Merge branch 'feature/add_flavor' into develop

app/.gitignore

@@ -1 +1,2 @@
 /build
+/beforerelease/prerelease/output-metadata.json

app/build.gradle

@@ -2,18 +2,23 @@
 apply plugin: 'com.android.application'
 
 ext.versionMajor = 0
-ext.versionMinor = 55
-ext.versionPatch = 20211003
+ext.versionMinor = 60
+ext.versionPatch = 20211115
 ext.versionClassifier = null
 ext.isSnapshot = false
 ext.minimumSdkVersion = defaultMinSdkVersion
 ext.git_version= ("git rev-parse --short HEAD".execute().text.trim())
 
-
 android {
     signingConfigs {
         release {
         }
+        prerelease {
+            storeFile file('/home/jacques/.config/keystore')
+            storePassword 'nifgk/Cr'
+            keyAlias 'prerelase'
+            keyPassword 'nifgk/Cr'
+        }
     }
     compileSdkVersion 29
 
@@ -27,9 +32,37 @@ android {
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+            debuggable true
+            applicationIdSuffix ".debug"
+        }
         release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            debuggable false
+        }
+        prerelease {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            debuggable false
+            signingConfig signingConfigs.prerelease
+        }
+    }
+    flavorDimensions "version"
+    productFlavors {
+        dev {
+            resValue "string", "app_name", "PillDroid dev"
+            dimension ="version"
+        }
+
+        product {
+            resValue "string", "app_name", "PillDroid"
+            dimension ="version"
+        }
+        preproduct {
+            resValue "string", "app_name", "PillDroid Pre-Release"
+            dimension ="version"
         }
     }
 
@@ -70,12 +103,12 @@ dependencies {
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
-    implementation 'com.journeyapps:zxing-android-embedded:4.2.0'
+    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
     implementation 'androidx.core:core:1.6.0'
 
 //    debugImplementation 'com.amitshekhar.android:debug-db:1.0.6'
 
-    implementation 'io.sentry:sentry-android:5.2.0'
+    implementation 'io.sentry:sentry-android:5.4.0'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }
 

app/src/main/AndroidManifest.xml

@@ -53,7 +53,8 @@
 <!--        <service
             android:name=".PillDroidJobService"
             android:permission="android.permission.BIND_JOB_SERVICE" />-->
-        <receiver android:name="net.foucry.pilldroid.AlarmReceiver" >
+        <receiver android:name="net.foucry.pilldroid.AlarmReceiver"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>

app/src/main/res/values-fr-rFR/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">PillDroid</string>
     <string name="title_drug_detail">Détail Médicament</string>
     <string name="button_cancel">Annuler</string>
     <string name="button_ok">OK</string>

app/src/main/res/values/strings.xml

@@ -1,5 +1,4 @@
 <resources>
-    <string name="app_name">PillDroid</string>
     <string name="title_drug_detail">Drug Detail</string>
     <string name="button_cancel">Cancel</string>
     <string name="button_ok">OK</string>

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         maven {
             url 'https://maven.google.com/'
             name 'Google'
@@ -28,7 +28,7 @@ ext {
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         maven {
             url 'https://maven.google.com/'
             name 'Google'