From 103a21d9b74b401694f517fa2618d43d1a51fc36 Mon Sep 17 00:00:00 2001
From: cmclark00 <cmclark00@gmail.com>
Date: Sat, 29 Mar 2025 02:21:15 -0400
Subject: [PATCH] fix: update text styles and sizes across app to match mintris
 theme

---
 app/src/main/res/layout/activity_main.xml     | 136 +++++++++++++-----
 .../main/res/layout/block_skin_selector.xml   |   5 +-
 .../main/res/layout/progression_screen.xml    |  29 ++--
 app/src/main/res/layout/theme_selector.xml    |   5 +-
 app/src/main/res/values/strings.xml           |  88 ++++++------
 5 files changed, 165 insertions(+), 98 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ddea78a..2224e92 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -62,36 +62,40 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/white"
-                android:textSize="24sp"
-                android:fontFamily="sans-serif-light"
-                tools:text="Score: 0" />
+                android:textSize="32sp"
+                android:textStyle="bold"
+                android:fontFamily="sans-serif"
+                tools:text="score: 0" />
 
             <TextView
                 android:id="@+id/currentLevelText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/white"
-                android:textSize="24sp"
-                android:fontFamily="sans-serif-light"
-                tools:text="Level: 1" />
+                android:textSize="32sp"
+                android:textStyle="bold"
+                android:fontFamily="sans-serif"
+                tools:text="level: 1" />
 
             <TextView
                 android:id="@+id/linesText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/white"
-                android:textSize="24sp"
-                android:fontFamily="sans-serif-light"
-                tools:text="Lines: 0" />
+                android:textSize="32sp"
+                android:textStyle="bold"
+                android:fontFamily="sans-serif"
+                tools:text="lines: 0" />
 
             <TextView
                 android:id="@+id/comboText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/white"
-                android:textSize="24sp"
-                android:fontFamily="sans-serif-light"
-                tools:text="Combo: 0" />
+                android:textSize="32sp"
+                android:textStyle="bold"
+                android:fontFamily="sans-serif"
+                tools:text="combo: 0" />
         </LinearLayout>
 
         <!-- Next Piece Preview -->
@@ -131,16 +135,18 @@
             android:layout_height="wrap_content"
             android:text="@string/game_over"
             android:textColor="@color/white"
-            android:textSize="24sp"
-            android:textStyle="bold" />
+            android:textSize="36sp"
+            android:textStyle="bold"
+            android:fontFamily="sans-serif" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/session_stats"
             android:textColor="@color/white"
-            android:textSize="20sp"
+            android:textSize="28sp"
             android:textStyle="bold"
+            android:fontFamily="sans-serif"
             android:layout_marginTop="24dp" />
 
         <TextView
@@ -149,7 +155,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:textColor="@color/white"
-            android:textSize="18sp" />
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:fontFamily="sans-serif" />
 
         <TextView
             android:id="@+id/sessionLinesText"
@@ -157,7 +165,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:textColor="@color/white"
-            android:textSize="18sp" />
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:fontFamily="sans-serif" />
 
         <TextView
             android:id="@+id/sessionPiecesText"
@@ -165,7 +175,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:textColor="@color/white"
-            android:textSize="18sp" />
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:fontFamily="sans-serif" />
 
         <TextView
             android:id="@+id/sessionTimeText"
@@ -173,7 +185,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:textColor="@color/white"
-            android:textSize="18sp" />
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:fontFamily="sans-serif" />
 
         <TextView
             android:id="@+id/sessionLevelText"
@@ -181,15 +195,18 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:textColor="@color/white"
-            android:textSize="18sp" />
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:fontFamily="sans-serif" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/line_clears"
             android:textColor="@color/white"
-            android:textSize="20sp"
+            android:textSize="28sp"
             android:textStyle="bold"
+            android:fontFamily="sans-serif"
             android:layout_marginTop="16dp" />
 
         <TextView
@@ -198,7 +215,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:textColor="@color/white"
-            android:textSize="18sp" />
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:fontFamily="sans-serif" />
 
         <TextView
             android:id="@+id/sessionDoublesText"
@@ -206,7 +225,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:textColor="@color/white"
-            android:textSize="18sp" />
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:fontFamily="sans-serif" />
 
         <TextView
             android:id="@+id/sessionTriplesText"
@@ -214,7 +235,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:textColor="@color/white"
-            android:textSize="18sp" />
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:fontFamily="sans-serif" />
 
         <TextView
             android:id="@+id/sessionTetrisesText"
@@ -222,7 +245,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:textColor="@color/white"
-            android:textSize="18sp" />
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:fontFamily="sans-serif" />
 
         <Button
             android:id="@+id/playAgainButton"
@@ -231,7 +256,10 @@
             android:layout_marginTop="32dp"
             android:background="@color/transparent"
             android:text="@string/play"
-            android:textColor="@color/white" />
+            android:textColor="@color/white"
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:fontFamily="sans-serif" />
     </LinearLayout>
     
     <!-- Player Progression Screen -->
@@ -270,7 +298,9 @@
                 android:textColor="@color/white"
                 android:textSize="24sp"
                 android:textStyle="bold"
-                android:layout_marginEnd="16dp" />
+                android:fontFamily="sans-serif"
+                android:layout_marginEnd="16dp"
+                android:textAllCaps="false" />
 
             <com.mintris.ui.LevelBadge
                 android:id="@+id/pauseLevelBadge"
@@ -299,7 +329,10 @@
                     android:background="@color/transparent"
                     android:text="@string/start"
                     android:textColor="@color/white"
-                    android:textSize="18sp" />
+                    android:textSize="24sp"
+                    android:textStyle="bold"
+                    android:fontFamily="sans-serif"
+                    android:textAllCaps="false" />
         
                 <Button
                     android:id="@+id/resumeButton"
@@ -309,7 +342,10 @@
                     android:background="@color/transparent"
                     android:text="@string/resume"
                     android:textColor="@color/white"
-                    android:textSize="18sp" />
+                    android:textSize="24sp"
+                    android:textStyle="bold"
+                    android:fontFamily="sans-serif"
+                    android:textAllCaps="false" />
         
                 <Button
                     android:id="@+id/pauseRestartButton"
@@ -319,7 +355,10 @@
                     android:background="@color/transparent"
                     android:text="@string/restart"
                     android:textColor="@color/white"
-                    android:textSize="18sp" />
+                    android:textSize="24sp"
+                    android:textStyle="bold"
+                    android:fontFamily="sans-serif"
+                    android:textAllCaps="false" />
         
                 <Button
                     android:id="@+id/highScoresButton"
@@ -329,7 +368,10 @@
                     android:background="@color/transparent"
                     android:text="@string/high_scores"
                     android:textColor="@color/white"
-                    android:textSize="18sp" />
+                    android:textSize="24sp"
+                    android:textStyle="bold"
+                    android:fontFamily="sans-serif"
+                    android:textAllCaps="false" />
         
                 <Button
                     android:id="@+id/statsButton"
@@ -339,7 +381,10 @@
                     android:background="@color/transparent"
                     android:text="@string/stats"
                     android:textColor="@color/white"
-                    android:textSize="18sp" />
+                    android:textSize="24sp"
+                    android:textStyle="bold"
+                    android:fontFamily="sans-serif"
+                    android:textAllCaps="false" />
                     
                 <LinearLayout
                     android:id="@+id/levelSelectorContainer"
@@ -355,8 +400,10 @@
                         android:layout_height="wrap_content"
                         android:text="@string/select_level"
                         android:textColor="@color/white"
-                        android:textSize="16sp"
-                        android:textStyle="bold" />
+                        android:textSize="24sp"
+                        android:textStyle="bold"
+                        android:fontFamily="sans-serif"
+                        android:textAllCaps="false" />
                         
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -371,7 +418,9 @@
                             android:background="@color/transparent"
                             android:text="−"
                             android:textColor="@color/white"
-                            android:textSize="24sp" />
+                            android:textSize="24sp"
+                            android:textStyle="bold"
+                            android:fontFamily="sans-serif" />
                             
                         <TextView
                             android:id="@+id/pauseLevelText"
@@ -381,7 +430,8 @@
                             android:text="1"
                             android:textColor="@color/white"
                             android:textSize="24sp"
-                            android:textStyle="bold" />
+                            android:textStyle="bold"
+                            android:fontFamily="sans-serif" />
                             
                         <Button
                             android:id="@+id/pauseLevelUpButton"
@@ -390,7 +440,9 @@
                             android:background="@color/transparent"
                             android:text="+"
                             android:textColor="@color/white"
-                            android:textSize="24sp" />
+                            android:textSize="24sp"
+                            android:textStyle="bold"
+                            android:fontFamily="sans-serif" />
                     </LinearLayout>
                 </LinearLayout>
                 
@@ -418,7 +470,10 @@
                     android:background="@color/transparent"
                     android:text="@string/sound_on"
                     android:textColor="@color/white"
-                    android:textSize="18sp" />
+                    android:textSize="24sp"
+                    android:textStyle="bold"
+                    android:fontFamily="sans-serif"
+                    android:textAllCaps="false" />
         
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -433,7 +488,10 @@
                         android:layout_height="wrap_content"
                         android:text="@string/music"
                         android:textColor="@color/white"
-                        android:textSize="18sp"
+                        android:textSize="24sp"
+                        android:textStyle="bold"
+                        android:fontFamily="sans-serif"
+                        android:textAllCaps="false"
                         android:layout_marginEnd="16dp" />
                         
                     <ImageButton
diff --git a/app/src/main/res/layout/block_skin_selector.xml b/app/src/main/res/layout/block_skin_selector.xml
index da08d42..366b099 100644
--- a/app/src/main/res/layout/block_skin_selector.xml
+++ b/app/src/main/res/layout/block_skin_selector.xml
@@ -9,10 +9,11 @@
         android:id="@+id/available_skins_label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="BLOCK SKINS"
+        android:text="block skins"
         android:textColor="@android:color/white"
-        android:textSize="18sp"
+        android:textSize="24sp"
         android:textStyle="bold"
+        android:fontFamily="sans-serif"
         android:gravity="center"
         android:layout_marginBottom="16dp" />
 
diff --git a/app/src/main/res/layout/progression_screen.xml b/app/src/main/res/layout/progression_screen.xml
index b911769..6210f26 100644
--- a/app/src/main/res/layout/progression_screen.xml
+++ b/app/src/main/res/layout/progression_screen.xml
@@ -9,9 +9,10 @@
         android:id="@+id/progression_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="LEVEL UP"
-        android:textSize="24sp"
+        android:text="level up"
+        android:textSize="48sp"
         android:textStyle="bold"
+        android:fontFamily="sans-serif"
         android:textColor="@color/white"
         android:gravity="center"
         android:layout_marginTop="16dp"
@@ -21,8 +22,10 @@
         android:id="@+id/player_level_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Player Level: 1"
-        android:textSize="20sp"
+        android:text="player level: 1"
+        android:textSize="36sp"
+        android:textStyle="bold"
+        android:fontFamily="sans-serif"
         android:textColor="@color/white"
         android:gravity="center"
         android:layout_marginBottom="24dp" />
@@ -37,10 +40,11 @@
         android:id="@+id/xp_gain_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="+0 XP"
-        android:textSize="22sp"
-        android:textColor="#50C878"
+        android:text="+0 xp"
+        android:textSize="42sp"
         android:textStyle="bold"
+        android:fontFamily="sans-serif"
+        android:textColor="#50C878"
         android:gravity="center"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="24dp" />
@@ -49,9 +53,10 @@
         android:id="@+id/rewards_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="REWARDS UNLOCKED"
-        android:textSize="20sp"
+        android:text="rewards unlocked"
+        android:textSize="36sp"
         android:textStyle="bold"
+        android:fontFamily="sans-serif"
         android:textColor="#FFD700"
         android:gravity="center"
         android:layout_marginTop="8dp"
@@ -75,8 +80,10 @@
         android:id="@+id/continue_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="CONTINUE"
-        android:textSize="18sp"
+        android:text="continue"
+        android:textSize="32sp"
+        android:textStyle="bold"
+        android:fontFamily="sans-serif"
         android:layout_gravity="center"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
diff --git a/app/src/main/res/layout/theme_selector.xml b/app/src/main/res/layout/theme_selector.xml
index 7eee6f0..5b785b3 100644
--- a/app/src/main/res/layout/theme_selector.xml
+++ b/app/src/main/res/layout/theme_selector.xml
@@ -9,10 +9,11 @@
         android:id="@+id/available_themes_label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="AVAILABLE THEMES"
+        android:text="available themes"
         android:textColor="@android:color/white"
-        android:textSize="18sp"
+        android:textSize="24sp"
         android:textStyle="bold"
+        android:fontFamily="sans-serif"
         android:gravity="center"
         android:layout_marginBottom="16dp" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e19310d..6879ee4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Mintris</string>
-    <string name="game_over">Game Over</string>
-    <string name="score">Score</string>
-    <string name="level">Level</string>
-    <string name="lines">Lines</string>
-    <string name="next">Next</string>
-    <string name="play">Play Again</string>
-    <string name="resume">Resume</string>
-    <string name="pause">PAUSE</string>
-    <string name="settings">Settings</string>
-    <string name="start">Start Game</string>
-    <string name="restart">Restart</string>
-    <string name="select_level">Select Level</string>
-    <string name="sound_on">Sound: On</string>
-    <string name="sound_off">Sound: Off</string>
-    <string name="toggle_music">Toggle music</string>
-    <string name="high_scores">High Scores</string>
-    <string name="new_high_score">New High Score!</string>
-    <string name="save">Save</string>
-    <string name="back">Back</string>
+    <string name="app_name">mintris</string>
+    <string name="game_over">game over</string>
+    <string name="score">score</string>
+    <string name="level">level</string>
+    <string name="lines">lines</string>
+    <string name="next">next</string>
+    <string name="play">play again</string>
+    <string name="resume">resume</string>
+    <string name="pause">pause</string>
+    <string name="settings">settings</string>
+    <string name="start">start game</string>
+    <string name="restart">restart</string>
+    <string name="select_level">select level</string>
+    <string name="sound_on">sound: on</string>
+    <string name="sound_off">sound: off</string>
+    <string name="toggle_music">toggle music</string>
+    <string name="high_scores">high scores</string>
+    <string name="new_high_score">new high score!</string>
+    <string name="save">save</string>
+    <string name="back">back</string>
     
     <!-- Stats Screen -->
-    <string name="lifetime_stats">Lifetime Stats</string>
-    <string name="best_performance">Best Performance</string>
-    <string name="total_games">Total Games: %d</string>
-    <string name="total_score">Total Score: %d</string>
-    <string name="total_lines">Total Lines: %d</string>
-    <string name="total_pieces">Total Pieces: %d</string>
-    <string name="total_time">Total Time: %s</string>
-    <string name="max_level">Max Level: %d</string>
-    <string name="max_score">Max Score: %d</string>
-    <string name="max_lines">Max Lines: %d</string>
-    <string name="stats">Stats</string>
-    <string name="session_stats">Session Stats</string>
-    <string name="session_score">Score: %d</string>
-    <string name="session_lines">Lines: %d</string>
-    <string name="session_pieces">Pieces: %d</string>
-    <string name="session_time">Time: %s</string>
-    <string name="session_level">Level: %d</string>
-    <string name="line_clears">Line Clears</string>
-    <string name="singles">Singles: %d</string>
-    <string name="doubles">Doubles: %d</string>
-    <string name="triples">Triples: %d</string>
-    <string name="tetrises">Tetrises: %d</string>
-    <string name="reset_stats">Reset Stats</string>
-    <string name="music">Music</string>
+    <string name="lifetime_stats">lifetime stats</string>
+    <string name="best_performance">best performance</string>
+    <string name="total_games">total games: %d</string>
+    <string name="total_score">total score: %d</string>
+    <string name="total_lines">total lines: %d</string>
+    <string name="total_pieces">total pieces: %d</string>
+    <string name="total_time">total time: %s</string>
+    <string name="max_level">max level: %d</string>
+    <string name="max_score">max score: %d</string>
+    <string name="max_lines">max lines: %d</string>
+    <string name="stats">stats</string>
+    <string name="session_stats">session stats</string>
+    <string name="session_score">score: %d</string>
+    <string name="session_lines">lines: %d</string>
+    <string name="session_pieces">pieces: %d</string>
+    <string name="session_time">time: %s</string>
+    <string name="session_level">level: %d</string>
+    <string name="line_clears">line clears</string>
+    <string name="singles">singles: %d</string>
+    <string name="doubles">doubles: %d</string>
+    <string name="triples">triples: %d</string>
+    <string name="tetrises">tetrises: %d</string>
+    <string name="reset_stats">reset stats</string>
+    <string name="music">music</string>
 </resources> 
\ No newline at end of file