♻️ Refactor a bit the Symptoms page

Signed-off-by: Leonardo Colman Lopes <dev@leonardo.colman.com.br>
LeoColman · Dec 28, 2024 · be00d0b · be00d0b
1 parent be6a1b0
commit be00d0b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 19 deletions.
diff --git a/app/src/main/kotlin/br/com/colman/petals/KoinModule.kt b/app/src/main/kotlin/br/com/colman/petals/KoinModule.kt
@@ -35,17 +35,6 @@ import org.koin.dsl.module
 private val Context.settingsDatastore by preferencesDataStore("settings")
 private val Context.blockDataStore by preferencesDataStore("block")
 
-val KoinModule = module {
-  includes(AndroidModule, SqlDelightModule)
-  includes(UseIOModules)
-
-  single { UseRepository(get<Database>().useQueries) }
-  single { PauseRepository(get<Database>().pauseQueries) }
-  single { HitTimerRepository(get()) }
-  single { SettingsRepository(get<Context>().settingsDatastore) }
-  single { SettingsMigrations(get<Context>().settingsDatastore) }
-  single { CensorshipRepository(get<Context>().blockDataStore) }
-}
 
 private val AndroidModule = module {
   single { get<Context>().resources }
@@ -58,3 +47,15 @@ private val SqlDelightModule = module {
   }
   single { Database(get()) }
 }
+
+val KoinModule = module {
+  includes(AndroidModule, SqlDelightModule)
+  includes(UseIOModules)
+
+  single { UseRepository(get<Database>().useQueries) }
+  single { PauseRepository(get<Database>().pauseQueries) }
+  single { HitTimerRepository(get()) }
+  single { SettingsRepository(get<Context>().settingsDatastore) }
+  single { SettingsMigrations(get<Context>().settingsDatastore) }
+  single { CensorshipRepository(get<Context>().blockDataStore) }
+}
diff --git a/app/src/main/kotlin/br/com/colman/petals/navigation/Page.kt b/app/src/main/kotlin/br/com/colman/petals/navigation/Page.kt
@@ -46,7 +46,7 @@ import br.com.colman.petals.hittimer.ComposeHitTimer
 import br.com.colman.petals.navigation.Page.Usage
 import br.com.colman.petals.settings.SettingsView
 import br.com.colman.petals.statistics.StatisticsPage
-import br.com.colman.petals.withdrawal.Symptoms
+import br.com.colman.petals.withdrawal.SymptomsPage
 import org.koin.compose.koinInject
 
 enum class Page(
@@ -56,7 +56,7 @@ enum class Page(
 ) {
   Usage(R.string.usage, { ImageVector.vectorResource(ic_cannabis) }, { Usage() }),
   HitTimer(R.string.hit_timer, { Default.LockClock }, { ComposeHitTimer() }),
-  Symptoms(R.string.symptoms, { Default.MedicalServices }, { Symptoms() }),
+  Symptoms(R.string.symptoms, { Default.MedicalServices }, { SymptomsPage() }),
   Stats(R.string.stats, { Default.GraphicEq }, { StatisticsPage(koinInject(), koinInject()) })
 }
 

diff --git a/app/src/main/kotlin/br/com/colman/petals/withdrawal/SymptomsPage.kt b/app/src/main/kotlin/br/com/colman/petals/withdrawal/SymptomsPage.kt
@@ -32,22 +32,32 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import br.com.colman.petals.R.string.symptoms_introduction
 import br.com.colman.petals.use.repository.UseRepository
 import br.com.colman.petals.withdrawal.data.ChartConfig
 import br.com.colman.petals.withdrawal.view.WithdrawalChart
+import java.time.LocalDateTime
 import org.koin.compose.koinInject
 
 @Composable
-@Preview
-fun Symptoms(
-  useRepository: UseRepository = koinInject()
-) {
-  val scrollState = rememberScrollState()
+fun SymptomsPage(useRepository: UseRepository = koinInject()) {
   val lastUseDate by useRepository.getLastUseDate().collectAsState(null)
 
-  Column(Modifier.verticalScroll(scrollState).padding(8.dp, 8.dp, 8.dp, 64.dp), spacedBy(16.dp)) {
+  Symptoms(lastUseDate)
+}
+
+@Composable
+@Preview
+private fun SymptomsPreview() {
+  Symptoms(LocalDateTime.now().minusDays(10))
+}
+
+@Composable
+private fun Symptoms(lastUseDate: LocalDateTime?) {
+  val verticalScroll = rememberScrollState()
+  Column(Modifier.verticalScroll(verticalScroll).padding(8.dp, 8.dp, 8.dp, 64.dp), spacedBy(16.dp)) {
     Text(stringResource(symptoms_introduction))
 
     ChartConfig.entries().forEach { chart ->
@@ -65,3 +75,4 @@ fun Symptoms(
     }
   }
 }
+