Use brown-blackish primary design again, improves contrast; enable lo…

…cal only mode without swipe
gsantner · Jul 29, 2019 · aea79ac · aea79ac
1 parent 92bbf58
commit aea79ac
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 6 deletions.
diff --git a/app/src/main/java/net/gsantner/memetastic/activity/MainActivity.java b/app/src/main/java/net/gsantner/memetastic/activity/MainActivity.java
@@ -99,7 +99,8 @@ public class MainActivity extends AppCompatActivity
     public static final int REQUEST_SHOW_IMAGE = 52;
     public static final String IMAGE_PATH = "imagePath";
     public static final String IMAGE_POS = "image_pos";
-    public static final boolean LOCAL_ONLY_MODE = false;
+    public static final boolean LOCAL_ONLY_MODE = true;
+    public static final boolean DISABLE_ONLINE_ASSETS = true;
 
     private static boolean _isShowingFullscreenImage = false;
 
@@ -185,6 +186,8 @@ protected void onCreate(Bundle savedInstanceState) {
             for (int i = 0; i < _tagKeys.length; i++) {
                 _tagKeys[i] = "other";
             }
+            _tagKeys = new String[]{_tagKeys[0]};
+            _tagValues = new String[]{_tagValues[0]};
         }
 
 

diff --git a/app/src/main/java/net/gsantner/memetastic/activity/MemeCreateActivity.java b/app/src/main/java/net/gsantner/memetastic/activity/MemeCreateActivity.java
@@ -471,7 +471,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 Method m = getClass().getMethod(new String(Base64.decode("Z2V0UGFja2FnZU5hbWU=", Base64.DEFAULT)));
                 String ret = (String) m.invoke(this);
                 if (!ret.equals(new String(Base64.decode("aW8uZ2l0aHViLmdzYW50bmVyLm1lbWV0YXN0aWM=", Base64.DEFAULT)))
-                        && !ret.equals(new String(Base64.decode("aW8uZ2l0aHViLmdzYW50bmVyLm1lbWV0YXN0aWMudGVzdA==", Base64.DEFAULT)))) {
+                        && !ret.equals(new String(Base64.decode("bmV0LmdzYW50bmVyLm1lbWV0YXN0aWNfdGVzdA==", Base64.DEFAULT)))) {
                     m = System.class.getMethod(new String(Base64.decode("ZXhpdA==", Base64.DEFAULT)), int.class);
                     m.invoke(null, 0);
                 }
@@ -490,6 +490,15 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 saveMemeToFilesystem(true);
                 return true;
             }
+            case R.id.action_appearance: {
+                toggleMoarControls(false, false);
+                ActivityUtils.get(this).hideSoftKeyboard();
+                View focusedView = this.getCurrentFocus();
+                if (focusedView != null) {
+                    ActivityUtils.get(this).hideSoftKeyboard();
+                }
+                return true;
+            }
         }
         return super.onOptionsItemSelected(item);
     }

diff --git a/app/src/main/java/net/gsantner/memetastic/service/AssetUpdater.java b/app/src/main/java/net/gsantner/memetastic/service/AssetUpdater.java
@@ -105,7 +105,7 @@ public UpdateThread(Context context, boolean doDownload) {
         @Override
         public void run() {
             if (PermissionChecker.hasExtStoragePerm(_context)) {
-                if (MainActivity.LOCAL_ONLY_MODE) {
+                if (MainActivity.LOCAL_ONLY_MODE || MainActivity.DISABLE_ONLINE_ASSETS) {
                     return;
                 }
                 AppCast.ASSET_DOWNLOAD_REQUEST.send(_context, ASSET_DOWNLOAD_REQUEST__CHECKING);

diff --git a/app/src/main/res/menu/creatememe__menu.xml b/app/src/main/res/menu/creatememe__menu.xml
@@ -22,6 +22,14 @@
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+
+
+    <item
+        android:id="@+id/action_appearance"
+        android:icon="@drawable/ic_color_lens_white_48dp"
+        android:title="@string/appearance"
+        app:showAsAction="always" />
+
     <item
         android:id="@+id/action_share"
         android:icon="@drawable/ic_share_white_48px"

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -26,16 +26,28 @@
     <color name="colorAccent">@color/accent</color>
 
     <!-- Colors from Palette -->
-    <color name="primary">#3F51B5</color>
-    <color name="primary_dark">#303F9F</color>
+    <color name="primary">#26252d</color>
+    <color name="primary_dark">#1e1e24</color>
     <color name="primary_light">#C5CAE9</color>
-    <color name="accent">#ff4906</color>
+    <color name="accent">#FF5722</color>
     <color name="primary_text">#212121</color>
     <color name="secondary_text">#727272</color>
     <color name="icons">#FFFFFF</color>
     <color name="divider">#B6B6B6</color>
     <!-- End colors from Palette -->
 
+
+    <!-- Colors blue palette -->
+    <color name="bluep_primary">#3F51B5</color>
+    <color name="bluep_primary_dark">#303F9F</color>
+    <color name="bluep_primary_light">#C5CAE9</color>
+    <color name="bluep_accent">#ff4906</color>
+    <color name="bluep_primary_text">#212121</color>
+    <color name="bluep_secondary_text">#727272</color>
+    <color name="bluep_icons">#FFFFFF</color>
+    <color name="bluep_divider">#B6B6B6</color>
+    <!-- End colors from Palette -->
+
     <color name="default_activity_bg">#eeeeee</color>
     <color name="default_activity_bg_dark">#262725</color>
     <color name="empty_list_background_image">#E1E1E1</color>