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

Protected/spring cleaning

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

1 files changed, 25 insertions, 143 deletions

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