Make the QRCode text match the official one, fix small QR code size

AdrienPoupa · Oct 30, 2020 · f0eda5c · f0eda5c
1 parent 3bcf441
commit f0eda5c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/com/poupa/attestationdeplacement/CreateAttestationActivity.java b/app/src/main/java/com/poupa/attestationdeplacement/CreateAttestationActivity.java
@@ -283,7 +283,7 @@ public void setDate() {
 
         travelDateInput.setText(currentDate);
 
-        String currentTime = String.format("%02d", currentHour) + ':' + String.format("%02d", currentMinute);
+        String currentTime = String.format("%02d", currentHour) + 'h' + String.format("%02d", currentMinute);
         attestation.setCurrentTime(currentTime);
 
         travelHourInput.setText(currentTime);

diff --git a/...om/poupa/attestationdeplacement/generator/AttestationDeplacementDerogatoireGenerator.java b/...om/poupa/attestationdeplacement/generator/AttestationDeplacementDerogatoireGenerator.java
@@ -93,6 +93,6 @@ protected void fillForm() throws IOException, DocumentException {
     protected String getQrCodeText() {
         return "Cree le: " + attestation.getCurrentDate() + " a " + attestation.getCurrentTime() + ";\n Nom: " + attestation.getLastName() + ";\n Prenom: " + attestation.getSurname() + ";\n " +
                 "Naissance: " + attestation.getBirthDate() + " a " + attestation.getBirthPlace() + ";\n Adresse: " + attestation.getFullAddress() + ";\n " +
-                "Sortie: " + attestation.getTravelDate() + " a " + attestation.getTravelHour() + ";\n Motifs: " + attestation.getMotivesQrCode();
+                "Sortie: " + attestation.getTravelDate() + " a " + attestation.getHour() + ":" + attestation.getMinute() + ";\n Motifs: " + attestation.getMotivesQrCode();
     }
 }
diff --git a/app/src/main/java/com/poupa/attestationdeplacement/generator/AttestationGenerator.java b/app/src/main/java/com/poupa/attestationdeplacement/generator/AttestationGenerator.java
@@ -49,7 +49,7 @@ public abstract class AttestationGenerator {
         this.context = context;
         this.attestation = attestation;
         setDates();
-        smallQrCodeSize = 92;
+        smallQrCodeSize = 100;
     }
 
     /**