From 6a576b9720315a6bc77a869c0e1219189ba665fa Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Sun, 12 Jul 2020 10:58:12 +0200
Subject: [PATCH] layout fix, deep link update

---
 .../org/nuclearfog/twidda/activity/ProfileEditor.java     | 8 ++++++++
 .../java/org/nuclearfog/twidda/activity/UserProfile.java  | 5 ++++-
 .../org/nuclearfog/twidda/backend/LinkContentLoader.java  | 6 ++++++
 .../org/nuclearfog/twidda/backend/UserListLoader.java     | 1 +
 app/src/main/res/layout/page_editprofile.xml              | 1 +
 app/src/main/res/values/dimens.xml                        | 3 ++-
 6 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java b/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
index d077fcf6..4b5ea68b 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
@@ -8,6 +8,7 @@ import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Point;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
@@ -71,6 +72,7 @@ public class ProfileEditor extends AppCompatActivity implements OnClickListener,
         setContentView(R.layout.page_editprofile);
         Toolbar toolbar = findViewById(R.id.editprofile_toolbar);
         View root = findViewById(R.id.page_edit);
+        View header = findViewById(R.id.editprofile_header);
         profile_image = findViewById(R.id.edit_pb);
         profile_banner = findViewById(R.id.edit_banner);
         add_banner_btn = findViewById(R.id.edit_add_banner);
@@ -88,6 +90,12 @@ public class ProfileEditor extends AppCompatActivity implements OnClickListener,
         GlobalSettings settings = GlobalSettings.getInstance(this);
         FontTool.setViewFontAndColor(settings, root);
         root.setBackgroundColor(settings.getBackgroundColor());
+        Point displaySize = new Point();
+        getWindowManager().getDefaultDisplay().getSize(displaySize);
+        int layoutHeight = displaySize.x / 3;
+        int buttonHeight = (int) getResources().getDimension(R.dimen.editprofile_dummy_height);
+        header.getLayoutParams().height = layoutHeight + buttonHeight;
+        header.requestLayout();
 
         loadingCircle.requestWindowFeature(FEATURE_NO_TITLE);
         loadingCircle.setCanceledOnTouchOutside(false);
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java b/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java
index 52a16c16..0f7dd353 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java
@@ -2,6 +2,7 @@ package org.nuclearfog.twidda.activity;
 
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.Point;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.Spanned;
@@ -509,7 +510,9 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
         }
         if (settings.getImageLoad()) {
             if (user.hasBannerImg()) {
-                int layoutHeight = profile_layer.getMeasuredWidth() / 3;
+                Point displaySize = new Point();
+                getWindowManager().getDefaultDisplay().getSize(displaySize);
+                int layoutHeight = displaySize.x / 3;
                 int buttonHeight = (int) getResources().getDimension(R.dimen.profile_button_height);
                 profile_layer.getLayoutParams().height = layoutHeight + buttonHeight;
                 String bannerLink = user.getBannerLink() + "/600x200";
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/LinkContentLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/LinkContentLoader.java
index 5774ccdb..934b3ef1 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/LinkContentLoader.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/LinkContentLoader.java
@@ -78,7 +78,13 @@ public class LinkContentLoader extends AsyncTask<Uri, Integer, LinkContentLoader
                 } else if (path.equals("intent/tweet")) {
                     if (link.isHierarchical()) {
                         String tweet = link.getQueryParameter("text");
+                        String url = link.getQueryParameter("url");
+                        String via = link.getQueryParameter("via");
                         if (tweet != null) {
+                            if (url != null)
+                                tweet += " " + url;
+                            if (via != null)
+                                tweet += " via @" + via;
                             data.putString(KEY_TWEETPOPUP_TEXT, tweet);
                             dataHolder = new DataHolder(data, TweetPopup.class);
                         }
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/UserListLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/UserListLoader.java
index 64ffbdec..79049fb1 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/UserListLoader.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/UserListLoader.java
@@ -73,6 +73,7 @@ public class UserListLoader extends AsyncTask<Long, Void, UserListHolder> {
                     return mTwitter.getRetweeter(id, cursor);
 
                 case FAVORIT:
+                    // TODO not implemented in Twitter4J
                     break;
 
                 case SEARCH:
diff --git a/app/src/main/res/layout/page_editprofile.xml b/app/src/main/res/layout/page_editprofile.xml
index c08a9bb8..e3296770 100644
--- a/app/src/main/res/layout/page_editprofile.xml
+++ b/app/src/main/res/layout/page_editprofile.xml
@@ -23,6 +23,7 @@
             android:orientation="vertical">
 
             <FrameLayout
+                android:id="@+id/editprofile_header"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/editprofile_banner_height"
                 android:layout_marginBottom="@dimen/editprofile_layout_margin"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f6d89d3e..aefcef84 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -57,7 +57,6 @@
     <integer name="profile_text_bio_lines">3</integer>
 
     <!--dimens of page_editprofile.xml-->
-    <dimen name="editprofile_toolbar_height">@dimen/toolbar_height</dimen>
     <dimen name="editprofile_banner_height">144dp</dimen>
     <dimen name="editprofile_image">80dp</dimen>
     <dimen name="editprofile_image_margin">10dp</dimen>
@@ -70,6 +69,8 @@
     <dimen name="editprofile_edittext_padding">5dp</dimen>
     <dimen name="editprofile_textsize">18sp</dimen>
     <dimen name="editprofile_bio_maxheight">150dp</dimen>
+    <dimen name="editprofile_toolbar_height">@dimen/toolbar_height</dimen>
+    <dimen name="editprofile_dummy_height">@dimen/profile_button_height</dimen>
 
     <!--dimens of item_tweet.xml-->
     <dimen name="tweetitem_profile_small">36sp</dimen>