Compare commits
7 Commits
1.0.4
...
ms/issue-1
Author | SHA1 | Date | |
---|---|---|---|
5cb3478bb6 | |||
52892c13d4 | |||
428759d30a | |||
1d617e7678 | |||
ea6c9c4ee0 | |||
a7993ed680 | |||
f052470700 |
@ -15,8 +15,8 @@ android {
|
|||||||
applicationId "fr.sanchezm.attestationsCovid19"
|
applicationId "fr.sanchezm.attestationsCovid19"
|
||||||
minSdkVersion 23
|
minSdkVersion 23
|
||||||
targetSdkVersion 29
|
targetSdkVersion 29
|
||||||
versionCode 6
|
versionCode 7
|
||||||
versionName "1.0.4"
|
versionName "1.0.5"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
@ -30,11 +30,28 @@ android {
|
|||||||
minifyEnabled true
|
minifyEnabled true
|
||||||
shrinkResources true
|
shrinkResources true
|
||||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
buildConfigField "Integer", "DB_VERSION", "1"
|
buildConfigField "Integer", "DB_VERSION", db_version
|
||||||
buildConfigField "Boolean", "TEST", "false"
|
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 {
|
debug {
|
||||||
buildConfigField "Integer", "DB_VERSION", "1"
|
buildConfigField "Integer", "DB_VERSION", db_version
|
||||||
buildConfigField "Boolean", "TEST", "true"
|
buildConfigField "Boolean", "TEST", "true"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -89,6 +106,8 @@ dependencies {
|
|||||||
//noinspection GradleDependency
|
//noinspection GradleDependency
|
||||||
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
|
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
|
||||||
|
|
||||||
|
implementation 'com.github.Ilhasoft:data-binding-validator:2.0.0'
|
||||||
|
|
||||||
// Test
|
// Test
|
||||||
testImplementation 'junit:junit:4.12'
|
testImplementation 'junit:junit:4.12'
|
||||||
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
|
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
|
tools:replace="android:allowBackup"
|
||||||
android:theme="@style/AppTheme.Light">
|
android:theme="@style/AppTheme.Light">
|
||||||
<activity android:name=".QrCodeActivity" />
|
<activity android:name=".QrCodeActivity" />
|
||||||
<activity android:name=".PdfViewerActivity" />
|
<activity android:name=".PdfViewerActivity" />
|
||||||
|
@ -3,7 +3,7 @@ package fr.sanchezm.attestationsCovid19.data.db.entity
|
|||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
const val PATTERN = "dd/MM/yyyy 'a' HH'h'mm"
|
const val PATTERN = "dd/MM/yyyy 'à' HH:mm"
|
||||||
|
|
||||||
//@Entity(tableName = "attestation")
|
//@Entity(tableName = "attestation")
|
||||||
data class Attestation(
|
data class Attestation(
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
package fr.sanchezm.attestationsCovid19.ui.add
|
package fr.sanchezm.attestationsCovid19.ui.add
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
|
import android.app.DatePickerDialog
|
||||||
|
import android.app.TimePickerDialog
|
||||||
|
import android.content.Context
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import androidx.lifecycle.LiveData
|
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.ConfigRepository
|
||||||
import fr.sanchezm.attestationsCovid19.data.repository.ProfileRepository
|
import fr.sanchezm.attestationsCovid19.data.repository.ProfileRepository
|
||||||
import fr.sanchezm.attestationsCovid19.utilities.Event
|
import fr.sanchezm.attestationsCovid19.utilities.Event
|
||||||
|
import java.text.DateFormat
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import java.time.LocalDateTime
|
import java.time.LocalDateTime
|
||||||
import java.time.format.DateTimeFormatter
|
import java.time.format.DateTimeFormatter
|
||||||
@ -21,7 +25,8 @@ import java.util.*
|
|||||||
class AddViewModel(
|
class AddViewModel(
|
||||||
private val configRepository: ConfigRepository,
|
private val configRepository: ConfigRepository,
|
||||||
private val profileRepository: ProfileRepository,
|
private val profileRepository: ProfileRepository,
|
||||||
private val attestationRepository: AttestationRepository
|
private val attestationRepository: AttestationRepository,
|
||||||
|
private val app: Context
|
||||||
) : ViewModel() {
|
) : ViewModel() {
|
||||||
|
|
||||||
private val _errorMessage = MutableLiveData<Event<Int>>()
|
private val _errorMessage = MutableLiveData<Event<Int>>()
|
||||||
@ -58,7 +63,7 @@ class AddViewModel(
|
|||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
private val datePattern = "dd/MM/yyyy"
|
private val datePattern = "dd/MM/yyyy"
|
||||||
private val timePattern = "HH'h'mm"
|
private val timePattern = "HH:mm"
|
||||||
|
|
||||||
@SuppressLint("LongLogTag")
|
@SuppressLint("LongLogTag")
|
||||||
fun onGenerateAttestationClick() {
|
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 {
|
init {
|
||||||
setProfileValue()
|
setProfileValue()
|
||||||
setDateHourToday()
|
setDateHourToday()
|
||||||
@ -164,4 +231,13 @@ class AddViewModel(
|
|||||||
|| reason7.value!!
|
|| reason7.value!!
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun getFormattedDayOrMonth(date: Int): String {
|
||||||
|
var formattedDate: String = date.toString()
|
||||||
|
|
||||||
|
if (formattedDate.length <= 1) {
|
||||||
|
formattedDate = "0$formattedDate"
|
||||||
|
}
|
||||||
|
return formattedDate
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -1,5 +1,6 @@
|
|||||||
package fr.sanchezm.attestationsCovid19.ui.add
|
package fr.sanchezm.attestationsCovid19.ui.add
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import androidx.lifecycle.ViewModelProvider
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import fr.sanchezm.attestationsCovid19.data.repository.AttestationRepository
|
import fr.sanchezm.attestationsCovid19.data.repository.AttestationRepository
|
||||||
@ -9,12 +10,13 @@ import fr.sanchezm.attestationsCovid19.data.repository.ProfileRepository
|
|||||||
class AddViewModelFactory(
|
class AddViewModelFactory(
|
||||||
private val configRepository: ConfigRepository,
|
private val configRepository: ConfigRepository,
|
||||||
private val profileRepository: ProfileRepository,
|
private val profileRepository: ProfileRepository,
|
||||||
private val attestationRepository: AttestationRepository
|
private val attestationRepository: AttestationRepository,
|
||||||
|
private val app: Context
|
||||||
) :
|
) :
|
||||||
ViewModelProvider.NewInstanceFactory() {
|
ViewModelProvider.NewInstanceFactory() {
|
||||||
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
@Suppress("UNCHECKED_CAST")
|
||||||
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
|
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
|
||||||
return AddViewModel(configRepository, profileRepository, attestationRepository) as T
|
return AddViewModel(configRepository, profileRepository, attestationRepository, app) as T
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,15 +1,15 @@
|
|||||||
package fr.sanchezm.attestationsCovid19.ui.info
|
package fr.sanchezm.attestationsCovid19.ui.info
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle
|
||||||
import android.text.method.LinkMovementMethod
|
import android.text.method.LinkMovementMethod
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater
|
||||||
import android.view.View;
|
import android.view.View
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup
|
||||||
import android.widget.TextView
|
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import fr.sanchezm.attestationsCovid19.BuildConfig
|
import fr.sanchezm.attestationsCovid19.BuildConfig
|
||||||
|
|
||||||
import fr.sanchezm.attestationsCovid19.R;
|
import fr.sanchezm.attestationsCovid19.R
|
||||||
|
import kotlinx.android.synthetic.main.fragment_info.view.*
|
||||||
|
|
||||||
class InfoFragment : Fragment() {
|
class InfoFragment : Fragment() {
|
||||||
|
|
||||||
@ -20,13 +20,19 @@ class InfoFragment : Fragment() {
|
|||||||
): View? {
|
): View? {
|
||||||
val root = inflater.inflate(R.layout.fragment_info, container, false)
|
val root = inflater.inflate(R.layout.fragment_info, container, false)
|
||||||
|
|
||||||
root.findViewById<TextView>(R.id.develop_by).movementMethod = LinkMovementMethod.getInstance()
|
root.credits_1.movementMethod = LinkMovementMethod.getInstance()
|
||||||
root.findViewById<TextView>(R.id.version).text = getVersionText()
|
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()
|
||||||
return root
|
return root
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getVersionText(): String {
|
private fun getVersionText(): String {
|
||||||
val versionText = getString(R.string.version_number);
|
val versionText = getString(R.string.version_number)
|
||||||
val versionName = BuildConfig.VERSION_NAME
|
val versionName = BuildConfig.VERSION_NAME
|
||||||
|
|
||||||
return "$versionText $versionName"
|
return "$versionText $versionName"
|
||||||
|
@ -16,7 +16,8 @@ object InjectorUtils {
|
|||||||
AddViewModelFactory(
|
AddViewModelFactory(
|
||||||
getConfigRepo(context),
|
getConfigRepo(context),
|
||||||
getProfileRepo(context),
|
getProfileRepo(context),
|
||||||
getAttestationRepo(context)
|
getAttestationRepo(context),
|
||||||
|
context
|
||||||
)
|
)
|
||||||
|
|
||||||
fun provideAttestationViewModel(context: Context): AttestationsViewModelFactory =
|
fun provideAttestationViewModel(context: Context): AttestationsViewModelFactory =
|
||||||
|
@ -130,8 +130,8 @@ class PdfUtils private constructor(
|
|||||||
addressField.value = "${profile.address} ${profile.postalCode} ${profile.city}"
|
addressField.value = "${profile.address} ${profile.postalCode} ${profile.city}"
|
||||||
cityField.value = profile.city
|
cityField.value = profile.city
|
||||||
dateField.value = attestation.exitDate
|
dateField.value = attestation.exitDate
|
||||||
hourField.value = attestation.exitHour.split("h")[0]
|
hourField.value = attestation.exitHour.split(":")[0]
|
||||||
minutesField.value = attestation.exitHour.split("h")[1]
|
minutesField.value = attestation.exitHour.split(":")[1]
|
||||||
return true
|
return true
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Log.e(TAG, "${e.message}")
|
Log.e(TAG, "${e.message}")
|
||||||
|
@ -1,79 +0,0 @@
|
|||||||
<?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>
|
|
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
<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:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
tools:context=".ui.add.AddFragment">
|
tools:context=".ui.add.AddFragment">
|
||||||
|
|
||||||
<data>
|
<data>
|
||||||
@ -12,9 +12,9 @@
|
|||||||
</data>
|
</data>
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:id="@+id/constraintContext"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:id="@+id/constraintContext">
|
|
||||||
|
|
||||||
<androidx.core.widget.NestedScrollView
|
<androidx.core.widget.NestedScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@ -34,10 +34,10 @@
|
|||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textStyle="bold"
|
|
||||||
android:text="@string/attestation_title"
|
android:text="@string/attestation_title"
|
||||||
android:textColor="?attr/colorPrimary"
|
android:textColor="?attr/colorPrimary"
|
||||||
android:textSize="25sp" />
|
android:textSize="25sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@ -88,7 +88,11 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:inputType="date"
|
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>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
@ -162,8 +166,12 @@
|
|||||||
<com.google.android.material.textfield.TextInputEditText
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:focusable="false"
|
||||||
android:inputType="date"
|
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>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
@ -177,7 +185,9 @@
|
|||||||
<com.google.android.material.textfield.TextInputEditText
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:focusable="false"
|
||||||
android:inputType="time"
|
android:inputType="time"
|
||||||
|
android:onClick="@{() -> viewModel.onExitHourClick()}"
|
||||||
android:text="@={viewModel.exitHour}" />
|
android:text="@={viewModel.exitHour}" />
|
||||||
|
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
@ -253,7 +263,6 @@
|
|||||||
android:layout_marginTop="20dp"
|
android:layout_marginTop="20dp"
|
||||||
android:onClick="@{() -> viewModel.onGenerateAttestationClick()}"
|
android:onClick="@{() -> viewModel.onGenerateAttestationClick()}"
|
||||||
android:text="@string/generate_attestation_button" />
|
android:text="@string/generate_attestation_button" />
|
||||||
<!-- android:enabled="false"-->
|
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -52,6 +52,58 @@
|
|||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/explication_3" />
|
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
|
<TextView
|
||||||
android:id="@+id/develop_by"
|
android:id="@+id/develop_by"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<style name="TextView">
|
<style name="TextView">
|
||||||
<item name="android:layout_width">match_parent</item>
|
<item name="android:layout_width">match_parent</item>
|
||||||
<item name="android:layout_height">wrap_content</item>
|
<item name="android:layout_height">wrap_content</item>
|
||||||
<item name="android:layout_marginTop">@dimen/margin20dp</item>
|
<item name="android:layout_marginTop">@dimen/margin15dp</item>
|
||||||
<item name="android:textColor">@color/colorPrimary</item>
|
<item name="android:textColor">@color/colorPrimary</item>
|
||||||
<item name="android:textSize">@dimen/textSize18sp</item>
|
<item name="android:textSize">@dimen/textSize18sp</item>
|
||||||
<item name="android:justificationMode">inter_word</item>
|
<item name="android:justificationMode">inter_word</item>
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<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_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>
|
<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>
|
</resources>
|
@ -5,9 +5,9 @@
|
|||||||
<string name="title_info">À Propos</string>
|
<string name="title_info">À Propos</string>
|
||||||
|
|
||||||
<!-- Attestation Fragment -->
|
<!-- 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_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>
|
<string name="no_attestation">Aucune attestation, veuillez en générer une.</string>
|
||||||
|
|
||||||
<!-- Field for attestation -->
|
<!-- Field for attestation -->
|
||||||
@ -33,11 +33,17 @@
|
|||||||
<string name="reason_7">Participation à des missions d’intérêt général sur demande de l’autorité 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 -->
|
<!-- Info Fragment -->
|
||||||
<string name="explication_1">- Merci de n\'utiliser l\'application quand cas de nécessité.</string>
|
<string name="explication_1">- Merci de n\'utiliser l\'application qu\'en cas de nécessité.</string>
|
||||||
<string name="explication_2">- Cette application n\'aura jamais de publicité.</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_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="explication_4">- Application non gouvernementale ni officielle, développée par un étudiant.</string>
|
||||||
<string name="develop_by">"Développer avec ❤️ par
|
<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
|
||||||
<a href="https://www.sanchezm.fr/">Mathieu Sanchez</a>"</string>
|
<a href="https://www.sanchezm.fr/">Mathieu Sanchez</a>"</string>
|
||||||
<string name="version_number">Version :</string>
|
<string name="version_number">Version :</string>
|
||||||
|
|
||||||
|
@ -37,14 +37,20 @@
|
|||||||
<style name="TextView" parent="Widget.MaterialComponents.TextView">
|
<style name="TextView" parent="Widget.MaterialComponents.TextView">
|
||||||
<item name="android:layout_width">match_parent</item>
|
<item name="android:layout_width">match_parent</item>
|
||||||
<item name="android:layout_height">wrap_content</item>
|
<item name="android:layout_height">wrap_content</item>
|
||||||
<item name="android:layout_marginTop">@dimen/margin20dp</item>
|
<item name="android:layout_marginTop">@dimen/margin15dp</item>
|
||||||
<item name="android:textColor">@color/colorPrimary</item>
|
<item name="android:textColor">@color/colorPrimary</item>
|
||||||
<item name="android:textSize">@dimen/textSize18sp</item>
|
<item name="android:textSize">@dimen/textSize18sp</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="TextViewCredits" parent="TextView">
|
||||||
|
<item name="android:textSize">@dimen/textSize14sp</item>
|
||||||
|
<item name="android:layout_marginTop">@dimen/margin5dp</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<dimen name="textSize18sp">18sp</dimen>
|
<dimen name="textSize18sp">18sp</dimen>
|
||||||
|
<dimen name="textSize14sp">14sp</dimen>
|
||||||
<dimen name="textInputCornerRadius">20dp</dimen>
|
<dimen name="textInputCornerRadius">20dp</dimen>
|
||||||
<dimen name="margin20dp">20dp</dimen>
|
<dimen name="margin15dp">15dp</dimen>
|
||||||
<dimen name="margin5dp">5dp</dimen>
|
<dimen name="margin5dp">5dp</dimen>
|
||||||
<dimen name="emptySize">0dp</dimen>
|
<dimen name="emptySize">0dp</dimen>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -1,7 +1,12 @@
|
|||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
ext.kotlin_version = '1.3.72'
|
ext {
|
||||||
|
kotlin_version = '1.3.72'
|
||||||
|
db_version = '1'
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
jcenter()
|
jcenter()
|
||||||
@ -20,7 +25,7 @@ allprojects {
|
|||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
jcenter()
|
jcenter()
|
||||||
|
maven { url 'https://jitpack.io' }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user