Add flavor dandelior*, move flavor specific to folder instead gradle generated

app/build.gradle

@@ -24,8 +24,6 @@ android {
 
 
         vectorDrawables.useSupportLibrary = true
-        resValue 'string', 'app_name', "dandelion*"
-        manifestPlaceholders = [appIcon: "@drawable/ic_launcher"]
     }
 
     compileOptions {
@@ -55,10 +53,12 @@ android {
             buildConfigField "boolean", "IS_GPLAY_BUILD", "true"
         }*/
 
+        flavorDandelior {
+            applicationId "net.gsantner.dandelior"
+        }
+
         flavorTest {
-            applicationId "com.github.dfa.secondlion"
-            resValue 'string', 'app_name', "secondlion*"
-            manifestPlaceholders = [appIcon: "@drawable/ic_launcher_test"]
+            applicationId "net.gsantner.secondlion"
             versionCode = Integer.parseInt(new Date().format('yyMMdd'))
             versionName = new Date().format('yyMMdd')
             buildConfigField "boolean", "IS_TEST_BUILD", "true"

app/src/flavorDandelior/res/drawable-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/flavorDandelior/res/drawable-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/flavorDandelior/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="20"
+        android:viewportHeight="20">
+    <path
+        android:pathData="M0.025,-0.07h19.95v20.14H0.025z"
+        android:fillColor="#000000"/>
+</vector>

app/src/flavorDandelior/res/values/strings-flavor.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">dandelior*</string>
+</resources>

app/src/flavorTest/res/drawable-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/flavorTest/res/drawable-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/flavorTest/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="36.363636"
+        android:viewportHeight="36.363636">
+    <group android:translateX="8.181818"
+            android:translateY="8.181818">
+        <path
+            android:pathData="M11.337,14.123l-0.963,-1.345c-0.257,-0.36 -0.466,-0.64 -0.477,-0.64 -0.012,0 -0.416,0.544 -0.958,1.287a83.9,83.9 0,0 1,-0.947 1.287c-0.015,0 -1.86,-1.3 -1.865,-1.313 -0.002,-0.007 0.415,-0.62 0.927,-1.361 0.512,-0.742 0.931,-1.36 0.931,-1.375 0,-0.023 -0.166,-0.081 -1.468,-0.515l-1.485,-0.496c-0.013,-0.005 0.063,-0.263 0.327,-1.094 0.19,-0.599 0.349,-1.093 0.354,-1.099 0.005,-0.006 0.707,0.219 1.56,0.5 0.852,0.28 1.556,0.509 1.565,0.509 0.008,0 0.018,-0.013 0.022,-0.03 0.003,-0.015 0.01,-0.74 0.016,-1.612 0.006,-0.87 0.015,-1.59 0.02,-1.6 0.009,-0.012 0.248,-0.015 1.127,-0.015 0.614,0 1.123,0.004 1.13,0.01 0.01,0.006 0.027,0.485 0.056,1.56 0.046,1.766 0.047,1.79 0.075,1.79 0.01,0 0.686,-0.226 1.501,-0.503a50.795,50.795 0,0 1,1.49 -0.492c0.016,0.019 0.685,2.194 0.676,2.202 -0.004,0.005 -0.684,0.237 -1.51,0.517 -1.137,0.386 -1.504,0.515 -1.507,0.531 -0.003,0.012 0.388,0.597 0.886,1.324 0.49,0.716 0.888,1.308 0.886,1.314a96.945,96.945 0,0 1,-1.852 1.364c-0.006,0 -0.239,-0.317 -0.517,-0.705z"
+            android:fillColor="#fafafa"/>
+    </group>
+</vector>

app/src/flavorTest/res/values/strings-flavor.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">secondlion*</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
     <application
         android:name="com.github.dfa.diaspora_android.App"
         android:allowBackup="false"
-        android:icon="${appIcon}"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/DiasporaLight">
 
@@ -53,7 +53,7 @@
         <activity
             android:name="com.github.dfa.diaspora_android.activity.MainActivity"
             android:configChanges="keyboardHidden|locale|orientation|screenSize"
-            android:icon="${appIcon}"
+            android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/DiasporaLight.NoActionBar"

app/src/main/java/com/github/dfa/diaspora_android/App.java

@@ -35,6 +35,7 @@ import com.github.dfa.diaspora_android.util.AppSettings;
 import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
 
 import net.gsantner.opoc.util.AdBlock;
+import net.gsantner.opoc.util.ContextUtils;
 
 public class App extends Application {
     private volatile static App app;
@@ -54,6 +55,13 @@ public class App extends Application {
         final Context c = getApplicationContext();
         appSettings = AppSettings.get();
 
+        String a = new ContextUtils(this).bcstr("FLAVOR", "");
+        a += "__";
+
+        if (appSettings.isAppFirstStart() && "flavorDandelior".equals(new ContextUtils(this).bcstr("FLAVOR", ""))){
+            appSettings.setAmoledColorMode(true);
+        }
+
         // Init app log
         AppLog.setLoggingEnabled(appSettings.isLoggingEnabled());
         AppLog.setLoggingSpamEnabled(appSettings.isLoggingSpamEnabled());

app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java

@@ -431,8 +431,6 @@ public class MainActivity extends ThemedActivity
                     app.getAvatarImageLoader().startImageDownload(navheaderImage, avatarUrl);
                 }
             }
-        } else if (BuildConfig.IS_TEST_BUILD) {
-            navheaderImage.setImageResource(R.drawable.ic_launcher_test);
         }
         updateNavigationViewEntryVisibilities();
     }

app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionFragment.java

@@ -173,7 +173,7 @@ public class PodSelectionFragment extends ThemedFragment implements SearchView.O
         rootView.setBackgroundColor(appSettings.isAmoledColorMode() ? Color.BLACK : Color.WHITE);
         listViewPod.setDivider(new ColorDrawable(Color.GRAY));
         listViewPod.setDividerHeight(dividerHeight);
-        int bgcolor = appSettings.isAmoledColorMode() ? Color.BLACK : appSettings.getAccentColor();
+        int bgcolor = appSettings.isAmoledColorMode() ? Color.DKGRAY : appSettings.getAccentColor();
         buttonUseCustomPod.setBackgroundColor(bgcolor);
         buttonUseCustomPod.setTextColor(_cu.shouldColorOnTopBeLight(bgcolor) ? Color.WHITE : Color.BLACK);
 

app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java

@@ -443,6 +443,9 @@ public class AppSettings extends SharedPreferencesPropertyBackend {
     public boolean isAmoledColorMode() {
         return getBool(R.string.pref_key__primary_color__amoled_mode, false);
     }
+    public void setAmoledColorMode(boolean enable) {
+        setBool(R.string.pref_key__primary_color__amoled_mode, enable);
+    }
 
     public boolean isAdBlockEnabled() {
         return getBool(R.string.pref_key__adblock_enable, true);

app/src/main/java/net/gsantner/opoc/activity/GsFragmentBase.java

@@ -3,7 +3,7 @@
  *   Maintained by Gregor Santner, 2017-
  *   https://gsantner.net/
  *
- *   License: Apache 2.0
+ *   License: Apache 2.0 / Commercial
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *

app/src/main/java/net/gsantner/opoc/format/markdown/SimpleMarkdownParser.java

@@ -1,9 +1,9 @@
 /*#######################################################
  *
- *   Maintained by Gregor Santner, 2016-
+ *   Maintained by Gregor Santner, 2018-
  *   https://gsantner.net/
  *
- *   License: Apache 2.0
+ *   License: Apache 2.0 / Commercial
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
@@ -124,6 +124,12 @@ public class SimpleMarkdownParser {
             return text;
         }
     };
+    public final static SmpFilter FILTER_NONE = new SmpFilter() {
+        @Override
+        public String filter(String text) {
+            return text;
+        }
+    };
 
     //########################
     //## Singleton

app/src/main/java/net/gsantner/opoc/preference/PropertyBackend.java

@@ -3,7 +3,7 @@
  *   Maintained by Gregor Santner, 2018-
  *   https://gsantner.net/
  *
- *   License: Apache 2.0
+ *   License: Apache 2.0 / Commercial
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *

app/src/main/java/net/gsantner/opoc/preference/SharedPreferencesPropertyBackend.java

@@ -3,7 +3,7 @@
  *   Maintained by Gregor Santner, 2016-
  *   https://gsantner.net/
  *
- *   License: Apache 2.0
+ *   License: Apache 2.0 / Commercial
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
@@ -209,7 +209,7 @@ public class SharedPreferencesPropertyBackend implements PropertyBackend<String,
         String value = pref
                 .getString(key, ARRAY_SEPARATOR)
                 .replace(ARRAY_SEPARATOR_SUBSTITUTE, ARRAY_SEPARATOR);
-        if (value.equals(ARRAY_SEPARATOR)) {
+        if (value.equals(ARRAY_SEPARATOR) || TextUtils.isEmpty(value)) {
             return ret;
         }
         ret.addAll(Arrays.asList(value.split(ARRAY_SEPARATOR)));

app/src/main/java/net/gsantner/opoc/util/ActivityUtils.java

@@ -3,7 +3,7 @@
  *   Maintained by Gregor Santner, 2016-
  *   https://gsantner.net/
  *
- *   License: Apache 2.0
+ *   License: Apache 2.0 / Commercial
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *

app/src/main/java/net/gsantner/opoc/util/Callback.java

@@ -3,7 +3,7 @@
  *   Maintained by Gregor Santner, 2018-
  *   https://gsantner.net/
  *
- *   License: Apache 2.0
+ *   License: Apache 2.0 / Commercial
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *

app/src/main/java/net/gsantner/opoc/util/ContextUtils.java

@@ -3,7 +3,7 @@
  *   Maintained by Gregor Santner, 2016-
  *   https://gsantner.net/
  *
- *   License: Apache 2.0
+ *   License: Apache 2.0 / Commercial
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *

app/src/main/java/net/gsantner/opoc/util/FileUtils.java

@@ -3,7 +3,7 @@
  *   Maintained by Gregor Santner, 2017-
  *   https://gsantner.net/
  *
- *   License: Apache 2.0
+ *   License: Apache 2.0 / Commercial
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *

app/src/main/java/net/gsantner/opoc/util/NetworkUtils.java

@@ -3,7 +3,7 @@
  *   Maintained by Gregor Santner, 2017-
  *   https://gsantner.net/
  *
- *   License: Apache 2.0
+ *   License: Apache 2.0 / Commercial
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *

app/src/main/java/net/gsantner/opoc/util/PermissionChecker.java

@@ -3,7 +3,7 @@
  *   Maintained by Gregor Santner, 2017-
  *   https://gsantner.net/
  *
- *   License: Apache 2.0
+ *   License: Apache 2.0 / Commercial
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *

app/src/main/java/net/gsantner/opoc/util/ShareUtil.java

@@ -3,7 +3,7 @@
  *   Maintained by Gregor Santner, 2017-
  *   https://gsantner.net/
  *
- *   License: Apache 2.0
+ *   License: Apache 2.0 / Commercial
  *  https://github.com/gsantner/opoc/#licensing
  *  https://www.apache.org/licenses/LICENSE-2.0
  *

app/src/main/res/drawable-anydpi-v26/ic_launcher_test.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_test_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_test_foreground"/>
-</adaptive-icon>

app/src/main/res/drawable-anydpi-v26/ic_launcher_test_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_test_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_test_foreground"/>
-</adaptive-icon>

app/src/main/res/values/strings-flavor.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">@string/dandelion</string>
+</resources>

build.gradle

@@ -1,3 +1,13 @@
+/*#######################################################
+*
+*   Maintained by Gregor Santner, 2017-
+*   https://gsantner.net/
+*
+*   License: Apache 2.0 / Commercial
+*  https://github.com/gsantner/opoc/#licensing
+*  https://www.apache.org/licenses/LICENSE-2.0
+*
+#########################################################*/
 import java.text.SimpleDateFormat
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.