From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Sun, 24 Mar 2019 09:12:22 +0000 (+0200)
Subject: remove the "Cancel" button from the hue selection dialog
X-Git-Tag: v0.8.1~21
X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=commitdiff_plain;h=32585e83b4165668a384eb43414d216601c16b31

remove the "Cancel" button from the hue selection dialog

it is a common feature to cancel the dialog by tapping outside and
the button only takes valuable space
---

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/HueRingDialog.java b/app/src/main/java/net/ktnx/mobileledger/ui/HueRingDialog.java
index f53c0429..d0228416 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/HueRingDialog.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/HueRingDialog.java
@@ -49,8 +49,6 @@ public class HueRingDialog extends Dialog {
             dismiss();
         });
 
-        findViewById(R.id.btn_cancel).setOnClickListener(v -> dismiss());
-
         findViewById(R.id.btn_default)
                 .setOnClickListener(v -> hueRing.setHue(Colors.DEFAULT_HUE_DEG));
     }
diff --git a/app/src/main/res/layout/hue_dialog.xml b/app/src/main/res/layout/hue_dialog.xml
index 41e79a2d..758809e1 100644
--- a/app/src/main/res/layout/hue_dialog.xml
+++ b/app/src/main/res/layout/hue_dialog.xml
@@ -43,26 +43,17 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/ring">
 
-        <TextView
-            android:id="@+id/btn_cancel"
-            style="@style/Base.TextAppearance.AppCompat.Button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/btn_cancel"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/btn_default"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <TextView
             android:id="@+id/btn_default"
             style="@style/Base.TextAppearance.AppCompat.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingStart="@dimen/fab_margin"
+            android:paddingEnd="@dimen/fab_margin"
             android:text="@string/default_color_btn"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/btn_ok"
-            app:layout_constraintStart_toEndOf="@id/btn_cancel"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
@@ -70,6 +61,8 @@
             style="@style/Base.TextAppearance.AppCompat.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingStart="@dimen/fab_margin"
+            android:paddingEnd="@dimen/fab_margin"
             android:text="@string/btn_select_label"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"