update libraries

This commit is contained in:
MM20
2025-05-09 21:53:25 +02:00
parent 92c4bce528
commit 4dc5f2e269
10 changed files with 46 additions and 45 deletions
@@ -13,14 +13,14 @@ import de.mm20.launcher2.widgets.FavoritesWidget
import de.mm20.launcher2.widgets.WidgetRepository
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import org.koin.androidx.compose.inject
import org.koin.compose.koinInject
@Composable
fun ProvideSettings(
content: @Composable () -> Unit
) {
val settings: UiSettings by inject()
val widgetRepository: WidgetRepository by inject()
val settings: UiSettings = koinInject()
val widgetRepository: WidgetRepository = koinInject()
val cardStyle by remember {
settings.cardStyle.distinctUntilChanged()
@@ -41,7 +41,7 @@ import de.mm20.launcher2.icons.VectorLayer
import de.mm20.launcher2.search.Tag
import de.mm20.launcher2.ui.component.ShapedLauncherIcon
import de.mm20.launcher2.ui.ktx.toPixels
import org.koin.androidx.compose.inject
import org.koin.compose.koinInject
@Composable
fun TagChip(
@@ -92,7 +92,7 @@ fun TagChip(
if (it >= 2) 8.dp else 0.dp
}
val iconService by inject<IconService>()
val iconService: IconService = koinInject()
val iconSize = InputChipDefaults.AvatarSize.toPixels()
val icon by remember(tag, iconSize) {
@@ -96,6 +96,7 @@ import de.mm20.launcher2.widgets.WeatherWidget
import de.mm20.launcher2.widgets.Widget
import kotlinx.coroutines.flow.map
import org.koin.androidx.compose.get
import org.koin.compose.koinInject
import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter
import kotlin.math.roundToInt
@@ -501,9 +502,9 @@ fun ColumnScope.ConfigureCalendarWidget(
widget: CalendarWidget,
onWidgetUpdated: (CalendarWidget) -> Unit
) {
val calendarRepository: CalendarRepository = get()
val permissionsManager: PermissionsManager = get()
val pluginRepository: PluginRepository = get()
val calendarRepository: CalendarRepository = koinInject()
val permissionsManager: PermissionsManager = koinInject()
val pluginRepository: PluginRepository = koinInject()
val calendars by remember {
calendarRepository.getCalendars().map {
it.sortedBy { it.name }
@@ -86,7 +86,7 @@ import de.mm20.launcher2.ui.launcher.widgets.clock.parts.PartProvider
import de.mm20.launcher2.ui.locals.LocalPreferDarkContentOverWallpaper
import de.mm20.launcher2.ui.settings.clockwidget.ClockWidgetSettingsScreenVM
import de.mm20.launcher2.ui.utils.isTwentyFourHours
import org.koin.androidx.compose.inject
import org.koin.compose.koinInject
@Composable
fun ClockWidget(
@@ -270,7 +270,7 @@ fun Clock(
) {
val time = LocalTime.current
val context = LocalContext.current
val clockSettings: ClockWidgetSettings by inject()
val clockSettings: ClockWidgetSettings = koinInject()
val showSeconds by clockSettings.showSeconds.collectAsState(initial = false)
val useThemeColor by clockSettings.useThemeColor.collectAsState(initial = false)
val timeFormat by clockSettings.timeFormat.collectAsState(null)
@@ -20,7 +20,7 @@ import de.mm20.launcher2.ui.theme.typography.DefaultTypography
import de.mm20.launcher2.ui.theme.typography.getDeviceDefaultTypography
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.map
import org.koin.androidx.compose.inject
import org.koin.compose.koinInject
import de.mm20.launcher2.preferences.ColorScheme as ColorSchemePref
@@ -30,8 +30,8 @@ fun LauncherTheme(
) {
val context = LocalContext.current
val uiSettings: UiSettings by inject()
val themeRepository: ThemeRepository by inject()
val uiSettings: UiSettings = koinInject()
val themeRepository: ThemeRepository = koinInject()
val theme by remember {
uiSettings.theme.flatMapLatest {
@@ -20,7 +20,7 @@ import de.mm20.launcher2.themes.Theme
import de.mm20.launcher2.themes.get
import de.mm20.launcher2.themes.merge
import de.mm20.launcher2.ui.locals.LocalWallpaperColors
import org.koin.androidx.compose.inject
import org.koin.compose.koinInject
@Composable
fun lightColorSchemeOf(theme: Theme): ColorScheme {
@@ -80,7 +80,7 @@ fun colorSchemeOf(colorScheme: FullColorScheme, corePalette: PartialCorePalette)
@Composable
fun systemCorePalette(): CorePalette<Int> {
val uiSettings: UiSettings by inject()
val uiSettings: UiSettings = koinInject()
val compatModeColors by remember {
uiSettings.compatModeColors
}.collectAsState(false)