feat: update typography styles and enhance text appearance in navigation components

android-app/app/src/main/java/de/harheimertc/ui/components/AppNavigationHeader.kt

@@ -214,8 +214,8 @@ private fun MainLink(
     ) {
         Text(
             label,
-            color = Color.White.copy(alpha = if (selected || primary) 1f else 0.82f),
+            color = Color.White.copy(alpha = if (selected || primary) 1f else 0.94f),
-            style = MaterialTheme.typography.labelSmall,
+            style = MaterialTheme.typography.labelMedium,
             modifier = Modifier.padding(horizontal = 10.dp, vertical = 9.dp),
             maxLines = 1,
         )
@@ -239,7 +239,7 @@ private fun CompactLink(
             label,
             color = if (route == selectedRoute) Color.White else Color(0xFFD4D4D8),
             textAlign = TextAlign.Center,
-            style = MaterialTheme.typography.labelSmall,
+            style = MaterialTheme.typography.labelMedium,
             modifier = Modifier.padding(vertical = 9.dp, horizontal = 2.dp),
             maxLines = 1,
         )
@@ -256,7 +256,7 @@ private fun SubLink(label: String, selected: Boolean, onClick: () -> Unit) {
         Text(
             label,
             color = if (selected) Color.White else Color(0xFFD4D4D8),
-            style = MaterialTheme.typography.labelSmall,
+            style = MaterialTheme.typography.labelMedium,
             modifier = Modifier.padding(horizontal = 9.dp, vertical = 4.dp),
             maxLines = 1,
         )

android-app/app/src/main/java/de/harheimertc/ui/theme/Typography.kt

@@ -10,32 +10,90 @@ import de.harheimertc.R
 
 // Bundled variable fonts in res/font:
 val InterFamily = FontFamily(Font(R.font.inter_variable))
-val MontserratFamily = FontFamily(Font(R.font.montserrat_variable, FontWeight.SemiBold))
+val MontserratFamily = FontFamily(
+    Font(R.font.montserrat_variable, FontWeight.SemiBold),
+    Font(R.font.montserrat_variable, FontWeight.Bold),
+    Font(R.font.montserrat_variable, FontWeight.ExtraBold),
+)
+val HeaderFamily = InterFamily
 
 val AppTypography = Typography(
     displayLarge = TextStyle(
-        fontFamily = MontserratFamily,
+        fontFamily = HeaderFamily,
-        fontWeight = FontWeight.SemiBold,
+        fontWeight = FontWeight.ExtraBold,
-        fontSize = 30.sp
+        fontSize = 32.sp,
+        lineHeight = 38.sp
+    ),
+    headlineLarge = TextStyle(
+        fontFamily = HeaderFamily,
+        fontWeight = FontWeight.Bold,
+        fontSize = 28.sp,
+        lineHeight = 34.sp
+    ),
+    headlineMedium = TextStyle(
+        fontFamily = HeaderFamily,
+        fontWeight = FontWeight.Bold,
+        fontSize = 24.sp,
+        lineHeight = 30.sp
+    ),
+    headlineSmall = TextStyle(
+        fontFamily = HeaderFamily,
+        fontWeight = FontWeight.Bold,
+        fontSize = 20.sp,
+        lineHeight = 26.sp
     ),
     titleLarge = TextStyle(
-        fontFamily = MontserratFamily,
+        fontFamily = HeaderFamily,
-        fontWeight = FontWeight.Medium,
+        fontWeight = FontWeight.Bold,
-        fontSize = 20.sp
+        fontSize = 22.sp,
+        lineHeight = 28.sp
+    ),
+    titleMedium = TextStyle(
+        fontFamily = HeaderFamily,
+        fontWeight = FontWeight.Bold,
+        fontSize = 18.sp,
+        lineHeight = 24.sp
+    ),
+    titleSmall = TextStyle(
+        fontFamily = HeaderFamily,
+        fontWeight = FontWeight.Bold,
+        fontSize = 16.sp,
+        lineHeight = 22.sp
     ),
     bodyLarge = TextStyle(
         fontFamily = InterFamily,
-        fontWeight = FontWeight.Normal,
+        fontWeight = FontWeight.Medium,
-        fontSize = 16.sp
+        fontSize = 17.sp,
+        lineHeight = 25.sp
     ),
     bodyMedium = TextStyle(
         fontFamily = InterFamily,
-        fontWeight = FontWeight.Normal,
+        fontWeight = FontWeight.Medium,
-        fontSize = 14.sp
+        fontSize = 15.sp,
+        lineHeight = 22.sp
+    ),
+    bodySmall = TextStyle(
+        fontFamily = InterFamily,
+        fontWeight = FontWeight.Medium,
+        fontSize = 14.sp,
+        lineHeight = 20.sp
+    ),
+    labelLarge = TextStyle(
+        fontFamily = InterFamily,
+        fontWeight = FontWeight.SemiBold,
+        fontSize = 15.sp,
+        lineHeight = 20.sp
+    ),
+    labelMedium = TextStyle(
+        fontFamily = InterFamily,
+        fontWeight = FontWeight.SemiBold,
+        fontSize = 14.sp,
+        lineHeight = 19.sp
     ),
     labelSmall = TextStyle(
         fontFamily = InterFamily,
-        fontWeight = FontWeight.Medium,
+        fontWeight = FontWeight.SemiBold,
-        fontSize = 12.sp
+        fontSize = 13.sp,
+        lineHeight = 18.sp
     )
 )

android-app/gradle.properties

@@ -8,8 +8,8 @@ LOCAL_API_BASE_URL=https://harheimertc.tsschulz.de/
 PRODUCTION_API_BASE_URL=https://harheimertc.de/
 
 # Android app versioning for Play Store uploads
-ANDROID_VERSION_CODE=4
+ANDROID_VERSION_CODE=5
-ANDROID_VERSION_NAME=1.0.0
+ANDROID_VERSION_NAME=0.9.0
 
 # Enable R8 for release by default so mapping.txt is generated for Play Console.
 RELEASE_MINIFY_ENABLED=true