Merge pull request #261 from rainxchzed/settings-to-profile

Author: rainxchzed

composeApp/build.gradle.kts

@@ -49,9 +49,9 @@ kotlin {
             implementation(projects.feature.search.data)
             implementation(projects.feature.search.presentation)
 
-            implementation(projects.feature.settings.domain)
-            implementation(projects.feature.settings.data)
-            implementation(projects.feature.settings.presentation)
+            implementation(projects.feature.profile.domain)
+            implementation(projects.feature.profile.data)
+            implementation(projects.feature.profile.presentation)
 
             implementation(projects.feature.starred.domain)
             implementation(projects.feature.starred.data)

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/di/ViewModelsModule.kt

@@ -8,8 +8,8 @@ import zed.rainxch.details.presentation.DetailsViewModel
 import zed.rainxch.devprofile.presentation.DeveloperProfileViewModel
 import zed.rainxch.favourites.presentation.FavouritesViewModel
 import zed.rainxch.home.presentation.HomeViewModel
+import zed.rainxch.profile.presentation.ProfileViewModel
 import zed.rainxch.search.presentation.SearchViewModel
-import zed.rainxch.settings.presentation.SettingsViewModel
 import zed.rainxch.starred.presentation.StarredReposViewModel
 
 val viewModelsModule = module {
@@ -20,6 +20,6 @@ val viewModelsModule = module {
     viewModelOf(::FavouritesViewModel)
     viewModelOf(::HomeViewModel)
     viewModelOf(::SearchViewModel)
-    viewModelOf(::SettingsViewModel)
+    viewModelOf(::ProfileViewModel)
     viewModelOf(::StarredReposViewModel)
 }

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/di/initKoin.kt

@@ -12,7 +12,7 @@ import zed.rainxch.details.data.di.detailsModule
 import zed.rainxch.devprofile.data.di.devProfileModule
 import zed.rainxch.home.data.di.homeModule
 import zed.rainxch.search.data.di.searchModule
-import zed.rainxch.settings.data.di.settingsModule
+import zed.rainxch.profile.data.di.settingsModule
 
 fun initKoin(config: KoinAppDeclaration? = null) {
     startKoin {

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/navigation/AppNavigation.kt

@@ -27,7 +27,7 @@ import zed.rainxch.devprofile.presentation.DeveloperProfileRoot
 import zed.rainxch.favourites.presentation.FavouritesRoot
 import zed.rainxch.home.presentation.HomeRoot
 import zed.rainxch.search.presentation.SearchRoot
-import zed.rainxch.settings.presentation.SettingsRoot
+import zed.rainxch.profile.presentation.ProfileRoot
 import zed.rainxch.starred.presentation.StarredReposRoot
 
 @Composable
@@ -53,7 +53,7 @@ fun AppNavigation(
                             navController.navigate(GithubStoreGraph.SearchScreen)
                         },
                         onNavigateToSettings = {
-                            navController.navigate(GithubStoreGraph.SettingsScreen)
+                            navController.navigate(GithubStoreGraph.ProfileScreen)
                         },
                         onNavigateToApps = {
                             navController.navigate(GithubStoreGraph.AppsScreen)
@@ -199,8 +199,8 @@ fun AppNavigation(
                     )
                 }
 
-                composable<GithubStoreGraph.SettingsScreen> {
-                    SettingsRoot(
+                composable<GithubStoreGraph.ProfileScreen> {
+                    ProfileRoot(
                         onNavigateBack = {
                             navController.navigateUp()
                         }

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/navigation/BottomNavigationUtils.kt

@@ -46,7 +46,7 @@ object BottomNavigationUtils {
             titleRes = Res.string.bottom_nav_profile_title,
             iconOutlined = Icons.Outlined.Person2,
             iconFilled = Icons.Filled.Person2,
-            screen = GithubStoreGraph.SettingsScreen
+            screen = GithubStoreGraph.ProfileScreen
         )
     )
 

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/navigation/GithubStoreGraph.kt

@@ -26,7 +26,7 @@ sealed interface GithubStoreGraph {
     ) : GithubStoreGraph
 
     @Serializable
-    data object SettingsScreen : GithubStoreGraph
+    data object ProfileScreen : GithubStoreGraph
 
     @Serializable
     data object FavouritesScreen : GithubStoreGraph

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/navigation/NavigationUtils.kt

@@ -13,7 +13,7 @@ fun NavBackStackEntry?.getCurrentScreen(): GithubStoreGraph? {
         route.contains("AuthenticationScreen") -> GithubStoreGraph.AuthenticationScreen
         route.contains("DetailsScreen") -> toRoute<GithubStoreGraph.DetailsScreen>()
         route.contains("DeveloperProfileScreen") -> toRoute<GithubStoreGraph.DeveloperProfileScreen>()
-        route.contains("SettingsScreen") -> GithubStoreGraph.SettingsScreen
+        route.contains("ProfileScreen") -> GithubStoreGraph.ProfileScreen
         route.contains("FavouritesScreen") -> GithubStoreGraph.FavouritesScreen
         route.contains("StarredReposScreen") -> GithubStoreGraph.StarredReposScreen
         route.contains("AppsScreen") -> GithubStoreGraph.AppsScreen