From 7aada36f8a333d76905ac546b147e24521d9f5d9 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Wed, 8 Apr 2020 10:49:32 +0200
Subject: [PATCH] Fixes #5 : close button bad layout

---
 .../handhistory/views/KeyboardCardView.kt     |  3 ---
 app/src/main/res/drawable/ic_close.xml        |  6 +++--
 app/src/main/res/drawable/ic_close_green.xml  |  7 ++++++
 .../res/layout/view_hand_keyboard_action.xml  | 19 ++++++++++-----
 .../res/layout/view_hand_keyboard_amount.xml  | 23 ++++++++++---------
 .../res/layout/view_hand_keyboard_card.xml    | 20 ++++++++--------
 app/src/main/res/values/styles.xml            |  5 ++++
 7 files changed, 50 insertions(+), 33 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_close_green.xml

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
index 9d48d599..5b766744 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
@@ -3,9 +3,6 @@ package net.pokeranalytics.android.ui.modules.handhistory.views
 import android.content.Context
 import android.view.LayoutInflater
 import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.view_hand_keyboard_action.view.closeButton
 import kotlinx.android.synthetic.main.view_hand_keyboard_card.view.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index 0c8775c4..dcb83ec4 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -1,5 +1,7 @@
 <vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_close_green.xml b/app/src/main/res/drawable/ic_close_green.xml
new file mode 100644
index 00000000..0aa3f48f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close_green.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/green" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/app/src/main/res/layout/view_hand_keyboard_action.xml b/app/src/main/res/layout/view_hand_keyboard_action.xml
index e9cb5460..2b56b78c 100644
--- a/app/src/main/res/layout/view_hand_keyboard_action.xml
+++ b/app/src/main/res/layout/view_hand_keyboard_action.xml
@@ -9,18 +9,25 @@
         android:id="@+id/toolbar"
         android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="44dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <com.google.android.material.button.MaterialButton
+        <ImageButton
             android:id="@+id/closeButton"
-            app:icon="@drawable/ic_close"
-            style="@style/PokerAnalyticsTheme.Button"
+            android:src="@drawable/ic_close_green"
+            style="@style/PokerAnalyticsTheme.TransparentButton"
             android:layout_width="44dp"
-            android:layout_height="44dp"
-            android:layout_marginStart="8dp"/>
+            android:layout_height="44dp"/>
+
+<!--        <com.google.android.material.button.MaterialButton-->
+<!--            android:id="@+id/closeButton"-->
+<!--            app:icon="@drawable/ic_close"-->
+<!--            style="@style/PokerAnalyticsTheme.Button"-->
+<!--            android:layout_width="44dp"-->
+<!--            android:layout_height="44dp"-->
+<!--            android:layout_marginStart="8dp"/>-->
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/view_hand_keyboard_amount.xml b/app/src/main/res/layout/view_hand_keyboard_amount.xml
index 1364b2a3..a59cab46 100644
--- a/app/src/main/res/layout/view_hand_keyboard_amount.xml
+++ b/app/src/main/res/layout/view_hand_keyboard_amount.xml
@@ -5,41 +5,41 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
+        android:id="@+id/toolbar"
         android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="44dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/recyclerView">
+        app:layout_constraintTop_toTopOf="parent">
 
-        <com.google.android.material.button.MaterialButton
+        <ImageButton
             android:id="@+id/closeButton"
-            style="@style/PokerAnalyticsTheme.Button"
-            app:icon="@drawable/ic_close"
+            android:src="@drawable/ic_close_green"
+            style="@style/PokerAnalyticsTheme.TransparentButton"
             android:layout_width="44dp"
-            android:layout_height="44dp"
-            android:layout_marginStart="8dp"/>
+            android:layout_height="match_parent"/>
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/clearButton"
             android:text="@string/clear"
             style="@style/PokerAnalyticsTheme.Button"
             android:layout_width="64dp"
-            android:layout_height="44dp"
+            android:layout_height="match_parent"
             android:layout_marginStart="8dp"/>
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/kiloButton"
             style="@style/PokerAnalyticsTheme.Button"
             android:layout_width="44dp"
-            android:layout_height="44dp"
+            android:layout_height="match_parent"
             android:layout_marginStart="8dp"/>
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/millionButton"
             style="@style/PokerAnalyticsTheme.Button"
             android:layout_width="44dp"
-            android:layout_height="44dp"
+            android:layout_height="match_parent"
             android:layout_marginStart="8dp"/>
 
         <com.google.android.material.button.MaterialButton
@@ -47,7 +47,7 @@
             android:text="@string/next"
             style="@style/PokerAnalyticsTheme.Button"
             android:layout_width="64dp"
-            android:layout_height="44dp"
+            android:layout_height="match_parent"
             android:layout_marginStart="8dp"/>
 
     </LinearLayout>
@@ -56,6 +56,7 @@
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/view_hand_keyboard_card.xml b/app/src/main/res/layout/view_hand_keyboard_card.xml
index 6345759f..5104e169 100644
--- a/app/src/main/res/layout/view_hand_keyboard_card.xml
+++ b/app/src/main/res/layout/view_hand_keyboard_card.xml
@@ -8,23 +8,21 @@
         android:id="@+id/toolbar"
         android:orientation="horizontal"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_height="44dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <com.google.android.material.button.MaterialButton
+        <ImageButton
             android:id="@+id/closeButton"
-            style="@style/PokerAnalyticsTheme.Button"
-            app:icon="@drawable/ic_close"
+            android:src="@drawable/ic_close_green"
+            style="@style/PokerAnalyticsTheme.TransparentButton"
             android:layout_width="44dp"
-            android:layout_height="44dp" />
+            android:layout_height="match_parent"/>
 
         <Space
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_weight="2"/>
 
         <com.google.android.material.button.MaterialButton
@@ -33,12 +31,12 @@
             android:text="@string/clear"
             android:layout_weight="1"
             android:layout_width="44dp"
-            android:layout_height="44dp"
+            android:layout_height="match_parent"
             android:layout_marginStart="8dp"/>
 
         <Space
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_weight="2"/>
 
         <com.google.android.material.button.MaterialButton
@@ -47,7 +45,7 @@
             android:text="@string/done"
             android:layout_weight="1"
             android:layout_width="44dp"
-            android:layout_height="44dp"
+            android:layout_height="match_parent"
             android:layout_marginStart="8dp"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7e038701..30f80198 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -354,6 +354,11 @@
 
 	<!-- Button -->
 
+	<style name="PokerAnalyticsTheme.TransparentButton" parent="Widget.MaterialComponents.Button">
+		<item name="iconPadding">0dp</item>
+		<item name="backgroundTint">@color/transparent</item>
+	</style>
+
 	<style name="PokerAnalyticsTheme.Button" parent="Widget.MaterialComponents.Button">
 		<item name="iconPadding">0dp</item>
 		<item name="android:height">48dp</item>