diff --git a/.gradle/8.11.1/executionHistory/executionHistory.bin b/.gradle/8.11.1/executionHistory/executionHistory.bin index c6e99a4..9082f3d 100644 Binary files a/.gradle/8.11.1/executionHistory/executionHistory.bin and b/.gradle/8.11.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.11.1/executionHistory/executionHistory.lock b/.gradle/8.11.1/executionHistory/executionHistory.lock index 5890799..777c4ad 100644 Binary files a/.gradle/8.11.1/executionHistory/executionHistory.lock and b/.gradle/8.11.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.11.1/fileHashes/fileHashes.bin b/.gradle/8.11.1/fileHashes/fileHashes.bin index 6e8ae6c..992c3a5 100644 Binary files a/.gradle/8.11.1/fileHashes/fileHashes.bin and b/.gradle/8.11.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.11.1/fileHashes/fileHashes.lock b/.gradle/8.11.1/fileHashes/fileHashes.lock index 700b740..afca945 100644 Binary files a/.gradle/8.11.1/fileHashes/fileHashes.lock and b/.gradle/8.11.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.11.1/fileHashes/resourceHashesCache.bin b/.gradle/8.11.1/fileHashes/resourceHashesCache.bin index 9b7a1c9..5e3c92b 100644 Binary files a/.gradle/8.11.1/fileHashes/resourceHashesCache.bin and b/.gradle/8.11.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index e96c9d4..e80a677 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b50bf0e..1c7b3eb 100644 --- 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" } diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm index 4440a5e..1edb474 100644 Binary files a/app/release/baselineProfiles/0/app-release.dm and b/app/release/baselineProfiles/0/app-release.dm differ diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm index 1172b5c..d76dd81 100644 Binary files a/app/release/baselineProfiles/1/app-release.dm and b/app/release/baselineProfiles/1/app-release.dm differ diff --git a/app/release/app-release.apk b/app/release/com.atridad.openclimb_0.2.0.apk similarity index 86% rename from app/release/app-release.apk rename to app/release/com.atridad.openclimb_0.2.0.apk index a8239c3..df854ce 100644 Binary files a/app/release/app-release.apk and b/app/release/com.atridad.openclimb_0.2.0.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index c66348f..52441cd 100644 --- 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" } ], diff --git a/app/src/main/java/com/atridad/openclimb/ui/screens/AnalyticsScreen.kt b/app/src/main/java/com/atridad/openclimb/ui/screens/AnalyticsScreen.kt index 72fb8e7..b953ae4 100644 --- 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,11 +28,23 @@ fun AnalyticsScreen( verticalArrangement = Arrangement.spacedBy(16.dp) ) { item { - Text( - text = "Analytics", - style = MaterialTheme.typography.headlineMedium, - fontWeight = FontWeight.Bold - ) + 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 diff --git a/app/src/main/java/com/atridad/openclimb/ui/screens/GymsScreen.kt b/app/src/main/java/com/atridad/openclimb/ui/screens/GymsScreen.kt index c94ae10..df14e38 100644 --- 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) ) { - Text( - text = "Climbing Gyms", - style = MaterialTheme.typography.headlineMedium, - fontWeight = FontWeight.Bold - ) + 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)) diff --git a/app/src/main/java/com/atridad/openclimb/ui/screens/ProblemsScreen.kt b/app/src/main/java/com/atridad/openclimb/ui/screens/ProblemsScreen.kt index 9f2b3a0..7ff2150 100644 --- 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) ) { - Text( - text = "Problems & Routes", - style = MaterialTheme.typography.headlineMedium, - fontWeight = FontWeight.Bold - ) + 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)) diff --git a/app/src/main/java/com/atridad/openclimb/ui/screens/SessionsScreen.kt b/app/src/main/java/com/atridad/openclimb/ui/screens/SessionsScreen.kt index 6d5b15a..744e716 100644 --- 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)) diff --git a/app/src/main/java/com/atridad/openclimb/ui/screens/SettingsScreen.kt b/app/src/main/java/com/atridad/openclimb/ui/screens/SettingsScreen.kt index eb8c35d..82f01a4 100644 --- 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) } - ) - } } } }