1 Commits

Author SHA1 Message Date
1d617e7678 Issue-4: Speeling correction 2020-05-02 14:46:30 +02:00
6 changed files with 13 additions and 44 deletions

View File

@ -15,8 +15,8 @@ android {
applicationId "fr.sanchezm.attestationsCovid19"
minSdkVersion 23
targetSdkVersion 29
versionCode 1000
versionName "1.0.4-beta1"
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"
}
}
@ -106,8 +89,6 @@ dependencies {
//noinspection GradleDependency
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
implementation 'com.github.Ilhasoft:data-binding-validator:2.0.0'
// Test
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'

View File

@ -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" />

View File

@ -88,9 +88,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="date"
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>
@ -165,9 +163,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="date"
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>

View File

@ -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é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>

View File

@ -5,9 +5,9 @@
<string name="title_info">À Propos</string>
<!-- Attestation Fragment -->
<string name="attestation_title">Attestation de déplacement dérogatoire</string>
<string name="attestation_title">@string/app_name</string>
<string name="attestation_subtitle">#RestonsChezNous</string>
<string name="attestation_generated">Attestation générer</string>
<string name="attestation_generated">Attestation générée</string>
<string name="no_attestation">Aucune attestation, veuillez en générer une.</string>
<!-- Field for attestation -->
@ -37,13 +37,13 @@
<string name="explication_2">- Cette application n\'aura jamais de publicité.</string>
<string name="explication_3">- Toutes les données sont stockées uniquement sur votre téléphone, utilisable hors ligne.</string>
<string name="explication_4">- Application non gouvernementale ni officielle, développée par un étudiant.</string>
<string name="credits_title">Petit remerciement pour l\'aide apporté au développement de l\'application :</string>
<string name="credits_title">Petit remerciement pour l\'aide apportée au développement de l\'application :</string>
<string name="credits_1">TomRoush: <a href="https://github.com/TomRoush/PdfBox-Android">PdfBox-Android</a></string>
<string name="credits_2">Barteksc: <a href="https://github.com/barteksc/AndroidPdfViewer">AndroidPdfViewer</a></string>
<string name="credits_3">Journeyapps: <a href="https://github.com/journeyapps/zxing-android-embedded">zxing-android-embedded</a></string>
<string name="credits_4">Ainsi que toutes les libraries fourni par google</string>
<string name="credits_5">Merci à <a href="https://www.linkedin.com/in/julienfabbro/">Fabbro J.</a> pour l\'aide sur l\'orthographe</string>
<string name="develop_by">"Développée avec ❤ par
<string name="develop_by">"Développée avec ❤ par
<a href="https://www.sanchezm.fr/">Mathieu Sanchez</a>"</string>
<string name="version_number">Version :</string>

View File

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