cmclark00/mintris
1
0
Fork 0
mirror of https://github.com/cmclark00/mintris.git synced 2025-05-18 05:15:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reordered pause menu items and fixed music icon resource

Browse source
This commit is contained in:
cmclark00 2025-03-31 13:42:09 -04:00
parent 7d7090d7ea
commit 05a504bb21
2 changed files with 57 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

91
app/src/main/res/layout-land/activity_main.xml
View file

@ -334,15 +334,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/select_level" android:text="@string/select_level"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="24sp"
android:textStyle="bold" android:textStyle="bold"
android:fontFamily="sans-serif" /> android:fontFamily="sans-serif"
android:textAllCaps="false" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center"
android:layout_marginTop="8dp"> android:layout_marginTop="8dp">
<Button <Button
@ -379,6 +379,49 @@
</LinearLayout> </LinearLayout>
</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 --> <!-- Theme Selector -->
<com.mintris.ui.ThemeSelector <com.mintris.ui.ThemeSelector
android:id="@+id/inPauseThemeSelector" android:id="@+id/inPauseThemeSelector"
@ -394,48 +437,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="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> </LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>

21
app/src/main/res/layout/activity_main.xml
View file

@ -412,13 +412,13 @@
android:fontFamily="sans-serif" android:fontFamily="sans-serif"
android:textAllCaps="false" /> android:textAllCaps="false" />
<!-- Level Selection -->
<LinearLayout <LinearLayout
android:id="@+id/levelSelectorContainer"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center"> android:gravity="center"
android:layout_marginTop="16dp">
<TextView <TextView
android:id="@+id/selectLevelText" android:id="@+id/selectLevelText"
@ -491,7 +491,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center_vertical" android:gravity="center"
android:layout_marginTop="16dp"> android:layout_marginTop="16dp">
<TextView <TextView
@ -503,17 +503,16 @@
android:textSize="24sp" android:textSize="24sp"
android:textStyle="bold" android:textStyle="bold"
android:fontFamily="sans-serif" android:fontFamily="sans-serif"
android:textAllCaps="false" android:layout_marginEnd="16dp"
android:layout_marginEnd="16dp" /> android:textAllCaps="false" />
<ImageButton <ImageButton
android:id="@+id/musicToggle" android:id="@+id/musicToggle"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless" android:background="@color/transparent"
android:contentDescription="@string/toggle_music" android:src="@drawable/ic_volume_up"
android:padding="12dp" android:contentDescription="@string/music" />
android:src="@drawable/ic_volume_up" />
</LinearLayout> </LinearLayout>
<!-- Theme Selector --> <!-- Theme Selector -->
@ -529,7 +528,7 @@
android:id="@+id/blockSkinSelector" android:id="@+id/blockSkinSelector"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="24dp" android:layout_marginTop="16dp"
android:layout_marginBottom="16dp" /> android:layout_marginBottom="16dp" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>