lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

update libraries

Browse Source
This commit is contained in:
MM20 2025-05-09 21:38:11 +02:00
parent 92c4bce528
commit 4dc5f2e269
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
10 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/ui/src/main/java/de/mm20/launcher2/ui/base/ProvideSettings.kt
View File

@ -13,14 +13,14 @@ import de.mm20.launcher2.widgets.FavoritesWidget
import de.mm20.launcher2.widgets.WidgetRepository import de.mm20.launcher2.widgets.WidgetRepository
import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.distinctUntilChanged
import org.koin.androidx.compose.inject import org.koin.compose.koinInject
@Composable @Composable
fun ProvideSettings( fun ProvideSettings(
content: @Composable () -> Unit content: @Composable () -> Unit
) { ) {
val settings: UiSettings by inject() val settings: UiSettings = koinInject()
val widgetRepository: WidgetRepository by inject() val widgetRepository: WidgetRepository = koinInject()
val cardStyle by remember { val cardStyle by remember {
settings.cardStyle.distinctUntilChanged() settings.cardStyle.distinctUntilChanged()

4
app/ui/src/main/java/de/mm20/launcher2/ui/common/TagChip.kt
View File

@ -41,7 +41,7 @@ import de.mm20.launcher2.icons.VectorLayer
import de.mm20.launcher2.search.Tag import de.mm20.launcher2.search.Tag
import de.mm20.launcher2.ui.component.ShapedLauncherIcon import de.mm20.launcher2.ui.component.ShapedLauncherIcon
import de.mm20.launcher2.ui.ktx.toPixels import de.mm20.launcher2.ui.ktx.toPixels
import org.koin.androidx.compose.inject import org.koin.compose.koinInject
@Composable @Composable
fun TagChip( fun TagChip(
@ -92,7 +92,7 @@ fun TagChip(
if (it >= 2) 8.dp else 0.dp if (it >= 2) 8.dp else 0.dp
} }
val iconService by inject<IconService>() val iconService: IconService = koinInject()
val iconSize = InputChipDefaults.AvatarSize.toPixels() val iconSize = InputChipDefaults.AvatarSize.toPixels()
val icon by remember(tag, iconSize) { val icon by remember(tag, iconSize) {

7
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/ConfigureWidgetSheet.kt
View File

@ -96,6 +96,7 @@ import de.mm20.launcher2.widgets.WeatherWidget
import de.mm20.launcher2.widgets.Widget import de.mm20.launcher2.widgets.Widget
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import org.koin.androidx.compose.get import org.koin.androidx.compose.get
import org.koin.compose.koinInject
import java.time.ZonedDateTime import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter import java.time.format.DateTimeFormatter
import kotlin.math.roundToInt import kotlin.math.roundToInt
@ -501,9 +502,9 @@ fun ColumnScope.ConfigureCalendarWidget(
widget: CalendarWidget, widget: CalendarWidget,
onWidgetUpdated: (CalendarWidget) -> Unit onWidgetUpdated: (CalendarWidget) -> Unit
) { ) {
val calendarRepository: CalendarRepository = get() val calendarRepository: CalendarRepository = koinInject()
val permissionsManager: PermissionsManager = get() val permissionsManager: PermissionsManager = koinInject()
val pluginRepository: PluginRepository = get() val pluginRepository: PluginRepository = koinInject()
val calendars by remember { val calendars by remember {
calendarRepository.getCalendars().map { calendarRepository.getCalendars().map {
it.sortedBy { it.name } it.sortedBy { it.name }

4
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidget.kt
View File

@ -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.locals.LocalPreferDarkContentOverWallpaper
import de.mm20.launcher2.ui.settings.clockwidget.ClockWidgetSettingsScreenVM import de.mm20.launcher2.ui.settings.clockwidget.ClockWidgetSettingsScreenVM
import de.mm20.launcher2.ui.utils.isTwentyFourHours import de.mm20.launcher2.ui.utils.isTwentyFourHours
import org.koin.androidx.compose.inject import org.koin.compose.koinInject
@Composable @Composable
fun ClockWidget( fun ClockWidget(
@ -270,7 +270,7 @@ fun Clock(
) { ) {
val time = LocalTime.current val time = LocalTime.current
val context = LocalContext.current val context = LocalContext.current
val clockSettings: ClockWidgetSettings by inject() val clockSettings: ClockWidgetSettings = koinInject()
val showSeconds by clockSettings.showSeconds.collectAsState(initial = false) val showSeconds by clockSettings.showSeconds.collectAsState(initial = false)
val useThemeColor by clockSettings.useThemeColor.collectAsState(initial = false) val useThemeColor by clockSettings.useThemeColor.collectAsState(initial = false)
val timeFormat by clockSettings.timeFormat.collectAsState(null) val timeFormat by clockSettings.timeFormat.collectAsState(null)

6
app/ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt
View File

@ -20,7 +20,7 @@ import de.mm20.launcher2.ui.theme.typography.DefaultTypography
import de.mm20.launcher2.ui.theme.typography.getDeviceDefaultTypography import de.mm20.launcher2.ui.theme.typography.getDeviceDefaultTypography
import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import org.koin.androidx.compose.inject import org.koin.compose.koinInject
import de.mm20.launcher2.preferences.ColorScheme as ColorSchemePref import de.mm20.launcher2.preferences.ColorScheme as ColorSchemePref
@ -30,8 +30,8 @@ fun LauncherTheme(
) { ) {
val context = LocalContext.current val context = LocalContext.current
val uiSettings: UiSettings by inject() val uiSettings: UiSettings = koinInject()
val themeRepository: ThemeRepository by inject() val themeRepository: ThemeRepository = koinInject()
val theme by remember { val theme by remember {
uiSettings.theme.flatMapLatest { uiSettings.theme.flatMapLatest {

4
app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Custom.kt
View File

@ -20,7 +20,7 @@ import de.mm20.launcher2.themes.Theme
import de.mm20.launcher2.themes.get import de.mm20.launcher2.themes.get
import de.mm20.launcher2.themes.merge import de.mm20.launcher2.themes.merge
import de.mm20.launcher2.ui.locals.LocalWallpaperColors import de.mm20.launcher2.ui.locals.LocalWallpaperColors
import org.koin.androidx.compose.inject import org.koin.compose.koinInject
@Composable @Composable
fun lightColorSchemeOf(theme: Theme): ColorScheme { fun lightColorSchemeOf(theme: Theme): ColorScheme {
@ -80,7 +80,7 @@ fun colorSchemeOf(colorScheme: FullColorScheme, corePalette: PartialCorePalette)
@Composable @Composable
fun systemCorePalette(): CorePalette<Int> { fun systemCorePalette(): CorePalette<Int> {
val uiSettings: UiSettings by inject() val uiSettings: UiSettings = koinInject()
val compatModeColors by remember { val compatModeColors by remember {
uiSettings.compatModeColors uiSettings.compatModeColors
}.collectAsState(false) }.collectAsState(false)

4
data/searchable/src/main/java/de/mm20/launcher2/searchable/SavableSearchableRepository.kt
View File

@ -28,7 +28,7 @@ import org.json.JSONException
import org.koin.core.component.KoinComponent import org.koin.core.component.KoinComponent
import org.koin.core.component.get import org.koin.core.component.get
import org.koin.core.error.InstanceCreationException import org.koin.core.error.InstanceCreationException
import org.koin.core.error.NoBeanDefFoundException import org.koin.core.error.NoDefinitionFoundException
import org.koin.core.qualifier.named import org.koin.core.qualifier.named
import java.io.File import java.io.File
@ -404,7 +404,7 @@ internal class SavableSearchableRepositoryImpl(
private suspend fun fromDatabaseEntity(entity: SavedSearchableEntity): SavedSearchable { private suspend fun fromDatabaseEntity(entity: SavedSearchableEntity): SavedSearchable {
val deserializer: SearchableDeserializer? = try { val deserializer: SearchableDeserializer? = try {
get(named(entity.type)) get(named(entity.type))
} catch (e: NoBeanDefFoundException) { } catch (e: NoDefinitionFoundException) {
CrashReporter.logException(e) CrashReporter.logException(e)
null null
} catch (e: InstanceCreationException) { } catch (e: InstanceCreationException) {

2
data/websites/src/main/java/de/mm20/launcher2/websites/WebsiteRepository.kt
View File

@ -17,8 +17,8 @@ import okhttp3.HttpUrl
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
import org.jsoup.Jsoup import org.jsoup.Jsoup
import org.jsoup.UncheckedIOException
import java.io.IOException import java.io.IOException
import java.io.UncheckedIOException
import java.net.MalformedURLException import java.net.MalformedURLException
import java.net.URISyntaxException import java.net.URISyntaxException
import java.net.URL import java.net.URL

52
gradle/libs.versions.toml
View File

@ -1,7 +1,7 @@
[versions] [versions]
mustache = "0.9.7" mustache = "0.9.14"
jacksonCore = "2.12.7" jacksonCore = "2.19.0"
jacksonDataformatYaml = "2.12.7" jacksonDataformatYaml = "2.19.0"
minSdk = "26" minSdk = "26"
compileSdk = "36" compileSdk = "36"
targetSdk = "36" targetSdk = "36"
@ -9,20 +9,20 @@ targetSdk = "36"
pluginSdk = "2.2.0" pluginSdk = "2.2.0"
gradle = "8.1.2" gradle = "8.1.2"
android-gradle-plugin = "8.6.1" android-gradle-plugin = "8.10.0"
ksp-gradle-plugin = "2.1.20-2.0.0" ksp-gradle-plugin = "2.1.20-2.0.0"
kotlin = "2.1.20" kotlin = "2.1.20"
kotlinx-coroutines = "1.9.0" kotlinx-coroutines = "1.10.2"
kotlinx-immutable = "0.3.5" kotlinx-immutable = "0.3.8"
kotlinx-serialization = "1.8.0" kotlinx-serialization = "1.8.1"
jetbrains-markdown = "0.7.3" jetbrains-markdown = "0.7.3"
androidx-compose = "1.8.0-rc03" androidx-compose = "1.9.0-alpha02"
androidx-compose-material3 = "1.4.0-alpha12" androidx-compose-material3 = "1.4.0-alpha14"
androidx-compose-materialicons = "1.7.8" androidx-compose-materialicons = "1.7.8"
androidx-lifecycle = "2.8.7" androidx-lifecycle = "2.9.0"
androidx-core = "1.16.0" androidx-core = "1.16.0"
androidx-appcompat = "1.7.0" androidx-appcompat = "1.7.0"
androidx-activity = "1.10.1" androidx-activity = "1.10.1"
@ -32,19 +32,19 @@ androidx-work = "2.9.0"
androidx-browser = "1.8.0" androidx-browser = "1.8.0"
androidx-palette = "1.0.0" androidx-palette = "1.0.0"
androidx-media2 = "1.3.0" androidx-media2 = "1.3.0"
androidx-room = "2.7.0" androidx-room = "2.7.1"
androidx-constraint-layout = "1.1.1" androidx-constraint-layout = "1.1.1"
androidx-emojipicker = "1.5.0" androidx-emojipicker = "1.5.0"
accompanist = "0.33.2-alpha" accompanist = "0.36.0"
coil = "2.3.0" coil = "2.7.0"
koin = "3.2.0" koin = "4.0.4"
retrofit = "2.9.0" retrofit = "2.11.0"
junit = "4.13.2" junit = "4.13.2"
junitVersion = "1.1.5" junitVersion = "1.2.1"
espressoCore = "3.5.1" espressoCore = "3.6.1"
osmOpeningHours = "0.1.0" osmOpeningHours = "0.2.0"
[libraries] [libraries]
mustache-compiler = { module = "com.github.spullara.mustache.java:compiler", version.ref = "mustache" } mustache-compiler = { module = "com.github.spullara.mustache.java:compiler", version.ref = "mustache" }
@ -97,13 +97,13 @@ accompanist-flowlayout = { group = "com.google.accompanist", name = "accompanist
accompanist-navigationanimation = { group = "com.google.accompanist", name = "accompanist-navigation-animation", version.ref = "accompanist" } accompanist-navigationanimation = { group = "com.google.accompanist", name = "accompanist-navigation-animation", version.ref = "accompanist" }
androidx-constraintlayout-compose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "androidx-constraint-layout" } androidx-constraintlayout-compose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "androidx-constraint-layout" }
androidx-transition = { group = "androidx.transition", name = "transition", version = "1.5.1" } androidx-transition = { group = "androidx.transition", name = "transition", version = "1.6.0" }
androidx-exifinterface = { group = "androidx.exifinterface", name = "exifinterface", version = "1.4.0" } androidx-exifinterface = { group = "androidx.exifinterface", name = "exifinterface", version = "1.4.1" }
androidx-securitycrypto = { group = "androidx.security", name = "security-crypto", version = "1.1.0-alpha07" } androidx-securitycrypto = { group = "androidx.security", name = "security-crypto", version = "1.1.0-alpha07" }
androidx-datastore = { group = "androidx.datastore", name = "datastore", version = "1.1.4" } androidx-datastore = { group = "androidx.datastore", name = "datastore", version = "1.1.6" }
androidx-emojipicker = { group = "androidx.emoji2", name = "emoji2-emojipicker", version.ref = "androidx-emojipicker" } androidx-emojipicker = { group = "androidx.emoji2", name = "emoji2-emojipicker", version.ref = "androidx-emojipicker" }
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version = "2.9.0-beta01" } androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version = "2.9.0" }
okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version = "4.12.0" } okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version = "4.12.0" }
retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
@ -114,9 +114,9 @@ coil-svg = { group = "io.coil-kt", name = "coil-svg", version.ref = "coil" }
coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" } coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary", version = "2.10" } leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary", version = "2.10" }
suncalc = { group = "org.shredzone.commons", name = "commons-suncalc", version = "3.7" } suncalc = { group = "org.shredzone.commons", name = "commons-suncalc", version = "3.11" }
jsoup = { group = "org.jsoup", name = "jsoup", version = "1.16.1" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.20.1" }
commons-text = { group = "org.apache.commons", name = "commons-text", version = "1.10.0" } commons-text = { group = "org.apache.commons", name = "commons-text", version = "1.13.1" }
stringsimilarity = { group = "com.aallam.similarity", name = "string-similarity-kotlin", version = "0.1.0" } stringsimilarity = { group = "com.aallam.similarity", name = "string-similarity-kotlin", version = "0.1.0" }
# 4.4.2 is the last GPL compatible version, don't update to 5.x # 4.4.2 is the last GPL compatible version, don't update to 5.x
@ -126,7 +126,7 @@ koin-android = { group = "io.insert-koin", name = "koin-android", version.ref =
koin-androidxcompose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koin" } koin-androidxcompose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koin" }
tinypinyin = { group = "com.github.promeg", name = "tinypinyin", version = "2.0.3" } tinypinyin = { group = "com.github.promeg", name = "tinypinyin", version = "2.0.3" }
emoji4j = { group = "com.sigpwned", name = "emoji4j-core", version = "15.0.1" } emoji4j = { group = "com.sigpwned", name = "emoji4j-core", version = "16.0.0" }
junit = { group = "junit", name = "junit", version.ref = "junit" } junit = { group = "junit", name = "junit", version.ref = "junit" }
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Sun Feb 09 12:41:42 CET 2025 #Sun Feb 09 12:41:42 CET 2025
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists