diff options
Diffstat (limited to 'org.fox.ttrss/src/main')
3 files changed, 20 insertions, 30 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index 7cf496d4..ef08c18f 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -153,14 +153,14 @@ public class OnlineActivity extends CommonActivity { m_prefs = PreferenceManager .getDefaultSharedPreferences(getApplicationContext()); +// if (canUseProgress()) { + requestWindowFeature(Window.FEATURE_PROGRESS); +// } + setAppTheme(m_prefs); super.onCreate(savedInstanceState); - if (canUseProgress()) { - requestWindowFeature(Window.FEATURE_PROGRESS); - } - //requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); setProgressBarVisibility(false); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java index 3add9c90..d6d88c63 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java @@ -168,12 +168,12 @@ public class OfflineActivity extends CommonActivity { m_prefs = PreferenceManager .getDefaultSharedPreferences(getApplicationContext()); + requestWindowFeature(Window.FEATURE_PROGRESS); + setAppTheme(m_prefs); super.onCreate(savedInstanceState); - requestWindowFeature(Window.FEATURE_PROGRESS); - setProgressBarVisibility(false); setContentView(R.layout.login); diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index ab7f9b8f..c03d32c9 100644 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -29,7 +29,10 @@ <item name="unreadSelectedCounterBackground">@drawable/counter_background_selected_light</item> <item name="articleNoteTextColor">#9a8c59</item> <item name="articleNoteBackground">#fff7d5</item> - <item name="android:actionBarStyle">@style/ActionBar.Light</item> + + <item name="colorPrimary">#6482af</item> + <item name="colorPrimaryDark">#526A8E</item> + <item name="colorAccent">#88b0f0</item> </style> <style name="LightTheme" parent="LightThemeBase"> @@ -48,7 +51,10 @@ <item name="unreadSelectedCounterBackground">@drawable/counter_background_sepia</item> <item name="feedlistTextColor">#35281C</item> <item name="linkColor">#C46262</item> - <item name="android:actionBarStyle">@style/ActionBar.Sepia</item> + + <item name="colorPrimary">#C46262</item> + <item name="colorPrimaryDark">#7F3F3F</item> + <item name="colorAccent">#E5B0A0</item> </style> <style name="SepiaTheme" parent="SepiaThemeBase"> @@ -103,33 +109,17 @@ <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item> <item name="headlineTextColor">@android:color/secondary_text_dark</item> <!-- <item name="actionBarStyle">@style/ActionBarDarkGray</item> --> - <item name="android:actionBarStyle">@style/ActionBar.DarkGray</item> - <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item> - </style> + <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item> - <style name="DarkTheme" parent="DarkThemeBase"> - </style> - - <style name="ActionBar.Light" parent="Widget.AppCompat.ActionBar.Solid"> - <item name="android:background">#6482AF</item> - <item name="android:titleTextStyle">@style/ActionBarText.Light</item> + <item name="colorPrimary">#22667f</item> + <item name="colorPrimaryDark">#394a63</item> + <item name="colorAccent">#22667f</item> </style> - <style name="ActionBar.Sepia" parent="Widget.AppCompat.ActionBar.Solid"> - <item name="android:background">#7F3F3F</item> - <item name="android:titleTextStyle">@style/ActionBarText.Light</item> - </style> - - <style name="ActionBarText.Light" - parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"> - <item name="android:textColor">@android:color/white</item> - </style> - - <style name="ActionBar.DarkGray" parent="Widget.AppCompat.ActionBar.Solid"> - <item name="android:background">#394A63</item> + <style name="DarkTheme" parent="DarkThemeBase"> </style> - <style name="DarkDialogTheme" parent="android:Theme.Dialog"> + <style name="DarkDialogTheme" parent="android:Theme"> </style> </resources>
\ No newline at end of file |