Refactor: Flatten ui package structure

ui/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 @Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
     alias(libs.plugins.android.library)
@@ -29,6 +31,11 @@ kotlin {
 
     jvmToolchain(17)
 
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
+
     sourceSets {
         commonMain {
             dependencies {

ui/src/androidMain/kotlin/com/materiiapps/gloom/di/modules/PlatformViewModelModule.kt

@@ -1,6 +1,6 @@
 package com.materiiapps.gloom.di.modules
 
-import com.materiiapps.gloom.ui.viewmodels.release.ReleaseViewModel
+import com.materiiapps.gloom.ui.screens.release.viewmodel.ReleaseViewModel
 import org.koin.core.module.dsl.factoryOf
 import org.koin.dsl.module
 

ui/src/androidMain/kotlin/com/materiiapps/gloom/ui/widgets/pdf/PdfPage.android.kt → ui/src/androidMain/kotlin/com/materiiapps/gloom/ui/screens/explorer/component/PdfPage.android.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.widgets.pdf
+package com.materiiapps.gloom.ui.screens.explorer.component
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize

ui/src/androidMain/kotlin/com/materiiapps/gloom/ui/viewmodels/release/ReleaseViewModel.kt → ui/src/androidMain/kotlin/com/materiiapps/gloom/ui/screens/release/viewmodel/ReleaseViewModel.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.viewmodels.release
+package com.materiiapps.gloom.ui.screens.release.viewmodel
 
 import android.content.Context
 import androidx.compose.runtime.getValue
@@ -12,8 +12,8 @@ import com.materiiapps.gloom.gql.ReleaseDetailsQuery
 import com.materiiapps.gloom.gql.fragment.ReleaseAssetFragment
 import com.materiiapps.gloom.gql.fragment.ReleaseDetails
 import com.materiiapps.gloom.gql.type.ReactionContent
+import com.materiiapps.gloom.ui.screens.list.viewmodel.BaseListViewModel
 import com.materiiapps.gloom.ui.utils.installApks
-import com.materiiapps.gloom.ui.viewmodels.list.base.BaseListViewModel
 import kotlinx.coroutines.launch
 import java.io.File
 

ui/src/commonMain/kotlin/com/materiiapps/gloom/di/modules/ViewModelModule.kt

@@ -1,26 +1,26 @@
 package com.materiiapps.gloom.di.modules
 
-import com.materiiapps.gloom.ui.viewmodels.auth.LandingViewModel
-import com.materiiapps.gloom.ui.viewmodels.explorer.DirectoryListingViewModel
-import com.materiiapps.gloom.ui.viewmodels.explorer.FileViewerViewModel
-import com.materiiapps.gloom.ui.viewmodels.home.HomeViewModel
-import com.materiiapps.gloom.ui.viewmodels.list.OrgListViewModel
-import com.materiiapps.gloom.ui.viewmodels.list.RepositoryListViewModel
-import com.materiiapps.gloom.ui.viewmodels.list.SponsoringViewModel
-import com.materiiapps.gloom.ui.viewmodels.list.StarredReposListViewModel
-import com.materiiapps.gloom.ui.viewmodels.profile.FollowersViewModel
-import com.materiiapps.gloom.ui.viewmodels.profile.FollowingViewModel
-import com.materiiapps.gloom.ui.viewmodels.profile.ProfileViewModel
-import com.materiiapps.gloom.ui.viewmodels.repo.LicenseViewModel
-import com.materiiapps.gloom.ui.viewmodels.repo.RepoViewModel
-import com.materiiapps.gloom.ui.viewmodels.repo.tab.RepoCodeViewModel
-import com.materiiapps.gloom.ui.viewmodels.repo.tab.RepoDetailsViewModel
-import com.materiiapps.gloom.ui.viewmodels.repo.tab.RepoIssuesViewModel
-import com.materiiapps.gloom.ui.viewmodels.repo.tab.RepoPullRequestsViewModel
-import com.materiiapps.gloom.ui.viewmodels.repo.tab.RepoReleasesViewModel
-import com.materiiapps.gloom.ui.viewmodels.settings.AccountSettingsViewModel
-import com.materiiapps.gloom.ui.viewmodels.settings.AppearanceSettingsViewModel
-import com.materiiapps.gloom.ui.viewmodels.settings.SettingsViewModel
+import com.materiiapps.gloom.ui.screens.auth.viewmodel.LandingViewModel
+import com.materiiapps.gloom.ui.screens.explorer.viewmodel.DirectoryListingViewModel
+import com.materiiapps.gloom.ui.screens.explorer.viewmodel.FileViewerViewModel
+import com.materiiapps.gloom.ui.screens.home.viewmodel.HomeViewModel
+import com.materiiapps.gloom.ui.screens.list.viewmodel.OrgListViewModel
+import com.materiiapps.gloom.ui.screens.list.viewmodel.RepositoryListViewModel
+import com.materiiapps.gloom.ui.screens.list.viewmodel.SponsoringViewModel
+import com.materiiapps.gloom.ui.screens.list.viewmodel.StarredReposListViewModel
+import com.materiiapps.gloom.ui.screens.profile.viewmodel.FollowersViewModel
+import com.materiiapps.gloom.ui.screens.profile.viewmodel.FollowingViewModel
+import com.materiiapps.gloom.ui.screens.profile.viewmodel.ProfileViewModel
+import com.materiiapps.gloom.ui.screens.repo.viewmodel.LicenseViewModel
+import com.materiiapps.gloom.ui.screens.repo.viewmodel.RepoViewModel
+import com.materiiapps.gloom.ui.screens.repo.viewmodel.RepoCodeViewModel
+import com.materiiapps.gloom.ui.screens.repo.viewmodel.RepoDetailsViewModel
+import com.materiiapps.gloom.ui.screens.repo.viewmodel.RepoIssuesViewModel
+import com.materiiapps.gloom.ui.screens.repo.viewmodel.RepoPullRequestsViewModel
+import com.materiiapps.gloom.ui.screens.repo.viewmodel.RepoReleasesViewModel
+import com.materiiapps.gloom.ui.screens.settings.viewmodel.AccountSettingsViewModel
+import com.materiiapps.gloom.ui.screens.settings.viewmodel.AppearanceSettingsViewModel
+import com.materiiapps.gloom.ui.screens.settings.viewmodel.SettingsViewModel
 import org.koin.core.module.dsl.factoryOf
 import org.koin.dsl.module
 

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/auth/LandingScreen.kt

@@ -39,8 +39,8 @@ import com.materiiapps.gloom.ui.icons.GitHub
 import com.materiiapps.gloom.ui.icons.Social
 import com.materiiapps.gloom.ui.screens.root.RootScreen
 import com.materiiapps.gloom.ui.utils.toImmutableList
-import com.materiiapps.gloom.ui.viewmodels.auth.LandingViewModel
-import com.materiiapps.gloom.ui.widgets.accounts.AccountItem
+import com.materiiapps.gloom.ui.screens.auth.viewmodel.LandingViewModel
+import com.materiiapps.gloom.ui.screens.settings.component.account.AccountItem
 import com.materiiapps.gloom.utils.LocalLinkHandler
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/viewmodels/auth/LandingViewModel.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/auth/viewmodel/LandingViewModel.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.viewmodels.auth
+package com.materiiapps.gloom.ui.screens.auth.viewmodel
 
 import cafe.adriel.voyager.core.model.ScreenModel
 import com.materiiapps.gloom.api.Credentials

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/explorer/DirectoryListingScreen.kt

@@ -24,7 +24,7 @@ import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import com.benasher44.uuid.uuid4
 import com.materiiapps.gloom.ui.utils.navigate
-import com.materiiapps.gloom.ui.viewmodels.explorer.DirectoryListingViewModel
+import com.materiiapps.gloom.ui.screens.explorer.viewmodel.DirectoryListingViewModel
 import org.koin.core.parameter.parametersOf
 
 class DirectoryListingScreen(

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/explorer/FileViewerScreen.kt

@@ -56,7 +56,7 @@ import com.materiiapps.gloom.ui.screens.explorer.viewers.MarkdownFileViewer
 import com.materiiapps.gloom.ui.screens.explorer.viewers.PdfFileViewer
 import com.materiiapps.gloom.ui.screens.explorer.viewers.TextFileViewer
 import com.materiiapps.gloom.ui.utils.thenIf
-import com.materiiapps.gloom.ui.viewmodels.explorer.FileViewerViewModel
+import com.materiiapps.gloom.ui.screens.explorer.viewmodel.FileViewerViewModel
 import dev.icerock.moko.resources.compose.stringResource
 import org.koin.compose.koinInject
 import org.koin.core.parameter.parametersOf

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/pdf/PdfPage.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/explorer/component/PdfPage.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.widgets.pdf
+package com.materiiapps.gloom.ui.screens.explorer.component
 
 import androidx.compose.runtime.Composable
 import dev.zt64.compose.pdf.RemotePdfState

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/explorer/viewers/PdfFileViewer.kt

@@ -23,7 +23,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.unit.dp
 import com.materiiapps.gloom.gql.fragment.RepoFile
-import com.materiiapps.gloom.ui.widgets.pdf.PdfPage
+import com.materiiapps.gloom.ui.screens.explorer.component.PdfPage
 import dev.zt64.compose.pdf.LoadState
 import dev.zt64.compose.pdf.RemotePdfState
 import dev.zt64.compose.pdf.component.PdfVerticalPager

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/viewmodels/explorer/DirectoryListingViewModel.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/explorer/viewmodel/DirectoryListingViewModel.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.viewmodels.explorer
+package com.materiiapps.gloom.ui.screens.explorer.viewmodel
 
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/viewmodels/explorer/FileViewerViewModel.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/explorer/viewmodel/FileViewerViewModel.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.viewmodels.explorer
+package com.materiiapps.gloom.ui.screens.explorer.viewmodel
 
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/home/HomeScreen.kt

@@ -41,14 +41,14 @@ import cafe.adriel.voyager.navigator.tab.TabOptions
 import com.materiiapps.gloom.Res
 import com.materiiapps.gloom.ui.components.RefreshIndicator
 import com.materiiapps.gloom.ui.components.toolbar.LargeToolbar
-import com.materiiapps.gloom.ui.viewmodels.home.HomeViewModel
-import com.materiiapps.gloom.ui.widgets.feed.CreatedRepoItem
-import com.materiiapps.gloom.ui.widgets.feed.FollowedUserItem
-import com.materiiapps.gloom.ui.widgets.feed.ForkedRepoItem
-import com.materiiapps.gloom.ui.widgets.feed.NewReleaseItem
-import com.materiiapps.gloom.ui.widgets.feed.RecommendedFollowUserItem
-import com.materiiapps.gloom.ui.widgets.feed.RecommendedRepoItem
-import com.materiiapps.gloom.ui.widgets.feed.StarredRepoItem
+import com.materiiapps.gloom.ui.screens.home.viewmodel.HomeViewModel
+import com.materiiapps.gloom.ui.screens.home.component.CreatedRepoItem
+import com.materiiapps.gloom.ui.screens.home.component.FollowedUserItem
+import com.materiiapps.gloom.ui.screens.home.component.ForkedRepoItem
+import com.materiiapps.gloom.ui.screens.home.component.NewReleaseItem
+import com.materiiapps.gloom.ui.screens.home.component.RecommendedFollowUserItem
+import com.materiiapps.gloom.ui.screens.home.component.RecommendedRepoItem
+import com.materiiapps.gloom.ui.screens.home.component.StarredRepoItem
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.launch
 

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/feed/CreatedRepoItem.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/home/component/CreatedRepoItem.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.widgets.feed
+package com.materiiapps.gloom.ui.screens.home.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/feed/FeedActor.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/home/component/FeedActor.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.widgets.feed
+package com.materiiapps.gloom.ui.screens.home.component
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/feed/FeedRepoCard.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/home/component/FeedRepoCard.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.widgets.feed
+package com.materiiapps.gloom.ui.screens.home.component
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/feed/FeedUserCard.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/home/component/FeedUserCard.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.widgets.feed
+package com.materiiapps.gloom.ui.screens.home.component
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/feed/FollowedUserItem.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/home/component/FollowedUserItem.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.widgets.feed
+package com.materiiapps.gloom.ui.screens.home.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/feed/ForkedRepoItem.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/home/component/ForkedRepoItem.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.widgets.feed
+package com.materiiapps.gloom.ui.screens.home.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/feed/NewReleaseItem.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/home/component/NewReleaseItem.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.widgets.feed
+package com.materiiapps.gloom.ui.screens.home.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/feed/ReccommendedRepoItem.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/home/component/ReccommendedRepoItem.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.widgets.feed
+package com.materiiapps.gloom.ui.screens.home.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/feed/RecommendedFollowUserItem.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/home/component/RecommendedFollowUserItem.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.widgets.feed
+package com.materiiapps.gloom.ui.screens.home.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/feed/StarredRepoItem.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/home/component/StarredRepoItem.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.widgets.feed
+package com.materiiapps.gloom.ui.screens.home.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/viewmodels/home/HomeViewModel.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/home/viewmodel/HomeViewModel.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.viewmodels.home
+package com.materiiapps.gloom.ui.screens.home.viewmodel
 
 import androidx.compose.runtime.mutableStateMapOf
 import app.cash.paging.compose.LazyPagingItems
@@ -7,7 +7,7 @@ import com.materiiapps.gloom.api.repository.GraphQLRepository
 import com.materiiapps.gloom.api.utils.getOrNull
 import com.materiiapps.gloom.api.utils.ifSuccessful
 import com.materiiapps.gloom.gql.FeedQuery
-import com.materiiapps.gloom.ui.viewmodels.list.base.BaseListViewModel
+import com.materiiapps.gloom.ui.screens.list.viewmodel.BaseListViewModel
 import kotlinx.coroutines.launch
 
 class HomeViewModel(

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/list/OrgsListScreen.kt

@@ -7,7 +7,7 @@ import com.materiiapps.gloom.Res
 import com.materiiapps.gloom.api.models.ModelUser
 import com.materiiapps.gloom.gql.JoinedOrgsQuery
 import com.materiiapps.gloom.ui.screens.list.base.BaseListScreen
-import com.materiiapps.gloom.ui.viewmodels.list.OrgListViewModel
+import com.materiiapps.gloom.ui.screens.list.viewmodel.OrgListViewModel
 import com.materiiapps.gloom.ui.widgets.user.UserItem
 import dev.icerock.moko.resources.StringResource
 import org.koin.core.parameter.parametersOf

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/list/RepositoryListScreen.kt

@@ -7,8 +7,8 @@ import com.materiiapps.gloom.Res
 import com.materiiapps.gloom.api.models.ModelRepo
 import com.materiiapps.gloom.gql.RepoListQuery
 import com.materiiapps.gloom.ui.screens.list.base.BaseListScreen
-import com.materiiapps.gloom.ui.viewmodels.list.RepositoryListViewModel
-import com.materiiapps.gloom.ui.widgets.repo.RepoItem
+import com.materiiapps.gloom.ui.screens.list.viewmodel.RepositoryListViewModel
+import com.materiiapps.gloom.ui.screens.repo.component.RepoItem
 import dev.icerock.moko.resources.StringResource
 import org.koin.core.parameter.parametersOf
 

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/list/SponsoringScreen.kt

@@ -7,7 +7,7 @@ import com.materiiapps.gloom.Res
 import com.materiiapps.gloom.api.models.ModelUser
 import com.materiiapps.gloom.gql.SponsoringQuery
 import com.materiiapps.gloom.ui.screens.list.base.BaseListScreen
-import com.materiiapps.gloom.ui.viewmodels.list.SponsoringViewModel
+import com.materiiapps.gloom.ui.screens.list.viewmodel.SponsoringViewModel
 import com.materiiapps.gloom.ui.widgets.user.UserItem
 import dev.icerock.moko.resources.StringResource
 import org.koin.core.parameter.parametersOf

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/list/StarredReposListScreen.kt

@@ -7,8 +7,8 @@ import com.materiiapps.gloom.Res
 import com.materiiapps.gloom.api.models.ModelRepo
 import com.materiiapps.gloom.gql.StarredReposQuery
 import com.materiiapps.gloom.ui.screens.list.base.BaseListScreen
-import com.materiiapps.gloom.ui.viewmodels.list.StarredReposListViewModel
-import com.materiiapps.gloom.ui.widgets.repo.RepoItem
+import com.materiiapps.gloom.ui.screens.list.viewmodel.StarredReposListViewModel
+import com.materiiapps.gloom.ui.screens.repo.component.RepoItem
 import dev.icerock.moko.resources.StringResource
 import org.koin.core.parameter.parametersOf
 

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/list/base/BaseListScreen.kt

@@ -25,7 +25,7 @@ import cafe.adriel.voyager.core.screen.Screen
 import com.apollographql.apollo.api.Query
 import com.materiiapps.gloom.ui.components.RefreshIndicator
 import com.materiiapps.gloom.ui.components.toolbar.LargeToolbar
-import com.materiiapps.gloom.ui.viewmodels.list.base.BaseListViewModel
+import com.materiiapps.gloom.ui.screens.list.viewmodel.BaseListViewModel
 import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.compose.stringResource
 

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/viewmodels/list/base/BaseListViewModel.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/list/viewmodel/BaseListViewModel.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.viewmodels.list.base
+package com.materiiapps.gloom.ui.screens.list.viewmodel
 
 import androidx.paging.Pager
 import androidx.paging.PagingConfig

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/viewmodels/list/OrgListViewModel.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/list/viewmodel/OrgListViewModel.kt

@@ -1,10 +1,9 @@
-package com.materiiapps.gloom.ui.viewmodels.list
+package com.materiiapps.gloom.ui.screens.list.viewmodel
 
 import com.materiiapps.gloom.api.models.ModelUser
 import com.materiiapps.gloom.api.repository.GraphQLRepository
 import com.materiiapps.gloom.api.utils.getOrNull
 import com.materiiapps.gloom.gql.JoinedOrgsQuery
-import com.materiiapps.gloom.ui.viewmodels.list.base.BaseListViewModel
 
 class OrgListViewModel(
     private val repo: GraphQLRepository,

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/viewmodels/list/RepositoryListViewModel.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/list/viewmodel/RepositoryListViewModel.kt

@@ -1,10 +1,9 @@
-package com.materiiapps.gloom.ui.viewmodels.list
+package com.materiiapps.gloom.ui.screens.list.viewmodel
 
 import com.materiiapps.gloom.api.models.ModelRepo
 import com.materiiapps.gloom.api.repository.GraphQLRepository
 import com.materiiapps.gloom.api.utils.getOrNull
 import com.materiiapps.gloom.gql.RepoListQuery
-import com.materiiapps.gloom.ui.viewmodels.list.base.BaseListViewModel
 
 class RepositoryListViewModel(
     private val repo: GraphQLRepository,

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/viewmodels/list/SponsoringViewModel.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/list/viewmodel/SponsoringViewModel.kt

@@ -1,10 +1,9 @@
-package com.materiiapps.gloom.ui.viewmodels.list
+package com.materiiapps.gloom.ui.screens.list.viewmodel
 
 import com.materiiapps.gloom.api.models.ModelUser
 import com.materiiapps.gloom.api.repository.GraphQLRepository
 import com.materiiapps.gloom.api.utils.getOrNull
 import com.materiiapps.gloom.gql.SponsoringQuery
-import com.materiiapps.gloom.ui.viewmodels.list.base.BaseListViewModel
 
 class SponsoringViewModel(
     private val repo: GraphQLRepository,

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/viewmodels/list/StarredReposListViewModel.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/list/viewmodel/StarredReposListViewModel.kt

@@ -1,10 +1,9 @@
-package com.materiiapps.gloom.ui.viewmodels.list
+package com.materiiapps.gloom.ui.screens.list.viewmodel
 
 import com.materiiapps.gloom.api.models.ModelRepo
 import com.materiiapps.gloom.api.repository.GraphQLRepository
 import com.materiiapps.gloom.api.utils.getOrNull
 import com.materiiapps.gloom.gql.StarredReposQuery
-import com.materiiapps.gloom.ui.viewmodels.list.base.BaseListViewModel
 
 class StarredReposListViewModel(
     private val repo: GraphQLRepository,

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/profile/FollowersScreen.kt

@@ -7,7 +7,7 @@ import com.materiiapps.gloom.Res
 import com.materiiapps.gloom.api.models.ModelUser
 import com.materiiapps.gloom.gql.FollowersQuery
 import com.materiiapps.gloom.ui.screens.list.base.BaseListScreen
-import com.materiiapps.gloom.ui.viewmodels.profile.FollowersViewModel
+import com.materiiapps.gloom.ui.screens.profile.viewmodel.FollowersViewModel
 import com.materiiapps.gloom.ui.widgets.user.UserItem
 import dev.icerock.moko.resources.StringResource
 import org.koin.core.parameter.parametersOf

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/profile/FollowingScreen.kt

@@ -7,7 +7,7 @@ import com.materiiapps.gloom.Res
 import com.materiiapps.gloom.api.models.ModelUser
 import com.materiiapps.gloom.gql.FollowingQuery
 import com.materiiapps.gloom.ui.screens.list.base.BaseListScreen
-import com.materiiapps.gloom.ui.viewmodels.profile.FollowingViewModel
+import com.materiiapps.gloom.ui.screens.profile.viewmodel.FollowingViewModel
 import com.materiiapps.gloom.ui.widgets.user.UserItem
 import dev.icerock.moko.resources.StringResource
 import org.koin.core.parameter.parametersOf

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/profile/ProfileScreen.kt

@@ -105,11 +105,11 @@ import com.materiiapps.gloom.ui.screens.list.StarredReposListScreen
 import com.materiiapps.gloom.ui.screens.settings.SettingsScreen
 import com.materiiapps.gloom.ui.utils.EmojiUtils
 import com.materiiapps.gloom.ui.utils.navigate
-import com.materiiapps.gloom.ui.viewmodels.profile.ProfileViewModel
+import com.materiiapps.gloom.ui.screens.profile.viewmodel.ProfileViewModel
 import com.materiiapps.gloom.ui.widgets.ReadMeCard
 import com.materiiapps.gloom.ui.widgets.alerts.LocalAlertController
-import com.materiiapps.gloom.ui.widgets.profile.ContributionGraph
-import com.materiiapps.gloom.ui.widgets.repo.RepoItem
+import com.materiiapps.gloom.ui.screens.profile.component.ContributionGraph
+import com.materiiapps.gloom.ui.screens.repo.component.RepoItem
 import com.materiiapps.gloom.utils.Constants
 import com.seiko.imageloader.rememberImagePainter
 import dev.icerock.moko.resources.compose.painterResource

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/profile/ContributionGraph.kt → ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/profile/component/ContributionGraph.kt

@@ -1,4 +1,4 @@
-package com.materiiapps.gloom.ui.widgets.profile
+package com.materiiapps.gloom.ui.screens.profile.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable