Issue-4: Speeling correction

Adding credits and correct spelling mistake
Version 1.0.4 version code 6
2020-05-02 14:46:30 +02:00 · 2020-04-29 17:20:11 +02:00 · 2020-04-26 17:14:00 +02:00 · 2020-04-26 17:13:28 +02:00 · 2020-04-26 17:12:38 +02:00
11 changed files with 141 additions and 129 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -15,8 +15,8 @@ android {
        applicationId "fr.sanchezm.attestationsCovid19"
        minSdkVersion 23
        targetSdkVersion 29
-        versionCode 5
-        versionName "1.0.3"
+        versionCode 6
+        versionName "1.0.4"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@ -78,7 +78,8 @@ dependencies {

    // PDF
    implementation 'com.tom_roush:pdfbox-android:1.8.10.1'
-    implementation 'com.github.barteksc:android-pdf-viewer:3.2.0-beta.1'
+    //noinspection GradleDependency
+    implementation 'com.github.barteksc:android-pdf-viewer:2.8.2'

    // Gson
    implementation 'com.google.code.gson:gson:2.8.6'
--- a/app/src/main/java/fr/sanchezm/attestationsCovid19/data/db/entity/Attestation.kt
+++ b/app/src/main/java/fr/sanchezm/attestationsCovid19/data/db/entity/Attestation.kt
@ -3,7 +3,7 @@ package fr.sanchezm.attestationsCovid19.data.db.entity
 import java.text.SimpleDateFormat
 import java.util.*

-const val PATTERN = "dd/MM/yyyy 'a' HH'h'mm"
+const val PATTERN = "dd/MM/yyyy 'à' HH'h'mm"

 //@Entity(tableName = "attestation")
 data class Attestation(
--- a/app/src/main/java/fr/sanchezm/attestationsCovid19/ui/info/InfoFragment.kt
+++ b/app/src/main/java/fr/sanchezm/attestationsCovid19/ui/info/InfoFragment.kt
@ -1,15 +1,15 @@
 package fr.sanchezm.attestationsCovid19.ui.info

-import android.os.Bundle;
+import android.os.Bundle
 import android.text.method.LinkMovementMethod
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 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() {

@ -20,13 +20,19 @@ class InfoFragment : Fragment() {
    ): View? {
        val root = inflater.inflate(R.layout.fragment_info, container, false)

-        root.findViewById<TextView>(R.id.develop_by).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
    }

    private fun getVersionText(): String {
-        val versionText = getString(R.string.version_number);
+        val versionText = getString(R.string.version_number)
        val versionName = BuildConfig.VERSION_NAME

        return "$versionText $versionName"
--- a/app/src/main/java/fr/sanchezm/attestationsCovid19/ui/qrcode/QrCodeViewModel.kt
+++ b/app/src/main/java/fr/sanchezm/attestationsCovid19/ui/qrcode/QrCodeViewModel.kt
@ -5,6 +5,7 @@ import android.view.View
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import fr.sanchezm.attestationsCovid19.R
 import fr.sanchezm.attestationsCovid19.data.db.entity.Attestation
 import fr.sanchezm.attestationsCovid19.data.repository.AttestationRepository
 import fr.sanchezm.attestationsCovid19.data.repository.ConfigRepository
@ -28,6 +29,7 @@ class QrCodeViewModel(

    private val _startActivity = MutableLiveData<Event<Long>>()
    private val _finish = MutableLiveData<Event<Boolean>>()
+    private val _error = MutableLiveData<Event<Int>>()

    val attestation: LiveData<Attestation> = _attestation

@ -40,6 +42,7 @@ class QrCodeViewModel(

    val startActivity: LiveData<Event<Long>> = _startActivity
    val finish: LiveData<Event<Boolean>> = _finish
+    val error: LiveData<Event<Int>> = _error

    fun addData(createAt: Long, toCreate: Boolean) {
        val att = attestationRepository.getAttestation(createAt)
@ -69,6 +72,8 @@ class QrCodeViewModel(
            ) { success ->
                if (success)
                    displayQrCode()
+                else
+                    _error.value = Event(R.string.error_failed_create_pdf)
            }
        }
    }
--- a/app/src/main/java/fr/sanchezm/attestationsCovid19/utilities/PdfUtils.kt
+++ b/app/src/main/java/fr/sanchezm/attestationsCovid19/utilities/PdfUtils.kt
@ -33,14 +33,17 @@ class PdfUtils private constructor(
            val acroForm = docCatalog.acroForm

            // Adding data
-            setFieldsData(acroForm, attestation)
-            setCheckboxFields(acroForm, attestation)
-            addPageWithQrCode(document, attestation)
+            if (setFieldsData(acroForm, attestation)) {
+                setCheckboxFields(acroForm, attestation)
+                addPageWithQrCode(document, attestation)

-            Log.v("PdfUtils", "Save File to ${getPath(attestation.createAt)}")
-            document.save(getPath(attestation.createAt))
-            document.close()
-            callback(true)
+                Log.v("PdfUtils", "Save File to ${getPath(attestation.createAt)}")
+                document.save(getPath(attestation.createAt))
+                document.close()
+                callback(true)
+            } else {
+                callback(false)
+            }
        } catch (e: IOException) {
            e.printStackTrace()
            callback(false)
@ -106,29 +109,34 @@ class PdfUtils private constructor(

    }

-    private fun setFieldsData(acroForm: PDAcroForm, attestation: Attestation) {
+    private fun setFieldsData(acroForm: PDAcroForm, attestation: Attestation): Boolean {
        val profile = attestation.profile

-        // Init Fields
-        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 actuelle") as PDTextField
-        val cityField = acroForm.getField("Ville") as PDTextField
-        val dateField = acroForm.getField("Date") as PDTextField
-        val hourField = acroForm.getField("Heure") as PDTextField
-        val minutesField = acroForm.getField("Minute") as PDTextField
+        try {
+            // Init Fields
+            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 actuelle") as PDTextField
+            val cityField = acroForm.getField("Ville") as PDTextField
+            val dateField = acroForm.getField("Date") 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.postalCode} ${profile.city}"
-        cityField.value = profile.city
-        dateField.value = attestation.exitDate
-        hourField.value = attestation.exitHour.split("h")[0]
-        minutesField.value = attestation.exitHour.split("h")[1]
-
+            namesField.value = "${profile.firstName} ${profile.lastName}"
+            birthdayField.value = profile.birthday
+            birthPlaceField.value = profile.birthPlace
+            addressField.value = "${profile.address} ${profile.postalCode} ${profile.city}"
+            cityField.value = profile.city
+            dateField.value = attestation.exitDate
+            hourField.value = attestation.exitHour.split("h")[0]
+            minutesField.value = attestation.exitHour.split("h")[1]
+            return true
+        } catch (e: Exception) {
+            Log.e(TAG, "${e.message}")
+        }
+        return false
    }

    private fun setCheckboxFields(acroForm: PDAcroForm, attestation: Attestation) {
@ -150,6 +158,7 @@ class PdfUtils private constructor(
        private var instance: PdfUtils? = null
        private val LOCK = Any()
        private const val folderPath = "attestations"
+        private val TAG = PdfUtils::class.simpleName

        fun getInstance() = instance

--- a/app/src/main/res/layout-v26/fragment_info.xml
+++ b/app/src/main/res/layout-v26/fragment_info.xml
@ -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>
--- a/app/src/main/res/layout/fragment_info.xml
+++ b/app/src/main/res/layout/fragment_info.xml
@ -52,6 +52,58 @@
        app:layout_constraintEnd_toEndOf="parent"
        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
        android:id="@+id/develop_by"
        android:layout_width="wrap_content"
--- a/app/src/main/res/values-v26/styles.xml
+++ b/app/src/main/res/values-v26/styles.xml
@ -4,7 +4,7 @@
    <style name="TextView">
        <item name="android:layout_width">match_parent</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:textSize">@dimen/textSize18sp</item>
        <item name="android:justificationMode">inter_word</item>
--- a/app/src/main/res/values/errors.xml
+++ b/app/src/main/res/values/errors.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <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>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -5,10 +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="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="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 -->
@ -34,11 +33,17 @@
    <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">- Merci de n\'utiliser l\'application quand 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 officiel, développer par un étudiant.</string>
-    <string name="develop_by">"Développer avec ❤️ par
+    <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="develop_by">"Développée avec ❤ par
        <a href="https://www.sanchezm.fr/">Mathieu Sanchez</a>"</string>
    <string name="version_number">Version :</string>

--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -37,14 +37,20 @@
    <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/margin20dp</item>
+        <item name="android:layout_marginTop">@dimen/margin15dp</item>
        <item name="android:textColor">@color/colorPrimary</item>
        <item name="android:textSize">@dimen/textSize18sp</item>
    </style>

+    <style name="TextViewCredits" parent="TextView">
+        <item name="android:textSize">@dimen/textSize14sp</item>
+        <item name="android:layout_marginTop">@dimen/margin5dp</item>
+    </style>
+
    <dimen name="textSize18sp">18sp</dimen>
+    <dimen name="textSize14sp">14sp</dimen>
    <dimen name="textInputCornerRadius">20dp</dimen>
-    <dimen name="margin20dp">20dp</dimen>
+    <dimen name="margin15dp">15dp</dimen>
    <dimen name="margin5dp">5dp</dimen>
    <dimen name="emptySize">0dp</dimen>
 </resources>
Author	SHA1	Message	Date
Mathieu Sanchez	1d617e7678	Issue-4: Speeling correction	2020-05-02 14:46:30 +02:00
Mathieu Sanchez	a7993ed680	Adding credits and correct spelling mistake	2020-04-29 17:20:11 +02:00
Mathieu Sanchez	41676a6b54	Version 1.0.4 version code 6	2020-04-26 17:14:00 +02:00
Mathieu Sanchez	ff04fb3102	Issue-8: Downgrade PDF Viewer for Xiaomi error	2020-04-26 17:13:28 +02:00
Mathieu Sanchez	514d1dff4e	Adding error return if pdfUtils error	2020-04-26 17:12:38 +02:00