From 4b61922969dea14652a7d1aec79327bba307e4af Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Tue, 19 Jul 2022 08:35:37 +0200
Subject: [PATCH] Fix issue #260 - Add privacy icon in messages

---
 .../android/ui/drawer/StatusAdapter.java      | 30 +++++++++----------
 app/src/main/res/layout/drawer_status.xml     | 20 ++++++++-----
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
index a0639bcf1..96fb6a549 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
@@ -770,7 +770,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         }
 
         if (statusToDeal.account.bot) {
-            holder.binding.botIcon.setVisibility(View.VISIBLE);
         } else {
             holder.binding.botIcon.setVisibility(View.GONE);
         }
@@ -780,6 +779,18 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             holder.binding.replyIcon.setVisibility(View.GONE);
         }
 
+        int ressource = R.drawable.ic_baseline_public_24;
+        switch (status.visibility) {
+            case "unlisted":
+                ressource = R.drawable.ic_baseline_lock_open_24;
+                break;
+            case "private":
+                ressource = R.drawable.ic_baseline_lock_24;
+                break;
+            case "direct":
+                ressource = R.drawable.ic_baseline_mail_24;
+                break;
+        }
         if (status.isFocused) {
             holder.binding.statusInfo.setVisibility(View.VISIBLE);
             holder.binding.reblogsCount.setText(String.valueOf(status.reblogs_count));
@@ -787,23 +798,14 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             holder.binding.time.setText(Helper.longDateToString(status.created_at));
             holder.binding.time.setVisibility(View.VISIBLE);
             holder.binding.dateShort.setVisibility(View.GONE);
-            int ressource = R.drawable.ic_baseline_public_24;
-            switch (status.visibility) {
-                case "unlisted":
-                    ressource = R.drawable.ic_baseline_lock_open_24;
-                    break;
-                case "private":
-                    ressource = R.drawable.ic_baseline_lock_24;
-                    break;
-                case "direct":
-                    ressource = R.drawable.ic_baseline_mail_24;
-                    break;
-            }
             holder.binding.visibility.setImageResource(ressource);
             holder.binding.dateShort.setVisibility(View.GONE);
+            holder.binding.visibilitySmall.setVisibility(View.GONE);
         } else {
+            holder.binding.visibilitySmall.setImageResource(ressource);
             holder.binding.statusInfo.setVisibility(View.GONE);
             holder.binding.dateShort.setVisibility(View.VISIBLE);
+            holder.binding.visibilitySmall.setVisibility(View.VISIBLE);
             holder.binding.dateShort.setText(Helper.dateDiff(context, status.created_at));
             holder.binding.time.setVisibility(View.GONE);
             Helper.absoluteDateTimeReveal(context, holder.binding.dateShort, status.created_at);
@@ -856,7 +858,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                     TextView.BufferType.SPANNABLE);
 
             holder.binding.statusBoosterInfo.setVisibility(View.VISIBLE);
-            holder.binding.boosterDivider.setVisibility(View.VISIBLE);
             if (theme_text_header_1_line != -1) {
                 holder.binding.statusBoosterDisplayName.setTextColor(theme_text_header_1_line);
             }
@@ -866,7 +867,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             }
         } else {
             holder.binding.statusBoosterInfo.setVisibility(View.GONE);
-            holder.binding.boosterDivider.setVisibility(View.GONE);
         }
         //--- BOOST VISIBILITY ---
         switch (statusToDeal.visibility) {
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 27c62d44e..eac76157e 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -36,6 +36,10 @@
         android:clipToPadding="false"
         android:orientation="vertical">
 
+        <com.google.android.material.divider.MaterialDivider
+            android:layout_width="match_parent"
+            android:layout_height="1dp" />
+
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/status_booster_info"
             android:layout_width="match_parent"
@@ -78,10 +82,6 @@
                 tools:text="@tools:sample/full_names" />
         </androidx.appcompat.widget.LinearLayoutCompat>
 
-        <com.google.android.material.divider.MaterialDivider
-            android:id="@+id/booster_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/header_container"
@@ -152,12 +152,19 @@
                             android:maxLines="1"
                             tools:text="@tools:sample/full_names" />
 
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:id="@+id/visibility_small"
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:layout_marginEnd="5dp"
+                            android:src="@drawable/ic_baseline_public_24" />
+
                         <TextView
                             android:id="@+id/date_short"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
-                            android:layout_marginEnd="10dp" />
+                            tools:text="2m" />
 
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -197,9 +204,6 @@
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
-        <com.google.android.material.divider.MaterialDivider
-            android:layout_width="match_parent"
-            android:layout_height="1dp" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/spoiler"