Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions composeApp/src/androidMain/kotlin/di/Providers.android.kt
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package core.di

import coil3.ImageLoader
import coil3.PlatformContext
import coil3.annotation.ExperimentalCoilApi

fun initializeCoil(context: PlatformContext) {
ImageLoader.Builder(context)
Expand Down
2 changes: 0 additions & 2 deletions composeApp/src/commonMain/kotlin/di/FeatureModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions composeApp/src/commonMain/kotlin/di/PlatformConfiguration.kt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@ 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
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,14 @@ 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
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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 0 additions & 3 deletions composeApp/src/jsMain/kotlin/data/DriverFactory.kt
Original file line number Diff line number Diff line change
@@ -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) {

Expand Down
Loading