Switch off build variants to build types

Should be much easier to maintain

app/src/debug/AndroidManifest.xml

@@ -1,10 +1,9 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
-        <activity android:name="org.bspeice.minimalbible.test.activity.FragmentTestActivity"
+        <activity
-            android:label="@string/title_activity_fragment_test"
+            android:name="org.bspeice.minimalbible.test.activity.FragmentTestActivity"
-            >
+            android:label="@string/title_activity_fragment_test"></activity>
-        </activity>
     </application>
 
 </manifest>

app/src/debug/java/org/bspeice/minimalbible/Modules.java

@@ -8,10 +8,11 @@ public class Modules {
 
     public static TestModules testModules = new TestModules();
 
-    private Modules() {}
+    private Modules() {
+    }
 
     public static Object[] list(MinimalBible app) {
-        return new Object[] {
+        return new Object[]{
                 new MinimalBibleModules(app),
                 testModules
         };

app/src/debug/res/menu/fragment_test.xml

@@ -1,9 +1,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="org.bspeice.minimalbible.test.activity.FragmentTestActivity" >
+    tools:context="org.bspeice.minimalbible.test.activity.FragmentTestActivity">
-    <item android:id="@+id/action_settings"
+    <item
-        android:title="@string/action_settings"
+        android:id="@+id/action_settings"
         android:orderInCategory="100"
+        android:title="@string/action_settings"
         app:showAsAction="never" />
 </menu>