Skip to content

Commit 2338438

Browse files
committed
major stuff
1 parent 03f1a9c commit 2338438

13 files changed

Lines changed: 645 additions & 315 deletions

File tree

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
package neth.iecal.trease
22
import androidx.compose.runtime.Composable
3-
import androidx.compose.runtime.remember
43
import androidx.navigation.compose.NavHost
54
import androidx.navigation.compose.composable
65
import androidx.navigation.compose.rememberNavController
76
import kotlinx.serialization.Serializable
8-
import neth.iecal.trease.ui.components.IsometricForest
7+
import neth.iecal.trease.ui.screens.GardenScreen
98
import neth.iecal.trease.ui.screens.HomeScreen
109
import neth.iecal.trease.ui.theme.ZenTheme
1110

1211
@Serializable
1312
data object Home
13+
@Serializable
14+
data object Garden
1415

1516
@Composable
1617
fun App() {
1718
val navController = rememberNavController()
1819
ZenTheme() {
19-
// NavHost(navController = navController, startDestination = Home) {
20-
// composable<Home> {
21-
// HomeScreen()
22-
// }
23-
//
24-
// }
20+
NavHost(navController = navController, startDestination = Home) {
21+
composable<Home> {
22+
HomeScreen(navController)
23+
}
24+
composable<Garden> {
25+
GardenScreen(navController)
26+
}
2527

26-
// Generate 500 IDs exactly like the user script
27-
val treeIds = remember { MutableList(21) { "tree" } }
28+
}
2829

29-
IsometricForest(treeIds = treeIds)
3030
}
3131
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package neth.iecal.trease.models
2+
3+
import kotlinx.serialization.Serializable
4+
import kotlinx.serialization.Serializer
5+
import kotlin.time.Clock
6+
import kotlin.uuid.ExperimentalUuidApi
7+
import kotlin.uuid.Uuid
8+
9+
@Serializable
10+
data class FocusStats @OptIn(ExperimentalUuidApi::class) constructor(
11+
val duration: Long = Clock.System.now().toEpochMilliseconds(),
12+
val treeId: String,
13+
val isFailed: Boolean,
14+
val failureTree: String = "weathered",
15+
val id:String = Uuid.generateV7().toString(),
16+
)
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package neth.iecal.trease.models
2+
3+
enum class TimerStatus {
4+
Idle, Running,
5+
6+
HAS_WON, // user wins to see the "you won" dialog
7+
POST_WIN, // The dialog is closed and user sees his grown tree
8+
9+
HAS_QUIT, // user just lost and the "You lost" dialog is visible
10+
POST_QUIT // The dialog is closed and user sees the weathered tree
11+
12+
}

0 commit comments

Comments
 (0)