Skip to content

Commit b21f540

Browse files
nethical6nethical6
committed
fix icons
1 parent 07024e0 commit b21f540

9 files changed

Lines changed: 73 additions & 22 deletions

File tree

‎composeApp/src/commonMain/composeResources/drawable/coin.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
android:pathData="M12,4c-4.41,0 -8,3.59 -8,8s3.59,8 8,8 8,-3.59 8,-8 -3.59,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6 6,2.69 6,6 -2.69,6 -6,6z"/>
1414

1515
<path
16-
android:fillColor="#E65100"
16+
android:fillColor="#FFA000"
1717
android:pathData="M12.5,15.58v1.42h-1v-1.42c-1.31,-0.23 -2.2,-1.2 -2.2,-2.28 0,-1.4 1.1,-2.3 2.85,-2.63l0.35,-0.06c0.66,-0.13 1,-0.37 1,-0.71 0,-0.38 -0.4,-0.6 -1,-0.6 -0.63,0 -1.02,0.27 -1.14,0.71L10.36,9.8c0.23,-0.92 1.05,-1.62 2.14,-1.8V6.5h1v1.5c1.31,0.23 2.13,1.2 2.13,2.2 0,1.3 -1.04,2.2 -2.75,2.53l-0.38,0.07C11.9,12.93 11.5,13.23 11.5,13.6c0,0.37 0.38,0.6 1,0.6 0.73,0 1.13,-0.29 1.22,-0.78l1.04,0.18C14.54,14.63 13.68,15.36 12.5,15.58z"/>
1818
</vector>

‎composeApp/src/commonMain/composeResources/drawable/grid.png‎

15.3 KB
Loading

‎composeApp/src/commonMain/composeResources/drawable/rounded_clock_loader_10_24.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
2+
3+
<path android:fillColor="#FFFFFF" android:pathData="M480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,416 776,357Q752,298 707,253L480,480L480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800Z"/>
4+
5+
</vector>

‎composeApp/src/commonMain/composeResources/drawable/stats.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="100"
5+
android:viewportHeight="100">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M15,50 L25,50 A5,5 0 0 1 30,55 L30,85 A5,5 0 0 1 25,90 L15,90 A5,5 0 0 1 10,85 L10,55 A5,5 0 0 1 15,50 z
9+
M45,10 L55,10 A5,5 0 0 1 60,15 L60,85 A5,5 0 0 1 55,90 L45,90 A5,5 0 0 1 40,85 L40,15 A5,5 0 0 1 45,10 z
10+
M75,30 L85,30 A5,5 0 0 1 90,35 L90,85 A5,5 0 0 1 85,90 L75,90 A5,5 0 0 1 70,85 L70,35 A5,5 0 0 1 75,30 z"/>
11+
</vector>

‎composeApp/src/commonMain/kotlin/neth/iecal/trease/ui/dialogs/WarningBeforeQuit.kt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import androidx.compose.runtime.remember
2626
import androidx.compose.runtime.setValue
2727
import androidx.compose.ui.Alignment
2828
import androidx.compose.ui.Modifier
29+
import androidx.compose.ui.graphics.painter.Painter
2930
import androidx.compose.ui.graphics.vector.ImageVector
3031
import androidx.compose.ui.text.SpanStyle
3132
import androidx.compose.ui.text.buildAnnotatedString
@@ -39,6 +40,7 @@ import neth.iecal.trease.viewmodels.HomeScreenViewModel
3940
import org.jetbrains.compose.resources.painterResource
4041
import trease.composeapp.generated.resources.Res
4142
import trease.composeapp.generated.resources.outline_arrow_forward_ios_24
43+
import trease.composeapp.generated.resources.rounded_clock_loader_10_24
4244

4345
@Composable
4446
fun WarningBeforeQuit(
@@ -85,11 +87,13 @@ fun WarningBeforeQuit(
8587
) {
8688
WarningStatItem(
8789
value = elapsedFormatted,
88-
label = "Focused"
90+
label = "Focused",
91+
painterResource(Res.drawable.rounded_clock_loader_10_24)
8992
)
9093
WarningStatItem(
9194
value = "${goalFocus}m",
92-
label = "Goal"
95+
label = "Goal",
96+
painterResource(Res.drawable.rounded_clock_loader_10_24)
9397
)
9498
}
9599

@@ -156,11 +160,12 @@ fun WarningBeforeQuit(
156160
@Composable
157161
private fun WarningStatItem(
158162
value: String,
159-
label: String
163+
label: String,
164+
painter: Painter
160165
) {
161166
Column(horizontalAlignment = Alignment.CenterHorizontally) {
162167
Icon(
163-
painter = painterResource( Res.drawable.outline_arrow_forward_ios_24),
168+
painter = painter,
164169
contentDescription = null,
165170
tint = MaterialTheme.colorScheme.onSurfaceVariant,
166171
modifier = Modifier.size(20.dp)

‎composeApp/src/commonMain/kotlin/neth/iecal/trease/ui/dialogs/YouLost.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
1414
import androidx.compose.material3.Button
1515
import androidx.compose.material3.ButtonDefaults
1616
import androidx.compose.material3.Card
17+
import androidx.compose.material3.CardDefaults
1718
import androidx.compose.material3.MaterialTheme
1819
import androidx.compose.material3.Surface
1920
import androidx.compose.material3.Text
@@ -47,6 +48,7 @@ fun YouLost(viewModel: HomeScreenViewModel) {
4748
Dialog(onDismissRequest = { viewModel.cleanTimerSession() }) {
4849
Card(
4950
shape = RoundedCornerShape(24.dp),
51+
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface) ,
5052
modifier = Modifier
5153
.fillMaxWidth()
5254
.padding(16.dp)

‎composeApp/src/commonMain/kotlin/neth/iecal/trease/ui/dialogs/YouWon.kt‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,22 @@ import androidx.compose.runtime.getValue
99
import androidx.compose.ui.Alignment
1010
import androidx.compose.ui.Modifier
1111
import androidx.compose.ui.graphics.Color
12+
import androidx.compose.ui.graphics.painter.Painter
1213
import androidx.compose.ui.layout.ContentScale
1314
import androidx.compose.ui.text.font.FontWeight
1415
import androidx.compose.ui.text.style.TextAlign
1516
import androidx.compose.ui.unit.dp
1617
import androidx.compose.ui.window.Dialog
1718
import coil3.compose.AsyncImage
19+
import coil3.compose.ImagePainter
1820
import neth.iecal.trease.Constants
1921
import neth.iecal.trease.viewmodels.HomeScreenViewModel
2022
import org.jetbrains.compose.resources.painterResource
2123
import trease.composeapp.generated.resources.Res
24+
import trease.composeapp.generated.resources.coin
25+
import trease.composeapp.generated.resources.grid
2226
import trease.composeapp.generated.resources.outline_arrow_forward_ios_24
27+
import trease.composeapp.generated.resources.rounded_clock_loader_10_24
2328

2429
@Composable
2530
fun YouWon(viewModel: HomeScreenViewModel) {
@@ -32,6 +37,7 @@ fun YouWon(viewModel: HomeScreenViewModel) {
3237
Dialog(onDismissRequest = { viewModel.cleanTimerSession() }) {
3338
Card(
3439
shape = RoundedCornerShape(24.dp),
40+
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface) ,
3541
modifier = Modifier
3642
.fillMaxWidth()
3743
.padding(16.dp)
@@ -41,7 +47,7 @@ fun YouWon(viewModel: HomeScreenViewModel) {
4147
.padding(24.dp)
4248
.fillMaxWidth(),
4349
horizontalAlignment = Alignment.CenterHorizontally,
44-
verticalArrangement = Arrangement.spacedBy(16.dp)
50+
verticalArrangement = Arrangement.spacedBy(8.dp)
4551
) {
4652
// Header Section
4753
Column(horizontalAlignment = Alignment.CenterHorizontally) {
@@ -76,22 +82,27 @@ fun YouWon(viewModel: HomeScreenViewModel) {
7682
) {
7783
StatItem(
7884
value = "${goalFocus}m",
79-
label = "Focus"
85+
label = "Focus",
86+
painter = painterResource(Res.drawable.rounded_clock_loader_10_24)
8087
)
8188

8289
// Only show Rarity if it is actually Rare, otherwise show something else or center the others
8390
if (isRare) {
8491
StatItem(
8592
value = "Rare",
8693
label = "Quality",
87-
tint = MaterialTheme.colorScheme.primary
94+
tint = MaterialTheme.colorScheme.primary,
95+
painter = painterResource(Res.drawable.grid)
96+
8897
)
8998
}
9099

91100
StatItem(
92101
value = "+$coins",
93102
label = "Earned",
94-
tint = MaterialTheme.colorScheme.tertiary
103+
tint = MaterialTheme.colorScheme.tertiary,
104+
painter = painterResource(Res.drawable.coin)
105+
95106
)
96107
}
97108

@@ -122,11 +133,12 @@ fun YouWon(viewModel: HomeScreenViewModel) {
122133
private fun StatItem(
123134
value: String,
124135
label: String,
125-
tint: Color = MaterialTheme.colorScheme.onSurface
136+
tint: Color = MaterialTheme.colorScheme.onSurface,
137+
painter: Painter
126138
) {
127139
Column(horizontalAlignment = Alignment.CenterHorizontally) {
128140
Icon(
129-
painter = painterResource(Res.drawable.outline_arrow_forward_ios_24),
141+
painter = painter,
130142
contentDescription = label,
131143
tint = tint,
132144
modifier = Modifier.size(28.dp)

‎composeApp/src/commonMain/kotlin/neth/iecal/trease/ui/screens/FullScreenGarden.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ fun FullScreenGarden(navController: NavHostController) {
103103
onClose = { showBottomLeft = false }
104104
) {
105105
Column {
106-
Text("HISTORY", style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurface.copy(0.5f), fontSize = 8.sp)
107106
Box(Modifier.weight(1f)) { WeeklyActivityChart(statsList) }
108107
}
109108
}
@@ -118,7 +117,6 @@ fun FullScreenGarden(navController: NavHostController) {
118117
onClose = { showBottomRight = false }
119118
) {
120119
Column {
121-
Text("PEAK TIME", style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurface.copy(0.5f), fontSize = 8.sp)
122120
Box(Modifier.weight(1f)) { HourlyFocusChart(statsList) }
123121
}
124122
}
@@ -175,7 +173,7 @@ private fun GlassHudWidget(
175173
.clickable { onClose() },
176174
contentAlignment = Alignment.Center
177175
) {
178-
Text("X")
176+
Text("x", style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.error)
179177
}
180178
}
181179
}
@@ -238,15 +236,15 @@ fun MiniMonthSelector(date: LocalDate, onMonthChange: (LocalDate) -> Unit) {
238236

239237
@Composable
240238
fun MiniResourceCounter(focus: Int, streak: Int) {
241-
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
239+
Row(horizontalArrangement = Arrangement.spacedBy(16.dp,Alignment.CenterHorizontally)) {
242240
Column(horizontalAlignment = Alignment.End) {
243241
Text("$focus", style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold))
244242
Text("min", style = MaterialTheme.typography.labelSmall, fontSize = 8.sp, color = MaterialTheme.colorScheme.primary)
245243
}
246244
Box(Modifier.width(1.dp).height(24.dp).background(MaterialTheme.colorScheme.onSurface.copy(0.1f)))
247245
Column(horizontalAlignment = Alignment.End) {
248246
Text("$streak", style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold))
249-
Text("days", style = MaterialTheme.typography.labelSmall, fontSize = 8.sp, color = MaterialTheme.colorScheme.tertiary)
247+
Text("streak", style = MaterialTheme.typography.labelSmall, fontSize = 8.sp, color = MaterialTheme.colorScheme.tertiary)
250248
}
251249
}
252250
}

‎composeApp/src/commonMain/kotlin/neth/iecal/trease/ui/screens/HomeScreen.kt‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package neth.iecal.trease.ui.screens
22

33
import androidx.compose.foundation.ExperimentalFoundationApi
4+
import androidx.compose.foundation.Image
45
import androidx.compose.foundation.combinedClickable
56
import androidx.compose.foundation.interaction.MutableInteractionSource
67
import androidx.compose.foundation.layout.*
@@ -23,7 +24,9 @@ import androidx.compose.ui.zIndex
2324
import androidx.lifecycle.compose.collectAsStateWithLifecycle
2425
import androidx.lifecycle.viewmodel.compose.viewModel
2526
import androidx.navigation.NavHostController
27+
import coil3.compose.AsyncImage
2628
import neth.iecal.trease.Garden
29+
import neth.iecal.trease.GardenFullScreen
2730
import neth.iecal.trease.models.TimerStatus
2831
import neth.iecal.trease.ui.bottomsheet.TreeBottomSheet
2932
import neth.iecal.trease.ui.components.TreeGrowthPlayer
@@ -36,6 +39,8 @@ import org.jetbrains.compose.resources.painterResource
3639
import trease.composeapp.generated.resources.Res
3740
import trease.composeapp.generated.resources.baseline_apps_24
3841
import trease.composeapp.generated.resources.coin
42+
import trease.composeapp.generated.resources.grid
43+
import trease.composeapp.generated.resources.stats
3944

4045
@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
4146
@Composable
@@ -51,6 +56,7 @@ fun HomeScreen(navController: NavHostController) {
5156

5257
Scaffold(
5358
modifier = Modifier.fillMaxSize(),
59+
contentWindowInsets = WindowInsets.displayCutout
5460
) { paddingValues ->
5561

5662
if (isTreeSelectionVisible) {
@@ -65,18 +71,30 @@ fun HomeScreen(navController: NavHostController) {
6571

6672
Box(Modifier.fillMaxSize()) {
6773
TopAppBar(
68-
modifier = Modifier.align(Alignment.TopCenter).zIndex(999f).padding(16.dp),
74+
modifier = Modifier.align(Alignment.TopCenter).zIndex(999f).padding(end = 16.dp),
6975
title = {},
7076
actions = {
71-
Row(horizontalArrangement = Arrangement.spacedBy(4.dp), verticalAlignment = Alignment.CenterVertically) {
77+
Row(horizontalArrangement = Arrangement.spacedBy(16.dp), verticalAlignment = Alignment.CenterVertically) {
7278
IconButton(onClick = { navController.navigate(Garden) }, Modifier.size(40.dp)) {
73-
Icon(
74-
painter = painterResource(Res.drawable.baseline_apps_24),
79+
Image(
80+
painter = painterResource(Res.drawable.stats),
7581
contentDescription = "Garden",
76-
tint = MaterialTheme.colorScheme.primary
7782
)
7883
}
79-
Text("$coins Coins")
84+
IconButton(onClick = { navController.navigate(GardenFullScreen) }, Modifier.size(25.dp)) {
85+
Image(
86+
painter = painterResource(Res.drawable.grid),
87+
contentDescription = "Garden",
88+
Modifier.size(40.dp)
89+
)
90+
}
91+
Row {
92+
Image(
93+
painter = painterResource(Res.drawable.coin),
94+
contentDescription = "Garden",
95+
)
96+
Text(" $coins")
97+
}
8098

8199
}
82100

0 commit comments

Comments
 (0)