Add profile

app/build.gradle

@@ -4,19 +4,19 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 29
     buildToolsVersion "29.0.3"
 
-    buildFeatures {
-        dataBinding = true
+    dataBinding {
+        enabled = true
     }
 
     defaultConfig {
         applicationId "fr.sanchezm.attestationsCovid19"
         minSdkVersion 23
-        targetSdkVersion 30
-        versionCode 10
-        versionName "2.0.1"
+        targetSdkVersion 29
+        versionCode 6
+        versionName "1.0.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -74,20 +74,24 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     // Android X
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
 
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.1'
-    implementation 'androidx.navigation:navigation-fragment:2.3.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.1'
-    implementation 'androidx.navigation:navigation-ui:2.3.1'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.2.2'
+    implementation 'androidx.navigation:navigation-fragment:2.2.2'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
+    implementation 'androidx.navigation:navigation-ui:2.2.2'
 
     // Design
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.1.0'
+
+    // Room
+//    implementation 'androidx.room:room-runtime:2.2.5'
+//    kapt 'androidx.room:room-compiler:2.2.5'
 
     // PDF
     implementation 'com.tom_roush:pdfbox-android:1.8.10.1'
@@ -106,6 +110,6 @@ dependencies {
 
     // Test
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }

app/src/main/java/fr/sanchezm/attestationsCovid19/data/db/MyDatabase.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import fr.sanchezm.attestationsCovid19.data.db.dao.AttestationDao
 import fr.sanchezm.attestationsCovid19.data.db.dao.ConfigDao
 import fr.sanchezm.attestationsCovid19.data.db.dao.ProfileDao
+import fr.sanchezm.attestationsCovid19.data.repository.ConfigRepository
 
 class MyDatabase private constructor(private val savePath: String, private val filesPath: String) {
 
@@ -11,10 +12,15 @@ class MyDatabase private constructor(private val savePath: String, private val f
     private var _attestationDao: AttestationDao? = null
     private var _configDao: ConfigDao? = null
 
-    fun profileDao(): ProfileDao = _profileDao ?: ProfileDao(savePath).also { _profileDao = it }
+    fun profileDao(configRepository: ConfigRepository): ProfileDao =
+        _profileDao ?: ProfileDao(savePath, configRepository).also { _profileDao = it }
 
-    fun attestationDao(): AttestationDao =
-        _attestationDao ?: AttestationDao(savePath, filesPath).also { _attestationDao = it }
+    fun attestationDao(configRepository: ConfigRepository): AttestationDao =
+        _attestationDao ?: AttestationDao(
+            savePath,
+            filesPath,
+            configRepository
+        ).also { _attestationDao = it }
 
     fun configDao(): ConfigDao = _configDao ?: ConfigDao(savePath).also { _configDao = it }
 

app/src/main/java/fr/sanchezm/attestationsCovid19/data/db/dao/AttestationDao.kt

@@ -6,10 +6,15 @@ import androidx.lifecycle.MutableLiveData
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import fr.sanchezm.attestationsCovid19.data.db.entity.Attestation
+import fr.sanchezm.attestationsCovid19.data.repository.ConfigRepository
 import fr.sanchezm.attestationsCovid19.utilities.PdfUtils
 import java.io.File
 
-class AttestationDao(private val savePath: String, private val filesPath: String) {
+class AttestationDao(
+    private val savePath: String,
+    private val filesPath: String,
+    private val configRepository: ConfigRepository
+) {
 
     private val _attestations = MutableLiveData<ArrayList<Attestation>>()
     private val fileName = "attestation.db"
@@ -23,9 +28,8 @@ class AttestationDao(private val savePath: String, private val filesPath: String
         _attestations.value?.elementAt(id)
 
     fun addAttestation(attestation: Attestation) {
-        _attestations.value = _attestations.value ?: ArrayList()
-
         _attestations.value?.add(attestation)
+        _attestations.value = _attestations.value
         Log.d(TAG, "Add Attestation : $attestation")
         save()
     }
@@ -66,6 +70,8 @@ class AttestationDao(private val savePath: String, private val filesPath: String
 
         if (file.exists()) {
             _attestations.value = Gson().fromJson(file.readText(Charsets.UTF_8), type)
+        } else {
+            _attestations.value = ArrayList()
         }
         _attestations.value?.forEach {
             val filePath = PdfUtils.getPath(filesPath, it.createAt)

app/src/main/java/fr/sanchezm/attestationsCovid19/data/db/dao/ConfigDao.kt

@@ -33,7 +33,12 @@ class ConfigDao(private val savePath: String) {
             _config.value?.versionName = BuildConfig.VERSION_NAME
         } else {
             _config.value =
-                Config(BuildConfig.DB_VERSION, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)
+                Config(
+                    BuildConfig.DB_VERSION,
+                    BuildConfig.VERSION_NAME,
+                    BuildConfig.VERSION_CODE,
+                    -1
+                )
             save()
         }
     }

app/src/main/java/fr/sanchezm/attestationsCovid19/data/db/dao/ProfileDao.kt

@@ -1,48 +1,77 @@
 package fr.sanchezm.attestationsCovid19.data.db.dao
 
+import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import fr.sanchezm.attestationsCovid19.BuildConfig
 import fr.sanchezm.attestationsCovid19.data.db.entity.Profile
+import fr.sanchezm.attestationsCovid19.data.repository.ConfigRepository
+import fr.sanchezm.attestationsCovid19.utilities.DbMigration
 import java.io.File
 
-class ProfileDao(private val path: String) {
+class ProfileDao(private val path: String, private val configRepository: ConfigRepository) {
 
-    private val _profile = MutableLiveData<Profile>()
+    private val _profile = MutableLiveData<ArrayList<Profile>>()
     private val fileName = "profile.db"
+    private val type = object : TypeToken<ArrayList<Profile>>() {}.type
 
-    fun getProfile(): LiveData<Profile> =
-        _profile
+    @Suppress("UNCHECKED_CAST")
+    fun getProfiles(): LiveData<List<Profile>> =
+        _profile as LiveData<List<Profile>>
 
-    fun updateProfile(profile: Profile) {
-        _profile.value = profile
+    fun getProfile(id: Int): Profile? =
+        _profile.value?.get(id)
+
+    fun getProfileId(profile: Profile): Int? =
+        _profile.value?.indexOf(profile)
+
+    fun addProfile(profile: Profile): Int {
+        _profile.value?.add(profile)
+        _profile.value = _profile.value
         save()
+
+        return _profile.value?.indexOf(profile)!!
     }
 
     init {
-        load()
+        val currentDbVersion = configRepository.getConfig().value!!.dbVersion
+        val appDbVersion = BuildConfig.DB_VERSION
+
+        if (currentDbVersion != appDbVersion) {
+            if (currentDbVersion == 1 && appDbVersion == 2) {
+                _profile.value = DbMigration.migrateProfileFrom1To2("$path/$fileName")
+                save()
+                configRepository.getConfig().value!!.let {
+                    it.dbVersion = appDbVersion
+                    configRepository.updateConfig(it)
+                }
+                Log.d(TAG, "Db version update from $currentDbVersion to $appDbVersion")
+            } else {
+                File("$path/$fileName").delete()
+                load()
+            }
+        } else {
+            load()
+        }
     }
 
     private fun load() {
         val file = File("$path/$fileName")
 
         if (file.exists()) {
-            _profile.value = Gson().fromJson(file.readText(Charsets.UTF_8), Profile::class.java)
+            _profile.value = Gson().fromJson(file.readText(Charsets.UTF_8), type)
         } else {
-            _profile.value = Profile("", "", "", "", "", "", "")
+            _profile.value = ArrayList()
         }
     }
 
     private fun save() {
         File("$path/$fileName").writeText(Gson().toJson(_profile.value))
     }
-}
 
-//@Dao
-//interface ProfileDao {
-//    @Insert(onConflict = OnConflictStrategy.REPLACE)
-//    fun insert(profile: Profile)
-//
-//    @Query(value = "SELECT * FROM profile WHERE id = $CURRENT_PROFILE_ID")
-//    fun getProfile(): LiveData<Profile>
-//}
+    companion object {
+        private val TAG = ProfileDao::class.simpleName
+    }
+}

app/src/main/java/fr/sanchezm/attestationsCovid19/data/db/entity/Attestation.kt

@@ -3,9 +3,8 @@ package fr.sanchezm.attestationsCovid19.data.db.entity
 import java.text.SimpleDateFormat
 import java.util.*
 
-const val PATTERN = "dd/MM/yyyy 'à' HH:mm"
+const val PATTERN = "dd/MM/yyyy 'a' HH'h'mm"
 
-//@Entity(tableName = "attestation")
 data class Attestation(
     val profile: Profile,
     val exitDate: String,
@@ -14,7 +13,7 @@ data class Attestation(
     val reasons: List<Int>
 ) {
     override fun toString(): String {
-        return "Cree le: ${getDate(createAt)};\n$profile;\nSortie: ${getExitDateFormatted()};\nMotifs: ${getMotifsText()}"
+        return "Cree le: ${getDate(createAt)}; $profile; Sortie: ${getExitDateFormatted()}; Motifs: ${getMotifsText()}"
     }
 
     fun getNameFormatted(): String = "${profile.firstName} ${profile.lastName}"
@@ -28,23 +27,21 @@ data class Attestation(
     private fun getMotifsText(): String {
         val motifs = StringBuilder()
 
-        reasons.forEach { motifs.append(getMotifText(it), ", ") }
-        return motifs.toString().dropLast(2)
+        reasons.forEach { motifs.append(getMotifText(it), "-") }
+        return motifs.toString().dropLast(1)
     }
 
     private fun getDate(dateTime: Long): String = SimpleDateFormat(PATTERN, Locale.FRANCE).format(Date(dateTime))
 
-    fun getMotifText(i: Int): String {
+    private fun getMotifText(i: Int): String {
         return when (i) {
             1 -> "travail"
-            2 -> "achats_culturel_culturel"
+            2 -> "courses"
             3 -> "sante"
             4 -> "famille"
-            5 -> "handicap"
-            6 -> "sport_animaux"
-            7 -> "convocation"
-            8 -> "missions"
-            9 -> "enfants"
+            5 -> "sport"
+            6 -> "judiciare"
+            7 -> "missions"
             else -> "Error $i not found"
         }
     }

app/src/main/java/fr/sanchezm/attestationsCovid19/data/db/entity/Config.kt

@@ -1,7 +1,8 @@
 package fr.sanchezm.attestationsCovid19.data.db.entity
 
 data class Config(
-    val dbVersion: Int,
+    var dbVersion: Int,
     var versionName: String,
-    var versionCode: Int
+    var versionCode: Int,
+    var selectProfileId: Int
 )

app/src/main/java/fr/sanchezm/attestationsCovid19/data/db/entity/Profile.kt

@@ -1,6 +1,5 @@
 package fr.sanchezm.attestationsCovid19.data.db.entity
 
-//@Entity(tableName = "profile")
 data class Profile(
     val firstName: String,
     val lastName: String,
@@ -10,10 +9,8 @@ data class Profile(
     val city: String,
     val postalCode: String
 ) {
-//    @PrimaryKey
-//    var id: Int = CURRENT_PROFILE_ID
 
     override fun toString(): String {
-        return "Nom: $lastName;\nPrenom: $firstName;\nNaissance: $birthday a $birthPlace;\nAdresse: $address $postalCode $city"
+        return "Nom: $lastName; Prenom: $firstName; Naissance: $birthday a $birthPlace; Adresse: $address $postalCode $city"
     }
 }

app/src/main/java/fr/sanchezm/attestationsCovid19/data/repository/ProfileRepository.kt

@@ -6,11 +6,14 @@ import fr.sanchezm.attestationsCovid19.data.db.entity.Profile
 
 class ProfileRepository private constructor(private val profileDao: ProfileDao) {
 
-    fun getProfile(): LiveData<Profile> =
-        profileDao.getProfile()
+    fun getProfiles(): LiveData<List<Profile>> =
+        profileDao.getProfiles()
 
-    fun insertProfile(profile: Profile) =
-        profileDao.updateProfile(profile)
+    fun getProfile(id: Int): Profile? =
+        profileDao.getProfile(id)
+
+    fun insertProfile(profile: Profile): Int =
+        profileDao.addProfile(profile)
 
     companion object {
         @Volatile

app/src/main/java/fr/sanchezm/attestationsCovid19/ui/add/AddViewModel.kt

@@ -1,9 +1,6 @@
 package fr.sanchezm.attestationsCovid19.ui.add
 
 import android.annotation.SuppressLint
-import android.app.DatePickerDialog
-import android.app.TimePickerDialog
-import android.content.Context
 import android.os.Build
 import android.util.Log
 import androidx.lifecycle.LiveData
@@ -16,7 +13,6 @@ import fr.sanchezm.attestationsCovid19.data.repository.AttestationRepository
 import fr.sanchezm.attestationsCovid19.data.repository.ConfigRepository
 import fr.sanchezm.attestationsCovid19.data.repository.ProfileRepository
 import fr.sanchezm.attestationsCovid19.utilities.Event
-import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
@@ -25,8 +21,7 @@ import java.util.*
 class AddViewModel(
     private val configRepository: ConfigRepository,
     private val profileRepository: ProfileRepository,
-    private val attestationRepository: AttestationRepository,
-    private val app: Context
+    private val attestationRepository: AttestationRepository
 ) : ViewModel() {
 
     private val _errorMessage = MutableLiveData<Event<Int>>()
@@ -60,12 +55,10 @@ class AddViewModel(
     val reason5 = MutableLiveData(false)
     val reason6 = MutableLiveData(false)
     val reason7 = MutableLiveData(false)
-    val reason8 = MutableLiveData(false)
-    val reason9 = MutableLiveData(false)
     // endregion
 
     private val datePattern = "dd/MM/yyyy"
-    private val timePattern = "HH:mm"
+    private val timePattern = "HH'h'mm"
 
     @SuppressLint("LongLogTag")
     fun onGenerateAttestationClick() {
@@ -82,83 +75,21 @@ class AddViewModel(
         }
     }
 
-    fun onBirthdayClick() {
-        val c = Calendar.getInstance().also { it.set(1970, 0, 1) }
-        if (!birthday.value.isNullOrBlank()) {
-            birthday.value?.let { birthday ->
-                DateFormat.getDateInstance(DateFormat.SHORT, Locale.FRANCE).parse(birthday)
-                    ?.let { c.time = it }
-            }
-        }
-        val year = c.get(Calendar.YEAR)
-        val month = c.get(Calendar.MONTH)
-        val day = c.get(Calendar.DAY_OF_MONTH)
-
-        val dpd = DatePickerDialog(
-            app,
-            DatePickerDialog.OnDateSetListener { _, yearPicked, monthOfYear, dayOfMonth ->
-                birthday.value =
-                    "${getFormattedDayOrMonth(dayOfMonth)}/${getFormattedDayOrMonth(monthOfYear + 1)}/$yearPicked"
-            },
-            year,
-            month,
-            day
-        )
-        dpd.show()
-    }
-
-    fun onExitDateClick() {
-        val c = Calendar.getInstance()
-        val year = c.get(Calendar.YEAR)
-        val month = c.get(Calendar.MONTH)
-        val day = c.get(Calendar.DAY_OF_MONTH)
-
-        val dpd = DatePickerDialog(
-            app,
-            DatePickerDialog.OnDateSetListener { _, yearPicked, monthOfYear, dayOfMonth ->
-                exitDate.value =
-                    "${getFormattedDayOrMonth(dayOfMonth)}/${getFormattedDayOrMonth(monthOfYear + 1)}/$yearPicked"
-            },
-            year,
-            month,
-            day
-        )
-        dpd.show()
-    }
-
-    fun onExitHourClick() {
-        val c = Calendar.getInstance()
-        val hour = c.get(Calendar.HOUR_OF_DAY)
-        val minute = c.get(Calendar.MINUTE)
-
-        val tpd = TimePickerDialog(
-            app,
-            TimePickerDialog.OnTimeSetListener { _, hourPicked, minutePicked ->
-                exitHour.value =
-                    "${getFormattedDayOrMonth(hourPicked)}:${getFormattedDayOrMonth(minutePicked)}"
-            },
-            hour,
-            minute,
-            true
-        )
-        tpd.show()
-    }
-
     init {
         setProfileValue()
         setDateHourToday()
     }
 
     private fun setProfileValue() {
-        val profile = profileRepository.getProfile()
+        val profile = profileRepository.getProfiles().value?.first()
 
-        firstName.value = profile.value?.firstName
-        lastName.value = profile.value?.lastName
-        birthday.value = profile.value?.birthday
-        birthPlace.value = profile.value?.birthPlace
-        address.value = profile.value?.address
-        city.value = profile.value?.city
-        postalCode.value = profile.value?.postalCode
+        firstName.value = profile?.firstName
+        lastName.value = profile?.lastName
+        birthday.value = profile?.birthday
+        birthPlace.value = profile?.birthPlace
+        address.value = profile?.address
+        city.value = profile?.city
+        postalCode.value = profile?.postalCode
     }
 
     private fun setDateHourToday() {
@@ -206,8 +137,6 @@ class AddViewModel(
         if (reason5.value!!) reasons.add(5)
         if (reason6.value!!) reasons.add(6)
         if (reason7.value!!) reasons.add(7)
-        if (reason8.value!!) reasons.add(8)
-        if (reason9.value!!) reasons.add(9)
 
         return reasons
     }
@@ -233,17 +162,6 @@ class AddViewModel(
                 || reason5.value!!
                 || reason6.value!!
                 || reason7.value!!
-                || reason8.value!!
-                || reason9.value!!
-    }
-
-    private fun getFormattedDayOrMonth(date: Int): String {
-        var formattedDate: String = date.toString()
-
-        if (formattedDate.length <= 1) {
-            formattedDate = "0$formattedDate"
-        }
-        return formattedDate
     }
 
 }

app/src/main/java/fr/sanchezm/attestationsCovid19/ui/add/AddViewModelFactory.kt

@@ -1,6 +1,5 @@
 package fr.sanchezm.attestationsCovid19.ui.add
 
-import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import fr.sanchezm.attestationsCovid19.data.repository.AttestationRepository
@@ -10,13 +9,12 @@ import fr.sanchezm.attestationsCovid19.data.repository.ProfileRepository
 class AddViewModelFactory(
     private val configRepository: ConfigRepository,
     private val profileRepository: ProfileRepository,
-    private val attestationRepository: AttestationRepository,
-    private val app: Context
+    private val attestationRepository: AttestationRepository
 ) :
     ViewModelProvider.NewInstanceFactory() {
 
     @Suppress("UNCHECKED_CAST")
     override fun <T : ViewModel?> create(modelClass: Class<T>): T {
-        return AddViewModel(configRepository, profileRepository, attestationRepository, app) as T
+        return AddViewModel(configRepository, profileRepository, attestationRepository) as T
     }
 }

app/src/main/java/fr/sanchezm/attestationsCovid19/ui/info/InfoFragment.kt

@@ -1,15 +1,15 @@
 package fr.sanchezm.attestationsCovid19.ui.info
 
-import android.os.Bundle
+import android.os.Bundle;
 import android.text.method.LinkMovementMethod
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView
 import androidx.fragment.app.Fragment
 import fr.sanchezm.attestationsCovid19.BuildConfig
 
-import fr.sanchezm.attestationsCovid19.R
-import kotlinx.android.synthetic.main.fragment_info.view.*
+import fr.sanchezm.attestationsCovid19.R;
 
 class InfoFragment : Fragment() {
 
@@ -20,20 +20,13 @@ class InfoFragment : Fragment() {
     ): View? {
         val root = inflater.inflate(R.layout.fragment_info, container, false)
 
-        root.explication_4.movementMethod = LinkMovementMethod.getInstance()
-        root.credits_1.movementMethod = LinkMovementMethod.getInstance()
-        root.credits_2.movementMethod = LinkMovementMethod.getInstance()
-        root.credits_3.movementMethod = LinkMovementMethod.getInstance()
-        root.credits_4.movementMethod = LinkMovementMethod.getInstance()
-        root.credits_5.movementMethod = LinkMovementMethod.getInstance()
-
-        root.develop_by.movementMethod = LinkMovementMethod.getInstance()
-        root.version.text = getVersionText()
+        root.findViewById<TextView>(R.id.develop_by).movementMethod = LinkMovementMethod.getInstance()
+        root.findViewById<TextView>(R.id.version).text = getVersionText()
         return root
     }
 
     private fun getVersionText(): String {
-        val versionText = getString(R.string.version_number)
+        val versionText = getString(R.string.version_number);
         val versionName = BuildConfig.VERSION_NAME
 
         return "$versionText $versionName"

app/src/main/java/fr/sanchezm/attestationsCovid19/utilities/DbMigration.kt

@@ -0,0 +1,22 @@
+package fr.sanchezm.attestationsCovid19.utilities
+
+import com.google.gson.Gson
+import fr.sanchezm.attestationsCovid19.data.db.entity.Profile
+import java.io.File
+
+object DbMigration {
+
+    fun migrateProfileFrom1To2(filename: String): ArrayList<Profile> {
+        val file = File(filename)
+        val list = ArrayList<Profile>()
+
+        val profile: Profile = if (file.exists()) {
+            Gson().fromJson(file.readText(Charsets.UTF_8), Profile::class.java)
+        } else {
+            Profile("", "", "", "", "", "", "")
+        }
+        list.add(profile)
+
+        return list
+    }
+}

app/src/main/java/fr/sanchezm/attestationsCovid19/utilities/InjectorUtils.kt

@@ -16,8 +16,7 @@ object InjectorUtils {
         AddViewModelFactory(
             getConfigRepo(context),
             getProfileRepo(context),
-            getAttestationRepo(context),
-            context
+            getAttestationRepo(context)
         )
 
     fun provideAttestationViewModel(context: Context): AttestationsViewModelFactory =
@@ -40,11 +39,12 @@ object InjectorUtils {
 
     private fun getAttestationRepo(context: Context): AttestationRepository =
         AttestationRepository.getInstance(
-            MyDatabase.invoke(context, getMyFilesDir(context)).attestationDao()
+            MyDatabase.invoke(context, getMyFilesDir(context))
+                .attestationDao(getConfigRepo(context))
         )
 
     private fun getProfileRepo(context: Context): ProfileRepository = ProfileRepository.getInstance(
-        MyDatabase.invoke(context, getMyFilesDir(context)).profileDao()
+        MyDatabase.invoke(context, getMyFilesDir(context)).profileDao(getConfigRepo(context))
     )
 
     private fun getConfigRepo(context: Context): ConfigRepository = ConfigRepository.getInstance(

app/src/main/java/fr/sanchezm/attestationsCovid19/utilities/PdfUtils.kt

@@ -21,8 +21,8 @@ class PdfUtils private constructor(
     private val path: String
 ) {
 
-    // private val checkboxListNames = ArrayList<String>()
-    // private val font = PDType1Font.HELVETICA
+    private val checkboxListNames = ArrayList<String>()
+    private val font = PDType1Font.HELVETICA
 
     fun fillForm(attestation: Attestation, callback: (Boolean) -> Unit) {
         checkFolder()
@@ -54,7 +54,7 @@ class PdfUtils private constructor(
 
     private fun addPageWithQrCode(document: PDDocument, attestation: Attestation) {
         val size = 360
-        val margin = 25f
+        val margin = 40f
 
 //      Add QRCode on the first page
         val page1: PDPage = document.pages.first()
@@ -64,8 +64,9 @@ class PdfUtils private constructor(
             page1,
             attestation,
             size / 3,
-            page1.mediaBox.upperRightX - margin - size / 3,
-            25f
+            page1.mediaBox.upperRightX - margin - size / 3 - 30,
+            141f,
+            true
         )
 
         // Add QRCode on a new page
@@ -82,7 +83,8 @@ class PdfUtils private constructor(
         attestation: Attestation,
         size: Int,
         x: Float,
-        y: Float
+        y: Float,
+        addText: Boolean = false
     ) {
 
         val contentStream = PDPageContentStream(document, page, true, false)
@@ -90,7 +92,21 @@ class PdfUtils private constructor(
             LosslessFactory.createFromImage(document, QRCodeUtils.getQrCode(attestation, size))
 
         contentStream.drawImage(alphaXimage, x, y)
+        if (addText) {
+            contentStream.beginText()
+            contentStream.setFont(font, 7f)
+            contentStream.newLineAtOffset(page.mediaBox.upperRightX - size - 20, 145f)
+            contentStream.showText("Date de création:")
+            contentStream.endText()
+
+            contentStream.beginText()
+            contentStream.setFont(font, 7f)
+            contentStream.newLineAtOffset(page.mediaBox.upperRightX - size - 27, 138f)
+            contentStream.showText(attestation.getCreatedAtFormattedDate())
+            contentStream.endText()
+        }
         contentStream.close()
+
     }
 
     private fun setFieldsData(acroForm: PDAcroForm, attestation: Attestation): Boolean {
@@ -101,18 +117,21 @@ class PdfUtils private constructor(
             val namesField = acroForm.getField("Nom et prénom") as PDTextField
             val birthdayField = acroForm.getField("Date de naissance") as PDTextField
             val birthPlaceField = acroForm.getField("Lieu de naissance") as PDTextField
-            val addressField = acroForm.getField("Adresse") as PDTextField
+            val addressField = acroForm.getField("Adresse actuelle") as PDTextField
             val cityField = acroForm.getField("Ville") as PDTextField
             val dateField = acroForm.getField("Date") as PDTextField
-            val exitField = acroForm.getField("Heure") as PDTextField
+            val hourField = acroForm.getField("Heure") as PDTextField
+            val minutesField = acroForm.getField("Minute") as PDTextField
+//            val signatureField = acroForm.getField("Signature") as PDTextField
 
             namesField.value = "${profile.firstName} ${profile.lastName}"
             birthdayField.value = profile.birthday
             birthPlaceField.value = profile.birthPlace
-            addressField.value = "${profile.address}, ${profile.city} ${profile.postalCode}"
+            addressField.value = "${profile.address} ${profile.postalCode} ${profile.city}"
             cityField.value = profile.city
             dateField.value = attestation.exitDate
-            exitField.value = attestation.exitHour.replace('h', ':')
+            hourField.value = attestation.exitHour.split("h")[0]
+            minutesField.value = attestation.exitHour.split("h")[1]
             return true
         } catch (e: Exception) {
             Log.e(TAG, "${e.message}")
@@ -122,7 +141,7 @@ class PdfUtils private constructor(
 
     private fun setCheckboxFields(acroForm: PDAcroForm, attestation: Attestation) {
         attestation.reasons.forEach {
-            (acroForm.getField("distinction Motif $it") as PDCheckbox).check()
+            (acroForm.getField(checkboxListNames[it - 1]) as PDCheckbox).check()
         }
     }
 
@@ -144,10 +163,20 @@ class PdfUtils private constructor(
         fun getInstance() = instance
 
         fun getInstance(assetManager: AssetManager, path: String) = instance ?: synchronized(LOCK) {
-            instance ?: PdfUtils(assetManager, path).also { instance = it }
+            instance ?: PdfUtils(assetManager, path).also { instance = it; it.initList() }
         }
 
         fun getPath(path: String, createAt: Long): String = "$path/$folderPath/$createAt.pdf"
 
     }
+
+    private fun initList() {
+        checkboxListNames.add("Déplacements entre domicile et travail")
+        checkboxListNames.add("Déplacements achats nécéssaires")
+        checkboxListNames.add("Consultations et soins")
+        checkboxListNames.add("Déplacements pour motif familial")
+        checkboxListNames.add("Déplacements brefs (activité physique et animaux)")
+        checkboxListNames.add("Convcation judiciaire ou administrative")
+        checkboxListNames.add("Mission d'intérêt général")
+    }
 }

app/src/main/res/layout-v26/fragment_info.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingHorizontal="30dp"
+    android:paddingVertical="20dp">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="30sp"
+        android:layout_marginTop="15dp"
+        android:textStyle="bold"
+        android:textColor="?attr/colorPrimaryDark"
+        android:text="@string/title_info"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/explication_1"
+        android:text="@string/explication_1"
+        android:layout_marginTop="40dp"
+        style="@style/TextView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/title" />
+
+    <TextView
+        android:id="@+id/explication_2"
+        android:text="@string/explication_2"
+        style="@style/TextView"
+        android:justificationMode="inter_word"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/explication_1" />
+
+    <TextView
+        android:id="@+id/explication_3"
+        android:text="@string/explication_3"
+        style="@style/TextView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/explication_2" />
+
+    <TextView
+        android:id="@+id/explication_4"
+        android:text="@string/explication_4"
+        style="@style/TextView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/explication_3" />
+
+    <TextView
+        android:id="@+id/develop_by"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:textColor="?attr/colorPrimaryDark"
+        android:text="@string/develop_by"
+        android:layout_marginBottom="5dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/version" />
+
+    <TextView
+        android:id="@+id/version"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/version_number"
+        android:textSize="12sp"
+        android:textColor="?attr/colorAccent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/attestation_item.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@drawable/custom_rectangle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="15dp"
-    android:background="@drawable/custom_rectangle"
     android:padding="15dp">
 
     <TextView
@@ -13,50 +13,50 @@
         android:layout_height="wrap_content"
         android:text="@string/people_item"
         android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
         android:id="@+id/date_item"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
         android:text="@string/date_item"
+        android:layout_marginTop="3dp"
         android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/people_item" />
+        app:layout_constraintTop_toBottomOf="@+id/people_item"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
         android:id="@+id/reason_item"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
         android:text="@string/reason_item"
+        android:layout_marginTop="3dp"
         android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/date_item" />
+        app:layout_constraintTop_toBottomOf="@+id/date_item"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
         android:id="@+id/people_item_data"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <TextView
         android:id="@+id/date_item_data"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/people_item_data" />
+        app:layout_constraintTop_toBottomOf="@id/people_item_data"
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <TextView
         android:id="@+id/reason_item_data"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/date_item_data" />
+        app:layout_constraintTop_toBottomOf="@id/date_item_data"
+        app:layout_constraintEnd_toEndOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_add_attestation.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".ui.add.AddFragment">
 
     <data>
@@ -12,9 +12,9 @@
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/constraintContext"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:id="@+id/constraintContext">
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
@@ -34,10 +34,10 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:textStyle="bold"
                     android:text="@string/attestation_title"
                     android:textColor="?attr/colorPrimary"
-                    android:textSize="25sp"
-                    android:textStyle="bold" />
+                    android:textSize="25sp" />
 
                 <TextView
                     android:layout_width="match_parent"
@@ -88,11 +88,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:inputType="date"
-                        android:focusable="false"
-                        android:onClick="@{() -> viewModel.onBirthdayClick()}"
                         android:text="@={viewModel.birthday}"
                         app:validateDate='@{"dd/MM/yyyy"}'
-                        app:validateDateMessage="@{@string/date_error_message}" />
+                        app:validateDateMessage="@{@string/date_error_message}"/>
 
                 </com.google.android.material.textfield.TextInputLayout>
 
@@ -121,7 +119,7 @@
                     <com.google.android.material.textfield.TextInputEditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:inputType="textPostalAddress|textCapWords"
+                        android:inputType="number|textCapWords"
                         android:text="@={viewModel.address}" />
 
                 </com.google.android.material.textfield.TextInputLayout>
@@ -166,12 +164,10 @@
                     <com.google.android.material.textfield.TextInputEditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:focusable="false"
                         android:inputType="date"
-                        android:onClick="@{() -> viewModel.onExitDateClick()}"
                         android:text="@={viewModel.exitDate}"
                         app:validateDate='@{"dd/MM/yyyy"}'
-                        app:validateDateMessage="@{@string/date_error_message}" />
+                        app:validateDateMessage="@{@string/date_error_message}"/>
 
                 </com.google.android.material.textfield.TextInputLayout>
 
@@ -185,9 +181,7 @@
                     <com.google.android.material.textfield.TextInputEditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:focusable="false"
                         android:inputType="time"
-                        android:onClick="@{() -> viewModel.onExitHourClick()}"
                         android:text="@={viewModel.exitHour}" />
 
                 </com.google.android.material.textfield.TextInputLayout>
@@ -256,22 +250,6 @@
                     android:checked="@={viewModel.reason7}"
                     android:text="@string/reason_7" />
 
-                <com.google.android.material.checkbox.MaterialCheckBox
-                    android:id="@+id/reason_8"
-                    style="@style/MaterialCheckBox"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:checked="@={viewModel.reason8}"
-                    android:text="@string/reason_8" />
-
-                <com.google.android.material.checkbox.MaterialCheckBox
-                    android:id="@+id/reason_9"
-                    style="@style/MaterialCheckBox"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:checked="@={viewModel.reason9}"
-                    android:text="@string/reason_9" />
-
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/generate_attestation"
                     android:layout_width="match_parent"
@@ -279,6 +257,7 @@
                     android:layout_marginTop="20dp"
                     android:onClick="@{() -> viewModel.onGenerateAttestationClick()}"
                     android:text="@string/generate_attestation_button" />
+                <!--                android:enabled="false"-->
 
 
             </LinearLayout>

app/src/main/res/layout/fragment_info.xml

@@ -22,7 +22,7 @@
     <TextView
         android:id="@+id/explication_1"
         android:text="@string/explication_1"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="40dp"
         style="@style/TextView"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -52,58 +52,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/explication_3" />
 
-    <TextView
-        android:layout_marginTop="20dp"
-        android:id="@+id/credits_title"
-        android:text="@string/credits_title"
-        android:textSize="17sp"
-        android:textStyle="bold"
-        style="@style/TextViewCredits"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/explication_4" />
-
-    <TextView
-        android:layout_marginTop="10dp"
-        android:id="@+id/credits_1"
-        android:text="@string/credits_1"
-        style="@style/TextViewCredits"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/credits_title" />
-
-    <TextView
-        android:id="@+id/credits_2"
-        android:text="@string/credits_2"
-        style="@style/TextViewCredits"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/credits_1" />
-
-    <TextView
-        android:id="@+id/credits_3"
-        android:text="@string/credits_3"
-        style="@style/TextViewCredits"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/credits_2" />
-
-    <TextView
-        android:id="@+id/credits_4"
-        android:text="@string/credits_4"
-        style="@style/TextViewCredits"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/credits_3" />
-
-    <TextView
-        android:id="@+id/credits_5"
-        android:text="@string/credits_5"
-        style="@style/TextViewCredits"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/credits_4" />
-
     <TextView
         android:id="@+id/develop_by"
         android:layout_width="wrap_content"

app/src/main/res/values-v26/styles.xml

@@ -4,7 +4,7 @@
     <style name="TextView">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">@dimen/margin15dp</item>
+        <item name="android:layout_marginTop">@dimen/margin20dp</item>
         <item name="android:textColor">@color/colorPrimary</item>
         <item name="android:textSize">@dimen/textSize18sp</item>
         <item name="android:justificationMode">inter_word</item>

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

@@ -4,6 +4,6 @@
     <!-- Validator -->
     <string name="date_error_message">Votre date doit être au format 01/01/1970</string>
 
-    <string name="error_cannot_create_attestation">Erreur lors de la génération de l\'attestation, tout les champs ne sont pas complétés</string>
+    <string name="error_cannot_create_attestation">Erreur lors de la génération de l\'attestation, tout les champs ne sont pas compléter</string>
     <string name="error_failed_create_pdf">Erreur lors de la génération de l\'attestion, veuillez vérifiez vos champs ou contacter le développeur.</string>
 </resources>

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

@@ -5,9 +5,9 @@
     <string name="title_info">À Propos</string>
 
     <!-- Attestation Fragment -->
-    <string name="attestation_title">@string/app_name</string>
-    <string name="attestation_subtitle">Restons chez nous pour nous protéger et protéger les autres</string>
-    <string name="attestation_generated">Attestation générée</string>
+    <string name="attestation_title">Attestation de déplacement dérogatoire</string>
+    <string name="attestation_subtitle">#RestonsChezNous</string>
+    <string name="attestation_generated">Attestation générer</string>
     <string name="no_attestation">Aucune attestation, veuillez en générer une.</string>
 
     <!-- Field for attestation -->
@@ -18,34 +18,26 @@
     <string name="address">Adresse</string>
     <string name="city">Ville</string>
     <string name="postal_code">Code Postal</string>
+    <string name="reason">Choisissez le ou les motif(s) de sortie</string>
     <string name="exit_date">Date de sortie</string>
     <string name="exit_hour">Heure de sortie</string>
     <string name="generate_attestation_button">Générer l\'attestation</string>
 
     <!-- Reasons for leaving house -->
-    <string name="reason">Je certifie que mon déplacement est lié au(x) motif(s) suivant (cocher la case) autorisé en application des mesures générales nécessaires pour faire face à l’épidémie de Covid19 dans le cadre de l’état d’urgence sanitaire :</string>
-    <string name="reason_1">1. Déplacements entre le domicile et le lieu d’exercice de l’activité professionnelle ou un établissement d’enseignement ou de formation ; déplacements professionnels ne pouvant être différés ; déplacements pour un concours ou un examen.</string>
-    <string name="reason_2">2. Déplacements pour se rendre dans un établissement culturel autorisé ou un lieu de culte ; déplacements pour effectuer des achats de biens, pour des services dont la fourniture est autorisée, pour les retraits de commandes et les livraisons à domicile.</string>
-    <string name="reason_3">3. Consultations, examens et soins ne pouvant être assurés à distance et l’achat de médicaments.</string>
-    <string name="reason_4">4. Déplacements pour motif familial impérieux, pour l’assistance aux personnes vulnérables et précaires ou la garde d’enfants.</string>
-    <string name="reason_5">5. Déplacements des personnes en situation de handicap et leur accompagnant.</string>
-    <string name="reason_6">6. Déplacements en plein air ou vers un lieu de plein air, sans changement du lieu de résidence, dans la limite de trois heures quotidiennes et dans un rayon maximal de vingt kilomètres autour du domicile, liés soit à l’activité physique ou aux loisirs individuels, à l’exclusion de toute pratique sportive collective et de toute proximité avec d’autres personnes, soit à la promenade avec les seules personnes regroupées dans un même domicile, soit aux besoins des animaux de compagnie.</string>
-    <string name="reason_7">7. Convocations judiciaires ou administratives et déplacements pour se rendre dans un service public.</string>
-    <string name="reason_8">8. Participation à des missions d’intérêt général sur demande de l’autorité administrative.</string>
-    <string name="reason_9">9. Déplacement pour chercher les enfants à l’école et à l’occasion de leurs activités périscolaires.</string>
+    <string name="reason_1">Déplacements entre le domicile et le lieu d’exercice de l’activité professionnelle, lorsqu\'ils sont indispensables à l\'exercice d’activités ne pouvant être organisées sous forme de télétravail ou déplacements professionnels ne pouvant être différés.</string>
+    <string name="reason_2">Déplacements pour effectuer des achats de fournitures nécessaires à l’activité professionnelle et des achats de première nécessité dans des établissements dont les activités demeurent autorisées</string>
+    <string name="reason_3">Consultations et soins ne pouvant être assurés à distance et ne pouvant être différés ; consultations et soins des patients atteints d\'une affection de longue durée.</string>
+    <string name="reason_4">Déplacements pour motif familial impérieux, pour l’assistance aux personnes vulnérables ou la garde d’enfants.</string>
+    <string name="reason_5">Déplacements brefs, dans la limite d\'une heure quotidienne et dans un rayon maximal d\'un kilomètre autour du domicile, liés soit à l\'activité physique individuelle des personnes, à l\'exclusion de toute pratique sportive collective et de toute proximité avec d\'autres personnes, soit à la promenade avec les seules personnes regroupées dans un même domicile, soit aux besoins des animaux de compagnie.</string>
+    <string name="reason_6">Convocation judiciaire ou administrative.</string>
+    <string name="reason_7">Participation à des missions d’intérêt général sur demande de l’autorité administrative.</string>
 
     <!-- Info Fragment -->
-    <string name="explication_1">- Cette application n\'aura jamais de publicité.</string>
-    <string name="explication_2">- Toutes les données sont stockées uniquement sur votre téléphone, utilisable hors ligne.</string>
-    <string name="explication_3">- Application non gouvernementale ni officielle, développée par un jeune diplômé.</string>
-    <string name="explication_4">- Si vous souhaitez m\'offrir une bière ou un café, c\'est <a href="https://buymeacoff.ee/sanchezm/">ici</a> ou vous pouvez me suivre sur <a href="https://www.twitch.tv/mathdieu">twitch</a>.</string>
-    <string name="credits_title">Petit remerciement pour l\'aide apportée au développement de l\'application :</string>
-    <string name="credits_1">TomRoush: <a href="https://github.com/TomRoush/PdfBox-Android">PdfBox-Android</a></string>
-    <string name="credits_2">Barteksc: <a href="https://github.com/barteksc/AndroidPdfViewer">AndroidPdfViewer</a></string>
-    <string name="credits_3">Journeyapps: <a href="https://github.com/journeyapps/zxing-android-embedded">zxing-android-embedded</a></string>
-    <string name="credits_4">Ainsi que toutes les libraries fourni par google</string>
-    <string name="credits_5">Merci à <a href="https://www.linkedin.com/in/julienfabbro/">Fabbro J.</a> pour l\'aide sur l\'orthographe</string>
-    <string name="develop_by">"Développée avec ❤ par
+    <string name="explication_1">- Merci de n\'utiliser l\'application quand cas de nécessité.</string>
+    <string name="explication_2">- Cette application n\'aura jamais de publicité.</string>
+    <string name="explication_3">- Toutes les données sont stockées uniquement sur votre téléphone, utilisable hors ligne.</string>
+    <string name="explication_4">- Application non gouvernementale ni officiel, développer par un étudiant.</string>
+    <string name="develop_by">"Développer avec ❤️ par
         <a href="https://www.sanchezm.fr/">Mathieu Sanchez</a>"</string>
     <string name="version_number">Version :</string>
 

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

@@ -37,20 +37,14 @@
     <style name="TextView" parent="Widget.MaterialComponents.TextView">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">@dimen/margin5dp</item>
+        <item name="android:layout_marginTop">@dimen/margin20dp</item>
         <item name="android:textColor">@color/colorPrimary</item>
-        <item name="android:textSize">@dimen/textSize14sp</item>
-    </style>
-
-    <style name="TextViewCredits" parent="TextView">
-        <item name="android:textSize">@dimen/textSize14sp</item>
-        <item name="android:layout_marginTop">@dimen/margin5dp</item>
+        <item name="android:textSize">@dimen/textSize18sp</item>
     </style>
 
     <dimen name="textSize18sp">18sp</dimen>
-    <dimen name="textSize14sp">14sp</dimen>
     <dimen name="textInputCornerRadius">20dp</dimen>
-    <dimen name="margin15dp">15dp</dimen>
+    <dimen name="margin20dp">20dp</dimen>
     <dimen name="margin5dp">5dp</dimen>
     <dimen name="emptySize">0dp</dimen>
 </resources>

build.gradle

@@ -2,9 +2,8 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.4.10'
-        db_version = '1'
-
+        kotlin_version = '1.3.72'
+        db_version = '2'
     }
 
     repositories {
@@ -13,7 +12,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Oct 24 15:33:39 CEST 2020
+#Sun Apr 12 01:14:42 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip