From a363c4a0e5d130a83c0f8cb25573410d36af6d73 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Fri, 20 Mar 2020 14:54:22 +0100
Subject: [PATCH] Reorder items + cleanup

---
 app/src/main/res/layout/activity_new_data.xml | 76 ++++++-------------
 1 file changed, 22 insertions(+), 54 deletions(-)

diff --git a/app/src/main/res/layout/activity_new_data.xml b/app/src/main/res/layout/activity_new_data.xml
index db71888c..de675ce3 100644
--- a/app/src/main/res/layout/activity_new_data.xml
+++ b/app/src/main/res/layout/activity_new_data.xml
@@ -6,14 +6,14 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<androidx.constraintlayout.widget.ConstraintLayout
+	<LinearLayout
 		android:id="@+id/menuContainer"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"
 		android:layout_marginEnd="16dp"
 		android:layout_marginBottom="72dp"
-		android:background="@android:color/transparent"
+		android:background="@color/kaki_darker"
 		android:elevation="4dp"
 		android:orientation="vertical"
 		android:visibility="invisible"
@@ -21,144 +21,112 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		tools:visibility="visible">
 
-		<View
-			android:layout_width="0dp"
-			android:layout_height="0dp"
-			android:transitionName="newButtonTransition"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			android:background="@color/kaki_darker"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent" />
-
 		<LinearLayout
-			android:id="@+id/newCashGame"
+			android:id="@+id/newTransaction"
 			android:layout_width="match_parent"
 			android:layout_height="48dp"
-			android:layout_marginTop="8dp"
+			android:layout_marginBottom="8dp"
 			android:background="?selectableItemBackground"
 			android:gravity="center_vertical"
 			android:orientation="horizontal"
 			android:paddingStart="16dp"
-			android:paddingEnd="16dp"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent">
+			android:paddingEnd="16dp">
 
 			<androidx.appcompat.widget.AppCompatImageView
 				android:layout_width="32dp"
 				android:layout_height="32dp"
 				android:tint="@color/green"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="parent"
-				app:srcCompat="@drawable/add_cash_game" />
+				app:srcCompat="@drawable/add_transaction" />
 
 			<androidx.appcompat.widget.AppCompatTextView
 				style="@style/PokerAnalyticsTheme.TextView.RowTitle"
 				android:layout_width="160dp"
 				android:layout_height="wrap_content"
 				android:layout_marginStart="16dp"
-				android:text="@string/new_cash_game"
+				android:text="@string/new_operation"
 				app:layout_constraintEnd_toEndOf="parent" />
 
 		</LinearLayout>
 
 		<LinearLayout
-			android:id="@+id/newTournament"
+			android:id="@+id/newHandHistory"
 			android:layout_width="match_parent"
 			android:layout_height="48dp"
+			android:layout_marginBottom="8dp"
 			android:background="?selectableItemBackground"
 			android:gravity="center_vertical"
 			android:orientation="horizontal"
 			android:paddingStart="16dp"
-			android:paddingEnd="16dp"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/newCashGame">
+			android:paddingEnd="16dp">
 
 			<androidx.appcompat.widget.AppCompatImageView
 				android:layout_width="32dp"
 				android:layout_height="32dp"
 				android:tint="@color/green"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="parent"
-				app:srcCompat="@drawable/add_tournament" />
+				app:srcCompat="@drawable/add_hand" />
 
 			<androidx.appcompat.widget.AppCompatTextView
 				style="@style/PokerAnalyticsTheme.TextView.RowTitle"
 				android:layout_width="160dp"
 				android:layout_height="wrap_content"
 				android:layout_marginStart="16dp"
-				android:text="@string/new_tournament"
-				app:layout_constraintEnd_toEndOf="parent" />
+				android:text="@string/new_hand" />
 
 		</LinearLayout>
 
 		<LinearLayout
-			android:id="@+id/newTransaction"
+			android:id="@+id/newTournament"
 			android:layout_width="match_parent"
 			android:layout_height="48dp"
-			android:layout_marginBottom="8dp"
 			android:background="?selectableItemBackground"
 			android:gravity="center_vertical"
 			android:orientation="horizontal"
 			android:paddingStart="16dp"
-			android:paddingEnd="16dp"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/newTournament">
+			android:paddingEnd="16dp">
 
 			<androidx.appcompat.widget.AppCompatImageView
 				android:layout_width="32dp"
 				android:layout_height="32dp"
 				android:tint="@color/green"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="parent"
-				app:srcCompat="@drawable/add_transaction" />
+				app:srcCompat="@drawable/add_tournament" />
 
 			<androidx.appcompat.widget.AppCompatTextView
 				style="@style/PokerAnalyticsTheme.TextView.RowTitle"
 				android:layout_width="160dp"
 				android:layout_height="wrap_content"
 				android:layout_marginStart="16dp"
-				android:text="@string/new_operation"
+				android:text="@string/new_tournament"
 				app:layout_constraintEnd_toEndOf="parent" />
 
 		</LinearLayout>
 
 		<LinearLayout
-			android:id="@+id/newHandHistory"
+			android:id="@+id/newCashGame"
 			android:layout_width="match_parent"
 			android:layout_height="48dp"
-			android:layout_marginBottom="8dp"
+			android:layout_marginTop="8dp"
 			android:background="?selectableItemBackground"
 			android:gravity="center_vertical"
 			android:orientation="horizontal"
 			android:paddingStart="16dp"
-			android:paddingEnd="16dp"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/newTransaction">
+			android:paddingEnd="16dp">
 
 			<androidx.appcompat.widget.AppCompatImageView
 				android:layout_width="32dp"
 				android:layout_height="32dp"
 				android:tint="@color/green"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="parent"
-				app:srcCompat="@drawable/add_hand" />
+				app:srcCompat="@drawable/add_cash_game" />
 
 			<androidx.appcompat.widget.AppCompatTextView
 				style="@style/PokerAnalyticsTheme.TextView.RowTitle"
 				android:layout_width="160dp"
 				android:layout_height="wrap_content"
 				android:layout_marginStart="16dp"
-				android:text="@string/new_hand"
+				android:text="@string/new_cash_game"
 				app:layout_constraintEnd_toEndOf="parent" />
 
 		</LinearLayout>
 
-	</androidx.constraintlayout.widget.ConstraintLayout>
+	</LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file