diff options
| -rwxr-xr-x | org.fox.ttrss/src/main/res/layout/toolbar.xml | 7 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/values-night/style.xml | 2 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/values/style.xml | 14 |
3 files changed, 3 insertions, 20 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/toolbar.xml b/org.fox.ttrss/src/main/res/layout/toolbar.xml index 94aa1eec..2ad2bec7 100755 --- a/org.fox.ttrss/src/main/res/layout/toolbar.xml +++ b/org.fox.ttrss/src/main/res/layout/toolbar.xml @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.appcompat.widget.Toolbar +<com.google.android.material.appbar.MaterialToolbar xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/toolbar" android:elevation="4dp" app:layout_scrollFlags="scroll|enterAlways" - android:theme="@style/ThemeOverlay.Material3.Dark.ActionBar" - app:popupTheme="@style/ThemeOverlay.Material3.Light" android:layout_height="wrap_content" android:layout_width="match_parent" - android:minHeight="?attr/actionBarSize" - android:background="?attr/colorPrimary" />
\ No newline at end of file + android:minHeight="?attr/actionBarSize"/> diff --git a/org.fox.ttrss/src/main/res/values-night/style.xml b/org.fox.ttrss/src/main/res/values-night/style.xml index f4513cb2..16b97602 100644 --- a/org.fox.ttrss/src/main/res/values-night/style.xml +++ b/org.fox.ttrss/src/main/res/values-night/style.xml @@ -17,8 +17,6 @@ <item name="headlineFooterColor">?colorPrimary</item> <item name="articleHeaderSeparator">#303030</item> - <item name="colorPrimary">#1e6286</item> - <item name="colorPrimaryDark">#18506e</item> <item name="colorAccent">#D84315</item> <item name="ic_rss_box">@drawable/ic_rss_box</item> diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index 3569ec48..fe2fd77d 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -1,6 +1,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="AppTheme.Base" parent="Theme.Material3.DayNight"> + <style name="AppTheme.Base" parent="Theme.Material3.DynamicColors.DayNight"> <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> </style> @@ -23,12 +23,8 @@ <item name="headlineFooterColor">?colorPrimary</item> <item name="articleHeaderSeparator">#cccccc</item> - <item name="colorPrimary">#2786BA</item> - <item name="colorPrimaryDark">#216d96</item> <item name="colorAccent">#F4511E</item> - <item name="actionModeStyle">@style/action_mode_style</item> - <item name="ic_rss_box">@drawable/ic_rss_box_dark</item> <item name="ic_checkbox_marked">@drawable/ic_checkbox_marked_dark</item> <item name="ic_star">@drawable/ic_star_dark</item> @@ -57,12 +53,4 @@ <style name="DarkDialogTheme" parent="android:Theme"></style> - <style name="action_mode_style" parent="@style/Widget.Material3.ActionMode"> - <item name="background">?colorPrimaryDark</item> - <!-- selected articles count (number) color --> - <item name="titleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Title</item> - <!-- idk --> - <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle</item> - </style> - </resources>
\ No newline at end of file |