diff --git a/composeApp/src/androidMain/kotlin/di/Providers.android.kt b/composeApp/src/androidMain/kotlin/di/Providers.android.kt index ab3810d..4e7baf6 100644 --- a/composeApp/src/androidMain/kotlin/di/Providers.android.kt +++ b/composeApp/src/androidMain/kotlin/di/Providers.android.kt @@ -1,8 +1 @@ package di - -import core.platform.AndroidImagePicker -import core.platform.ImagePicker -import org.kodein.di.DI -import org.kodein.di.bind -import org.kodein.di.instance -import org.kodein.di.singleton \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/tech/mobiledeveloper/jethabit/app/MainActivity.kt b/composeApp/src/androidMain/kotlin/tech/mobiledeveloper/jethabit/app/MainActivity.kt index 37e5ee6..c93398e 100644 --- a/composeApp/src/androidMain/kotlin/tech/mobiledeveloper/jethabit/app/MainActivity.kt +++ b/composeApp/src/androidMain/kotlin/tech/mobiledeveloper/jethabit/app/MainActivity.kt @@ -1,8 +1,6 @@ package tech.mobiledeveloper.jethabit.app import App -import MainView -import android.content.Intent import android.os.Bundle import androidx.activity.compose.setContent import androidx.activity.result.contract.ActivityResultContracts diff --git a/composeApp/src/commonMain/kotlin/core/di/CoilInitializer.kt b/composeApp/src/commonMain/kotlin/core/di/CoilInitializer.kt index 8832243..7c6a44d 100644 --- a/composeApp/src/commonMain/kotlin/core/di/CoilInitializer.kt +++ b/composeApp/src/commonMain/kotlin/core/di/CoilInitializer.kt @@ -2,7 +2,6 @@ package core.di import coil3.ImageLoader import coil3.PlatformContext -import coil3.annotation.ExperimentalCoilApi fun initializeCoil(context: PlatformContext) { ImageLoader.Builder(context) diff --git a/composeApp/src/commonMain/kotlin/di/FeatureModule.kt b/composeApp/src/commonMain/kotlin/di/FeatureModule.kt index 99ad915..e652969 100644 --- a/composeApp/src/commonMain/kotlin/di/FeatureModule.kt +++ b/composeApp/src/commonMain/kotlin/di/FeatureModule.kt @@ -3,10 +3,8 @@ package di import feature.daily.domain.GetHabitsForTodayUseCase import feature.daily.domain.SwitchHabitUseCase import feature.detail.di.detailModule -import feature.habits.data.HabitDao import feature.habits.domain.CreateHabitUseCase import feature.settings.domain.ClearAllHabitsUseCase -import feature.tracker.data.TrackerDao import feature.tracker.domain.UpdateTrackerValueUseCase import org.kodein.di.DI import org.kodein.di.bind diff --git a/composeApp/src/commonMain/kotlin/di/PlatformConfiguration.kt b/composeApp/src/commonMain/kotlin/di/PlatformConfiguration.kt index 4b54d74..aac0cc5 100644 --- a/composeApp/src/commonMain/kotlin/di/PlatformConfiguration.kt +++ b/composeApp/src/commonMain/kotlin/di/PlatformConfiguration.kt @@ -1,8 +1,6 @@ package di import androidx.compose.runtime.staticCompositionLocalOf -import core.database.AppDatabase -import org.kodein.di.DI enum class Platform { Android, MacOS, Desktop, iOS, Js diff --git a/composeApp/src/commonMain/kotlin/feature/create/presentation/ComposeViewModel.kt b/composeApp/src/commonMain/kotlin/feature/create/presentation/ComposeViewModel.kt index 761384e..0fa69c3 100644 --- a/composeApp/src/commonMain/kotlin/feature/create/presentation/ComposeViewModel.kt +++ b/composeApp/src/commonMain/kotlin/feature/create/presentation/ComposeViewModel.kt @@ -5,7 +5,6 @@ import base.BaseViewModel import di.Inject import feature.create.presentation.models.ComposeEvent import feature.create.presentation.models.ComposeViewState -import feature.habits.data.HabitType import feature.habits.domain.CreateHabitUseCase import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/composeApp/src/commonMain/kotlin/feature/create/ui/ComposeView.kt b/composeApp/src/commonMain/kotlin/feature/create/ui/ComposeView.kt index 3d1f934..60934eb 100644 --- a/composeApp/src/commonMain/kotlin/feature/create/ui/ComposeView.kt +++ b/composeApp/src/commonMain/kotlin/feature/create/ui/ComposeView.kt @@ -18,7 +18,6 @@ import androidx.compose.ui.unit.dp import feature.habits.data.HabitType import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.ui.tooling.preview.Preview -import screens.compose.views.ComposeViewInitialError import tech.mobiledeveloper.jethabit.resources.* import ui.themes.JetHabitTheme import androidx.compose.runtime.mutableStateOf diff --git a/composeApp/src/commonMain/kotlin/feature/daily/ui/views/HabitCardItem.kt b/composeApp/src/commonMain/kotlin/feature/daily/ui/views/HabitCardItem.kt index 20a4e4d..2c495a7 100644 --- a/composeApp/src/commonMain/kotlin/feature/daily/ui/views/HabitCardItem.kt +++ b/composeApp/src/commonMain/kotlin/feature/daily/ui/views/HabitCardItem.kt @@ -2,12 +2,10 @@ package screens.daily.views import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* -import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import feature.daily.presentation.models.DailyHabit diff --git a/composeApp/src/commonMain/kotlin/feature/detail/domain/GetDetailInfoUseCase.kt b/composeApp/src/commonMain/kotlin/feature/detail/domain/GetDetailInfoUseCase.kt index 1a2ca14..54613cd 100644 --- a/composeApp/src/commonMain/kotlin/feature/detail/domain/GetDetailInfoUseCase.kt +++ b/composeApp/src/commonMain/kotlin/feature/detail/domain/GetDetailInfoUseCase.kt @@ -1,7 +1,6 @@ package feature.detail.domain import feature.habits.data.HabitDao -import feature.habits.data.HabitEntity import feature.habits.data.HabitType import utils.CalendarDays import kotlinx.datetime.LocalDate diff --git a/composeApp/src/commonMain/kotlin/feature/health/list/ui/HealthScreen.kt b/composeApp/src/commonMain/kotlin/feature/health/list/ui/HealthScreen.kt index 8ecc557..3600034 100644 --- a/composeApp/src/commonMain/kotlin/feature/health/list/ui/HealthScreen.kt +++ b/composeApp/src/commonMain/kotlin/feature/health/list/ui/HealthScreen.kt @@ -16,7 +16,6 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Path import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.graphics.drawscope.Stroke -import androidx.compose.ui.graphics.drawscope.rotate import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.drawText import androidx.compose.ui.text.rememberTextMeasurer @@ -24,7 +23,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController import feature.health.list.presentation.HealthViewModel -import feature.health.list.presentation.models.HealthEvent import feature.health.list.presentation.models.TrackerHabitItem import feature.health.list.ui.views.HealthViewNoItems import navigation.HealthScreens diff --git a/composeApp/src/commonMain/kotlin/feature/profile/edit/ui/EditProfileView.kt b/composeApp/src/commonMain/kotlin/feature/profile/edit/ui/EditProfileView.kt index d9becb5..7cd6b64 100644 --- a/composeApp/src/commonMain/kotlin/feature/profile/edit/ui/EditProfileView.kt +++ b/composeApp/src/commonMain/kotlin/feature/profile/edit/ui/EditProfileView.kt @@ -3,7 +3,6 @@ package feature.profile.edit.ui import androidx.compose.foundation.layout.* import androidx.compose.material.* import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp diff --git a/composeApp/src/commonMain/kotlin/feature/profile/start/presentation/ProfileViewModel.kt b/composeApp/src/commonMain/kotlin/feature/profile/start/presentation/ProfileViewModel.kt index 1d2d13f..a800334 100644 --- a/composeApp/src/commonMain/kotlin/feature/profile/start/presentation/ProfileViewModel.kt +++ b/composeApp/src/commonMain/kotlin/feature/profile/start/presentation/ProfileViewModel.kt @@ -8,7 +8,6 @@ import feature.profile.start.ui.models.ProfileEvent import feature.profile.start.ui.models.ProfileAction import feature.profile.start.ui.models.ProfileViewState import kotlinx.coroutines.launch -import navigation.ProfileScreens class ProfileViewModel( private val imagePicker: ImagePicker, diff --git a/composeApp/src/commonMain/kotlin/feature/profile/start/ui/views/ProfileView.kt b/composeApp/src/commonMain/kotlin/feature/profile/start/ui/views/ProfileView.kt index 49d453f..df438f6 100644 --- a/composeApp/src/commonMain/kotlin/feature/profile/start/ui/views/ProfileView.kt +++ b/composeApp/src/commonMain/kotlin/feature/profile/start/ui/views/ProfileView.kt @@ -2,14 +2,10 @@ package feature.profile.start.ui.views import androidx.compose.foundation.background import androidx.compose.foundation.layout.* -import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.foundation.verticalScroll import androidx.compose.material.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.* import androidx.compose.runtime.* -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import feature.profile.start.ui.models.ProfileEvent diff --git a/composeApp/src/commonMain/kotlin/feature/profile/start/ui/views/UserHeader.kt b/composeApp/src/commonMain/kotlin/feature/profile/start/ui/views/UserHeader.kt index 84ee340..064402b 100644 --- a/composeApp/src/commonMain/kotlin/feature/profile/start/ui/views/UserHeader.kt +++ b/composeApp/src/commonMain/kotlin/feature/profile/start/ui/views/UserHeader.kt @@ -1,21 +1,14 @@ package feature.profile.start.ui.views import androidx.compose.foundation.background -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.* -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Person import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.ui.unit.dp import feature.profile.start.ui.models.ProfileViewState -import ui.components.PlatformImage import ui.themes.JetHabitTheme @Composable diff --git a/composeApp/src/commonMain/kotlin/feature/settings/ui/SettingsScreen.kt b/composeApp/src/commonMain/kotlin/feature/settings/ui/SettingsScreen.kt index c7575ec..00d663b 100644 --- a/composeApp/src/commonMain/kotlin/feature/settings/ui/SettingsScreen.kt +++ b/composeApp/src/commonMain/kotlin/feature/settings/ui/SettingsScreen.kt @@ -4,7 +4,6 @@ import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.* import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState @@ -12,9 +11,7 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController import data.features.settings.LocalSettingsEventBus @@ -29,7 +26,6 @@ import screens.settings.views.MenuItem import screens.settings.views.MenuItemModel import tech.mobiledeveloper.jethabit.resources.* import ui.themes.* -import ui.themes.components.JHDivider import ui.components.AppHeader @ExperimentalMaterialApi diff --git a/composeApp/src/commonMain/kotlin/feature/statistics/ui/StatisticsScreen.kt b/composeApp/src/commonMain/kotlin/feature/statistics/ui/StatisticsScreen.kt index 4dbe7a4..0d43ffa 100644 --- a/composeApp/src/commonMain/kotlin/feature/statistics/ui/StatisticsScreen.kt +++ b/composeApp/src/commonMain/kotlin/feature/statistics/ui/StatisticsScreen.kt @@ -1,6 +1,5 @@ package feature.statistics.ui -import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items diff --git a/composeApp/src/commonMain/kotlin/screens/add_name/MedicationAddName.kt b/composeApp/src/commonMain/kotlin/screens/add_name/MedicationAddName.kt index 59f2b9e..77d8381 100644 --- a/composeApp/src/commonMain/kotlin/screens/add_name/MedicationAddName.kt +++ b/composeApp/src/commonMain/kotlin/screens/add_name/MedicationAddName.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth @@ -20,7 +19,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.text.font.FontWeight diff --git a/composeApp/src/jsMain/kotlin/data/DriverFactory.kt b/composeApp/src/jsMain/kotlin/data/DriverFactory.kt index 913155f..8de2ad3 100644 --- a/composeApp/src/jsMain/kotlin/data/DriverFactory.kt +++ b/composeApp/src/jsMain/kotlin/data/DriverFactory.kt @@ -1,10 +1,7 @@ package data import com.squareup.sqldelight.db.SqlDriver -import com.squareup.sqldelight.drivers.sqljs.initSqlDriver import di.PlatformConfiguration -import kotlinx.coroutines.await -import kotlin.js.Promise actual class DriverFactory actual constructor(private val platformConfiguration: PlatformConfiguration) {