From e29a722cfb709f3d74ea49307248d5c28843f9e4 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 1 Aug 2022 18:21:05 +0200
Subject: [PATCH] Improve theming

---
 .../android/ui/drawer/ReorderBottomMenuAdapter.java       | 5 +----
 .../app/fedilab/android/ui/drawer/ReorderTabAdapter.java  | 5 +----
 app/src/main/res/layout/activity_profile.xml              | 8 ++++----
 app/src/main/res/layout/activity_scheduled.xml            | 4 ++--
 app/src/main/res/layout/activity_search_result_tabs.xml   | 2 +-
 app/src/main/res/layout/activity_trends.xml               | 2 +-
 app/src/main/res/layout/drawer_account.xml                | 3 ++-
 app/src/main/res/layout/drawer_reorder.xml                | 1 +
 app/src/main/res/layout/drawer_tag.xml                    | 3 ++-
 .../main/res/layout/fragment_notification_container.xml   | 4 ++--
 app/src/main/res/layout/fragment_profile_timelines.xml    | 1 +
 app/src/main/res/layout/fragment_scheduled.xml            | 3 +--
 12 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ReorderBottomMenuAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ReorderBottomMenuAdapter.java
index 276d99e08..5d0e4dd01 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ReorderBottomMenuAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ReorderBottomMenuAdapter.java
@@ -22,7 +22,6 @@ import android.view.MotionEvent;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
-import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.jetbrains.annotations.NotNull;
@@ -161,7 +160,7 @@ public class ReorderBottomMenuAdapter extends RecyclerView.Adapter<RecyclerView.
      * Simple example of a view holder that implements {@link ItemTouchHelperViewHolder} and has a
      * "handle" view that initiates a drag event when touched.
      */
-    public class ReorderViewHolder extends RecyclerView.ViewHolder implements ItemTouchHelperViewHolder {
+    public static class ReorderViewHolder extends RecyclerView.ViewHolder implements ItemTouchHelperViewHolder {
 
         DrawerReorderBinding binding;
 
@@ -172,12 +171,10 @@ public class ReorderBottomMenuAdapter extends RecyclerView.Adapter<RecyclerView.
 
         @Override
         public void onItemSelected() {
-            itemView.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC3));
         }
 
         @Override
         public void onItemClear() {
-            itemView.setBackgroundColor(0);
         }
     }
 }
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ReorderTabAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ReorderTabAdapter.java
index 9011a4a59..249ef232a 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ReorderTabAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ReorderTabAdapter.java
@@ -22,7 +22,6 @@ import android.view.MotionEvent;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
-import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.jetbrains.annotations.NotNull;
@@ -183,7 +182,7 @@ public class ReorderTabAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
      * Simple example of a view holder that implements {@link ItemTouchHelperViewHolder} and has a
      * "handle" view that initiates a drag event when touched.
      */
-    public class ReorderViewHolder extends RecyclerView.ViewHolder implements ItemTouchHelperViewHolder {
+    public static class ReorderViewHolder extends RecyclerView.ViewHolder implements ItemTouchHelperViewHolder {
 
         DrawerReorderBinding binding;
 
@@ -194,12 +193,10 @@ public class ReorderTabAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
         @Override
         public void onItemSelected() {
-            itemView.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC3));
         }
 
         @Override
         public void onItemClear() {
-            itemView.setBackgroundColor(0);
         }
     }
 }
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index a3382e4b5..3906fad4f 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -24,7 +24,7 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
-        android:backgroundTint="?backgroundColorLight"
+        android:background="@color/cyanea_primary_dark_reference"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fitsSystemWindows="true">
@@ -32,7 +32,7 @@
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:backgroundTint="?backgroundColorLight"
+            android:background="@color/cyanea_primary_dark_reference"
             app:contentScrim="?colorPrimaryDark"
             android:fitsSystemWindows="true"
             app:expandedTitleGravity="top"
@@ -344,7 +344,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:backgroundTint="?colorPrimaryDark"
+                android:background="@color/cyanea_primary_dark_reference"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:layout_collapseMode="pin">
 
@@ -372,7 +372,7 @@
             android:id="@+id/account_tabLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?backgroundColorLight"
+            android:background="@color/cyanea_primary_dark_reference"
             app:tabGravity="fill"
             app:tabMode="fixed" />
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/activity_scheduled.xml b/app/src/main/res/layout/activity_scheduled.xml
index e3baabf6a..a33806674 100644
--- a/app/src/main/res/layout/activity_scheduled.xml
+++ b/app/src/main/res/layout/activity_scheduled.xml
@@ -24,7 +24,7 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
-        android:background="@color/cyanea_primary_reference"
+        android:background="@color/cyanea_primary_dark_reference"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fitsSystemWindows="true">
@@ -57,7 +57,7 @@
             android:id="@+id/schedule_tablayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?backgroundColorLight"
+            android:background="@color/cyanea_primary_dark_reference"
             app:tabGravity="fill"
             app:tabMode="scrollable" />
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/activity_search_result_tabs.xml b/app/src/main/res/layout/activity_search_result_tabs.xml
index 397c8e66b..6201b00d8 100644
--- a/app/src/main/res/layout/activity_search_result_tabs.xml
+++ b/app/src/main/res/layout/activity_search_result_tabs.xml
@@ -26,7 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tabGravity="fill"
-        android:background="?backgroundColorLight"
+        android:background="@color/cyanea_primary_dark_reference"
         app:tabIndicatorColor="@color/cyanea_accent_dark_reference"
         app:tabMode="scrollable" />
 
diff --git a/app/src/main/res/layout/activity_trends.xml b/app/src/main/res/layout/activity_trends.xml
index 75ea988a0..c4fa4f4e6 100644
--- a/app/src/main/res/layout/activity_trends.xml
+++ b/app/src/main/res/layout/activity_trends.xml
@@ -25,7 +25,7 @@
         android:id="@+id/search_tabLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?backgroundColorLight"
+        android:background="@color/cyanea_primary_dark_reference"
         app:tabGravity="fill"
         app:tabIndicatorColor="@color/cyanea_accent_dark_reference"
         app:tabMode="fixed" />
diff --git a/app/src/main/res/layout/drawer_account.xml b/app/src/main/res/layout/drawer_account.xml
index eb3b454a0..8b9fe8287 100644
--- a/app/src/main/res/layout/drawer_account.xml
+++ b/app/src/main/res/layout/drawer_account.xml
@@ -20,8 +20,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="6dp"
+    android:backgroundTint="@color/cyanea_primary_dark_reference"
     android:layout_marginTop="6dp"
-    app:cardElevation="2dp">
+    app:cardElevation="0dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/drawer_reorder.xml b/app/src/main/res/layout/drawer_reorder.xml
index f45ec75a6..b437a4ace 100644
--- a/app/src/main/res/layout/drawer_reorder.xml
+++ b/app/src/main/res/layout/drawer_reorder.xml
@@ -5,6 +5,7 @@
     android:layout_height="wrap_content"
     android:clickable="true"
     android:focusable="true"
+    android:background="@color/cyanea_primary_dark_reference"
     android:foreground="?selectableItemBackground">
 
     <androidx.appcompat.widget.LinearLayoutCompat
diff --git a/app/src/main/res/layout/drawer_tag.xml b/app/src/main/res/layout/drawer_tag.xml
index 10189c4c6..d12686837 100644
--- a/app/src/main/res/layout/drawer_tag.xml
+++ b/app/src/main/res/layout/drawer_tag.xml
@@ -19,7 +19,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="12dp"
-    app:cardElevation="2dp">
+    android:backgroundTint="@color/cyanea_primary_dark_reference"
+    app:cardElevation="0dp">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_notification_container.xml b/app/src/main/res/layout/fragment_notification_container.xml
index d6a85ace3..48c4c2988 100644
--- a/app/src/main/res/layout/fragment_notification_container.xml
+++ b/app/src/main/res/layout/fragment_notification_container.xml
@@ -30,7 +30,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="?backgroundColorLight"
+            android:background="@color/cyanea_primary_dark_reference"
             app:tabIndicatorColor="@color/cyanea_accent_dark_reference"
             app:tabGravity="fill"
             app:tabMaxWidth="0dp" />
@@ -38,7 +38,7 @@
         <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/settings"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
-            android:background="?backgroundColorLight"
+            android:background="@color/cyanea_primary_dark_reference"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_profile_timelines.xml b/app/src/main/res/layout/fragment_profile_timelines.xml
index 225f40722..e1af89704 100644
--- a/app/src/main/res/layout/fragment_profile_timelines.xml
+++ b/app/src/main/res/layout/fragment_profile_timelines.xml
@@ -24,6 +24,7 @@
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/cyanea_primary_dark_reference"
         app:tabGravity="fill"
         app:tabMaxWidth="0dp" />
 
diff --git a/app/src/main/res/layout/fragment_scheduled.xml b/app/src/main/res/layout/fragment_scheduled.xml
index 84299d675..0a53c7dc9 100644
--- a/app/src/main/res/layout/fragment_scheduled.xml
+++ b/app/src/main/res/layout/fragment_scheduled.xml
@@ -16,8 +16,7 @@
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?backgroundColorLight">
+    android:layout_height="match_parent">
 
     <!-- Listview status -->
     <FrameLayout