0.2.0 quick fixes

2025-08-15 14:51:30 -06:00
parent 66fdef78d9
commit 6e16a30429
16 changed files with 71 additions and 38 deletions
--- a/.gradle/8.11.1/executionHistory/executionHistory.bin
+++ b/.gradle/8.11.1/executionHistory/executionHistory.bin
--- a/.gradle/8.11.1/executionHistory/executionHistory.lock
+++ b/.gradle/8.11.1/executionHistory/executionHistory.lock
--- a/.gradle/8.11.1/fileHashes/fileHashes.bin
+++ b/.gradle/8.11.1/fileHashes/fileHashes.bin
--- a/.gradle/8.11.1/fileHashes/fileHashes.lock
+++ b/.gradle/8.11.1/fileHashes/fileHashes.lock
--- a/.gradle/8.11.1/fileHashes/resourceHashesCache.bin
+++ b/.gradle/8.11.1/fileHashes/resourceHashesCache.bin
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -14,8 +14,8 @@ android {
        applicationId = "com.atridad.openclimb"
        minSdk = 31
        targetSdk = 35
-        versionCode = 1
-        versionName = "0.1.0"
+        versionCode = 2
+        versionName = "0.2.0"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }
--- a/app/release/baselineProfiles/0/app-release.dm
+++ b/app/release/baselineProfiles/0/app-release.dm
--- a/app/release/baselineProfiles/1/app-release.dm
+++ b/app/release/baselineProfiles/1/app-release.dm
--- a/app/release/com.atridad.openclimb_0.2.0.apk
+++ b/app/release/com.atridad.openclimb_0.2.0.apk
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
      "type": "SINGLE",
      "filters": [],
      "attributes": [],
-      "versionCode": 1,
-      "versionName": "0.1.0",
+      "versionCode": 2,
+      "versionName": "0.2.0",
      "outputFile": "app-release.apk"
    }
  ],
--- a/app/src/main/java/com/atridad/openclimb/ui/screens/AnalyticsScreen.kt
+++ b/app/src/main/java/com/atridad/openclimb/ui/screens/AnalyticsScreen.kt
@@ -6,8 +6,10 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import com.atridad.openclimb.R
 import com.atridad.openclimb.ui.viewmodel.ClimbViewModel

@Composable
@@ -26,12 +28,24 @@ fun AnalyticsScreen(
        verticalArrangement = Arrangement.spacedBy(16.dp)
    ) {
        item {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(12.dp)
+            ) {
+                Icon(
+                    painter = painterResource(id = R.drawable.ic_mountains),
+                    contentDescription = "OpenClimb Logo",
+                    modifier = Modifier.size(32.dp),
+                    tint = MaterialTheme.colorScheme.primary
+                )
                Text(
                    text = "Analytics",
                    style = MaterialTheme.typography.headlineMedium,
                    fontWeight = FontWeight.Bold
                )
            }
+        }
        
        // Overall Stats
        item {
--- a/app/src/main/java/com/atridad/openclimb/ui/screens/GymsScreen.kt
+++ b/app/src/main/java/com/atridad/openclimb/ui/screens/GymsScreen.kt
@@ -9,9 +9,11 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.atridad.openclimb.R
 import com.atridad.openclimb.data.model.Gym
 import com.atridad.openclimb.ui.viewmodel.ClimbViewModel

@@ -29,11 +31,23 @@ fun GymsScreen(
            .fillMaxSize()
            .padding(16.dp)
    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(12.dp)
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_mountains),
+                contentDescription = "OpenClimb Logo",
+                modifier = Modifier.size(32.dp),
+                tint = MaterialTheme.colorScheme.primary
+            )
            Text(
                text = "Climbing Gyms",
                style = MaterialTheme.typography.headlineMedium,
                fontWeight = FontWeight.Bold
            )
+        }
        
        Spacer(modifier = Modifier.height(16.dp))
        
--- a/app/src/main/java/com/atridad/openclimb/ui/screens/ProblemsScreen.kt
+++ b/app/src/main/java/com/atridad/openclimb/ui/screens/ProblemsScreen.kt
@@ -9,9 +9,11 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.atridad.openclimb.R
 import com.atridad.openclimb.data.model.Problem
 import com.atridad.openclimb.ui.components.FullscreenImageViewer
 import com.atridad.openclimb.ui.components.ImageDisplay
@@ -35,11 +37,23 @@ fun ProblemsScreen(
            .fillMaxSize()
            .padding(16.dp)
    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(12.dp)
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_mountains),
+                contentDescription = "OpenClimb Logo",
+                modifier = Modifier.size(32.dp),
+                tint = MaterialTheme.colorScheme.primary
+            )
            Text(
                text = "Problems & Routes",
                style = MaterialTheme.typography.headlineMedium,
                fontWeight = FontWeight.Bold
            )
+        }
        
        Spacer(modifier = Modifier.height(16.dp))
        
--- a/app/src/main/java/com/atridad/openclimb/ui/screens/SessionsScreen.kt
+++ b/app/src/main/java/com/atridad/openclimb/ui/screens/SessionsScreen.kt
@@ -10,9 +10,11 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.atridad.openclimb.R
 import com.atridad.openclimb.data.model.ClimbSession
 import com.atridad.openclimb.data.model.SessionStatus
 import com.atridad.openclimb.ui.components.ActiveSessionBanner
@@ -45,16 +47,20 @@ fun SessionsScreen(
    ) {
        Row(
            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(12.dp)
        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_mountains),
+                contentDescription = "OpenClimb Logo",
+                modifier = Modifier.size(32.dp),
+                tint = MaterialTheme.colorScheme.primary
+            )
            Text(
                text = "Climbing Sessions",
                style = MaterialTheme.typography.headlineMedium,
                fontWeight = FontWeight.Bold
            )
-            
-
        }
        
        Spacer(modifier = Modifier.height(16.dp))
--- a/app/src/main/java/com/atridad/openclimb/ui/screens/SettingsScreen.kt
+++ b/app/src/main/java/com/atridad/openclimb/ui/screens/SettingsScreen.kt
@@ -303,21 +303,6 @@ fun SettingsScreen(
                            leadingContent = { Icon(Icons.Default.Info, contentDescription = null) }
                        )
                    }
-                    
-                    Spacer(modifier = Modifier.height(8.dp))
-                    
-                    Card(
-                        shape = RoundedCornerShape(12.dp),
-                        colors = CardDefaults.cardColors(
-                            containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
-                        )
-                    ) {
-                        ListItem(
-                            headlineContent = { Text("About") },
-                            supportingContent = { Text("OpenClimb - Track your climbing progress") },
-                            leadingContent = { Icon(Icons.Default.Info, contentDescription = null) }
-                        )
-                    }
                }
            }
        }