Compare commits
47 Commits
ms/issue-5
...
master
Author | SHA1 | Date | |
---|---|---|---|
97c1712181 | |||
9febdc9c35 | |||
1d0c53ebc5 | |||
a5de6ae137 | |||
b0fb52ea79 | |||
4ba6e0ea58 | |||
65c7d46379 | |||
1c7386e24b | |||
747cae4d04 | |||
3811723df6 | |||
92d703ec7b | |||
8e3e1dd615 | |||
8d69694ec3 | |||
ba3956bd2f | |||
31f2bf15b1 | |||
d5c140e9e5 | |||
b037788708 | |||
8909908baa | |||
eea7a7b27c | |||
dd12a6a91e | |||
6983af93d7 | |||
ee9b243902 | |||
c976c00ce4 | |||
ae62c2ab7e | |||
22732c42a3 | |||
1530028f4b | |||
20d41dec23 | |||
3388de76b0 | |||
b712c391ce | |||
b04cd541b4 | |||
055be5f968 | |||
8807105c06 | |||
849d6d4665 | |||
b5f8848f32 | |||
a2e8a5e333 | |||
af6cef0cd4 | |||
3b2bf5f0ae | |||
5cb3478bb6 | |||
52892c13d4 | |||
428759d30a | |||
fac797ed32 | |||
731920ca28 | |||
1d617e7678 | |||
7d8c509e9c | |||
50cd345a53 | |||
8f965e5322 | |||
|
a7993ed680 |
@ -4,19 +4,19 @@ apply plugin: 'kotlin-kapt'
|
|||||||
apply plugin: 'kotlin-android-extensions'
|
apply plugin: 'kotlin-android-extensions'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 29
|
compileSdkVersion 30
|
||||||
buildToolsVersion "29.0.3"
|
buildToolsVersion "29.0.3"
|
||||||
|
|
||||||
dataBinding {
|
buildFeatures {
|
||||||
enabled = true
|
dataBinding true
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "fr.sanchezm.attestationsCovid19"
|
applicationId "fr.sanchezm.attestationsCovid19"
|
||||||
minSdkVersion 23
|
minSdkVersion 23
|
||||||
targetSdkVersion 29
|
targetSdkVersion 30
|
||||||
versionCode 6
|
versionCode 13
|
||||||
versionName "1.0.4"
|
versionName "2.2.0"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
@ -74,24 +74,18 @@ dependencies {
|
|||||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||||
// Android X
|
// Android X
|
||||||
implementation 'androidx.appcompat:appcompat:1.1.0'
|
implementation 'androidx.appcompat:appcompat:1.2.0'
|
||||||
implementation 'androidx.core:core-ktx:1.2.0'
|
implementation 'androidx.core:core-ktx:1.3.2'
|
||||||
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
|
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
|
||||||
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
|
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
|
||||||
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
|
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
|
||||||
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
|
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
|
||||||
|
|
||||||
implementation 'androidx.navigation:navigation-fragment-ktx:2.2.2'
|
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
|
||||||
implementation 'androidx.navigation:navigation-fragment:2.2.2'
|
implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
|
||||||
implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
|
|
||||||
implementation 'androidx.navigation:navigation-ui:2.2.2'
|
|
||||||
|
|
||||||
// Design
|
// Design
|
||||||
implementation 'com.google.android.material:material:1.1.0'
|
implementation 'com.google.android.material:material:1.2.1'
|
||||||
|
|
||||||
// Room
|
|
||||||
// implementation 'androidx.room:room-runtime:2.2.5'
|
|
||||||
// kapt 'androidx.room:room-compiler:2.2.5'
|
|
||||||
|
|
||||||
// PDF
|
// PDF
|
||||||
implementation 'com.tom_roush:pdfbox-android:1.8.10.1'
|
implementation 'com.tom_roush:pdfbox-android:1.8.10.1'
|
||||||
@ -110,6 +104,6 @@ dependencies {
|
|||||||
|
|
||||||
// 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.2'
|
||||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
|
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
@ -4,7 +4,6 @@ import android.content.Context
|
|||||||
import fr.sanchezm.attestationsCovid19.data.db.dao.AttestationDao
|
import fr.sanchezm.attestationsCovid19.data.db.dao.AttestationDao
|
||||||
import fr.sanchezm.attestationsCovid19.data.db.dao.ConfigDao
|
import fr.sanchezm.attestationsCovid19.data.db.dao.ConfigDao
|
||||||
import fr.sanchezm.attestationsCovid19.data.db.dao.ProfileDao
|
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) {
|
class MyDatabase private constructor(private val savePath: String, private val filesPath: String) {
|
||||||
|
|
||||||
@ -12,15 +11,10 @@ class MyDatabase private constructor(private val savePath: String, private val f
|
|||||||
private var _attestationDao: AttestationDao? = null
|
private var _attestationDao: AttestationDao? = null
|
||||||
private var _configDao: ConfigDao? = null
|
private var _configDao: ConfigDao? = null
|
||||||
|
|
||||||
fun profileDao(configRepository: ConfigRepository): ProfileDao =
|
fun profileDao(): ProfileDao = _profileDao ?: ProfileDao(savePath).also { _profileDao = it }
|
||||||
_profileDao ?: ProfileDao(savePath, configRepository).also { _profileDao = it }
|
|
||||||
|
|
||||||
fun attestationDao(configRepository: ConfigRepository): AttestationDao =
|
fun attestationDao(): AttestationDao =
|
||||||
_attestationDao ?: AttestationDao(
|
_attestationDao ?: AttestationDao(savePath, filesPath).also { _attestationDao = it }
|
||||||
savePath,
|
|
||||||
filesPath,
|
|
||||||
configRepository
|
|
||||||
).also { _attestationDao = it }
|
|
||||||
|
|
||||||
fun configDao(): ConfigDao = _configDao ?: ConfigDao(savePath).also { _configDao = it }
|
fun configDao(): ConfigDao = _configDao ?: ConfigDao(savePath).also { _configDao = it }
|
||||||
|
|
||||||
|
@ -6,15 +6,10 @@ import androidx.lifecycle.MutableLiveData
|
|||||||
import com.google.gson.Gson
|
import com.google.gson.Gson
|
||||||
import com.google.gson.reflect.TypeToken
|
import com.google.gson.reflect.TypeToken
|
||||||
import fr.sanchezm.attestationsCovid19.data.db.entity.Attestation
|
import fr.sanchezm.attestationsCovid19.data.db.entity.Attestation
|
||||||
import fr.sanchezm.attestationsCovid19.data.repository.ConfigRepository
|
|
||||||
import fr.sanchezm.attestationsCovid19.utilities.PdfUtils
|
import fr.sanchezm.attestationsCovid19.utilities.PdfUtils
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
class AttestationDao(
|
class AttestationDao(private val savePath: String, private val filesPath: String) {
|
||||||
private val savePath: String,
|
|
||||||
private val filesPath: String,
|
|
||||||
private val configRepository: ConfigRepository
|
|
||||||
) {
|
|
||||||
|
|
||||||
private val _attestations = MutableLiveData<ArrayList<Attestation>>()
|
private val _attestations = MutableLiveData<ArrayList<Attestation>>()
|
||||||
private val fileName = "attestation.db"
|
private val fileName = "attestation.db"
|
||||||
@ -28,8 +23,9 @@ class AttestationDao(
|
|||||||
_attestations.value?.elementAt(id)
|
_attestations.value?.elementAt(id)
|
||||||
|
|
||||||
fun addAttestation(attestation: Attestation) {
|
fun addAttestation(attestation: Attestation) {
|
||||||
|
_attestations.value = _attestations.value ?: ArrayList()
|
||||||
|
|
||||||
_attestations.value?.add(attestation)
|
_attestations.value?.add(attestation)
|
||||||
_attestations.value = _attestations.value
|
|
||||||
Log.d(TAG, "Add Attestation : $attestation")
|
Log.d(TAG, "Add Attestation : $attestation")
|
||||||
save()
|
save()
|
||||||
}
|
}
|
||||||
@ -70,8 +66,6 @@ class AttestationDao(
|
|||||||
|
|
||||||
if (file.exists()) {
|
if (file.exists()) {
|
||||||
_attestations.value = Gson().fromJson(file.readText(Charsets.UTF_8), type)
|
_attestations.value = Gson().fromJson(file.readText(Charsets.UTF_8), type)
|
||||||
} else {
|
|
||||||
_attestations.value = ArrayList()
|
|
||||||
}
|
}
|
||||||
_attestations.value?.forEach {
|
_attestations.value?.forEach {
|
||||||
val filePath = PdfUtils.getPath(filesPath, it.createAt)
|
val filePath = PdfUtils.getPath(filesPath, it.createAt)
|
||||||
|
@ -33,12 +33,7 @@ class ConfigDao(private val savePath: String) {
|
|||||||
_config.value?.versionName = BuildConfig.VERSION_NAME
|
_config.value?.versionName = BuildConfig.VERSION_NAME
|
||||||
} else {
|
} else {
|
||||||
_config.value =
|
_config.value =
|
||||||
Config(
|
Config(BuildConfig.DB_VERSION, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)
|
||||||
BuildConfig.DB_VERSION,
|
|
||||||
BuildConfig.VERSION_NAME,
|
|
||||||
BuildConfig.VERSION_CODE,
|
|
||||||
-1
|
|
||||||
)
|
|
||||||
save()
|
save()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,77 +1,48 @@
|
|||||||
package fr.sanchezm.attestationsCovid19.data.db.dao
|
package fr.sanchezm.attestationsCovid19.data.db.dao
|
||||||
|
|
||||||
import android.util.Log
|
|
||||||
import androidx.lifecycle.LiveData
|
import androidx.lifecycle.LiveData
|
||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
import com.google.gson.Gson
|
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.db.entity.Profile
|
||||||
import fr.sanchezm.attestationsCovid19.data.repository.ConfigRepository
|
|
||||||
import fr.sanchezm.attestationsCovid19.utilities.DbMigration
|
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
class ProfileDao(private val path: String, private val configRepository: ConfigRepository) {
|
class ProfileDao(private val path: String) {
|
||||||
|
|
||||||
private val _profile = MutableLiveData<ArrayList<Profile>>()
|
private val _profile = MutableLiveData<Profile>()
|
||||||
private val fileName = "profile.db"
|
private val fileName = "profile.db"
|
||||||
private val type = object : TypeToken<ArrayList<Profile>>() {}.type
|
|
||||||
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
fun getProfile(): LiveData<Profile> =
|
||||||
fun getProfiles(): LiveData<List<Profile>> =
|
_profile
|
||||||
_profile as LiveData<List<Profile>>
|
|
||||||
|
|
||||||
fun getProfile(id: Int): Profile? =
|
fun updateProfile(profile: Profile) {
|
||||||
_profile.value?.get(id)
|
_profile.value = profile
|
||||||
|
|
||||||
fun getProfileId(profile: Profile): Int? =
|
|
||||||
_profile.value?.indexOf(profile)
|
|
||||||
|
|
||||||
fun addProfile(profile: Profile): Int {
|
|
||||||
_profile.value?.add(profile)
|
|
||||||
_profile.value = _profile.value
|
|
||||||
save()
|
save()
|
||||||
|
|
||||||
return _profile.value?.indexOf(profile)!!
|
|
||||||
}
|
}
|
||||||
|
|
||||||
init {
|
init {
|
||||||
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()
|
load()
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
load()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun load() {
|
private fun load() {
|
||||||
val file = File("$path/$fileName")
|
val file = File("$path/$fileName")
|
||||||
|
|
||||||
if (file.exists()) {
|
if (file.exists()) {
|
||||||
_profile.value = Gson().fromJson(file.readText(Charsets.UTF_8), type)
|
_profile.value = Gson().fromJson(file.readText(Charsets.UTF_8), Profile::class.java)
|
||||||
} else {
|
} else {
|
||||||
_profile.value = ArrayList()
|
_profile.value = Profile("", "", "", "", "", "", "")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun save() {
|
private fun save() {
|
||||||
File("$path/$fileName").writeText(Gson().toJson(_profile.value))
|
File("$path/$fileName").writeText(Gson().toJson(_profile.value))
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
companion object {
|
//@Dao
|
||||||
private val TAG = ProfileDao::class.simpleName
|
//interface ProfileDao {
|
||||||
}
|
// @Insert(onConflict = OnConflictStrategy.REPLACE)
|
||||||
}
|
// fun insert(profile: Profile)
|
||||||
|
//
|
||||||
|
// @Query(value = "SELECT * FROM profile WHERE id = $CURRENT_PROFILE_ID")
|
||||||
|
// fun getProfile(): LiveData<Profile>
|
||||||
|
//}
|
||||||
|
@ -3,8 +3,9 @@ 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")
|
||||||
data class Attestation(
|
data class Attestation(
|
||||||
val profile: Profile,
|
val profile: Profile,
|
||||||
val exitDate: String,
|
val exitDate: String,
|
||||||
@ -13,7 +14,7 @@ data class Attestation(
|
|||||||
val reasons: List<Int>
|
val reasons: List<Int>
|
||||||
) {
|
) {
|
||||||
override fun toString(): String {
|
override fun toString(): String {
|
||||||
return "Cree le: ${getDate(createAt)}; $profile; Sortie: ${getExitDateFormatted()}; Motifs: ${getMotifsText()}"
|
return "Cree le: ${getDate(createAt)};\n$profile;\nSortie: ${getExitDateFormatted()};\nMotifs: ${getMotifsText()}"
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getNameFormatted(): String = "${profile.firstName} ${profile.lastName}"
|
fun getNameFormatted(): String = "${profile.firstName} ${profile.lastName}"
|
||||||
@ -27,21 +28,22 @@ data class Attestation(
|
|||||||
private fun getMotifsText(): String {
|
private fun getMotifsText(): String {
|
||||||
val motifs = StringBuilder()
|
val motifs = StringBuilder()
|
||||||
|
|
||||||
reasons.forEach { motifs.append(getMotifText(it), "-") }
|
reasons.forEach { motifs.append(getMotifText(it), ", ") }
|
||||||
return motifs.toString().dropLast(1)
|
return motifs.toString().dropLast(2)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getDate(dateTime: Long): String = SimpleDateFormat(PATTERN, Locale.FRANCE).format(Date(dateTime))
|
private fun getDate(dateTime: Long): String = SimpleDateFormat(PATTERN, Locale.FRANCE).format(Date(dateTime))
|
||||||
|
|
||||||
private fun getMotifText(i: Int): String {
|
fun getMotifText(i: Int): String {
|
||||||
return when (i) {
|
return when (i) {
|
||||||
1 -> "travail"
|
1 -> "travail"
|
||||||
2 -> "courses"
|
2 -> "sante"
|
||||||
3 -> "sante"
|
3 -> "famille"
|
||||||
4 -> "famille"
|
4 -> "handicap"
|
||||||
5 -> "sport"
|
5 -> "convocation"
|
||||||
6 -> "judiciare"
|
6 -> "missions"
|
||||||
7 -> "missions"
|
7 -> "transits"
|
||||||
|
8 -> "animaux"
|
||||||
else -> "Error $i not found"
|
else -> "Error $i not found"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
package fr.sanchezm.attestationsCovid19.data.db.entity
|
package fr.sanchezm.attestationsCovid19.data.db.entity
|
||||||
|
|
||||||
data class Config(
|
data class Config(
|
||||||
var dbVersion: Int,
|
val dbVersion: Int,
|
||||||
var versionName: String,
|
var versionName: String,
|
||||||
var versionCode: Int,
|
var versionCode: Int
|
||||||
var selectProfileId: Int
|
|
||||||
)
|
)
|
@ -1,5 +1,6 @@
|
|||||||
package fr.sanchezm.attestationsCovid19.data.db.entity
|
package fr.sanchezm.attestationsCovid19.data.db.entity
|
||||||
|
|
||||||
|
//@Entity(tableName = "profile")
|
||||||
data class Profile(
|
data class Profile(
|
||||||
val firstName: String,
|
val firstName: String,
|
||||||
val lastName: String,
|
val lastName: String,
|
||||||
@ -9,8 +10,10 @@ data class Profile(
|
|||||||
val city: String,
|
val city: String,
|
||||||
val postalCode: String
|
val postalCode: String
|
||||||
) {
|
) {
|
||||||
|
// @PrimaryKey
|
||||||
|
// var id: Int = CURRENT_PROFILE_ID
|
||||||
|
|
||||||
override fun toString(): String {
|
override fun toString(): String {
|
||||||
return "Nom: $lastName; Prenom: $firstName; Naissance: $birthday a $birthPlace; Adresse: $address $postalCode $city"
|
return "Nom: $lastName;\nPrenom: $firstName;\nNaissance: $birthday a $birthPlace;\nAdresse: $address $postalCode $city"
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -6,14 +6,11 @@ import fr.sanchezm.attestationsCovid19.data.db.entity.Profile
|
|||||||
|
|
||||||
class ProfileRepository private constructor(private val profileDao: ProfileDao) {
|
class ProfileRepository private constructor(private val profileDao: ProfileDao) {
|
||||||
|
|
||||||
fun getProfiles(): LiveData<List<Profile>> =
|
fun getProfile(): LiveData<Profile> =
|
||||||
profileDao.getProfiles()
|
profileDao.getProfile()
|
||||||
|
|
||||||
fun getProfile(id: Int): Profile? =
|
fun insertProfile(profile: Profile) =
|
||||||
profileDao.getProfile(id)
|
profileDao.updateProfile(profile)
|
||||||
|
|
||||||
fun insertProfile(profile: Profile): Int =
|
|
||||||
profileDao.addProfile(profile)
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
@Volatile
|
@Volatile
|
||||||
|
@ -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>>()
|
||||||
@ -55,10 +60,11 @@ class AddViewModel(
|
|||||||
val reason5 = MutableLiveData(false)
|
val reason5 = MutableLiveData(false)
|
||||||
val reason6 = MutableLiveData(false)
|
val reason6 = MutableLiveData(false)
|
||||||
val reason7 = MutableLiveData(false)
|
val reason7 = MutableLiveData(false)
|
||||||
|
val reason8 = MutableLiveData(false)
|
||||||
// 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,21 +81,83 @@ 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,
|
||||||
|
{ _, 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()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setProfileValue() {
|
private fun setProfileValue() {
|
||||||
val profile = profileRepository.getProfiles().value?.first()
|
val profile = profileRepository.getProfile()
|
||||||
|
|
||||||
firstName.value = profile?.firstName
|
firstName.value = profile.value?.firstName
|
||||||
lastName.value = profile?.lastName
|
lastName.value = profile.value?.lastName
|
||||||
birthday.value = profile?.birthday
|
birthday.value = profile.value?.birthday
|
||||||
birthPlace.value = profile?.birthPlace
|
birthPlace.value = profile.value?.birthPlace
|
||||||
address.value = profile?.address
|
address.value = profile.value?.address
|
||||||
city.value = profile?.city
|
city.value = profile.value?.city
|
||||||
postalCode.value = profile?.postalCode
|
postalCode.value = profile.value?.postalCode
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setDateHourToday() {
|
private fun setDateHourToday() {
|
||||||
@ -137,6 +205,7 @@ class AddViewModel(
|
|||||||
if (reason5.value!!) reasons.add(5)
|
if (reason5.value!!) reasons.add(5)
|
||||||
if (reason6.value!!) reasons.add(6)
|
if (reason6.value!!) reasons.add(6)
|
||||||
if (reason7.value!!) reasons.add(7)
|
if (reason7.value!!) reasons.add(7)
|
||||||
|
if (reason8.value!!) reasons.add(8)
|
||||||
|
|
||||||
return reasons
|
return reasons
|
||||||
}
|
}
|
||||||
@ -162,6 +231,16 @@ class AddViewModel(
|
|||||||
|| reason5.value!!
|
|| reason5.value!!
|
||||||
|| reason6.value!!
|
|| reason6.value!!
|
||||||
|| reason7.value!!
|
|| reason7.value!!
|
||||||
|
|| reason8.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,20 @@ 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.explication_4.movementMethod = LinkMovementMethod.getInstance()
|
||||||
root.findViewById<TextView>(R.id.version).text = getVersionText()
|
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()
|
||||||
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"
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
@ -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 =
|
||||||
@ -39,12 +40,11 @@ object InjectorUtils {
|
|||||||
|
|
||||||
private fun getAttestationRepo(context: Context): AttestationRepository =
|
private fun getAttestationRepo(context: Context): AttestationRepository =
|
||||||
AttestationRepository.getInstance(
|
AttestationRepository.getInstance(
|
||||||
MyDatabase.invoke(context, getMyFilesDir(context))
|
MyDatabase.invoke(context, getMyFilesDir(context)).attestationDao()
|
||||||
.attestationDao(getConfigRepo(context))
|
|
||||||
)
|
)
|
||||||
|
|
||||||
private fun getProfileRepo(context: Context): ProfileRepository = ProfileRepository.getInstance(
|
private fun getProfileRepo(context: Context): ProfileRepository = ProfileRepository.getInstance(
|
||||||
MyDatabase.invoke(context, getMyFilesDir(context)).profileDao(getConfigRepo(context))
|
MyDatabase.invoke(context, getMyFilesDir(context)).profileDao()
|
||||||
)
|
)
|
||||||
|
|
||||||
private fun getConfigRepo(context: Context): ConfigRepository = ConfigRepository.getInstance(
|
private fun getConfigRepo(context: Context): ConfigRepository = ConfigRepository.getInstance(
|
||||||
|
@ -21,8 +21,8 @@ class PdfUtils private constructor(
|
|||||||
private val path: String
|
private val path: String
|
||||||
) {
|
) {
|
||||||
|
|
||||||
private val checkboxListNames = ArrayList<String>()
|
// private val checkboxListNames = ArrayList<String>()
|
||||||
private val font = PDType1Font.HELVETICA
|
// private val font = PDType1Font.HELVETICA
|
||||||
|
|
||||||
fun fillForm(attestation: Attestation, callback: (Boolean) -> Unit) {
|
fun fillForm(attestation: Attestation, callback: (Boolean) -> Unit) {
|
||||||
checkFolder()
|
checkFolder()
|
||||||
@ -54,7 +54,7 @@ class PdfUtils private constructor(
|
|||||||
|
|
||||||
private fun addPageWithQrCode(document: PDDocument, attestation: Attestation) {
|
private fun addPageWithQrCode(document: PDDocument, attestation: Attestation) {
|
||||||
val size = 360
|
val size = 360
|
||||||
val margin = 40f
|
val margin = 25f
|
||||||
|
|
||||||
// Add QRCode on the first page
|
// Add QRCode on the first page
|
||||||
val page1: PDPage = document.pages.first()
|
val page1: PDPage = document.pages.first()
|
||||||
@ -64,9 +64,8 @@ class PdfUtils private constructor(
|
|||||||
page1,
|
page1,
|
||||||
attestation,
|
attestation,
|
||||||
size / 3,
|
size / 3,
|
||||||
page1.mediaBox.upperRightX - margin - size / 3 - 30,
|
page1.mediaBox.upperRightX - margin - size / 3,
|
||||||
141f,
|
25f
|
||||||
true
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Add QRCode on a new page
|
// Add QRCode on a new page
|
||||||
@ -83,8 +82,7 @@ class PdfUtils private constructor(
|
|||||||
attestation: Attestation,
|
attestation: Attestation,
|
||||||
size: Int,
|
size: Int,
|
||||||
x: Float,
|
x: Float,
|
||||||
y: Float,
|
y: Float
|
||||||
addText: Boolean = false
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
val contentStream = PDPageContentStream(document, page, true, false)
|
val contentStream = PDPageContentStream(document, page, true, false)
|
||||||
@ -92,21 +90,7 @@ class PdfUtils private constructor(
|
|||||||
LosslessFactory.createFromImage(document, QRCodeUtils.getQrCode(attestation, size))
|
LosslessFactory.createFromImage(document, QRCodeUtils.getQrCode(attestation, size))
|
||||||
|
|
||||||
contentStream.drawImage(alphaXimage, x, y)
|
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()
|
contentStream.close()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setFieldsData(acroForm: PDAcroForm, attestation: Attestation): Boolean {
|
private fun setFieldsData(acroForm: PDAcroForm, attestation: Attestation): Boolean {
|
||||||
@ -117,21 +101,18 @@ class PdfUtils private constructor(
|
|||||||
val namesField = acroForm.getField("Nom et prénom") as PDTextField
|
val namesField = acroForm.getField("Nom et prénom") as PDTextField
|
||||||
val birthdayField = acroForm.getField("Date de naissance") as PDTextField
|
val birthdayField = acroForm.getField("Date de naissance") as PDTextField
|
||||||
val birthPlaceField = acroForm.getField("Lieu de naissance") as PDTextField
|
val birthPlaceField = acroForm.getField("Lieu de naissance") as PDTextField
|
||||||
val addressField = acroForm.getField("Adresse actuelle") as PDTextField
|
val addressField = acroForm.getField("Adresse") as PDTextField
|
||||||
val cityField = acroForm.getField("Ville") as PDTextField
|
val cityField = acroForm.getField("Ville") as PDTextField
|
||||||
val dateField = acroForm.getField("Date") as PDTextField
|
val dateField = acroForm.getField("Date") as PDTextField
|
||||||
val hourField = acroForm.getField("Heure") as PDTextField
|
val exitField = 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}"
|
namesField.value = "${profile.firstName} ${profile.lastName}"
|
||||||
birthdayField.value = profile.birthday
|
birthdayField.value = profile.birthday
|
||||||
birthPlaceField.value = profile.birthPlace
|
birthPlaceField.value = profile.birthPlace
|
||||||
addressField.value = "${profile.address} ${profile.postalCode} ${profile.city}"
|
addressField.value = "${profile.address}, ${profile.city} ${profile.postalCode}"
|
||||||
cityField.value = profile.city
|
cityField.value = profile.city
|
||||||
dateField.value = attestation.exitDate
|
dateField.value = attestation.exitDate
|
||||||
hourField.value = attestation.exitHour.split("h")[0]
|
exitField.value = attestation.exitHour.replace('h', ':')
|
||||||
minutesField.value = attestation.exitHour.split("h")[1]
|
|
||||||
return true
|
return true
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Log.e(TAG, "${e.message}")
|
Log.e(TAG, "${e.message}")
|
||||||
@ -141,7 +122,7 @@ class PdfUtils private constructor(
|
|||||||
|
|
||||||
private fun setCheckboxFields(acroForm: PDAcroForm, attestation: Attestation) {
|
private fun setCheckboxFields(acroForm: PDAcroForm, attestation: Attestation) {
|
||||||
attestation.reasons.forEach {
|
attestation.reasons.forEach {
|
||||||
(acroForm.getField(checkboxListNames[it - 1]) as PDCheckbox).check()
|
(acroForm.getField("distinction Motif $it") as PDCheckbox).check()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -163,20 +144,10 @@ class PdfUtils private constructor(
|
|||||||
fun getInstance() = instance
|
fun getInstance() = instance
|
||||||
|
|
||||||
fun getInstance(assetManager: AssetManager, path: String) = instance ?: synchronized(LOCK) {
|
fun getInstance(assetManager: AssetManager, path: String) = instance ?: synchronized(LOCK) {
|
||||||
instance ?: PdfUtils(assetManager, path).also { instance = it; it.initList() }
|
instance ?: PdfUtils(assetManager, path).also { instance = it }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getPath(path: String, createAt: Long): String = "$path/$folderPath/$createAt.pdf"
|
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")
|
|
||||||
}
|
|
||||||
}
|
}
|
@ -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,10 +1,10 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:background="@drawable/custom_rectangle"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="15dp"
|
android:layout_marginBottom="15dp"
|
||||||
|
android:background="@drawable/custom_rectangle"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
@ -13,50 +13,50 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/people_item"
|
android:text="@string/people_item"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/date_item"
|
android:id="@+id/date_item"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/date_item"
|
|
||||||
android:layout_marginTop="3dp"
|
android:layout_marginTop="3dp"
|
||||||
|
android:text="@string/date_item"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/people_item"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent" />
|
app:layout_constraintTop_toBottomOf="@+id/people_item" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/reason_item"
|
android:id="@+id/reason_item"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/reason_item"
|
|
||||||
android:layout_marginTop="3dp"
|
android:layout_marginTop="3dp"
|
||||||
|
android:text="@string/reason_item"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/date_item"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent" />
|
app:layout_constraintTop_toBottomOf="@+id/date_item" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/people_item_data"
|
android:id="@+id/people_item_data"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/date_item_data"
|
android:id="@+id/date_item_data"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="3dp"
|
android:layout_marginTop="3dp"
|
||||||
app:layout_constraintTop_toBottomOf="@id/people_item_data"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent" />
|
app:layout_constraintTop_toBottomOf="@id/people_item_data" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/reason_item_data"
|
android:id="@+id/reason_item_data"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="3dp"
|
android:layout_marginTop="3dp"
|
||||||
app:layout_constraintTop_toBottomOf="@id/date_item_data"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent" />
|
app:layout_constraintTop_toBottomOf="@id/date_item_data" />
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</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,6 +88,8 @@
|
|||||||
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:focusable="false"
|
||||||
|
android:onClick="@{() -> viewModel.onBirthdayClick()}"
|
||||||
android:text="@={viewModel.birthday}"
|
android:text="@={viewModel.birthday}"
|
||||||
app:validateDate='@{"dd/MM/yyyy"}'
|
app:validateDate='@{"dd/MM/yyyy"}'
|
||||||
app:validateDateMessage="@{@string/date_error_message}" />
|
app:validateDateMessage="@{@string/date_error_message}" />
|
||||||
@ -119,7 +121,7 @@
|
|||||||
<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:inputType="number|textCapWords"
|
android:inputType="textPostalAddress|textCapWords"
|
||||||
android:text="@={viewModel.address}" />
|
android:text="@={viewModel.address}" />
|
||||||
|
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
@ -164,7 +166,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="date"
|
android:inputType="date"
|
||||||
|
android:onClick="@{() -> viewModel.onExitDateClick()}"
|
||||||
android:text="@={viewModel.exitDate}"
|
android:text="@={viewModel.exitDate}"
|
||||||
app:validateDate='@{"dd/MM/yyyy"}'
|
app:validateDate='@{"dd/MM/yyyy"}'
|
||||||
app:validateDateMessage="@{@string/date_error_message}" />
|
app:validateDateMessage="@{@string/date_error_message}" />
|
||||||
@ -181,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>
|
||||||
@ -250,6 +256,14 @@
|
|||||||
android:checked="@={viewModel.reason7}"
|
android:checked="@={viewModel.reason7}"
|
||||||
android:text="@string/reason_7" />
|
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.button.MaterialButton
|
<com.google.android.material.button.MaterialButton
|
||||||
android:id="@+id/generate_attestation"
|
android:id="@+id/generate_attestation"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@ -257,7 +271,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>
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/explication_1"
|
android:id="@+id/explication_1"
|
||||||
android:text="@string/explication_1"
|
android:text="@string/explication_1"
|
||||||
android:layout_marginTop="40dp"
|
android:layout_marginTop="20dp"
|
||||||
style="@style/TextView"
|
style="@style/TextView"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
@ -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>
|
||||||
|
@ -4,6 +4,6 @@
|
|||||||
<!-- Validator -->
|
<!-- Validator -->
|
||||||
<string name="date_error_message">Votre date doit être au format 01/01/1970</string>
|
<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étés</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">Restons chez nous pour nous protéger et protéger les autres</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 -->
|
||||||
@ -18,26 +18,33 @@
|
|||||||
<string name="address">Adresse</string>
|
<string name="address">Adresse</string>
|
||||||
<string name="city">Ville</string>
|
<string name="city">Ville</string>
|
||||||
<string name="postal_code">Code Postal</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_date">Date de sortie</string>
|
||||||
<string name="exit_hour">Heure de sortie</string>
|
<string name="exit_hour">Heure de sortie</string>
|
||||||
<string name="generate_attestation_button">Générer l\'attestation</string>
|
<string name="generate_attestation_button">Générer l’attestation</string>
|
||||||
|
|
||||||
<!-- Reasons for leaving house -->
|
<!-- Reasons for leaving house -->
|
||||||
<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">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_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_1">1. Déplacements entre le domicile et le lieu d’exercice de l’activité professionnelle ou le lieu d’enseignement et de formation, déplacements professionnels ne pouvant être différés.</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_2">2. Déplacements pour des consultations et soins ne pouvant être assurés à distance et ne pouvant être différés ou pour l’achat de produits de santé.</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_3">3. Déplacements pour motif familial impérieux, pour l’assistance aux personnes vulnérables ou précaires ou pour 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_4">4. Déplacements des personnes en situation de handicap et de leur accompagnant.</string>
|
||||||
<string name="reason_6">Convocation judiciaire ou administrative.</string>
|
<string name="reason_5">5. Déplacements pour répondre à une 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>
|
<string name="reason_6">6. Déplacements pour participer à des missions d’intérêt général sur demande de l’autorité administrative.</string>
|
||||||
|
<string name="reason_7">7. Déplacements liés à des transits ferroviaires ou aériens pour des déplacements de longues distances.</string>
|
||||||
|
<string name="reason_8">8. Déplacements brefs, dans un rayon maximal d’un kilomètre autour du domicile pour les besoins des animaux de compagnie.</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">- Cette application n’aura jamais de publicité.</string>
|
||||||
<string name="explication_2">- 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">- 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">- Application non gouvernementale ni officiel, développer par un étudiant.</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="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>
|
||||||
|
|
||||||
@ -49,6 +56,6 @@
|
|||||||
<!-- QR Fragment -->
|
<!-- QR Fragment -->
|
||||||
<string name="generating_attestation">Création de votre attesation</string>
|
<string name="generating_attestation">Création de votre attesation</string>
|
||||||
<string name="qrcode_attestation">QrCode Attestation</string>
|
<string name="qrcode_attestation">QrCode Attestation</string>
|
||||||
<string name="display_attestation">Afficher l\'attestation</string>
|
<string name="display_attestation">Afficher l’attestation</string>
|
||||||
<string name="delete_attestation">Supprimer l\'attestation</string>
|
<string name="delete_attestation">Supprimer l’attestation</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -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/margin5dp</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/textSize14sp</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="TextViewCredits" parent="TextView">
|
||||||
|
<item name="android:textSize">@dimen/textSize14sp</item>
|
||||||
|
<item name="android:layout_marginTop">@dimen/margin5dp</item>
|
||||||
</style>
|
</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>
|
||||||
|
@ -2,8 +2,9 @@
|
|||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
ext {
|
ext {
|
||||||
kotlin_version = '1.3.72'
|
kotlin_version = '1.4.21'
|
||||||
db_version = '2'
|
db_version = '1'
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
@ -12,7 +13,7 @@ buildscript {
|
|||||||
|
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:3.6.3'
|
classpath 'com.android.tools.build:gradle:4.1.1'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
#Sun Apr 12 01:14:42 CEST 2020
|
#Sat Oct 24 15:33:39 CEST 2020
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
|
||||||
|
Loading…
Reference in New Issue
Block a user