#202 Added "My Blue" Action bar color, which is the same as AndStatus…

… icon. First screen logo changed.
andstatus · Jul 14, 2015 · da57dec · da57dec
1 parent a2afbdb
commit da57dec
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 20 deletions.
diff --git a/app/src/main/java/org/andstatus/app/HelpActivity.java b/app/src/main/java/org/andstatus/app/HelpActivity.java
@@ -35,7 +35,6 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -62,7 +61,7 @@ public class HelpActivity extends MyActivity implements SwipeInterface {
      */
     public static final String EXTRA_IS_FIRST_ACTIVITY = ClassInApplicationPackage.PACKAGE_NAME + ".IS_FIRST_ACTIVITY";
 
-    public static final int PAGE_INDEX_DEFAULT = 0;
+    public static final int PAGE_INDEX_LOGO = 0;
     public static final int PAGE_INDEX_USER_GUIDE = 1;
     public static final int PAGE_INDEX_CHANGELOG = 2;
 
@@ -73,6 +72,7 @@ public class HelpActivity extends MyActivity implements SwipeInterface {
      */
     private boolean mIsFirstActivity = false;
     private boolean wasPaused = false;
+    private static boolean isFirstTimeRun = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -84,7 +84,8 @@ protected void onCreate(Bundle savedInstanceState) {
             if (MyPreferences.shouldSetDefaultValues()) {
                 MyLog.e(this, "Default values were not set?!");   
             } else {
-                MyLog.i(this, "Default values has been set");   
+                MyLog.i(this, "Default values has been set");
+                isFirstTimeRun = true;
             }
         }
 
@@ -295,9 +296,11 @@ public static boolean startFromActivity(Activity activity) {
                 intent.putExtra(HelpActivity.EXTRA_IS_FIRST_ACTIVITY, true);
             } 
 
-            int pageIndex = PAGE_INDEX_DEFAULT;
-            if (MyContextHolder.get().isReady() && MyContextHolder.get().persistentAccounts().isEmpty()) {
-                pageIndex = PAGE_INDEX_USER_GUIDE;
+            int pageIndex = PAGE_INDEX_LOGO;
+            if (MyContextHolder.get().persistentAccounts().isEmpty()) {
+                if (!isFirstTimeRun) {
+                    pageIndex = PAGE_INDEX_USER_GUIDE;
+                }
             } else if (showChangeLog) {
                 pageIndex = PAGE_INDEX_CHANGELOG;
             }

diff --git a/app/src/main/java/org/andstatus/app/context/MySettingsFragment.java b/app/src/main/java/org/andstatus/app/context/MySettingsFragment.java
@@ -238,8 +238,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
             switch (key) {
                 case MyPreferences.KEY_CUSTOM_LOCALE:
                     MyPreferences.setLocale(getActivity());
-                    getActivity().finish();
-                    startActivity(getActivity().getIntent());
+                    restartMe();
                     break;
                 case MyPreferences.KEY_THEME_COLOR:
                     showThemeColor();
@@ -283,6 +282,11 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
         }
     }
 
+    private void restartMe() {
+        getActivity().finish();
+        startActivity(getActivity().getIntent());
+    }
+
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         switch (preference.getKey()) {

diff --git a/app/src/main/res/drawable/splash_logo.png b/app/src/main/res/drawable/splash_logo.png
diff --git a/app/src/main/res/values/arrays_international.xml b/app/src/main/res/values/arrays_international.xml
@@ -168,6 +168,9 @@
         <item>@string/color_green</item>
         <item>@string/color_teal</item>
         <item>@string/color_blue</item>
+        <item>@string/color_light_blue</item>
+        <item>@string/color_material_blue</item>
+        <item>@string/color_my_blue</item>
         <item>@string/color_grey</item>
     </string-array>
     <string-array name="background_color_entries">

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -26,6 +26,12 @@
     <color name="teal_700">#00796B</color>
 	<color name="blue_500">#2196F3</color>
 	<color name="blue_700">#1976D2</color>
+	<color name="light_blue_500">#03A9F4</color>
+	<color name="light_blue_700">#0288D1</color>
+	<color name="material_blue_500">#577AF3</color>
+	<color name="material_blue_700">#485CD4</color>
+	<color name="my_blue_500">#0073be</color>
+	<color name="my_blue_700">#005B97</color>
 	<color name="grey_500">#9E9E9E</color>
 	<color name="grey_700">#616161</color>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -68,6 +68,9 @@
   <string name="color_black">Black</string>
   <string name="color_black_cat">Black Cat</string>
   <string name="color_blue">Blue</string>
+  <string name="color_light_blue">Light Blue</string>
+  <string name="color_material_blue">Material Blue</string>
+  <string name="color_my_blue">My Blue</string>
   <string name="color_carbon_grey">Carbon Grey</string>
   <string name="color_charcoal">Charcoal</string>
   <string name="color_grey">Grey</string>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -6,6 +6,9 @@
         <item>ActionBarGreen</item>
         <item>ActionBarTeal</item>
         <item>ActionBarBlue</item>
+        <item>ActionBarLightBlue</item>
+        <item>ActionBarMaterialBlue</item>
+        <item>ActionBarMyBlue</item>
         <item>ActionBarGrey</item>
     </string-array>
     <style name="ActionBarRed">
@@ -28,6 +31,18 @@
         <item name="actionBarColor">@color/blue_500</item>
         <item name="actionBarColorDark">@color/blue_700</item>
     </style>
+    <style name="ActionBarLightBlue">
+        <item name="actionBarColor">@color/light_blue_500</item>
+        <item name="actionBarColorDark">@color/light_blue_700</item>
+    </style>
+    <style name="ActionBarMaterialBlue">
+        <item name="actionBarColor">@color/material_blue_500</item>
+        <item name="actionBarColorDark">@color/material_blue_700</item>
+    </style>
+    <style name="ActionBarMyBlue">
+        <item name="actionBarColor">@color/my_blue_500</item>
+        <item name="actionBarColorDark">@color/my_blue_700</item>
+    </style>
     <style name="ActionBarGrey">
         <item name="actionBarColor">@color/grey_500</item>
         <item name="actionBarColorDark">@color/grey_700</item>

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -58,7 +58,7 @@
             <org.andstatus.app.context.MultilineListPreference android:key="action_bar_color"
                 android:entries="@array/action_bar_color_entries"
                 android:entryValues="@array/action_bar_color_values"
-                android:defaultValue="ActionBarTeal"
+                android:defaultValue="ActionBarMyBlue"
                 android:title="@string/action_bar_color_preference_title" />
             <org.andstatus.app.context.MultilineListPreference android:key="background_color"
                 android:entries="@array/background_color_entries"

diff --git a/res-src/icon.svg b/res-src/icon.svg