Adding pickers for date and time

app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "fr.sanchezm.attestationsCovid19"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 6
-        versionName "1.0.4"
+        versionCode 7
+        versionName "1.0.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -30,11 +30,28 @@ android {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            buildConfigField "Integer", "DB_VERSION", "1"
+            buildConfigField "Integer", "DB_VERSION", db_version
             buildConfigField "Boolean", "TEST", "false"
         }
+
+        beta {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            buildConfigField "Integer", "DB_VERSION", db_version
+            buildConfigField "Boolean", "TEST", "false"
+        }
+
+        alpha {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            buildConfigField "Integer", "DB_VERSION", db_version
+            buildConfigField "Boolean", "TEST", "true"
+        }
+
         debug {
-            buildConfigField "Integer", "DB_VERSION", "1"
+            buildConfigField "Integer", "DB_VERSION", db_version
             buildConfigField "Boolean", "TEST", "true"
         }
     }
@@ -89,6 +106,8 @@ dependencies {
     //noinspection GradleDependency
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
 
+    implementation 'com.github.Ilhasoft:data-binding-validator:2.0.0'
+
     // Test
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

app/src/main/AndroidManifest.xml

@@ -15,6 +15,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        tools:replace="android:allowBackup"
         android:theme="@style/AppTheme.Light">
         <activity android:name=".QrCodeActivity" />
         <activity android:name=".PdfViewerActivity" />

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

@@ -3,7 +3,7 @@ package fr.sanchezm.attestationsCovid19.data.db.entity
 import java.text.SimpleDateFormat
 import java.util.*
 
-const val PATTERN = "dd/MM/yyyy 'à' HH'h'mm"
+const val PATTERN = "dd/MM/yyyy 'à' HH:mm"
 
 //@Entity(tableName = "attestation")
 data class Attestation(

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

@@ -1,6 +1,9 @@
 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
@@ -13,6 +16,7 @@ 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
@@ -21,7 +25,8 @@ import java.util.*
 class AddViewModel(
     private val configRepository: ConfigRepository,
     private val profileRepository: ProfileRepository,
-    private val attestationRepository: AttestationRepository
+    private val attestationRepository: AttestationRepository,
+    private val app: Context
 ) : ViewModel() {
 
     private val _errorMessage = MutableLiveData<Event<Int>>()
@@ -58,7 +63,7 @@ class AddViewModel(
     // endregion
 
     private val datePattern = "dd/MM/yyyy"
-    private val timePattern = "HH'h'mm"
+    private val timePattern = "HH:mm"
 
     @SuppressLint("LongLogTag")
     fun onGenerateAttestationClick() {
@@ -75,6 +80,68 @@ 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()
@@ -164,4 +231,13 @@ class AddViewModel(
                 || reason7.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,5 +1,6 @@
 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
@@ -9,12 +10,13 @@ import fr.sanchezm.attestationsCovid19.data.repository.ProfileRepository
 class AddViewModelFactory(
     private val configRepository: ConfigRepository,
     private val profileRepository: ProfileRepository,
-    private val attestationRepository: AttestationRepository
+    private val attestationRepository: AttestationRepository,
+    private val app: Context
 ) :
     ViewModelProvider.NewInstanceFactory() {
 
     @Suppress("UNCHECKED_CAST")
     override fun <T : ViewModel?> create(modelClass: Class<T>): T {
-        return AddViewModel(configRepository, profileRepository, attestationRepository) as T
+        return AddViewModel(configRepository, profileRepository, attestationRepository, app) as T
     }
 }

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

@@ -16,7 +16,8 @@ object InjectorUtils {
         AddViewModelFactory(
             getConfigRepo(context),
             getProfileRepo(context),
-            getAttestationRepo(context)
+            getAttestationRepo(context),
+            context
         )
 
     fun provideAttestationViewModel(context: Context): AttestationsViewModelFactory =

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

@@ -130,8 +130,8 @@ class PdfUtils private constructor(
             addressField.value = "${profile.address} ${profile.postalCode} ${profile.city}"
             cityField.value = profile.city
             dateField.value = attestation.exitDate
-            hourField.value = attestation.exitHour.split("h")[0]
-            minutesField.value = attestation.exitHour.split("h")[1]
+            hourField.value = attestation.exitHour.split(":")[0]
+            minutesField.value = attestation.exitHour.split(":")[1]
             return true
         } catch (e: Exception) {
             Log.e(TAG, "${e.message}")

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:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     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:id="@+id/constraintContext">
+        android:layout_height="match_parent">
 
         <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:textSize="25sp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:layout_width="match_parent"
@@ -88,7 +88,11 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:inputType="date"
-                        android:text="@={viewModel.birthday}" />
+                        android:focusable="false"
+                        android:onClick="@{() -> viewModel.onBirthdayClick()}"
+                        android:text="@={viewModel.birthday}"
+                        app:validateDate='@{"dd/MM/yyyy"}'
+                        app:validateDateMessage="@{@string/date_error_message}" />
 
                 </com.google.android.material.textfield.TextInputLayout>
 
@@ -162,8 +166,12 @@
                     <com.google.android.material.textfield.TextInputEditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:focusable="false"
                         android:inputType="date"
-                        android:text="@={viewModel.exitDate}" />
+                        android:onClick="@{() -> viewModel.onExitDateClick()}"
+                        android:text="@={viewModel.exitDate}"
+                        app:validateDate='@{"dd/MM/yyyy"}'
+                        app:validateDateMessage="@{@string/date_error_message}" />
 
                 </com.google.android.material.textfield.TextInputLayout>
 
@@ -177,7 +185,9 @@
                     <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>
@@ -253,7 +263,6 @@
                     android:layout_marginTop="20dp"
                     android:onClick="@{() -> viewModel.onGenerateAttestationClick()}"
                     android:text="@string/generate_attestation_button" />
-                <!--                android:enabled="false"-->
 
 
             </LinearLayout>

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

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <!-- 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é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">Attestation de déplacement dérogatoire</string>
+    <string name="attestation_title">@string/app_name</string>
     <string name="attestation_subtitle">#RestonsChezNous</string>
-    <string name="attestation_generated">Attestation générer</string>
+    <string name="attestation_generated">Attestation générée</string>
     <string name="no_attestation">Aucune attestation, veuillez en générer une.</string>
 
     <!-- Field for attestation -->
@@ -37,13 +37,13 @@
     <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 officielle, développée par un étudiant.</string>
-    <string name="credits_title">Petit remerciement pour l\'aide apporté au développement de l\'application :</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="develop_by">"Développée avec ❤ par
         <a href="https://www.sanchezm.fr/">Mathieu Sanchez</a>"</string>
     <string name="version_number">Version :</string>
 

build.gradle

@@ -1,7 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext {
+        kotlin_version = '1.3.72'
+        db_version = '1'
+
+    }
+
     repositories {
         google()
         jcenter()
@@ -20,7 +25,7 @@ allprojects {
     repositories {
         google()
         jcenter()
-        
+        maven { url 'https://jitpack.io' }
     }
 }