From f51c24dfb2d8e0c79f265a4d0a655c38c215a631 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Thu, 9 Jun 2022 17:20:45 +0200
Subject: [PATCH] Fix #153 & #154 - Icon not visible in menu / No indicator for
 audio messages

---
 app/build.gradle                               |  4 ++--
 .../android/ui/drawer/StatusAdapter.java       | 10 ++++++++++
 .../drawable/ic_baseline_audiotrack_128.xml    | 10 ++++++++++
 .../res/drawable/ic_baseline_audiotrack_24.xml | 10 ++++++++++
 .../res/drawable/ic_baseline_audiotrack_48.xml | 10 ++++++++++
 app/src/main/res/layout/layout_media.xml       |  8 ++++++++
 app/src/main/res/layout/nav_header_main.xml    | 18 +++++++++++-------
 7 files changed, 61 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_baseline_audiotrack_128.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_audiotrack_24.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_audiotrack_48.xml

diff --git a/app/build.gradle b/app/build.gradle
index 32b56543..9c02a893 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 31
-        versionCode 19
-        versionName "beta-19"
+        versionCode 20
+        versionName "beta-20"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
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 2713cb55..6c33b91f 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
@@ -934,6 +934,11 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                 } else {
                     layoutMediaBinding.playVideo.setVisibility(View.GONE);
                 }
+                if (statusToDeal.media_attachments.get(0).type != null && statusToDeal.media_attachments.get(0).type.equalsIgnoreCase("audio")) {
+                    layoutMediaBinding.playMusic.setVisibility(View.VISIBLE);
+                } else {
+                    layoutMediaBinding.playMusic.setVisibility(View.GONE);
+                }
                 if (!mediaObfuscated(statusToDeal) || expand_media) {
                     layoutMediaBinding.viewHide.setImageResource(R.drawable.ic_baseline_visibility_24);
                     Glide.with(layoutMediaBinding.media.getContext())
@@ -972,6 +977,11 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                     } else {
                         layoutMediaBinding.playVideo.setVisibility(View.GONE);
                     }
+                    if (attachment.type != null && attachment.type.equalsIgnoreCase("audio")) {
+                        layoutMediaBinding.playMusic.setVisibility(View.VISIBLE);
+                    } else {
+                        layoutMediaBinding.playMusic.setVisibility(View.GONE);
+                    }
                     lp.setMargins(0, 0, (int) Helper.convertDpToPixel(5, context), 0);
                     if (!mediaObfuscated(statusToDeal) || expand_media) {
                         layoutMediaBinding.viewHide.setImageResource(R.drawable.ic_baseline_visibility_24);
diff --git a/app/src/main/res/drawable/ic_baseline_audiotrack_128.xml b/app/src/main/res/drawable/ic_baseline_audiotrack_128.xml
new file mode 100644
index 00000000..3e26e1c7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_audiotrack_128.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,3v9.28c-0.47,-0.17 -0.97,-0.28 -1.5,-0.28C8.01,12 6,14.01 6,16.5S8.01,21 10.5,21c2.31,0 4.2,-1.75 4.45,-4H15V6h4V3h-7z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_audiotrack_24.xml b/app/src/main/res/drawable/ic_baseline_audiotrack_24.xml
new file mode 100644
index 00000000..c1c0a105
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_audiotrack_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,3v9.28c-0.47,-0.17 -0.97,-0.28 -1.5,-0.28C8.01,12 6,14.01 6,16.5S8.01,21 10.5,21c2.31,0 4.2,-1.75 4.45,-4H15V6h4V3h-7z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_audiotrack_48.xml b/app/src/main/res/drawable/ic_baseline_audiotrack_48.xml
new file mode 100644
index 00000000..e4e7a65a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_audiotrack_48.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,3v9.28c-0.47,-0.17 -0.97,-0.28 -1.5,-0.28C8.01,12 6,14.01 6,16.5S8.01,21 10.5,21c2.31,0 4.2,-1.75 4.45,-4H15V6h4V3h-7z" />
+</vector>
diff --git a/app/src/main/res/layout/layout_media.xml b/app/src/main/res/layout/layout_media.xml
index 6906d102..3633dd8e 100644
--- a/app/src/main/res/layout/layout_media.xml
+++ b/app/src/main/res/layout/layout_media.xml
@@ -20,6 +20,14 @@
         android:src="@drawable/ic_baseline_play_circle_filled_24"
         android:visibility="gone" />
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/play_music"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:src="@drawable/ic_baseline_audiotrack_24"
+        android:visibility="gone" />
+
     <ImageView
         android:id="@+id/view_hide"
         android:layout_width="24dp"
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 276a84b3..3676b0ce 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -3,8 +3,18 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height"
+    xmlns:tools="http://schemas.android.com/tools"
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
 
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/background_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:minHeight="@dimen/nav_header_height"
+        android:scaleType="centerCrop"
+        tools:src="@tools:sample/backgrounds/scenic" />
+
     <ImageView
         android:id="@+id/header_option_info"
         android:layout_width="wrap_content"
@@ -17,13 +27,6 @@
         android:src="@drawable/ic_baseline_more_vert_24"
         app:tint="?iconColor" />
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/background_image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:minHeight="@dimen/nav_header_height"
-        android:scaleType="centerCrop" />
-
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="180dp"
@@ -42,6 +45,7 @@
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/profile_picture"
             android:paddingTop="@dimen/nav_header_vertical_spacing"
+            tools:src="@tools:sample/avatars"
             android:scaleType="fitCenter" />
 
         <androidx.appcompat.widget.LinearLayoutCompat