From 4e822c9a0a3bae055a5b830f1347f1df8f251b9b Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Wed, 17 Apr 2024 18:41:51 +0200
Subject: [PATCH] larger background for toolbar icons in AccountActivity
 (#4375)

Looks way better.
[I also wanted to change the color of the status bar, but nobody seems
to like it](https://chaos.social/@ConnyDuck/112178196967742268), so
let's leave it.

before/after
<img
src="https://github.com/tuskyapp/Tusky/assets/10157047/4e93c722-c1a3-4fc4-808f-037a1398a944"
width="260"/> <img
src="https://github.com/tuskyapp/Tusky/assets/10157047/2a58785b-d3f4-4613-9bd9-0e09436f7142"
width="260"/>
---
 .../components/account/AccountActivity.kt     | 19 +++----------------
 .../main/res/drawable/background_circle.xml   |  4 ++--
 app/src/main/res/drawable/ic_arrow_back.xml   | 11 +++++++++++
 .../ic_arrow_back_with_background.xml         | 12 ++++++++++++
 app/src/main/res/drawable/ic_more.xml         | 10 ++++++++++
 .../res/drawable/ic_more_with_background.xml  | 12 ++++++++++++
 .../main/res/values-night/theme_colors.xml    |  2 ++
 app/src/main/res/values/theme_colors.xml      |  2 ++
 8 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_arrow_back.xml
 create mode 100644 app/src/main/res/drawable/ic_arrow_back_with_background.xml
 create mode 100644 app/src/main/res/drawable/ic_more.xml
 create mode 100644 app/src/main/res/drawable/ic_more_with_background.xml

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
index 58e514387..88ea5ba96 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
@@ -23,7 +23,6 @@ import android.content.Intent
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.graphics.Typeface
-import android.graphics.drawable.LayerDrawable
 import android.os.Bundle
 import android.text.SpannableStringBuilder
 import android.text.TextWatcher
@@ -345,21 +344,9 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide
         toolbarBackground.fillColor = ColorStateList.valueOf(Color.TRANSPARENT)
         binding.accountToolbar.background = toolbarBackground
 
-        // Provide a non-transparent background to the navigation and overflow icons to ensure
-        // they remain visible over whatever the profile background image might be.
-        val backgroundCircle = AppCompatResources.getDrawable(this, R.drawable.background_circle)!!
-        backgroundCircle.alpha = 210 // Any lower than this and the backgrounds interfere
-        binding.accountToolbar.navigationIcon = LayerDrawable(
-            arrayOf(
-                backgroundCircle,
-                binding.accountToolbar.navigationIcon
-            )
-        )
-        binding.accountToolbar.overflowIcon = LayerDrawable(
-            arrayOf(
-                backgroundCircle,
-                binding.accountToolbar.overflowIcon
-            )
+        binding.accountToolbar.setNavigationIcon(R.drawable.ic_arrow_back_with_background)
+        binding.accountToolbar.setOverflowIcon(
+            AppCompatResources.getDrawable(this, R.drawable.ic_more_with_background)
         )
 
         binding.accountHeaderInfoContainer.background = MaterialShapeDrawable.createWithElevationOverlay(this, appBarElevation)
diff --git a/app/src/main/res/drawable/background_circle.xml b/app/src/main/res/drawable/background_circle.xml
index e10c97565..923aaee68 100644
--- a/app/src/main/res/drawable/background_circle.xml
+++ b/app/src/main/res/drawable/background_circle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="?attr/colorSurface" />
+    android:shape="oval" >
+    <solid android:color="@color/toolbar_icon_background" />
 </shape>
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
new file mode 100644
index 000000000..89d18543f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_back_with_background.xml b/app/src/main/res/drawable/ic_arrow_back_with_background.xml
new file mode 100644
index 000000000..1a4d711f0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back_with_background.xml
@@ -0,0 +1,12 @@
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/background_circle" android:width="32dp" android:height="32dp"/>
+
+    <item android:drawable="@drawable/ic_arrow_back"
+        android:top="4dp"
+        android:bottom="4dp"
+        android:left="4dp"
+        android:right="4dp"/>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml
new file mode 100644
index 000000000..f84f9b3f1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_with_background.xml b/app/src/main/res/drawable/ic_more_with_background.xml
new file mode 100644
index 000000000..755b37298
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_with_background.xml
@@ -0,0 +1,12 @@
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/background_circle" android:width="32dp" android:height="32dp"/>
+
+    <item android:drawable="@drawable/ic_more"
+        android:top="4dp"
+        android:bottom="4dp"
+        android:left="4dp"
+        android:right="4dp"/>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/theme_colors.xml b/app/src/main/res/values-night/theme_colors.xml
index 57f15799b..e47febfcb 100644
--- a/app/src/main/res/values-night/theme_colors.xml
+++ b/app/src/main/res/values-night/theme_colors.xml
@@ -28,6 +28,8 @@
     <color name="botBadgeForeground">@color/white</color>
     <color name="botBadgeBackground">@color/tusky_grey_10</color>
 
+    <color name="toolbar_icon_background">#CC444B5D</color>
+
     <!-- colors used to show inserted/deleted text -->
     <color name="view_edits_background_insert">#00731B</color>
     <color name="view_edits_background_delete">#DF0000</color>
diff --git a/app/src/main/res/values/theme_colors.xml b/app/src/main/res/values/theme_colors.xml
index 32f2727fd..a309873fb 100644
--- a/app/src/main/res/values/theme_colors.xml
+++ b/app/src/main/res/values/theme_colors.xml
@@ -28,6 +28,8 @@
     <color name="botBadgeForeground">@color/tusky_grey_20</color>
     <color name="botBadgeBackground">@color/white</color>
 
+    <color name="toolbar_icon_background">#CCEBEFF4</color>
+
     <!-- colors used to show inserted/deleted text -->
     <color name="view_edits_background_insert">#CCFFD8</color>
     <color name="view_edits_background_delete">#FFC0C0</color>