diff options
| author | mo khan <mo@mokhan.ca> | 2016-12-23 13:11:05 -0700 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2016-12-23 13:11:05 -0700 |
| commit | dfaa3e00fc5e142fa8430ba801c3eb5ae73d37ed (patch) | |
| tree | d384bcec1dc6cce1e9281c7841747860de4ff0fc /android | |
| parent | 6d3ffe945c8833b71774003c3642fa1dd54609cc (diff) | |
regenerate app.
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/BUCK | 4 | ||||
| -rw-r--r-- | android/app/build.gradle | 15 | ||||
| -rw-r--r-- | android/app/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | android/app/src/main/assets/fonts/Entypo.ttf | bin | 65584 -> 0 bytes | |||
| -rw-r--r-- | android/app/src/main/assets/fonts/EvilIcons.ttf | bin | 13128 -> 0 bytes | |||
| -rw-r--r-- | android/app/src/main/assets/fonts/FontAwesome.ttf | bin | 152796 -> 0 bytes | |||
| -rw-r--r-- | android/app/src/main/assets/fonts/Foundation.ttf | bin | 56976 -> 0 bytes | |||
| -rw-r--r-- | android/app/src/main/assets/fonts/Ionicons.ttf | bin | 143936 -> 0 bytes | |||
| -rw-r--r-- | android/app/src/main/assets/fonts/MaterialIcons.ttf | bin | 128180 -> 0 bytes | |||
| -rw-r--r-- | android/app/src/main/assets/fonts/Octicons.ttf | bin | 30680 -> 0 bytes | |||
| -rw-r--r-- | android/app/src/main/assets/fonts/Zocial.ttf | bin | 25552 -> 0 bytes | |||
| -rw-r--r-- | android/app/src/main/java/com/stronglifters/MainActivity.java | 2 | ||||
| -rw-r--r-- | android/app/src/main/java/com/stronglifters/MainApplication.java | 8 | ||||
| -rw-r--r-- | android/settings.gradle | 4 |
14 files changed, 7 insertions, 28 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 a578739..d0d5909 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,6 +1,4 @@ apply plugin: "com.android.application" -apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle" -apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" import com.android.build.OutputFile @@ -89,7 +87,7 @@ android { buildToolsVersion "23.0.1" defaultConfig { - applicationId "com.stronglifters.app" + applicationId "com.stronglifters" minSdkVersion 16 targetSdkVersion 23 versionCode 2 @@ -98,14 +96,6 @@ android { abiFilters "armeabi-v7a", "x86" } } - signingConfigs { - release { - storeFile file(STRONGLIFTERS_RELEASE_STORE_FILE) - storePassword STRONGLIFTERS_RELEASE_STORE_PASSWORD - keyAlias STRONGLIFTERS_RELEASE_KEY_ALIAS - keyPassword STRONGLIFTERS_RELEASE_KEY_PASSWORD - } - } splits { abi { reset() @@ -118,7 +108,6 @@ android { release { minifyEnabled enableProguardInReleaseBuilds proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" - signingConfig signingConfigs.release } } // applicationVariants are e.g. debug, release @@ -137,8 +126,6 @@ android { } dependencies { - compile project(':react-native-vector-icons') - compile project(':react-native-config') 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/Entypo.ttf b/android/app/src/main/assets/fonts/Entypo.ttf Binary files differdeleted file mode 100644 index 1c8f5e9..0000000 --- a/android/app/src/main/assets/fonts/Entypo.ttf +++ /dev/null diff --git a/android/app/src/main/assets/fonts/EvilIcons.ttf b/android/app/src/main/assets/fonts/EvilIcons.ttf Binary files differdeleted file mode 100644 index b270f98..0000000 --- a/android/app/src/main/assets/fonts/EvilIcons.ttf +++ /dev/null diff --git a/android/app/src/main/assets/fonts/FontAwesome.ttf b/android/app/src/main/assets/fonts/FontAwesome.ttf Binary files differdeleted file mode 100644 index f221e50..0000000 --- a/android/app/src/main/assets/fonts/FontAwesome.ttf +++ /dev/null diff --git a/android/app/src/main/assets/fonts/Foundation.ttf b/android/app/src/main/assets/fonts/Foundation.ttf Binary files differdeleted file mode 100644 index 6cce217..0000000 --- a/android/app/src/main/assets/fonts/Foundation.ttf +++ /dev/null diff --git a/android/app/src/main/assets/fonts/Ionicons.ttf b/android/app/src/main/assets/fonts/Ionicons.ttf Binary files differdeleted file mode 100644 index 307ad88..0000000 --- a/android/app/src/main/assets/fonts/Ionicons.ttf +++ /dev/null diff --git a/android/app/src/main/assets/fonts/MaterialIcons.ttf b/android/app/src/main/assets/fonts/MaterialIcons.ttf Binary files differdeleted file mode 100644 index 7015564..0000000 --- a/android/app/src/main/assets/fonts/MaterialIcons.ttf +++ /dev/null diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf Binary files differdeleted file mode 100644 index 0a62bb9..0000000 --- a/android/app/src/main/assets/fonts/Octicons.ttf +++ /dev/null diff --git a/android/app/src/main/assets/fonts/Zocial.ttf b/android/app/src/main/assets/fonts/Zocial.ttf Binary files differdeleted file mode 100644 index e4ae46c..0000000 --- a/android/app/src/main/assets/fonts/Zocial.ttf +++ /dev/null diff --git a/android/app/src/main/java/com/stronglifters/MainActivity.java b/android/app/src/main/java/com/stronglifters/MainActivity.java index 5fe8e04..49278c5 100644 --- a/android/app/src/main/java/com/stronglifters/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; diff --git a/android/app/src/main/java/com/stronglifters/MainApplication.java b/android/app/src/main/java/com/stronglifters/MainApplication.java index 7a4e386..a829c5b 100644 --- a/android/app/src/main/java/com/stronglifters/MainApplication.java +++ b/android/app/src/main/java/com/stronglifters/MainApplication.java @@ -1,11 +1,9 @@ -package com.stronglifters.app; +package com.stronglifters; import android.app.Application; import android.util.Log; import com.facebook.react.ReactApplication; -import com.oblador.vectoricons.VectorIconsPackage; -import com.lugg.ReactNativeConfig.ReactNativeConfigPackage; import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; @@ -26,9 +24,7 @@ public class MainApplication extends Application implements ReactApplication { @Override protected List<ReactPackage> getPackages() { return Arrays.<ReactPackage>asList( - new MainReactPackage(), - new VectorIconsPackage(), - new ReactNativeConfigPackage() + new MainReactPackage() ); } }; diff --git a/android/settings.gradle b/android/settings.gradle index 612c3d8..7a7a9cd 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,7 +1,3 @@ rootProject.name = 'StrongLifters' include ':app' -include ':react-native-vector-icons' -project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android') -include ':react-native-config' -project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android') |
