From fe4c67aa973ee41ffcb5b3b7fd6d346b453242d1 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Fri, 27 Dec 2024 14:43:13 +0700
Subject: [PATCH] layout: Drop theme attribute from toolbar

Conflicts with DynamicTheme in dark mode

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 app/src/main/res/layout-land/fragment_about.xml           | 1 -
 app/src/main/res/layout-land/fragment_account.xml         | 1 -
 app/src/main/res/layout-land/fragment_installer.xml       | 3 +--
 app/src/main/res/layout-land/fragment_splash.xml          | 1 -
 app/src/main/res/layout/fragment_about.xml                | 1 -
 app/src/main/res/layout/fragment_account.xml              | 1 -
 app/src/main/res/layout/fragment_apps_games.xml           | 1 -
 app/src/main/res/layout/fragment_details.xml              | 1 -
 app/src/main/res/layout/fragment_details_more.xml         | 1 -
 app/src/main/res/layout/fragment_details_review.xml       | 1 -
 app/src/main/res/layout/fragment_dev_profile.xml          | 1 -
 app/src/main/res/layout/fragment_dispenser.xml            | 1 -
 app/src/main/res/layout/fragment_download.xml             | 1 -
 app/src/main/res/layout/fragment_favourite.xml            | 3 +--
 app/src/main/res/layout/fragment_generic_with_search.xml  | 1 -
 app/src/main/res/layout/fragment_generic_with_toolbar.xml | 1 -
 app/src/main/res/layout/fragment_installer.xml            | 3 +--
 app/src/main/res/layout/fragment_search_result.xml        | 1 -
 app/src/main/res/layout/fragment_search_suggestion.xml    | 1 -
 app/src/main/res/layout/fragment_splash.xml               | 1 -
 app/src/main/res/layout/fragment_spoof.xml                | 1 -
 app/src/main/res/layout/fragment_updates.xml              | 1 -
 22 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/app/src/main/res/layout-land/fragment_about.xml b/app/src/main/res/layout-land/fragment_about.xml
index 3f97cc0f5..96b974ce6 100644
--- a/app/src/main/res/layout-land/fragment_about.xml
+++ b/app/src/main/res/layout-land/fragment_about.xml
@@ -32,7 +32,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:navigationIcon="@drawable/ic_arrow_back"
         app:title="@string/title_about" />
 
diff --git a/app/src/main/res/layout-land/fragment_account.xml b/app/src/main/res/layout-land/fragment_account.xml
index bb0e42a82..e528df593 100644
--- a/app/src/main/res/layout-land/fragment_account.xml
+++ b/app/src/main/res/layout-land/fragment_account.xml
@@ -32,7 +32,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:navigationIcon="@drawable/ic_arrow_back"
         app:title="@string/title_account_manager" />
 
diff --git a/app/src/main/res/layout-land/fragment_installer.xml b/app/src/main/res/layout-land/fragment_installer.xml
index 863301a28..723aa2997 100644
--- a/app/src/main/res/layout-land/fragment_installer.xml
+++ b/app/src/main/res/layout-land/fragment_installer.xml
@@ -31,7 +31,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:navigationIcon="@drawable/ic_arrow_back"
         app:title="@string/pref_install_mode_title" />
 
@@ -45,4 +44,4 @@
         android:scrollbars="none"
         app:itemSpacing="@dimen/margin_small"
         tools:listitem="@layout/view_installer" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_splash.xml b/app/src/main/res/layout-land/fragment_splash.xml
index 1dd28284d..0ad7e4468 100644
--- a/app/src/main/res/layout-land/fragment_splash.xml
+++ b/app/src/main/res/layout-land/fragment_splash.xml
@@ -33,7 +33,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:menu="@menu/menu_splash" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index e00babed5..d06e9945a 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -31,7 +31,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:navigationIcon="@drawable/ic_arrow_back"
         app:title="@string/title_about" />
 
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index ec1e2a6f3..ec65b74b1 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -33,7 +33,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:navigationIcon="@drawable/ic_arrow_back"
         app:title="@string/title_account_manager" />
 
diff --git a/app/src/main/res/layout/fragment_apps_games.xml b/app/src/main/res/layout/fragment_apps_games.xml
index 0bbc4fa1b..f523e9050 100644
--- a/app/src/main/res/layout/fragment_apps_games.xml
+++ b/app/src/main/res/layout/fragment_apps_games.xml
@@ -28,7 +28,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:menu="@menu/menu_main" />
 
     <com.google.android.material.tabs.TabLayout
diff --git a/app/src/main/res/layout/fragment_details.xml b/app/src/main/res/layout/fragment_details.xml
index d3b6468e7..e5159311e 100644
--- a/app/src/main/res/layout/fragment_details.xml
+++ b/app/src/main/res/layout/fragment_details.xml
@@ -36,7 +36,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
-            android:theme="?attr/actionBarTheme"
             app:menu="@menu/menu_details"
             app:navigationIcon="@drawable/ic_arrow_back" />
 
diff --git a/app/src/main/res/layout/fragment_details_more.xml b/app/src/main/res/layout/fragment_details_more.xml
index 2519b71bc..174611bea 100644
--- a/app/src/main/res/layout/fragment_details_more.xml
+++ b/app/src/main/res/layout/fragment_details_more.xml
@@ -30,7 +30,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:navigationIcon="@drawable/ic_arrow_back" />
 
     <androidx.core.widget.NestedScrollView
diff --git a/app/src/main/res/layout/fragment_details_review.xml b/app/src/main/res/layout/fragment_details_review.xml
index 75f4ba8ce..4c9a52450 100644
--- a/app/src/main/res/layout/fragment_details_review.xml
+++ b/app/src/main/res/layout/fragment_details_review.xml
@@ -30,7 +30,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:navigationIcon="@drawable/ic_arrow_back" />
 
     <HorizontalScrollView
diff --git a/app/src/main/res/layout/fragment_dev_profile.xml b/app/src/main/res/layout/fragment_dev_profile.xml
index 5a79228c6..8cb0f61ad 100644
--- a/app/src/main/res/layout/fragment_dev_profile.xml
+++ b/app/src/main/res/layout/fragment_dev_profile.xml
@@ -32,7 +32,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:navigationIcon="@drawable/ic_arrow_back" />
 
     <ViewFlipper
diff --git a/app/src/main/res/layout/fragment_dispenser.xml b/app/src/main/res/layout/fragment_dispenser.xml
index 00fcff0ea..7ecc2b910 100644
--- a/app/src/main/res/layout/fragment_dispenser.xml
+++ b/app/src/main/res/layout/fragment_dispenser.xml
@@ -11,7 +11,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/fragment_download.xml b/app/src/main/res/layout/fragment_download.xml
index abbb3894a..c3475aafa 100644
--- a/app/src/main/res/layout/fragment_download.xml
+++ b/app/src/main/res/layout/fragment_download.xml
@@ -30,7 +30,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:menu="@menu/menu_download_main"
         app:navigationIcon="@drawable/ic_arrow_back"
         app:title="@string/title_download_manager" />
diff --git a/app/src/main/res/layout/fragment_favourite.xml b/app/src/main/res/layout/fragment_favourite.xml
index 383bac657..0bd7c51f5 100644
--- a/app/src/main/res/layout/fragment_favourite.xml
+++ b/app/src/main/res/layout/fragment_favourite.xml
@@ -29,7 +29,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:menu="@menu/menu_import_export"
         app:navigationIcon="@drawable/ic_arrow_back"
         app:title="@string/title_favourites_manager" />
@@ -44,4 +43,4 @@
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listitem="@layout/view_app_list"
         app:stackFromEnd="false" />
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_generic_with_search.xml b/app/src/main/res/layout/fragment_generic_with_search.xml
index 9289fbf15..4f208bd5a 100644
--- a/app/src/main/res/layout/fragment_generic_with_search.xml
+++ b/app/src/main/res/layout/fragment_generic_with_search.xml
@@ -29,7 +29,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:navigationIcon="@drawable/ic_arrow_back">
 
         <com.google.android.material.textfield.TextInputEditText
diff --git a/app/src/main/res/layout/fragment_generic_with_toolbar.xml b/app/src/main/res/layout/fragment_generic_with_toolbar.xml
index af5f55429..e4ec2f41c 100644
--- a/app/src/main/res/layout/fragment_generic_with_toolbar.xml
+++ b/app/src/main/res/layout/fragment_generic_with_toolbar.xml
@@ -28,7 +28,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:navigationIcon="@drawable/ic_arrow_back" />
 
     <com.airbnb.epoxy.EpoxyRecyclerView
diff --git a/app/src/main/res/layout/fragment_installer.xml b/app/src/main/res/layout/fragment_installer.xml
index ae013c7e6..c41ea459b 100644
--- a/app/src/main/res/layout/fragment_installer.xml
+++ b/app/src/main/res/layout/fragment_installer.xml
@@ -31,7 +31,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:navigationIcon="@drawable/ic_arrow_back"
         app:title="@string/pref_install_mode_title" />
 
@@ -46,4 +45,4 @@
         app:itemSpacing="@dimen/margin_small"
         tools:listitem="@layout/view_installer" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_search_result.xml b/app/src/main/res/layout/fragment_search_result.xml
index 6f96a2055..27ca80b36 100644
--- a/app/src/main/res/layout/fragment_search_result.xml
+++ b/app/src/main/res/layout/fragment_search_result.xml
@@ -35,7 +35,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
-            android:theme="?attr/actionBarTheme"
             app:menu="@menu/menu_search"
             app:navigationIcon="@drawable/ic_arrow_back">
 
diff --git a/app/src/main/res/layout/fragment_search_suggestion.xml b/app/src/main/res/layout/fragment_search_suggestion.xml
index c8414ea82..ca8e29ccf 100644
--- a/app/src/main/res/layout/fragment_search_suggestion.xml
+++ b/app/src/main/res/layout/fragment_search_suggestion.xml
@@ -35,7 +35,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
-            android:theme="?attr/actionBarTheme"
             app:menu="@menu/menu_search"
             app:navigationIcon="@drawable/ic_arrow_back">
 
diff --git a/app/src/main/res/layout/fragment_splash.xml b/app/src/main/res/layout/fragment_splash.xml
index 1b81ecfc6..28064a419 100644
--- a/app/src/main/res/layout/fragment_splash.xml
+++ b/app/src/main/res/layout/fragment_splash.xml
@@ -33,7 +33,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:menu="@menu/menu_splash" />
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_spoof.xml b/app/src/main/res/layout/fragment_spoof.xml
index e50ab8bc5..70d3b864d 100644
--- a/app/src/main/res/layout/fragment_spoof.xml
+++ b/app/src/main/res/layout/fragment_spoof.xml
@@ -27,7 +27,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:menu="@menu/menu_import_export"
         app:navigationIcon="@drawable/ic_arrow_back"
         app:title="@string/title_spoof_manager" />
diff --git a/app/src/main/res/layout/fragment_updates.xml b/app/src/main/res/layout/fragment_updates.xml
index 1ee6c8410..3e18b35cd 100644
--- a/app/src/main/res/layout/fragment_updates.xml
+++ b/app/src/main/res/layout/fragment_updates.xml
@@ -29,7 +29,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
         app:menu="@menu/menu_main"
         app:title="@string/title_updates" />