Merge branch 'protected/spring-cleaning' into 'master'

Protected/spring cleaning

See merge request tt-rss/tt-rss-android!29

5 files changed, 342 insertions, 178 deletions

diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index 93892545..daf2323c 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -1,35 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="ttrssHorizontalDivider" format="reference|color" />
-    <attr name="feedlistBackground" format="reference|color" />
-    <attr name="unreadCounterColor" format="reference|color" />
-    <attr name="headlinesBackground" format="reference|color" />
-    <attr name="articleBackground" format="reference|color" />
-    <attr name="headlineSelectedBackground" format="reference|color" />
-    <attr name="headlineUnreadBackground" format="reference|color" />
-    <attr name="feedsSelectedBackground" format="reference|color" />
-    <attr name="feedlistTextColor" format="reference|color" />
-    <attr name="feedlistSelectedTextColor" format="reference|color" />
-    <!-- <attr name="headlineTextColor" format="reference|color" /> -->
-    <attr name="headlineHeaderBackground" format="reference|color" />
-    <attr name="headlineUnreadTextColor" format="reference|color" />
-    <attr name="headlineSelectedTextColor" format="reference|color" />    
-    <attr name="headlineExcerptTextColor" format="reference|color" />
-    <attr name="headlineSecondaryTextColor" format="reference|color" />
-    <attr name="headlineSelectedSecondaryTextColor" format="reference|color" />
-    <attr name="headlineSelectedExcerptTextColor" format="reference|color" />
-    <attr name="headlineTitleHighScoreUnreadTextColor" format="reference|color" />
-    <attr name="linkColor" format="reference|color" />
-    <attr name="loadingBackground" format="reference|color" />
-    <attr name="articleNoteBackground" format="reference|color" />
-    <attr name="articleNoteTextColor" format="reference|color" />
-    <!-- <attr name="statusBarHintColor" format="reference|color" /> -->
-    <attr name="parentBtnBackground" format="reference|color" />
-    <attr name="articleHeader" format="reference|color" />
-    <attr name="articleHeaderTextColor" format="reference|color" />
-    <attr name="articleTextColor" format="reference|color" />
-    <attr name="headlineFooterColor" format="reference|color" />
-    <attr name="articleHeaderSeparator" format="reference|color" />
     <attr name="ic_rss_box" format="reference"/>
     <attr name="ic_checkbox_marked" format="reference" />
     <attr name="ic_star" format="reference" />
diff --git a/org.fox.ttrss/src/main/res/values/colors.xml b/org.fox.ttrss/src/main/res/values/colors.xml
index d87ac346..795cbaec 100755..100644
--- a/org.fox.ttrss/src/main/res/values/colors.xml
+++ b/org.fox.ttrss/src/main/res/values/colors.xml
@@ -1,6 +1,143 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item name="window_background" type="color">#216d96</item>
-    <item name="window_background_dark" type="color">#18506e</item>
-    <item name="window_background_amber" type="color">#6e4b1a</item>
-</resources>
\ No newline at end of file
+    <color name="md_theme_primary">#226488</color>
+    <color name="md_theme_onPrimary">#FFFFFF</color>
+    <color name="md_theme_primaryContainer">#C7E7FF</color>
+    <color name="md_theme_onPrimaryContainer">#004C6C</color>
+    <color name="md_theme_secondary">#4F616E</color>
+    <color name="md_theme_onSecondary">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer">#D2E5F5</color>
+    <color name="md_theme_onSecondaryContainer">#374955</color>
+    <color name="md_theme_tertiary">#8F4B38</color>
+    <color name="md_theme_onTertiary">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer">#FFDBD1</color>
+    <color name="md_theme_onTertiaryContainer">#723523</color>
+    <color name="md_theme_error">#BA1A1A</color>
+    <color name="md_theme_onError">#FFFFFF</color>
+    <color name="md_theme_errorContainer">#FFDAD6</color>
+    <color name="md_theme_onErrorContainer">#93000A</color>
+    <color name="md_theme_background">#F6FAFE</color>
+    <color name="md_theme_onBackground">#181C20</color>
+    <color name="md_theme_surface">#F6FAFE</color>
+    <color name="md_theme_onSurface">#181C20</color>
+    <color name="md_theme_surfaceVariant">#DDE3EA</color>
+    <color name="md_theme_onSurfaceVariant">#41484D</color>
+    <color name="md_theme_outline">#71787E</color>
+    <color name="md_theme_outlineVariant">#C1C7CE</color>
+    <color name="md_theme_scrim">#000000</color>
+    <color name="md_theme_inverseSurface">#2D3135</color>
+    <color name="md_theme_inverseOnSurface">#EEF1F6</color>
+    <color name="md_theme_inversePrimary">#93CDF6</color>
+    <color name="md_theme_primaryFixed">#C7E7FF</color>
+    <color name="md_theme_onPrimaryFixed">#001E2E</color>
+    <color name="md_theme_primaryFixedDim">#93CDF6</color>
+    <color name="md_theme_onPrimaryFixedVariant">#004C6C</color>
+    <color name="md_theme_secondaryFixed">#D2E5F5</color>
+    <color name="md_theme_onSecondaryFixed">#0B1D29</color>
+    <color name="md_theme_secondaryFixedDim">#B6C9D8</color>
+    <color name="md_theme_onSecondaryFixedVariant">#374955</color>
+    <color name="md_theme_tertiaryFixed">#FFDBD1</color>
+    <color name="md_theme_onTertiaryFixed">#3A0B01</color>
+    <color name="md_theme_tertiaryFixedDim">#FFB5A0</color>
+    <color name="md_theme_onTertiaryFixedVariant">#723523</color>
+    <color name="md_theme_surfaceDim">#D7DADF</color>
+    <color name="md_theme_surfaceBright">#F6FAFE</color>
+    <color name="md_theme_surfaceContainerLowest">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow">#F1F4F9</color>
+    <color name="md_theme_surfaceContainer">#EBEEF3</color>
+    <color name="md_theme_surfaceContainerHigh">#E5E8ED</color>
+    <color name="md_theme_surfaceContainerHighest">#DFE3E7</color>
+    <color name="md_theme_primary_mediumContrast">#003A54</color>
+    <color name="md_theme_onPrimary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_primaryContainer_mediumContrast">#357397</color>
+    <color name="md_theme_onPrimaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondary_mediumContrast">#273844</color>
+    <color name="md_theme_onSecondary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer_mediumContrast">#5E6F7D</color>
+    <color name="md_theme_onSecondaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiary_mediumContrast">#5D2515</color>
+    <color name="md_theme_onTertiary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer_mediumContrast">#A15A46</color>
+    <color name="md_theme_onTertiaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_error_mediumContrast">#740006</color>
+    <color name="md_theme_onError_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_errorContainer_mediumContrast">#CF2C27</color>
+    <color name="md_theme_onErrorContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_background_mediumContrast">#F6FAFE</color>
+    <color name="md_theme_onBackground_mediumContrast">#181C20</color>
+    <color name="md_theme_surface_mediumContrast">#F6FAFE</color>
+    <color name="md_theme_onSurface_mediumContrast">#0D1215</color>
+    <color name="md_theme_surfaceVariant_mediumContrast">#DDE3EA</color>
+    <color name="md_theme_onSurfaceVariant_mediumContrast">#30373C</color>
+    <color name="md_theme_outline_mediumContrast">#4D5359</color>
+    <color name="md_theme_outlineVariant_mediumContrast">#676E74</color>
+    <color name="md_theme_scrim_mediumContrast">#000000</color>
+    <color name="md_theme_inverseSurface_mediumContrast">#2D3135</color>
+    <color name="md_theme_inverseOnSurface_mediumContrast">#EEF1F6</color>
+    <color name="md_theme_inversePrimary_mediumContrast">#93CDF6</color>
+    <color name="md_theme_primaryFixed_mediumContrast">#357397</color>
+    <color name="md_theme_onPrimaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_primaryFixedDim_mediumContrast">#135A7E</color>
+    <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixed_mediumContrast">#5E6F7D</color>
+    <color name="md_theme_onSecondaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixedDim_mediumContrast">#455764</color>
+    <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixed_mediumContrast">#A15A46</color>
+    <color name="md_theme_onTertiaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixedDim_mediumContrast">#844230</color>
+    <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceDim_mediumContrast">#C3C7CB</color>
+    <color name="md_theme_surfaceBright_mediumContrast">#F6FAFE</color>
+    <color name="md_theme_surfaceContainerLowest_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow_mediumContrast">#F1F4F9</color>
+    <color name="md_theme_surfaceContainer_mediumContrast">#E5E8ED</color>
+    <color name="md_theme_surfaceContainerHigh_mediumContrast">#DADDE2</color>
+    <color name="md_theme_surfaceContainerHighest_mediumContrast">#CED2D7</color>
+    <color name="md_theme_primary_highContrast">#003046</color>
+    <color name="md_theme_onPrimary_highContrast">#FFFFFF</color>
+    <color name="md_theme_primaryContainer_highContrast">#004E70</color>
+    <color name="md_theme_onPrimaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondary_highContrast">#1D2E3A</color>
+    <color name="md_theme_onSecondary_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer_highContrast">#3A4B58</color>
+    <color name="md_theme_onSecondaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiary_highContrast">#501B0C</color>
+    <color name="md_theme_onTertiary_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer_highContrast">#753725</color>
+    <color name="md_theme_onTertiaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_error_highContrast">#600004</color>
+    <color name="md_theme_onError_highContrast">#FFFFFF</color>
+    <color name="md_theme_errorContainer_highContrast">#98000A</color>
+    <color name="md_theme_onErrorContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_background_highContrast">#F6FAFE</color>
+    <color name="md_theme_onBackground_highContrast">#181C20</color>
+    <color name="md_theme_surface_highContrast">#F6FAFE</color>
+    <color name="md_theme_onSurface_highContrast">#000000</color>
+    <color name="md_theme_surfaceVariant_highContrast">#DDE3EA</color>
+    <color name="md_theme_onSurfaceVariant_highContrast">#000000</color>
+    <color name="md_theme_outline_highContrast">#262D32</color>
+    <color name="md_theme_outlineVariant_highContrast">#434A50</color>
+    <color name="md_theme_scrim_highContrast">#000000</color>
+    <color name="md_theme_inverseSurface_highContrast">#2D3135</color>
+    <color name="md_theme_inverseOnSurface_highContrast">#FFFFFF</color>
+    <color name="md_theme_inversePrimary_highContrast">#93CDF6</color>
+    <color name="md_theme_primaryFixed_highContrast">#004E70</color>
+    <color name="md_theme_onPrimaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_primaryFixedDim_highContrast">#00374F</color>
+    <color name="md_theme_onPrimaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixed_highContrast">#3A4B58</color>
+    <color name="md_theme_onSecondaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixedDim_highContrast">#233541</color>
+    <color name="md_theme_onSecondaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixed_highContrast">#753725</color>
+    <color name="md_theme_onTertiaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixedDim_highContrast">#592111</color>
+    <color name="md_theme_onTertiaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceDim_highContrast">#B5B9BE</color>
+    <color name="md_theme_surfaceBright_highContrast">#F6FAFE</color>
+    <color name="md_theme_surfaceContainerLowest_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow_highContrast">#EEF1F6</color>
+    <color name="md_theme_surfaceContainer_highContrast">#DFE3E7</color>
+    <color name="md_theme_surfaceContainerHigh_highContrast">#D1D5D9</color>
+    <color name="md_theme_surfaceContainerHighest_highContrast">#C3C7CB</color>
+</resources>
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index 033a9492..f97f66f8 100755..100644
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -1,152 +1,34 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight">
-        <item name="android:windowNoTitle">true</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
+<resources>
+    <style name="ShapeAppearanceArticleHeader">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSizeTopLeft">0dp</item>
+        <item name="cornerSizeTopRight">0dp</item>
+        <item name="cornerSizeBottomLeft">16dp</item>
+        <item name="cornerSizeBottomRight">16dp</item>
     </style>
 
-    <style name="AppTheme" parent="AppTheme.Base">
-        <item name="windowActionModeOverlay">true</item>
-
-        <!-- <item name="statusBarHintColor">?colorPrimary</item> -->
-        <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item>
-        <item name="feedlistBackground">#e0e0e0</item>
-        <item name="unreadCounterColor">#909090</item>
-        <item name="headlinesBackground">#f0f0f0</item>
-        <item name="articleBackground">@android:color/white</item>
-        <item name="headlineSelectedBackground">#dddddd</item>
-        <item name="headlineHeaderBackground">#ccffffff</item>
-        <item name="headlineUnreadBackground">@android:color/white</item>
-        <item name="feedsSelectedBackground">#dddddd</item>
-        <item name="feedlistTextColor">@android:color/black</item>
-        <item name="feedlistSelectedTextColor">@android:color/black</item>
-        <item name="headlineUnreadTextColor">@android:color/black</item>
-        <item name="headlineSelectedTextColor">@android:color/black</item>
-        <item name="headlineExcerptTextColor">#323232</item>
-        <item name="headlineSecondaryTextColor">#909090</item>
-        <item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item>
-        <item name="headlineSelectedExcerptTextColor">#323232</item>
-        <item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
-        <item name="linkColor">?colorPrimary</item>
-        <item name="loadingBackground">@android:color/white</item>
-        <item name="articleNoteTextColor">#9a8c59</item>
-        <item name="articleNoteBackground">#fff7d5</item>
-        <item name="parentBtnBackground">#dddddd</item>
-        <item name="articleHeader">@android:color/transparent</item>
-        <item name="articleHeaderTextColor">@android:color/black</item>
-        <item name="articleTextColor">@android:color/black</item>
-        <!-- <item name="floatingActionButtonStyle">@style/FabTheme</item> -->
-        <item name="headlineFooterColor">?colorPrimary</item>
-        <item name="articleHeaderSeparator">#cccccc</item>
-
-        <item name="colorPrimary">#257eae</item>
-        <item name="colorPrimaryDark">#216d96</item>
-        <item name="colorAccent">#F4511E</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>
-        <item name="ic_star_outline">@drawable/ic_star_outline_dark</item>
-        <item name="ic_share">@drawable/ic_share_dark</item>
-        <item name="ic_inbox">@drawable/ic_inbox_dark</item>
-        <item name="ic_go_back">@drawable/ic_go_back_dark</item>
-        <item name="ic_settings">@drawable/ic_settings_dark</item>
-        <item name="ic_filter_variant">@drawable/ic_filter_variant_dark</item>
-        <item name="ic_cloud_download">@drawable/ic_cloud_download_dark</item>
-        <item name="ic_cloud_upload">@drawable/ic_cloud_upload_dark</item>
-        <item name="ic_archive">@drawable/ic_archive_dark</item>
-        <item name="ic_fresh">@drawable/ic_fresh_dark</item>
-        <item name="ic_restore">@drawable/ic_restore_dark</item>
-        <item name="ic_folder_outline">@drawable/ic_folder_outline_dark</item>
-        <item name="ic_dots_vertical">@drawable/ic_dots_vertical_dark</item>
-        <item name="ic_dots_vertical_circle">@drawable/ic_dots_vertical_circle_dark</item>
-        <item name="ic_attachment">@drawable/ic_attachment_dark</item>
-        <item name="ic_attachment_vert">@drawable/ic_attachment_vert_dark</item>
-        <item name="ic_action_trending_up">@drawable/ic_action_trending_up_dark</item>
-        <item name="ic_action_trending_flat">@drawable/ic_action_trending_flat_dark</item>
-        <item name="ic_action_trending_down">@drawable/ic_action_trending_down_dark</item>
-
-        <item name="drawer_header">@drawable/drawer_header</item>
+    <style name="ShapeAppearanceFeedsTablet">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSizeTopLeft">0dp</item>
+        <item name="cornerSizeTopRight">16dp</item>
+        <item name="cornerSizeBottomLeft">0dp</item>
+        <item name="cornerSizeBottomRight">16dp</item>
     </style>
 
-    <!--
-    <style name="DarkTheme.Base" parent="Theme.AppCompat.NoActionBar">
-
+    <style name="ShapeAppearanceHeadlinesTablet">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSizeTopLeft">0dp</item>
+        <item name="cornerSizeTopRight">16dp</item>
+        <item name="cornerSizeBottomLeft">0dp</item>
+        <item name="cornerSizeBottomRight">0dp</item>
     </style>
 
-    <style name="AmberTheme" parent="DarkTheme">
-        <item name="colorPrimary">#b87d2c</item>
-        <item name="colorPrimaryDark">#6e4b1a</item>
-        <item name="android:windowBackground">@color/window_background_amber</item>
-        <item name="drawer_header">@drawable/drawer_header_amber</item>
+    <!-- https://stackoverflow.com/a/73782598 -->
+    <style name="AppPreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay">
+        <item name="switchPreferenceCompatStyle">@style/AppSwitchPreference</item>
     </style>
 
-    <style name="DarkTheme" parent="DarkTheme.Base">
-        <item name="windowActionModeOverlay">true</item> -->
-
-        <!-- <item name="statusBarHintColor">?colorPrimary</item> -->
-        <!-- <item name="unreadCounterColor">#909090</item>
-        <item name="feedlistTextColor">@android:color/white</item>
-        <item name="headlineUnreadTextColor">@android:color/white</item>
-        <item name="headlineSelectedTextColor">@android:color/white</item>
-        <item name="headlineExcerptTextColor">#bebebe</item>
-        <item name="headlineSecondaryTextColor">#909090</item>
-        <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
-        <item name="headlineSelectedExcerptTextColor">#bebebe</item>
-        <item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item>
-        <item name="headlineSelectedBackground">#1c1c1c</item>
-        <item name="headlineHeaderBackground">#99000000</item>
-        <item name="headlineUnreadBackground">#101010</item>
-        <item name="linkColor">#2d92c8</item>
-        <item name="loadingBackground">@android:color/black</item>
-        <item name="articleNoteTextColor">#bebebe</item>
-        <item name="articleNoteBackground">#303030</item>
-        <item name="parentBtnBackground">#101010</item>
-        <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
-        <item name="feedlistBackground">#1c1d1e</item>
-        <item name="headlinesBackground">#1c1d1e</item>
-        <item name="articleBackground">@android:color/black</item>
-        <item name="feedsSelectedBackground">#1c1c1c</item>
-        <item name="feedlistSelectedTextColor">@android:color/white</item>
-        <item name="articleHeader">@android:color/transparent</item>
-        <item name="articleHeaderTextColor">@android:color/white</item>
-        <item name="floatingActionButtonStyle">@style/FabTheme</item>
-        <item name="articleTextColor">#e0e0e0</item>
-        <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>
-        <item name="ic_checkbox_marked">@drawable/ic_checkbox_marked</item>
-        <item name="ic_star">@drawable/ic_star</item>
-        <item name="ic_star_outline">@drawable/ic_star_outline</item>
-        <item name="ic_share">@drawable/ic_share</item>
-        <item name="ic_inbox">@drawable/ic_inbox</item>
-        <item name="ic_go_back">@drawable/ic_go_back</item>
-        <item name="ic_settings">@drawable/ic_settings</item>
-        <item name="ic_filter_variant">@drawable/ic_filter_variant</item>
-        <item name="ic_cloud_download">@drawable/ic_cloud_download</item>
-        <item name="ic_cloud_upload">@drawable/ic_cloud_upload</item>
-        <item name="ic_archive">@drawable/ic_archive</item>
-        <item name="ic_fresh">@drawable/ic_fresh</item>
-        <item name="ic_restore">@drawable/ic_restore</item>
-        <item name="ic_folder_outline">@drawable/ic_folder_outline</item>
-        <item name="ic_dots_vertical">@drawable/ic_dots_vertical</item>
-        <item name="ic_dots_vertical_circle">@drawable/ic_dots_vertical_circle</item>
-        <item name="ic_attachment">@drawable/ic_attachment</item>
-        <item name="ic_attachment_vert">@drawable/ic_attachment_vert</item>
-
-        <item name="drawer_header">@drawable/drawer_header_dark</item>
-    </style> -->
-
-    <style name="DarkDialogTheme" parent="android:Theme"></style>
-
-    <!-- <style name="FabTheme" parent="FloatingActionButton">
-        <item name="floatingActionButtonColor">?colorPrimaryDark</item>
-    </style> -->
-
+    <style name="AppSwitchPreference" parent="@style/Preference.SwitchPreferenceCompat.Material">
+        <item name="widgetLayout">@layout/preference_material_switch</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/theme_overlays.xml b/org.fox.ttrss/src/main/res/values/theme_overlays.xml
new file mode 100644
index 00000000..e81f18fb
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/values/theme_overlays.xml
@@ -0,0 +1,98 @@
+<resources>
+    <style name="ThemeOverlay.AppTheme.MediumContrast" parent="Theme.Material3.Light.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_primary_mediumContrast</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary_mediumContrast</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_mediumContrast</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_mediumContrast</item>
+        <item name="colorSecondary">@color/md_theme_secondary_mediumContrast</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary_mediumContrast</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_mediumContrast</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_mediumContrast</item>
+        <item name="colorTertiary">@color/md_theme_tertiary_mediumContrast</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary_mediumContrast</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_mediumContrast</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_mediumContrast</item>
+        <item name="colorError">@color/md_theme_error_mediumContrast</item>
+        <item name="colorOnError">@color/md_theme_onError_mediumContrast</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer_mediumContrast</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_mediumContrast</item>
+        <item name="android:colorBackground">@color/md_theme_background_mediumContrast</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground_mediumContrast</item>
+        <item name="colorSurface">@color/md_theme_surface_mediumContrast</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface_mediumContrast</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_mediumContrast</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_mediumContrast</item>
+        <item name="colorOutline">@color/md_theme_outline_mediumContrast</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant_mediumContrast</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_mediumContrast</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_mediumContrast</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_mediumContrast</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_mediumContrast</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_mediumContrast</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_mediumContrast</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_mediumContrast</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_mediumContrast</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_mediumContrast</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_mediumContrast</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_mediumContrast</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_mediumContrast</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_mediumContrast</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_mediumContrast</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_mediumContrast</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim_mediumContrast</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright_mediumContrast</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_mediumContrast</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_mediumContrast</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_mediumContrast</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_mediumContrast</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_mediumContrast</item>
+    </style>
+    <style name="ThemeOverlay.AppTheme.HighContrast" parent="Theme.Material3.Light.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_primary_highContrast</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary_highContrast</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_highContrast</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_highContrast</item>
+        <item name="colorSecondary">@color/md_theme_secondary_highContrast</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary_highContrast</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_highContrast</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_highContrast</item>
+        <item name="colorTertiary">@color/md_theme_tertiary_highContrast</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary_highContrast</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_highContrast</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_highContrast</item>
+        <item name="colorError">@color/md_theme_error_highContrast</item>
+        <item name="colorOnError">@color/md_theme_onError_highContrast</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer_highContrast</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_highContrast</item>
+        <item name="android:colorBackground">@color/md_theme_background_highContrast</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground_highContrast</item>
+        <item name="colorSurface">@color/md_theme_surface_highContrast</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface_highContrast</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_highContrast</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_highContrast</item>
+        <item name="colorOutline">@color/md_theme_outline_highContrast</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant_highContrast</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_highContrast</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_highContrast</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_highContrast</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_highContrast</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_highContrast</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_highContrast</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_highContrast</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_highContrast</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_highContrast</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_highContrast</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_highContrast</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_highContrast</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_highContrast</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_highContrast</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_highContrast</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim_highContrast</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright_highContrast</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_highContrast</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_highContrast</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_highContrast</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_highContrast</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_highContrast</item>
+    </style>
+</resources>
diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml
new file mode 100644
index 00000000..68a57811
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/values/themes.xml
@@ -0,0 +1,77 @@
+<resources>
+
+    <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
+        <item name="windowActionModeOverlay">true</item>
+        <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
+
+        <item name="ic_rss_box">@drawable/baseline_rss_feed_24</item>
+        <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item>
+        <item name="ic_star">@drawable/baseline_star_24</item>
+        <item name="ic_star_outline">@drawable/baseline_star_outline_24</item>
+        <item name="ic_share">@drawable/baseline_share_24</item>
+        <item name="ic_inbox">@drawable/baseline_inbox_24</item>
+        <item name="ic_go_back">@drawable/baseline_arrow_back_24</item>
+        <item name="ic_settings">@drawable/baseline_settings_24</item>
+        <item name="ic_filter_variant">@drawable/baseline_filter_alt_24</item>
+        <item name="ic_cloud_download">@drawable/baseline_cloud_download_24</item>
+        <item name="ic_cloud_upload">@drawable/baseline_cloud_upload_24</item>
+        <item name="ic_archive">@drawable/baseline_archive_24</item>
+        <item name="ic_fresh">@drawable/baseline_local_fire_department_24</item>
+        <item name="ic_restore">@drawable/baseline_restore_24</item>
+        <item name="ic_folder_outline">@drawable/baseline_folder_open_24</item>
+        <item name="ic_dots_vertical">@drawable/baseline_more_vert_24</item>
+        <item name="ic_dots_vertical_circle">@drawable/outline_more_24</item>
+        <item name="ic_attachment">@drawable/baseline_attachment_24</item>
+        <item name="ic_attachment_vert">@drawable/baseline_attach_file_24</item>
+        <item name="ic_action_trending_up">@drawable/baseline_trending_up_24</item>
+        <item name="ic_action_trending_flat">@drawable/baseline_trending_flat_24</item>
+        <item name="ic_action_trending_down">@drawable/baseline_trending_down_24</item>
+
+        <item name="colorPrimary">@color/md_theme_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_error</item>
+        <item name="colorOnError">@color/md_theme_onError</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground</item>
+        <item name="colorSurface">@color/md_theme_surface</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_outline</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
+    </style>
+</resources>