chore: update dependencies and fix deprecations

2026-01-25 20:11:04 +00:00 · 2026-01-09 19:36:04 +01:00
parent 1b21f5d4ab
commit fe84b22b6f
29 changed files with 147 additions and 123 deletions
--- a/app/src/main/java/app/revanced/manager/MainActivity.kt
+++ b/app/src/main/java/app/revanced/manager/MainActivity.kt
@@ -59,7 +59,6 @@ import app.revanced.manager.ui.viewmodel.SelectedAppInfoViewModel
 import app.revanced.manager.util.EventEffect
 import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel
-import org.koin.androidx.compose.navigation.koinNavViewModel
 import org.koin.core.parameter.parametersOf
 import org.koin.androidx.viewmodel.ext.android.getViewModel as getActivityViewModel

@@ -185,7 +184,7 @@ private fun ReVancedManager(vm: MainViewModel) {
                val data =
                    parentBackStackEntry.getComplexArg<SelectedApplicationInfo.ViewModelParams>()
                val viewModel =
-                    koinNavViewModel<SelectedAppInfoViewModel>(viewModelStoreOwner = parentBackStackEntry) {
+                    koinViewModel<SelectedAppInfoViewModel>(viewModelStoreOwner = parentBackStackEntry) {
                        parametersOf(data)
                    }

@@ -226,7 +225,7 @@ private fun ReVancedManager(vm: MainViewModel) {
            composable<SelectedApplicationInfo.PatchesSelector> {
                val data =
                    it.getComplexArg<SelectedApplicationInfo.PatchesSelector.ViewModelParams>()
-                val selectedAppInfoVm = koinNavViewModel<SelectedAppInfoViewModel>(
+                val selectedAppInfoVm = koinViewModel<SelectedAppInfoViewModel>(
                    viewModelStoreOwner = navController.navGraphEntry(it)
                )

@@ -243,7 +242,7 @@ private fun ReVancedManager(vm: MainViewModel) {
            composable<SelectedApplicationInfo.RequiredOptions> {
                val data =
                    it.getComplexArg<SelectedApplicationInfo.PatchesSelector.ViewModelParams>()
-                val selectedAppInfoVm = koinNavViewModel<SelectedAppInfoViewModel>(
+                val selectedAppInfoVm = koinViewModel<SelectedAppInfoViewModel>(
                    viewModelStoreOwner = navController.navGraphEntry(it)
                )

--- a/app/src/main/java/app/revanced/manager/di/ViewModelModule.kt
+++ b/app/src/main/java/app/revanced/manager/di/ViewModelModule.kt
@@ -1,7 +1,7 @@
 package app.revanced.manager.di

 import app.revanced.manager.ui.viewmodel.*
-import org.koin.androidx.viewmodel.dsl.viewModelOf
+import org.koin.core.module.dsl.*
 import org.koin.dsl.module

 val viewModelModule = module {
--- a/app/src/main/java/app/revanced/manager/network/service/HttpService.kt
+++ b/app/src/main/java/app/revanced/manager/network/service/HttpService.kt
@@ -16,8 +16,11 @@ import io.ktor.http.isSuccess
 import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.core.isNotEmpty
 import io.ktor.utils.io.core.readBytes
+import io.ktor.utils.io.exhausted
+import io.ktor.utils.io.readRemaining
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import kotlinx.io.asSink
 import kotlinx.serialization.json.Json
 import java.io.File
 import java.io.OutputStream
@@ -69,14 +72,12 @@ class HttpService(
    ) {
        http.prepareGet(builder).execute { httpResponse ->
            if (httpResponse.status.isSuccess()) {
-                val channel: ByteReadChannel = httpResponse.body()
                withContext(Dispatchers.IO) {
-                    while (!channel.isClosedForRead) {
+                    val channel: ByteReadChannel = httpResponse.body()
+                    val sink = outputStream.asSink()
+                    while (!channel.exhausted()) {
                        val packet = channel.readRemaining(DEFAULT_BUFFER_SIZE.toLong())
-                        while (packet.isNotEmpty) {
-                            val bytes = packet.readBytes()
-                            outputStream.write(bytes)
-                        }
+                        packet.transferTo(sink)
                    }
                }

--- a/app/src/main/java/app/revanced/manager/ui/component/AppIcon.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/AppIcon.kt
@@ -16,7 +16,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import coil.compose.AsyncImage
-import io.github.fornewid.placeholder.material3.placeholder
+import com.eygraber.compose.placeholder.material3.placeholder

@Composable
 fun AppIcon(
--- a/app/src/main/java/app/revanced/manager/ui/component/AppLabel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/AppLabel.kt
@@ -16,7 +16,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import app.revanced.manager.R
-import io.github.fornewid.placeholder.material3.placeholder
+import com.eygraber.compose.placeholder.material3.placeholder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

--- a/app/src/main/java/app/revanced/manager/ui/component/LoadingIndicator.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/LoadingIndicator.kt
@@ -14,7 +14,7 @@ fun LoadingIndicator(
    progress: () -> Float? = { null },
    color: Color = ProgressIndicatorDefaults.circularColor,
    strokeWidth: Dp = ProgressIndicatorDefaults.CircularStrokeWidth,
-    trackColor: Color = ProgressIndicatorDefaults.circularTrackColor,
+    trackColor: Color = ProgressIndicatorDefaults.circularIndeterminateTrackColor,
    strokeCap: StrokeCap = ProgressIndicatorDefaults.CircularDeterminateStrokeCap
 ) {
    progress()?.let {
--- a/app/src/main/java/app/revanced/manager/ui/component/Markdown.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/Markdown.kt
@@ -18,8 +18,6 @@ fun Markdown(
        colors = markdownColor(
            text = MaterialTheme.colorScheme.onSurfaceVariant,
            codeBackground = MaterialTheme.colorScheme.secondaryContainer,
-            codeText = MaterialTheme.colorScheme.onSecondaryContainer,
-            linkText = MaterialTheme.colorScheme.primary
        ),
        typography = markdownTypography(
            h1 = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
--- a/app/src/main/java/app/revanced/manager/ui/component/SearchBar.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/SearchBar.kt
@@ -29,7 +29,8 @@ fun SearchBar(
 ) {
    val colors = SearchBarColors(
        containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
-        dividerColor = MaterialTheme.colorScheme.outline
+        dividerColor = MaterialTheme.colorScheme.outline,
+        inputFieldColors = SearchBarDefaults.inputFieldColors()
    )
    val keyboardController = LocalSoftwareKeyboardController.current

--- a/app/src/main/java/app/revanced/manager/ui/component/SearchView.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/SearchView.kt
@@ -31,7 +31,8 @@ fun SearchView(
 ) {
    val colors = SearchBarColors(
        containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
-        dividerColor = MaterialTheme.colorScheme.outline
+        dividerColor = MaterialTheme.colorScheme.outline,
+        inputFieldColors = SearchBarDefaults.inputFieldColors()
    )
    val focusRequester = remember { FocusRequester() }
    val keyboardController = LocalSoftwareKeyboardController.current
--- a/app/src/main/java/app/revanced/manager/ui/model/PatcherStep.kt
+++ b/app/src/main/java/app/revanced/manager/ui/model/PatcherStep.kt
@@ -6,7 +6,7 @@ import app.revanced.manager.R
 import app.revanced.manager.patcher.StepId
 import kotlinx.parcelize.Parcelize

-enum class StepCategory(@StringRes val displayName: Int) {
+enum class StepCategory(@param:StringRes val displayName: Int) {
    PREPARING(R.string.patcher_step_group_preparing),
    PATCHING(R.string.patcher_step_group_patching),
    SAVING(R.string.patcher_step_group_saving)
--- a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
@@ -36,7 +36,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.TabRow
+import androidx.compose.material3.SecondaryTabRow
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.surfaceColorAtElevation
@@ -53,6 +53,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -100,6 +101,7 @@ fun DashboardScreen(
        false
    )
    val androidContext = LocalContext.current
+    val resources = LocalResources.current
    val composableScope = rememberCoroutineScope()
    val pagerState = rememberPagerState(
        initialPage = DashboardPage.DASHBOARD.ordinal,
@@ -234,7 +236,7 @@ fun DashboardScreen(
                    when (pagerState.currentPage) {
                        DashboardPage.DASHBOARD.ordinal -> {
                            if (availablePatches < 1) {
-                                androidContext.toast(androidContext.getString(R.string.no_patch_found))
+                                androidContext.toast(resources.getString(R.string.no_patch_found))
                                composableScope.launch {
                                    pagerState.animateScrollToPage(
                                        DashboardPage.BUNDLES.ordinal
@@ -259,7 +261,7 @@ fun DashboardScreen(
        }
    ) { paddingValues ->
        Column(Modifier.padding(paddingValues)) {
-            TabRow(
+            SecondaryTabRow(
                selectedTabIndex = pagerState.currentPage,
                containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.0.dp)
            ) {
--- a/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
@@ -40,6 +40,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import app.revanced.manager.R
@@ -69,6 +70,7 @@ fun PatcherScreen(
    }

    val context = LocalContext.current
+    val resources = LocalResources.current
    val exportApkLauncher =
        rememberLauncherForActivityResult(CreateDocument(APK_MIMETYPE), viewModel::export)

@@ -79,7 +81,7 @@ fun PatcherScreen(

    fun onPageBack() = when {
        patcherSucceeded == null -> showDismissConfirmationDialog = true
-        viewModel.isInstalling -> context.toast(context.getString(R.string.patcher_install_in_progress))
+        viewModel.isInstalling -> context.toast(resources.getString(R.string.patcher_install_in_progress))
        else -> onLeave()
    }

--- a/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
@@ -40,7 +40,7 @@ import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.ScrollableTabRow
+import androidx.compose.material3.SecondaryScrollableTabRow
 import androidx.compose.material3.SmallFloatingActionButton
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -392,7 +392,7 @@ fun PatchesSelectorScreen(
                .padding(top = 16.dp)
        ) {
            if (bundles.size > 1) {
-                ScrollableTabRow(
+                SecondaryScrollableTabRow(
                    selectedTabIndex = pagerState.currentPage,
                    containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.0.dp)
                ) {
--- a/app/src/main/java/app/revanced/manager/ui/screen/RequiredOptionsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/RequiredOptionsScreen.kt
@@ -13,7 +13,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.ScrollableTabRow
+import androidx.compose.material3.SecondaryScrollableTabRow
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
@@ -106,7 +106,7 @@ fun RequiredOptionsScreen(
                .padding(paddingValues)
        ) {
            if (list.isEmpty()) return@Column
-            else if (list.size > 1) ScrollableTabRow(
+            else if (list.size > 1) SecondaryScrollableTabRow(
                selectedTabIndex = pagerState.currentPage,
                containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.0.dp)
            ) {
--- a/app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt
@@ -32,6 +32,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -68,6 +69,7 @@ fun SelectedAppInfoScreen(
    vm: SelectedAppInfoViewModel
 ) {
    val context = LocalContext.current
+    val resources = LocalResources.current
    val networkInfo = koinInject<NetworkInfo>()
    val networkConnected = remember { networkInfo.isConnected() }
    val networkMetered = remember { !networkInfo.isUnmetered() }
@@ -118,7 +120,7 @@ fun SelectedAppInfoScreen(
                },
                onClick = patchClick@{
                    if (selectedPatchCount == 0) {
-                        context.toast(context.getString(R.string.no_patches_selected))
+                        context.toast(resources.getString(R.string.no_patches_selected))

                        return@patchClick
                    }
--- a/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
@@ -22,8 +22,8 @@ import app.revanced.manager.ui.model.navigation.Settings
 import org.koin.compose.koinInject

 private data class Section(
-    @StringRes val name: Int,
-    @StringRes val description: Int,
+    @param:StringRes val name: Int,
+    @param:StringRes val description: Int,
    val image: ImageVector,
    val destination: Settings.Destination,
 )
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt
@@ -1,5 +1,6 @@
 package app.revanced.manager.ui.screen.settings

+import android.annotation.SuppressLint
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
@@ -40,6 +41,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.semantics
@@ -67,8 +69,9 @@ fun AboutSettingsScreen(
    viewModel: AboutViewModel = koinViewModel()
 ) {
    val context = LocalContext.current
+    val resources = LocalResources.current
    // painterResource() is broken on release builds for some reason.
-    val icon = rememberDrawablePainter(drawable = remember {
+    val icon = rememberDrawablePainter(drawable = remember(resources) {
        AppCompatResources.getDrawable(context, R.drawable.ic_logo_ring)
    })

@@ -76,7 +79,7 @@ fun AboutSettingsScreen(
        viewModel.socials.partition(ReVancedSocial::preferred)
    }

-    val preferredSocialButtons = remember(preferredSocials, viewModel.donate, viewModel.contact) {
+    val preferredSocialButtons = remember(resources, preferredSocials, viewModel.donate, viewModel.contact) {
        preferredSocials.map {
            Triple(
                getSocialIcon(it.name),
@@ -89,7 +92,7 @@ fun AboutSettingsScreen(
            viewModel.donate?.let {
                Triple(
                    Icons.Outlined.FavoriteBorder,
-                    context.getString(R.string.donate),
+                    resources.getString(R.string.donate),
                    third = {
                        context.openUrl(it)
                    }
@@ -98,7 +101,7 @@ fun AboutSettingsScreen(
            viewModel.contact?.let {
                Triple(
                    Icons.Outlined.MailOutline,
-                    context.getString(R.string.contact),
+                    resources.getString(R.string.contact),
                    third = {
                        context.openUrl("mailto:$it")
                    }
@@ -131,7 +134,7 @@ fun AboutSettingsScreen(
            stringResource(R.string.contributors_description),
            third = nav@{
                if (!viewModel.isConnected) {
-                    context.toast(context.getString(R.string.no_network_toast))
+                    context.toast(resources.getString(R.string.no_network_toast))
                    return@nav
                }

@@ -153,7 +156,7 @@ fun AboutSettingsScreen(
    LaunchedEffect(developerTaps) {
        if (developerTaps == 0) return@LaunchedEffect
        if (showDeveloperSettings) {
-            snackbarHostState.showSnackbar(context.getString(R.string.developer_options_already_enabled))
+            snackbarHostState.showSnackbar(resources.getString(R.string.developer_options_already_enabled))
            developerTaps = 0
            return@LaunchedEffect
        }
@@ -161,7 +164,7 @@ fun AboutSettingsScreen(
        val remaining = DEVELOPER_OPTIONS_TAPS - developerTaps
        if (remaining > 0) {
            snackbarHostState.showSnackbar(
-                context.getString(
+                resources.getString(
                    R.string.developer_options_taps,
                    remaining
                ),
@@ -169,7 +172,7 @@ fun AboutSettingsScreen(
            )
        } else if (remaining == 0) {
            viewModel.showDeveloperSettings.update(true)
-            snackbarHostState.showSnackbar(context.getString(R.string.developer_options_enabled))
+            snackbarHostState.showSnackbar(resources.getString(R.string.developer_options_enabled))
        }

        // Reset the counter
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
@@ -38,6 +38,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -64,9 +65,10 @@ fun AdvancedSettingsScreen(
    viewModel: AdvancedSettingsViewModel = koinViewModel()
 ) {
    val context = LocalContext.current
-    val memoryLimit = remember {
+    val resources = LocalResources.current
+    val memoryLimit = remember(resources) {
        val activityManager = context.getSystemService<ActivityManager>()!!
-        context.getString(
+        resources.getString(
            R.string.device_memory_limit_format,
            activityManager.memoryClass,
            activityManager.largeMemoryClass
@@ -183,7 +185,7 @@ fun AdvancedSettingsScreen(
                            ClipData.newPlainText("Device Information", deviceContent)
                        )

-                        context.toast(context.getString(R.string.toast_copied_to_clipboard))
+                        context.toast(resources.getString(R.string.toast_copied_to_clipboard))
                    }.withHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
                ),
                headlineContent = stringResource(R.string.about_device),
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/ImportExportSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/ImportExportSettingsScreen.kt
@@ -36,6 +36,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -64,6 +65,7 @@ fun ImportExportSettingsScreen(
    vm: ImportExportViewModel = koinViewModel()
 ) {
    val context = LocalContext.current
+    val resources = LocalResources.current
    val coroutineScope = rememberCoroutineScope()
    var selectorDialog by rememberSaveable { mutableStateOf<(@Composable () -> Unit)?>(null) }

@@ -108,7 +110,7 @@ fun ImportExportSettingsScreen(
                vm.viewModelScope.launch {
                    uiSafe(context, R.string.failed_to_import_keystore, "Failed to import keystore") {
                        val result = vm.tryKeystoreImport(alias, pass)
-                        if (!result) context.toast(context.getString(R.string.import_keystore_wrong_credentials))
+                        if (!result) context.toast(resources.getString(R.string.import_keystore_wrong_credentials))
                    }
                }
            }
@@ -166,7 +168,7 @@ fun ImportExportSettingsScreen(
            GroupItem(
                onClick = {
                    if (!vm.canExport()) {
-                        context.toast(context.getString(R.string.export_keystore_unavailable))
+                        context.toast(resources.getString(R.string.export_keystore_unavailable))
                        return@GroupItem
                    }
                    exportKeystoreLauncher.launch("Manager.keystore")
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesSettingsScreen.kt
@@ -7,15 +7,18 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AppScaffold
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.Scrollbar
-import com.mikepenz.aboutlibraries.ui.compose.LibrariesContainer
 import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults
-import com.mikepenz.aboutlibraries.ui.compose.libraryColors
+import com.mikepenz.aboutlibraries.ui.compose.android.produceLibraries
+import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
+import com.mikepenz.aboutlibraries.ui.compose.m3.chipColors
+import com.mikepenz.aboutlibraries.ui.compose.m3.libraryColors

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -33,16 +36,23 @@ fun LicensesSettingsScreen(
    ) { paddingValues ->
        Column(modifier = Modifier.padding(paddingValues)) {
            val lazyListState = rememberLazyListState()
+            val libraries by produceLibraries(R.raw.aboutlibraries)
+            val chipColors = LibraryDefaults.chipColors(
+                containerColor = MaterialTheme.colorScheme.primary,
+                contentColor = MaterialTheme.colorScheme.onPrimary,
+            )

            LibrariesContainer(
                modifier = Modifier
                    .fillMaxSize(),
+                libraries = libraries,
                lazyListState = lazyListState,
                colors = LibraryDefaults.libraryColors(
-                    backgroundColor = MaterialTheme.colorScheme.background,
-                    contentColor = MaterialTheme.colorScheme.onBackground,
-                    badgeBackgroundColor = MaterialTheme.colorScheme.primary,
-                    badgeContentColor = MaterialTheme.colorScheme.onPrimary,
+                    libraryBackgroundColor = MaterialTheme.colorScheme.background,
+                    libraryContentColor = MaterialTheme.colorScheme.onBackground,
+                    versionChipColors = chipColors,
+                    licenseChipColors = chipColors,
+                    fundingChipColors = chipColors,
                )
            )
            Scrollbar(lazyListState = lazyListState, modifier = Modifier.padding(paddingValues))
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/update/UpdatesSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/update/UpdatesSettingsScreen.kt
@@ -12,6 +12,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AppTopBar
@@ -33,6 +34,7 @@ fun UpdatesSettingsScreen(
    vm: UpdatesSettingsViewModel = koinViewModel(),
 ) {
    val context = LocalContext.current
+    val resources = LocalResources.current
    val coroutineScope = rememberCoroutineScope()
    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())

@@ -57,7 +59,7 @@ fun UpdatesSettingsScreen(
                modifier = Modifier.clickable {
                    coroutineScope.launch {
                        if (!vm.isConnected) {
-                            context.toast(context.getString(R.string.no_network_toast))
+                            context.toast(resources.getString(R.string.no_network_toast))
                            return@launch
                        }
                        if (vm.checkForUpdates()) onUpdateClick()
@@ -70,7 +72,7 @@ fun UpdatesSettingsScreen(
            SettingsListItem(
                modifier = Modifier.clickable {
                    if (!vm.isConnected) {
-                        context.toast(context.getString(R.string.no_network_toast))
+                        context.toast(resources.getString(R.string.no_network_toast))
                        return@clickable
                    }
                    onChangelogClick()
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/ImportExportViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/ImportExportViewModel.kt
@@ -36,8 +36,8 @@ import kotlin.io.path.deleteExisting
 import kotlin.io.path.inputStream

 sealed class ResetDialogState(
-    @StringRes val titleResId: Int,
-    @StringRes val descriptionResId: Int,
+    @param:StringRes val titleResId: Int,
+    @param:StringRes val descriptionResId: Int,
    val onConfirm: () -> Unit,
    val dialogOptionName: String? = null
 ) {
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/UpdateViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/UpdateViewModel.kt
@@ -90,8 +90,10 @@ class UpdateViewModel(
                    http.download(location) {
                        url(release.downloadUrl)
                        onDownload { bytesSentTotal, contentLength ->
-                            downloadedSize = bytesSentTotal
-                            totalSize = contentLength
+                            withContext(Dispatchers.Main) {
+                                downloadedSize = bytesSentTotal
+                                contentLength?.let { totalSize = it }
+                            }
                        }
                    }
                    installUpdate()
--- a/app/src/main/java/app/revanced/manager/util/Util.kt
+++ b/app/src/main/java/app/revanced/manager/util/Util.kt
@@ -43,7 +43,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.launch
-import kotlinx.datetime.Clock
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.format.MonthNames
@@ -54,6 +53,7 @@ import java.util.Locale
 import kotlin.properties.PropertyDelegateProvider
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
+import kotlin.time.Clock

 typealias PatchSelection = Map<Int, Set<String>>
 typealias Options = Map<Int, Map<String, Map<String, Any?>>>
@@ -169,7 +169,7 @@ fun LocalDateTime.relativeTime(context: Context): String {
            else -> LocalDateTime.Format {
                monthName(MonthNames.ENGLISH_ABBREVIATED)
                char(' ')
-                dayOfMonth()
+                day()
                if (now.toLocalDateTime(TimeZone.UTC).year != this@relativeTime.year) {
                    chars(", ")
                    year()