From 12d81872226c29bf06f32dd80d57cdcb50167203 Mon Sep 17 00:00:00 2001
From: Jacob Bosco <jacob.bosco3075@gmail.com>
Date: Sun, 11 Sep 2022 12:14:43 +0530
Subject: [PATCH 1/3] WTA #2: Moved LoginPage navigation inside LaunchedEffect.

---
 .idea/inspectionProfiles/Project_Default.xml        | 12 ++++++++++++
 .../com/jacob/wakatimeapp/login/ui/LoginPage.kt     | 13 ++++++++++---
 .../wakatimeapp/login/ui/LoginPageNavigator.kt      |  5 -----
 3 files changed, 22 insertions(+), 8 deletions(-)
 delete mode 100644 login/src/main/java/com/jacob/wakatimeapp/login/ui/LoginPageNavigator.kt

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index d235beba..ed76bea3 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -9,6 +9,10 @@
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
@@ -21,5 +25,13 @@
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
   </profile>
 </component>
\ No newline at end of file
diff --git a/login/src/main/java/com/jacob/wakatimeapp/login/ui/LoginPage.kt b/login/src/main/java/com/jacob/wakatimeapp/login/ui/LoginPage.kt
index 08065074..ec51997e 100644
--- a/login/src/main/java/com/jacob/wakatimeapp/login/ui/LoginPage.kt
+++ b/login/src/main/java/com/jacob/wakatimeapp/login/ui/LoginPage.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
@@ -25,6 +26,10 @@ import com.jacob.wakatimeapp.core.ui.theme.WakaTimeAppTheme
 import net.openid.appauth.AuthorizationException
 import timber.log.Timber
 
+interface LoginPageNavigator {
+    fun toHomePage()
+}
+
 @Composable
 fun LoginPageContent(
     viewModel: LoginPageViewModel = hiltViewModel(),
@@ -32,9 +37,11 @@ fun LoginPageContent(
 ) = Surface(
     modifier = Modifier.fillMaxSize(),
 ) {
-    if (viewModel.authStatus) {
-        viewModel.updateUserDetails()
-        loginPageNavigator.toHomePage()
+    LaunchedEffect(Unit) {
+        if (viewModel.authStatus) {
+            viewModel.updateUserDetails()
+            loginPageNavigator.toHomePage()
+        }
     }
 
     val launcher =
diff --git a/login/src/main/java/com/jacob/wakatimeapp/login/ui/LoginPageNavigator.kt b/login/src/main/java/com/jacob/wakatimeapp/login/ui/LoginPageNavigator.kt
deleted file mode 100644
index f900d4a2..00000000
--- a/login/src/main/java/com/jacob/wakatimeapp/login/ui/LoginPageNavigator.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.jacob.wakatimeapp.login.ui
-
-interface LoginPageNavigator {
-    fun toHomePage()
-}

From 7d60f74fb00fcd8b8f41ea20a94226ec8e1bd2ef Mon Sep 17 00:00:00 2001
From: Jacob Bosco <jacob.bosco3075@gmail.com>
Date: Sun, 11 Sep 2022 14:39:31 +0530
Subject: [PATCH 2/3] WTA #2: Fixed HomePage error flow collection inside
 LaunchedEffect.

---
 .../com/jacob/wakatimeapp/home/ui/HomePage.kt | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePage.kt b/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePage.kt
index 5baafb0b..5027ef92 100644
--- a/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePage.kt
+++ b/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePage.kt
@@ -6,21 +6,16 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Scaffold
 import androidx.compose.material.SnackbarDuration.Long
 import androidx.compose.material.rememberScaffoldState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.jacob.wakatimeapp.core.common.observeInLifecycle
 import com.jacob.wakatimeapp.core.ui.R.drawable
 import com.jacob.wakatimeapp.core.ui.TimeSpentCard
 import com.jacob.wakatimeapp.core.ui.TimeSpentCardParameters
 import com.jacob.wakatimeapp.core.ui.theme.Gradients
 import com.jacob.wakatimeapp.home.ui.components.*
-import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
@@ -34,17 +29,18 @@ fun HomePageContent(
     val snackBarCoroutineScope = rememberCoroutineScope()
     val viewState by viewModel.homePageState.collectAsState()
 
-    viewModel.errors
-        .onEach {
-            snackBarCoroutineScope.launch {
-                scaffoldState.snackbarHostState.showSnackbar(
-                    message = it.errorMessage,
-                    actionLabel = "Action",
-                    duration = Long
-                )
+    LaunchedEffect(Unit) {
+        viewModel.errors
+            .collectLatest {
+                snackBarCoroutineScope.launch {
+                    scaffoldState.snackbarHostState.showSnackbar(
+                        message = it.errorMessage,
+                        actionLabel = "Action",
+                        duration = Long
+                    )
+                }
             }
-        }
-        .observeInLifecycle(LocalLifecycleOwner.current)
+    }
 
     Scaffold(
         scaffoldState = scaffoldState,

From 32fa04d1cde69f1affcdfcfb77dedbe23d297967 Mon Sep 17 00:00:00 2001
From: Jacob Bosco <jacob.bosco3075@gmail.com>
Date: Sun, 11 Sep 2022 14:40:46 +0530
Subject: [PATCH 3/3] WTA #2: Removed parameter wrapper objects for different
 composables.

---
 .../wakatimeapp/navigation/AppDestinations.kt |   2 +-
 .../core/ui/ComponentParameters.kt            |  35 -----
 .../jacob/wakatimeapp/core/ui/StatsCards.kt   |  98 ++++++++------
 .../com/jacob/wakatimeapp/home/ui/HomePage.kt |  48 +++----
 .../wakatimeapp/home/ui/HomePageNavigator.kt  |   5 -
 .../wakatimeapp/home/ui/HomePageViewModel.kt  |  12 +-
 .../home/ui/components/ComponentParameters.kt |  55 --------
 .../HomePageLoadingAndErrorStates.kt          | 127 +++++++++---------
 .../home/ui/components/HomePageStats.kt       |  51 ++++---
 .../ui/components/RecentProjectsSection.kt    |  30 ++---
 .../home/ui/components/UserDetailsSection.kt  |  40 +++---
 .../home/ui/components/WeeklyReport.kt        |   8 +-
 12 files changed, 212 insertions(+), 299 deletions(-)
 delete mode 100644 core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/ComponentParameters.kt
 delete mode 100644 home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePageNavigator.kt
 delete mode 100644 home/src/main/java/com/jacob/wakatimeapp/home/ui/components/ComponentParameters.kt

diff --git a/app/src/main/java/com/jacob/wakatimeapp/navigation/AppDestinations.kt b/app/src/main/java/com/jacob/wakatimeapp/navigation/AppDestinations.kt
index 9026a0e5..2eb811ab 100644
--- a/app/src/main/java/com/jacob/wakatimeapp/navigation/AppDestinations.kt
+++ b/app/src/main/java/com/jacob/wakatimeapp/navigation/AppDestinations.kt
@@ -17,4 +17,4 @@ fun LoginPage(loginPageNavigator: LoginPageNavigator) =
 @Composable
 @Destination
 fun HomePage(homePageNavigator: HomePageNavigator) =
-    HomePageContent(homePageNavigator = homePageNavigator)
+    HomePageContent(navigator = homePageNavigator)
diff --git a/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/ComponentParameters.kt b/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/ComponentParameters.kt
deleted file mode 100644
index b6957e5a..00000000
--- a/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/ComponentParameters.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.jacob.wakatimeapp.core.ui
-
-import androidx.annotation.DrawableRes
-import com.jacob.wakatimeapp.core.models.Time
-import com.jacob.wakatimeapp.core.ui.theme.Gradient
-
-data class TimeSpentCardParameters(
-    val gradient: Gradient,
-    val roundedCornerPercent: Int,
-    @DrawableRes val iconId: Int,
-    val mainText: String,
-    val time: Time,
-    val onClick: () -> Unit,
-)
-
-data class OtherStatsCardParameters(
-    val gradient: Gradient,
-    val roundedCornerPercent: Int,
-    @DrawableRes val iconId: Int,
-    val mainText: String,
-    val language: String,
-    val onClick: () -> Unit,
-)
-
-data class StatsCardParameters(
-    val gradient: Gradient,
-    val roundedCornerPercent: Int = 25,
-    @DrawableRes val iconId: Int,
-    val mainText: String,
-    val text: String,
-    val weights: Pair<Float, Float> = Pair(1f, 1f),
-    val iconOffset: Int = 50,
-    val iconSize: Int = 80,
-    val onClick: () -> Unit,
-)
diff --git a/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/StatsCards.kt b/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/StatsCards.kt
index eb05b49e..e9e52695 100644
--- a/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/StatsCards.kt
+++ b/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/StatsCards.kt
@@ -1,6 +1,7 @@
 package com.jacob.wakatimeapp.core.ui
 
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import androidx.annotation.DrawableRes
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -22,41 +23,50 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.jacob.wakatimeapp.core.models.Time
+import com.jacob.wakatimeapp.core.ui.theme.Gradient
 import com.jacob.wakatimeapp.core.ui.theme.Gradients
 import com.jacob.wakatimeapp.core.ui.theme.WakaTimeAppTheme
 
 @Composable
-fun StatsCard(
-    parameters: StatsCardParameters,
+private fun StatsCard(
+    gradient: Gradient,
+    roundedCornerPercent: Int = 25,
+    @DrawableRes iconId: Int,
+    mainText: String,
+    text: String,
+    weights: Pair<Float, Float> = Pair(1f, 1f),
+    iconOffset: Int = 50,
+    iconSize: Int = 80,
+    onClick: () -> Unit,
 ) {
     val cardGradient =
-        Brush.horizontalGradient(listOf(parameters.gradient.startColor,
-            parameters.gradient.endColor))
-    val cardShape = RoundedCornerShape(parameters.roundedCornerPercent)
+        Brush.horizontalGradient(listOf(gradient.startColor,
+            gradient.endColor))
+    val cardShape = RoundedCornerShape(roundedCornerPercent)
     Box(
         contentAlignment = Alignment.Center,
         modifier = Modifier
             .shadow(elevation = 10.dp, shape = cardShape)
-            .clickable { parameters.onClick() }
+            .clickable { onClick() }
             .fillMaxWidth()
             .background(cardGradient, cardShape)
             .padding(horizontal = 22.dp)
     ) {
         Image(
-            painter = painterResource(id = parameters.iconId),
+            painter = painterResource(id = iconId),
             contentDescription = "",
             contentScale = ContentScale.FillBounds,
             modifier = Modifier
-                .padding(start = parameters.iconOffset.dp)
-                .size(parameters.iconSize.dp)
+                .padding(start = iconOffset.dp)
+                .size(iconSize.dp)
         )
         Row(
             verticalAlignment = Alignment.CenterVertically
         ) {
             Text(
-                text = parameters.mainText,
+                text = mainText,
                 maxLines = 2,
-                modifier = Modifier.weight(parameters.weights.first, true),
+                modifier = Modifier.weight(weights.first, true),
                 style = TextStyle(
                     fontSize = 18.sp,
                     color = Color.White,
@@ -64,8 +74,8 @@ fun StatsCard(
                 ),
             )
             Text(
-                text = parameters.text,
-                modifier = Modifier.weight(parameters.weights.second, true),
+                text = text,
+                modifier = Modifier.weight(weights.second, true),
                 textAlign = TextAlign.End,
                 style = TextStyle(
                     color = Color.White,
@@ -79,16 +89,19 @@ fun StatsCard(
 
 @Composable
 fun TimeSpentCard(
-    parameters: TimeSpentCardParameters,
+    gradient: Gradient,
+    roundedCornerPercent: Int,
+    @DrawableRes iconId: Int,
+    mainText: String,
+    time: Time,
+    onClick: () -> Unit,
 ) = StatsCard(
-    parameters = StatsCardParameters(
-        gradient = parameters.gradient,
-        roundedCornerPercent = parameters.roundedCornerPercent,
-        iconId = parameters.iconId,
-        mainText = parameters.mainText,
-        text = "${parameters.time.hours}H, ${parameters.time.minutes}M",
-        onClick = parameters.onClick
-    ),
+    gradient = gradient,
+    roundedCornerPercent = roundedCornerPercent,
+    iconId = iconId,
+    mainText = mainText,
+    text = "${time.hours}H, ${time.minutes}M",
+    onClick = onClick,
 )
 
 @Composable
@@ -97,32 +110,33 @@ fun TimeSpentChip() {
 
 @Composable
 fun OtherStatsCard(
-    parameters: OtherStatsCardParameters,
+    gradient: Gradient,
+    roundedCornerPercent: Int,
+    @DrawableRes iconId: Int,
+    mainText: String,
+    language: String,
+    onClick: () -> Unit,
 ) = StatsCard(
-    parameters = StatsCardParameters(
-        gradient = parameters.gradient,
-        roundedCornerPercent = parameters.roundedCornerPercent,
-        iconId = parameters.iconId,
-        mainText = parameters.mainText,
-        text = parameters.language,
-        weights = Pair(1f, 0.5f),
-        iconOffset = 90,
-        iconSize = 70,
-        onClick = parameters.onClick
-    ),
+    gradient = gradient,
+    roundedCornerPercent = roundedCornerPercent,
+    iconId = iconId,
+    mainText = mainText,
+    text = language,
+    weights = Pair(1f, 0.5f),
+    iconOffset = 90,
+    iconSize = 70,
+    onClick = onClick,
 )
 
 @Preview(showBackground = true, uiMode = UI_MODE_NIGHT_YES)
 @Composable
 fun TimeSpentCardPreview() = WakaTimeAppTheme(darkTheme = true) {
     TimeSpentCard(
-        parameters = TimeSpentCardParameters(
-            Gradients.primary,
-            25,
-            R.drawable.ic_time,
-            "Total Time Spent Today",
-            Time(42, 22, 0f),
-            onClick = {}
-        )
+        gradient = Gradients.primary,
+        roundedCornerPercent = 25,
+        iconId = R.drawable.ic_time,
+        mainText = "Total Time Spent Today",
+        time = Time(42, 22, 0f),
+        onClick = {}
     )
 }
diff --git a/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePage.kt b/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePage.kt
index 5027ef92..8a5674dc 100644
--- a/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePage.kt
+++ b/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePage.kt
@@ -12,19 +12,20 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.jacob.wakatimeapp.core.ui.R.drawable
 import com.jacob.wakatimeapp.core.ui.TimeSpentCard
-import com.jacob.wakatimeapp.core.ui.TimeSpentCardParameters
 import com.jacob.wakatimeapp.core.ui.theme.Gradients
 import com.jacob.wakatimeapp.home.ui.components.*
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import timber.log.Timber
+
+interface HomePageNavigator {
+    fun toDetailsPage()
+}
 
 @Composable
 fun HomePageContent(
     viewModel: HomePageViewModel = hiltViewModel(),
-    homePageNavigator: HomePageNavigator,
+    navigator: HomePageNavigator,
 ) {
-    Timber.e("Loaded")
     val scaffoldState = rememberScaffoldState()
     val snackBarCoroutineScope = rememberCoroutineScope()
     val viewState by viewModel.homePageState.collectAsState()
@@ -49,22 +50,19 @@ fun HomePageContent(
         when (viewState) {
             is HomePageViewState.Loading -> HomePageLoading()
             is HomePageViewState.Loaded -> HomePageLoaded(
-                HomePageLoadedParameters(
-                    homePageViewState = viewState as HomePageViewState.Loaded,
-                    navigator = homePageNavigator
-                ),
-                homePageNavigator = homePageNavigator,
+                homePageViewState = viewState as HomePageViewState.Loaded,
+                navigator = navigator,
             )
 
-            is HomePageViewState.Error -> HomePageError(HomePageErrorParameters(viewState as HomePageViewState.Error))
+            is HomePageViewState.Error -> HomePageError(viewState as HomePageViewState.Error)
         }
     }
 }
 
 @Composable
 private fun HomePageLoaded(
-    parameters: HomePageLoadedParameters,
-    homePageNavigator: HomePageNavigator,
+    homePageViewState: HomePageViewState.Loaded,
+    navigator: HomePageNavigator,
 ) {
     val scrollState = rememberScrollState()
     Column(
@@ -73,31 +71,29 @@ private fun HomePageLoaded(
             .padding(top = 30.dp)
             .verticalScroll(scrollState)
     ) {
-        UserDetailsSection(UserDetailsSectionParameters(parameters.homePageViewState.userDetails))
+        UserDetailsSection(homePageViewState.userDetails)
         Spacer(modifier = Modifier.height(25.dp))
 
         TimeSpentCard(
-            parameters = TimeSpentCardParameters(
-                gradient = Gradients.primary,
-                roundedCornerPercent = 25,
-                iconId = drawable.ic_time,
-                mainText = "Total Time Spent Today",
-                time = parameters.homePageViewState.contentData.todaysStats.timeSpent,
-                onClick = homePageNavigator::toDetailsPage
-            )
+            gradient = Gradients.primary,
+            roundedCornerPercent = 25,
+            iconId = drawable.ic_time,
+            mainText = "Total Time Spent Today",
+            time = homePageViewState.contentData.todaysStats.timeSpent,
+            onClick = navigator::toDetailsPage,
         )
         Spacer(modifier = Modifier.height(25.dp))
 
-        RecentProjects(RecentProjectsParameters(parameters.homePageViewState.contentData.todaysStats))
+        RecentProjects(homePageViewState.contentData.todaysStats)
         Spacer(modifier = Modifier.height(10.dp))
 
-        WeeklyReport(WeeklyReportParameters(parameters.homePageViewState.contentData.dailyStats))
+        WeeklyReport(homePageViewState.contentData.dailyStats)
         Spacer(modifier = Modifier.height(25.dp))
 
-        OtherDailyStatsSection(OtherDailyStatsSectionParameters(
-            parameters.homePageViewState.contentData.todaysStats,
+        OtherDailyStatsSection(
+            homePageViewState.contentData.todaysStats,
             onClick = {}
-        ))
+        )
         Spacer(modifier = Modifier.height(25.dp))
     }
 }
diff --git a/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePageNavigator.kt b/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePageNavigator.kt
deleted file mode 100644
index eccca42b..00000000
--- a/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePageNavigator.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.jacob.wakatimeapp.home.ui
-
-interface HomePageNavigator {
-    fun toDetailsPage()
-}
diff --git a/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePageViewModel.kt b/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePageViewModel.kt
index 5c4b3702..0542cafb 100644
--- a/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePageViewModel.kt
+++ b/home/src/main/java/com/jacob/wakatimeapp/home/ui/HomePageViewModel.kt
@@ -5,6 +5,8 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import com.jacob.wakatimeapp.core.common.auth.AuthDataStore
 import com.jacob.wakatimeapp.core.common.auth.AuthTokenProvider
+import com.jacob.wakatimeapp.core.models.ErrorTypes
+import com.jacob.wakatimeapp.core.models.Result
 import com.jacob.wakatimeapp.home.usecases.GetLast7DaysStatsUC
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.*
@@ -35,24 +37,24 @@ class HomePageViewModel @Inject constructor(
             val userDetails = authDataStore.getUserDetails().filterNotNull().first()
 
             when (result) {
-                is com.jacob.wakatimeapp.core.models.Result.Success -> {
+                is Result.Success -> {
                     _homePageState.value = HomePageViewState.Loaded(
                         result.value,
                         userDetails,
                     )
                 }
-                is com.jacob.wakatimeapp.core.models.Result.Failure -> {
+                is Result.Failure -> {
                     val error = getErrorMessage(result)
                     _homePageState.value = error
                     _errors.emit(error)
                 }
-                is com.jacob.wakatimeapp.core.models.Result.Empty -> Timber.e("EMPTY")
+                is Result.Empty -> Timber.e("EMPTY")
             }
         }
     }
 
-    private fun getErrorMessage(last7DaysStatsResult: com.jacob.wakatimeapp.core.models.Result.Failure): HomePageViewState.Error =
+    private fun getErrorMessage(last7DaysStatsResult: Result.Failure): HomePageViewState.Error =
         when (val errorType = last7DaysStatsResult.errorHolder) {
-            is com.jacob.wakatimeapp.core.models.ErrorTypes.NetworkError -> HomePageViewState.Error(errorType.throwable.message ?: "")
+            is ErrorTypes.NetworkError -> HomePageViewState.Error(errorType.throwable.message ?: "")
         }
 }
diff --git a/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/ComponentParameters.kt b/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/ComponentParameters.kt
deleted file mode 100644
index 605b3c54..00000000
--- a/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/ComponentParameters.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.jacob.wakatimeapp.home.ui.components
-
-import androidx.navigation.NavController
-import com.jacob.wakatimeapp.core.models.DailyStats
-import com.jacob.wakatimeapp.core.models.UserDetails
-import com.jacob.wakatimeapp.home.ui.HomePageNavigator
-import com.jacob.wakatimeapp.home.ui.HomePageViewModel
-import com.jacob.wakatimeapp.home.ui.HomePageViewState
-import com.jacob.wakatimeapp.home.ui.HomePageViewState.Loaded
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-
-data class HomePageParameters @ExperimentalCoroutinesApi constructor(
-    val viewModel: HomePageViewModel,
-    val navController: NavController,
-)
-
-data class HomePageErrorParameters(
-    val errorMessage: HomePageViewState.Error,
-)
-
-data class HomePageLoadedParameters(
-    val homePageViewState: Loaded,
-    val navigator: HomePageNavigator,
-)
-
-data class ShowIllustrationParameters(
-    val illustrations: List<Int>,
-    val text: String,
-    val illustrationTestTag: String,
-    val textTestTag: String,
-)
-
-data class ShowAnimationParameters(
-    val animations: List<Int>,
-    val text: String,
-    val animationTestTag: String,
-    val textTestTag: String,
-)
-
-data class UserDetailsSectionParameters(
-    val userDetails: UserDetails?,
-)
-
-data class OtherDailyStatsSectionParameters(
-    val dailyStats: DailyStats?,
-    val onClick: () -> Unit,
-)
-
-data class RecentProjectsParameters(
-    val dailyStats: DailyStats?,
-)
-
-data class WeeklyReportParameters(
-    val dailyStats: List<DailyStats>?,
-)
diff --git a/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/HomePageLoadingAndErrorStates.kt b/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/HomePageLoadingAndErrorStates.kt
index 34374ae0..7fcb01c0 100644
--- a/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/HomePageLoadingAndErrorStates.kt
+++ b/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/HomePageLoadingAndErrorStates.kt
@@ -26,57 +26,55 @@ import com.jacob.wakatimeapp.home.ui.HomePageTestTags.ERROR_ANIMATION_ILLUSTRATI
 import com.jacob.wakatimeapp.home.ui.HomePageTestTags.ERROR_TEXT
 import com.jacob.wakatimeapp.home.ui.HomePageTestTags.LOADING_ANIMATION_ILLUSTRATION
 import com.jacob.wakatimeapp.home.ui.HomePageTestTags.LOADING_TEXT
+import com.jacob.wakatimeapp.home.ui.HomePageViewState
 import kotlin.random.Random
 
 @Composable
 fun HomePageLoading() =
     if (Random.nextBoolean()) ShowAnimation(
-        parameters = ShowAnimationParameters(
-            animations = listOf(
-                R.raw.loading_1,
-                R.raw.loading_2,
-                R.raw.loading_animation,
-                R.raw.loading_bloob,
-                R.raw.loading_paperplane_1,
-                R.raw.loading_paperplane_2,
-            ),
-            text = "Loading..",
-            animationTestTag = LOADING_ANIMATION_ILLUSTRATION,
-            textTestTag = LOADING_TEXT
+        animations = listOf(
+            R.raw.loading_1,
+            R.raw.loading_2,
+            R.raw.loading_animation,
+            R.raw.loading_bloob,
+            R.raw.loading_paperplane_1,
+            R.raw.loading_paperplane_2,
         ),
+        text = "Loading..",
+        animationTestTag = LOADING_ANIMATION_ILLUSTRATION,
+        textTestTag = LOADING_TEXT,
     ) else ShowIllustration(
-        showIllustrationParameters = ShowIllustrationParameters(
-            illustrations = listOf(
-                R.drawable.il_loading_1,
-                R.drawable.il_loading_2,
-                R.drawable.il_loading_3,
-                R.drawable.il_loading_3a,
-            ),
-            text = "Loading..",
-            illustrationTestTag = LOADING_ANIMATION_ILLUSTRATION,
-            textTestTag = LOADING_TEXT
+        illustrations = listOf(
+            R.drawable.il_loading_1,
+            R.drawable.il_loading_2,
+            R.drawable.il_loading_3,
+            R.drawable.il_loading_3a,
         ),
+        text = "Loading..",
+        illustrationTestTag = LOADING_ANIMATION_ILLUSTRATION,
+        textTestTag = LOADING_TEXT
     )
 
 @Composable
-fun HomePageError(parameters: HomePageErrorParameters) {
+fun HomePageError(errorMessage: HomePageViewState.Error) {
     ShowAnimation(
-        parameters = ShowAnimationParameters(
-            animations = listOf(
-                R.raw.error_1,
-                R.raw.error_2,
-                R.raw.error_animation,
-            ),
-            text = parameters.errorMessage.errorMessage,
-            animationTestTag = ERROR_ANIMATION_ILLUSTRATION,
-            textTestTag = ERROR_TEXT
+        animations = listOf(
+            R.raw.error_1,
+            R.raw.error_2,
+            R.raw.error_animation,
         ),
+        text = errorMessage.errorMessage,
+        animationTestTag = ERROR_ANIMATION_ILLUSTRATION,
+        textTestTag = ERROR_TEXT,
     )
 }
 
 @Composable
 private fun ShowIllustration(
-    showIllustrationParameters: ShowIllustrationParameters,
+    illustrations: List<Int>,
+    text: String,
+    illustrationTestTag: String,
+    textTestTag: String,
 ) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
@@ -84,26 +82,29 @@ private fun ShowIllustration(
         modifier = Modifier.fillMaxSize()
     ) {
         Image(
-            painter = painterResource(id = showIllustrationParameters.illustrations.random()),
+            painter = painterResource(id = illustrations.random()),
             contentDescription = "",
             contentScale = ContentScale.Fit,
-            modifier = Modifier.testTag(showIllustrationParameters.illustrationTestTag)
+            modifier = Modifier.testTag(illustrationTestTag)
         )
         Spacer(modifier = Modifier.height(25.dp))
         Text(
-            text = showIllustrationParameters.text,
+            text = text,
             fontWeight = FontWeight.SemiBold,
             fontSize = 18.sp,
-            modifier = Modifier.testTag(showIllustrationParameters.textTestTag)
+            modifier = Modifier.testTag(textTestTag)
         )
     }
 }
 
 @Composable
 fun ShowAnimation(
-    parameters: ShowAnimationParameters,
+    animations: List<Int>,
+    text: String,
+    animationTestTag: String,
+    textTestTag: String,
 ) {
-    val composition by rememberLottieComposition(RawRes(parameters.animations.random()))
+    val composition by rememberLottieComposition(RawRes(animations.random()))
 
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
@@ -113,14 +114,14 @@ fun ShowAnimation(
         LottieAnimation(
             composition = composition,
             iterations = LottieConstants.IterateForever,
-            modifier = Modifier.testTag(parameters.animationTestTag)
+            modifier = Modifier.testTag(animationTestTag)
         )
         Spacer(modifier = Modifier.height(25.dp))
         Text(
-            text = parameters.text,
+            text = text,
             fontWeight = FontWeight.SemiBold,
             fontSize = 18.sp,
-            modifier = Modifier.testTag(parameters.textTestTag)
+            modifier = Modifier.testTag(textTestTag)
         )
     }
 }
@@ -130,17 +131,15 @@ fun ShowAnimation(
 fun IllustrationPreview() = WakaTimeAppTheme {
     Surface {
         ShowIllustration(
-            showIllustrationParameters = ShowIllustrationParameters(
-                illustrations = listOf(
-                    R.drawable.il_loading_1,
-                    R.drawable.il_loading_2,
-                    R.drawable.il_loading_3,
-                    R.drawable.il_loading_3a,
-                ),
-                text = "Loading...",
-                illustrationTestTag = "",
-                textTestTag = ""
+            illustrations = listOf(
+                R.drawable.il_loading_1,
+                R.drawable.il_loading_2,
+                R.drawable.il_loading_3,
+                R.drawable.il_loading_3a,
             ),
+            text = "Loading...",
+            illustrationTestTag = "",
+            textTestTag = "",
         )
     }
 }
@@ -149,18 +148,16 @@ fun IllustrationPreview() = WakaTimeAppTheme {
 @Composable
 fun AnimationPreview() = WakaTimeAppTheme {
     ShowAnimation(
-        parameters = ShowAnimationParameters(
-            animations = listOf(
-                R.raw.loading_1,
-                R.raw.loading_2,
-                R.raw.loading_animation,
-                R.raw.loading_bloob,
-                R.raw.loading_paperplane_1,
-                R.raw.loading_paperplane_2,
-            ),
-            text = "Loading...",
-            animationTestTag = "",
-            textTestTag = ""
-        )
+        animations = listOf(
+            R.raw.loading_1,
+            R.raw.loading_2,
+            R.raw.loading_animation,
+            R.raw.loading_bloob,
+            R.raw.loading_paperplane_1,
+            R.raw.loading_paperplane_2,
+        ),
+        text = "Loading...",
+        animationTestTag = "",
+        textTestTag = ""
     )
 }
diff --git a/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/HomePageStats.kt b/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/HomePageStats.kt
index 51b7e783..38a2d007 100644
--- a/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/HomePageStats.kt
+++ b/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/HomePageStats.kt
@@ -8,14 +8,17 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.jacob.wakatimeapp.core.ui.R.drawable
+import com.jacob.wakatimeapp.core.models.DailyStats
 import com.jacob.wakatimeapp.core.ui.OtherStatsCard
-import com.jacob.wakatimeapp.core.ui.OtherStatsCardParameters
+import com.jacob.wakatimeapp.core.ui.R.drawable
 import com.jacob.wakatimeapp.core.ui.theme.Colors
 import com.jacob.wakatimeapp.core.ui.theme.Gradients
 
 @Composable
-fun OtherDailyStatsSection(parameters: OtherDailyStatsSectionParameters) {
+fun OtherDailyStatsSection(
+    dailyStats: DailyStats?,
+    onClick: () -> Unit,
+) {
     Column(
         modifier = Modifier.fillMaxWidth()
     ) {
@@ -29,36 +32,30 @@ fun OtherDailyStatsSection(parameters: OtherDailyStatsSectionParameters) {
         }
         Spacer(modifier = Modifier.height(15.dp))
         OtherStatsCard(
-            parameters = OtherStatsCardParameters(
-                gradient = Gradients.greenCyan,
-                roundedCornerPercent = 25,
-                iconId = drawable.ic_code_file,
-                mainText = "Most Language Used",
-                language = parameters.dailyStats?.mostUsedLanguage ?: "",
-                onClick = parameters.onClick
-            ),
+            gradient = Gradients.greenCyan,
+            roundedCornerPercent = 25,
+            iconId = drawable.ic_code_file,
+            mainText = "Most Language Used",
+            language = dailyStats?.mostUsedLanguage ?: "",
+            onClick = onClick,
         )
         Spacer(modifier = Modifier.height(15.dp))
         OtherStatsCard(
-            parameters = OtherStatsCardParameters(
-                gradient = Gradients.purpleCyanLight,
-                roundedCornerPercent = 25,
-                iconId = drawable.ic_laptop,
-                mainText = "Most OS Used",
-                language = parameters.dailyStats?.mostUsedOs ?: "",
-                onClick = parameters.onClick
-            ),
+            gradient = Gradients.purpleCyanLight,
+            roundedCornerPercent = 25,
+            iconId = drawable.ic_laptop,
+            mainText = "Most OS Used",
+            language = dailyStats?.mostUsedOs ?: "",
+            onClick = onClick,
         )
         Spacer(modifier = Modifier.height(15.dp))
         OtherStatsCard(
-            parameters = OtherStatsCardParameters(
-                gradient = Gradients.purpleCyanLight,
-                roundedCornerPercent = 25,
-                iconId = drawable.ic_laptop,
-                mainText = "Most OS Used",
-                language = parameters.dailyStats?.mostUsedOs ?: "",
-                onClick = parameters.onClick
-            ),
+            gradient = Gradients.purpleCyanLight,
+            roundedCornerPercent = 25,
+            iconId = drawable.ic_laptop,
+            mainText = "Most OS Used",
+            language = dailyStats?.mostUsedOs ?: "",
+            onClick = onClick,
         )
     }
 }
diff --git a/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/RecentProjectsSection.kt b/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/RecentProjectsSection.kt
index 8f6dfb3d..043bf926 100644
--- a/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/RecentProjectsSection.kt
+++ b/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/RecentProjectsSection.kt
@@ -26,7 +26,9 @@ import com.jacob.wakatimeapp.core.ui.theme.WakaTimeAppTheme
 import java.time.LocalDate
 
 @Composable
-fun RecentProjects(parameters: RecentProjectsParameters) {
+fun RecentProjects(
+    dailyStats: DailyStats?,
+) {
     Column(
         modifier = Modifier.fillMaxWidth()
     ) {
@@ -40,7 +42,7 @@ fun RecentProjects(parameters: RecentProjectsParameters) {
         }
         RecentProjectList(
             modifier = Modifier.padding(horizontal = 12.dp),
-            projects = parameters.dailyStats?.projectsWorkedOn ?: emptyList()
+            projects = dailyStats?.projectsWorkedOn ?: emptyList()
         )
     }
 }
@@ -94,19 +96,17 @@ private fun ProjectCardItem(project: Project) {
 fun RecentProjectPreview() = WakaTimeAppTheme(darkTheme = true) {
     Surface {
         RecentProjects(
-            parameters = RecentProjectsParameters(
-                DailyStats(
-                    timeSpent = Time(0, 0, 0f),
-                    projectsWorkedOn = listOf(
-                        Project(Time(10, 9, 0f), "Project 1", 75.0),
-                        Project(Time(100, 26, 0f), "Project 2", 20.0),
-                        Project(Time(5, 15, 0f), "Project 3", 10.0),
-                    ),
-                    mostUsedLanguage = "",
-                    mostUsedEditor = "",
-                    mostUsedOs = "",
-                    date = LocalDate.now()
-                )
+            DailyStats(
+                timeSpent = Time(0, 0, 0f),
+                projectsWorkedOn = listOf(
+                    Project(Time(10, 9, 0f), "Project 1", 75.0),
+                    Project(Time(100, 26, 0f), "Project 2", 20.0),
+                    Project(Time(5, 15, 0f), "Project 3", 10.0),
+                ),
+                mostUsedLanguage = "",
+                mostUsedEditor = "",
+                mostUsedOs = "",
+                date = LocalDate.now()
             ),
         )
     }
diff --git a/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/UserDetailsSection.kt b/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/UserDetailsSection.kt
index bb7292f1..111f1d84 100644
--- a/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/UserDetailsSection.kt
+++ b/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/UserDetailsSection.kt
@@ -15,13 +15,15 @@ import androidx.compose.ui.unit.dp
 import coil.compose.rememberAsyncImagePainter
 import coil.request.ImageRequest.Builder
 import coil.transform.CircleCropTransformation
-import com.jacob.wakatimeapp.core.ui.R
 import com.jacob.wakatimeapp.core.models.UserDetails
+import com.jacob.wakatimeapp.core.ui.R
 import com.jacob.wakatimeapp.core.ui.theme.Typography
 import com.jacob.wakatimeapp.core.ui.theme.WakaTimeAppTheme
 
 @Composable
-fun UserDetailsSection(parameters: UserDetailsSectionParameters) {
+fun UserDetailsSection(
+    userDetails: UserDetails?,
+) {
     Row(
         horizontalArrangement = Arrangement.Start,
         verticalAlignment = Alignment.CenterVertically,
@@ -29,7 +31,7 @@ fun UserDetailsSection(parameters: UserDetailsSectionParameters) {
     ) {
         Image(
             painter = rememberAsyncImagePainter(
-                Builder(LocalContext.current).data(data = parameters.userDetails?.photoUrl)
+                Builder(LocalContext.current).data(data = userDetails?.photoUrl)
                     .apply {
                         transformations(CircleCropTransformation())
                         placeholder(R.drawable.place_holder)
@@ -41,7 +43,7 @@ fun UserDetailsSection(parameters: UserDetailsSectionParameters) {
         )
         Spacer(modifier = Modifier.width(24.dp))
         Text(
-            text = parameters.userDetails?.fullName ?: "",
+            text = userDetails?.fullName ?: "",
             fontSize = Typography.h4.fontSize,
             fontWeight = FontWeight.SemiBold,
             maxLines = 1,
@@ -54,22 +56,20 @@ fun UserDetailsSection(parameters: UserDetailsSectionParameters) {
 @Composable
 fun UserDetailsPreview() = WakaTimeAppTheme {
     UserDetailsSection(
-        parameters = UserDetailsSectionParameters(
-            UserDetails(
-                bio = "",
-                email = "",
-                id = "",
-                timeout = 0,
-                timezone = "",
-                username = "",
-                displayName = "",
-                lastProject = "",
-                fullName = "Jacob Bosco",
-                durationsSliceBy = "",
-                createdAt = "",
-                dateFormat = "",
-                photoUrl = ""
-            )
+        UserDetails(
+            bio = "",
+            email = "",
+            id = "",
+            timeout = 0,
+            timezone = "",
+            username = "",
+            displayName = "",
+            lastProject = "",
+            fullName = "Jacob Bosco",
+            durationsSliceBy = "",
+            createdAt = "",
+            dateFormat = "",
+            photoUrl = ""
         ),
     )
 }
diff --git a/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/WeeklyReport.kt b/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/WeeklyReport.kt
index d38c6d26..73a8553f 100644
--- a/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/WeeklyReport.kt
+++ b/home/src/main/java/com/jacob/wakatimeapp/home/ui/components/WeeklyReport.kt
@@ -33,7 +33,9 @@ import java.util.*
 
 
 @Composable
-fun WeeklyReport(parameters: WeeklyReportParameters) {
+fun WeeklyReport(
+    dailyStats: List<DailyStats>?,
+) {
     Column(
         modifier = Modifier.fillMaxWidth()
     ) {
@@ -46,7 +48,7 @@ fun WeeklyReport(parameters: WeeklyReportParameters) {
             Text(text = "Details", color = Colors.AccentText, fontSize = 14.sp)
         }
         Spacer(modifier = Modifier.height(10.dp))
-        WeeklyReportChart(parameters.dailyStats ?: emptyList())
+        WeeklyReportChart(dailyStats ?: emptyList())
     }
 }
 
@@ -129,7 +131,7 @@ private fun WeeklyReportChart(dailyStats: List<DailyStats>) {
 @Composable
 fun WeeklyReportPreview() = WakaTimeAppTheme(darkTheme = true) {
     Surface {
-        WeeklyReport(WeeklyReportParameters(emptyList()))
+        WeeklyReport(emptyList())
     }
 }