From 7fb625c71f6e3941a73809ff9da31ad898575053 Mon Sep 17 00:00:00 2001
From: Distopico Vegan <distopico@riseup.net>
Date: Mon, 3 Dec 2018 22:45:44 -0500
Subject: [PATCH] feat: move color picker account outside of advanced

---
 .../org/dystopia/email/FragmentAccount.java   |  6 +-
 app/src/main/res/layout/fragment_account.xml  | 62 ++++++++-----------
 app/src/main/res/values/dimens.xml            |  2 +
 3 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/org/dystopia/email/FragmentAccount.java b/app/src/main/java/org/dystopia/email/FragmentAccount.java
index 3daada40..71977f5b 100644
--- a/app/src/main/java/org/dystopia/email/FragmentAccount.java
+++ b/app/src/main/java/org/dystopia/email/FragmentAccount.java
@@ -107,7 +107,6 @@ public class FragmentAccount extends FragmentEx {
 
   private TextView tvName;
   private EditText etName;
-  private Button btnColor;
   private View vwColor;
   private ImageView ibColorDefault;
   private EditText etSignature;
@@ -183,7 +182,6 @@ public class FragmentAccount extends FragmentEx {
 
     etName = view.findViewById(R.id.etName);
     tvName = view.findViewById(R.id.tvName);
-    btnColor = view.findViewById(R.id.btnColor);
     vwColor = view.findViewById(R.id.vwColor);
     ibColorDefault = view.findViewById(R.id.ibColorDefault);
     etSignature = view.findViewById(R.id.etSignature);
@@ -372,7 +370,7 @@ public class FragmentAccount extends FragmentEx {
         });
 
     vwColor.setBackgroundColor(color);
-    btnColor.setOnClickListener(
+    vwColor.setOnClickListener(
         new View.OnClickListener() {
           @Override
           public void onClick(View v) {
@@ -1164,7 +1162,7 @@ public class FragmentAccount extends FragmentEx {
 
     GradientDrawable border = new GradientDrawable();
     border.setColor(color);
-    border.setStroke(1, Helper.resolveColor(getContext(), R.attr.colorSeparator));
+    border.setStroke(5, Helper.resolveColor(getContext(), R.attr.colorSeparator));
     vwColor.setBackground(border);
   }
 
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 4a77eb24..f5c24d1c 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -220,6 +220,27 @@
                 android:inputType="textPassword" />
         </com.google.android.material.textfield.TextInputLayout>
 
+        <View
+            android:id="@+id/vwColor"
+            android:layout_width="@dimen/color_pick"
+            android:layout_height="@dimen/color_pick"
+            android:layout_marginTop="@dimen/base_margin"
+            android:layout_marginStart="@dimen/content_margin"
+            android:background="@color/colorAccent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tilPassword" />
+
+        <ImageView
+            android:id="@+id/ibColorDefault"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="12dp"
+            android:src="@drawable/baseline_delete_24"
+            app:layout_constraintBottom_toBottomOf="@id/vwColor"
+            app:layout_constraintStart_toEndOf="@id/vwColor"
+            app:layout_constraintTop_toBottomOf="@id/tilPassword" />
+        
         <Button
             android:id="@+id/btnAdvanced"
             style="@style/buttonStyleSmall"
@@ -230,9 +251,9 @@
             android:minHeight="0dp"
             android:text="@string/title_setup_advanced"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tilPassword" />
+            app:layout_constraintTop_toBottomOf="@id/vwColor" />
 
-        <!-- name -->
+        <!-- advanced -->
 
         <TextView
             android:id="@+id/tvName"
@@ -254,39 +275,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-        <Button
-            android:id="@+id/btnColor"
-            style="@style/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="@string/title_account_color"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/etName" />
-
-        <View
-            android:id="@+id/vwColor"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="12dp"
-            android:background="@color/colorAccent"
-            app:layout_constraintBottom_toBottomOf="@id/btnColor"
-            app:layout_constraintStart_toEndOf="@id/btnColor"
-            app:layout_constraintTop_toTopOf="@id/btnColor" />
-
-        <ImageView
-            android:id="@+id/ibColorDefault"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="12dp"
-            android:src="@drawable/baseline_delete_24"
-            app:layout_constraintBottom_toBottomOf="@id/btnColor"
-            app:layout_constraintStart_toEndOf="@id/vwColor"
-            app:layout_constraintTop_toBottomOf="@id/etName" />
-
         <TextView
             android:id="@+id/tvSignature"
             android:layout_width="wrap_content"
@@ -295,7 +283,7 @@
             android:text="@string/title_account_signature"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnColor" />
+            app:layout_constraintTop_toBottomOf="@id/etName" />
 
         <EditText
             android:id="@+id/etSignature"
@@ -541,7 +529,7 @@
             android:id="@+id/grpAdvanced"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="tvName,etName,btnColor,vwColor,ibColorDefault,tvSignature,etSignature,cbSynchronize,cbPrimary,tvInterval,etInterval" />
+            app:constraint_referenced_ids="tvName,etName,tvSignature,etSignature,cbSynchronize,cbPrimary,tvInterval,etInterval" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpFolders"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 750027d0..50d91c5f 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="base_margin">12dp</dimen>
     <dimen name="layout_margin">12dp</dimen>
     <dimen name="widget_padding">6dp</dimen>
     <dimen name="content_margin">6dp</dimen>
     <dimen name="compose_padding">6dp</dimen>
     <dimen name="input_height">40dp</dimen>
+    <dimen name="color_pick">24dp</dimen>
 </resources>