From c530cb1cd02f57d903259150919b88f8b733fc0d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 19 Jul 2020 14:08:16 +0200
Subject: [PATCH] Small layout improvement

---
 .../email/FragmentOptionsPrivacy.java         | 22 +++++++++----------
 .../res/layout/fragment_options_privacy.xml   |  6 ++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
index 6632cb6dff..1c15503a4a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
@@ -65,8 +65,8 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
     private SwitchCompat swConfirmHtml;
     private SwitchCompat swDisableTracking;
     private SwitchCompat swHideTimeZone;
-    private Button btnBiometrics;
     private Button btnPin;
+    private Button btnBiometrics;
     private Spinner spBiometricsTimeout;
     private SwitchCompat swDisplayHidden;
     private SwitchCompat swSecure;
@@ -81,7 +81,7 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
     private final static String[] RESET_OPTIONS = new String[]{
             "confirm_links", "browse_links", "confirm_images", "confirm_html",
             "disable_tracking", "hide_timezone",
-            "biometrics", "pin", "biometrics_timeout",
+            "pin", "biometrics", "biometrics_timeout",
             "display_hidden", "secure", "safe_browsing"
     };
 
@@ -101,8 +101,8 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
         swConfirmHtml = view.findViewById(R.id.swConfirmHtml);
         swDisableTracking = view.findViewById(R.id.swDisableTracking);
         swHideTimeZone = view.findViewById(R.id.swHideTimeZone);
-        btnBiometrics = view.findViewById(R.id.btnBiometrics);
         btnPin = view.findViewById(R.id.btnPin);
+        btnBiometrics = view.findViewById(R.id.btnBiometrics);
         spBiometricsTimeout = view.findViewById(R.id.spBiometricsTimeout);
         swDisplayHidden = view.findViewById(R.id.swDisplayHidden);
         swSecure = view.findViewById(R.id.swSecure);
@@ -163,6 +163,14 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
             }
         });
 
+        btnPin.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FragmentDialogPin fragment = new FragmentDialogPin();
+                fragment.show(getParentFragmentManager(), "pin");
+            }
+        });
+
         btnBiometrics.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -193,14 +201,6 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
             }
         });
 
-        btnPin.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                FragmentDialogPin fragment = new FragmentDialogPin();
-                fragment.show(getParentFragmentManager(), "pin");
-            }
-        });
-
         spBiometricsTimeout.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
diff --git a/app/src/main/res/layout/fragment_options_privacy.xml b/app/src/main/res/layout/fragment_options_privacy.xml
index d6d5ac4042..a19f72e0c3 100644
--- a/app/src/main/res/layout/fragment_options_privacy.xml
+++ b/app/src/main/res/layout/fragment_options_privacy.xml
@@ -159,7 +159,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:text="@string/title_setup_biometrics_enable"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvBiometrics" />
 
         <Button
@@ -169,7 +169,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:text="@string/title_advanced_pin"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvBiometrics" />
 
         <eu.faircode.email.FixedTextView
@@ -325,7 +325,7 @@
             android:text="July 19, 11:30 AM"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textStyle="italic"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnDisconnectBlacklist" />
 
         <androidx.constraintlayout.widget.Group