diff --git a/ComApp/android/app/build.gradle b/ComApp/android/app/build.gradle index 9a65c23..5fd9258 100644 --- a/ComApp/android/app/build.gradle +++ b/ComApp/android/app/build.gradle @@ -135,11 +135,11 @@ android { compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { - applicationId "com.comapp" + applicationId "com.comintl.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 - versionName "1.0" + versionName "1.2" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { @@ -217,6 +217,14 @@ android { keyAlias 'androiddebugkey' keyPassword 'android' } + 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 { @@ -225,7 +233,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/ComApp/android/app/src/main/ic_launcher-playstore.png b/ComApp/android/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..9937cab Binary files /dev/null and b/ComApp/android/app/src/main/ic_launcher-playstore.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/ComApp/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/ComApp/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ComApp/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/ComApp/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/ComApp/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index a2f5908..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..5fab4fe Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 1b52399..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index ff10afd..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..40265af Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 115a4c7..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index dcd3cd8..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..0919a4a Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 459ca60..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 8ca12fe..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..bbd6492 Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 8e19b41..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index b824ebd..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..b4ba36d Binary files /dev/null and b/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 4c19a13..0000000 Binary files a/ComApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/ComApp/android/app/src/main/res/values/ic_launcher_background.xml b/ComApp/android/app/src/main/res/values/ic_launcher_background.xml index cfa9be0..c5d5899 100644 --- a/ComApp/android/app/src/main/res/values/ic_launcher_background.xml +++ b/ComApp/android/app/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - - - #FFFFFF + + + #FFFFFF \ No newline at end of file diff --git a/ComApp/android/app/src/main/res/values/strings.xml b/ComApp/android/app/src/main/res/values/strings.xml index 3a3b5f9..116c7bc 100644 --- a/ComApp/android/app/src/main/res/values/strings.xml +++ b/ComApp/android/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ contain - ComApp + Commerciaux - LDC International diff --git a/ComApp/android/gradle.properties b/ComApp/android/gradle.properties index fa4feae..52ed1d8 100644 --- a/ComApp/android/gradle.properties +++ b/ComApp/android/gradle.properties @@ -38,3 +38,8 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 # to write custom TurboModules/Fabric components OR use libraries that # are providing them. newArchEnabled=false + +MYAPP_UPLOAD_STORE_FILE=upload.keystore +MYAPP_UPLOAD_KEY_ALIAS=app-native-1 +MYAPP_UPLOAD_STORE_PASSWORD=9LjCAts7qtetVqMT +MYAPP_UPLOAD_KEY_PASSWORD=9LjCAts7qtetVqMT diff --git a/ComApp/src/Database.js b/ComApp/src/Database.js index e2fb0f5..4e63cbe 100644 --- a/ComApp/src/Database.js +++ b/ComApp/src/Database.js @@ -97,7 +97,7 @@ const Database = { ContactsSchema, SendBrochureSchema, ], - //encryptionKey: new Int8Array(64) + encryptionKey: new Int8Array(64) }; export default Database;