From 45bdd93b7804b60933d7a98b5c6bfa1d5fd084d8 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurelien@mbp-aurelien.lan>
Date: Fri, 7 Jun 2019 18:34:56 +0200
Subject: [PATCH] Improve swipe to delete for players

---
 .../android/ui/view/PlayerImageView.kt        |   1 -
 app/src/main/res/layout/row_player.xml        | 142 ++++++++++--------
 2 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt
index 95dc07a6..6aedd289 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt
@@ -33,7 +33,6 @@ class PlayerImageView : FrameLayout {
 				SMALL -> 16f
 			}
 		}
-
 	}
 
 	private lateinit var playerImageView: ConstraintLayout
diff --git a/app/src/main/res/layout/row_player.xml b/app/src/main/res/layout/row_player.xml
index 4b970c45..7f2d73c5 100644
--- a/app/src/main/res/layout/row_player.xml
+++ b/app/src/main/res/layout/row_player.xml
@@ -1,81 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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:id="@+id/container"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:background="@color/gray_dark"
-	android:foreground="?selectableItemBackground">
+	android:layout_height="wrap_content">
 
-	<net.pokeranalytics.android.ui.view.PlayerImageView
-		android:id="@+id/playerImage"
-		android:layout_width="48dp"
-		android:layout_height="48dp"
-		android:layout_marginTop="8dp"
-		android:background="@android:color/transparent"
-		app:layout_constraintStart_toStartOf="@id/guidelineStart"
-		app:layout_constraintTop_toTopOf="parent" />
+	<include layout="@layout/layout_swipe_to_delete" />
 
-	<LinearLayout
-		android:layout_width="0dp"
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:id="@+id/foreground"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginEnd="8dp"
-		android:layout_marginBottom="8dp"
-		android:gravity="center_vertical"
-		android:minHeight="48dp"
-		android:orientation="vertical"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toStartOf="@+id/nextArrow"
-		app:layout_constraintStart_toEndOf="@+id/playerImage"
-		app:layout_constraintTop_toTopOf="parent">
+		android:background="@color/gray_dark"
+		android:foreground="?selectableItemBackground">
 
-		<androidx.appcompat.widget.AppCompatTextView
-			android:id="@+id/playerName"
-			style="@style/PokerAnalyticsTheme.TextView.RowTitle"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:ellipsize="end"
-			android:lines="1"
-			tools:text="John Smith" />
+		<net.pokeranalytics.android.ui.view.PlayerImageView
+			android:id="@+id/playerImage"
+			android:layout_width="48dp"
+			android:layout_height="48dp"
+			android:layout_marginTop="8dp"
+			android:background="@android:color/transparent"
+			app:layout_constraintStart_toStartOf="@id/guidelineStart"
+			app:layout_constraintTop_toTopOf="parent" />
 
-		<androidx.appcompat.widget.AppCompatTextView
-			android:id="@+id/playerSummary"
-			style="@style/PokerAnalyticsTheme.TextView"
-			android:layout_width="match_parent"
+		<LinearLayout
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="2dp"
-			android:ellipsize="end"
-			android:maxLines="3"
-			android:textColor="@color/kaki_lighter"
-			android:visibility="visible"
-			tools:text="Summary" />
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="8dp"
+			android:layout_marginEnd="8dp"
+			android:layout_marginBottom="8dp"
+			android:gravity="center_vertical"
+			android:minHeight="48dp"
+			android:orientation="vertical"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toStartOf="@+id/nextArrow"
+			app:layout_constraintStart_toEndOf="@+id/playerImage"
+			app:layout_constraintTop_toTopOf="parent">
 
-	</LinearLayout>
+			<androidx.appcompat.widget.AppCompatTextView
+				android:id="@+id/playerName"
+				style="@style/PokerAnalyticsTheme.TextView.RowTitle"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:ellipsize="end"
+				android:lines="1"
+				tools:text="John Smith" />
 
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/nextArrow"
-		android:layout_width="24dp"
-		android:layout_height="24dp"
-		android:src="@drawable/ic_arrow_right"
-		android:tint="@color/gray_light"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
-		app:layout_constraintTop_toTopOf="parent" />
+			<androidx.appcompat.widget.AppCompatTextView
+				android:id="@+id/playerSummary"
+				style="@style/PokerAnalyticsTheme.TextView"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="2dp"
+				android:ellipsize="end"
+				android:maxLines="3"
+				android:textColor="@color/kaki_lighter"
+				android:visibility="visible"
+				tools:text="Summary" />
 
-	<androidx.constraintlayout.widget.Guideline
-		android:id="@+id/guidelineStart"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		app:layout_constraintGuide_begin="16dp" />
+		</LinearLayout>
 
-	<androidx.constraintlayout.widget.Guideline
-		android:id="@+id/guidelineEnd"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		app:layout_constraintGuide_end="8dp" />
+		<androidx.appcompat.widget.AppCompatImageView
+			android:id="@+id/nextArrow"
+			android:layout_width="24dp"
+			android:layout_height="24dp"
+			android:src="@drawable/ic_arrow_right"
+			android:tint="@color/gray_light"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
+			app:layout_constraintTop_toTopOf="parent" />
+
+		<androidx.constraintlayout.widget.Guideline
+			android:id="@+id/guidelineStart"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			app:layout_constraintGuide_begin="16dp" />
+
+		<androidx.constraintlayout.widget.Guideline
+			android:id="@+id/guidelineEnd"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			app:layout_constraintGuide_end="8dp" />
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file