diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index 565f3b88..c92edd94 100644 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -31,7 +31,7 @@ dependencies { compile 'com.readystatesoftware.systembartint:systembartint:1.0.3' compile 'com.viewpagerindicator:library:2.4.1' compile 'com.android.support:cardview-v7:21.0.0' - compile 'com.android.support:support-v4:19.1.0' + compile 'com.android.support:support-v4:21.0.0' compile 'com.google.code.gson:gson:1.7.1' - compile 'com.android.support:appcompat-v7:19.1.0' + compile 'com.android.support:appcompat-v7:21.0.0' } diff --git a/org.fox.ttrss/org.fox.ttrss.iml b/org.fox.ttrss/org.fox.ttrss.iml index 2b67f407..74cb1d02 100644 --- a/org.fox.ttrss/org.fox.ttrss.iml +++ b/org.fox.ttrss/org.fox.ttrss.iml @@ -81,15 +81,16 @@ + + - - + 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 @@ @drawable/counter_background_selected_light #9a8c59 #fff7d5 - @style/ActionBar.Light + + #6482af + #526A8E + #88b0f0 - - - - - - - - - \ No newline at end of file