Mercurial Mercurial > geekttrss > geekttrss / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
app: start to cleanup styles.xml
authorDa Risk <da_risk@geekorum.com>
Sat, 20 Jul 2024 23:17:17 -0400
changeset 1285 ab373fa827c8
parent 1284 a052714469df
child 1286 7895c18a5055
app: start to cleanup styles.xml
app/src/main/res/values-night-v27/styles.xml file | annotate | diff | comparison | revisions
app/src/main/res/values-night/styles.xml file | annotate | diff | comparison | revisions
app/src/main/res/values-v27/styles.xml file | annotate | diff | comparison | revisions
app/src/main/res/values/styles.xml file | annotate | diff | comparison | revisions 
--- a/app/src/main/res/values-night-v27/styles.xml	Sat Jul 20 23:23:29 2024 -0400
+++ b/app/src/main/res/values-night-v27/styles.xml	Sat Jul 20 23:17:17 2024 -0400
@@ -26,7 +26,7 @@
     <style name="AppTheme.ArticleListActivity" parent="AppTheme.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:navigationBarColor">?android:colorBackground</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar">false</item>
         <item name="articleListHeader">@color/dark_color_primary_surface</item>
     </style>
@@ -34,7 +34,7 @@
     <style name="AppTheme.ArticleDetailActivity" parent="AppTheme.NoActionBar">
         <item name="android:statusBarColor">?android:windowBackground</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:navigationBarColor">?android:colorBackground</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 </resources>
--- a/app/src/main/res/values-night/styles.xml	Sat Jul 20 23:23:29 2024 -0400
+++ b/app/src/main/res/values-night/styles.xml	Sat Jul 20 23:17:17 2024 -0400
@@ -46,14 +46,8 @@
     </style>
 
     <style name="AppTheme.ArticleDetailActivity" parent="AppTheme.NoActionBar">
-        <item name="android:statusBarColor">?android:windowBackground</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">false</item>
     </style>
 
-    <!-- Widget styles -->
-    <style name="Widget.AppTheme.AppBar.CollapsingToolbar" parent="">
-        <item name="expandedTitleTextAppearance">@style/TextAppearance.AppTheme.CollapsingToolbar.Expanded.Surface</item>
-        <item name="collapsedTitleTextAppearance">@style/TextAppearance.AppTheme.CollapsingToolbar.Collapsed.Surface</item>
-    </style>
-
 </resources>
--- a/app/src/main/res/values-v27/styles.xml	Sat Jul 20 23:23:29 2024 -0400
+++ b/app/src/main/res/values-v27/styles.xml	Sat Jul 20 23:17:17 2024 -0400
@@ -25,14 +25,14 @@
     <style name="AppTheme.ArticleListActivity" parent="AppTheme.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:navigationBarColor">?android:colorBackground</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="articleListHeader">@color/material_blue_grey_500_lighter</item>
     </style>
 
     <style name="AppTheme.ArticleDetailActivity" parent="AppTheme.NoActionBar">
         <item name="android:statusBarColor">?android:windowBackground</item>
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">?android:colorBackground</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 </resources>
--- a/app/src/main/res/values/styles.xml	Sat Jul 20 23:23:29 2024 -0400
+++ b/app/src/main/res/values/styles.xml	Sat Jul 20 23:17:17 2024 -0400
@@ -23,14 +23,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
            xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Base.AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <item name="bottomAppBarStyle">@style/Widget.AppTheme.BottomAppBar</item>
+    <style name="Base.AppTheme" parent="Theme.Material3.DynamicColors.DayNight">
         <item name="materialAlertDialogTheme">@style/ThemeOverlay.AppTheme.AlertDialog</item>
-        <!-- This style needs to be applied manually in layout to have the correct theme overlay -->
-        <item name="appBarToolbarStyle">@style/Widget.AppTheme.AppBar.Toolbar</item>
-        <item name="appBarCollapsingToolbarStyle">@style/Widget.AppTheme.AppBar.CollapsingToolbar</item>
 
-        <item name="floatingActionButtonStyle">@style/Widget.AppTheme.FloatingActionButton</item>
         <item name="bottomSheetStyle">@style/Widget.MaterialComponents.BottomSheet</item>
         <!-- Shapes-->
         <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.AppTheme.SmallComponent</item>
@@ -85,7 +80,7 @@
     </style>
 
     <style name="AppTheme.ArticleDetailActivity" parent="AppTheme.NoActionBar">
-        <item name="android:statusBarColor">?android:windowBackground</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
@@ -115,27 +110,6 @@
     </style>
 
 
-    <!-- Widget styles -->
-
-    <style name="Widget.AppTheme.BottomAppBar" parent="Widget.MaterialComponents.BottomAppBar.PrimarySurface">
-        <item name="fabCradleMargin">8dp</item>
-        <item name="fabCradleRoundedCornerRadius">32dp</item>
-    </style>
-
-    <style name="Widget.AppTheme.AppBar.Toolbar" parent="Widget.MaterialComponents.Toolbar.PrimarySurface">
-        <item name="background">@null</item>
-    </style>
-
-    <style name="Widget.AppTheme.AppBar.CollapsingToolbar" parent="">
-        <item name="expandedTitleTextAppearance">@style/TextAppearance.AppTheme.CollapsingToolbar.Expanded</item>
-        <item name="collapsedTitleTextAppearance">@style/TextAppearance.AppTheme.CollapsingToolbar.Collapsed</item>
-    </style>
-
-    <style name="Widget.AppTheme.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
-        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.AppTheme.FloatingActionButton</item>
-    </style>
-
-
     <!-- Text appearances -->
     <style name="TextAppearance.AppTheme.Headline4" parent="TextAppearance.MaterialComponents.Headline4">
         <item name="fontFamily">@font/expletus_sans_medium</item>
Geekttrss