Skip to content

Refactor Presentation Layer Structure #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HendSayed25 merged 1 commit into from
Oct 17, 2025
Merged

Refactor Presentation Layer Structure #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...commonMain/kotlin/org/example/project/presentation/screens/onboarding/OnboardingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import org.example.project.presentation.designsystem.components.SecondaryButton
import org.example.project.presentation.designsystem.textstyle.AppTheme
import org.example.project.presentation.screens.onboarding.composable.OnboardingIndicator
import org.example.project.presentation.screens.onboarding.composable.OnboardingItem
import org.example.project.presentation.viewmodel.OnboardingViewModel
import org.example.project.presentation.screens.onboarding.OnboardingViewModel
import org.jetbrains.compose.resources.StringResource
import org.jetbrains.compose.resources.stringResource
import org.jetbrains.compose.ui.tooling.preview.Preview
Expand Down
2 changes: 1 addition & 1 deletion ...nMain/kotlin/org/example/project/presentation/screens/onboarding/OnboardingScreenState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.example.project.presentation.screens.onboarding

import org.example.project.presentation.screens.onboarding.model.OnboardingUiState
import org.example.project.presentation.viewmodel.base.ErrorUiState
import org.example.project.presentation.shared.base.ErrorUiState

data class OnboardingScreenState(
val onboardingData: List<OnboardingUiState> = emptyList(),
Expand Down
8 changes: 2 additions & 6 deletions ...entation/viewmodel/OnboardingViewModel.kt → ...screens/onboarding/OnboardingViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
package org.example.project.presentation.viewmodel
package org.example.project.presentation.screens.onboarding

import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.IO
import org.example.project.domain.entity.OnboardingItem
import org.example.project.domain.repository.OnboardingRepository
import org.example.project.presentation.screens.onboarding.OnboardingScreenEffect
import org.example.project.presentation.screens.onboarding.OnboardingScreenInteractionListener
import org.example.project.presentation.screens.onboarding.OnboardingScreenState
import org.example.project.presentation.screens.onboarding.model.toUiState
import org.example.project.presentation.viewmodel.base.BaseViewModel
import org.example.project.presentation.shared.base.BaseViewModel
import org.koin.android.annotation.KoinViewModel
import org.koin.core.annotation.Provided


@KoinViewModel
class OnboardingViewModel(
@Provided private val repository: OnboardingRepository,
Expand Down
4 changes: 2 additions & 2 deletions ...otlin/org/example/project/presentation/screens/setupScreens/AccountSetupCategoryScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import crafto.composeapp.generated.resources.account_setup_customer_category_des
import crafto.composeapp.generated.resources.account_setup_customer_category_title
import org.example.project.presentation.ui.screens.setupScreens.component.CategoryActionBox
import org.example.project.presentation.ui.screens.setupScreens.component.SetupScreenScaffold
import org.example.project.presentation.viewmodel.accountSetup.AccountSetupState
import org.example.project.presentation.viewmodel.accountSetup.AccountSetupViewModel
import org.example.project.presentation.screens.setupScreens.AccountSetupState
import org.example.project.presentation.screens.setupScreens.AccountSetupViewModel
import org.jetbrains.compose.resources.stringResource
import org.koin.compose.viewmodel.koinViewModel
import org.koin.core.annotation.KoinExperimentalAPI
Expand Down
5 changes: 5 additions & 0 deletions ...onMain/kotlin/org/example/project/presentation/screens/setupScreens/AccountSetupEffect.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package org.example.project.presentation.screens.setupScreens

sealed class AccountSetupEffect {

}
2 changes: 1 addition & 1 deletion ...tSetup/AccountSetupInterActionListener.kt → ...creens/AccountSetupInterActionListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.example.project.presentation.viewmodel.accountSetup
package org.example.project.presentation.screens.setupScreens

interface AccountSetupInterActionListener {
fun onCategorySelected(id: Int)
Expand Down
2 changes: 1 addition & 1 deletion ...ewmodel/accountSetup/AccountSetupState.kt → ...screens/setupScreens/AccountSetupState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.example.project.presentation.viewmodel.accountSetup
package org.example.project.presentation.screens.setupScreens

import org.example.project.domain.entity.Category

Expand Down
4 changes: 2 additions & 2 deletions ...del/accountSetup/AccountSetupViewModel.kt → ...ens/setupScreens/AccountSetupViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.example.project.presentation.viewmodel.accountSetup
package org.example.project.presentation.screens.setupScreens

import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.launch
import org.example.project.domain.usecase.GetCategoriesUseCase
import org.example.project.presentation.viewmodel.base.BaseViewModel
import org.example.project.presentation.shared.base.BaseViewModel
import org.koin.android.annotation.KoinViewModel
import org.koin.core.annotation.Provided

Expand Down
4 changes: 2 additions & 2 deletions ...tlin/org/example/project/presentation/screens/setupScreens/component/CategoryActionBox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import org.example.project.data.memory.dataSource.categoryList
import org.example.project.presentation.designsystem.components.Chip
import org.example.project.presentation.designsystem.textstyle.AppTheme
import org.example.project.presentation.util.extension.toAnimatedColor
import org.example.project.presentation.viewmodel.accountSetup.AccountSetupCategoryState
import org.example.project.presentation.viewmodel.accountSetup.AccountSetupState
import org.example.project.presentation.screens.setupScreens.AccountSetupCategoryState
import org.example.project.presentation.screens.setupScreens.AccountSetupState
import org.jetbrains.compose.ui.tooling.preview.Preview

@Composable
Expand Down
4 changes: 2 additions & 2 deletions ...in/org/example/project/presentation/screens/setupScreens/component/SetupScreenScaffold.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import org.example.project.presentation.designsystem.components.ButtonState
import org.example.project.presentation.designsystem.components.PrimaryButton
import org.example.project.presentation.designsystem.textstyle.AppTheme
import org.example.project.presentation.util.DeviceConfiguration
import org.example.project.presentation.viewmodel.accountSetup.AccountSetupCategoryState
import org.example.project.presentation.viewmodel.accountSetup.AccountSetupState
import org.example.project.presentation.screens.setupScreens.AccountSetupCategoryState
import org.example.project.presentation.screens.setupScreens.AccountSetupState
import org.jetbrains.compose.resources.stringResource
import org.jetbrains.compose.ui.tooling.preview.Preview

Expand Down
2 changes: 1 addition & 1 deletion ...sentation/viewmodel/base/BaseViewModel.kt → ...presentation/shared/base/BaseViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.example.project.presentation.viewmodel.base
package org.example.project.presentation.shared.base

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
Expand Down
2 changes: 1 addition & 1 deletion ...esentation/viewmodel/base/ErrorUiState.kt → .../presentation/shared/base/ErrorUiState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.example.project.presentation.viewmodel.base
package org.example.project.presentation.shared.base

data class ErrorUiState (
val message: String = "",
Expand Down
5 changes: 0 additions & 5 deletions ...Main/kotlin/org/example/project/presentation/viewmodel/accountSetup/AccountSetupEffect.kt
View file
Open in desktop

This file was deleted.