diff --git a/android/app/_BUCK b/android/app/_BUCK index 0a812ef..d7af4e4 100644 --- a/android/app/_BUCK +++ b/android/app/_BUCK @@ -35,12 +35,12 @@ android_library( android_build_config( name = "build_config", - package = "com.rn_isac", + package = "com.isacsimo", ) android_resource( name = "res", - package = "com.rn_isac", + package = "com.isacsimo", res = "src/main/res", ) diff --git a/android/app/build.gradle b/android/app/build.gradle index c552826..3578e24 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -99,7 +99,7 @@ def enableSeparateBuildPerCPUArchitecture = false /** * Run Proguard to shrink the Java bytecode in release builds. */ -def enableProguardInReleaseBuilds = false +def enableProguardInReleaseBuilds = true /** * The preferred build flavor of JavaScriptCore. @@ -134,12 +134,12 @@ android { } defaultConfig { - applicationId "com.rn_isac" + applicationId "com.isacsimo" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 + versionCode 2 missingDimensionStrategy 'react-native-camera', 'general' - versionName "1.0" + versionName "1.0.2" renderscriptTargetApi rootProject.ext.renderscriptVersion renderscriptSupportModeEnabled true vectorDrawables.useSupportLibrary = true @@ -154,12 +154,22 @@ android { } signingConfigs { debug { - storeFile file('debug.keystore') - storePassword 'android' - keyAlias 'androiddebugkey' - keyPassword 'android' + if (project.hasProperty('MYAPP_UPLOAD_STORE_FILE')) { + storeFile file(MYAPP_UPLOAD_STORE_FILE) + storePassword MYAPP_UPLOAD_STORE_PASSWORD + keyAlias MYAPP_UPLOAD_KEY_ALIAS + keyPassword MYAPP_UPLOAD_KEY_PASSWORD + } + } + release { + if (project.hasProperty('MYAPP_UPLOAD_STORE_FILE')) { + storeFile file(MYAPP_UPLOAD_STORE_FILE) + storePassword MYAPP_UPLOAD_STORE_PASSWORD + keyAlias MYAPP_UPLOAD_KEY_ALIAS + keyPassword MYAPP_UPLOAD_KEY_PASSWORD } } + } buildTypes { debug { signingConfig signingConfigs.debug @@ -167,7 +177,7 @@ android { release { // Caution! In production, you need to generate your own keystore file. // see https://reactnative.dev/docs/signed-apk-android. - signingConfig signingConfigs.debug + signingConfig signingConfigs.release minifyEnabled enableProguardInReleaseBuilds proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } diff --git a/android/app/src/debug/java/com/rn_isac/ReactNativeFlipper.java b/android/app/src/debug/java/com/rn_isac/ReactNativeFlipper.java index 09311b5..088fb92 100644 --- a/android/app/src/debug/java/com/rn_isac/ReactNativeFlipper.java +++ b/android/app/src/debug/java/com/rn_isac/ReactNativeFlipper.java @@ -4,7 +4,7 @@ *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.rn_isac; +package com.isacsimo; import android.content.Context; import com.facebook.flipper.android.AndroidFlipperClient; diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 1237bb8..4bb2af6 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.isacsimo"> diff --git a/android/app/src/main/java/com/rn_isac/MainActivity.java b/android/app/src/main/java/com/isacsimo/MainActivity.java similarity index 86% rename from android/app/src/main/java/com/rn_isac/MainActivity.java rename to android/app/src/main/java/com/isacsimo/MainActivity.java index 3973266..927afec 100644 --- a/android/app/src/main/java/com/rn_isac/MainActivity.java +++ b/android/app/src/main/java/com/isacsimo/MainActivity.java @@ -1,4 +1,4 @@ -package com.rn_isac; +package com.isacsimo; import com.facebook.react.ReactActivity; @@ -10,6 +10,6 @@ public class MainActivity extends ReactActivity { */ @Override protected String getMainComponentName() { - return "rn_isac"; + return "isacsimo"; } } diff --git a/android/app/src/main/java/com/rn_isac/MainApplication.java b/android/app/src/main/java/com/isacsimo/MainApplication.java similarity index 95% rename from android/app/src/main/java/com/rn_isac/MainApplication.java rename to android/app/src/main/java/com/isacsimo/MainApplication.java index 6b28859..c8ebbe6 100644 --- a/android/app/src/main/java/com/rn_isac/MainApplication.java +++ b/android/app/src/main/java/com/isacsimo/MainApplication.java @@ -1,6 +1,6 @@ -package com.rn_isac; +package com.isacsimo; -import com.rn_isac.generated.BasePackageList; +import com.isacsimo.generated.BasePackageList; import android.app.Application; import android.content.Context; import com.facebook.react.PackageList; @@ -70,7 +70,7 @@ private static void initializeFlipper( We use reflection here to pick up the class that initializes Flipper, since Flipper library is not available in release mode */ - Class aClass = Class.forName("com.rn_isac.ReactNativeFlipper"); + Class aClass = Class.forName("com.isacsimo.ReactNativeFlipper"); aClass .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class) .invoke(null, context, reactInstanceManager); diff --git a/android/app/src/main/java/com/rn_isac/generated/BasePackageList.java b/android/app/src/main/java/com/isacsimo/generated/BasePackageList.java similarity index 83% rename from android/app/src/main/java/com/rn_isac/generated/BasePackageList.java rename to android/app/src/main/java/com/isacsimo/generated/BasePackageList.java index ff66151..24c7fa5 100644 --- a/android/app/src/main/java/com/rn_isac/generated/BasePackageList.java +++ b/android/app/src/main/java/com/isacsimo/generated/BasePackageList.java @@ -1,4 +1,4 @@ -package com.rn_isac.generated; +package com.isacsimo.generated; import java.util.Arrays; import java.util.List; diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 47f67be..2b13e80 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 9ce51db..9e5c24d 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index dbd467a..100456f 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index d733c83..6a52128 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 6e4d0d8..661c261 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 768a009..1d305b9 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index b9a5197..f5f6ecc 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 7e61255..2b24fd5 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 0431d30..e6caa72 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 912ce92..c8b0902 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/build.gradle b/android/build.gradle index 032b661..3d9c694 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,12 +2,12 @@ buildscript { ext { - buildToolsVersion = "29.0.3" + buildToolsVersion = "30.0.0" minSdkVersion = 21 - compileSdkVersion = 29 - targetSdkVersion = 29 + compileSdkVersion = 30 + targetSdkVersion = 30 renderscriptVersion = 21 - supportLibVersion = "29.0.3" + supportLibVersion = "30.0.0" ndkVersion = "20.1.5948944" } repositories { diff --git a/android/gradle.properties b/android/gradle.properties index e76f5ec..eed784a 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -29,3 +29,8 @@ FLIPPER_VERSION=0.75.1 org.gradle.daemon=true org.gradle.jvmargs=-Xmx2560m + +MYAPP_UPLOAD_STORE_FILE=my-upload-key.keystore +MYAPP_UPLOAD_KEY_ALIAS=my-key-alias +MYAPP_UPLOAD_STORE_PASSWORD=Bu1ldCh@nge +MYAPP_UPLOAD_KEY_PASSWORD=Bu1ldCh@nge diff --git a/android/settings.gradle b/android/settings.gradle index 5323ce4..bf9c699 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'rn_isac' +rootProject.name = 'isacsimo' include ':react-native-geolocation-service' project(':react-native-geolocation-service').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-geolocation-service/android') include ':react-native-get-location' diff --git a/app.json b/app.json index 57b27e5..4510955 100644 --- a/app.json +++ b/app.json @@ -1,4 +1,4 @@ { - "name": "rn_isac", - "displayName": "rn_isac" -} \ No newline at end of file + "name": "isacsimo", + "displayName": "isacsimo" +} diff --git a/assets/logo.png b/assets/logo.png index a6236e9..d95807b 100644 Binary files a/assets/logo.png and b/assets/logo.png differ diff --git a/ios/Podfile b/ios/Podfile index 4230808..50edaf2 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -3,7 +3,7 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ platform :ios, '10.0' -target 'rn_isac' do +target 'isacsimo' do config = use_native_modules! use_react_native!(:path => config[:reactNativePath], @@ -20,7 +20,7 @@ target 'rn_isac' do pod 'react-native-geolocation-service', :path => '../node_modules/react-native-geolocation-service' - target 'rn_isacTests' do + target 'isacsimoTests' do inherit! :complete # Pods for testing end diff --git a/ios/rn_isac.xcodeproj/xcshareddata/xcschemes/rn_isac.xcscheme b/ios/rn_isac.xcodeproj/xcshareddata/xcschemes/rn_isac.xcscheme index f7958a9..740ce88 100644 --- a/ios/rn_isac.xcodeproj/xcshareddata/xcschemes/rn_isac.xcscheme +++ b/ios/rn_isac.xcodeproj/xcshareddata/xcschemes/rn_isac.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "isacsimo.app" + BlueprintName = "isacsimo" + ReferencedContainer = "container:isacsimo.xcodeproj"> @@ -33,9 +33,9 @@ + BuildableName = "isacsimoTests.xctest" + BlueprintName = "isacsimoTests" + ReferencedContainer = "container:isacsimo.xcodeproj"> @@ -55,9 +55,9 @@ + BuildableName = "isacsimo.app" + BlueprintName = "isacsimo" + ReferencedContainer = "container:isacsimo.xcodeproj"> @@ -72,9 +72,9 @@ + BuildableName = "isacsimo.app" + BlueprintName = "isacsimo" + ReferencedContainer = "container:isacsimo.xcodeproj"> diff --git a/ios/rn_isac/AppDelegate.m b/ios/rn_isac/AppDelegate.m index 9007c3e..0a34e24 100644 --- a/ios/rn_isac/AppDelegate.m +++ b/ios/rn_isac/AppDelegate.m @@ -33,7 +33,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge - moduleName:@"rn_isac" + moduleName:@"isacsimo" initialProperties:nil]; if (@available(iOS 13.0, *)) { diff --git a/ios/rn_isac/Info.plist b/ios/rn_isac/Info.plist index b11fedc..190d5c5 100644 --- a/ios/rn_isac/Info.plist +++ b/ios/rn_isac/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - rn_isac + isacsimo CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/ios/rn_isac/LaunchScreen.storyboard b/ios/rn_isac/LaunchScreen.storyboard index 81716bd..8990bee 100644 --- a/ios/rn_isac/LaunchScreen.storyboard +++ b/ios/rn_isac/LaunchScreen.storyboard @@ -16,7 +16,7 @@ -