From 0df39a1136eeda0bf42ba1886f04b6a4a07a6d41 Mon Sep 17 00:00:00 2001
From: Ax333l <main@axelen.xyz>
Date: Fri, 5 Apr 2024 19:09:39 +0200
Subject: [PATCH] refactor: replace deprecated functions

---
 app/build.gradle.kts                                 |  5 +++--
 .../main/java/app/revanced/manager/MainActivity.kt   |  2 +-
 .../data/room/apps/installed/InstalledAppDao.kt      |  7 ++++---
 .../revanced/manager/data/room/options/OptionDao.kt  |  5 ++---
 .../manager/data/room/selection/SelectionDao.kt      | 12 +++++++-----
 .../app/revanced/manager/ui/component/AppIcon.kt     |  2 +-
 .../app/revanced/manager/ui/component/AppLabel.kt    |  2 +-
 .../manager/ui/component/patches/OptionFields.kt     |  4 ++--
 .../revanced/manager/ui/screen/AppSelectorScreen.kt  |  4 ++--
 .../revanced/manager/ui/screen/DashboardScreen.kt    |  4 ++--
 .../manager/ui/screen/InstalledAppsScreen.kt         |  4 ++--
 .../manager/ui/screen/PatchesSelectorScreen.kt       |  7 ++-----
 .../manager/ui/screen/SelectedAppInfoScreen.kt       |  6 +++---
 .../app/revanced/manager/ui/screen/SettingsScreen.kt |  7 +++----
 .../manager/ui/screen/VersionSelectorScreen.kt       |  3 ---
 .../ui/screen/settings/AboutSettingsScreen.kt        |  4 ++--
 .../ui/screen/settings/AdvancedSettingsScreen.kt     |  4 ++--
 .../manager/ui/screen/settings/ContributorScreen.kt  |  5 ++---
 .../ui/screen/settings/DownloadsSettingsScreen.kt    |  4 ++--
 .../ui/screen/settings/ImportExportSettingsScreen.kt |  4 ++--
 .../ui/screen/settings/update/ChangelogsScreen.kt    |  4 ++--
 .../ui/screen/settings/update/UpdateScreen.kt        |  4 ++--
 .../screen/settings/update/UpdatesSettingsScreen.kt  |  4 ++--
 gradle/libs.versions.toml                            |  6 ++++--
 24 files changed, 55 insertions(+), 58 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f5e4fd54..e11dd0e6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -124,8 +124,9 @@ dependencies {
 
     // Accompanist
     implementation(libs.accompanist.drawablepainter)
-    implementation(libs.accompanist.webview)
-    implementation(libs.accompanist.placeholder)
+
+    // Placeholder
+    implementation(libs.placeholder.material3)
 
     // HTML Scraper
     implementation(libs.skrapeit.dsl)
diff --git a/app/src/main/java/app/revanced/manager/MainActivity.kt b/app/src/main/java/app/revanced/manager/MainActivity.kt
index a2d0c855..e3202399 100644
--- a/app/src/main/java/app/revanced/manager/MainActivity.kt
+++ b/app/src/main/java/app/revanced/manager/MainActivity.kt
@@ -35,7 +35,7 @@ import dev.olshevski.navigation.reimagined.pop
 import dev.olshevski.navigation.reimagined.popUpTo
 import dev.olshevski.navigation.reimagined.rememberNavController
 import org.koin.core.parameter.parametersOf
-import org.koin.androidx.compose.getViewModel as getComposeViewModel
+import org.koin.androidx.compose.koinViewModel as getComposeViewModel
 import org.koin.androidx.viewmodel.ext.android.getViewModel as getAndroidViewModel
 
 class MainActivity : ComponentActivity() {
diff --git a/app/src/main/java/app/revanced/manager/data/room/apps/installed/InstalledAppDao.kt b/app/src/main/java/app/revanced/manager/data/room/apps/installed/InstalledAppDao.kt
index 90d40b9f..c290cc5e 100644
--- a/app/src/main/java/app/revanced/manager/data/room/apps/installed/InstalledAppDao.kt
+++ b/app/src/main/java/app/revanced/manager/data/room/apps/installed/InstalledAppDao.kt
@@ -3,7 +3,7 @@ package app.revanced.manager.data.room.apps.installed
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
-import androidx.room.MapInfo
+import androidx.room.MapColumn
 import androidx.room.Query
 import androidx.room.Transaction
 import androidx.room.Upsert
@@ -17,12 +17,13 @@ interface InstalledAppDao {
     @Query("SELECT * FROM installed_app WHERE current_package_name = :packageName")
     suspend fun get(packageName: String): InstalledApp?
 
-    @MapInfo(keyColumn = "bundle", valueColumn = "patch_name")
     @Query(
         "SELECT bundle, patch_name FROM applied_patch" +
                 " WHERE package_name = :packageName"
     )
-    suspend fun getPatchesSelection(packageName: String): Map<Int, List<String>>
+    suspend fun getPatchesSelection(packageName: String): Map<@MapColumn("bundle") Int, List<@MapColumn(
+        "patch_name"
+    ) String>>
 
     @Transaction
     suspend fun upsertApp(installedApp: InstalledApp, appliedPatches: List<AppliedPatch>) {
diff --git a/app/src/main/java/app/revanced/manager/data/room/options/OptionDao.kt b/app/src/main/java/app/revanced/manager/data/room/options/OptionDao.kt
index fa343a6d..5a147f6f 100644
--- a/app/src/main/java/app/revanced/manager/data/room/options/OptionDao.kt
+++ b/app/src/main/java/app/revanced/manager/data/room/options/OptionDao.kt
@@ -2,7 +2,7 @@ package app.revanced.manager.data.room.options
 
 import androidx.room.Dao
 import androidx.room.Insert
-import androidx.room.MapInfo
+import androidx.room.MapColumn
 import androidx.room.Query
 import androidx.room.Transaction
 import kotlinx.coroutines.flow.Flow
@@ -10,13 +10,12 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 abstract class OptionDao {
     @Transaction
-    @MapInfo(keyColumn = "patch_bundle")
     @Query(
         "SELECT patch_bundle, `group`, patch_name, `key`, value FROM option_groups" +
                 " LEFT JOIN options ON uid = options.`group`" +
                 " WHERE package_name = :packageName"
     )
-    abstract suspend fun getOptions(packageName: String): Map<Int, List<Option>>
+    abstract suspend fun getOptions(packageName: String): Map<@MapColumn("patch_bundle") Int, List<Option>>
 
     @Query("SELECT uid FROM option_groups WHERE patch_bundle = :bundleUid AND package_name = :packageName")
     abstract suspend fun getGroupId(bundleUid: Int, packageName: String): Int?
diff --git a/app/src/main/java/app/revanced/manager/data/room/selection/SelectionDao.kt b/app/src/main/java/app/revanced/manager/data/room/selection/SelectionDao.kt
index 7cf6dd79..14ad1d87 100644
--- a/app/src/main/java/app/revanced/manager/data/room/selection/SelectionDao.kt
+++ b/app/src/main/java/app/revanced/manager/data/room/selection/SelectionDao.kt
@@ -2,29 +2,31 @@ package app.revanced.manager.data.room.selection
 
 import androidx.room.Dao
 import androidx.room.Insert
-import androidx.room.MapInfo
+import androidx.room.MapColumn
 import androidx.room.Query
 import androidx.room.Transaction
 
 @Dao
 abstract class SelectionDao {
     @Transaction
-    @MapInfo(keyColumn = "patch_bundle", valueColumn = "patch_name")
     @Query(
         "SELECT patch_bundle, patch_name FROM patch_selections" +
                 " LEFT JOIN selected_patches ON uid = selected_patches.selection" +
                 " WHERE package_name = :packageName"
     )
-    abstract suspend fun getSelectedPatches(packageName: String): Map<Int, List<String>>
+    abstract suspend fun getSelectedPatches(packageName: String): Map<@MapColumn("patch_bundle") Int, List<@MapColumn(
+        "patch_name"
+    ) String>>
 
     @Transaction
-    @MapInfo(keyColumn = "package_name", valueColumn = "patch_name")
     @Query(
         "SELECT package_name, patch_name FROM patch_selections" +
                 " LEFT JOIN selected_patches ON uid = selected_patches.selection" +
                 " WHERE patch_bundle = :bundleUid"
     )
-    abstract suspend fun exportSelection(bundleUid: Int): Map<String, List<String>>
+    abstract suspend fun exportSelection(bundleUid: Int): Map<@MapColumn("package_name") String, List<@MapColumn(
+        "patch_name"
+    ) String>>
 
     @Query("SELECT uid FROM patch_selections WHERE patch_bundle = :bundleUid AND package_name = :packageName")
     abstract suspend fun getSelectionId(bundleUid: Int, packageName: String): Int?
diff --git a/app/src/main/java/app/revanced/manager/ui/component/AppIcon.kt b/app/src/main/java/app/revanced/manager/ui/component/AppIcon.kt
index 6eb101f9..a308f174 100644
--- 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 com.google.accompanist.placeholder.placeholder
+import io.github.fornewid.placeholder.material3.placeholder
 
 @Composable
 fun AppIcon(
diff --git a/app/src/main/java/app/revanced/manager/ui/component/AppLabel.kt b/app/src/main/java/app/revanced/manager/ui/component/AppLabel.kt
index 9723e58d..33a1e201 100644
--- 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 com.google.accompanist.placeholder.placeholder
+import io.github.fornewid.placeholder.material3.placeholder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
diff --git a/app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt b/app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt
index 7647eccb..a291c46d 100644
--- a/app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt
@@ -29,7 +29,7 @@ import app.revanced.manager.R
 import app.revanced.manager.data.platform.Filesystem
 import app.revanced.manager.patcher.patch.Option
 import app.revanced.manager.util.toast
-import org.koin.compose.rememberKoinInject
+import org.koin.compose.koinInject
 
 // Composable functions do not support function references, so we have to use composable lambdas instead.
 private typealias OptionImpl = @Composable (Option, Any?, (Any?) -> Unit) -> Unit
@@ -60,7 +60,7 @@ private fun StringOptionDialog(
         mutableStateOf(value.orEmpty())
     }
 
-    val fs: Filesystem = rememberKoinInject()
+    val fs: Filesystem = koinInject()
     val (contract, permissionName) = fs.permissionContract()
     val permissionLauncher = rememberLauncherForActivityResult(contract = contract) {
         showFileDialog = it
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/AppSelectorScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/AppSelectorScreen.kt
index 658a90f2..cd07cbde 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/AppSelectorScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/AppSelectorScreen.kt
@@ -33,7 +33,7 @@ import app.revanced.manager.ui.component.NonSuggestedVersionDialog
 import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.ui.viewmodel.AppSelectorViewModel
 import app.revanced.manager.util.APK_MIMETYPE
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -41,7 +41,7 @@ fun AppSelectorScreen(
     onAppClick: (packageName: String) -> Unit,
     onStorageClick: (SelectedApp.Local) -> Unit,
     onBackClick: () -> Unit,
-    vm: AppSelectorViewModel = getViewModel()
+    vm: AppSelectorViewModel = koinViewModel()
 ) {
     SideEffect {
         vm.onStorageClick = onStorageClick
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
index dfe82a74..489fe8f1 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
@@ -52,7 +52,7 @@ import app.revanced.manager.ui.model.BundleType
 import app.revanced.manager.ui.viewmodel.DashboardViewModel
 import app.revanced.manager.util.toast
 import kotlinx.coroutines.launch
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 enum class DashboardPage(
     val titleResId: Int,
@@ -65,7 +65,7 @@ enum class DashboardPage(
 @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
 @Composable
 fun DashboardScreen(
-    vm: DashboardViewModel = getViewModel(),
+    vm: DashboardViewModel = koinViewModel(),
     onAppSelectorClick: () -> Unit,
     onSettingsClick: () -> Unit,
     onAppClick: (InstalledApp) -> Unit
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/InstalledAppsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/InstalledAppsScreen.kt
index b0ec8ece..06a9d7bd 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/InstalledAppsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/InstalledAppsScreen.kt
@@ -27,12 +27,12 @@ import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.ui.component.LoadingIndicator
 import app.revanced.manager.ui.component.NotificationCard
 import app.revanced.manager.ui.viewmodel.InstalledAppsViewModel
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Composable
 fun InstalledAppsScreen(
     onAppClick: (InstalledApp) -> Unit,
-    viewModel: InstalledAppsViewModel = getViewModel()
+    viewModel: InstalledAppsViewModel = koinViewModel()
 ) {
     val installedApps by viewModel.apps.collectAsStateWithLifecycle(initialValue = null)
 
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
index 7856b71c..8f231934 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
@@ -21,7 +21,6 @@ import androidx.compose.material.icons.outlined.Restore
 import androidx.compose.material.icons.outlined.Save
 import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material.icons.outlined.Settings
-import androidx.compose.material.icons.outlined.WarningAmber
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -48,11 +47,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
@@ -73,7 +70,7 @@ import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
 import app.revanced.manager.util.isScrollingUp
 import kotlinx.coroutines.launch
-import org.koin.compose.rememberKoinInject
+import org.koin.compose.koinInject
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
 @Composable
@@ -390,7 +387,7 @@ fun SelectionWarningDialog(
     onCancel: () -> Unit,
     onConfirm: (Boolean) -> Unit
 ) {
-    val prefs: PreferencesManager = rememberKoinInject()
+    val prefs: PreferencesManager = koinInject()
 
     DangerousActionDialogBase(
         onCancel = onCancel,
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt
index e6f96524..f38aa457 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt
@@ -39,7 +39,7 @@ import dev.olshevski.navigation.reimagined.NavBackHandler
 import dev.olshevski.navigation.reimagined.navigate
 import dev.olshevski.navigation.reimagined.pop
 import dev.olshevski.navigation.reimagined.rememberNavController
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 import org.koin.core.parameter.parametersOf
 
 @Composable
@@ -122,7 +122,7 @@ fun SelectedAppInfoScreen(
                     vm.selectedApp = it
                     navController.pop()
                 },
-                viewModel = getViewModel { parametersOf(packageName) }
+                viewModel = koinViewModel { parametersOf(packageName) }
             )
 
             is SelectedAppInfoDestination.PatchesSelector -> PatchesSelectorScreen(
@@ -131,7 +131,7 @@ fun SelectedAppInfoScreen(
                     navController.pop()
                 },
                 onBackClick = navController::pop,
-                vm = getViewModel {
+                vm = koinViewModel {
                     parametersOf(
                         PatchesSelectorViewModel.Params(
                             destination.app,
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
index 38c11452..382efa0e 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
@@ -34,9 +34,8 @@ import app.revanced.manager.ui.screen.settings.update.UpdateScreen
 import app.revanced.manager.ui.screen.settings.update.UpdatesSettingsScreen
 import app.revanced.manager.ui.viewmodel.SettingsViewModel
 import dev.olshevski.navigation.reimagined.*
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 import org.koin.core.parameter.parametersOf
-import org.koin.androidx.compose.getViewModel as getComposeViewModel
 
 @SuppressLint("BatteryLife")
 @OptIn(ExperimentalMaterial3Api::class)
@@ -44,7 +43,7 @@ import org.koin.androidx.compose.getViewModel as getComposeViewModel
 fun SettingsScreen(
     onBackClick: () -> Unit,
     startDestination: SettingsDestination,
-    viewModel: SettingsViewModel = getViewModel()
+    viewModel: SettingsViewModel = koinViewModel()
 ) {
     val navController = rememberNavController(startDestination)
 
@@ -127,7 +126,7 @@ fun SettingsScreen(
 
             is SettingsDestination.Update -> UpdateScreen(
                 onBackClick = backClick,
-                vm = getComposeViewModel {
+                vm = koinViewModel {
                     parametersOf(
                         destination.downloadOnScreenEntry
                     )
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/VersionSelectorScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/VersionSelectorScreen.kt
index dc7a7dd7..388b5dee 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/VersionSelectorScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/VersionSelectorScreen.kt
@@ -20,10 +20,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
diff --git 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
index 5034fe39..c4425913 100644
--- 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
@@ -42,7 +42,7 @@ import app.revanced.manager.ui.viewmodel.AboutViewModel.Companion.getSocialIcon
 import app.revanced.manager.util.isDebuggable
 import app.revanced.manager.util.openUrl
 import com.google.accompanist.drawablepainter.rememberDrawablePainter
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
 @Composable
@@ -50,7 +50,7 @@ fun AboutSettingsScreen(
     onBackClick: () -> Unit,
     onContributorsClick: () -> Unit,
     onLicensesClick: () -> Unit,
-    viewModel: AboutViewModel = getViewModel()
+    viewModel: AboutViewModel = koinViewModel()
 ) {
     val context = LocalContext.current
     // painterResource() is broken on release builds for some reason.
diff --git 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
index cf9aac71..f46849c8 100644
--- 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,13 +38,13 @@ import app.revanced.manager.ui.component.settings.BooleanItem
 import app.revanced.manager.ui.component.settings.IntegerItem
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.AdvancedSettingsViewModel
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AdvancedSettingsScreen(
     onBackClick: () -> Unit,
-    vm: AdvancedSettingsViewModel = getViewModel()
+    vm: AdvancedSettingsViewModel = koinViewModel()
 ) {
     val context = LocalContext.current
     val memoryLimit = remember {
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorScreen.kt
index 586e1c80..d4995aad 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorScreen.kt
@@ -7,7 +7,6 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material3.*
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -33,13 +32,13 @@ import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.ui.component.LoadingIndicator
 import app.revanced.manager.ui.viewmodel.ContributorViewModel
 import coil.compose.AsyncImage
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ContributorScreen(
     onBackClick: () -> Unit,
-    viewModel: ContributorViewModel = getViewModel()
+    viewModel: ContributorViewModel = koinViewModel()
 ) {
     val repositories = viewModel.repositories
     Scaffold(
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt
index 372dd30b..432c4808 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt
@@ -23,13 +23,13 @@ import app.revanced.manager.ui.component.GroupHeader
 import app.revanced.manager.ui.component.settings.BooleanItem
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.DownloadsViewModel
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun DownloadsSettingsScreen(
     onBackClick: () -> Unit,
-    viewModel: DownloadsViewModel = getViewModel()
+    viewModel: DownloadsViewModel = koinViewModel()
 ) {
     val prefs = viewModel.prefs
 
diff --git 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
index 827c9832..1f15f469 100644
--- 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
@@ -38,13 +38,13 @@ import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.ImportExportViewModel
 import app.revanced.manager.util.toast
 import kotlinx.coroutines.launch
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ImportExportSettingsScreen(
     onBackClick: () -> Unit,
-    vm: ImportExportViewModel = getViewModel()
+    vm: ImportExportViewModel = koinViewModel()
 ) {
     val context = LocalContext.current
 
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsScreen.kt
index 72799104..315bc1a1 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsScreen.kt
@@ -25,13 +25,13 @@ import app.revanced.manager.ui.component.settings.Changelog
 import app.revanced.manager.ui.viewmodel.ChangelogsViewModel
 import app.revanced.manager.util.formatNumber
 import app.revanced.manager.util.relativeTime
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ChangelogsScreen(
     onBackClick: () -> Unit,
-    vm: ChangelogsViewModel = getViewModel()
+    vm: ChangelogsViewModel = koinViewModel()
 ) {
     val changelogs = vm.changelogs
 
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/settings/update/UpdateScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/update/UpdateScreen.kt
index c8ef0412..cb1639f4 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/update/UpdateScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/update/UpdateScreen.kt
@@ -44,14 +44,14 @@ import com.gigamole.composefadingedges.content.FadingEdgesContentType
 import com.gigamole.composefadingedges.content.scrollconfig.FadingEdgesScrollConfig
 import com.gigamole.composefadingedges.fill.FadingEdgesFillType
 import com.gigamole.composefadingedges.verticalFadingEdges
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 @Stable
 fun UpdateScreen(
     onBackClick: () -> Unit,
-    vm: UpdateViewModel = getViewModel()
+    vm: UpdateViewModel = koinViewModel()
 ) {
     Scaffold(
         topBar = {
diff --git 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
index 7b06ab1a..96aa2cd2 100644
--- 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
@@ -16,7 +16,7 @@ import app.revanced.manager.ui.component.settings.BooleanItem
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.UpdatesSettingsViewModel
 import kotlinx.coroutines.launch
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -24,7 +24,7 @@ fun UpdatesSettingsScreen(
     onBackClick: () -> Unit,
     onChangelogClick: () -> Unit,
     onUpdateClick: () -> Unit,
-    vm: UpdatesSettingsViewModel = getViewModel(),
+    vm: UpdatesSettingsViewModel = koinViewModel(),
 ) {
     val coroutineScope = rememberCoroutineScope()
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3f1b6c6d..b306987b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,6 +10,7 @@ preferences-datastore = "1.0.0"
 work-runtime = "2.9.0"
 compose-bom = "2024.03.00"
 accompanist = "0.34.0"
+placeholder = "1.1.2"
 serialization = "1.6.3"
 collection = "0.3.7"
 room-version = "2.6.1"
@@ -60,8 +61,9 @@ coil-appiconloader = { group = "me.zhanghai.android.appiconloader", name = "appi
 
 # Accompanist
 accompanist-drawablepainter = { group = "com.google.accompanist", name = "accompanist-drawablepainter", version.ref = "accompanist" }
-accompanist-webview = { group = "com.google.accompanist", name = "accompanist-webview", version.ref = "accompanist" }
-accompanist-placeholder = { group = "com.google.accompanist", name = "accompanist-placeholder-material", version.ref = "accompanist" }
+
+# Placeholder
+placeholder-material3 = { group = "io.github.fornewid", name = "placeholder-material3", version.ref = "placeholder"}
 
 # Kotlinx
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "serialization" }