WTA #71: Fixed import and detekt issues.

Jacob3075 · May 13, 2023 · 264e583 · 264e583
1 parent c9ee155
commit 264e583
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/app/src/main/java/com/jacob/wakatimeapp/navigation/ApplicationNavigator.kt b/app/src/main/java/com/jacob/wakatimeapp/navigation/ApplicationNavigator.kt
@@ -1,12 +1,12 @@
 package com.jacob.wakatimeapp.navigation
 
 import com.jacob.wakatimeapp.details.ui.DetailsPageNavigator
+import com.jacob.wakatimeapp.details.ui.destinations.DetailsPageDestination
 import com.jacob.wakatimeapp.home.ui.HomePageNavigator
+import com.jacob.wakatimeapp.home.ui.destinations.HomePageDestination
 import com.jacob.wakatimeapp.login.ui.LoginPageNavigator
-import com.jacob.wakatimeapp.navigation.destinations.DetailsPageDestination
-import com.jacob.wakatimeapp.navigation.destinations.HomePageDestination
-import com.jacob.wakatimeapp.navigation.destinations.SearchProjectsDestination
 import com.jacob.wakatimeapp.search.ui.SearchProjectsNavigator
+import com.jacob.wakatimeapp.search.ui.destinations.SearchProjectsDestination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 
 class ApplicationNavigator(private val navigator: DestinationsNavigator) :

diff --git a/details/src/main/java/com/jacob/wakatimeapp/details/ui/DetailsPageViewModel.kt b/details/src/main/java/com/jacob/wakatimeapp/details/ui/DetailsPageViewModel.kt
@@ -1,5 +1,6 @@
 package com.jacob.wakatimeapp.details.ui
 
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.jacob.wakatimeapp.details.domain.usecases.GetProjectStatsUC
@@ -12,14 +13,17 @@ import timber.log.Timber
 
 @HiltViewModel
 internal class DetailsPageViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
     private val getProjectStatsUC: GetProjectStatsUC,
 ) : ViewModel() {
+    private val args = savedStateHandle.navArgs<DetailsPageNavArgs>()
+
     private val _viewState = MutableStateFlow<DetailsPageViewState>(DetailsPageViewState.Loading)
     val viewState = _viewState.asStateFlow()
 
     init {
         viewModelScope.launch {
-            val data = getProjectStatsUC("WakaTimeApp.Compose")
+            val data = getProjectStatsUC(args.projectName)
             Timber.w(data.toString())
         }
     }

diff --git a/search/src/main/java/com/jacob/wakatimeapp/search/ui/SearchProjects.kt b/search/src/main/java/com/jacob/wakatimeapp/search/ui/SearchProjects.kt
@@ -45,9 +45,9 @@ private fun SearchProjectsScreen(
     when (val stateInstance = state) {
         is Loaded -> SearchProjectsLoaded(
             state = stateInstance,
-            modifier = modifier,
             updateSearchQuery = viewModel::updateSearchQuery,
             onProjectItemClicked = { navigator.toProjectDetailsPage(it.name) },
+            modifier = modifier,
         )
 
         Loading -> WtaAnimation(
@@ -65,15 +65,14 @@ private fun SearchProjectsScreen(
 @Composable
 private fun SearchProjectsLoaded(
     state: Loaded,
-    modifier: Modifier = Modifier,
     updateSearchQuery: (TextFieldValue) -> Unit,
     onProjectItemClicked: (ProjectDetails) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     Column(
-        modifier = modifier.statusBarsPadding()
-            .padding(
-                horizontal = MaterialTheme.spacing.medium,
-            ),
+        modifier = modifier
+            .statusBarsPadding()
+            .padding(horizontal = MaterialTheme.spacing.medium),
     ) {
         Spacer(modifier = Modifier.height(MaterialTheme.spacing.medium))
         SearchBar(

diff --git a/tools/detekt-config.yml b/tools/detekt-config.yml
@@ -228,6 +228,7 @@ empty-blocks:
     active: true
 
 exceptions:
+  excludes: [ '**/build/**' ]
   active: true
   ExceptionRaisedInUnexpectedLocation:
     active: true