Compare commits
No commits in common. "master" and "ms/issue-4/add-credits-libraries-used" have entirely different histories.
master
...
ms/issue-4
@ -4,19 +4,19 @@ apply plugin: 'kotlin-kapt'
|
||||
apply plugin: 'kotlin-android-extensions'
|
||||
|
||||
android {
|
||||
compileSdkVersion 30
|
||||
compileSdkVersion 29
|
||||
buildToolsVersion "29.0.3"
|
||||
|
||||
buildFeatures {
|
||||
dataBinding true
|
||||
dataBinding {
|
||||
enabled = true
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
applicationId "fr.sanchezm.attestationsCovid19"
|
||||
minSdkVersion 23
|
||||
targetSdkVersion 30
|
||||
versionCode 13
|
||||
versionName "2.2.0"
|
||||
targetSdkVersion 29
|
||||
versionCode 6
|
||||
versionName "1.0.4"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
@ -30,28 +30,11 @@ android {
|
||||
minifyEnabled true
|
||||
shrinkResources true
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
buildConfigField "Integer", "DB_VERSION", db_version
|
||||
buildConfigField "Integer", "DB_VERSION", "1"
|
||||
buildConfigField "Boolean", "TEST", "false"
|
||||
}
|
||||
|
||||
beta {
|
||||
minifyEnabled true
|
||||
shrinkResources true
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
buildConfigField "Integer", "DB_VERSION", db_version
|
||||
buildConfigField "Boolean", "TEST", "false"
|
||||
}
|
||||
|
||||
alpha {
|
||||
minifyEnabled true
|
||||
shrinkResources true
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
buildConfigField "Integer", "DB_VERSION", db_version
|
||||
buildConfigField "Boolean", "TEST", "true"
|
||||
}
|
||||
|
||||
debug {
|
||||
buildConfigField "Integer", "DB_VERSION", db_version
|
||||
buildConfigField "Integer", "DB_VERSION", "1"
|
||||
buildConfigField "Boolean", "TEST", "true"
|
||||
}
|
||||
}
|
||||
@ -74,18 +57,24 @@ dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||
// Android X
|
||||
implementation 'androidx.appcompat:appcompat:1.2.0'
|
||||
implementation 'androidx.core:core-ktx:1.3.2'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
|
||||
implementation 'androidx.appcompat:appcompat:1.1.0'
|
||||
implementation 'androidx.core:core-ktx:1.2.0'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
|
||||
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
|
||||
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
|
||||
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
|
||||
|
||||
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
|
||||
implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
|
||||
implementation 'androidx.navigation:navigation-fragment-ktx:2.2.2'
|
||||
implementation 'androidx.navigation:navigation-fragment:2.2.2'
|
||||
implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
|
||||
implementation 'androidx.navigation:navigation-ui:2.2.2'
|
||||
|
||||
// Design
|
||||
implementation 'com.google.android.material:material:1.2.1'
|
||||
implementation 'com.google.android.material:material:1.1.0'
|
||||
|
||||
// Room
|
||||
// implementation 'androidx.room:room-runtime:2.2.5'
|
||||
// kapt 'androidx.room:room-compiler:2.2.5'
|
||||
|
||||
// PDF
|
||||
implementation 'com.tom_roush:pdfbox-android:1.8.10.1'
|
||||
@ -100,10 +89,8 @@ dependencies {
|
||||
//noinspection GradleDependency
|
||||
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
|
||||
|
||||
implementation 'com.github.Ilhasoft:data-binding-validator:2.0.0'
|
||||
|
||||
// Test
|
||||
testImplementation 'junit:junit:4.12'
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
|
||||
}
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
tools:replace="android:allowBackup"
|
||||
android:theme="@style/AppTheme.Light">
|
||||
<activity android:name=".QrCodeActivity" />
|
||||
<activity android:name=".PdfViewerActivity" />
|
||||
|
||||
Binary file not shown.
@ -28,3 +28,40 @@ class MyDatabase private constructor(private val savePath: String, private val f
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
import android.content.Context
|
||||
import androidx.room.Database
|
||||
import androidx.room.Room
|
||||
import androidx.room.RoomDatabase
|
||||
import fr.sanchezm.attestationsCovid19.data.db.dao.AttestationDao
|
||||
import fr.sanchezm.attestationsCovid19.data.db.dao.ProfileDao
|
||||
import fr.sanchezm.attestationsCovid19.data.db.entity.Profile
|
||||
|
||||
@Database(
|
||||
entities = [Profile::class],
|
||||
version = 1
|
||||
)
|
||||
abstract class MyDatabase private constructor() : RoomDatabase() {
|
||||
|
||||
abstract fun profileDao(): ProfileDao
|
||||
abstract fun attestationDao(): AttestationDao
|
||||
|
||||
companion object {
|
||||
@Volatile
|
||||
private var instance: MyDatabase? = null
|
||||
private val LOCK = Any()
|
||||
|
||||
operator fun invoke(context: Context) = instance ?: synchronized(LOCK) {
|
||||
instance ?: buildDatabase(context).also { instance = it }
|
||||
}
|
||||
|
||||
private fun buildDatabase(context: Context) =
|
||||
Room.databaseBuilder(
|
||||
context.applicationContext,
|
||||
MyDatabase::class.java, "data.db"
|
||||
)
|
||||
.build()
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
@ -3,7 +3,7 @@ package fr.sanchezm.attestationsCovid19.data.db.entity
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.*
|
||||
|
||||
const val PATTERN = "dd/MM/yyyy 'à' HH:mm"
|
||||
const val PATTERN = "dd/MM/yyyy 'à' HH'h'mm"
|
||||
|
||||
//@Entity(tableName = "attestation")
|
||||
data class Attestation(
|
||||
@ -14,7 +14,7 @@ data class Attestation(
|
||||
val reasons: List<Int>
|
||||
) {
|
||||
override fun toString(): String {
|
||||
return "Cree le: ${getDate(createAt)};\n$profile;\nSortie: ${getExitDateFormatted()};\nMotifs: ${getMotifsText()}"
|
||||
return "Cree le: ${getDate(createAt)}; $profile; Sortie: ${getExitDateFormatted()}; Motifs: ${getMotifsText()}"
|
||||
}
|
||||
|
||||
fun getNameFormatted(): String = "${profile.firstName} ${profile.lastName}"
|
||||
@ -28,22 +28,21 @@ data class Attestation(
|
||||
private fun getMotifsText(): String {
|
||||
val motifs = StringBuilder()
|
||||
|
||||
reasons.forEach { motifs.append(getMotifText(it), ", ") }
|
||||
return motifs.toString().dropLast(2)
|
||||
reasons.forEach { motifs.append(getMotifText(it), "-") }
|
||||
return motifs.toString().dropLast(1)
|
||||
}
|
||||
|
||||
private fun getDate(dateTime: Long): String = SimpleDateFormat(PATTERN, Locale.FRANCE).format(Date(dateTime))
|
||||
|
||||
fun getMotifText(i: Int): String {
|
||||
private fun getMotifText(i: Int): String {
|
||||
return when (i) {
|
||||
1 -> "travail"
|
||||
2 -> "sante"
|
||||
3 -> "famille"
|
||||
4 -> "handicap"
|
||||
5 -> "convocation"
|
||||
6 -> "missions"
|
||||
7 -> "transits"
|
||||
8 -> "animaux"
|
||||
2 -> "courses"
|
||||
3 -> "sante"
|
||||
4 -> "famille"
|
||||
5 -> "sport"
|
||||
6 -> "judiciare"
|
||||
7 -> "missions"
|
||||
else -> "Error $i not found"
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,6 +14,6 @@ data class Profile(
|
||||
// var id: Int = CURRENT_PROFILE_ID
|
||||
|
||||
override fun toString(): String {
|
||||
return "Nom: $lastName;\nPrenom: $firstName;\nNaissance: $birthday a $birthPlace;\nAdresse: $address $postalCode $city"
|
||||
return "Nom: $lastName; Prenom: $firstName; Naissance: $birthday a $birthPlace; Adresse: $address $postalCode $city"
|
||||
}
|
||||
}
|
||||
@ -1,9 +1,6 @@
|
||||
package fr.sanchezm.attestationsCovid19.ui.add
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.app.DatePickerDialog
|
||||
import android.app.TimePickerDialog
|
||||
import android.content.Context
|
||||
import android.os.Build
|
||||
import android.util.Log
|
||||
import androidx.lifecycle.LiveData
|
||||
@ -16,7 +13,6 @@ import fr.sanchezm.attestationsCovid19.data.repository.AttestationRepository
|
||||
import fr.sanchezm.attestationsCovid19.data.repository.ConfigRepository
|
||||
import fr.sanchezm.attestationsCovid19.data.repository.ProfileRepository
|
||||
import fr.sanchezm.attestationsCovid19.utilities.Event
|
||||
import java.text.DateFormat
|
||||
import java.text.SimpleDateFormat
|
||||
import java.time.LocalDateTime
|
||||
import java.time.format.DateTimeFormatter
|
||||
@ -25,8 +21,7 @@ import java.util.*
|
||||
class AddViewModel(
|
||||
private val configRepository: ConfigRepository,
|
||||
private val profileRepository: ProfileRepository,
|
||||
private val attestationRepository: AttestationRepository,
|
||||
private val app: Context
|
||||
private val attestationRepository: AttestationRepository
|
||||
) : ViewModel() {
|
||||
|
||||
private val _errorMessage = MutableLiveData<Event<Int>>()
|
||||
@ -60,11 +55,10 @@ class AddViewModel(
|
||||
val reason5 = MutableLiveData(false)
|
||||
val reason6 = MutableLiveData(false)
|
||||
val reason7 = MutableLiveData(false)
|
||||
val reason8 = MutableLiveData(false)
|
||||
// endregion
|
||||
|
||||
private val datePattern = "dd/MM/yyyy"
|
||||
private val timePattern = "HH:mm"
|
||||
private val timePattern = "HH'h'mm"
|
||||
|
||||
@SuppressLint("LongLogTag")
|
||||
fun onGenerateAttestationClick() {
|
||||
@ -81,68 +75,6 @@ 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 {
|
||||
setProfileValue()
|
||||
setDateHourToday()
|
||||
@ -205,7 +137,6 @@ class AddViewModel(
|
||||
if (reason5.value!!) reasons.add(5)
|
||||
if (reason6.value!!) reasons.add(6)
|
||||
if (reason7.value!!) reasons.add(7)
|
||||
if (reason8.value!!) reasons.add(8)
|
||||
|
||||
return reasons
|
||||
}
|
||||
@ -231,16 +162,6 @@ class AddViewModel(
|
||||
|| reason5.value!!
|
||||
|| reason6.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,6 +1,5 @@
|
||||
package fr.sanchezm.attestationsCovid19.ui.add
|
||||
|
||||
import android.content.Context
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import fr.sanchezm.attestationsCovid19.data.repository.AttestationRepository
|
||||
@ -10,13 +9,12 @@ import fr.sanchezm.attestationsCovid19.data.repository.ProfileRepository
|
||||
class AddViewModelFactory(
|
||||
private val configRepository: ConfigRepository,
|
||||
private val profileRepository: ProfileRepository,
|
||||
private val attestationRepository: AttestationRepository,
|
||||
private val app: Context
|
||||
private val attestationRepository: AttestationRepository
|
||||
) :
|
||||
ViewModelProvider.NewInstanceFactory() {
|
||||
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
|
||||
return AddViewModel(configRepository, profileRepository, attestationRepository, app) as T
|
||||
return AddViewModel(configRepository, profileRepository, attestationRepository) as T
|
||||
}
|
||||
}
|
||||
@ -20,7 +20,6 @@ class InfoFragment : Fragment() {
|
||||
): View? {
|
||||
val root = inflater.inflate(R.layout.fragment_info, container, false)
|
||||
|
||||
root.explication_4.movementMethod = LinkMovementMethod.getInstance()
|
||||
root.credits_1.movementMethod = LinkMovementMethod.getInstance()
|
||||
root.credits_2.movementMethod = LinkMovementMethod.getInstance()
|
||||
root.credits_3.movementMethod = LinkMovementMethod.getInstance()
|
||||
|
||||
@ -16,8 +16,7 @@ object InjectorUtils {
|
||||
AddViewModelFactory(
|
||||
getConfigRepo(context),
|
||||
getProfileRepo(context),
|
||||
getAttestationRepo(context),
|
||||
context
|
||||
getAttestationRepo(context)
|
||||
)
|
||||
|
||||
fun provideAttestationViewModel(context: Context): AttestationsViewModelFactory =
|
||||
|
||||
@ -21,8 +21,8 @@ class PdfUtils private constructor(
|
||||
private val path: String
|
||||
) {
|
||||
|
||||
// private val checkboxListNames = ArrayList<String>()
|
||||
// private val font = PDType1Font.HELVETICA
|
||||
private val checkboxListNames = ArrayList<String>()
|
||||
private val font = PDType1Font.HELVETICA
|
||||
|
||||
fun fillForm(attestation: Attestation, callback: (Boolean) -> Unit) {
|
||||
checkFolder()
|
||||
@ -54,7 +54,7 @@ class PdfUtils private constructor(
|
||||
|
||||
private fun addPageWithQrCode(document: PDDocument, attestation: Attestation) {
|
||||
val size = 360
|
||||
val margin = 25f
|
||||
val margin = 40f
|
||||
|
||||
// Add QRCode on the first page
|
||||
val page1: PDPage = document.pages.first()
|
||||
@ -64,8 +64,9 @@ class PdfUtils private constructor(
|
||||
page1,
|
||||
attestation,
|
||||
size / 3,
|
||||
page1.mediaBox.upperRightX - margin - size / 3,
|
||||
25f
|
||||
page1.mediaBox.upperRightX - margin - size / 3 - 30,
|
||||
141f,
|
||||
true
|
||||
)
|
||||
|
||||
// Add QRCode on a new page
|
||||
@ -82,7 +83,8 @@ class PdfUtils private constructor(
|
||||
attestation: Attestation,
|
||||
size: Int,
|
||||
x: Float,
|
||||
y: Float
|
||||
y: Float,
|
||||
addText: Boolean = false
|
||||
) {
|
||||
|
||||
val contentStream = PDPageContentStream(document, page, true, false)
|
||||
@ -90,7 +92,21 @@ class PdfUtils private constructor(
|
||||
LosslessFactory.createFromImage(document, QRCodeUtils.getQrCode(attestation, size))
|
||||
|
||||
contentStream.drawImage(alphaXimage, x, y)
|
||||
if (addText) {
|
||||
contentStream.beginText()
|
||||
contentStream.setFont(font, 7f)
|
||||
contentStream.newLineAtOffset(page.mediaBox.upperRightX - size - 20, 145f)
|
||||
contentStream.showText("Date de création:")
|
||||
contentStream.endText()
|
||||
|
||||
contentStream.beginText()
|
||||
contentStream.setFont(font, 7f)
|
||||
contentStream.newLineAtOffset(page.mediaBox.upperRightX - size - 27, 138f)
|
||||
contentStream.showText(attestation.getCreatedAtFormattedDate())
|
||||
contentStream.endText()
|
||||
}
|
||||
contentStream.close()
|
||||
|
||||
}
|
||||
|
||||
private fun setFieldsData(acroForm: PDAcroForm, attestation: Attestation): Boolean {
|
||||
@ -101,18 +117,21 @@ class PdfUtils private constructor(
|
||||
val namesField = acroForm.getField("Nom et prénom") as PDTextField
|
||||
val birthdayField = acroForm.getField("Date de naissance") as PDTextField
|
||||
val birthPlaceField = acroForm.getField("Lieu de naissance") as PDTextField
|
||||
val addressField = acroForm.getField("Adresse") as PDTextField
|
||||
val addressField = acroForm.getField("Adresse actuelle") as PDTextField
|
||||
val cityField = acroForm.getField("Ville") as PDTextField
|
||||
val dateField = acroForm.getField("Date") as PDTextField
|
||||
val exitField = acroForm.getField("Heure") as PDTextField
|
||||
val hourField = acroForm.getField("Heure") as PDTextField
|
||||
val minutesField = acroForm.getField("Minute") as PDTextField
|
||||
// val signatureField = acroForm.getField("Signature") as PDTextField
|
||||
|
||||
namesField.value = "${profile.firstName} ${profile.lastName}"
|
||||
birthdayField.value = profile.birthday
|
||||
birthPlaceField.value = profile.birthPlace
|
||||
addressField.value = "${profile.address}, ${profile.city} ${profile.postalCode}"
|
||||
addressField.value = "${profile.address} ${profile.postalCode} ${profile.city}"
|
||||
cityField.value = profile.city
|
||||
dateField.value = attestation.exitDate
|
||||
exitField.value = attestation.exitHour.replace('h', ':')
|
||||
hourField.value = attestation.exitHour.split("h")[0]
|
||||
minutesField.value = attestation.exitHour.split("h")[1]
|
||||
return true
|
||||
} catch (e: Exception) {
|
||||
Log.e(TAG, "${e.message}")
|
||||
@ -122,7 +141,7 @@ class PdfUtils private constructor(
|
||||
|
||||
private fun setCheckboxFields(acroForm: PDAcroForm, attestation: Attestation) {
|
||||
attestation.reasons.forEach {
|
||||
(acroForm.getField("distinction Motif $it") as PDCheckbox).check()
|
||||
(acroForm.getField(checkboxListNames[it - 1]) as PDCheckbox).check()
|
||||
}
|
||||
}
|
||||
|
||||
@ -144,10 +163,20 @@ class PdfUtils private constructor(
|
||||
fun getInstance() = instance
|
||||
|
||||
fun getInstance(assetManager: AssetManager, path: String) = instance ?: synchronized(LOCK) {
|
||||
instance ?: PdfUtils(assetManager, path).also { instance = it }
|
||||
instance ?: PdfUtils(assetManager, path).also { instance = it; it.initList() }
|
||||
}
|
||||
|
||||
fun getPath(path: String, createAt: Long): String = "$path/$folderPath/$createAt.pdf"
|
||||
|
||||
}
|
||||
|
||||
private fun initList() {
|
||||
checkboxListNames.add("Déplacements entre domicile et travail")
|
||||
checkboxListNames.add("Déplacements achats nécéssaires")
|
||||
checkboxListNames.add("Consultations et soins")
|
||||
checkboxListNames.add("Déplacements pour motif familial")
|
||||
checkboxListNames.add("Déplacements brefs (activité physique et animaux)")
|
||||
checkboxListNames.add("Convcation judiciaire ou administrative")
|
||||
checkboxListNames.add("Mission d'intérêt général")
|
||||
}
|
||||
}
|
||||
@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:background="@drawable/custom_rectangle"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="15dp"
|
||||
android:background="@drawable/custom_rectangle"
|
||||
android:padding="15dp">
|
||||
|
||||
<TextView
|
||||
@ -13,50 +13,50 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/people_item"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/date_item"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="3dp"
|
||||
android:text="@string/date_item"
|
||||
android:layout_marginTop="3dp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/people_item" />
|
||||
app:layout_constraintTop_toBottomOf="@+id/people_item"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/reason_item"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="3dp"
|
||||
android:text="@string/reason_item"
|
||||
android:layout_marginTop="3dp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/date_item" />
|
||||
app:layout_constraintTop_toBottomOf="@+id/date_item"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/people_item_data"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/date_item_data"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="3dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/people_item_data" />
|
||||
app:layout_constraintTop_toBottomOf="@id/people_item_data"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/reason_item_data"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="3dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/date_item_data" />
|
||||
app:layout_constraintTop_toBottomOf="@id/date_item_data"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
tools:context=".ui.add.AddFragment">
|
||||
|
||||
<data>
|
||||
@ -12,9 +12,9 @@
|
||||
</data>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/constraintContext"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="match_parent"
|
||||
android:id="@+id/constraintContext">
|
||||
|
||||
<androidx.core.widget.NestedScrollView
|
||||
android:layout_width="match_parent"
|
||||
@ -34,10 +34,10 @@
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textStyle="bold"
|
||||
android:text="@string/attestation_title"
|
||||
android:textColor="?attr/colorPrimary"
|
||||
android:textSize="25sp"
|
||||
android:textStyle="bold" />
|
||||
android:textSize="25sp" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
@ -88,11 +88,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="date"
|
||||
android:focusable="false"
|
||||
android:onClick="@{() -> viewModel.onBirthdayClick()}"
|
||||
android:text="@={viewModel.birthday}"
|
||||
app:validateDate='@{"dd/MM/yyyy"}'
|
||||
app:validateDateMessage="@{@string/date_error_message}" />
|
||||
android:text="@={viewModel.birthday}" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
@ -166,12 +162,8 @@
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:focusable="false"
|
||||
android:inputType="date"
|
||||
android:onClick="@{() -> viewModel.onExitDateClick()}"
|
||||
android:text="@={viewModel.exitDate}"
|
||||
app:validateDate='@{"dd/MM/yyyy"}'
|
||||
app:validateDateMessage="@{@string/date_error_message}" />
|
||||
android:text="@={viewModel.exitDate}" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
@ -185,9 +177,7 @@
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:focusable="false"
|
||||
android:inputType="time"
|
||||
android:onClick="@{() -> viewModel.onExitHourClick()}"
|
||||
android:text="@={viewModel.exitHour}" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
@ -256,14 +246,6 @@
|
||||
android:checked="@={viewModel.reason7}"
|
||||
android:text="@string/reason_7" />
|
||||
|
||||
<com.google.android.material.checkbox.MaterialCheckBox
|
||||
android:id="@+id/reason_8"
|
||||
style="@style/MaterialCheckBox"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:checked="@={viewModel.reason8}"
|
||||
android:text="@string/reason_8" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/generate_attestation"
|
||||
android:layout_width="match_parent"
|
||||
@ -271,6 +253,7 @@
|
||||
android:layout_marginTop="20dp"
|
||||
android:onClick="@{() -> viewModel.onGenerateAttestationClick()}"
|
||||
android:text="@string/generate_attestation_button" />
|
||||
<!-- android:enabled="false"-->
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<TextView
|
||||
android:id="@+id/explication_1"
|
||||
android:text="@string/explication_1"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_marginTop="40dp"
|
||||
style="@style/TextView"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<!-- Validator -->
|
||||
<string name="date_error_message">Votre date doit être au format 01/01/1970</string>
|
||||
|
||||
<string name="error_cannot_create_attestation">Erreur lors de la génération de l\'attestation, tout les champs ne sont pas complétés</string>
|
||||
<string name="error_cannot_create_attestation">Erreur lors de la génération de l\'attestation, tout les champs ne sont pas compléter</string>
|
||||
<string name="error_failed_create_pdf">Erreur lors de la génération de l\'attestion, veuillez vérifiez vos champs ou contacter le développeur.</string>
|
||||
|
||||
</resources>
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
<!-- Attestation Fragment -->
|
||||
<string name="attestation_title">@string/app_name</string>
|
||||
<string name="attestation_subtitle">Restons chez nous pour nous protéger et protéger les autres</string>
|
||||
<string name="attestation_subtitle">#RestonsChezNous</string>
|
||||
<string name="attestation_generated">Attestation générée</string>
|
||||
<string name="no_attestation">Aucune attestation, veuillez en générer une.</string>
|
||||
|
||||
@ -18,32 +18,31 @@
|
||||
<string name="address">Adresse</string>
|
||||
<string name="city">Ville</string>
|
||||
<string name="postal_code">Code Postal</string>
|
||||
<string name="reason">Choisissez le ou les motif(s) de sortie</string>
|
||||
<string name="exit_date">Date de sortie</string>
|
||||
<string name="exit_hour">Heure de sortie</string>
|
||||
<string name="generate_attestation_button">Générer l’attestation</string>
|
||||
<string name="generate_attestation_button">Générer l\'attestation</string>
|
||||
|
||||
<!-- Reasons for leaving house -->
|
||||
<string name="reason">Je certifie que mon déplacement est lié au(x) motif(s) suivant (cocher la case) autorisé en application des mesures générales nécessaires pour faire face à l’épidémie de Covid19 dans le cadre de l’état d’urgence sanitaire :</string>
|
||||
<string name="reason_1">1. Déplacements entre le domicile et le lieu d’exercice de l’activité professionnelle ou le lieu d’enseignement et de formation, déplacements professionnels ne pouvant être différés.</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_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_4">4. Déplacements des personnes en situation de handicap et de leur accompagnant.</string>
|
||||
<string name="reason_5">5. Déplacements pour répondre à une convocation judiciaire ou 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>
|
||||
<string name="reason_1">Déplacements entre le domicile et le lieu d’exercice de l’activité professionnelle, lorsqu\'ils sont indispensables à l\'exercice d’activités ne pouvant être organisées sous forme de télétravail ou déplacements professionnels ne pouvant être différés.</string>
|
||||
<string name="reason_2">Déplacements pour effectuer des achats de fournitures nécessaires à l’activité professionnelle et des achats de première nécessité dans des établissements dont les activités demeurent autorisées</string>
|
||||
<string name="reason_3">Consultations et soins ne pouvant être assurés à distance et ne pouvant être différés ; consultations et soins des patients atteints d\'une affection de longue durée.</string>
|
||||
<string name="reason_4">Déplacements pour motif familial impérieux, pour l’assistance aux personnes vulnérables ou la garde d’enfants.</string>
|
||||
<string name="reason_5">Déplacements brefs, dans la limite d\'une heure quotidienne et dans un rayon maximal d\'un kilomètre autour du domicile, liés soit à l\'activité physique individuelle des personnes, à l\'exclusion de toute pratique sportive collective et de toute proximité avec d\'autres personnes, soit à la promenade avec les seules personnes regroupées dans un même domicile, soit aux besoins des animaux de compagnie.</string>
|
||||
<string name="reason_6">Convocation judiciaire ou administrative.</string>
|
||||
<string name="reason_7">Participation à des missions d’intérêt général sur demande de l’autorité administrative.</string>
|
||||
|
||||
<!-- Info Fragment -->
|
||||
<string name="explication_1">- Cette application n’aura jamais de publicité.</string>
|
||||
<string name="explication_2">- Toutes les données sont stockées uniquement sur votre téléphone, utilisable hors ligne.</string>
|
||||
<string name="explication_3">- Application non gouvernementale ni officielle, développée par un jeune diplômé.</string>
|
||||
<string name="explication_4">- Si vous souhaitez m’offrir une bière ou un café, c’est <a href="https://buymeacoff.ee/sanchezm/">ici</a> ou vous pouvez me suivre sur <a href="https://www.twitch.tv/mathdieu">twitch</a>.</string>
|
||||
<string name="credits_title">Petit remerciement pour l’aide apportée au développement de l’application :</string>
|
||||
<string name="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_3">- Toutes les données sont stockées uniquement sur votre téléphone, utilisable hors ligne.</string>
|
||||
<string name="explication_4">- Application non gouvernementale ni officielle, développée par un étudiant.</string>
|
||||
<string name="credits_title">Petit remerciement pour l\'aide apporté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="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>
|
||||
<string name="version_number">Version :</string>
|
||||
@ -56,6 +55,6 @@
|
||||
<!-- QR Fragment -->
|
||||
<string name="generating_attestation">Création de votre attesation</string>
|
||||
<string name="qrcode_attestation">QrCode Attestation</string>
|
||||
<string name="display_attestation">Afficher l’attestation</string>
|
||||
<string name="delete_attestation">Supprimer l’attestation</string>
|
||||
<string name="display_attestation">Afficher l\'attestation</string>
|
||||
<string name="delete_attestation">Supprimer l\'attestation</string>
|
||||
</resources>
|
||||
|
||||
@ -37,9 +37,9 @@
|
||||
<style name="TextView" parent="Widget.MaterialComponents.TextView">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_marginTop">@dimen/margin5dp</item>
|
||||
<item name="android:layout_marginTop">@dimen/margin15dp</item>
|
||||
<item name="android:textColor">@color/colorPrimary</item>
|
||||
<item name="android:textSize">@dimen/textSize14sp</item>
|
||||
<item name="android:textSize">@dimen/textSize18sp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextViewCredits" parent="TextView">
|
||||
|
||||
11
build.gradle
11
build.gradle
@ -1,19 +1,14 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
|
||||
buildscript {
|
||||
ext {
|
||||
kotlin_version = '1.4.21'
|
||||
db_version = '1'
|
||||
|
||||
}
|
||||
|
||||
ext.kotlin_version = '1.3.72'
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:4.1.1'
|
||||
classpath 'com.android.tools.build:gradle:3.6.3'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
@ -25,7 +20,7 @@ allprojects {
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
maven { url 'https://jitpack.io' }
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
#Sat Oct 24 15:33:39 CEST 2020
|
||||
#Sun Apr 12 01:14:42 CEST 2020
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
|
||||
|
||||
Loading…
Reference in New Issue
Block a user