From 041cf00510a75042223d1857660fc7f1dff958ef Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Sun, 10 May 2020 19:21:39 +0530
Subject: Treewide codestyle cleanup (#765)

- Updated gitignore and checked in the IDE's codestyle config
- Removed spotless as the underlying ktlint backend has failed to resolve the super frustrating import order bug[1] in nearly a year
- Reformat the entire codebase based on the previously committed code style configuration.

1: https://github.com/pinterest/ktlint/issues/527
---
 app/src/main/res/layout/activity_git_clone.xml     | 55 +++++++++---------
 app/src/main/res/layout/activity_git_config.xml    | 30 +++++-----
 .../res/layout/activity_oreo_autofill_filter.xml   |  7 ++-
 app/src/main/res/layout/activity_pwdstore.xml      |  6 +-
 app/src/main/res/layout/autofill_instructions.xml  | 20 +++----
 app/src/main/res/layout/autofill_recycler_view.xml | 26 ++++-----
 app/src/main/res/layout/autofill_row_layout.xml    | 50 ++++++++--------
 app/src/main/res/layout/decrypt_layout.xml         | 66 +++++++++++-----------
 app/src/main/res/layout/encrypt_layout.xml         | 34 +++++------
 .../res/layout/folder_creation_dialog_fragment.xml |  6 +-
 app/src/main/res/layout/fragment_autofill.xml      | 16 +++---
 app/src/main/res/layout/fragment_pwgen.xml         |  4 +-
 app/src/main/res/layout/fragment_show_ssh_key.xml  |  4 +-
 app/src/main/res/layout/fragment_ssh_keygen.xml    |  6 +-
 .../main/res/layout/fragment_to_clone_or_not.xml   | 33 ++++++-----
 app/src/main/res/layout/fragment_xkpwgen.xml       | 24 ++++----
 app/src/main/res/layout/git_passphrase_layout.xml  |  1 +
 app/src/main/res/layout/item_create_sheet.xml      | 17 +++---
 app/src/main/res/layout/oreo_autofill_dataset.xml  |  2 +-
 .../main/res/layout/oreo_autofill_instructions.xml | 16 +++---
 app/src/main/res/layout/otp_confirm_layout.xml     |  2 +-
 app/src/main/res/layout/password_recycler_view.xml | 13 ++---
 app/src/main/res/layout/password_row_layout.xml    | 12 ++--
 app/src/main/res/layout/select_folder_layout.xml   |  7 ++-
 24 files changed, 230 insertions(+), 227 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index d4113cd6..9249ffbf 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -3,44 +3,44 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?android:attr/windowBackground"
     android:padding="@dimen/activity_horizontal_margin"
-    tools:context="com.zeapo.pwdstore.git.GitOperationActivity"
-    android:background="?android:attr/windowBackground">
+    tools:context="com.zeapo.pwdstore.git.GitOperationActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/TextAppearance.MaterialComponents.Headline5"
             android:id="@+id/server_label"
-            android:textStyle="bold"
-            android:textSize="24sp"
-            android:text="@string/server_name"
+            style="@style/TextAppearance.MaterialComponents.Headline5"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
+            android:text="@string/server_name"
+            android:textSize="24sp"
+            android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/TextAppearance.MaterialComponents.Headline6"
             android:id="@+id/label_server_protocol"
+            style="@style/TextAppearance.MaterialComponents.Headline6"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/server_protocol"
             android:layout_margin="8dp"
-            app:layout_constraintTop_toBottomOf="@id/server_label"
-            app:layout_constraintStart_toStartOf="parent" />
+            android:text="@string/server_protocol"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/server_label" />
 
         <com.google.android.material.button.MaterialButtonToggleGroup
-            style="@style/TextAppearance.MaterialComponents.Headline1"
             android:id="@+id/clone_protocol_group"
+            style="@style/TextAppearance.MaterialComponents.Headline1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
-            app:layout_constraintTop_toBottomOf="@id/label_server_protocol"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/label_server_protocol"
             app:selectionRequired="true"
             app:singleSelection="true">
 
@@ -61,11 +61,12 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/server_user_layout"
-            android:hint="@string/server_user"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
+            android:hint="@string/server_user"
             app:layout_constraintTop_toBottomOf="@id/clone_protocol_group">
+
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/server_user"
                 android:layout_width="match_parent"
@@ -79,14 +80,14 @@
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
             android:hint="@string/server_url"
-            app:layout_constraintTop_toBottomOf="@id/server_user_layout"
+            app:layout_constraintEnd_toStartOf="@id/label_server_port"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/label_server_port">
+            app:layout_constraintTop_toBottomOf="@id/server_user_layout">
 
             <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/server_url"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/server_url"
                 android:inputType="textWebEmailAddress" />
 
         </com.google.android.material.textfield.TextInputLayout>
@@ -97,10 +98,10 @@
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
             android:hint="@string/server_port_hint"
-            app:layout_constraintStart_toEndOf="@id/label_server_url"
-            app:layout_constraintTop_toBottomOf="@id/server_user_layout"
+            app:layout_constraintDimensionRatio="1:0.8"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintDimensionRatio="1:0.8">
+            app:layout_constraintStart_toEndOf="@id/label_server_url"
+            app:layout_constraintTop_toBottomOf="@id/server_user_layout">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/server_port"
@@ -123,19 +124,19 @@
                 android:id="@+id/server_path"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:inputType="textWebEmailAddress"/>
+                android:inputType="textWebEmailAddress" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/TextAppearance.MaterialComponents.Headline6"
             android:id="@+id/label_connection_mode"
+            style="@style/TextAppearance.MaterialComponents.Headline6"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/connection_mode"
             android:layout_margin="8dp"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
+            android:text="@string/connection_mode"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/label_server_path" />
 
@@ -144,8 +145,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            app:layout_constraintTop_toBottomOf="@id/label_connection_mode"
-            app:layout_constraintStart_toStartOf="parent">
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/label_connection_mode">
 
             <RadioButton
                 android:id="@+id/connection_mode_ssh_key"
@@ -179,11 +180,11 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/save_button"
-            android:text="@string/crypto_save"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            app:layout_constraintTop_toBottomOf="@id/connection_mode_group"
-            app:layout_constraintEnd_toEndOf="parent" />
+            android:text="@string/crypto_save"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/connection_mode_group" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml
index e9d769b8..ec6ff7a1 100644
--- a/app/src/main/res/layout/activity_git_config.xml
+++ b/app/src/main/res/layout/activity_git_config.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="@dimen/activity_horizontal_margin"
     android:background="?android:attr/windowBackground"
+    android:padding="@dimen/activity_horizontal_margin"
     tools:context="com.zeapo.pwdstore.git.GitConfigActivity"
     tools:layout_editor_absoluteX="0dp"
     tools:layout_editor_absoluteY="81dp">
@@ -15,8 +15,8 @@
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:hint="@string/git_user_name_hint"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:layout_editor_absoluteY="64dp">
 
         <com.google.android.material.textfield.TextInputEditText
@@ -33,8 +33,8 @@
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:hint="@string/git_user_email"
-        app:layout_constraintTop_toBottomOf="@id/username_input_layout"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/username_input_layout">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/git_user_email"
@@ -50,20 +50,20 @@
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:text="@string/crypto_save"
-        app:layout_constraintTop_toBottomOf="@id/email_input_layout"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/email_input_layout" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        style="@style/TextAppearance.MaterialComponents.Headline5"
-        android:textStyle="bold"
-        android:textSize="24sp"
         android:id="@+id/git_tools_title"
+        style="@style/TextAppearance.MaterialComponents.Headline5"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:text="@string/hackish_tools"
-        app:layout_constraintTop_toBottomOf="@id/save_button"
-        app:layout_constraintStart_toStartOf="parent" />
+        android:textSize="24sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/save_button" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/commit_hash_label"
@@ -71,8 +71,8 @@
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:text="@string/commit_hash"
-        app:layout_constraintTop_toBottomOf="@id/git_tools_title"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/git_tools_title" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/git_commit_hash"
@@ -80,9 +80,9 @@
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:textStyle="bold"
-        app:layout_constraintTop_toBottomOf="@id/git_tools_title"
         app:layout_constraintStart_toEndOf="@id/commit_hash_label"
-        tools:text="HASH"/>
+        app:layout_constraintTop_toBottomOf="@id/git_tools_title"
+        tools:text="HASH" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/git_abort_rebase"
diff --git a/app/src/main/res/layout/activity_oreo_autofill_filter.xml b/app/src/main/res/layout/activity_oreo_autofill_filter.xml
index da965e05..319ce2f0 100644
--- a/app/src/main/res/layout/activity_oreo_autofill_filter.xml
+++ b/app/src/main/res/layout/activity_oreo_autofill_filter.xml
@@ -42,15 +42,16 @@
             android:inputType="text"
             tools:text="example.com" />
     </com.google.android.material.textfield.TextInputLayout>
+
     <ViewSwitcher
         android:id="@+id/rvPasswordSwitcher"
         android:layout_width="0dp"
+        android:layout_height="0dp"
         android:layout_marginTop="@dimen/activity_vertical_margin"
         app:layout_constraintBottom_toTopOf="@id/strictDomainSearch"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/searchLayout"
-        android:layout_height="0dp">
+        app:layout_constraintTop_toBottomOf="@id/searchLayout">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvPassword"
@@ -84,7 +85,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/rvPasswordSwitcher"
         app:layout_constraintVertical_bias="1.0"
-        tools:text="Phishing-resistant search"/>
+        tools:text="Phishing-resistant search" />
 
     <Switch
         android:id="@+id/shouldMatch"
diff --git a/app/src/main/res/layout/activity_pwdstore.xml b/app/src/main/res/layout/activity_pwdstore.xml
index e76b88a1..509a41da 100644
--- a/app/src/main/res/layout/activity_pwdstore.xml
+++ b/app/src/main/res/layout/activity_pwdstore.xml
@@ -2,13 +2,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".PasswordStore"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".PasswordStore">
 
     <LinearLayout
         android:id="@+id/main_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"/>
+        android:orientation="vertical" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/autofill_instructions.xml b/app/src/main/res/layout/autofill_instructions.xml
index e7cf3dd1..4193c4b9 100644
--- a/app/src/main/res/layout/autofill_instructions.xml
+++ b/app/src/main/res/layout/autofill_instructions.xml
@@ -7,10 +7,10 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingBottom="20dp"
         android:paddingLeft="24dp"
+        android:paddingTop="20dp"
         android:paddingRight="24dp"
-        android:paddingTop="20dp">
+        android:paddingBottom="20dp">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
@@ -21,19 +21,19 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
             android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
             android:adjustViewBounds="true"
-            android:src="@drawable/autofill_ins_1"
-            android:contentDescription="@string/autofill_ins_1_hint" />
+            android:contentDescription="@string/autofill_ins_1_hint"
+            android:src="@drawable/autofill_ins_1" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
             android:adjustViewBounds="true"
-            android:src="@drawable/autofill_ins_2"
-            android:contentDescription="@string/autofill_ins_2_hint" />
+            android:contentDescription="@string/autofill_ins_2_hint"
+            android:src="@drawable/autofill_ins_2" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
@@ -44,10 +44,10 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="match_parent"
             android:layout_height="114dp"
-            android:layout_marginBottom="8dp"
             android:layout_marginTop="8dp"
-            android:src="@drawable/autofill_ins_3"
-            android:contentDescription="@string/autofill_ins_3_hint" />
+            android:layout_marginBottom="8dp"
+            android:contentDescription="@string/autofill_ins_3_hint"
+            android:src="@drawable/autofill_ins_3" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/autofill_recycler_view.xml b/app/src/main/res/layout/autofill_recycler_view.xml
index c3a4a9f3..beb87fd5 100644
--- a/app/src/main/res/layout/autofill_recycler_view.xml
+++ b/app/src/main/res/layout/autofill_recycler_view.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/autofill_recycler"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="none"
-        tools:listitem="@layout/autofill_row_layout"
-        tools:itemCount="20"/>
+        tools:itemCount="20"
+        tools:listitem="@layout/autofill_row_layout" />
 
     <ProgressBar
         android:id="@+id/progress_bar"
@@ -24,16 +24,16 @@
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
-        android:src="@drawable/ic_add_white_48dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
         android:layout_gravity="bottom|end"
-        app:elevation="6dp"
-        app:pressedTranslationZ="12dp"
+        android:layout_margin="@dimen/fab_compat_margin"
+        android:src="@drawable/ic_add_white_48dp"
         app:backgroundTint="?attr/colorSecondary"
-        app:rippleColor="?attr/colorSecondary"
         app:borderWidth="0dp"
-        android:layout_margin="@dimen/fab_compat_margin"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"/>
+        app:elevation="6dp"
+        app:pressedTranslationZ="12dp"
+        app:rippleColor="?attr/colorSecondary" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/autofill_row_layout.xml b/app/src/main/res/layout/autofill_row_layout.xml
index acdeed6b..56a72854 100644
--- a/app/src/main/res/layout/autofill_row_layout.xml
+++ b/app/src/main/res/layout/autofill_row_layout.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
     android:layout_height="64dp"
     android:background="?android:attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:paddingRight="@dimen/activity_horizontal_margin">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/app_icon"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:contentDescription="@string/app_icon_hint"/>
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/app_icon"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:contentDescription="@string/app_icon_hint" />
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginStart="8dp"
-            android:gravity="center_vertical"
-            android:orientation="vertical" >
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginStart="8dp"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/app_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/app_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/secondary_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColor" />
-        </LinearLayout>
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/secondary_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColor" />
+    </LinearLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index 71566178..1c0c9b35 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?android:attr/windowBackground"
     android:orientation="vertical"
     tools:context="com.zeapo.pwdstore.crypto.PgpActivity">
@@ -58,8 +58,8 @@
             android:id="@+id/divider"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
             android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
             android:src="@drawable/divider"
             app:layout_constraintTop_toBottomOf="@id/crypto_password_last_changed"
             tools:ignore="ContentDescription" />
@@ -70,8 +70,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/activity_vertical_margin"
             android:visibility="invisible"
-            tools:visibility="visible"
-            app:layout_constraintTop_toBottomOf="@id/divider">
+            app:layout_constraintTop_toBottomOf="@id/divider"
+            tools:visibility="visible">
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/crypto_password_show_label"
@@ -79,9 +79,9 @@
                 android:layout_height="wrap_content"
                 android:text="@string/password"
                 android:textColor="?android:attr/textColor"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:textStyle="bold" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/crypto_password_show"
@@ -90,16 +90,16 @@
                 android:layout_gravity="fill"
                 android:gravity="bottom"
                 android:textColor="?android:attr/textColor"
-                app:layout_constraintStart_toEndOf="@id/crypto_password_show_label"
+                android:typeface="monospace"
                 app:layout_constraintBaseline_toBaselineOf="@id/crypto_password_show_label"
-                android:typeface="monospace" />
+                app:layout_constraintStart_toEndOf="@id/crypto_password_show_label" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/crypto_password_toggle_show"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/show_password"
                 android:layout_marginTop="8dp"
+                android:text="@string/show_password"
                 app:layout_constraintTop_toBottomOf="@id/crypto_password_show_label" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -116,15 +116,15 @@
                 android:id="@+id/crypto_copy_username"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
                 android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true"
                 android:background="?android:attr/windowBackground"
                 android:contentDescription="@string/copy_username"
                 android:src="@drawable/ic_content_copy"
                 android:visibility="invisible"
-                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                tools:visibility="visible"/>
+                app:layout_constraintTop_toTopOf="parent"
+                tools:visibility="visible" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/crypto_username_show_label"
@@ -139,84 +139,84 @@
                 android:visibility="invisible"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:visibility="visible"/>
+                tools:visibility="visible" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/crypto_username_show"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
                 android:layout_below="@id/crypto_username_show_label"
+                android:layout_alignParentStart="true"
                 android:layout_toStartOf="@id/crypto_copy_username"
                 android:textColor="?android:attr/textColor"
                 android:textIsSelectable="true"
                 android:typeface="monospace"
                 android:visibility="invisible"
-                app:layout_constraintTop_toBottomOf="@id/crypto_username_show_label"
                 app:layout_constraintStart_toStartOf="parent"
-                tools:visibility="visible"/>
+                app:layout_constraintTop_toBottomOf="@id/crypto_username_show_label"
+                tools:visibility="visible" />
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/crypto_copy_otp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
                 android:layout_below="@id/crypto_username_show"
+                android:layout_alignParentEnd="true"
                 android:background="?android:attr/windowBackground"
                 android:contentDescription="@string/copy_otp"
                 android:src="@drawable/ic_content_copy"
                 android:visibility="invisible"
-                app:layout_constraintTop_toTopOf="@id/crypto_otp_show_label"
                 app:layout_constraintEnd_toEndOf="parent"
-                tools:visibility="visible"/>
+                app:layout_constraintTop_toTopOf="@id/crypto_otp_show_label"
+                tools:visibility="visible" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/crypto_otp_show_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
                 android:layout_below="@id/crypto_username_show"
+                android:layout_alignParentStart="true"
                 android:layout_toStartOf="@id/crypto_copy_otp"
                 android:text="@string/otp"
                 android:textColor="?android:attr/textColor"
-                app:layout_constraintTop_toBottomOf="@id/crypto_username_show"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
-                android:textStyle="bold" />
+                app:layout_constraintTop_toBottomOf="@id/crypto_username_show" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/crypto_otp_show"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
                 android:layout_below="@id/crypto_otp_show_label"
+                android:layout_alignParentStart="true"
                 android:layout_toStartOf="@id/crypto_copy_otp"
                 android:textColor="?android:attr/textColor"
                 android:textIsSelectable="true"
-                app:layout_constraintTop_toBottomOf="@id/crypto_otp_show_label"
-                android:typeface="monospace" />
+                android:typeface="monospace"
+                app:layout_constraintTop_toBottomOf="@id/crypto_otp_show_label" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/crypto_extra_show_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
                 android:layout_below="@id/crypto_otp_show"
+                android:layout_alignParentStart="true"
                 android:text="@string/extra_content"
                 android:textColor="?android:attr/textColor"
-                app:layout_constraintTop_toBottomOf="@id/crypto_otp_show"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
-                android:textStyle="bold" />
+                app:layout_constraintTop_toBottomOf="@id/crypto_otp_show" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/crypto_extra_show"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
                 android:layout_below="@id/crypto_extra_show_label"
+                android:layout_alignParentStart="true"
                 android:textColor="?android:attr/textColor"
                 android:textIsSelectable="true"
-                app:layout_constraintTop_toBottomOf="@id/crypto_extra_show_label"
-                android:typeface="monospace" />
+                android:typeface="monospace"
+                app:layout_constraintTop_toBottomOf="@id/crypto_extra_show_label" />
 
             <ToggleButton
                 android:id="@+id/crypto_extra_toggle_show"
@@ -225,13 +225,13 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/crypto_extra_show"
                 android:layout_alignParentStart="true"
+                android:backgroundTint="?attr/colorSecondary"
                 android:checked="false"
                 android:paddingTop="8dp"
                 android:textColor="?android:attr/windowBackground"
                 android:textOff="@string/show_extra"
                 android:textOn="@string/hide_extra"
-                app:layout_constraintTop_toBottomOf="@id/crypto_extra_show"
-                android:backgroundTint="?attr/colorSecondary"/>
+                app:layout_constraintTop_toBottomOf="@id/crypto_extra_show" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml
index 3b0b8068..bab1214e 100644
--- a/app/src/main/res/layout/encrypt_layout.xml
+++ b/app/src/main/res/layout/encrypt_layout.xml
@@ -1,9 +1,9 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?android:attr/windowBackground"
     android:orientation="vertical"
     android:padding="@dimen/activity_horizontal_margin"
@@ -14,8 +14,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/activity_horizontal_margin"
-        android:textColor="?android:attr/textColor"
         android:enabled="false"
+        android:textColor="?android:attr/textColor"
         android:textSize="18sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -23,17 +23,18 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/name_input_layout"
-        android:layout_gravity="center_vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
         android:layout_margin="8dp"
         android:hint="@string/crypto_name_hint"
-        app:layout_constraintTop_toBottomOf="@id/crypto_password_category"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/crypto_password_category">
+
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/crypto_password_file_edit"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
@@ -43,13 +44,14 @@
         android:layout_margin="8dp"
         android:hint="@string/crypto_pass_label"
         app:endIconMode="password_toggle"
-        app:layout_constraintTop_toBottomOf="@id/name_input_layout"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/name_input_layout">
+
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/crypto_password_edit"
-            android:inputType="textVisiblePassword"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:inputType="textVisiblePassword" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.button.MaterialButton
@@ -58,8 +60,8 @@
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:text="@string/pwd_generate_button"
-        app:layout_constraintTop_toBottomOf="@id/password_input_layout"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/password_input_layout" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/extra_input_layout"
@@ -67,14 +69,14 @@
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:hint="@string/crypto_extra_label"
-        app:layout_constraintTop_toBottomOf="@id/generate_password"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/generate_password">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/crypto_extra_edit"
-            android:inputType="textMultiLine|textVisiblePassword"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:inputType="textMultiLine|textVisiblePassword" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/folder_creation_dialog_fragment.xml b/app/src/main/res/layout/folder_creation_dialog_fragment.xml
index 375b4a30..eaae3c60 100644
--- a/app/src/main/res/layout/folder_creation_dialog_fragment.xml
+++ b/app/src/main/res/layout/folder_creation_dialog_fragment.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -17,7 +15,7 @@
             android:id="@+id/folder_name_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="textNoSuggestions|textVisiblePassword"/>
+            android:inputType="textNoSuggestions|textVisiblePassword" />
 
     </com.google.android.material.textfield.TextInputLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_autofill.xml b/app/src/main/res/layout/fragment_autofill.xml
index 21a9d95a..713c8ba5 100644
--- a/app/src/main/res/layout/fragment_autofill.xml
+++ b/app/src/main/res/layout/fragment_autofill.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingBottom="20dp"
     android:paddingLeft="24dp"
+    android:paddingTop="20dp"
     android:paddingRight="24dp"
-    android:paddingTop="20dp">
+    android:paddingBottom="20dp">
 
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="URL">
+
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/webURL"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="textUri"/>
+            android:inputType="textUri" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <RadioGroup
@@ -56,14 +56,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_weight="1"/>
+            android:layout_weight="1" />
 
         <com.google.android.material.button.MaterialButton
+            android:id="@+id/matchButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="+"
-            android:id="@+id/matchButton"
             android:layout_gravity="center_horizontal"
+            android:text="+"
             tools:ignore="HardcodedText" />
 
         <RadioButton
@@ -72,7 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:checked="false"
-            android:text="@string/autofill_apps_never"/>
+            android:text="@string/autofill_apps_never" />
 
     </RadioGroup>
 
diff --git a/app/src/main/res/layout/fragment_pwgen.xml b/app/src/main/res/layout/fragment_pwgen.xml
index df01c62e..6510c006 100644
--- a/app/src/main/res/layout/fragment_pwgen.xml
+++ b/app/src/main/res/layout/fragment_pwgen.xml
@@ -7,10 +7,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingBottom="20dp"
         android:paddingLeft="24dp"
-        android:paddingRight="24dp"
         android:paddingTop="20dp"
+        android:paddingRight="24dp"
+        android:paddingBottom="20dp"
         tools:context=".MainActivityFragment">
 
         <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/fragment_show_ssh_key.xml b/app/src/main/res/layout/fragment_show_ssh_key.xml
index eff30360..312a9c8e 100644
--- a/app/src/main/res/layout/fragment_show_ssh_key.xml
+++ b/app/src/main/res/layout/fragment_show_ssh_key.xml
@@ -7,10 +7,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingBottom="20dp"
         android:paddingLeft="24dp"
+        android:paddingTop="20dp"
         android:paddingRight="24dp"
-        android:paddingTop="20dp">
+        android:paddingBottom="20dp">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/public_key"
diff --git a/app/src/main/res/layout/fragment_ssh_keygen.xml b/app/src/main/res/layout/fragment_ssh_keygen.xml
index 803debc4..91e5b772 100644
--- a/app/src/main/res/layout/fragment_ssh_keygen.xml
+++ b/app/src/main/res/layout/fragment_ssh_keygen.xml
@@ -18,18 +18,20 @@
             android:text="@string/ssh_keygen_length" />
 
         <com.google.android.material.button.MaterialButtonToggleGroup
-            style="@style/TextAppearance.MaterialComponents.Headline1"
             android:id="@+id/key_length_group"
+            style="@style/TextAppearance.MaterialComponents.Headline1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:selectionRequired="true"
             app:singleSelection="true">
+
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/key_length_2048"
                 style="?attr/materialButtonOutlinedStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/key_length_2048" />
+
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/key_length_4096"
                 style="?attr/materialButtonOutlinedStyle"
@@ -49,8 +51,8 @@
                 android:id="@+id/passphrase"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:importantForAccessibility="no"
                 android:fontFamily="@font/sourcecodepro"
+                android:importantForAccessibility="no"
                 android:inputType="textPassword" />
         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/fragment_to_clone_or_not.xml b/app/src/main/res/layout/fragment_to_clone_or_not.xml
index 5aa94e8a..80b5e7b5 100644
--- a/app/src/main/res/layout/fragment_to_clone_or_not.xml
+++ b/app/src/main/res/layout/fragment_to_clone_or_not.xml
@@ -1,8 +1,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/colorPrimary"
     android:orientation="vertical">
 
@@ -11,37 +10,37 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@mipmap/ic_launcher"
         android:contentDescription="@string/app_icon_hint"
-        app:layout_constraintTop_toTopOf="parent"
+        android:src="@mipmap/ic_launcher"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/app_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="@string/app_name"
         android:layout_below="@+id/app_icon"
         android:layout_centerHorizontal="true"
+        android:text="@string/app_name"
+        android:textAppearance="?android:attr/textAppearanceLarge"
         android:textColor="@android:color/white"
         android:textStyle="bold"
-        app:layout_constraintTop_toBottomOf="@+id/app_icon"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/app_icon" />
 
     <com.google.android.material.button.MaterialButton
         style="@style/Widget.MaterialComponents.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:onClick="openSettings"
-        android:text="@string/action_settings"
-        android:textColor="@android:color/white"
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
         android:layout_marginEnd="@dimen/activity_horizontal_margin"
+        android:onClick="openSettings"
+        android:text="@string/action_settings"
+        android:textColor="@android:color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -49,13 +48,13 @@
         android:id="@+id/use_local_directory"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="48dp"
         android:onClick="createNewRepository"
         android:text="@string/initialize"
         android:textSize="12sp"
-        android:layout_marginTop="48dp"
-        app:layout_constraintTop_toBottomOf="@id/app_name"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/app_name" />
 
     <com.google.android.material.button.MaterialButton
         android:layout_width="wrap_content"
@@ -63,8 +62,8 @@
         android:onClick="cloneExistingRepository"
         android:text="@string/clone"
         android:textSize="12sp"
-        app:layout_constraintTop_toBottomOf="@id/use_local_directory"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/use_local_directory" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_xkpwgen.xml b/app/src/main/res/layout/fragment_xkpwgen.xml
index 6e9ebd29..c6b03445 100644
--- a/app/src/main/res/layout/fragment_xkpwgen.xml
+++ b/app/src/main/res/layout/fragment_xkpwgen.xml
@@ -49,19 +49,19 @@
                     <CheckBox
                         android:id="@+id/xknumerals"
                         android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:gravity="center_vertical"
-                        android:text="@string/xkpwgen_numbers"
-                        android:layout_height="wrap_content" />
+                        android:text="@string/xkpwgen_numbers" />
 
                     <Spinner
                         android:id="@+id/xk_numbers_count"
                         android:layout_width="fill_parent"
-                        android:minWidth="40dp"
-                        android:dropDownWidth="40dp"
-                        android:gravity="center_vertical"
                         android:layout_height="wrap_content"
+                        android:dropDownWidth="40dp"
                         android:entries="@array/xk_range_1_10"
                         android:entryValues="@array/xk_range_1_10"
+                        android:gravity="center_vertical"
+                        android:minWidth="40dp"
                         android:spinnerMode="dropdown" />
                 </LinearLayout>
 
@@ -73,19 +73,19 @@
                     <CheckBox
                         android:id="@+id/xksymbols"
                         android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:gravity="center_vertical"
-                        android:text="@string/xkpwgen_symbols"
-                        android:layout_height="wrap_content"/>
+                        android:text="@string/xkpwgen_symbols" />
 
                     <Spinner
                         android:id="@+id/xk_symbols_count"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:minWidth="40dp"
                         android:dropDownWidth="40dp"
                         android:entries="@array/xk_range_1_10"
                         android:entryValues="@array/xk_range_1_10"
+                        android:gravity="center_vertical"
+                        android:minWidth="40dp"
                         android:spinnerMode="dropdown" />
                 </LinearLayout>
 
@@ -116,9 +116,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="8dp"
-                    android:maxLength="2"
                     android:ems="10"
-                    android:inputType="number" />
+                    android:inputType="number"
+                    android:maxLength="2" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
@@ -132,8 +132,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="8dp"
-                    android:ems="10"
                     android:autofillHints=""
+                    android:ems="10"
                     android:hint="@string/xkpwgen_separator_character"
                     android:inputType="text" />
             </LinearLayout>
diff --git a/app/src/main/res/layout/git_passphrase_layout.xml b/app/src/main/res/layout/git_passphrase_layout.xml
index c0922471..27c52412 100644
--- a/app/src/main/res/layout/git_passphrase_layout.xml
+++ b/app/src/main/res/layout/git_passphrase_layout.xml
@@ -13,6 +13,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
+
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/git_auth_passphrase"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_create_sheet.xml b/app/src/main/res/layout/item_create_sheet.xml
index 244537ad..b6e0c8d9 100644
--- a/app/src/main/res/layout/item_create_sheet.xml
+++ b/app/src/main/res/layout/item_create_sheet.xml
@@ -1,39 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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">
 
     <com.google.android.material.button.MaterialButton
-        style="@style/Widget.MaterialComponents.Button.TextButton"
         android:id="@+id/create_folder"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottom_sheet_item_height"
+        android:layout_margin="@dimen/normal_margin"
         android:text="@string/bottom_sheet_create_new_folder"
         android:textAlignment="viewStart"
         android:textColor="?attr/colorOnSurface"
-        android:layout_margin="@dimen/normal_margin"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:icon="@drawable/ic_action_new_folder"
         app:iconPadding="@dimen/normal_margin"
         app:iconTint="?attr/colorSecondary"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:rippleColor="?attr/colorSecondary" />
 
     <com.google.android.material.button.MaterialButton
-        style="@style/Widget.MaterialComponents.Button.TextButton"
         android:id="@+id/create_password"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottom_sheet_item_height"
+        android:layout_margin="@dimen/normal_margin"
         android:text="@string/bottom_sheet_create_new_password"
         android:textAlignment="viewStart"
         android:textColor="?attr/colorOnSurface"
-        android:layout_margin="@dimen/normal_margin"
-        app:layout_constraintTop_toBottomOf="@id/create_folder"
         app:icon="@drawable/ic_action_new_password"
         app:iconPadding="@dimen/normal_margin"
         app:iconTint="?attr/colorSecondary"
+        app:layout_constraintTop_toBottomOf="@id/create_folder"
         app:rippleColor="?attr/colorSecondary" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/oreo_autofill_dataset.xml b/app/src/main/res/layout/oreo_autofill_dataset.xml
index 4917347c..9176dc7d 100644
--- a/app/src/main/res/layout/oreo_autofill_dataset.xml
+++ b/app/src/main/res/layout/oreo_autofill_dataset.xml
@@ -12,13 +12,13 @@
     <ImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
-        android:tint="@color/secondary_color"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginEnd="10dp"
         android:adjustViewBounds="true"
         android:maxWidth="20dp"
         android:maxHeight="20dp"
+        android:tint="@color/secondary_color"
         tools:src="@mipmap/ic_launcher" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/oreo_autofill_instructions.xml b/app/src/main/res/layout/oreo_autofill_instructions.xml
index 874d764f..07571fac 100644
--- a/app/src/main/res/layout/oreo_autofill_instructions.xml
+++ b/app/src/main/res/layout/oreo_autofill_instructions.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingBottom="20dp"
         android:paddingLeft="24dp"
+        android:paddingTop="20dp"
         android:paddingRight="24dp"
-        android:paddingTop="20dp">
+        android:paddingBottom="20dp">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/intro_text"
@@ -32,15 +32,15 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/activity_vertical_margin"
             android:text="@string/oreo_autofill_enable_dialog_installed_browsers"
-            android:textStyle="bold"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            android:textStyle="bold" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/supportedBrowsers"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            tools:text="Firefox: Fill and save credentials"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            tools:text="Firefox: Fill and save credentials" />
 
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/otp_confirm_layout.xml b/app/src/main/res/layout/otp_confirm_layout.xml
index 4e6e777a..c94a9404 100644
--- a/app/src/main/res/layout/otp_confirm_layout.xml
+++ b/app/src/main/res/layout/otp_confirm_layout.xml
@@ -8,9 +8,9 @@
         android:id="@+id/hotp_remember_checkbox"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
         android:text="@string/dialog_update_check"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/password_recycler_view.xml b/app/src/main/res/layout/password_recycler_view.xml
index 05707f04..2ee16478 100644
--- a/app/src/main/res/layout/password_recycler_view.xml
+++ b/app/src/main/res/layout/password_recycler_view.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     android:clipChildren="false"
     android:clipToPadding="false"
+    android:orientation="vertical"
     tools:context="com.zeapo.pwdstore.PasswordFragment">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -26,13 +25,13 @@
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
-        android:src="@drawable/ic_add_white_48dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_compat_margin"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
+        android:src="@drawable/ic_add_white_48dp"
         app:backgroundTint="?attr/colorSecondary"
         app:rippleColor="?attr/colorSecondary" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml
index 257b9d4c..72dc72bf 100644
--- a/app/src/main/res/layout/password_row_layout.xml
+++ b/app/src/main/res/layout/password_row_layout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/password_row_background"
@@ -15,9 +15,9 @@
         android:layout_gravity="bottom"
         android:alpha="0.5"
         android:contentDescription="@string/folder_icon_hint"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
         tools:src="@drawable/ic_multiple_files_24dp" />
 
     <TextView
@@ -35,11 +35,11 @@
         android:id="@+id/child_count"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="12dp"
         android:textSize="18sp"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/folder_indicator"
-        android:layout_marginEnd="12dp"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="12" />
 
     <ImageView
@@ -48,8 +48,8 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:src="@drawable/ic_keyboard_arrow_right_24dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/select_folder_layout.xml b/app/src/main/res/layout/select_folder_layout.xml
index 1fd32853..b89b0943 100644
--- a/app/src/main/res/layout/select_folder_layout.xml
+++ b/app/src/main/res/layout/select_folder_layout.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/pgp_handler_linearlayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"/>
+        android:orientation="vertical" />
 </LinearLayout>
-- 
cgit v1.2.3