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 +++++++++++++-------------
 1 file changed, 28 insertions(+), 27 deletions(-)

(limited to 'app/src/main/res/layout/activity_git_clone.xml')

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>
-- 
cgit v1.2.3