From 63d14666a550388fbaa2021dc5a7217baaf54190 Mon Sep 17 00:00:00 2001
From: GME <guillaume.meneroud@gmail.com>
Date: Sat, 24 Nov 2018 09:33:38 +0100
Subject: [PATCH] update register layout

---
 .../mobile/qrcode/QrCodeActivity.java         |   2 +-
 app/src/main/res/layout/activity_2fa.xml      |   6 -
 app/src/main/res/layout/activity_signup.xml   | 203 ++++++++++--------
 3 files changed, 109 insertions(+), 102 deletions(-)
 delete mode 100644 app/src/main/res/layout/activity_2fa.xml

diff --git a/app/src/main/java/monnethic/mobile/qrcode/QrCodeActivity.java b/app/src/main/java/monnethic/mobile/qrcode/QrCodeActivity.java
index f0b9532..4f90881 100644
--- a/app/src/main/java/monnethic/mobile/qrcode/QrCodeActivity.java
+++ b/app/src/main/java/monnethic/mobile/qrcode/QrCodeActivity.java
@@ -51,7 +51,7 @@ public class QrCodeActivity extends AppCompatActivity {
         BitMatrix bitMatrix;
         String valueToEncode = adresse+";"+value;
         try{
-            bitMatrix = new MultiFormatWriter().encode(valueToEncode, BarcodeFormat.QR_CODE,450,450);
+            bitMatrix = new MultiFormatWriter().encode(valueToEncode, BarcodeFormat.QR_CODE,350,350);
             BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
             Bitmap bitmap = barcodeEncoder.createBitmap(bitMatrix);
             qrCode.setImageBitmap(bitmap);
diff --git a/app/src/main/res/layout/activity_2fa.xml b/app/src/main/res/layout/activity_2fa.xml
deleted file mode 100644
index d8fb324..0000000
--- a/app/src/main/res/layout/activity_2fa.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index b8df5d4..a7d359c 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -3,108 +3,121 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <Button
-        android:id="@+id/buttonCancel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/buttonOk"
-        android:layout_alignBottom="@+id/buttonOk"
-        android:layout_alignStart="@+id/inputConfPassword"
-        android:text="Cancel" />
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-    <Button
-        android:id="@+id/buttonOk"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignEnd="@+id/inputConfPassword"
-        android:layout_below="@+id/inputConfPassword"
-        android:layout_marginTop="25dp"
-        android:text="OK" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="center">
 
-    <TextView
-        android:id="@+id/appVersion"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:text="version v0.1" />
+            <TextView
+                android:id="@+id/textView9"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true"
+                android:text="REGISTER"
+                android:textAlignment="center"
+                android:textSize="18sp"
+                android:textStyle="bold" />
 
-    <EditText
-        android:id="@+id/inputConfPassword"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignStart="@+id/inputPassword"
-        android:layout_below="@+id/inputPassword"
-        android:layout_marginTop="15dp"
-        android:ems="10"
-        android:hint="Confirm Password"
-        android:inputType="textPassword" />
+            <EditText
+                android:id="@+id/inputName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/textView9"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="65dp"
+                android:ems="10"
+                android:hint="Name"
+                android:inputType="textPersonName"
+                android:singleLine="false" />
 
-    <TextView
-        android:id="@+id/textView9"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:text="REGISTER"
-        android:textAlignment="center"
-        android:textSize="18sp"
-        android:textStyle="bold" />
+            <EditText
+                android:id="@+id/inputPrenom"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/inputName"
+                android:layout_alignStart="@+id/inputName"
+                android:layout_marginTop="12dp"
+                android:ems="10"
+                android:hint="Firstname"
+                android:inputType="textPersonName" />
 
-    <EditText
-        android:id="@+id/inputPassword"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignStart="@+id/inputConfEmail"
-        android:layout_below="@+id/inputConfEmail"
-        android:layout_marginTop="13dp"
-        android:ems="10"
-        android:hint="Password"
-        android:inputType="textPassword" />
+            <EditText
+                android:id="@+id/inputEmail"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/inputPrenom"
+                android:layout_alignStart="@+id/inputPrenom"
+                android:layout_marginTop="11dp"
+                android:ems="10"
+                android:hint="Email"
+                android:inputType="textEmailAddress" />
 
-    <EditText
-        android:id="@+id/inputEmail"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignStart="@+id/inputPrenom"
-        android:layout_below="@+id/inputPrenom"
-        android:layout_marginTop="11dp"
-        android:ems="10"
-        android:hint="Email"
-        android:inputType="textEmailAddress" />
+            <EditText
+                android:id="@+id/inputConfEmail"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/inputEmail"
+                android:layout_alignStart="@+id/inputEmail"
+                android:layout_marginTop="11dp"
+                android:ems="10"
+                android:hint="Confirm Email"
+                android:inputType="textEmailAddress" />
 
-    <EditText
-        android:id="@+id/inputConfEmail"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignStart="@+id/inputEmail"
-        android:layout_below="@+id/inputEmail"
-        android:layout_marginTop="11dp"
-        android:ems="10"
-        android:hint="Confirm Email"
-        android:inputType="textEmailAddress" />
+            <EditText
+                android:id="@+id/inputPassword"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/inputConfEmail"
+                android:layout_alignStart="@+id/inputConfEmail"
+                android:layout_marginTop="13dp"
+                android:ems="10"
+                android:hint="Password"
+                android:inputType="textPassword" />
 
-    <EditText
-        android:id="@+id/inputPrenom"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignStart="@+id/inputName"
-        android:layout_below="@+id/inputName"
-        android:layout_marginTop="12dp"
-        android:ems="10"
-        android:hint="Firstname"
-        android:inputType="textPersonName" />
+            <EditText
+                android:id="@+id/inputConfPassword"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/inputPassword"
+                android:layout_alignStart="@+id/inputPassword"
+                android:layout_marginTop="15dp"
+                android:ems="10"
+                android:hint="Confirm Password"
+                android:inputType="textPassword" />
+
+            <Button
+                android:id="@+id/buttonOk"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/inputConfPassword"
+                android:layout_alignEnd="@+id/inputConfPassword"
+                android:layout_marginTop="25dp"
+                android:text="OK" />
+
+            <Button
+                android:id="@+id/buttonCancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBaseline="@+id/buttonOk"
+                android:layout_alignStart="@+id/inputConfPassword"
+                android:layout_alignBottom="@+id/buttonOk"
+                android:text="Cancel" />
+
+            <TextView
+                android:id="@+id/appVersion"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:text="version v0.1" />
+        </LinearLayout>
+    </ScrollView>
 
-    <EditText
-        android:id="@+id/inputName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/textView9"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="65dp"
-        android:ems="10"
-        android:hint="Name"
-        android:inputType="textPersonName"
-        android:singleLine="false" />
 </RelativeLayout>
\ No newline at end of file