Merge branch 'blinds' of gitlab.com:stax-river/poker-analytics into blinds

app/src/main/res/layout/activity_new_data.xml

@@ -8,7 +8,7 @@
 
 	<LinearLayout
 			android:id="@+id/menuContainer"
-		android:layout_width="wrap_content"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
 			android:layout_marginEnd="16dp"
@@ -22,10 +22,10 @@
 			tools:visibility="visible">
 
 		<LinearLayout
-			android:id="@+id/newTransaction"
-			android:layout_width="match_parent"
+				android:id="@+id/newCashGame"
+				android:layout_width="wrap_content"
 				android:layout_height="48dp"
-			android:layout_marginBottom="8dp"
+				android:layout_marginTop="8dp"
 				android:background="?selectableItemBackground"
 				android:gravity="center_vertical"
 				android:orientation="horizontal"
@@ -36,23 +36,22 @@
 					android:layout_width="32dp"
 					android:layout_height="32dp"
 					android:tint="@color/green"
-				app:srcCompat="@drawable/add_transaction" />
+					app:srcCompat="@drawable/add_cash_game" />
 
 			<androidx.appcompat.widget.AppCompatTextView
 					style="@style/PokerAnalyticsTheme.TextView.RowTitle"
-				android:layout_width="160dp"
+					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_marginStart="16dp"
-				android:text="@string/new_operation"
+					android:text="@string/new_cash_game"
 					app:layout_constraintEnd_toEndOf="parent" />
 
 		</LinearLayout>
 
 		<LinearLayout
-			android:id="@+id/new_hand_history"
-			android:layout_width="match_parent"
+				android:id="@+id/newTournament"
+				android:layout_width="wrap_content"
 				android:layout_height="48dp"
-			android:layout_marginBottom="8dp"
 				android:background="?selectableItemBackground"
 				android:gravity="center_vertical"
 				android:orientation="horizontal"
@@ -63,20 +62,21 @@
 					android:layout_width="32dp"
 					android:layout_height="32dp"
 					android:tint="@color/green"
-				app:srcCompat="@drawable/add_hand" />
+					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_hand" />
+					android:text="@string/new_tournament"
+					app:layout_constraintEnd_toEndOf="parent" />
 
 		</LinearLayout>
 
 		<LinearLayout
-			android:id="@+id/newTournament"
-			android:layout_width="match_parent"
+				android:id="@+id/new_hand_history"
+				android:layout_width="wrap_content"
 				android:layout_height="48dp"
 				android:background="?selectableItemBackground"
 				android:gravity="center_vertical"
@@ -88,23 +88,22 @@
 					android:layout_width="32dp"
 					android:layout_height="32dp"
 					android:tint="@color/green"
-				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/newCashGame"
-			android:layout_width="match_parent"
+				android:id="@+id/newTransaction"
+				android:layout_width="wrap_content"
 				android:layout_height="48dp"
-			android:layout_marginTop="8dp"
+				android:layout_marginBottom="8dp"
 				android:background="?selectableItemBackground"
 				android:gravity="center_vertical"
 				android:orientation="horizontal"
@@ -115,14 +114,14 @@
 					android:layout_width="32dp"
 					android:layout_height="32dp"
 					android:tint="@color/green"
-				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>