From 05a504bb210680a7e509855040bb8366fc289d14 Mon Sep 17 00:00:00 2001
From: cmclark00 <cmclark00@gmail.com>
Date: Mon, 31 Mar 2025 13:42:09 -0400
Subject: [PATCH] Reordered pause menu items and fixed music icon resource

---
 .../main/res/layout-land/activity_main.xml    | 91 ++++++++++---------
 app/src/main/res/layout/activity_main.xml     | 23 +++--
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index 7630ab8..35d814f 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -334,15 +334,15 @@
                         android:layout_height="wrap_content"
                         android:text="@string/select_level"
                         android:textColor="@color/white"
-                        android:textSize="16sp"
+                        android:textSize="24sp"
                         android:textStyle="bold"
-                        android:fontFamily="sans-serif" />
+                        android:fontFamily="sans-serif"
+                        android:textAllCaps="false" />
                         
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
-                        android:gravity="center"
                         android:layout_marginTop="8dp">
                         
                         <Button
@@ -379,6 +379,49 @@
                     </LinearLayout>
                 </LinearLayout>
                 
+                <!-- Sound Toggle -->
+                <Button
+                    android:id="@+id/settingsButton"
+                    android:layout_width="200dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:background="@color/transparent"
+                    android:text="@string/sound_on"
+                    android:textColor="@color/white"
+                    android:textSize="24sp"
+                    android:textStyle="bold"
+                    android:fontFamily="sans-serif"
+                    android:textAllCaps="false" />
+        
+                <!-- Music Toggle -->
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:gravity="center"
+                    android:layout_marginTop="16dp">
+                    
+                    <TextView
+                        android:id="@+id/musicText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/music"
+                        android:textColor="@color/white"
+                        android:textSize="24sp"
+                        android:textStyle="bold"
+                        android:fontFamily="sans-serif"
+                        android:layout_marginEnd="16dp"
+                        android:textAllCaps="false" />
+                        
+                    <ImageButton
+                        android:id="@+id/musicToggle"
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:background="@color/transparent"
+                        android:src="@drawable/ic_volume_up"
+                        android:contentDescription="@string/music" />
+                </LinearLayout>
+                
                 <!-- Theme Selector -->
                 <com.mintris.ui.ThemeSelector
                     android:id="@+id/inPauseThemeSelector"
@@ -394,48 +437,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:layout_marginBottom="16dp" />
-                    
-                <!-- Sound Settings -->
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:gravity="center"
-                    android:layout_marginTop="16dp">
-                    
-                    <TextView
-                        android:id="@+id/musicText"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/music"
-                        android:textColor="@color/white"
-                        android:textSize="16sp"
-                        android:textStyle="bold"
-                        android:fontFamily="sans-serif" />
-                        
-                    <ImageButton
-                        android:id="@+id/musicToggle"
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:layout_marginStart="16dp"
-                        android:background="@color/transparent"
-                        android:contentDescription="@string/toggle_music"
-                        android:src="@drawable/ic_volume_up" />
-                </LinearLayout>
-                
-                <!-- Sound Toggle -->
-                <Button
-                    android:id="@+id/settingsButton"
-                    android:layout_width="200dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:background="@color/transparent"
-                    android:text="@string/sound_on"
-                    android:textColor="@color/white"
-                    android:textSize="24sp"
-                    android:textStyle="bold"
-                    android:fontFamily="sans-serif"
-                    android:textAllCaps="false" />
             </LinearLayout>
         </ScrollView>
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a76a8ba..a6d5481 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -412,13 +412,13 @@
                     android:fontFamily="sans-serif"
                     android:textAllCaps="false" />
                     
+                <!-- Level Selection -->
                 <LinearLayout
-                    android:id="@+id/levelSelectorContainer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="32dp"
                     android:orientation="vertical"
-                    android:gravity="center">
+                    android:gravity="center"
+                    android:layout_marginTop="16dp">
                     
                     <TextView
                         android:id="@+id/selectLevelText"
@@ -491,7 +491,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:gravity="center_vertical"
+                    android:gravity="center"
                     android:layout_marginTop="16dp">
                     
                     <TextView
@@ -503,17 +503,16 @@
                         android:textSize="24sp"
                         android:textStyle="bold"
                         android:fontFamily="sans-serif"
-                        android:textAllCaps="false"
-                        android:layout_marginEnd="16dp" />
+                        android:layout_marginEnd="16dp"
+                        android:textAllCaps="false" />
                         
                     <ImageButton
                         android:id="@+id/musicToggle"
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:background="?attr/selectableItemBackgroundBorderless"
-                        android:contentDescription="@string/toggle_music"
-                        android:padding="12dp"
-                        android:src="@drawable/ic_volume_up" />
+                        android:background="@color/transparent"
+                        android:src="@drawable/ic_volume_up"
+                        android:contentDescription="@string/music" />
                 </LinearLayout>
                 
                 <!-- Theme Selector -->
@@ -523,13 +522,13 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="24dp"
                     android:layout_marginBottom="16dp" />
-
+                    
                 <!-- Block Skin Selector -->
                 <com.mintris.ui.BlockSkinSelector
                     android:id="@+id/blockSkinSelector"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="24dp"
+                    android:layout_marginTop="16dp"
                     android:layout_marginBottom="16dp" />
             </LinearLayout>
         </ScrollView>