Merge pull request #118 from thermatk/flavors

[F-Droid] split into flavors

app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.google.gms.google-services'
 android {
 
     compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    buildToolsVersion '25.0.3'
 
     defaultConfig {
         applicationId "ohi.andre.consolelauncher"
@@ -29,6 +29,17 @@ android {
         }
     }
 
+    productFlavors {
+        // includes proprietary libs
+        playstore {
+
+        }
+        // only foss
+        foss {
+
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -50,6 +61,6 @@ android {
     }
 }
 dependencies {
-    compile files('libs/anrwatchdog-1.3.0.jar')
-    compile 'com.google.firebase:firebase-database:9.0.0'
+    playstoreCompile files('libs/anrwatchdog-1.3.0.jar')
+    playstoreCompile 'com.google.firebase:firebase-database:9.0.0'
 }
\ No newline at end of file

app/src/foss/java/ohi/andre/consolelauncher/FlavorUtils.java

+package ohi.andre.consolelauncher;
+
+public class FlavorUtils {
+
+    public static void startANR () {
+
+    }
+	
+}

app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java

@@ -22,9 +22,6 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Toast;
 
-import com.github.anrwatchdog.ANRError;
-import com.github.anrwatchdog.ANRWatchDog;
-
 import java.util.LinkedList;
 import java.util.Queue;
 
@@ -219,17 +216,7 @@ public class LauncherActivity extends AppCompatActivity implements Reloadable {
     }
 
     private void finishOnCreate() {
-
-        new ANRWatchDog(5000)
-                .setANRListener(new ANRWatchDog.ANRListener() {
-                    @Override
-                    public void onAppNotResponding(ANRError anrError) {
-                        Tuils.log(anrError);
-                        Tuils.toFile(anrError);
-                    }
-                })
-                .setReportMainThreadOnly()
-                .start();
+        FlavorUtils.startANR();
 
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
             @Override

app/src/playstore/java/ohi/andre/consolelauncher/FlavorUtils.java

+package ohi.andre.consolelauncher;
+
+import com.github.anrwatchdog.ANRError;
+import com.github.anrwatchdog.ANRWatchDog;
+
+import ohi.andre.consolelauncher.tuils.Tuils;
+
+public class FlavorUtils {
+
+    public static void startANR () {
+        new ANRWatchDog(5000)
+                .setANRListener(new ANRWatchDog.ANRListener() {
+                    @Override
+                    public void onAppNotResponding(ANRError anrError) {
+                        Tuils.log(anrError);
+                        Tuils.toFile(anrError);
+                    }
+                })
+                .setReportMainThreadOnly()
+                .start();
+    }
+}

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.1.0'
     }
 }