From 596e99a92d052043f7f7d1e64f1499261b94e999 Mon Sep 17 00:00:00 2001
From: NudeDude <extremeoverclocking>
Date: Sun, 12 May 2019 23:48:29 +0200
Subject: [PATCH] layout fix

---
 .../twidda/adapter/MessageAdapter.java        | 15 ++++-
 .../twidda/adapter/TweetAdapter.java          | 23 +++----
 .../twidda/adapter/UserAdapter.java           | 18 ++---
 .../res/drawable/ic_launcher_background.xml   |  6 +-
 .../res/drawable/ic_launcher_foreground.xml   | 24 +++----
 app/src/main/res/layout/item_dm.xml           | 13 ++--
 app/src/main/res/layout/item_tweet.xml        | 67 ++++---------------
 app/src/main/res/layout/item_user.xml         | 60 ++++-------------
 app/src/main/res/layout/page_profile.xml      |  4 +-
 app/src/main/res/layout/popup_dm.xml          |  8 ++-
 app/src/main/res/layout/popup_tweet.xml       | 12 ++--
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |  4 +-
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |  4 +-
 app/src/main/res/values-de-rDE/strings.xml    |  9 ---
 app/src/main/res/values/dimens.xml            |  6 +-
 app/src/main/res/values/strings.xml           |  9 ---
 app/src/main/res/values/styles.xml            | 17 ++---
 17 files changed, 108 insertions(+), 191 deletions(-)

diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/MessageAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/MessageAdapter.java
index 9f729ec4..8a3969ce 100644
--- a/app/src/main/java/org/nuclearfog/twidda/adapter/MessageAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/adapter/MessageAdapter.java
@@ -18,6 +18,7 @@ import org.nuclearfog.tag.Tagger;
 import org.nuclearfog.tag.Tagger.OnTagClickListener;
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.items.Message;
+import org.nuclearfog.twidda.backend.items.TwitterUser;
 
 import java.lang.ref.WeakReference;
 import java.text.SimpleDateFormat;
@@ -115,6 +116,7 @@ public class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.MessageH
     public void onBindViewHolder(@NonNull MessageHolder vh, int index) {
         Spanned text;
         Message message = messages[index];
+        TwitterUser user = message.getSender();
         if (itemClickListener.get() != null)
             text = Tagger.makeText(message.getText(), highlight, itemClickListener.get());
         else
@@ -123,8 +125,8 @@ public class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.MessageH
         vh.message.setText(text);
         vh.message.setMovementMethod(LinkMovementMethod.getInstance());
         vh.message.setLinkTextColor(highlight);
-        vh.username.setText(message.getSender().getUsername());
-        vh.screenname.setText(message.getSender().getScreenname());
+        vh.username.setText(user.getUsername());
+        vh.screenname.setText(user.getScreenname());
         vh.createdAt.setText(stringTime(message.getTime()));
 
         vh.message.setTextColor(fontColor);
@@ -132,6 +134,15 @@ public class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.MessageH
         vh.screenname.setTextColor(fontColor);
         vh.createdAt.setTextColor(fontColor);
 
+        if (user.isVerified())
+            vh.username.setCompoundDrawablesWithIntrinsicBounds(R.drawable.verify, 0, 0, 0);
+        else
+            vh.username.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+        if (user.isLocked())
+            vh.screenname.setCompoundDrawablesWithIntrinsicBounds(R.drawable.lock, 0, 0, 0);
+        else
+            vh.screenname.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+
         if (loadImage) {
             String link = message.getSender().getImageLink() + "_mini";
             Picasso.get().load(link).into(vh.profile_img);
diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java
index c6cca6bb..884601b3 100644
--- a/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java
@@ -130,21 +130,21 @@ public class TweetAdapter extends Adapter<TweetAdapter.ItemHolder> {
         vh.time.setTextColor(font_color);
 
         if (tweet.retweeted())
-            vh.rtButton.setImageResource(R.drawable.retweet_enabled);
+            vh.retweet.setCompoundDrawablesWithIntrinsicBounds(R.drawable.retweet_enabled, 0, 0, 0);
         else
-            vh.rtButton.setImageResource(R.drawable.retweet);
+            vh.retweet.setCompoundDrawablesWithIntrinsicBounds(R.drawable.retweet, 0, 0, 0);
         if (tweet.favored())
-            vh.fvButton.setImageResource(R.drawable.favorite_enabled);
+            vh.favorite.setCompoundDrawablesWithIntrinsicBounds(R.drawable.favorite_enabled, 0, 0, 0);
         else
-            vh.fvButton.setImageResource(R.drawable.favorite);
+            vh.favorite.setCompoundDrawablesWithIntrinsicBounds(R.drawable.favorite, 0, 0, 0);
         if (tweet.getUser().isVerified())
-            vh.verify.setVisibility(View.VISIBLE);
+            vh.username.setCompoundDrawablesWithIntrinsicBounds(R.drawable.verify, 0, 0, 0);
         else
-            vh.verify.setVisibility(View.GONE);
+            vh.username.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
         if (tweet.getUser().isLocked())
-            vh.lock.setVisibility(View.VISIBLE);
+            vh.screenname.setCompoundDrawablesWithIntrinsicBounds(R.drawable.lock, 0, 0, 0);
         else
-            vh.lock.setVisibility(View.GONE);
+            vh.screenname.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
         if (image_load)
             Picasso.get().load(tweet.getUser().getImageLink() + "_mini").into(vh.profile);
     }
@@ -177,8 +177,7 @@ public class TweetAdapter extends Adapter<TweetAdapter.ItemHolder> {
     class ItemHolder extends ViewHolder {
         final TextView username, screenname, tweet, retweet;
         final TextView favorite, retweeter, time;
-        final ImageView profile, verify, lock;
-        final ImageView rtButton, fvButton;
+        final ImageView profile;
 
         ItemHolder(View v) {
             super(v);
@@ -190,10 +189,6 @@ public class TweetAdapter extends Adapter<TweetAdapter.ItemHolder> {
             retweeter = v.findViewById(R.id.retweeter);
             time = v.findViewById(R.id.time);
             profile = v.findViewById(R.id.tweetPb);
-            verify = v.findViewById(R.id.list_verify);
-            lock = v.findViewById(R.id.list_locked);
-            rtButton = v.findViewById(R.id.rt_button);
-            fvButton = v.findViewById(R.id.fv_button);
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java
index 7d3aa406..54d00a5f 100644
--- a/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java
@@ -88,31 +88,29 @@ public class UserAdapter extends Adapter<UserAdapter.ItemHolder> {
     @Override
     public void onBindViewHolder(@NonNull ItemHolder vh, int index) {
         TwitterUser user = mUser[index];
-        vh.screenname.setText(user.getScreenname());
         vh.username.setText(user.getUsername());
-
-        vh.screenname.setTextColor(font_color);
         vh.username.setTextColor(font_color);
-
+        vh.screenname.setText(user.getScreenname());
+        vh.screenname.setTextColor(font_color);
 
         if (loadImage) {
             Picasso.get().load(user.getImageLink() + "_mini").into(vh.profileImg);
         }
         if (user.isVerified()) {
-            vh.verifyIco.setVisibility(View.VISIBLE);
+            vh.username.setCompoundDrawablesWithIntrinsicBounds(R.drawable.verify, 0, 0, 0);
         } else {
-            vh.verifyIco.setVisibility(View.GONE);
+            vh.username.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
         }
         if (user.isLocked()) {
-            vh.lockIco.setVisibility(View.VISIBLE);
+            vh.screenname.setCompoundDrawablesWithIntrinsicBounds(R.drawable.lock, 0, 0, 0);
         } else {
-            vh.lockIco.setVisibility(View.GONE);
+            vh.screenname.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
         }
     }
 
 
     class ItemHolder extends ViewHolder {
-        final ImageView profileImg, verifyIco, lockIco;
+        final ImageView profileImg;
         final TextView username, screenname;
 
         ItemHolder(View v) {
@@ -120,8 +118,6 @@ public class UserAdapter extends Adapter<UserAdapter.ItemHolder> {
             username = v.findViewById(R.id.username_detail);
             screenname = v.findViewById(R.id.screenname_detail);
             profileImg = v.findViewById(R.id.user_profileimg);
-            verifyIco = v.findViewById(R.id.verified);
-            lockIco = v.findViewById(R.id.locked_profile);
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index c3f28b51..499c699c 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -3,7 +3,7 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <path
-      android:pathData="M0,0h108v108h-108z"
-      android:fillColor="#FFA500" />
+    <path
+        android:pathData="M0,0h108v108h-108z"
+        android:fillColor="#FFA500" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 1925abea..d0829148 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -3,16 +3,16 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <path
-      android:pathData="M108,65.8V108H77.35L44.29,76.36c0.1,-3.32 2.83,-5.98 6.17,-5.98c1.49,0 2.92,-0.21 4.29,-0.58c6.82,-1.87 11.84,-8.13 11.84,-15.55c0,-1.94 -0.34,-3.8 -0.97,-5.53c0.1,0.74 0.16,1.5 0.16,2.27c0,8.91 -7.221,16.13 -16.13,16.13c-1.66,0 -3.17,0.649 -4.28,1.729l-5.04,-4.6c-0.62,-0.37 -1.21,-0.81 -1.78,-1.3c-3.71,-3.29 -4.95,-8.33 -3.58,-12.79l2.09,2.23l8.391,8.95l1.87,0.07l-6.16,-6.6c-1.22,-0.73 -2.29,-1.7 -3.11,-2.87c-0.819,-1.16 -1.39,-2.52 -1.649,-3.99l-0.08,-0.52c-0.021,-0.2 -0.04,-0.4 -0.051,-0.59c-0.279,-4.51 2.49,-8.5 6.53,-9.97l6.561,7.65l-0.021,-0.05v-0.01c-0.25,-0.72 -0.399,-1.47 -0.45,-2.24c-0.08,-1.29 0.13,-2.54 0.601,-3.7c0.359,-0.88 0.87,-1.7 1.51,-2.43c1.5,-1.69 3.57,-2.7 5.82,-2.84c0.449,-0.02 0.89,-0.02 1.319,0.02c0.091,0.01 0.181,0.02 0.28,0.03c1.67,0.21 3.24,0.92 4.53,2.06c0.01,0.02 0.03,0.03 0.05,0.05c0.05,0.04 0.1,0.09 0.15,0.14c0.13,0.12 0.26,0.25 0.38,0.38l10.04,-4.29L108,65.8z"
-      android:fillColor="#FFA500" />
-  <path
-      android:pathData="M66.59,54.25c0,7.424 -5.018,13.677 -11.844,15.551c-1.363,0.374 -2.799,0.574 -4.281,0.574c-3.348,0 -6.072,2.664 -6.17,5.989c-0.521,-0.905 -0.818,-1.954 -0.818,-3.072c0,-1.485 0.523,-2.848 1.398,-3.913c0.061,-0.076 0.125,-0.149 0.189,-0.222c0.098,-0.107 0.197,-0.212 0.303,-0.312c1.109,-1.071 2.619,-1.729 4.283,-1.729c8.906,0 16.125,-7.219 16.125,-16.124c0,-0.771 -0.055,-1.529 -0.156,-2.271C66.248,50.446 66.59,52.308 66.59,54.25z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M73.572,31.636l-8.695,6.213l-3.811,2.724l-0.004,0.002c0,-0.001 0,-0.001 0,-0.002v0.001c-0.205,-0.681 -0.596,-1.294 -1.133,-1.773l-0.035,-0.031c-0.777,-0.677 -1.768,-1.012 -2.793,-0.949c-1.016,0.063 -1.949,0.509 -2.633,1.261c-0.014,0.015 -0.027,0.029 -0.041,0.044c-0.688,0.779 -1.031,1.778 -0.969,2.814c0.064,1.037 0.527,1.986 1.307,2.674c2.402,2.126 3.854,5.046 4.094,8.24c0.006,0.058 0.01,0.117 0.014,0.177c0.201,3.263 -0.883,6.408 -3.047,8.856c-2.234,2.526 -5.291,3.909 -8.418,4.102c-2.432,0.149 -4.906,-0.421 -7.076,-1.732c-0.621,-0.375 -1.217,-0.811 -1.779,-1.309c-3.711,-3.282 -4.953,-8.331 -3.582,-12.784c0.232,3.064 1.611,6.044 4.088,8.236c1.863,1.646 4.092,2.622 6.387,2.944c0.234,0.037 0.471,0.063 0.707,0.078c0.018,0.001 0.037,0.003 0.057,0.004c2.268,0.131 4.572,-0.74 6.189,-2.569c1.355,-1.533 2.033,-3.502 1.908,-5.546c-0.021,-0.335 -0.063,-0.666 -0.127,-0.99c-0.316,-1.653 -1.164,-3.146 -2.445,-4.279c-1.094,-0.968 -1.904,-2.175 -2.377,-3.516L49.34,44.47l-0.004,-0.012c-0.246,-0.714 -0.395,-1.465 -0.443,-2.239c-0.078,-1.285 0.131,-2.543 0.602,-3.701c0.355,-0.875 0.861,-1.694 1.506,-2.424c1.498,-1.693 3.566,-2.701 5.822,-2.84c0.443,-0.027 0.883,-0.021 1.318,0.021c0.092,0.008 0.184,0.018 0.275,0.03c1.672,0.209 3.24,0.915 4.529,2.056c0.016,0.015 0.033,0.03 0.051,0.046c0.053,0.047 0.105,0.095 0.154,0.143c0.131,0.124 0.258,0.252 0.381,0.383L73.572,31.636z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M53.271,53.222c-1.66,1.681 -3.92,2.778 -6.463,2.935c-2.053,0.126 -3.998,-0.38 -5.646,-1.349v-0.001c-2.453,-1.442 -4.248,-3.91 -4.762,-6.854c-0.031,-0.175 -0.057,-0.35 -0.078,-0.527c-0.023,-0.195 -0.043,-0.392 -0.055,-0.59c-0.275,-4.507 2.492,-8.497 6.531,-9.963c-1.922,1.942 -3.039,4.664 -2.859,7.606c0.338,5.484 5.057,9.657 10.541,9.32C51.459,53.74 52.395,53.541 53.271,53.222z"
-      android:fillColor="#FFFFFF"/>
+    <path
+        android:pathData="M108,65.8V108H77.35L44.29,76.36c0.1,-3.32 2.83,-5.98 6.17,-5.98c1.49,0 2.92,-0.21 4.29,-0.58c6.82,-1.87 11.84,-8.13 11.84,-15.55c0,-1.94 -0.34,-3.8 -0.97,-5.53c0.1,0.74 0.16,1.5 0.16,2.27c0,8.91 -7.221,16.13 -16.13,16.13c-1.66,0 -3.17,0.649 -4.28,1.729l-5.04,-4.6c-0.62,-0.37 -1.21,-0.81 -1.78,-1.3c-3.71,-3.29 -4.95,-8.33 -3.58,-12.79l2.09,2.23l8.391,8.95l1.87,0.07l-6.16,-6.6c-1.22,-0.73 -2.29,-1.7 -3.11,-2.87c-0.819,-1.16 -1.39,-2.52 -1.649,-3.99l-0.08,-0.52c-0.021,-0.2 -0.04,-0.4 -0.051,-0.59c-0.279,-4.51 2.49,-8.5 6.53,-9.97l6.561,7.65l-0.021,-0.05v-0.01c-0.25,-0.72 -0.399,-1.47 -0.45,-2.24c-0.08,-1.29 0.13,-2.54 0.601,-3.7c0.359,-0.88 0.87,-1.7 1.51,-2.43c1.5,-1.69 3.57,-2.7 5.82,-2.84c0.449,-0.02 0.89,-0.02 1.319,0.02c0.091,0.01 0.181,0.02 0.28,0.03c1.67,0.21 3.24,0.92 4.53,2.06c0.01,0.02 0.03,0.03 0.05,0.05c0.05,0.04 0.1,0.09 0.15,0.14c0.13,0.12 0.26,0.25 0.38,0.38l10.04,-4.29L108,65.8z"
+        android:fillColor="#FFA500" />
+    <path
+        android:pathData="M66.59,54.25c0,7.424 -5.018,13.677 -11.844,15.551c-1.363,0.374 -2.799,0.574 -4.281,0.574c-3.348,0 -6.072,2.664 -6.17,5.989c-0.521,-0.905 -0.818,-1.954 -0.818,-3.072c0,-1.485 0.523,-2.848 1.398,-3.913c0.061,-0.076 0.125,-0.149 0.189,-0.222c0.098,-0.107 0.197,-0.212 0.303,-0.312c1.109,-1.071 2.619,-1.729 4.283,-1.729c8.906,0 16.125,-7.219 16.125,-16.124c0,-0.771 -0.055,-1.529 -0.156,-2.271C66.248,50.446 66.59,52.308 66.59,54.25z"
+        android:fillColor="#FFFFFF" />
+    <path
+        android:pathData="M73.572,31.636l-8.695,6.213l-3.811,2.724l-0.004,0.002c0,-0.001 0,-0.001 0,-0.002v0.001c-0.205,-0.681 -0.596,-1.294 -1.133,-1.773l-0.035,-0.031c-0.777,-0.677 -1.768,-1.012 -2.793,-0.949c-1.016,0.063 -1.949,0.509 -2.633,1.261c-0.014,0.015 -0.027,0.029 -0.041,0.044c-0.688,0.779 -1.031,1.778 -0.969,2.814c0.064,1.037 0.527,1.986 1.307,2.674c2.402,2.126 3.854,5.046 4.094,8.24c0.006,0.058 0.01,0.117 0.014,0.177c0.201,3.263 -0.883,6.408 -3.047,8.856c-2.234,2.526 -5.291,3.909 -8.418,4.102c-2.432,0.149 -4.906,-0.421 -7.076,-1.732c-0.621,-0.375 -1.217,-0.811 -1.779,-1.309c-3.711,-3.282 -4.953,-8.331 -3.582,-12.784c0.232,3.064 1.611,6.044 4.088,8.236c1.863,1.646 4.092,2.622 6.387,2.944c0.234,0.037 0.471,0.063 0.707,0.078c0.018,0.001 0.037,0.003 0.057,0.004c2.268,0.131 4.572,-0.74 6.189,-2.569c1.355,-1.533 2.033,-3.502 1.908,-5.546c-0.021,-0.335 -0.063,-0.666 -0.127,-0.99c-0.316,-1.653 -1.164,-3.146 -2.445,-4.279c-1.094,-0.968 -1.904,-2.175 -2.377,-3.516L49.34,44.47l-0.004,-0.012c-0.246,-0.714 -0.395,-1.465 -0.443,-2.239c-0.078,-1.285 0.131,-2.543 0.602,-3.701c0.355,-0.875 0.861,-1.694 1.506,-2.424c1.498,-1.693 3.566,-2.701 5.822,-2.84c0.443,-0.027 0.883,-0.021 1.318,0.021c0.092,0.008 0.184,0.018 0.275,0.03c1.672,0.209 3.24,0.915 4.529,2.056c0.016,0.015 0.033,0.03 0.051,0.046c0.053,0.047 0.105,0.095 0.154,0.143c0.131,0.124 0.258,0.252 0.381,0.383L73.572,31.636z"
+        android:fillColor="#FFFFFF" />
+    <path
+        android:pathData="M53.271,53.222c-1.66,1.681 -3.92,2.778 -6.463,2.935c-2.053,0.126 -3.998,-0.38 -5.646,-1.349v-0.001c-2.453,-1.442 -4.248,-3.91 -4.762,-6.854c-0.031,-0.175 -0.057,-0.35 -0.078,-0.527c-0.023,-0.195 -0.043,-0.392 -0.055,-0.59c-0.275,-4.507 2.492,-8.497 6.531,-9.963c-1.922,1.942 -3.039,4.664 -2.859,7.606c0.338,5.484 5.057,9.657 10.541,9.32C51.459,53.74 52.395,53.541 53.271,53.222z"
+        android:fillColor="#FFFFFF" />
 </vector>
diff --git a/app/src/main/res/layout/item_dm.xml b/app/src/main/res/layout/item_dm.xml
index 8a7d2626..ac1f475b 100644
--- a/app/src/main/res/layout/item_dm.xml
+++ b/app/src/main/res/layout/item_dm.xml
@@ -18,13 +18,15 @@
 
             <androidx.cardview.widget.CardView
                 style="@style/ProfileImageCardView"
-                android:layout_width="@dimen/profile_small"
-                android:layout_height="@dimen/profile_small">
+                android:layout_width="@dimen/profile_middle"
+                android:layout_height="@dimen/profile_middle"
+                android:layout_marginRight="@dimen/layout_margin"
+                android:layout_marginEnd="@dimen/layout_margin">
 
                 <ImageView
                     android:id="@+id/dm_profileImg"
-                    android:layout_width="@dimen/profile_small"
-                    android:layout_height="@dimen/profile_small"
+                    android:layout_width="@dimen/profile_middle"
+                    android:layout_height="@dimen/profile_middle"
                     android:contentDescription="@string/profile_image" />
 
             </androidx.cardview.widget.CardView>
@@ -39,6 +41,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
                     android:orientation="horizontal">
 
                     <TextView
@@ -46,6 +49,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="2"
+                        android:drawablePadding="@dimen/drawable_padding"
                         android:singleLine="true"
                         android:textSize="12sp" />
 
@@ -65,6 +69,7 @@
                     android:id="@+id/dm_screenname"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:drawablePadding="@dimen/drawable_padding"
                     android:singleLine="true"
                     android:textSize="12sp" />
 
diff --git a/app/src/main/res/layout/item_tweet.xml b/app/src/main/res/layout/item_tweet.xml
index 564f24fa..a9e62508 100644
--- a/app/src/main/res/layout/item_tweet.xml
+++ b/app/src/main/res/layout/item_tweet.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/CardViewStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -21,7 +20,8 @@
             <androidx.cardview.widget.CardView
                 style="@style/ProfileImageCardView"
                 android:layout_width="@dimen/profile_small"
-                android:layout_height="@dimen/profile_small">
+                android:layout_height="@dimen/profile_small"
+                android:layout_marginRight="@dimen/layout_margin">
 
                 <ImageView
                     android:id="@+id/tweetPb"
@@ -43,21 +43,11 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
 
-                    <ImageView
-                        android:id="@+id/list_verify"
-                        android:layout_width="@dimen/icon_size"
-                        android:layout_height="@dimen/icon_size"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginEnd="@dimen/icon_margin"
-                        android:layout_marginRight="@dimen/icon_margin"
-                        android:contentDescription="@string/verify"
-                        android:visibility="gone"
-                        app:srcCompat="@drawable/verify" />
-
                     <TextView
                         android:id="@+id/username"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:drawablePadding="@dimen/drawable_padding"
                         android:layout_gravity="start"
                         android:layout_weight="2"
                         android:gravity="start"
@@ -75,29 +65,12 @@
 
                 </LinearLayout>
 
-                <LinearLayout
+                <TextView
+                    android:id="@+id/screenname"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/list_locked"
-                        android:layout_width="@dimen/icon_size"
-                        android:layout_height="@dimen/icon_size"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginEnd="@dimen/icon_margin"
-                        android:layout_marginRight="@dimen/icon_margin"
-                        android:contentDescription="@string/verify"
-                        android:visibility="gone"
-                        app:srcCompat="@drawable/lock" />
-
-                    <TextView
-                        android:id="@+id/screenname"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:singleLine="true" />
-                </LinearLayout>
+                    android:drawablePadding="@dimen/drawable_padding"
+                    android:singleLine="true" />
 
             </LinearLayout>
 
@@ -119,41 +92,25 @@
                 android:id="@+id/retweeter"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="3"
+                android:layout_weight="1"
                 android:singleLine="true"
                 android:textSize="12sp" />
 
-            <ImageView
-                android:id="@+id/rt_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/icon_margin"
-                android:layout_marginRight="@dimen/icon_margin"
-                android:contentDescription="@string/retweet"
-                app:srcCompat="@drawable/retweet" />
-
             <TextView
                 android:id="@+id/retweet_number"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="2"
+                android:drawablePadding="@dimen/drawable_padding"
+                android:layout_weight="1"
                 android:singleLine="true"
                 android:textSize="12sp" />
 
-            <ImageView
-                android:id="@+id/fv_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/icon_margin"
-                android:layout_marginRight="@dimen/icon_margin"
-                android:contentDescription="@string/favorite"
-                app:srcCompat="@drawable/favorite" />
-
             <TextView
                 android:id="@+id/favorite_number"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="2"
+                android:drawablePadding="@dimen/drawable_padding"
+                android:layout_weight="1"
                 android:singleLine="true"
                 android:textSize="12sp" />
 
diff --git a/app/src/main/res/layout/item_user.xml b/app/src/main/res/layout/item_user.xml
index cfb43b8f..64f3ccf9 100644
--- a/app/src/main/res/layout/item_user.xml
+++ b/app/src/main/res/layout/item_user.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/CardViewStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -15,7 +14,8 @@
         <androidx.cardview.widget.CardView
             style="@style/ProfileImageCardView"
             android:layout_width="@dimen/profile_middle"
-            android:layout_height="@dimen/profile_middle">
+            android:layout_height="@dimen/profile_middle"
+            android:layout_marginRight="@dimen/layout_margin">
 
             <ImageView
                 android:id="@+id/user_profileimg"
@@ -32,55 +32,19 @@
             android:layout_marginLeft="@dimen/layout_margin"
             android:orientation="vertical">
 
-            <LinearLayout
+            <TextView
+                android:id="@+id/username_detail"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
+                android:layout_height="wrap_content"
+                android:drawablePadding="@dimen/drawable_padding"
+                android:singleLine="true" />
 
-                <ImageView
-                    android:id="@+id/verified"
-                    android:layout_width="@dimen/icon_size"
-                    android:layout_height="@dimen/icon_size"
-                    android:layout_marginEnd="@dimen/icon_margin"
-                    android:layout_marginRight="@dimen/icon_margin"
-                    android:contentDescription="@string/verify"
-                    android:visibility="gone"
-                    app:srcCompat="@drawable/verify" />
-
-                <TextView
-                    android:id="@+id/username_detail"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:singleLine="true" />
-
-            </LinearLayout>
-
-            <LinearLayout
+            <TextView
+                android:id="@+id/screenname_detail"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/locked_profile"
-                    android:layout_width="@dimen/icon_size"
-                    android:layout_height="@dimen/icon_size"
-                    android:layout_marginEnd="@dimen/icon_margin"
-                    android:layout_marginRight="@dimen/icon_margin"
-                    android:contentDescription="@string/profile_locked"
-                    android:visibility="gone"
-                    app:srcCompat="@drawable/lock" />
-
-                <TextView
-                    android:id="@+id/screenname_detail"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:singleLine="true" />
-
-            </LinearLayout>
+                android:layout_height="wrap_content"
+                android:drawablePadding="@dimen/drawable_padding"
+                android:singleLine="true" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/page_profile.xml b/app/src/main/res/layout/page_profile.xml
index ffd24bea..d6b3d7fd 100644
--- a/app/src/main/res/layout/page_profile.xml
+++ b/app/src/main/res/layout/page_profile.xml
@@ -140,7 +140,6 @@
                         android:id="@+id/bio"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="@dimen/layout_margin"
                         android:autoLink="web"
                         android:linksClickable="true"
                         android:maxLines="@integer/max_bio_lines"
@@ -150,6 +149,7 @@
                         android:id="@+id/location"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/layout_margin"
                         android:drawablePadding="@dimen/drawable_padding"
                         android:singleLine="true"
                         android:textSize="12sp"
@@ -160,6 +160,7 @@
                         android:id="@+id/links"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/layout_margin"
                         android:drawablePadding="@dimen/drawable_padding"
                         android:linksClickable="true"
                         android:singleLine="true"
@@ -171,6 +172,7 @@
                         android:id="@+id/profile_date"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/layout_margin"
                         android:drawablePadding="@dimen/drawable_padding"
                         android:singleLine="true"
                         android:textSize="12sp"
diff --git a/app/src/main/res/layout/popup_dm.xml b/app/src/main/res/layout/popup_dm.xml
index 49a1a2c4..c60e369d 100644
--- a/app/src/main/res/layout/popup_dm.xml
+++ b/app/src/main/res/layout/popup_dm.xml
@@ -24,28 +24,30 @@
             <EditText
                 android:id="@+id/dm_receiver"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/dm_button_size"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:background="@android:color/transparent"
                 android:hint="@string/username"
                 android:inputType="text"
                 android:singleLine="true" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/dm_media"
                 android:layout_width="@dimen/dm_button_size"
                 android:layout_height="@dimen/dm_button_size"
                 android:layout_marginStart="@dimen/dm_icon_margin"
                 android:layout_marginLeft="@dimen/dm_icon_margin"
+                android:background="@drawable/button"
                 android:contentDescription="@string/add_image"
                 app:srcCompat="@drawable/image" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/dm_send"
                 android:layout_width="@dimen/dm_button_size"
                 android:layout_height="@dimen/dm_button_size"
                 android:layout_marginStart="@dimen/button_margin"
                 android:layout_marginLeft="@dimen/button_margin"
+                android:background="@drawable/button"
                 android:contentDescription="@string/close_dm"
                 app:srcCompat="@drawable/right" />
 
diff --git a/app/src/main/res/layout/popup_tweet.xml b/app/src/main/res/layout/popup_tweet.xml
index 347693ea..de6e9afa 100644
--- a/app/src/main/res/layout/popup_tweet.xml
+++ b/app/src/main/res/layout/popup_tweet.xml
@@ -37,40 +37,44 @@
                 android:textColor="@android:color/holo_red_dark"
                 android:textSize="18sp" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/img_preview"
                 android:layout_width="@dimen/tweet_button_size"
                 android:layout_height="@dimen/tweet_button_size"
                 android:layout_marginStart="@dimen/tweet_icon_margin"
                 android:layout_marginLeft="@dimen/tweet_icon_margin"
+                android:background="@drawable/button"
                 android:contentDescription="@string/image_preview"
                 android:visibility="invisible"
                 app:srcCompat="@drawable/preview" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/image"
                 android:layout_width="@dimen/tweet_button_size"
                 android:layout_height="@dimen/tweet_button_size"
                 android:layout_marginStart="@dimen/tweet_icon_margin"
                 android:layout_marginLeft="@dimen/tweet_icon_margin"
+                android:background="@drawable/button"
                 android:contentDescription="@string/add_image"
                 app:srcCompat="@drawable/image" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/sendTweet"
                 android:layout_width="@dimen/tweet_button_size"
                 android:layout_height="@dimen/tweet_button_size"
                 android:layout_marginStart="@dimen/tweet_icon_margin"
                 android:layout_marginLeft="@dimen/tweet_icon_margin"
+                android:background="@drawable/button"
                 android:contentDescription="@string/send_tweet"
                 app:srcCompat="@drawable/tweet" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/close"
                 android:layout_width="@dimen/tweet_button_size"
                 android:layout_height="@dimen/tweet_button_size"
                 android:layout_marginStart="@dimen/tweet_icon_margin"
                 android:layout_marginLeft="@dimen/tweet_icon_margin"
+                android:background="@drawable/button"
                 android:contentDescription="@string/tweet_close"
                 app:srcCompat="@drawable/cross" />
 
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index bbd3e021..eca70cfe 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index bbd3e021..eca70cfe 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index e5d47359..0c2b6539 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -2,10 +2,7 @@
 <resources>
     <string name="font">Schrift</string>
     <string name="highlight">Hervorhebung</string>
-    <string name="verify">verifiziert</string>
-    <string name="profile_locked">Privat</string>
     <string name="load_factor">Anzahl Tweets</string>
-    <string name="followback">Folgt dir</string>
     <string name="follow">folgen</string>
     <string name="retry">wiederholen</string>
     <string name="cancel">abbrechen</string>
@@ -25,8 +22,6 @@
     <string name="delete_tweet">Tweet löschen?</string>
     <string name="connection_failed">Keine Internetverbindung!</string>
     <string name="enter_pin">PIN eingeben!</string>
-    <string name="pin_added">PIN eingefügt!</string>
-    <string name="false_format">Falsches Format!</string>
     <string name="delete_database_popup">Datenbank löschen?</string>
     <string name="rate_limit_exceeded">"Rate-Limit erreicht, weiter in (s): "</string>
     <string name="error_sending_tweet">Fehler beim Senden!</string>
@@ -77,11 +72,7 @@
     <string name="char_limit_reached">Zeichenlimit erreicht!</string>
     <string name="link_to_clipboard">Link in Zwischenablage kopieren</string>
     <string name="copied_to_clipboard">Link in Zwischenablage kopiert!</string>
-    <string name="location_name">Standortname</string>
     <string name="profile_link">Link</string>
-    <string name="profile_date">Profil erstellt am</string>
-    <string name="paste_from_clipboard">Von Zwischenablage einfügen</string>
-    <string name="clipboard_icon">Clipboard Symbol</string>
     <string name="image_preview_button">Bildvorschau button</string>
     <string name="answer_button">Antwort Button</string>
     <string name="retweet_button">Retweet Button</string>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3b45b15d..5fd0a3f8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,13 +4,11 @@
     <dimen name="profile_image">64dp</dimen>
     <dimen name="profile_middle">40dp</dimen>
     <dimen name="profile_small">36dp</dimen>
-    <dimen name="icon_size">14dp</dimen>
     <dimen name="layout_margin">5dp</dimen>
     <dimen name="side_padding">10dp</dimen>
     <dimen name="icon_margin">5dp</dimen>
     <dimen name="divider">2dp</dimen>
     <dimen name="load_button">48dp</dimen>
-    <dimen name="button_size">24dp</dimen>
     <dimen name="button_margin">5dp</dimen>
     <dimen name="image_height">300dp</dimen>
     <dimen name="button_padding">40dp</dimen>
@@ -21,9 +19,9 @@
     <dimen name="tweet_profile">56dp</dimen>
     <dimen name="tweet_page_icon">20dp</dimen>
     <dimen name="dm_icon_margin">5dp</dimen>
-    <dimen name="dm_button_size">32dp</dimen>
+    <dimen name="dm_button_size">40dp</dimen>
     <dimen name="tweet_icon_margin">16dp</dimen>
-    <dimen name="tweet_button_size">32dp</dimen>
+    <dimen name="tweet_button_size">40dp</dimen>
     <dimen name="bio_height">150dp</dimen>
     <dimen name="editprofile_padding">20dp</dimen>
     <dimen name="tab_padding_top">5dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c892bb29..6cb8028c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,15 +14,12 @@
     <string name="font">Font</string>
     <string name="popup" translatable="false">Popup</string>
     <string name="highlight">Highlight</string>
-    <string name="verify">verified</string>
-    <string name="profile_locked">locked</string>
     <string name="load_factor">tweet count</string>
     <string name="block">Block</string>
     <string name="follow">follow</string>
     <string name="retry">retry</string>
     <string name="cancel">cancel!</string>
     <string name="color_settings">Color settings</string>
-    <string name="followback">follows you</string>
     <string name="data_load">data consumption</string>
     <string name="trend_setting">trend setting</string>
     <string name="profile">profile</string>
@@ -33,8 +30,6 @@
     <string name="delete_tweet">delete tweet?</string>
     <string name="connection_failed">connection failed</string>
     <string name="enter_pin">Enter PIN</string>
-    <string name="pin_added">PIN added!</string>
-    <string name="false_format">not valid!</string>
     <string name="delete_database_popup">delete database?</string>
     <string name="rate_limit_exceeded">"Rate limit exceeded, retry after(s): "</string>
     <string name="error_sending_tweet">error while sending</string>
@@ -85,11 +80,7 @@
     <string name="char_limit_reached">char limit reached!</string>
     <string name="link_to_clipboard">copy link to clipboard</string>
     <string name="copied_to_clipboard">Link copied to clipboard!</string>
-    <string name="location_name">Location name</string>
     <string name="profile_link">link</string>
-    <string name="profile_date">profile creation date</string>
-    <string name="paste_from_clipboard">paste from clipboard</string>
-    <string name="clipboard_icon">clipboard icon</string>
     <string name="image_preview_button">image preview button</string>
     <string name="answer_button">answer button</string>
     <string name="retweet_button">retweet button</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b8676d42..7f67856f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,7 +7,7 @@
         <item name="android:colorBackground">@android:color/black</item>
         <item name="android:windowAnimationStyle">@style/TransactionPending</item>
         <item name="android:textViewStyle">@style/RobotoTextView</item>
-        <item name="buttonStyle">@style/CustomButton</item>
+        <item name="android:buttonStyle">@style/RobotoButton</item>
         <item name="android:textAllCaps">false</item>
     </style>
 
@@ -26,8 +26,14 @@
         <item name="android:windowExitAnimation">@android:anim/fade_out</item>
     </style>
 
-    <style name="RobotoTextView">
-        <item name="fontFamily">sans-serif-light</item>
+    <style name="RobotoTextView" parent="android:Widget.TextView">
+        <item name="android:fontFamily">sans-serif-thin</item>
+        <item name="android:textStyle">normal</item>
+    </style>
+
+    <style name="RobotoButton" parent="Widget.AppCompat.Button">
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">italic</item>
     </style>
 
     <style name="CardViewStyle" parent="CardView">
@@ -47,9 +53,4 @@
         <item name="cardCornerRadius">10dp</item>
     </style>
 
-    <style name="CustomButton" parent="Widget.AppCompat.Button">
-        <item name="android:textAllCaps">false</item>
-        <item name="android:fontFamily">RobotoTextView</item>
-    </style>
-
 </resources>
\ No newline at end of file