upgrade.

11 files changed, 19 insertions, 19 deletions

diff --git a/android/app/BUCK b/android/app/BUCK
index 9c289fd..da3b3e5 100644
--- a/android/app/BUCK
+++ b/android/app/BUCK
@@ -46,13 +46,13 @@ android_library(
 
 android_build_config(
   name = 'build_config',
-  package = 'com.stronglifters.app',
+  package = 'com.stronglifters',
 )
 
 android_resource(
   name = 'res',
   res = 'src/main/res',
-  package = 'com.stronglifters.app',
+  package = 'com.stronglifters',
 )
 
 android_binary(
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 3c7b568..0ca098b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -87,11 +87,11 @@ android {
     buildToolsVersion "23.0.1"
 
     defaultConfig {
-        applicationId "com.stronglifters.app"
+        applicationId "com.stronglifters"
         minSdkVersion 16
-        targetSdkVersion 23
-        versionCode 10
-        versionName "1.9"
+        targetSdkVersion 22
+        versionCode 1
+        versionName "1.0"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
@@ -135,9 +135,9 @@ android {
 }
 
 dependencies {
+    compile project(':react-native-vector-icons')
     compile project(':realm')
     compile project(':react-native-svg')
-    compile project(':react-native-vector-icons')
     compile fileTree(dir: "libs", include: ["*.jar"])
     compile "com.android.support:appcompat-v7:23.0.1"
     compile "com.facebook.react:react-native:+"  // From node_modules
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 6668a7f..d3f18cf 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.stronglifters.app"
+    package="com.stronglifters"
     android:versionCode="1"
     android:versionName="1.0">
 
diff --git a/android/app/src/main/assets/fonts/FontAwesome.ttf b/android/app/src/main/assets/fonts/FontAwesome.ttf
index f221e50..35acda2 100644
--- a/android/app/src/main/assets/fonts/FontAwesome.ttf
+++ b/android/app/src/main/assets/fonts/FontAwesome.ttf
diff --git a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
new file mode 100644
index 0000000..fb79695
--- /dev/null
+++ b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf
index 0a62bb9..5b1f7d6 100644
--- a/android/app/src/main/assets/fonts/Octicons.ttf
+++ b/android/app/src/main/assets/fonts/Octicons.ttf
diff --git a/android/app/src/main/assets/fonts/SimpleLineIcons.ttf b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf
new file mode 100644
index 0000000..6ecb686
--- /dev/null
+++ b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf
diff --git a/android/app/src/main/java/com/stronglifters/app/MainActivity.java b/android/app/src/main/java/com/stronglifters/MainActivity.java
index 5fe8e04..8cbd430 100644
--- a/android/app/src/main/java/com/stronglifters/app/MainActivity.java
+++ b/android/app/src/main/java/com/stronglifters/MainActivity.java
@@ -1,4 +1,4 @@
-package com.stronglifters.app;
+package com.stronglifters;
 
 import com.facebook.react.ReactActivity;
 
@@ -10,6 +10,6 @@ public class MainActivity extends ReactActivity {
      */
     @Override
     protected String getMainComponentName() {
-        return "StrongLifters";
+        return "stronglifters";
     }
 }
diff --git a/android/app/src/main/java/com/stronglifters/app/MainApplication.java b/android/app/src/main/java/com/stronglifters/MainApplication.java
index 5998bd2..42652c3 100644
--- a/android/app/src/main/java/com/stronglifters/app/MainApplication.java
+++ b/android/app/src/main/java/com/stronglifters/MainApplication.java
@@ -1,12 +1,12 @@
-package com.stronglifters.app;
+package com.stronglifters;
 
 import android.app.Application;
 import android.util.Log;
 
 import com.facebook.react.ReactApplication;
-import io.realm.react.RealmReactPackage;
-import com.horcrux.svg.RNSvgPackage;
 import com.oblador.vectoricons.VectorIconsPackage;
+import io.realm.react.RealmReactPackage;
+import com.horcrux.svg.SvgPackage;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
@@ -28,9 +28,9 @@ public class MainApplication extends Application implements ReactApplication {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
+            new VectorIconsPackage(),
             new RealmReactPackage(),
-            new RNSvgPackage(),
-            new VectorIconsPackage()
+            new SvgPackage()
       );
     }
   };
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 92a5a62..86cb7c0 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">StrongLifters</string>
+    <string name="app_name">stronglifters</string>
 </resources>
diff --git a/android/settings.gradle b/android/settings.gradle
index 28c6f21..9b623ac 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,9 +1,9 @@
-rootProject.name = 'StrongLifters'
+rootProject.name = 'stronglifters'
+include ':react-native-vector-icons'
+project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 include ':realm'
 project(':realm').projectDir = new File(rootProject.projectDir, '../node_modules/realm/android')
 include ':react-native-svg'
 project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
-include ':react-native-vector-icons'
-project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 
 include ':app'