From f51a2515b0597bcf1abfe9a11609f8bfa2764c7a Mon Sep 17 00:00:00 2001
From: Bradlee Speice <bspeice.nc@gmail.com>
Date: Thu, 20 Nov 2014 22:57:46 -0500
Subject: [PATCH] Switch off build variants to build types Should be much
 easier to maintain

---
 app/src/{testConfig => debug}/AndroidManifest.xml        | 9 ++++-----
 .../java/org/bspeice/minimalbible/MinimalBible.java      | 0
 .../java/org/bspeice/minimalbible/Modules.java           | 5 +++--
 .../java/org/bspeice/minimalbible/TestModules.java       | 0
 .../minimalbible/test/activity/FragmentTestActivity.java | 0
 .../res/layout/activity_fragment_test.xml                | 0
 app/src/{testConfig => debug}/res/menu/fragment_test.xml | 7 ++++---
 .../{testConfig => debug}/res/values-w820dp/dimens.xml   | 0
 app/src/{testConfig => debug}/res/values/dimens.xml      | 0
 app/src/{testConfig => debug}/res/values/strings.xml     | 2 +-
 .../java/org/bspeice/minimalbible/MinimalBible.java      | 0
 .../java/org/bspeice/minimalbible/Modules.java           | 0
 12 files changed, 12 insertions(+), 11 deletions(-)
 rename app/src/{testConfig => debug}/AndroidManifest.xml (57%)
 rename app/src/{testConfig => debug}/java/org/bspeice/minimalbible/MinimalBible.java (100%)
 rename app/src/{testConfig => debug}/java/org/bspeice/minimalbible/Modules.java (87%)
 rename app/src/{testConfig => debug}/java/org/bspeice/minimalbible/TestModules.java (100%)
 rename app/src/{testConfig => debug}/java/org/bspeice/minimalbible/test/activity/FragmentTestActivity.java (100%)
 rename app/src/{testConfig => debug}/res/layout/activity_fragment_test.xml (100%)
 rename app/src/{testConfig => debug}/res/menu/fragment_test.xml (84%)
 rename app/src/{testConfig => debug}/res/values-w820dp/dimens.xml (100%)
 rename app/src/{testConfig => debug}/res/values/dimens.xml (100%)
 rename app/src/{testConfig => debug}/res/values/strings.xml (61%)
 rename app/src/{mainConfig => release}/java/org/bspeice/minimalbible/MinimalBible.java (100%)
 rename app/src/{mainConfig => release}/java/org/bspeice/minimalbible/Modules.java (100%)

diff --git a/app/src/testConfig/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
similarity index 57%
rename from app/src/testConfig/AndroidManifest.xml
rename to app/src/debug/AndroidManifest.xml
index 559954b..031212a 100644
--- a/app/src/testConfig/AndroidManifest.xml
+++ b/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"
-            android:label="@string/title_activity_fragment_test"
-            >
-        </activity>
+        <activity
+            android:name="org.bspeice.minimalbible.test.activity.FragmentTestActivity"
+            android:label="@string/title_activity_fragment_test"></activity>
     </application>
 
 </manifest>
diff --git a/app/src/testConfig/java/org/bspeice/minimalbible/MinimalBible.java b/app/src/debug/java/org/bspeice/minimalbible/MinimalBible.java
similarity index 100%
rename from app/src/testConfig/java/org/bspeice/minimalbible/MinimalBible.java
rename to app/src/debug/java/org/bspeice/minimalbible/MinimalBible.java
diff --git a/app/src/testConfig/java/org/bspeice/minimalbible/Modules.java b/app/src/debug/java/org/bspeice/minimalbible/Modules.java
similarity index 87%
rename from app/src/testConfig/java/org/bspeice/minimalbible/Modules.java
rename to app/src/debug/java/org/bspeice/minimalbible/Modules.java
index 0879293..aeb22bc 100644
--- a/app/src/testConfig/java/org/bspeice/minimalbible/Modules.java
+++ b/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
         };
diff --git a/app/src/testConfig/java/org/bspeice/minimalbible/TestModules.java b/app/src/debug/java/org/bspeice/minimalbible/TestModules.java
similarity index 100%
rename from app/src/testConfig/java/org/bspeice/minimalbible/TestModules.java
rename to app/src/debug/java/org/bspeice/minimalbible/TestModules.java
diff --git a/app/src/testConfig/java/org/bspeice/minimalbible/test/activity/FragmentTestActivity.java b/app/src/debug/java/org/bspeice/minimalbible/test/activity/FragmentTestActivity.java
similarity index 100%
rename from app/src/testConfig/java/org/bspeice/minimalbible/test/activity/FragmentTestActivity.java
rename to app/src/debug/java/org/bspeice/minimalbible/test/activity/FragmentTestActivity.java
diff --git a/app/src/testConfig/res/layout/activity_fragment_test.xml b/app/src/debug/res/layout/activity_fragment_test.xml
similarity index 100%
rename from app/src/testConfig/res/layout/activity_fragment_test.xml
rename to app/src/debug/res/layout/activity_fragment_test.xml
diff --git a/app/src/testConfig/res/menu/fragment_test.xml b/app/src/debug/res/menu/fragment_test.xml
similarity index 84%
rename from app/src/testConfig/res/menu/fragment_test.xml
rename to app/src/debug/res/menu/fragment_test.xml
index 9bb73ad..ca8d5fb 100644
--- a/app/src/testConfig/res/menu/fragment_test.xml
+++ b/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" >
-    <item android:id="@+id/action_settings"
-        android:title="@string/action_settings"
+    tools:context="org.bspeice.minimalbible.test.activity.FragmentTestActivity">
+    <item
+        android:id="@+id/action_settings"
         android:orderInCategory="100"
+        android:title="@string/action_settings"
         app:showAsAction="never" />
 </menu>
diff --git a/app/src/testConfig/res/values-w820dp/dimens.xml b/app/src/debug/res/values-w820dp/dimens.xml
similarity index 100%
rename from app/src/testConfig/res/values-w820dp/dimens.xml
rename to app/src/debug/res/values-w820dp/dimens.xml
diff --git a/app/src/testConfig/res/values/dimens.xml b/app/src/debug/res/values/dimens.xml
similarity index 100%
rename from app/src/testConfig/res/values/dimens.xml
rename to app/src/debug/res/values/dimens.xml
diff --git a/app/src/testConfig/res/values/strings.xml b/app/src/debug/res/values/strings.xml
similarity index 61%
rename from app/src/testConfig/res/values/strings.xml
rename to app/src/debug/res/values/strings.xml
index 981e6a3..e19613e 100644
--- a/app/src/testConfig/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-        <string name="title_activity_fragment_test">FragmentTestActivity</string>
+    <string name="title_activity_fragment_test">FragmentTestActivity</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
 </resources>
diff --git a/app/src/mainConfig/java/org/bspeice/minimalbible/MinimalBible.java b/app/src/release/java/org/bspeice/minimalbible/MinimalBible.java
similarity index 100%
rename from app/src/mainConfig/java/org/bspeice/minimalbible/MinimalBible.java
rename to app/src/release/java/org/bspeice/minimalbible/MinimalBible.java
diff --git a/app/src/mainConfig/java/org/bspeice/minimalbible/Modules.java b/app/src/release/java/org/bspeice/minimalbible/Modules.java
similarity index 100%
rename from app/src/mainConfig/java/org/bspeice/minimalbible/Modules.java
rename to app/src/release/java/org/bspeice/minimalbible/Modules.java