Generating the PDF in a thread

Author: AdrienPoupa

CHANGELOG.md

@@ -12,6 +12,7 @@
 ### Changé
 - Ajout de marges autour des motifs de sortie
 - Méthode d'ouverture du PDF, ajout d'un message informatif si pas de lecteur PDF installé
+- Création du PDF dans un thread, ajout d'une fenêtre de chargement
 
 ## [1.2.1] - 2020-04-11
 ### Changé

app/src/main/java/com/poupa/attestationdeplacement/CreateAttestationActivity.java

@@ -1,10 +1,12 @@
 package com.poupa.attestationdeplacement;
 
+import android.app.ProgressDialog;
 import android.app.TimePickerDialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.CheckBox;
@@ -20,7 +22,6 @@
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import com.itextpdf.text.BaseColor;
 import com.itextpdf.text.DocumentException;
 import com.itextpdf.text.Element;
@@ -168,10 +169,67 @@ public void onTimeSet(TimePicker timePicker, int hour, int minute) {
     }
 
     /**
-     * Generates the PDF file and the QRCode
+     * Generates the PDF by calling the async task
      * @param v
      */
-    public void generate(View v) {
+    public void startGenerate(View v) {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                final GeneratePdfTask task = new GeneratePdfTask();
+                task.execute();
+            }
+        }).start();
+    }
+
+    private class GeneratePdfTask extends AsyncTask<Void, Void, Void> {
+        ProgressDialog nDialog;
+
+        @Override
+        protected void onPreExecute() {
+            CreateAttestationActivity.this.runOnUiThread(new Runnable()
+            {
+                public void run()
+                {
+                    nDialog = new ProgressDialog(CreateAttestationActivity.this);
+                    nDialog.setMessage(getString(R.string.loading));
+                    nDialog.setTitle(getString(R.string.generating));
+                    nDialog.setIndeterminate(true);
+                    nDialog.setCancelable(false);
+                    nDialog.show();
+                }
+            });
+        }
+
+        @Override
+        protected void onPostExecute(Void result) {
+            CreateAttestationActivity.this.runOnUiThread(new Runnable()
+            {
+                public void run()
+                {
+                    nDialog.dismiss();
+
+                    Toast.makeText(CreateAttestationActivity.this, "Attestation générée !", Toast.LENGTH_SHORT).show();
+
+                    Intent show = new Intent(CreateAttestationActivity.this, MainActivity.class);
+
+                    startActivity(show);
+                }
+            });
+        }
+
+        @Override
+        protected Void doInBackground(Void... voids) {
+            generate();
+
+            return null;
+        }
+    }
+
+    /**
+     * Generates the PDF file and the QRCode
+     */
+    private void generate() {
         try {
             saveFields();
 
@@ -199,11 +257,6 @@ public void generate(View v) {
             stamper.setFormFlattening(true);
 
             stamper.close();
-
-            Toast.makeText(this, "Attestation générée !", Toast.LENGTH_SHORT).show();
-
-            Intent show = new Intent(this, MainActivity.class);
-            startActivity(show);
         } catch (IOException | WriterException | DocumentException e) {
             e.printStackTrace();
             Toast.makeText(this, "Erreur", Toast.LENGTH_SHORT).show();
@@ -489,8 +542,7 @@ public Bitmap generateQrCode(String str, int width, int height) throws WriterExc
         BitMatrix result;
         try {
             Map<EncodeHintType, Object> hints = new EnumMap<>(EncodeHintType.class);
-            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M);
-            hints.put(EncodeHintType.MARGIN, 1);
+            hints.put(EncodeHintType.MARGIN, 0);
             hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
             result = new MultiFormatWriter().encode(str,
                     BarcodeFormat.QR_CODE, width, height, hints);

app/src/main/res/layout/content_create_attestation.xml

@@ -351,7 +351,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
-            android:onClick="generate"
+            android:onClick="startGenerate"
             android:text="@string/generate"
             android:textColor="@color/design_default_color_on_primary"
             app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/values/strings.xml

@@ -32,4 +32,6 @@
 
     <string name="delete_information">Voulez-vous vraiment supprimer cette attestation ?</string>
     <string name="no_pdf_reader">Vous n\'avez pas d\'application permettant de lire des fichiers PDF. Veuillez en installer une avant de réessayer.</string>
+    <string name="generating">Génération de l\'attestation</string>
+    <string name="loading">Chargement..</string>
 </resources>