fix subtitle clipping

app/build.gradle.kts

@@ -9,8 +9,6 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.dokka)
     alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.compose.multiplatform)
-    alias(libs.plugins.compose.compiler)
 }
 
 val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
@@ -290,12 +288,7 @@ dependencies {
     implementation(libs.work.runtime.ktx)
     implementation(libs.nicehttp) // HTTP Lib
 
-    implementation(libs.bundles.compose)
-    implementation(libs.activity.compose)
-    implementation(libs.kotlinx.io.core) // Logcat parser
-
     implementation(project(":library"))
-    implementation(project(":shared"))
 }
 
 tasks.register<Jar>("androidSourcesJar") {

app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt

@@ -170,11 +170,11 @@ class CloudStreamApp : Application(), SingletonImageLoader.Factory {
         }
 
         /** Will fall back to WebView if in TV or emulator layout. */
-        fun openBrowser(url: String, activity: Activity?) {
+        fun openBrowser(url: String, activity: FragmentActivity?) {
             openBrowser(
                 url,
                 isLayout(TV or EMULATOR),
-                (activity as? FragmentActivity)?.supportFragmentManager?.fragments?.lastOrNull()
+                activity?.supportFragmentManager?.fragments?.lastOrNull()
             )
         }
     }

app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt

@@ -98,7 +98,7 @@ object VideoClickActionHolder {
             ?.second
     }
 
-    fun getPlayers(context: Context? = null) = allVideoClickActions.filter { it.isPlayer && it.shouldShowSafe(context, null) }
+    fun getPlayers(activity: Activity? = null) = allVideoClickActions.filter { it.isPlayer && it.shouldShowSafe(activity, null) }
 }
 
 abstract class VideoClickAction {

app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt

@@ -37,7 +37,7 @@ fun buildDefaultClient(context: Context, ignoreSSL: Boolean = false): OkHttpClie
     safe { Security.insertProviderAt(Conscrypt.newProvider(), 1) }
     
     val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
-    val dns = settingsManager.getInt(context.getString(R.string.dns_key), 0)
+    val dns = settingsManager.getInt(context.getString(R.string.dns_pref), 0)
     val baseClient = OkHttpClient.Builder()
         .followRedirects(true)
         .followSslRedirects(true)

app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt

@@ -54,15 +54,10 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
             false
         )
 
-        val isFromMainActivity = intent.getBooleanExtra(
-            "isFromMainActivity",
-            false
-        )
-
         // Sometimes we start this activity when we have already logged in
         // For example when using cloudstreamsearch://
         // In those cases we want to just go to the main activity instantly
-        if (hasLoggedIn && !isEditingFromMainActivity && !isFromMainActivity) {
+        if (hasLoggedIn && !isEditingFromMainActivity) {
             navigateToMainActivity()
             return
         }
@@ -103,7 +98,7 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
 
         // Don't show account selection if there is only
         // one account that exists
-        if (!isFromMainActivity && !isEditingFromMainActivity && skipStartup) {
+        if (!isEditingFromMainActivity && skipStartup) {
             val currentAccount = accounts.firstOrNull { it.keyIndex == selectedKeyIndex }
             if (currentAccount?.lockPin != null) {
                 CommonActivity.init(this)

app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt

@@ -30,9 +30,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.chip.Chip
 import com.lagradost.api.Log
-import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.apis
-import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainAPI
@@ -68,7 +66,6 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettin
 import com.lagradost.cloudstream3.utils.AppContextUtils.isNetworkAvailable
 import com.lagradost.cloudstream3.utils.AppContextUtils.isRecyclerScrollable
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadSearchResult
-import com.lagradost.cloudstream3.utils.AppContextUtils.openBrowser
 import com.lagradost.cloudstream3.utils.AppContextUtils.ownHide
 import com.lagradost.cloudstream3.utils.AppContextUtils.ownShow
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
@@ -112,14 +109,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
 
         val errorProfilePic = errorProfilePics.random()
 
-        fun Context.getDisplayName(apiName: String?): String? {
-            return when (apiName) {
-                noneApi.name -> getString(R.string.none)
-                randomApi.name -> getString(R.string.home_random)
-                else -> apiName
-            }
-        }
-
         //fun Activity.loadHomepageList(
         //    item: HomePageList,
         //    deleteCallback: (() -> Unit)? = null,
@@ -513,10 +502,8 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                         addAll(remainingApis)
                     }
 
-                    val names = currentValidApis.map {
-                        val displayName = getDisplayName(it.name)
-                        if (isMultiLang) "${getFlagFromIso(it.lang)?.plus(" ") ?: ""}$displayName" else displayName
-                    }
+                    val names =
+                        currentValidApis.map { if (isMultiLang) "${getFlagFromIso(it.lang)?.plus(" ") ?: ""}${it.name}" else it.name }
                     val index = currentValidApis.map { it.name }.indexOf(currentApiName)
                     listView?.setItemChecked(index, true)
                     arrayAdapter.addAll(names)
@@ -714,38 +701,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                 homeViewModel.queryTextSubmit("")
             }
 
-            homePreviewSettingsButton.setOnClickListener { view ->
-                val apiName = homeViewModel.apiName.value
-                val plugin = APIHolder.getApiFromNameNull(apiName)
-                    ?.sourcePlugin?.let { PluginManager.plugins[it] } as? Plugin
-                val openSettings = plugin?.openSettings
-                if (openSettings != null) {
-                    try {
-                        val activityContext = view.context.getActivity() ?: view.context
-                        openSettings.invoke(activityContext)
-                    } catch (e: Throwable) {
-                        logError(e)
-                    }
-                }
-            }
-
-            // Load value for toggling Tv layout real time clock. Hide by default at startup
-            // set visibility first, to apply a scroll effect later
-            context?.let {
-                if (isLayout(TV)) {
-                    val settingsManager = PreferenceManager.getDefaultSharedPreferences(it)
-                    val toggleClock =
-                        settingsManager.getBoolean(
-                            getString(R.string.tv_layout_clock_key),
-                            false
-                        )
-                    binding.homeClock.isVisible = toggleClock
-                } else {
-                    binding.homeClock.isVisible = false
-                }
-            }
-
-
             homeMasterRecycler.addOnScrollListener(object : RecyclerView.OnScrollListener() {
                 override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                     if (isLayout(PHONE)) {
@@ -785,17 +740,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                             view.getLocationInWindow(rect)
                             scrollParent.isVisible = true
                             scrollParent.translationY = rect[1].toFloat() - 60.toPx
-
-                            // Move the TV layout real time clock out of the way too
-                            // We check if we have the correct layout and if the clock is enabled
-                            if(isLayout(TV) && binding.homeClock.isVisible) {
-                                val scrollParent = binding.homeClock
-
-                                val rect = IntArray(2)
-                                view.getLocationInWindow(rect)
-                                scrollParent.isVisible = true
-                                scrollParent.translationY = rect[1].toFloat() - 60.toPx
-                            }
                         }
                     }
                     super.onScrolled(recyclerView, dx, dy)
@@ -818,10 +762,9 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
 
         observe(homeViewModel.apiName) { apiName ->
             currentApiName = apiName
-            val displayApiName = context?.getDisplayName(apiName) ?: apiName
             binding.apply {
-                homeApiFab.text = displayApiName
-                homeChangeApi.text = displayApiName
+                homeApiFab.text = apiName
+                homeChangeApi.text = apiName
                 homePreviewReloadProvider.isGone = (apiName == noneApi.name)
                 homePreviewSearchButton.isGone = (apiName == noneApi.name)
             }
@@ -829,12 +772,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
 
         observe(homeViewModel.page) { data ->
             binding.apply {
-                if (isLayout(TV or EMULATOR)) {
-                    val plugin = APIHolder.getApiFromNameNull(homeViewModel.apiName.value)
-                        ?.sourcePlugin?.let { PluginManager.plugins[it] } as? Plugin
-                    homePreviewSettingsButton.isGone = plugin?.openSettings == null
-                }
-                
                 when (data) {
                     is Resource.Success -> {
                         val d = data.value
@@ -850,7 +787,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                         homeLoadingError.isVisible = false
                         homeMasterRecycler.isVisible = true
                         homeLoadingShimmer.stopShimmer()
-
                         //home_loaded?.isVisible = true
                         if (toggleRandomButton) {
                             val distinct = d.values
@@ -871,16 +807,26 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                             homeRandomButtonTv.isGone = true
                         }
                     }
-                    //Open browser directly, without a menu.
+
                     is Resource.Failure -> {
                         homeLoadingShimmer.stopShimmer()
                         homeReloadConnectionerror.setOnClickListener(apiChangeClickListener)
-                        homeReloadConnectionOpenInBrowser.setOnClickListener {
-                            val currentApi = currentApiName?.let { getApiFromNameNull(it) }
-                                ?: homeViewModel.apiName.value?.let { getApiFromNameNull(it) }
-                            val mainUrl = currentApi?.mainUrl
-                            if (!mainUrl.isNullOrBlank()) {
-                                context?.openBrowser(mainUrl)
+                        homeReloadConnectionOpenInBrowser.setOnClickListener { view ->
+                            val validAPIs = apis//.filter { api -> api.hasMainPage }
+
+                            view.popupMenuNoIconsAndNoStringRes(validAPIs.mapIndexed { index, api ->
+                                Pair(
+                                    index,
+                                    api.name
+                                )
+                            }) {
+                                try {
+                                    val i = Intent(Intent.ACTION_VIEW)
+                                    i.data = validAPIs[itemId].mainUrl.toUri()
+                                    startActivity(i)
+                                } catch (e: Exception) {
+                                    logError(e)
+                                }
                             }
                         }
 

app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt

@@ -307,7 +307,6 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
                 playerVideoTitleRez,
                 playerVideoInfo,
                 playerGoBackHolder,
-                playerVideoClock,
             ).forEach {
                 it.animateY(titleMove)
             }
@@ -773,7 +772,7 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
             val showPlayerEpisodes = !isGone && isThereEpisodes()
             playerEpisodesButtonRoot.isVisible = showPlayerEpisodes
             playerEpisodesButton.isVisible = showPlayerEpisodes
-            playerVideoTitleHolder.isGone = togglePlayerTitleGone || playerVideoTitle.text.isBlank()
+            playerVideoTitleHolder.isGone = togglePlayerTitleGone
             playerVideoTitleRez.isGone = isGone || playerVideoTitleRez.text.isBlank()
             playerEpisodeFiller.isGone = isGone
             playerCenterMenu.isGone = isGone

app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt

@@ -8,7 +8,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.graphics.Bitmap
-import android.graphics.Typeface
 import android.os.Build
 import android.os.Bundle
 import android.text.Spanned
@@ -80,7 +79,6 @@ import com.lagradost.cloudstream3.ui.player.CS3IPlayer.Companion.preferredAudioT
 import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.updateForcedEncoding
 import com.lagradost.cloudstream3.ui.player.PlayerSubtitleHelper.Companion.toSubtitleMimeType
 import com.lagradost.cloudstream3.ui.player.source_priority.LinkSource
-import com.lagradost.cloudstream3.ui.player.source_priority.ProfileSettings
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getLinkPriority
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityProfileDialog
@@ -134,7 +132,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import java.io.Serializable
-import java.lang.ref.WeakReference
 import java.util.Calendar
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
@@ -513,7 +510,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         showDownloadProgress(DownloadEvent(0, 0, 0, null))
 
         // uiReset() // Removed due to UX
-
+        
         currentSelectedLink = link
         //  setEpisodes(viewModel.getAllMeta() ?: emptyList())
         setPlayerDimen(null)
@@ -1115,29 +1112,21 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 var sourceIndex = 0
                 var startSource = 0
-                // Filtered and sorted links
-                var currentHiddenFooter: View? = null
-                var filteredLinks: List<DisplayLink> = emptyList()
+                var sortedUrls = emptyList<Pair<ExtractorLink?, ExtractorUri?>>()
 
                 fun refreshLinks(qualityProfile: Int) {
-                    val currentLinkUsed = currentSelectedLink
-                    // Always display current linkFooter
-                    val sortedLinks = viewModel.state.sortLinks(qualityProfile)
-
-                    filteredLinks = sortedLinks.filter { it.shouldUseLink || it.link == currentLinkUsed }
-
-                    if (sortedLinks.isEmpty()) {
+                    sortedUrls = viewModel.state.sortLinks(qualityProfile)
+                    if (sortedUrls.isEmpty()) {
                         sourceDialog.findViewById<LinearLayout>(R.id.sort_sources_holder)?.isGone =
                             true
                     } else {
-                        startSource = filteredLinks.indexOfFirst { it.link == currentLinkUsed }
+                        startSource = sortedUrls.indexOf(currentSelectedLink)
                         sourceIndex = startSource
 
                         val sourcesArrayAdapter =
                             ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
-                        sourcesArrayAdapter.addAll(filteredLinks.map { displayLink ->
-                            val (link, uri) = displayLink.link
+                        sourcesArrayAdapter.addAll(sortedUrls.map { (link, uri) ->
                             val name = link?.name ?: uri?.name ?: "NULL"
                             "$name ${Qualities.getStringByInt(link?.quality)}"
                         })
@@ -1153,7 +1142,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                         }
 
                         providerList.setOnItemLongClickListener { _, _, position, _ ->
-                            sortedLinks.getOrNull(position)?.link?.first?.url?.let {
+                            sortedUrls.getOrNull(position)?.first?.url?.let {
                                 clipboardHelper(
                                     txt(R.string.video_source),
                                     it
@@ -1161,25 +1150,6 @@ class GeneratorPlayer : FullScreenPlayer() {
                             }
                             true
                         }
-
-                        val hiddenLinks = sortedLinks.size - filteredLinks.size
-                        providerList.removeFooterView(currentHiddenFooter)
-
-                        if (hiddenLinks > 0) {
-                            val hiddenLinksFooter: TextView = layoutInflater.inflate(
-                                R.layout.sort_bottom_footer_add_choice, null
-                            ) as TextView
-
-                            providerList.addFooterView(hiddenLinksFooter, null, false)
-                            currentHiddenFooter = hiddenLinksFooter
-
-                            val hiddenLinksText =
-                                ctx.resources.getQuantityString(R.plurals.links_hidden, hiddenLinks)
-                                    .format(hiddenLinks)
-                            hiddenLinksFooter.text = hiddenLinksText
-                            hiddenLinksFooter.setCompoundDrawables(null, null, null, null)
-                            hiddenLinksFooter.setTypeface(null, Typeface.ITALIC)
-                        }
                     }
                 }
 
@@ -1393,8 +1363,8 @@ class GeneratorPlayer : FullScreenPlayer() {
                         }
                     }
                     if (init) {
-                        filteredLinks.getOrNull(sourceIndex)?.let {
-                            loadLink(it.link, true)
+                        sortedUrls.getOrNull(sourceIndex)?.let {
+                            loadLink(it, true)
                         }
                     }
                     sourceDialog.dismissSafe(activity)
@@ -1562,10 +1532,6 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     override fun playerError(exception: Throwable) {
-        currentSelectedLink?.let { link ->
-            viewModel.modifyState { this.addError(link) }
-        }
-
         val currentUrl =
             currentSelectedLink?.let { it.first?.url ?: it.second?.uri?.toString() } ?: "unknown"
         val headers = currentSelectedLink?.first?.headers?.toString() ?: "none"
@@ -1588,22 +1554,8 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     private fun noLinksFound() {
         viewModel.forceClearCache = true
-        val hiddenLinks = viewModel.state.sortLinks(currentQualityProfile).count { !it.shouldUseLink }
-
-        context?.let { ctx ->
-            // Display that there are hidden links to the user.
-            if (hiddenLinks > 0) {
-                val noLinksString = ctx.getString(R.string.no_links_found_toast)
-                val hiddenString =
-                    ctx.resources.getQuantityString(R.plurals.links_hidden, hiddenLinks)
-                        .format(hiddenLinks)
-                val toastText = "$noLinksString\n($hiddenString)"
-                showToast(toastText, Toast.LENGTH_SHORT)
-            } else {
-                showToast(R.string.no_links_found_toast, Toast.LENGTH_SHORT)
-            }
-        }
 
+        showToast(R.string.no_links_found_toast, Toast.LENGTH_SHORT)
         activity?.popCurrentPage()
     }
 
@@ -1614,9 +1566,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
 
         val links = viewModel.state.sortLinks(currentQualityProfile)
-
-        val firstAvailableLink = links.firstOrNull { it.shouldUseLink }?.link
-        if (firstAvailableLink == null) {
+        if (links.isEmpty()) {
             noLinksFound()
             return
         }
@@ -1624,7 +1574,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         if (!isPlayerActive.compareAndSet(false, true)) {
             return
         }
-        loadLink(firstAvailableLink, false)
+        loadLink(links.first(), false)
         showPlayerMetadata()
     }
 
@@ -1691,26 +1641,25 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
-    private fun getNextLink(): DisplayLink? {
-        val links = viewModel.state.sortLinks(currentQualityProfile)
-        val currentIndex = links.indexOfFirst { it.link == currentSelectedLink }
-        val nextPotentialLink =
-            links.withIndex().firstOrNull { it.index > currentIndex && it.value.shouldUseLink }
-        return nextPotentialLink?.value
-    }
-
     override fun hasNextMirror(): Boolean {
-        return getNextLink() != null
+        val links = viewModel.state.sortLinks(currentQualityProfile)
+        return links.isNotEmpty() && links.indexOf(currentSelectedLink) + 1 < links.size
     }
 
     override fun nextMirror() {
-        val nextLink = getNextLink()
-        if (nextLink == null) {
+        val links = viewModel.state.sortLinks(currentQualityProfile)
+        if (links.isEmpty()) {
             noLinksFound()
             return
         }
 
-        loadLink(nextLink.link, true)
+        val newIndex = links.indexOf(currentSelectedLink) + 1
+        if (newIndex >= links.size) {
+            noLinksFound()
+            return
+        }
+
+        loadLink(links[newIndex], true)
     }
 
     override fun onDestroy() {
@@ -2217,7 +2166,6 @@ class GeneratorPlayer : FullScreenPlayer() {
         isPlayerActive.set(false)
         binding?.overlayLoadingSkipButton?.isVisible = false
         binding?.playerLoadingOverlay?.isVisible = true
-        viewModel.modifyState { setError(emptyList()) }
         uiReset()
     }
 
@@ -2271,14 +2219,6 @@ class GeneratorPlayer : FullScreenPlayer() {
                     fromTagToEnglishLanguageName(it)?.lowercase() ?: return@mapNotNull null
                 } ?: listOf()
             }
-
-            // Set up TV clock visibility
-            if (isLayout(TV)) {
-                val showTvClock = settingsManager.getBoolean(ctx.getString(R.string.tv_layout_clock_key), false)
-                playerBinding?.playerVideoClock?.isVisible = showTvClock
-            } else {
-                playerBinding?.playerVideoClock?.isVisible = false
-            }
         }
 
         unwrapBundle(savedInstanceState)
@@ -2357,23 +2297,19 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         }
 
-        observe(viewModel.currentLinks) { (_, instance) ->
+        observe(viewModel.currentLinks) { (links, instance) ->
             if (instance != viewModel.state.instance) return@observe // Outdated observe
 
-            val sortedLinks = viewModel.state.sortLinks(currentQualityProfile)
-            val usableLinks = sortedLinks.count { link -> link.shouldUseLink }
-
-            val turnVisible = usableLinks > 0 && viewModel.generator?.canSkipLoading == true
+            val turnVisible = links.isNotEmpty() && viewModel.generator?.canSkipLoading == true
             val wasGone = binding.overlayLoadingSkipButton.isGone
 
             binding.overlayLoadingSkipButton.apply {
                 isVisible = turnVisible
-
-                if (usableLinks == 0) {
+                if (links.isEmpty()) {
                     setText(R.string.skip_loading)
                 } else {
                     @SuppressLint("SetTextI18n")
-                    text = "${context.getString(R.string.skip_loading)} (${usableLinks})"
+                    text = "${context.getString(R.string.skip_loading)} (${links.size})"
                 }
             }
 

app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt

@@ -10,8 +10,6 @@ import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
-import com.lagradost.cloudstream3.ui.player.source_priority.ProfileSettings
-import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getLinkPriority
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
@@ -42,20 +40,12 @@ data class GeneratorState(
     val id: Int?,
 )
 
-data class DisplayLink(
-    val link: VideoLink,
-    // If the link should be displayed and used by the player
-    val shouldUseLink: Boolean,
-    val priority: Int
-)
-
 /** Immutable state of all current links relevant to displaying the video */
 // @MustUseReturnValues
 // @Immutable
 data class VideoState(
     val subtitles: PersistentSet<SubtitleData> = persistentSetOf(),
     val links: PersistentSet<VideoLink> = persistentSetOf(),
-    val erroredLinks: PersistentSet<VideoLink> = persistentSetOf(),
     val stamps: PersistentList<VideoSkipStamp> = persistentListOf(),
     val loading: Resource<Unit> = Resource.Loading(),
     val generatorState: GeneratorState? = null,
@@ -66,52 +56,19 @@ data class VideoState(
      *
      * sortedBy is not exactly expensive, but each hasNextMirror does it again, so this alleviates unnecessary recomputation
      * */
-    private val sortedLinks: ConcurrentHashMap<Int, List<DisplayLink>> = ConcurrentHashMap()
+    private val sortedLinks: ConcurrentHashMap<Int, List<VideoLink>> = ConcurrentHashMap()
 
-    /**
-     * The cache is guaranteed to be up to date link-wise due to the immutable links.
-     * However, hideNegativeSources and hideErrorSources could be updated, which requires clearing the cache.
-     */
     fun clearSortedLinksCache() = sortedLinks.clear()
 
-    private fun hasLinkErrored(link: VideoLink): Boolean {
-        return erroredLinks.any { it == link }
-    }
-
-    private fun VideoLink.toDisplayLink(
-        qualityProfile: Int,
-        hideNegativeSources: Boolean,
-        hideErrorSources: Boolean
-    ): DisplayLink {
-        val priority = getLinkPriority(qualityProfile, this.first)
-        val shouldHideLink =
-            (hideNegativeSources && priority < 0) || (hideErrorSources && hasLinkErrored(this))
-        val displayLink = DisplayLink(this, !shouldHideLink, priority)
-
-        return displayLink
-    }
-
     // Modifying sortedLinks is not considered a "visible" side effect, and rerunning it does not change the result
     // It is by all standards, idempotent and by extension also pure as it has no "visible" side effect
     /** Returns .links in the sorted order according to the qualityProfile.
      * Use .links if order is not needed */
     @Contract(pure = true)
-    fun sortLinks(qualityProfile: Int): List<DisplayLink> {
-        sortedLinks[qualityProfile]?.let {
-            return it
-        }
-
-        val hideNegativeSources =
-            QualityDataHelper.getProfileSetting(qualityProfile, ProfileSettings.HideNegativeSources)
-        val hideErrorSources =
-            QualityDataHelper.getProfileSetting(qualityProfile, ProfileSettings.HideErrorSources)
-
-        return links.map { link ->
+    fun sortLinks(qualityProfile: Int): List<VideoLink> {
+        return sortedLinks[qualityProfile] ?: links.sortedBy { link ->
             // negative because we want to sort highest quality first
-            link.toDisplayLink(qualityProfile, hideNegativeSources, hideErrorSources)
-        }.sortedBy {
-            // negative because we want to sort highest quality first
-            -it.priority
+            -getLinkPriority(qualityProfile, link.first)
         }.also { value -> sortedLinks[qualityProfile] = value }
     }
 
@@ -156,12 +113,6 @@ data class VideoState(
     @JvmName("setVideoSkipStamp")
     @Contract(pure = true)
     fun set(items: Collection<VideoSkipStamp>): VideoState = copy(stamps = items.toPersistentList())
-
-    @Contract(pure = true)
-    fun addError(item: VideoLink): VideoState = copy(erroredLinks = erroredLinks.add(item))
-
-    @Contract(pure = true)
-    fun setError(items: Collection<VideoLink>): VideoState = copy(erroredLinks = items.toPersistentSet())
 }
 
 data class VideoLive<T>(
@@ -190,8 +141,9 @@ class PlayerGeneratorViewModel : ViewModel() {
     var state = VideoState(instance = 0)
         private set
 
-    private val _currentLinks = MutableLiveData<VideoLive<Set<VideoLink>>>(null)
-    val currentLinks: LiveData<VideoLive<Set<VideoLink>>> = _currentLinks
+    private val _currentLinks =
+        MutableLiveData<VideoLive<Set<Pair<ExtractorLink?, ExtractorUri?>>>>(null)
+    val currentLinks: LiveData<VideoLive<Set<Pair<ExtractorLink?, ExtractorUri?>>>> = _currentLinks
 
     private val _currentSubtitles = MutableLiveData<VideoLive<Set<SubtitleData>>>(null)
     val currentSubtitles: LiveData<VideoLive<Set<SubtitleData>>> = _currentSubtitles

app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt

@@ -12,16 +12,12 @@ import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
-import java.util.EnumMap
-import java.util.concurrent.ConcurrentHashMap
-import kotlin.also
 import kotlin.math.abs
 
 object QualityDataHelper {
     private const val VIDEO_SOURCE_PRIORITY = "video_source_priority"
     private const val VIDEO_PROFILE_NAME = "video_profile_name"
     private const val VIDEO_QUALITY_PRIORITY = "video_quality_priority"
-    const val VIDEO_PROFILE_SETTINGS = "video_profile_settings"
 
     // Old key only supporting one type per profile
     @Deprecated("Changed to support multiple types per profile")
@@ -57,21 +53,13 @@ object QualityDataHelper {
         val types: Set<QualityProfileType>
     )
 
-
-    // Map profile and name to priority
-    val sourcePriorityCache: ConcurrentHashMap<Int, HashMap<String, Int>> = ConcurrentHashMap()
-
     fun getSourcePriority(profile: Int, name: String?): Int {
         if (name == null) return DEFAULT_SOURCE_PRIORITY
-
-        return sourcePriorityCache[profile]?.get(name) ?: (getKey<Int>(
+        return getKey<Int>(
             "$currentAccount/$VIDEO_SOURCE_PRIORITY/$profile",
             name,
             DEFAULT_SOURCE_PRIORITY
-        ) ?: DEFAULT_SOURCE_PRIORITY).also {
-            sourcePriorityCache.getOrPut(profile) { hashMapOf() }
-            sourcePriorityCache[profile]?.set(name, it)
-        }
+        ) ?: DEFAULT_SOURCE_PRIORITY
     }
 
     fun getAllSourcePriorityNames(profile: Int): List<String> {
@@ -89,8 +77,6 @@ object QualityDataHelper {
         } else {
             setKey(folder, name, priority)
         }
-
-        sourcePriorityCache[profile]?.set(name, priority)
     }
 
     fun setProfileName(profile: Int, name: String?) {
@@ -107,17 +93,12 @@ object QualityDataHelper {
             ?: txt(R.string.profile_number, profile)
     }
 
-    // Map profile and quality to priority
-    val qualityPriorityCache: ConcurrentHashMap<Int, EnumMap<Qualities, Int>> = ConcurrentHashMap()
     fun getQualityPriority(profile: Int, quality: Qualities): Int {
-        return qualityPriorityCache[profile]?.get(quality) ?: (getKey<Int>(
+        return getKey<Int>(
             "$currentAccount/$VIDEO_QUALITY_PRIORITY/$profile",
             quality.value.toString(),
             quality.defaultPriority
-        )?.also {
-            qualityPriorityCache.getOrPut(profile) { EnumMap(Qualities::class.java) }
-            qualityPriorityCache[profile]?.set(quality, it)
-        }) ?: quality.defaultPriority
+        ) ?: quality.defaultPriority
     }
 
     fun setQualityPriority(profile: Int, quality: Qualities, priority: Int) {
@@ -126,24 +107,8 @@ object QualityDataHelper {
             quality.value.toString(),
             priority
         )
-        qualityPriorityCache[profile]?.set(quality, priority)
     }
 
-    fun <T> setProfileSetting(profile: Int, setting: ProfileSettings<T>, value: T) {
-        val folder = "$currentAccount/$VIDEO_PROFILE_SETTINGS/$profile"
-        // Prevent unnecessary keys
-        if (value == setting.defaultValue) {
-            removeKey(folder, setting.key)
-        } else {
-            setKey(folder, setting.key, value)
-        }
-    }
-
-    inline fun <reified T : Any> getProfileSetting(profile: Int, setting: ProfileSettings<T>): T {
-        val folder = "$currentAccount/$VIDEO_PROFILE_SETTINGS/$profile"
-        val value = getKey<T>(folder, setting.key)
-        return value ?: setting.defaultValue
-    }
 
     @Suppress("DEPRECATION")
     fun getQualityProfileTypes(profile: Int): Set<QualityProfileType> {
@@ -259,8 +224,3 @@ object QualityDataHelper {
         return Qualities.entries.minBy { abs(it.value - target) }
     }
 }
-
-sealed class ProfileSettings<T>(val key: String, val defaultValue: T) {
-    object HideErrorSources : ProfileSettings<Boolean>("hide_error_sources", false)
-    object HideNegativeSources : ProfileSettings<Boolean>("hide_negative_sources", false)
-}

app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt

@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.ui.player.source_priority
 
-import android.app.Activity
 import android.app.Dialog
 import androidx.annotation.StyleRes
 import androidx.core.view.isVisible
@@ -27,7 +26,7 @@ data class LinkSource(
 
 
 class QualityProfileDialog private constructor(
-    val activity: Activity,
+    val activity: FragmentActivity,
     @StyleRes val themeRes: Int,
     private val links: List<LinkSource>,
     private val usedProfile: Int?,
@@ -35,7 +34,7 @@ class QualityProfileDialog private constructor(
     private val useProfileSelection: Boolean
 ) : Dialog(activity, themeRes) {
     constructor(
-        activity: Activity,
+        activity: FragmentActivity,
         @StyleRes themeRes: Int,
         links: List<LinkSource>,
         usedProfile: Int,
@@ -43,7 +42,7 @@ class QualityProfileDialog private constructor(
     ) : this(activity, themeRes, links, usedProfile, profileSelectionCallback, true)
 
     constructor(
-        activity: Activity,
+        activity: FragmentActivity,
         @StyleRes themeRes: Int,
         links: List<LinkSource>
     ) : this(activity, themeRes, links, null, null, false)

app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt

@@ -14,7 +14,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
 class SourcePriorityDialog(
     val ctx: Context,
-    @StyleRes val themeRes: Int,
+    @StyleRes themeRes: Int,
     val links: List<LinkSource>,
     private val profile: QualityDataHelper.QualityProfile,
     /**
@@ -28,79 +28,76 @@ class SourcePriorityDialog(
             PlayerSelectSourcePriorityBinding.inflate(LayoutInflater.from(ctx), null, false)
         setContentView(binding.root)
         fixSystemBarsPadding(binding.root)
+        val sourcesRecyclerView = binding.sortSources
+        val qualitiesRecyclerView = binding.sortQualities
+        val profileText = binding.profileTextEditable
+        val saveBtt = binding.saveBtt
+        val exitBtt = binding.closeBtt
+        val helpBtt = binding.helpBtt
 
-        binding.apply {
-            profileTextEditable.setText(
-                QualityDataHelper.getProfileName(profile.id).asString(context)
-            )
-            profileTextEditable.hint = txt(R.string.profile_number, profile.id).asString(context)
+        profileText.setText(QualityDataHelper.getProfileName(profile.id).asString(context))
+        profileText.hint = txt(R.string.profile_number, profile.id).asString(context)
 
-            sortSources.adapter = PriorityAdapter<Nothing?>(
-            ).apply {
-                val sortedLinks = links.map { link ->
-                    SourcePriority(
-                        null,
-                        link.source,
-                        QualityDataHelper.getSourcePriority(profile.id, link.source)
-                    )
-                }.distinctBy { it.name }.sortedBy { -it.priority }
-
-                submitList(sortedLinks)
-            }
-
-            sortQualities.adapter = PriorityAdapter<Qualities>(
-            ).apply {
-                submitList(Qualities.entries.mapNotNull {
-                    SourcePriority(
-                        it,
-                        Qualities.getStringByIntFull(it.value).ifBlank { return@mapNotNull null },
-                        QualityDataHelper.getQualityPriority(profile.id, it)
-                    )
-                }.sortedBy { -it.priority })
-            }
-
-            @Suppress("UNCHECKED_CAST") // We know the types
-            saveBtt.setOnClickListener {
-                val qualityAdapter = sortQualities.adapter as? PriorityAdapter<Qualities>
-                val sourcesAdapter = sortSources.adapter as? PriorityAdapter<Nothing?>
-
-                val qualities = qualityAdapter?.immutableCurrentList ?: emptyList()
-                val sources = sourcesAdapter?.immutableCurrentList ?: emptyList()
-
-                qualities.forEach {
-                    QualityDataHelper.setQualityPriority(profile.id, it.data, it.priority)
-                }
-
-                sources.forEach {
-                    QualityDataHelper.setSourcePriority(profile.id, it.name, it.priority)
-                }
-
-                qualityAdapter?.submitList(qualities.sortedBy { -it.priority })
-                sourcesAdapter?.submitList(sources.sortedBy { -it.priority })
-
-                val savedProfileName = profileTextEditable.text.toString()
-                if (savedProfileName.isBlank()) {
-                    QualityDataHelper.setProfileName(profile.id, null)
-                } else {
-                    QualityDataHelper.setProfileName(profile.id, savedProfileName)
-                }
-                updatedCallback.invoke()
-            }
-
-            closeBtt.setOnClickListener {
-                dismissSafe()
-            }
-
-            helpBtt.setOnClickListener {
-                AlertDialog.Builder(context, R.style.AlertDialogCustom).apply {
-                    setMessage(R.string.quality_profile_help)
-                }.show()
-            }
-
-            settingsBtt.setOnClickListener {
-                SourceProfileSettingsDialog(ctx, themeRes, profile.id).show()
-            }
+        sourcesRecyclerView.adapter = PriorityAdapter<Nothing?>(
+        ).apply {
+            submitList(links.map { link ->
+                SourcePriority(
+                    null,
+                    link.source,
+                    QualityDataHelper.getSourcePriority(profile.id, link.source)
+                )
+            }.distinctBy { it.name }.sortedBy { -it.priority })
         }
+
+        qualitiesRecyclerView.adapter = PriorityAdapter<Qualities>(
+        ).apply {
+            submitList(Qualities.entries.mapNotNull {
+                SourcePriority(
+                    it,
+                    Qualities.getStringByIntFull(it.value).ifBlank { return@mapNotNull null },
+                    QualityDataHelper.getQualityPriority(profile.id, it)
+                )
+            }.sortedBy { -it.priority })
+        }
+
+        @Suppress("UNCHECKED_CAST") // We know the types
+        saveBtt.setOnClickListener {
+            val qualityAdapter = qualitiesRecyclerView.adapter as? PriorityAdapter<Qualities>
+            val sourcesAdapter = sourcesRecyclerView.adapter as? PriorityAdapter<Nothing?>
+
+            val qualities = qualityAdapter?.immutableCurrentList ?: emptyList()
+            val sources = sourcesAdapter?.immutableCurrentList ?: emptyList()
+
+            qualities.forEach {
+                QualityDataHelper.setQualityPriority(profile.id, it.data, it.priority)
+            }
+
+            sources.forEach {
+                QualityDataHelper.setSourcePriority(profile.id, it.name, it.priority)
+            }
+
+            qualityAdapter?.submitList(qualities.sortedBy { -it.priority })
+            sourcesAdapter?.submitList(sources.sortedBy { -it.priority })
+
+            val savedProfileName = profileText.text.toString()
+            if (savedProfileName.isBlank()) {
+                QualityDataHelper.setProfileName(profile.id, null)
+            } else {
+                QualityDataHelper.setProfileName(profile.id, savedProfileName)
+            }
+            updatedCallback.invoke()
+        }
+
+        exitBtt.setOnClickListener {
+            this.dismissSafe()
+        }
+
+        helpBtt.setOnClickListener {
+            AlertDialog.Builder(context, R.style.AlertDialogCustom).apply {
+                setMessage(R.string.quality_profile_help)
+            }.show()
+        }
+
         super.show()
     }
 }

app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourceProfileSettingsDialog.kt

@@ -1,48 +0,0 @@
-package com.lagradost.cloudstream3.ui.player.source_priority
-
-import android.app.Dialog
-import android.content.Context
-import android.view.LayoutInflater
-import androidx.annotation.StyleRes
-import com.lagradost.cloudstream3.databinding.SourceProfileSettingsDialogBinding
-import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
-
-class SourceProfileSettingsDialog(
-    val ctx: Context,
-    @StyleRes themeRes: Int,
-    val profile: Int
-) : Dialog(ctx, themeRes) {
-     override fun show() {
-         val binding =
-             SourceProfileSettingsDialogBinding.inflate(LayoutInflater.from(ctx), null, false)
-         setContentView(binding.root)
-         fixSystemBarsPadding(binding.root)
-
-         binding.apply {
-             var hideErrorSources = QualityDataHelper.getProfileSetting(profile, ProfileSettings.HideErrorSources)
-             var hideNegativeSources = QualityDataHelper.getProfileSetting(profile, ProfileSettings.HideNegativeSources)
-
-             profileHideErrorSources.isChecked = hideErrorSources
-             profileHideErrorSources.setOnCheckedChangeListener { _, bool ->
-                 hideErrorSources = bool
-             }
-
-             profileHideNegativeSources.isChecked = hideNegativeSources
-             profileHideNegativeSources.setOnCheckedChangeListener { _, bool ->
-                 hideNegativeSources = bool
-             }
-
-             applyBtt.setOnClickListener {
-                 QualityDataHelper.setProfileSetting(profile, ProfileSettings.HideErrorSources, hideErrorSources)
-                 QualityDataHelper.setProfileSetting(profile, ProfileSettings.HideNegativeSources, hideNegativeSources)
-                 dismissSafe()
-             }
-
-             cancelBtt.setOnClickListener {
-                 dismissSafe()
-             }
-         }
-         super.show()
-     }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt

@@ -874,6 +874,7 @@ class ResultFragmentTv : BaseFragment<FragmentResultTvBinding>(
                         resultMetaRating.setText(d.ratingText)
                         resultMetaStatus.setText(d.onGoingText)
                         resultMetaContentRating.setText(d.contentRatingText)
+                        resultCastText.setText(d.actorsText)
                         resultNextAiring.setText(d.nextAiringEpisode)
                         resultNextAiringTime.setText(d.nextAiringDate)
                         resultPoster.loadImage(d.posterImage, headers = d.posterHeaders)
@@ -931,7 +932,6 @@ class ResultFragmentTv : BaseFragment<FragmentResultTvBinding>(
                             true
                         )
 
-                        resultCastText.setText(if (showCast) d.actorsText else null)
                         resultCastItems.isGone = !showCast || d.actors.isNullOrEmpty()
                         (resultCastItems.adapter as? ActorAdaptor)?.submitList(if (showCast) d.actors else emptyList())
 

app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt

@@ -1,18 +1,19 @@
 package com.lagradost.cloudstream3.ui.settings
 
+import android.app.UiModeManager
 import android.content.Context
 import android.content.res.Configuration
 import android.content.res.Resources
+import android.os.Build
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream4.compose.DeviceLayout.Companion.isAutoTv
 
 object Globals {
     var beneneCount = 0
 
-    const val PHONE: Int = 0b00001
-    const val TV: Int = 0b00010
-    const val EMULATOR: Int = 0b00100
+    const val PHONE : Int = 0b001
+    const val TV : Int = 0b010
+    const val EMULATOR : Int = 0b100
     private const val INVALID = -1
     private var layoutId = INVALID
 
@@ -21,9 +22,18 @@ object Globals {
         return settingsManager.getInt(this.getString(R.string.app_layout_key), -1)
     }
 
-    fun Context.updateTv() {
-        layoutId = when (getLayoutInt()) {
-            -1 -> if (isAutoTv(this)) TV else PHONE
+    private fun Context.isAutoTv(): Boolean {
+        val uiModeManager = getSystemService(Context.UI_MODE_SERVICE) as UiModeManager?
+        // AFT = Fire TV
+        val model = Build.MODEL.lowercase()
+        return uiModeManager?.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION || Build.MODEL.contains(
+            "AFT"
+        ) || model.contains("firestick") || model.contains("fire tv") || model.contains("chromecast")
+    }
+
+    private fun Context.layoutIntCorrected(): Int {
+        return when(getLayoutInt()) {
+            -1 -> if (isAutoTv()) TV else PHONE
             0 -> PHONE
             1 -> TV
             2 -> EMULATOR
@@ -31,10 +41,14 @@ object Globals {
         }
     }
 
+    fun Context.updateTv() {
+        layoutId = layoutIntCorrected()
+    }
+
     /** Returns true if the current orientation is landscape. */
     fun isLandscape(): Boolean =
         isLayout(TV or EMULATOR) ||
-                Resources.getSystem().configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+            Resources.getSystem().configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
 
     /** Returns true if the layout is any of the flags,
      * so isLayout(TV or EMULATOR) is a valid statement for checking if the layout is in the emulator
@@ -42,7 +56,7 @@ object Globals {
      *
      * Valid flags are: PHONE, TV, EMULATOR
      * */
-    fun isLayout(flags: Int): Boolean {
+    fun isLayout(flags: Int) : Boolean {
         return (layoutId and flags) != 0
     }
 }

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt

@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.ui.settings
 
 import android.annotation.SuppressLint
-import android.app.Activity
 import android.graphics.Bitmap
 import android.os.Bundle
 import android.os.CountDownTimer
@@ -14,6 +13,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.content.edit
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentActivity
 import androidx.preference.PreferenceManager
 import androidx.preference.SwitchPreference
 import androidx.recyclerview.widget.RecyclerView
@@ -29,8 +29,8 @@ import com.lagradost.cloudstream3.databinding.DeviceAuthBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.animeSkipApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.kitsuApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.kitsuApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.openSubtitlesApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.simklApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.subDlApi
@@ -42,8 +42,8 @@ import com.lagradost.cloudstream3.syncproviders.SubtitleRepo
 import com.lagradost.cloudstream3.syncproviders.SyncRepo
 import com.lagradost.cloudstream3.ui.BasePreferenceFragmentCompat
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
-import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn
@@ -76,7 +76,7 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
         /** Used by nginx plugin too */
         @SuppressLint("StringFormatInvalid")
         fun showLoginInfo(
-            activity: Activity?,
+            activity: FragmentActivity?,
             api: AuthRepo,
             info: AuthUser?,
             index: Int,
@@ -121,7 +121,7 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
             }
         }
 
-        private fun showAccountSwitch(activity: Activity, api: AuthRepo) {
+        private fun showAccountSwitch(activity: FragmentActivity, api: AuthRepo) {
             val accounts = api.accounts
             val binding: AccountSwitchBinding =
                 AccountSwitchBinding.inflate(activity.layoutInflater, null, false)
@@ -153,7 +153,7 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
 
 
         @UiThread
-        fun showPin(activity: Activity, api: AuthRepo) {
+        fun showPin(activity: FragmentActivity, api: AuthRepo) {
             val binding: DeviceAuthBinding =
                 DeviceAuthBinding.inflate(activity.layoutInflater, null, false)
 
@@ -273,7 +273,8 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
         }
 
 
-        fun showAppLogin(activity: Activity, api: AuthRepo) {
+        fun showAppLogin(activity: FragmentActivity, api: AuthRepo) {
+
             val binding: AddAccountInputBinding =
                 AddAccountInputBinding.inflate(activity.layoutInflater, null, false)
             val builder =
@@ -314,7 +315,7 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
             binding.createAccount.setOnClickListener {
                 openBrowser(
                     api.createAccountUrl ?: return@setOnClickListener,
-                    activity,
+                    activity
                 )
                 dialog.dismissSafe()
             }
@@ -390,7 +391,7 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
         }
 
         @UiThread
-        fun addAccount(activity: Activity, api: AuthRepo) {
+        fun addAccount(activity: FragmentActivity, api: AuthRepo) {
             try {
                 if (api.hasPin && !isLayout(PHONE)) {
                     showPin(activity, api)

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount2.kt

@@ -1,7 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.mihon.presentation.settings.SearchableSettings
-
-/** Empty glue code to connect the old navigation graph to Compose */
-class SettingsAccount2 : BaseComposeFragment(), SearchableSettings by SettingsAccountScreen

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccountScreen.kt

@@ -1,148 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import android.content.Context
-import androidx.activity.compose.LocalActivity
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.fragment.app.FragmentActivity
-import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.animeSkipApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.kitsuApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.openSubtitlesApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.simklApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.subDlApi
-import com.lagradost.cloudstream3.syncproviders.PlainAuthRepo
-import com.lagradost.cloudstream3.syncproviders.SubtitleRepo
-import com.lagradost.cloudstream3.syncproviders.SyncRepo
-import com.lagradost.cloudstream3.ui.settings.SettingsAccount.Companion.addAccount
-import com.lagradost.cloudstream3.ui.settings.SettingsAccount.Companion.showLoginInfo
-import com.lagradost.cloudstream3.utils.AppContextUtils.html
-import com.lagradost.cloudstream3.utils.BackupUtils
-import com.lagradost.cloudstream3.utils.BiometricAuthenticator
-import com.lagradost.cloudstream3.utils.BiometricAuthenticator.authCallback
-import com.lagradost.cloudstream3.utils.BiometricAuthenticator.biometricPrompt
-import com.lagradost.cloudstream3.utils.BiometricAuthenticator.deviceHasPasswordPinLock
-import com.lagradost.cloudstream3.utils.BiometricAuthenticator.isAuthEnabled
-import com.lagradost.cloudstream3.utils.BiometricAuthenticator.promptInfo
-import com.lagradost.cloudstream3.utils.BiometricAuthenticator.startBiometricAuthentication
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogText
-import com.lagradost.cloudstream4.AppSettings
-import com.lagradost.cloudstream4.compose.PHONE
-import com.lagradost.cloudstream4.compose.isLayout
-import com.lagradost.cloudstream4.rememberAppSettings
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import kotlinx.collections.immutable.persistentListOf
-
-object SettingsAccountScreen : SearchableSettings, BiometricAuthenticator.BiometricCallback {
-    val syncApis = persistentListOf(
-        SyncRepo(malApi),
-        SyncRepo(kitsuApi),
-        SyncRepo(aniListApi),
-        SyncRepo(simklApi),
-        SubtitleRepo(openSubtitlesApi),
-        SubtitleRepo(subDlApi),
-        PlainAuthRepo(animeSkipApi),
-    )
-    private fun updateAuthPreference(context: Context, enabled: Boolean) {
-        val settings = AppSettings(context)
-        settings.security.biometrics.set(enabled)
-    }
-
-    override fun onAuthenticationError() {
-        val context = activity ?: return
-        updateAuthPreference(context, !isAuthEnabled(context))
-    }
-
-    override fun onAuthenticationSuccess() {
-        val context = activity ?: return
-
-        if (isAuthEnabled(context)) {
-            updateAuthPreference(context, true)
-            BackupUtils.backup(context)
-            context.showBottomDialogText(
-                context.getString(R.string.biometric_setting),
-                context.getString(R.string.biometric_warning).html()
-            ) { onDialogDismissedEvent }
-        } else {
-            updateAuthPreference(context, false)
-        }
-    }
-
-    @Composable
-    override fun getTitleRes(): String = stringResource(R.string.category_account)
-
-    @Composable
-    override fun getPreferences(): List<Preference> {
-        val settings = rememberAppSettings()
-        val activity = LocalActivity.current
-        val context = LocalContext.current
-        val hasSecurity = remember(context) {
-            try {
-                deviceHasPasswordPinLock(context)
-            } catch (_ : Throwable) {
-                // e.g preview
-                false
-            }
-        }
-
-        return persistentListOf(
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_accounts),
-                preferenceItems = syncApis.map { api ->
-                    Preference.PreferenceItem.TextPreference(
-                        title = api.name,
-                        icon = api.icon?.let { painterResource(it) },
-                        onClick = {
-                            val activity = activity ?: return@TextPreference
-                            val info = api.authUser()
-                            val index =
-                                api.accounts.indexOfFirst { account -> account.user.id == info?.id }
-                            if (api.accounts.isNotEmpty()) {
-                                showLoginInfo(activity, api, info, index)
-                            } else {
-                                addAccount(activity, api)
-                            }
-                        })
-                } + Preference.PreferenceItem.SwitchPreference(
-                    preference = settings.security.skipAccountSelection,
-                    title = stringResource(R.string.skip_startup_account_select_pref),
-                    icon = painterResource(R.drawable.ic_outline_account_circle_24)
-                ),
-            ), Preference.PreferenceGroup(
-                enabled = hasSecurity && isLayout(PHONE),
-                title = stringResource(R.string.pref_category_security),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.security.biometrics,
-                        title = stringResource(R.string.biometric_setting),
-                        subtitle = stringResource(R.string.biometric_setting_summary),
-                        icon = painterResource(R.drawable.ic_fingerprint),
-                        onValueChanged = { _ ->
-                            val activity =
-                                activity as? FragmentActivity ?: return@SwitchPreference false
-
-                            if (deviceHasPasswordPinLock(activity)) {
-                                startBiometricAuthentication(
-                                    activity, R.string.biometric_authentication_title, false
-                                )
-                                promptInfo?.let {
-                                    authCallback = this
-                                    biometricPrompt?.authenticate(it)
-                                }
-                            }
-
-                            return@SwitchPreference true
-                        })
-                )
-            )
-        )
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment2.kt

@@ -1,8 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.lagradost.cloudstream4.compose.Screen
-
-
-/** Empty glue code to connect the old navigation graph to Compose */
-class SettingsFragment2 : BaseComposeFragment(), Screen by SettingsFragmentScreen

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragmentScreen.kt

@@ -1,430 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import androidx.activity.compose.BackHandler
-import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-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
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.text.input.TextFieldState
-import androidx.compose.foundation.text.input.rememberTextFieldState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ProvideTextStyle
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SearchBarDefaults
-import androidx.compose.material3.SearchBarState
-import androidx.compose.material3.SearchBarValue
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.material3.rememberSearchBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.layout.onGloballyPositioned
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.semantics.clearAndSetSemantics
-import androidx.compose.ui.tooling.preview.PreviewLightDark
-import androidx.compose.ui.unit.dp
-import coil3.compose.AsyncImage
-import com.lagradost.cloudstream3.BuildConfig
-import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.DataStoreHelper.profileImages
-import com.lagradost.cloudstream3.utils.GitInfo.currentCommitHash
-import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
-import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import com.lagradost.cloudstream3.utils.txt
-import com.lagradost.cloudstream4.compose.Screen
-import com.lagradost.cloudstream4.compose.TV
-import com.lagradost.cloudstream4.compose.circle
-import com.lagradost.cloudstream4.compose.focusOutline
-import com.lagradost.cloudstream4.compose.isLayout
-import com.lagradost.cloudstream4.theme.CloudStreamPreviewTheme
-import com.mihon.material.padding
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import com.mihon.presentation.settings.SettingSearchResults
-import com.mihon.presentation.settings.SettingsData
-import com.mihon.presentation.settings.widget.TextPreferenceWidget
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toPersistentList
-import kotlinx.coroutines.launch
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.TimeZone
-
-object SettingsFragmentScreen : Screen {
-    val screens = persistentListOf(
-        SettingsNavigation(
-            title = R.string.category_general,
-            navigation = R.id.action_navigation_global_to_navigation_settings_general,
-            screen = SettingsGeneralScreen,
-            icon = R.drawable.build_24px,
-        ),
-        SettingsNavigation(
-            title = R.string.category_player,
-            navigation = R.id.action_navigation_global_to_navigation_settings_player,
-            screen = SettingsPlayerScreen,
-            icon = R.drawable.play_arrow_24px,
-        ),
-        /*SettingsNavigation(
-            title = R.string.category_providers,
-            navigation = R.id.action_navigation_global_to_navigation_settings_providers,
-            screen = SettingsProvidersScreen,
-            icon = R.drawable.build_24px,
-        ),*/
-        SettingsNavigation(
-            title = R.string.category_ui,
-            navigation = R.id.action_navigation_global_to_navigation_settings_ui,
-            screen = SettingsUIScreen,
-            icon = R.drawable.format_paint_24px,
-        ),
-        SettingsNavigation(
-            title = R.string.category_updates,
-            navigation = R.id.action_navigation_global_to_navigation_settings_updates,
-            screen = SettingsUpdatesScreen,
-            icon = R.drawable.mobile_arrow_down_24px,
-        ),
-        SettingsNavigation(
-            title = R.string.category_account,
-            navigation = R.id.action_navigation_global_to_navigation_settings_account,
-            screen = SettingsAccountScreen,
-            icon = R.drawable.encrypted_24px,
-        ),
-        SettingsNavigation(
-            title = R.string.pref_category_extensions,
-            navigation = R.id.action_navigation_global_to_navigation_settings_extensions,
-            screen = null,
-            icon = R.drawable.extension_24px,
-            subtitle = R.string.add_repository
-        ),
-    )
-
-    data class SettingsNavigation(
-        val title: Int,
-        val navigation: Int,
-        val screen: SearchableSettings?,
-        val icon: Int,
-        val subtitle: Int? = null,
-    )
-
-
-    @OptIn(ExperimentalMaterial3Api::class)
-    @Composable
-    @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
-    override fun Content() {
-        val textFieldState = rememberTextFieldState()
-        val searchBarState = rememberSearchBarState()
-
-        val screen = screens.mapNotNull { item ->
-            val contents = item.screen?.getPreferences() ?: return@mapNotNull null
-            SettingsData(
-                title = stringResource(item.title),
-                navigation = item.navigation,
-                contents = contents
-            )
-        }.toPersistentList()
-
-        val outerListState = rememberScrollState()
-
-        val parentFirstScrollConnection = remember {
-            object : NestedScrollConnection {
-                override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
-                    val delta = available.y
-                    return if (delta < 0 && outerListState.canScrollForward) {
-                        val consumed = outerListState.dispatchRawDelta(-delta)
-                        Offset(0f, -consumed)
-                    } else {
-                        Offset.Zero
-                    }
-                }
-            }
-        }
-
-        Scaffold { _ ->
-            Column(modifier = Modifier.verticalScroll(outerListState)) {
-                Spacer(modifier = Modifier.height(MaterialTheme.padding.small))
-
-                val default = DataStoreHelper.getDefaultAccount(
-                    LocalContext.current
-                )
-                val flow by DataStoreHelper.selectedAccountNumberFlow.collectAsState()
-                val account = remember(flow) {
-                    DataStoreHelper.getCurrentAccount() ?: default
-                }
-
-                Row(
-                    modifier = Modifier.fillMaxSize().focusOutline().clickable {
-                        activity.navigate(
-                            R.id.accountSelectActivity,
-                            Bundle().apply { putBoolean("isFromMainActivity", true) }
-                        )
-                    }.padding(
-                        vertical = MaterialTheme.padding.large,
-                        horizontal = MaterialTheme.padding.medium
-                    )
-                ) {
-                    val image =
-                        account.customImage ?: profileImages.getOrNull(account.defaultImageIndex)
-                        ?: profileImages.first()
-
-                    Box(
-                        modifier = Modifier
-                            .size(50.dp)
-                            .border(
-                                2.dp,
-                                MaterialTheme.colorScheme.onBackground.copy(alpha = 0.2f),
-                                CircleShape
-                            )
-                            .circle(),
-                    ) {
-                        AsyncImage(
-                            contentScale = ContentScale.Crop,
-                            model = image,
-                            modifier = Modifier.fillMaxSize(),
-                            contentDescription = null,
-                        )
-                    }
-                    Spacer(modifier = Modifier.width(MaterialTheme.padding.medium))
-                    Column {
-                        Text(
-                            text = account.name,
-                            style = MaterialTheme.typography.titleLarge,
-                        )
-                        Text(
-                            text = stringResource(R.string.title_settings),
-                            style = MaterialTheme.typography.bodyMedium,
-                        )
-                    }
-                }
-
-                Spacer(modifier = Modifier.height(MaterialTheme.padding.small))
-                SettingsSearch(searchBarState = searchBarState, textFieldState = textFieldState)
-                Spacer(modifier = Modifier.height(MaterialTheme.padding.small))
-
-                SettingSearchResults(
-                    nestedScrollConnection = parentFirstScrollConnection,
-                    searchKey = textFieldState.text.toString(),
-                    items = screen,
-                    onItemClick = { item ->
-                        SearchableSettings.highlightKey = item.highlightKey
-                        activity?.navigate(item.navigation)
-                    }, empty = {
-                        Column(
-                            modifier = Modifier
-                                .nestedScroll(parentFirstScrollConnection)
-                        ) {
-                            screens.forEach { settingsTab ->
-                                SettingsTab(settingsTab)
-                            }
-                            BuildStamp()
-                        }
-                    })
-
-            }
-        }
-    }
-
-    @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
-    @Composable
-    fun SettingsSearch(searchBarState: SearchBarState, textFieldState: TextFieldState) {
-        val scope = rememberCoroutineScope()
-        val inputField =
-            @Composable {
-                SearchBarDefaults.InputField(
-                    textFieldState = textFieldState,
-                    searchBarState = searchBarState,
-                    modifier = Modifier.onFocusChanged { newFocus ->
-                        if (newFocus.hasFocus) {
-                            scope.launch {
-                                searchBarState.animateToExpanded()
-                            }
-                        }
-                    },
-                    onSearch = { scope.launch { searchBarState.animateToCollapsed() } },
-                    placeholder = {
-                        Text(modifier = Modifier.clearAndSetSemantics {}, text = stringResource(R.string.search_hint))
-                    },
-                    leadingIcon = {
-                        Crossfade(
-                            targetState = searchBarState.targetValue,
-                            label = "leftsearch",
-                        ) { value ->
-                            when (value) {
-                                SearchBarValue.Expanded -> {
-                                    IconButton(onClick = {
-                                        textFieldState.edit { replace(0, length, "") }
-                                        scope.launch {
-                                            searchBarState.animateToCollapsed()
-                                        }
-                                    }) {
-                                        Icon(
-                                            painter = painterResource(R.drawable.keyboard_arrow_left_24px),
-                                            tint = MaterialTheme.colorScheme.onBackground,
-                                            contentDescription = null
-                                        )
-                                    }
-                                }
-
-                                SearchBarValue.Collapsed -> {
-                                    IconButton(onClick = {
-                                        scope.launch {
-                                            searchBarState.animateToExpanded()
-                                        }
-                                    }) {
-                                        Icon(
-                                            painter = painterResource(R.drawable.search_icon),
-                                            tint = MaterialTheme.colorScheme.onBackground,
-                                            contentDescription = null
-                                        )
-                                    }
-                                }
-                            }
-                        }
-
-                        /*SampleLeadingIcon(searchBarState, scope)*/
-                    },
-                    trailingIcon = {
-                        Crossfade(
-                            targetState = searchBarState.targetValue,
-                            label = "rightsearch",
-                        ) { value ->
-                            when (value) {
-                                SearchBarValue.Expanded -> {
-                                    IconButton(onClick = {
-                                        textFieldState.edit { replace(0, length, "") }
-                                    }) {
-                                        Icon(
-                                            painter = painterResource(R.drawable.close_24px),
-                                            tint = MaterialTheme.colorScheme.onBackground,
-                                            contentDescription = null
-                                        )
-                                    }
-                                }
-
-                                SearchBarValue.Collapsed -> {
-                                }
-                            }
-                        }
-                    },
-                )
-            }
-
-        Surface(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 24.dp - 12.dp * searchBarState.progress)
-                .focusOutline(enabled = isLayout(TV), CircleShape)
-                .onGloballyPositioned { searchBarState.collapsedCoords = it },
-            shape = SearchBarDefaults.inputFieldShape,
-            color = MaterialTheme.colorScheme.surfaceVariant,
-            tonalElevation = SearchBarDefaults.TonalElevation,
-            shadowElevation = SearchBarDefaults.ShadowElevation,
-            content = inputField,
-        )
-
-        BackHandler(enabled = searchBarState.targetValue == SearchBarValue.Expanded) {
-            textFieldState.edit { replace(0, length, "") }
-            scope.launch {
-                searchBarState.animateToCollapsed()
-            }
-        }
-    }
-
-    @Composable
-    fun SettingsTab(settingsTab: SettingsNavigation) {
-        val pref = settingsTab.screen?.getPreferences() ?: emptyList()
-        val groups = pref.filterIsInstance<Preference.PreferenceGroup>()
-            .filter { it.enabled }
-        TextPreferenceWidget(
-            title = stringResource(settingsTab.title),
-            icon = painterResource(settingsTab.icon),
-            subtitle = settingsTab.subtitle?.let { stringResource(it) }
-                ?: groups.joinToString { it.title }) {
-            // Clear it if we have already set it but navigated back instantly
-            SearchableSettings.highlightKey = null
-            activity?.navigate(settingsTab.navigation)
-        }
-    }
-
-    @Composable
-    fun BuildStamp() {
-        val (commitHash, buildTimestamp) = remember {
-            val commitHash = activity?.currentCommitHash() ?: ""
-            val buildTimestamp = SimpleDateFormat.getDateTimeInstance(
-                DateFormat.LONG, DateFormat.MEDIUM,
-                Locale.getDefault()
-            ).apply {
-                timeZone = TimeZone.getTimeZone("UTC")
-            }.format(Date(BuildConfig.BUILD_DATE)).replace("UTC", "")
-            commitHash to buildTimestamp
-        }
-
-        Row(
-            horizontalArrangement = Arrangement.SpaceEvenly,
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(50.dp)
-                .focusOutline()
-                .clickable {
-                    clipboardHelper(
-                        txt(R.string.extension_version),
-                        "${BuildConfig.VERSION_NAME} $commitHash $buildTimestamp"
-                    )
-                },
-        ) {
-            ProvideTextStyle(MaterialTheme.typography.bodyMedium) {
-                Text(text = BuildConfig.VERSION_NAME)
-                if (commitHash != "") {
-                    Text("•")
-                    Text(text = commitHash)
-                }
-                Text("•")
-                Text(text = buildTimestamp)
-            }
-        }
-    }
-}
-
-
-@PreviewLightDark
-@Composable
-fun Preview() {
-    CloudStreamPreviewTheme {
-        SettingsFragmentScreen.Content()
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt

@@ -3,7 +3,6 @@ package com.lagradost.cloudstream3.ui.settings
 import android.content.Context
 import android.net.Uri
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
@@ -18,7 +17,6 @@ import com.lagradost.cloudstream3.CloudStreamApp
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity
-import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
@@ -79,7 +77,6 @@ val appLanguages = arrayListOf(
     Pair("Azərbaycan dili", "az"),
     Pair("Bahasa Indonesia", "in"),
     Pair("Bahasa Melayu", "ms"),
-    Pair("català", "ca"),
     Pair("Deutsch", "de"),
     Pair("English", "en"),
     Pair("Español", "es"),
@@ -100,7 +97,6 @@ val appLanguages = arrayListOf(
     Pair("Português", "pt"),
     Pair("Português (Brasil)", "pt-BR"),
     Pair("Română", "ro"),
-    Pair("Shqip мова", "sq"),
     Pair("Slovenčina", "sk"),
     Pair("Soomaaliga", "so"),
     Pair("Svenska", "sv"),
@@ -110,7 +106,6 @@ val appLanguages = arrayListOf(
     Pair("Wikang Filipino", "fil"),
     Pair("Čeština", "cs"),
     Pair("Ελληνικά", "el"),
-    Pair("беларуская мова", "be"),
     Pair("български", "bg"),
     Pair("македонски", "mk"),
     Pair("русский", "ru"),
@@ -177,96 +172,6 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
                 putString(context.getString(R.string.download_path_key_visual), visual)
             }
         }
-
-        fun getCurrent(): MutableList<CustomSite> {
-            return getKey<Array<CustomSite>>(USER_PROVIDER_API)?.toMutableList()
-                ?: mutableListOf()
-        }
-        fun showAdd() {
-            val providers = allProviders.distinctBy { it::class }.sortedBy { it.name }
-            val context = activity
-            context?.showDialog(
-                providers.map { "${it.name} (${it.mainUrl})" },
-                -1,
-                context.getString(R.string.add_site_pref),
-                true,
-                {}) { selection ->
-                val provider = providers.getOrNull(selection) ?: return@showDialog
-
-                val binding : AddSiteInputBinding = AddSiteInputBinding.inflate(LayoutInflater.from(
-                    context
-                ),null,false)
-
-                val builder =
-                    AlertDialog.Builder(context, R.style.AlertDialogCustom)
-                        .setView(binding.root)
-
-                val dialog = builder.create()
-                dialog.show()
-
-                binding.text2.text = provider.name
-                binding.applyBtt.setOnClickListener {
-                    val name = binding.siteNameInput.text?.toString()
-                    val url = binding.siteUrlInput.text?.toString()
-                    val lang = binding.siteLangInput.text?.toString()
-                    val realLang = if (lang.isNullOrBlank()) provider.lang else lang
-                    val simpleName = provider::class.simpleName
-                    if (url.isNullOrBlank() || name.isNullOrBlank() || simpleName == null) {
-                        showToast(R.string.error_invalid_data, Toast.LENGTH_SHORT)
-                        return@setOnClickListener
-                    }
-
-                    val current = getCurrent()
-                    val newSite = CustomSite(simpleName, name, url, realLang)
-                    current.add(newSite)
-                    setKey(USER_PROVIDER_API, current.toTypedArray())
-                    // reload apis
-                    MainActivity.afterPluginsLoadedEvent.invoke(false)
-
-                    dialog.dismissSafe(activity)
-                }
-                binding.cancelBtt.setOnClickListener {
-                    dialog.dismissSafe(activity)
-                }
-            }
-        }
-
-        fun showDelete() {
-            val current = getCurrent()
-            val context = activity
-            context?.showMultiDialog(
-                current.map { it.name },
-                listOf(),
-                context.getString(R.string.remove_site_pref),
-                {}) { indexes ->
-                current.removeAll(indexes.map { current[it] })
-                setKey(USER_PROVIDER_API, current.toTypedArray())
-            }
-        }
-
-        fun showAddOrDelete() {
-            val context = activity
-
-            val binding : AddRemoveSitesBinding = AddRemoveSitesBinding.inflate(
-                LayoutInflater.from(
-                    context
-                ),null,false)
-            val builder =
-                AlertDialog.Builder(context ?: return, R.style.AlertDialogCustom)
-                    .setView(binding.root)
-
-            val dialog = builder.create()
-            dialog.show()
-
-            binding.addSite.setOnClickListener {
-                showAdd()
-                dialog.dismissSafe(activity)
-            }
-            binding.removeSite.setOnClickListener {
-                showDelete()
-                dialog.dismissSafe(activity)
-            }
-        }
     }
 
     private val pathPicker = getChooseFolderLauncher { uri, path ->
@@ -278,6 +183,10 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
         setPreferencesFromResource(R.xml.settings_general, rootKey)
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(requireContext())
 
+        fun getCurrent(): MutableList<CustomSite> {
+            return getKey<Array<CustomSite>>(USER_PROVIDER_API)?.toMutableList()
+                ?: mutableListOf()
+        }
 
         getPref(R.string.locale_key)?.setOnPreferenceClickListener { pref ->
             val current = getCurrentLocale(pref.context)
@@ -314,7 +223,83 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
             true
         }
 
+        fun showAdd() {
+            val providers = allProviders.distinctBy { it::class }.sortedBy { it.name }
+            activity?.showDialog(
+                providers.map { "${it.name} (${it.mainUrl})" },
+                -1,
+                context?.getString(R.string.add_site_pref) ?: return,
+                true,
+                {}) { selection ->
+                val provider = providers.getOrNull(selection) ?: return@showDialog
 
+                val binding : AddSiteInputBinding = AddSiteInputBinding.inflate(layoutInflater,null,false)
+
+                val builder =
+                    AlertDialog.Builder(context ?: return@showDialog, R.style.AlertDialogCustom)
+                        .setView(binding.root)
+
+                val dialog = builder.create()
+                dialog.show()
+
+                binding.text2.text = provider.name
+                binding.applyBtt.setOnClickListener {
+                    val name = binding.siteNameInput.text?.toString()
+                    val url = binding.siteUrlInput.text?.toString()
+                    val lang = binding.siteLangInput.text?.toString()
+                    val realLang = if (lang.isNullOrBlank()) provider.lang else lang
+                    val simpleName = provider::class.simpleName
+                    if (url.isNullOrBlank() || name.isNullOrBlank() || simpleName == null) {
+                        showToast(R.string.error_invalid_data, Toast.LENGTH_SHORT)
+                        return@setOnClickListener
+                    }
+
+                    val current = getCurrent()
+                    val newSite = CustomSite(simpleName, name, url, realLang)
+                    current.add(newSite)
+                    setKey(USER_PROVIDER_API, current.toTypedArray())
+                    // reload apis
+                    MainActivity.afterPluginsLoadedEvent.invoke(false)
+
+                    dialog.dismissSafe(activity)
+                }
+                binding.cancelBtt.setOnClickListener {
+                    dialog.dismissSafe(activity)
+                }
+            }
+        }
+
+        fun showDelete() {
+            val current = getCurrent()
+
+            activity?.showMultiDialog(
+                current.map { it.name },
+                listOf(),
+                context?.getString(R.string.remove_site_pref) ?: return,
+                {}) { indexes ->
+                current.removeAll(indexes.map { current[it] })
+                setKey(USER_PROVIDER_API, current.toTypedArray())
+            }
+        }
+
+        fun showAddOrDelete() {
+            val binding : AddRemoveSitesBinding = AddRemoveSitesBinding.inflate(layoutInflater,null,false)
+            val builder =
+                AlertDialog.Builder(context ?: return, R.style.AlertDialogCustom)
+                    .setView(binding.root)
+
+            val dialog = builder.create()
+            dialog.show()
+
+            binding.addSite.setOnClickListener {
+                showAdd()
+                dialog.dismissSafe(activity)
+            }
+            binding.removeSite.setOnClickListener {
+                showDelete()
+                dialog.dismissSafe(activity)
+            }
+        }
 
         getPref(R.string.override_site_key)?.setOnPreferenceClickListener { _ ->
 
@@ -341,7 +326,7 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
             val prefValues = resources.getIntArray(R.array.dns_pref_values)
 
             val currentDns =
-                settingsManager.getInt(getString(R.string.dns_key), 0)
+                settingsManager.getInt(getString(R.string.dns_pref), 0)
 
             activity?.showBottomDialog(
                 prefNames.toList(),
@@ -349,7 +334,7 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
                 getString(R.string.dns_pref),
                 true,
                 {}) {
-                settingsManager.edit { putInt(getString(R.string.dns_key), prefValues[it]) }
+                settingsManager.edit { putInt(getString(R.string.dns_pref), prefValues[it]) }
                 (context ?: CloudStreamApp.context)?.let { ctx -> app.initClient(ctx) }
             }
             return@setOnPreferenceClickListener true
@@ -367,7 +352,7 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
                         (first +
                                 ctx.getExternalFilesDirs("").mapNotNull { it.path } +
                                 currentDir)
-                    } catch (_: Exception) {
+                    } catch (e: Exception) {
                         first
                     }).filterNotNull().distinct()
                 }

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral2.kt

@@ -1,7 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.mihon.presentation.settings.SearchableSettings
-
-/** Empty glue code to connect the old navigation graph to Compose */
-class SettingsGeneral2 : BaseComposeFragment(), SearchableSettings by SettingsGeneralScreen

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneralScreen.kt

@@ -1,299 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import android.content.Intent
-import android.net.Uri
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.integerArrayResource
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringArrayResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.PreviewLightDark
-import com.lagradost.cloudstream3.APIHolder
-import com.lagradost.cloudstream3.AllLanguagesName
-import com.lagradost.cloudstream3.CloudStreamApp
-import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.UnsafeSSL
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.insecureApp
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.network.initClient
-import com.lagradost.cloudstream3.ui.settings.SettingsProvidersScreen.toStringRes
-import com.lagradost.cloudstream3.utils.BatteryOptimizationChecker.isAppRestricted
-import com.lagradost.cloudstream3.utils.BatteryOptimizationChecker.showRequestIgnoreBatteryOptDialog
-import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToLanguageName
-import com.lagradost.cloudstream3.utils.SubtitleHelper.getNameNextToFlagEmoji
-import com.lagradost.cloudstream4.AppSettings
-import com.lagradost.cloudstream4.compose.ActionDialog
-import com.lagradost.cloudstream4.compose.PHONE
-import com.lagradost.cloudstream4.compose.isLayout
-import com.lagradost.cloudstream4.rememberAppSettings
-import com.lagradost.cloudstream4.theme.CloudStreamPreviewTheme
-import com.lagradost.safefile.SafeFile
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import com.mihon.presentation.settings.collectAsState
-import kotlinx.collections.immutable.persistentListOf
-
-object SettingsGeneralScreen : SearchableSettings {
-    @Composable
-    override fun getTitleRes(): String = stringResource(R.string.category_general)
-
-    @Composable
-    override fun getPreferences(): List<Preference> {
-        val settings = rememberAppSettings()
-
-        // TODO Refactor entirely to use a different file path selector ect like QuickNovel
-        val selectFileSelector =
-            rememberLauncherForActivityResult(ActivityResultContracts.OpenDocumentTree()) { uri ->
-                // It lies, it can be null if file manager quits.
-                if (uri == null) return@rememberLauncherForActivityResult
-                val context = CloudStreamApp.context ?: return@rememberLauncherForActivityResult
-
-                try {
-                    val settings = AppSettings(context)
-                    // RW perms for the path
-                    val flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
-                            Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-
-                    context.contentResolver.takePersistableUriPermission(uri, flags)
-
-                    val filePath = SafeFile.fromUri(context, uri)?.filePath()
-                    println("Selected URI path: $uri - Full path: $filePath")
-
-                    // store the actual URI instead of the path due to permissions.
-                    // filePath should only be used for cosmetic purposes.
-                    val visual = filePath ?: uri.toString()
-                    settings.general.downloadPath.set(uri.toString())
-                    settings.general.downloadPathVisual.set(visual)
-                } catch (t: Throwable) {
-                    logError(t)
-                }
-            }
-
-        val bananas by settings.general.bananas.collectAsState()
-        val parallelDownloads by settings.general.parallelDownloads.collectAsState()
-        val concurrentConnections by settings.general.concurrentConnections.collectAsState()
-        val locale by settings.general.locale.collectAsState()
-        val downloadPathVisual by settings.general.downloadPathVisual.collectAsState()
-        //val downloadPath by settings.general.downloadPath.collectAsState()
-
-        var isBatteryShown by remember { mutableStateOf(false) }
-        val context = LocalContext.current
-
-        if (isBatteryShown) {
-            ActionDialog(
-                icon = painterResource(R.drawable.battery_alert_24px),
-                title = stringResource(R.string.battery_dialog_title),
-                text = stringResource(R.string.battery_dialog_message),
-                confirmText = stringResource(R.string.ok),
-                dismissText = stringResource(R.string.cancel),
-                dismiss = {
-                    isBatteryShown = false
-                    settings.general.batterOptimization.set(false)
-                },
-                confirm = {
-                    isBatteryShown = false
-                    // The og impl never modified it to true?
-                    // settings.general.batterOptimization.set(true)
-                    context.showRequestIgnoreBatteryOptDialog()
-                }
-            )
-        }
-
-        val default = AllLanguagesName to stringResource(R.string.all_languages_preference)
-        val languages = APIHolder.apis.withLock {
-            APIHolder.apis.map { api -> api.lang }.distinct()
-        }.sortedBy { fromTagToLanguageName(it) ?: it }
-
-        return persistentListOf(
-            Preference.PreferenceGroup(title = stringResource(R.string.extension_language), preferenceItems = persistentListOf(
-                Preference.PreferenceItem.BasicListPreference(
-                    value = locale,
-                    entries = appLanguages.associate { (name, code) -> (code to (name to code).nameNextToFlagEmoji()) },
-                    title = stringResource(R.string.app_language),
-                    icon = painterResource(R.drawable.language_korean_latin_24px),
-                    onValueChanged = { value ->
-                        settings.general.locale.set(value)
-                        activity?.recreate()
-                    },
-                    subtitleProvider = { v, e -> e[v] ?: getCurrentLocale(LocalContext.current) }
-                ),
-                Preference.PreferenceItem.MultiSelectListPreference(
-                    title = stringResource(R.string.provider_lang_settings),
-                    icon = painterResource(R.drawable.plugin_lang),
-                    entries = mapOf(default) + languages.associateWith { lang ->
-                        (getNameNextToFlagEmoji(
-                            lang
-                        ) ?: lang)
-                    },
-                    preference = settings.provider.extensionLanguages
-                ),
-                Preference.PreferenceItem.MultiSelectListPreference(
-                    title = stringResource(R.string.preferred_media_settings),
-                    icon = painterResource(R.drawable.movie_edit_24px),
-                    preference = settings.provider.preferredMedia,
-                    entries = TvType.entries.associate {
-                        it.ordinal.toString() to stringResource(it.toStringRes())
-                    }),
-            )),
-
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.title_downloads),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.TextPreference(
-                        icon = painterResource(R.drawable.netflix_download),
-                        subtitle = downloadPathVisual,
-                        title = stringResource(R.string.download_path_pref),
-                        onClick = {
-                            // This is not a ListPreference because the old selection system is
-                            // broken af. This needs to be refactored to QuickNovels download path
-                            // system.
-                            selectFileSelector.launch(Uri.EMPTY)
-                        },
-                    ),
-                    Preference.PreferenceItem.SliderPreference(
-                        icon = painterResource(R.drawable.arrow_or_edge_24px),
-                        value = parallelDownloads,
-                        valueRange = 1..10,
-                        title = stringResource(R.string.parallel_downloads),
-                        subtitle = stringResource(R.string.download_parallel_settings_des),
-                        onValueChanged = settings.general.parallelDownloads::set,
-                    ),
-                    Preference.PreferenceItem.SliderPreference(
-                        icon = painterResource(R.drawable.arrow_and_edge_24px),
-                        value = concurrentConnections,
-                        valueRange = 1..10,
-                        title = stringResource(R.string.concurrent_connections),
-                        subtitle = stringResource(R.string.concurrent_connections_settings_des),
-                        onValueChanged = settings.general.concurrentConnections::set,
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.battery_dialog_title),
-                        icon = painterResource(R.drawable.battery_alert_24px),
-                        enabled = isLayout(PHONE),
-                        onClick = {
-                            if (isAppRestricted(context)) {
-                                isBatteryShown = true
-                            } else {
-                                showToast(R.string.app_unrestricted_toast)
-                            }
-                        }
-                    ),
-                )
-            ),
-
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_bypass),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.add_site_pref),
-                        subtitle = stringResource(R.string.add_site_summary),
-                        icon = painterResource(R.drawable.copy_all_24px),
-                        onClick = {
-                            // TODO refactor into compose
-                            if (SettingsGeneral.getCurrent().isEmpty()) {
-                                SettingsGeneral.showAdd()
-                            } else {
-                                SettingsGeneral.showAddOrDelete()
-                            }
-                        }
-                    ),
-                    Preference.PreferenceItem.ListPreference(
-                        title = stringResource(R.string.dns_pref),
-                        subtitle = stringResource(R.string.dns_pref_summary),
-                        icon = painterResource(R.drawable.dns_24px),
-                        preference = settings.general.dns,
-                        entries = integerArrayResource(R.array.dns_pref_values).zip(
-                            stringArrayResource(R.array.dns_pref)
-                        ).toMap(),
-                        onValueChanged = {
-                            (CloudStreamApp.context)?.let { ctx ->
-                                app.initClient(ctx, ignoreSSL = false)
-                                @OptIn(UnsafeSSL::class)
-                                insecureApp.initClient(ctx, ignoreSSL = true)
-                            }
-                            return@ListPreference true
-                        },
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        title = stringResource(R.string.jsdelivr_proxy),
-                        subtitle = stringResource(R.string.jsdelivr_proxy_summary),
-                        icon = painterResource(R.drawable.wifi_proxy_24px),
-                        preference = settings.general.jsdelivrProxy
-                    )
-                )
-            ),
-
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_links),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.github),
-                        subtitle = "https://github.com/recloudstream/cloudstream",
-                        icon = painterResource(R.drawable.ic_github_logo),
-                        onClick = {
-                            CloudStreamApp.openBrowser("https://github.com/recloudstream/cloudstream")
-                        }
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.lightnovel),
-                        subtitle = "https://github.com/LagradOst/QuickNovel",
-                        icon = painterResource(R.drawable.quick_novel_icon),
-                        onClick = {
-                            CloudStreamApp.openBrowser("https://github.com/LagradOst/QuickNovel")
-                        }
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.discord),
-                        subtitle = "https://discord.gg/5Hus6fM",
-                        icon = painterResource(R.drawable.ic_baseline_discord_24),
-                        onClick = {
-                            CloudStreamApp.openBrowser("https://discord.gg/5Hus6fM")
-                        }
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.cs3wiki),
-                        subtitle = "https://cloudstream.miraheze.org/",
-                        icon = painterResource(R.drawable.description_24px),
-                        onClick = {
-                            CloudStreamApp.openBrowser("https://cloudstream.miraheze.org/")
-                        }
-                    ),
-                )
-            ),
-
-            Preference.PreferenceItem.TextPreference(
-                title = stringResource(R.string.benene),
-                subtitle = if (bananas == 0) {
-                    stringResource(R.string.benene_count_text_none)
-                } else {
-                    stringResource(R.string.benene_count_text, bananas)
-                },
-                onClick = {
-                    settings.general.bananas.set(bananas + 1)
-                },
-                icon = painterResource(R.drawable.benene),
-            ),
-            Preference.PreferenceItem.InfoPreference(title = stringResource(R.string.legal_notice_text)),
-        )
-    }
-}
-
-
-@PreviewLightDark
-@Composable
-private fun SettingGeneralPreview() {
-    CloudStreamPreviewTheme {
-        SettingsGeneralScreen.Content()
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer2.kt

@@ -1,7 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.mihon.presentation.settings.SearchableSettings
-
-/** Empty glue code to connect the old navigation graph to Compose */
-class SettingsPlayer2 : BaseComposeFragment(), SearchableSettings by SettingsPlayerScreen

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayerScreen.kt

@@ -1,353 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import android.text.format.Formatter.formatShortFileSize
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableLongStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.integerArrayResource
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringArrayResource
-import androidx.compose.ui.res.stringResource
-import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.actions.VideoClickActionHolder
-import com.lagradost.cloudstream3.ui.player.source_priority.QualityProfileDialog
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getFolderSize
-import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
-import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream4.compose.EMULATOR
-import com.lagradost.cloudstream4.compose.PHONE
-import com.lagradost.cloudstream4.compose.TV
-import com.lagradost.cloudstream4.compose.isLayout
-import com.lagradost.cloudstream4.rememberAppSettings
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import com.mihon.presentation.settings.collectAsState
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import kotlin.reflect.jvm.jvmName
-
-object SettingsPlayerScreen : SearchableSettings {
-    @Composable
-    override fun getTitleRes(): String = stringResource(R.string.category_player)
-
-    @Composable
-    override fun getPreferences(): List<Preference> {
-        val settings = rememberAppSettings()
-
-        val context = LocalContext.current
-        val defaultPlayerName = stringResource(R.string.player_settings_play_in_app)
-        val players = remember(context) {
-            mapOf("" to defaultPlayerName) + VideoClickActionHolder.getPlayers()
-                .associate { player ->
-                    player.uniqueId() to (player.name.asStringNull(context)
-                        ?: player::class.simpleName ?: player::class.jvmName)
-                }
-        }
-
-        val playerSeekTime by settings.player.doubleTapTime.collectAsState()
-        val tvSeekOnTime by settings.player.tvSeekOnTime.collectAsState()
-        val tvSeekOffTime by settings.player.tvSeekOffTime.collectAsState()
-
-        var cacheSize by remember { mutableLongStateOf(0L) }
-        var cacheCleared by remember { mutableIntStateOf(0) }
-        val cacheDir = LocalContext.current.cacheDir
-        LaunchedEffect(cacheCleared) {
-            withContext(Dispatchers.IO) {
-                cacheSize = getFolderSize(cacheDir)
-            }
-        }
-
-        return persistentListOf(
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_subtitles),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.player_subtitles_settings),
-                        subtitle = stringResource(R.string.player_subtitles_settings_des),
-                        icon = painterResource(R.drawable.subtitles_gear_24px),
-                        onClick = {
-                            SubtitlesFragment.push(activity, false)
-                        }),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.chromecast_subtitles_settings),
-                        subtitle = stringResource(R.string.chromecast_subtitles_settings_des),
-                        icon = painterResource(R.drawable.cast),
-                        onClick = {
-                            ChromecastSubtitlesFragment.push(activity, false)
-                        }),
-                ),
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_player_features),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ListPreference(
-                        title = stringResource(R.string.player_pref),
-                        icon = painterResource(R.drawable.play_arrow_24px),
-                        preference = settings.player.defaultPlayer,
-                        entries = players,
-                    ),
-
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.source_priority),
-                        subtitle = stringResource(R.string.source_priority_help),
-                        icon = painterResource(R.drawable.ic_baseline_people_24),
-                        onClick = {
-                            ioSafe {
-                                val defaultSources = QualityProfileDialog.getAllDefaultSources()
-                                val activity = activity ?: return@ioSafe
-                                activity.runOnUiThread {
-                                    QualityProfileDialog(
-                                        activity,
-                                        R.style.DialogFullscreenPlayer,
-                                        defaultSources,
-                                    ).show()
-                                }
-                            }
-                        }),
-
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.pipEnabled,
-                        title = stringResource(R.string.picture_in_picture),
-                        subtitle = stringResource(R.string.picture_in_picture_des),
-                        icon = painterResource(R.drawable.pip_24px),
-                    ),
-
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.resizeEnabled,
-                        title = stringResource(R.string.player_size_settings),
-                        subtitle = stringResource(R.string.player_size_settings_des),
-                        icon = painterResource(R.drawable.aspect_ratio_24px),
-                    ),
-
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.speedEnabled,
-                        title = stringResource(R.string.eigengraumode_settings),
-                        subtitle = stringResource(R.string.speed_setting_summary),
-                        icon = painterResource(R.drawable.ic_baseline_speed_24),
-                    ),
-
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.tiktokEnabled,
-                        title = stringResource(R.string.speedup_title),
-                        subtitle = stringResource(R.string.speedup_summary),
-                        icon = painterResource(R.drawable.speedup),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.autoPlayEnabled,
-                        title = stringResource(R.string.autoplay_next_settings),
-                        subtitle = stringResource(R.string.autoplay_next_settings_des),
-                        icon = painterResource(R.drawable.skip_next_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.skipOpEnabled,
-                        title = stringResource(R.string.video_skip_op),
-                        subtitle = stringResource(R.string.enable_skip_op_from_database_des),
-                        icon = painterResource(R.drawable.keyboard_double_arrow_right_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.autoRotateEnabled,
-                        title = stringResource(R.string.auto_rotate_video),
-                        subtitle = stringResource(R.string.auto_rotate_video_desc),
-                        icon = painterResource(R.drawable.screen_rotation_alt_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.rotateButtonEnabled,
-                        title = stringResource(R.string.rotate_video),
-                        subtitle = stringResource(R.string.rotate_video_desc),
-                        icon = painterResource(R.drawable.screen_rotation),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.previewBarEnabled,
-                        enabled = isLayout(PHONE or EMULATOR),
-                        title = stringResource(R.string.preview_seekbar),
-                        subtitle = stringResource(R.string.preview_seekbar_desc),
-                        icon = painterResource(R.drawable.picture_in_picture_center_24px),
-                    ),
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.player.softwareDecoding,
-                        title = stringResource(R.string.software_decoding),
-                        subtitle = stringResource(R.string.software_decoding_desc),
-                        icon = painterResource(R.drawable.memory_24px),
-                        entries = integerArrayResource(R.array.software_decoding_switch_values).zip(
-                            stringArrayResource(R.array.software_decoding_switch)
-                        ).toMap()
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.extraBrightnessEnabled,
-                        title = stringResource(R.string.extra_brightness_settings),
-                        subtitle = stringResource(R.string.extra_brightness_settings_des),
-                        icon = painterResource(R.drawable.light_mode_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.episodeSync,
-                        title = stringResource(R.string.episode_sync_settings),
-                        subtitle = stringResource(R.string.episode_sync_settings_des),
-                        icon = painterResource(R.drawable.autorenew_24px)
-                    ),
-                ),
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_gestures),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.swipeHorizontalEnabled,
-                        title = stringResource(R.string.swipe_to_seek_settings),
-                        subtitle = stringResource(R.string.swipe_to_seek_settings_des),
-                        icon = painterResource(R.drawable.swipe_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.swipeVerticalEnabled,
-                        title = stringResource(R.string.swipe_to_change_settings),
-                        subtitle = stringResource(R.string.swipe_to_change_settings_des),
-                        icon = painterResource(R.drawable.swipe_vertical_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.doubleTapToSeekEnabled,
-                        title = stringResource(R.string.double_tap_to_seek_settings),
-                        subtitle = stringResource(R.string.double_tap_to_seek_settings_des),
-                        icon = painterResource(R.drawable.touch_double_24px),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.doubleTapToPauseEnabled,
-                        title = stringResource(R.string.double_tap_to_pause_settings),
-                        subtitle = stringResource(R.string.double_tap_to_pause_settings_des),
-                        icon = painterResource(R.drawable.touch_double_24px),
-                    ),
-
-                    Preference.PreferenceItem.SliderPreference(
-                        value = playerSeekTime,
-                        title = stringResource(R.string.double_tap_to_seek_amount_settings),
-                        icon = painterResource(R.drawable.go_forward_30),
-                        valueRange = 5..60,
-                        steps = 10,
-                        onValueChanged = settings.player.doubleTapTime::set
-                    ),
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_android_tv),
-                enabled = isLayout(TV or EMULATOR),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.SliderPreference(
-                        value = tvSeekOnTime,
-                        title = stringResource(R.string.android_tv_interface_on_seek_settings),
-                        subtitle = stringResource(R.string.android_tv_interface_on_seek_settings_summary),
-                        icon = painterResource(R.drawable.go_forward_30),
-                        valueRange = 5..60,
-                        steps = 10,
-                        onValueChanged = settings.player.tvSeekOnTime::set
-                    ),
-                    Preference.PreferenceItem.SliderPreference(
-                        value = tvSeekOffTime,
-                        title = stringResource(R.string.android_tv_interface_off_seek_settings),
-                        subtitle = stringResource(R.string.android_tv_interface_off_seek_settings_summary),
-                        icon = painterResource(R.drawable.go_forward_30),
-                        valueRange = 5..60,
-                        steps = 10,
-                        onValueChanged = settings.player.tvSeekOffTime::set
-                    ),
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_player_layout),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.player.limitPlayerTitle,
-                        title = stringResource(R.string.limit_title),
-                        icon = painterResource(R.drawable.match_word_24px),
-                        entries = integerArrayResource(R.array.limit_title_pref_values).zip(
-                            stringArrayResource(R.array.limit_title_pref_names)
-                        ).toMap()
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        enabled = isLayout(PHONE or EMULATOR),
-                        preference = settings.player.hidePlayerControlNames,
-                        icon = painterResource(R.drawable.visibility_off_24px),
-                        title = stringResource(R.string.hide_player_control_names),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.showName,
-                        icon = painterResource(R.drawable.label_24px),
-                        title = stringResource(R.string.source_name),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.showMediaInfo,
-                        icon = painterResource(R.drawable.movie_info_24px),
-                        title = stringResource(R.string.video_info),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.player.showResolution,
-                        title = stringResource(R.string.resolution),
-                        icon = painterResource(R.drawable.high_res_24px),
-                    ),
-
-                    // Unsure if we want to have MultiSelectListPreference or boolean
-                    /*Preference.PreferenceItem.MultiSelectListPreference(
-                        preference = settings.player.showPlayerInfo,
-                        title = stringResource(R.string.limit_title_rez),
-                        icon = painterResource(R.drawable.ic_baseline_text_format_24),
-                        entries = persistentMapOf(
-                            ShowPlayerInfo.Name to stringResource(R.string.source_name),
-                            ShowPlayerInfo.Resolution to stringResource(R.string.resolution),
-                            ShowPlayerInfo.VideoInfo to stringResource(R.string.video_info),
-                        )
-                    ), */
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_cache),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.player.bufferDiskMB,
-                        title = stringResource(R.string.video_buffer_disk_settings),
-                        subtitle = "%s\n" + stringResource(R.string.video_disk_description),
-                        icon = painterResource(R.drawable.hard_drive_24px),
-                        entries = integerArrayResource(R.array.video_buffer_size_values).zip(
-                            stringArrayResource(R.array.video_buffer_size_names)
-                        ).toMap()
-                    ),
-
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.player.bufferRamMB,
-                        title = stringResource(R.string.video_buffer_size_settings),
-                        subtitle = "%s\n" + stringResource(R.string.video_ram_description),
-                        icon = painterResource(R.drawable.memory_alt_24px),
-                        entries = integerArrayResource(R.array.video_buffer_size_values).zip(
-                            stringArrayResource(R.array.video_buffer_size_names)
-                        ).toMap()
-                    ),
-
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.player.bufferTimeSec,
-                        title = stringResource(R.string.video_buffer_length_settings),
-                        subtitle = "%s\n" + stringResource(R.string.video_ram_description),
-                        icon = painterResource(R.drawable.history_toggle_off_24px),
-                        entries = integerArrayResource(R.array.video_buffer_length_values).zip(
-                            stringArrayResource(R.array.video_buffer_length_names)
-                        ).toMap()
-                    ),
-
-                    Preference.PreferenceItem.TextPreference(
-                        icon = painterResource(R.drawable.ic_baseline_delete_outline_24),
-                        title = stringResource(R.string.video_buffer_clear_settings),
-                        subtitle = formatShortFileSize(LocalContext.current, cacheSize),
-                        onClick = {
-                            ioSafe {
-                                cacheDir.deleteRecursively()
-                                cacheCleared += 1
-                            }
-                        })
-                )
-            ),
-
-            )
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt

@@ -109,8 +109,7 @@ class SettingsProviders : BasePreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
-        getPref(R.string.
-        provider_lang_key)?.setOnPreferenceClickListener {
+        getPref(R.string.provider_lang_key)?.setOnPreferenceClickListener {
             activity?.getApiProviderLangSettings()?.let { currentLangTags ->
                 val languagesTagName = APIHolder.apis.withLock {
                     listOf(Pair(AllLanguagesName, getString(R.string.all_languages_preference))) +

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders2.kt

@@ -1,7 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.mihon.presentation.settings.SearchableSettings
-
-/** Empty glue code to connect the old navigation graph to Compose */
-@Deprecated("This setting was merged into other places")
-class SettingsProviders2 : BaseComposeFragment(), SearchableSettings by SettingsProvidersScreen

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProvidersScreen.kt

@@ -1,89 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import com.lagradost.cloudstream3.APIHolder
-import com.lagradost.cloudstream3.AllLanguagesName
-import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.DubStatus
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToLanguageName
-import com.lagradost.cloudstream3.utils.SubtitleHelper.getNameNextToFlagEmoji
-import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import com.lagradost.cloudstream4.rememberAppSettings
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import kotlinx.collections.immutable.persistentListOf
-
-@Deprecated("This setting was merged into other places")
-object SettingsProvidersScreen : SearchableSettings {
-    @Composable
-    override fun getTitleRes(): String = stringResource(R.string.category_providers)
-
-    fun TvType.toStringRes() = when (this) {
-        TvType.TvSeries -> R.string.tv_series_singular
-        TvType.Anime -> R.string.anime_singular
-        TvType.OVA -> R.string.ova_singular
-        TvType.AnimeMovie -> R.string.movies_singular
-        TvType.Cartoon -> R.string.cartoons_singular
-        TvType.Documentary -> R.string.documentaries_singular
-        TvType.Movie -> R.string.movies_singular
-        TvType.Torrent -> R.string.torrent_singular
-        TvType.AsianDrama -> R.string.asian_drama_singular
-        TvType.Live -> R.string.live_singular
-        TvType.Others -> R.string.other_singular
-        TvType.NSFW -> R.string.nsfw_singular
-        TvType.Music -> R.string.music_singular
-        TvType.AudioBook -> R.string.audio_book_singular
-        TvType.CustomMedia -> R.string.custom_media_singular
-        TvType.Audio -> R.string.audio_singular
-        TvType.Podcast -> R.string.podcast_singular
-        TvType.Video -> R.string.video_singular
-    }
-
-    @Composable
-    override fun getPreferences(): List<Preference> {
-        val settings = rememberAppSettings()
-
-        val default = AllLanguagesName to stringResource(R.string.all_languages_preference)
-        val languages = APIHolder.apis.withLock {
-            APIHolder.apis.map { api -> api.lang }.distinct()
-        }.sortedBy { fromTagToLanguageName(it) ?: it }
-
-        return persistentListOf(
-            Preference.PreferenceItem.MultiSelectListPreference(
-            title = stringResource(R.string.provider_lang_settings),
-            icon = painterResource(R.drawable.plugin_lang),
-            entries = mapOf(default) + languages.associateWith { lang ->
-                (getNameNextToFlagEmoji(
-                    lang
-                ) ?: lang)
-            },
-            preference = settings.provider.extensionLanguages
-        ), Preference.PreferenceItem.MultiSelectListPreference(
-            title = stringResource(R.string.preferred_media_settings),
-            icon = painterResource(R.drawable.movie_edit_24px),
-            preference = settings.provider.preferredMedia,
-            entries = TvType.entries.associate {
-                    it.ordinal.toString() to stringResource(it.toStringRes())
-                }),
-            Preference.PreferenceItem.MultiSelectListPreference(
-            title = stringResource(R.string.display_subbed_dubbed_settings),
-            icon = painterResource(R.drawable.audio_capture_24px),
-            preference = settings.provider.displayDubSub,
-            entries = mapOf(
-                DubStatus.None.name to stringResource(R.string.none),
-                DubStatus.Dubbed.name to stringResource(R.string.app_dubbed_text),
-                DubStatus.Subbed.name to stringResource(R.string.app_subbed_text),
-            )
-        ), Preference.PreferenceItem.TextPreference(
-            title = stringResource(R.string.test_extensions),
-            subtitle = stringResource(R.string.test_extensions_summary),
-            icon = painterResource(R.drawable.baseline_network_ping_24),
-            onClick = {
-                activity?.navigate(R.id.navigation_test_providers)
-            }))
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt

@@ -228,8 +228,6 @@ class SettingsUI : BasePreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
-        getPref(R.string.tv_layout_clock_key)?.hideOn(PHONE or EMULATOR)
-
         getPref(R.string.confirm_exit_key)?.setOnPreferenceClickListener {
             val prefNames = resources.getStringArray(R.array.confirm_exit)
             val prefValues = resources.getIntArray(R.array.confirm_exit_values)

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI2.kt

@@ -1,7 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.mihon.presentation.settings.SearchableSettings
-
-/** Empty glue code to connect the old navigation graph to Compose */
-class SettingsUI2 : BaseComposeFragment(), SearchableSettings by SettingsUIScreen

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUIScreen.kt

@@ -1,306 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import android.os.Build
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.integerArrayResource
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringArrayResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.DubStatus
-import com.lagradost.cloudstream3.MainActivity
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.SearchQuality
-import com.lagradost.cloudstream3.mvvm.safe
-import com.lagradost.cloudstream3.ui.clear
-import com.lagradost.cloudstream3.ui.home.HomeChildItemAdapter
-import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
-import com.lagradost.cloudstream3.ui.search.SearchAdapter
-import com.lagradost.cloudstream3.ui.settings.Globals.updateTv
-import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import com.lagradost.cloudstream4.compose.TV
-import com.lagradost.cloudstream4.compose.isLayout
-import com.lagradost.cloudstream4.rememberAppSettings
-import com.lagradost.cloudstream4.theme.CloudStreamPrimaryColor
-import com.lagradost.cloudstream4.theme.modeToTheme
-import com.lagradost.cloudstream4.theme.perfToColor
-import com.lagradost.cloudstream4.theme.perfToMode
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import com.mihon.presentation.settings.collectAsState
-import kotlinx.collections.immutable.mutate
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toPersistentMap
-
-object SettingsUIScreen : SearchableSettings {
-    @Composable
-    override fun getTitleRes(): String = stringResource(R.string.category_ui)
-
-    fun SearchQuality.toStringRes() = when (this) {
-        SearchQuality.BlueRay -> R.string.quality_blueray
-        SearchQuality.Cam -> R.string.quality_cam
-        SearchQuality.CamRip -> R.string.quality_cam_rip
-        SearchQuality.DVD -> R.string.quality_dvd
-        SearchQuality.HD -> R.string.quality_hd
-        SearchQuality.HQ -> R.string.quality_hq
-        SearchQuality.HdCam -> R.string.quality_cam_hd
-        SearchQuality.Telecine -> R.string.quality_tc
-        SearchQuality.Telesync -> R.string.quality_ts
-        SearchQuality.WorkPrint -> R.string.quality_workprint
-        SearchQuality.SD -> R.string.quality_sd
-        SearchQuality.FourK -> R.string.quality_4k
-        SearchQuality.UHD -> R.string.quality_uhd
-        SearchQuality.SDR -> R.string.quality_sdr
-        SearchQuality.HDR -> R.string.quality_hdr
-        SearchQuality.WebRip -> R.string.quality_webrip
-    }
-
-    @Composable
-    fun RoundColor(color: Color) {
-        Box(
-            modifier = Modifier
-                .padding(start = 15.dp)
-                .size(20.dp)
-                .border(width = 1.5.dp, shape = CircleShape, color = MaterialTheme.colorScheme.onBackground)
-                .background(color, CircleShape)
-        )
-    }
-
-    @Composable
-    override fun getPreferences(): List<Preference> {
-        val settings = rememberAppSettings()
-
-        val overscanDp by settings.ui.overscanDp.collectAsState()
-        val posterSize by settings.ui.posterSize.collectAsState()
-
-        return persistentListOf(
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_looks),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.ui.primaryColor,
-                        icon = painterResource(R.drawable.colors_24px),
-                        title = stringResource(R.string.primary_color_settings),
-                        entries = stringArrayResource(R.array.themes_overlay_names_values).zip(
-                            stringArrayResource(R.array.themes_overlay_names)
-                        ).toMap().toPersistentMap().mutate { map ->
-                            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { // remove monet on android 11 and less
-                                map.remove("Monet")
-                                map.remove("Monet2")
-                            }
-                        },
-                        iconProvider = { k, _ ->
-                            val color = perfToColor(k)
-                            RoundColor(color.color)
-                        },
-                        onValueChanged = { newValue ->
-                            settings.ui.primaryColor.set(newValue) // We need to set before we recreate
-                            safe {
-                                activity?.recreate()
-                            }
-                            return@ListPreference false
-                        }),
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.ui.theme,
-                        icon = painterResource(R.drawable.palette_24px),
-                        title = stringResource(R.string.app_theme_settings),
-                        entries = stringArrayResource(R.array.themes_names_values).zip(
-                            stringArrayResource(R.array.themes_names)
-                        ).toMap().toPersistentMap().mutate { map ->
-                            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { // remove monet on android 11 and less
-                                map.remove("Monet")
-                            }
-                            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { // Remove system on android 9 and less
-                                map.remove("System")
-                            }
-                        },
-                        iconProvider = { k, _ ->
-                            val theme = modeToTheme(perfToMode(k), CloudStreamPrimaryColor.NORMAL)
-                            RoundColor(theme.background)
-                        },
-                        onValueChanged = { newValue ->
-                            settings.ui.theme.set(newValue) // We need to set before we recreate
-                            safe {
-                                activity?.recreate()
-                            }
-                            return@ListPreference false
-                        }),
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.ui.layout,
-                        icon = painterResource(R.drawable.responsive_layout_24px),
-                        title = stringResource(R.string.app_layout),
-                        entries = integerArrayResource(R.array.app_layout_values).zip(
-                            stringArrayResource(R.array.app_layout)
-                        ).toMap().toPersistentMap(),
-                        onValueChanged = { newValue ->
-                            settings.ui.layout.set(newValue) // We need to set before we recreate
-                            safe {
-                                activity?.updateTv()
-                                activity?.recreate()
-                            }
-                            return@ListPreference false
-                        }),
-                )
-            ),
-
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_ui_features),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.SliderPreference(
-                        value = overscanDp,
-                        title = stringResource(R.string.overscan_settings),
-                        subtitle = stringResource(R.string.overscan_settings_des),
-                        valueRange = 0..100,
-                        icon = painterResource(R.drawable.arrows_input_24px),
-                        enabled = isLayout(TV),
-                        onValueChanged = { newValue ->
-                            settings.ui.overscanDp.set(newValue)
-                            val padding = newValue.toPx
-                            (activity as? MainActivity)?.binding?.homeRoot?.setPadding(
-                                padding, padding, padding, padding
-                            )
-                        }),
-
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.advancedSearch,
-                        title = stringResource(R.string.advanced_search),
-                        subtitle = stringResource(R.string.advanced_search_des),
-                        icon = painterResource(R.drawable.search_icon)
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.searchSuggestions,
-                        title = stringResource(R.string.search_suggestions),
-                        subtitle = stringResource(R.string.search_suggestions_des),
-                        icon = painterResource(R.drawable.tooltip_24px)
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.trailersEnabled,
-                        title = stringResource(R.string.show_trailers_settings),
-                        icon = painterResource(R.drawable.baseline_theaters_24)
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.kitsuPostersEnabled,
-                        title = stringResource(R.string.kitsu_settings),
-                        icon = painterResource(R.drawable.kitsu_icon)
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.castEnabled,
-                        title = stringResource(R.string.show_cast_in_details),
-                        icon = painterResource(R.drawable.face_24px)
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.fillersEnabled,
-                        title = stringResource(R.string.show_fillers_settings),
-                        icon = painterResource(R.drawable.skip_next_24px)
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.showMetadataOverlay,
-                        title = stringResource(R.string.show_player_metadata_overlay),
-                        icon = painterResource(R.drawable.metadata_overlay_icon)
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.showClock,
-                        title = stringResource(R.string.tv_layout_clock_settings),
-                        subtitle = stringResource(R.string.tv_layout_clock_settings_des),
-                        icon = painterResource(R.drawable.ic_baseline_clock_24),
-                        enabled = isLayout(TV),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.randomButtonEnabled,
-                        title = stringResource(R.string.random_button_settings),
-                        subtitle = stringResource(R.string.random_button_settings_desc),
-                        icon = painterResource(R.drawable.shuffle_24px)
-                    ),
-                    Preference.PreferenceItem.ListPreference(
-                        preference = settings.ui.confirmExit,
-                        title = stringResource(R.string.confirm_before_exiting_title),
-                        subtitle = stringResource(R.string.confirm_before_exiting_desc),
-                        icon = painterResource(R.drawable.ic_baseline_exit_24),
-                        entries = integerArrayResource(R.array.confirm_exit_values).zip(
-                            stringArrayResource(R.array.confirm_exit)
-                        ).toMap()
-                    ),
-                )
-            ),
-
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.search_poster_img_des),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.MultiSelectListPreference(
-                        preference = settings.ui.filterQuality,
-                        title = stringResource(R.string.pref_filter_search_quality),
-                        icon = painterResource(R.drawable.filter_alt_24px),
-                        entries = SearchQuality.entries.associateWith { stringResource(it.toStringRes()) }),
-                    Preference.PreferenceItem.MultiSelectListPreference(
-                        title = stringResource(R.string.display_subbed_dubbed_settings),
-                        icon = painterResource(R.drawable.audio_capture_24px),
-                        preference = settings.provider.displayDubSub,
-                        entries = mapOf(
-                            DubStatus.None.name to stringResource(R.string.none),
-                            DubStatus.Dubbed.name to stringResource(R.string.app_dubbed_text),
-                            DubStatus.Subbed.name to stringResource(R.string.app_subbed_text),
-                        )),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.bottomTitle,
-                        title = stringResource(R.string.bottom_title_settings),
-                        subtitle = stringResource(R.string.bottom_title_settings_des),
-                        icon = painterResource(R.drawable.title_24px)
-                    ),
-                    Preference.PreferenceItem.SliderPreference(
-                        value = posterSize,
-                        title = stringResource(R.string.poster_size_settings),
-                        subtitle = stringResource(R.string.poster_size_settings_des),
-                        valueRange = 0..15,
-                        icon = painterResource(R.drawable.baseline_grid_view_24),
-                        onValueChanged = { newValue ->
-                            HomeChildItemAdapter.sharedPool.clear()
-                            ParentItemAdapter.sharedPool.clear()
-                            SearchAdapter.sharedPool.clear()
-                            activity?.let { HomeChildItemAdapter.updatePosterSize(it, newValue) }
-                            settings.ui.posterSize.set(newValue)
-                        }),
-                ),
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.poster_ui_settings),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.posterShowRating,
-                        title = stringResource(R.string.show_rating),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.posterShowEpisode,
-                        title = stringResource(R.string.show_episode_text),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.posterShowTitle,
-                        title = stringResource(R.string.show_title),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.posterShowHd,
-                        title = stringResource(R.string.show_hd),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.posterShowDub,
-                        title = stringResource(R.string.show_dub),
-                    ),
-                    Preference.PreferenceItem.SwitchPreference(
-                        preference = settings.ui.posterShowSub,
-                        title = stringResource(R.string.show_sub),
-                    ),
-                )
-            )
-        )
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates2.kt

@@ -1,7 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import com.lagradost.cloudstream3.utils.BaseComposeFragment
-import com.mihon.presentation.settings.SearchableSettings
-
-/** Empty glue code to connect the old navigation graph to Compose */
-class SettingsUpdates2 : BaseComposeFragment(), SearchableSettings by SettingsUpdatesScreen

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdatesScreen.kt

@@ -1,229 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings
-
-import android.content.Intent
-import android.net.Uri
-import android.widget.Toast
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.res.integerArrayResource
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringArrayResource
-import androidx.compose.ui.res.stringResource
-import com.lagradost.cloudstream3.AutoDownloadMode
-import com.lagradost.cloudstream3.BuildConfig
-import com.lagradost.cloudstream3.CloudStreamApp
-import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.utils.BackupUtils
-import com.lagradost.cloudstream3.utils.BackupUtils.restorePrompt
-import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream3.utils.InAppUpdater.installPreReleaseIfNeeded
-import com.lagradost.cloudstream3.utils.InAppUpdater.runAutoUpdate
-import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import com.lagradost.cloudstream4.AppSettings
-import com.lagradost.cloudstream4.rememberAppSettings
-import com.lagradost.safefile.SafeFile
-import com.mihon.presentation.settings.Preference
-import com.mihon.presentation.settings.SearchableSettings
-import com.mihon.presentation.settings.collectAsState
-import kotlinx.collections.immutable.persistentListOf
-
-object SettingsUpdatesScreen : SearchableSettings {
-    @Composable
-    override fun getTitleRes(): String = stringResource(R.string.category_updates)
-
-    @Composable
-    override fun getPreferences(): List<Preference> {
-        val settings = rememberAppSettings()
-
-        // TODO Refactor entirely to use a different file path selector ect like QuickNovel
-        val selectFileSelector =
-            rememberLauncherForActivityResult(ActivityResultContracts.OpenDocumentTree()) { uri ->
-                // It lies, it can be null if file manager quits.
-                if (uri == null) return@rememberLauncherForActivityResult
-                val context = CloudStreamApp.context ?: return@rememberLauncherForActivityResult
-
-                try {
-                    val settings = AppSettings(context)
-                    // RW perms for the path
-                    val flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
-                            Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-
-                    context.contentResolver.takePersistableUriPermission(uri, flags)
-
-                    val filePath = SafeFile.fromUri(context, uri)?.filePath()
-                    println("Selected URI path: $uri - Full path: $filePath")
-
-                    // store the actual URI instead of the path due to permissions.
-                    // filePath should only be used for cosmetic purposes.
-                    val visual = filePath ?: uri.toString()
-                    settings.backup.path.set(uri.toString())
-                    settings.backup.visualPath.set(visual)
-                } catch (t: Throwable) {
-                    logError(t)
-                }
-            }
-
-        val visualBackupPath by settings.backup.visualPath.collectAsState()
-        var showDialog by remember { mutableStateOf(false) }
-
-        if (showDialog) {
-            com.lagradost.cloudstream3.ui.settings.logcat.LogcatDialog {
-                showDialog = false
-            }
-        }
-
-        return persistentListOf(
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_app_updates),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.check_for_update),
-                        subtitle = BuildConfig.VERSION_NAME,
-                        icon = painterResource(R.drawable.mobile_arrow_down_24px),
-                        onClick = {
-                            ioSafe {
-                                if (activity?.runAutoUpdate(false) == false) {
-                                    activity?.runOnUiThread {
-                                        showToast(
-                                            R.string.no_update_found,
-                                            Toast.LENGTH_SHORT
-                                        )
-                                    }
-                                }
-                            }
-                        }
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.install_prerelease),
-                        icon = painterResource(R.drawable.mobile_code_24px),
-                        enabled = BuildConfig.FLAVOR == "stable",
-                        onClick = {
-                            activity?.installPreReleaseIfNeeded()
-                        }
-                    ),
-
-                    Preference.PreferenceItem.ListPreference(
-                        title = stringResource(R.string.apk_installer_settings),
-                        subtitle = stringResource(R.string.apk_installer_settings_des),
-                        icon = painterResource(R.drawable.mobile_wrench_24px),
-                        entries = integerArrayResource(R.array.apk_installer_values).zip(
-                            stringArrayResource(R.array.apk_installer_pref)
-                        ).toMap(),
-                        preference = settings.updates.apkInstaller
-                    ),
-
-                    Preference.PreferenceItem.SwitchPreference(
-                        title = stringResource(R.string.updates_settings),
-                        subtitle = stringResource(R.string.updates_settings_des),
-                        icon = painterResource(R.drawable.notifications_active_24px),
-                        preference = settings.updates.showAppUpdates
-                    )
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_backup),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.backup_settings),
-                        icon = painterResource(R.drawable.save_as_24px),
-                        onClick = {
-                            BackupUtils.backup(activity)
-                        }
-                    ),
-                    Preference.PreferenceItem.ListPreference(
-                        title = stringResource(R.string.backup_frequency),
-                        icon = painterResource(R.drawable.save_clock_24px),
-                        entries = integerArrayResource(R.array.periodic_work_values).zip(
-                            stringArrayResource(R.array.periodic_work_names)
-                        ).toMap(),
-                        preference = settings.backup.frequency
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.backup_path_title),
-                        icon = painterResource(R.drawable.folder_24px),
-                        subtitle = visualBackupPath,
-                        onClick = {
-                            // This is not a ListPreference because the old selection system is
-                            // broken af. This needs to be refactored to QuickNovels download path
-                            // system.
-                            selectFileSelector.launch(Uri.EMPTY)
-                        }
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.restore_settings),
-                        icon = painterResource(R.drawable.restore_page_24px),
-                        onClick = {
-                            activity?.restorePrompt()
-                        }
-                    ),
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_extensions),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.SwitchPreference(
-                        title = stringResource(R.string.automatic_plugin_updates),
-                        icon = painterResource(R.drawable.extension_24px),
-                        preference = settings.plugins.autoUpdate,
-                    ),
-
-                    Preference.PreferenceItem.ListPreference(
-                        title = stringResource(R.string.automatic_plugin_download),
-                        subtitle = "%s\n" + stringResource(R.string.automatic_plugin_download_summary),
-                        icon = painterResource(R.drawable.extention_renew2),
-                        entries = AutoDownloadMode.entries.map { it.value }.sorted()
-                            .zip(stringArrayResource((R.array.auto_download_plugin))).toMap(),
-                        preference = settings.plugins.autoDownload
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.update_plugins),
-                        subtitle = stringResource(R.string.update_plugins_manually),
-                        icon = painterResource(R.drawable.extention_download),
-                        onClick = {
-                            ioSafe {
-                                PluginManager.___DO_NOT_CALL_FROM_A_PLUGIN_manuallyReloadAndUpdatePlugins(
-                                    activity ?: return@ioSafe
-                                )
-                            }
-                        }
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.test_extensions),
-                        subtitle = stringResource(R.string.test_extensions_summary),
-                        icon = painterResource(R.drawable.baseline_network_ping_24),
-                        onClick = {
-                            activity?.navigate(R.id.navigation_test_providers)
-                        })
-                )
-            ),
-            Preference.PreferenceGroup(
-                title = stringResource(R.string.pref_category_actions),
-                preferenceItems = persistentListOf(
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.show_log_cat),
-                        icon = painterResource(R.drawable.article_24px),
-                        onClick = {
-                            showDialog = true
-                        }
-                    ),
-                    Preference.PreferenceItem.TextPreference(
-                        title = stringResource(R.string.redo_setup_process),
-                        icon = painterResource(R.drawable.construction_24px),
-                        onClick = {
-                            activity?.navigate(R.id.navigation_setup_language)
-                        }
-                    ),
-                )
-            )
-        )
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/settings/logcat/LogcatDialog.kt

@@ -1,282 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings.logcat
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.LinearProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory.component1
-import androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory.component2
-import androidx.compose.ui.focus.focusProperties
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.DialogProperties
-import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
-import com.lagradost.cloudstream3.utils.txt
-import com.lagradost.cloudstream4.compose.BlackButton
-import com.lagradost.cloudstream4.compose.WhiteButton
-import com.lagradost.cloudstream4.compose.circle
-import com.lagradost.cloudstream4.compose.rounded
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toPersistentList
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.io.OutputStream
-import java.lang.System.currentTimeMillis
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-
-
-@Composable
-fun LogcatDialog(dismiss: () -> Unit) {
-    val list = remember { mutableStateOf(persistentListOf<LogcatItem>()) }
-    var isLoading by remember { mutableStateOf(true) }
-    LaunchedEffect(dismiss) {
-        try {
-            isLoading = true
-
-            // https://developer.android.com/studio/command-line/logcat
-            val process = Runtime.getRuntime().exec("logcat --binary -d")
-            val items = arrayListOf<LogcatItem>()
-            LogcatBinaryParser(process.inputStream).use { parser ->
-                while (true) {
-                    val item = parser.parseItem() ?: break
-                    items.add(item)
-                }
-            }
-
-            list.value = items.toPersistentList()
-        } catch (e: Exception) {
-            logError(e) // kinda ironic
-        } finally {
-            isLoading = false
-        }
-    }
-    val (dismissFocus, confirmFocus) = remember { FocusRequester.createRefs() }
-
-    val context = LocalContext.current
-    val scope = rememberCoroutineScope()
-    AlertDialog(
-        containerColor = MaterialTheme.colorScheme.background,
-        onDismissRequest = dismiss,
-        title = {
-            Text(text = stringResource(R.string.log_cat))
-        },
-        text = {
-            if (isLoading) {
-                LinearProgressIndicator(
-                    modifier = Modifier.fillMaxWidth(),
-                    color = MaterialTheme.colorScheme.onBackground,
-                    trackColor = MaterialTheme.colorScheme.surfaceVariant,
-                )
-            }
-            LazyColumn(
-                modifier = Modifier.focusProperties {
-                    start = dismissFocus
-                    end = confirmFocus
-                }
-            ) {
-                items(items = list.value) { item ->
-                    LogcatItem(item, modifier = Modifier.focusProperties {
-                        start = dismissFocus
-                        end = confirmFocus
-                    })
-                }
-            }
-        },
-        confirmButton = {
-            WhiteButton(
-                text = stringResource(R.string.sort_save),
-                modifier = Modifier.focusRequester(confirmFocus)
-            ) {
-                scope.launch {
-                    withContext(Dispatchers.IO) {
-                        val date = SimpleDateFormat("yyyy_MM_dd_HH_mm", Locale.getDefault()).format(
-                            Date(currentTimeMillis())
-                        )
-                        var fileStream: OutputStream?
-                        try {
-                            fileStream = VideoDownloadManager.setupStream(
-                                context,
-                                "logcat_${date}",
-                                null,
-                                "txt",
-                                false
-                            ).openNew()
-                            fileStream.bufferedWriter()
-                                .use { writer ->
-                                    list.value.forEach {
-                                        writer.write(it.toString())
-                                        writer.write("\n\n")
-                                    }
-                                }
-                            dismiss()
-                        } catch (t: Throwable) {
-                            logError(t)
-                            showToast(t.message)
-                        }
-                        /*try {
-                            val date = SimpleDateFormat(
-                                "yyyy_MM_dd_HH_mm",
-                                Locale.getDefault()
-                            ).format(
-                                Date(System.currentTimeMillis())
-                            )
-
-                            val file = FileHelper.logcat.createFile(context, "logcat_${date}")
-                                ?: throw ErrorLoadingException("Unable to create file")
-                            val stream = file.openOutputStream(append = false)
-                                ?: throw ErrorLoadingException("Unable to create stream")
-
-                            stream.bufferedWriter()
-                                .use { writer ->
-                                    list.value.forEach {
-                                        writer.write(it.toString())
-                                        writer.write("\n\n")
-                                    }
-                                }
-                            dismiss()
-                            showToast(
-                                txt(
-                                    R.string.logcat_success,
-                                    file.absolutePath ?: file.uri.toString()
-                                ),
-                                Toast.LENGTH_LONG
-                            )
-                        } catch (t: Throwable) {
-                            logError(t)
-                            showToast(t.message)
-                        }*/
-                    }
-                }
-            }
-
-            WhiteButton(text = stringResource(R.string.sort_copy)) {
-                clipboardHelper(
-                    txt("Logcat"),
-                    list.value.joinToString(separator = "\n\n") { it.toString() }
-                )
-            }
-            WhiteButton(text = stringResource(R.string.sort_clear)) {
-                try {
-                    Runtime.getRuntime().exec("logcat -c")
-                } catch (t: Throwable) {
-                    logError(t)
-                }
-                dismiss()
-            }
-        },
-        dismissButton = {
-            BlackButton(
-                text = stringResource(R.string.sort_close),
-                onClick = dismiss,
-                modifier = Modifier.focusRequester(dismissFocus)
-            )
-        },
-        properties = DialogProperties(usePlatformDefaultWidth = false)
-    )
-}
-
-
-@Composable
-fun LogcatItem(item: LogcatItem, modifier: Modifier = Modifier) {
-    val color = when (item.level) {
-        LogcatLevel.Fatal -> Color.Magenta
-        LogcatLevel.Error -> Color.Red
-        LogcatLevel.Warning -> Color.Yellow
-        LogcatLevel.Info -> Color.White
-        LogcatLevel.Debug -> Color.Green
-        LogcatLevel.Verbose -> Color.Gray
-        null -> Color.Transparent
-    }
-
-    Row(modifier = Modifier.fillMaxWidth()) {
-        item.level?.identifier?.let { value ->
-            Text(
-                value,
-                modifier = Modifier
-                    .padding(2.dp)
-                    .rounded()
-                    .background(MaterialTheme.colorScheme.onBackground)
-                    .padding(4.dp),
-                color = MaterialTheme.colorScheme.surfaceVariant
-            )
-        }
-        Text(
-            item.date.toHumanReadable(),
-            modifier = Modifier
-                .padding(2.dp)
-                .rounded()
-                .background(MaterialTheme.colorScheme.surfaceVariant)
-                .padding(4.dp),
-            color = MaterialTheme.colorScheme.onBackground
-        )
-        Text(
-            item.tag,
-            modifier = Modifier
-                .padding(2.dp)
-                .rounded()
-                .background(MaterialTheme.colorScheme.surfaceVariant)
-                .padding(4.dp),
-            color = MaterialTheme.colorScheme.onBackground
-        )
-    }
-    Row(
-        modifier = modifier
-            .height(IntrinsicSize.Min)
-            .fillMaxWidth()
-            .rounded()
-            .clickable(
-                onClick = {
-                    clipboardHelper(txt("Logcat"), item.toString())
-                })
-            .padding(5.dp)
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxHeight()
-                .width(4.dp)
-                .circle()
-                .background(color)
-        )
-        Spacer(modifier = Modifier.width(5.dp))
-        Text(
-            item.message,
-            color = MaterialTheme.colorScheme.onBackground,
-            fontSize = 14.sp,
-            lineHeight = 15.sp,
-        )
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/settings/logcat/LogcatParser.kt

@@ -1,140 +0,0 @@
-package com.lagradost.cloudstream3.ui.settings.logcat
-
-import androidx.compose.runtime.Immutable
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import java.io.Closeable
-import java.io.InputStream
-import kotlin.time.Instant
-import kotlinx.io.Buffer
-import kotlinx.io.asSource
-import kotlinx.io.readByteArray
-import kotlinx.io.readIntLe
-import kotlinx.io.readString
-import kotlinx.io.readUShortLe
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.TimeZone
-
-fun Instant.toHumanReadable(): String {
-    val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).apply {
-        timeZone = TimeZone.getDefault()
-    }
-    return formatter.format(Date(this.toEpochMilliseconds()))
-}
-@Immutable
-data class LogcatItem(
-    val date: Instant,
-    val pid: Int,
-    val tid: Int,
-    val level: LogcatLevel?,
-    val tag: String,
-    val message: String,
-) {
-    override fun toString(): String {
-        return "${date.toHumanReadable()} $pid-$tid $tag ${level?.identifier ?: "?"} $message"
-    }
-}
-
-enum class LogcatLevel(val identifier: String) {
-    Fatal("WTF"),
-    Error("E"),
-    Warning("W"),
-    Info("I"),
-    Debug("D"),
-    Verbose("V"),
-}
-
-/**https://github.com/brudaswen/android-logcat/blob/main/library/logcat-core/src/main/kotlin/de/brudaswen/android/logcat/core/parser/LogcatBinaryParser.kt  */
-class LogcatBinaryParser(
-    private val input: InputStream,
-) : Closeable by input {
-    val source = input.asSource()
-    private val buffer = Buffer()
-
-    /**
-     * Parse one [LogcatItem] from the current [input] stream.
-     *
-     * @return The parsed [LogcatItem] or `null` if stream reached EOF.
-     */
-    suspend fun parseItem(): LogcatItem? = withContext(Dispatchers.IO) {
-        val firstByte = input.read()
-        if (firstByte == -1) return@withContext null
-
-        // Read v1 header
-        buffer.writeByte(firstByte.toByte())
-        buffer.write(source = source, byteCount = 19)
-
-        val len = buffer.readUShortLe().toInt()
-        val headerSize = buffer.readUShortLe().toInt()
-        val pid = buffer.readIntLe()
-        val tid = buffer.readIntLe()
-        val sec = buffer.readIntLe()
-        val nsec = buffer.readIntLe()
-
-        // Read additional header fields
-        buffer.write(source = source, byteCount = headerSize - 20L)
-
-        val additionalHeaderBytes = (headerSize - 20).coerceAtLeast(0)
-        buffer.readByteArray(byteCount = additionalHeaderBytes)
-
-        // Read payload
-        buffer.write(source = source, byteCount = len.toLong())
-
-        val priority = buffer.readByte()
-
-        val payload = buffer.readString()
-        val texts = payload.split('\u0000', limit = 2)
-        val tag = texts.getOrNull(0).orEmpty()
-        val message = texts.getOrNull(1).orEmpty().removeSuffix("\u0000").trim()
-
-        // Clear buffer
-        buffer.clear()
-
-        // Convert raw values to item
-        LogcatItem(
-            sec = sec,
-            nsec = nsec,
-            priority = priority,
-            pid = pid,
-            tid = tid,
-            tag = tag,
-            message = message,
-        )
-    }
-
-    private fun LogcatItem(
-        sec: Int,
-        nsec: Int,
-        priority: Byte,
-        pid: Int,
-        tid: Int,
-        tag: String,
-        message: String,
-    ): LogcatItem {
-        val date = Instant.fromEpochSeconds(
-            epochSeconds = sec.toLong(),
-            nanosecondAdjustment = nsec,
-        )
-
-        val level = when (priority) {
-            2.toByte() -> LogcatLevel.Verbose
-            3.toByte() -> LogcatLevel.Debug
-            4.toByte() -> LogcatLevel.Info
-            5.toByte() -> LogcatLevel.Warning
-            6.toByte() -> LogcatLevel.Error
-            7.toByte() -> LogcatLevel.Fatal
-            else -> null
-        }
-
-        return LogcatItem(
-            date = date,
-            pid = pid,
-            tid = tid,
-            level = level,
-            tag = tag,
-            message = message,
-        )
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt

@@ -86,7 +86,6 @@ import com.lagradost.cloudstream3.utils.FillerEpisodeCheck.toClassDir
 import com.lagradost.cloudstream3.utils.JsUnpacker.Companion.load
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
-import com.lagradost.cloudstream4.AppSettings
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okhttp3.Cache
@@ -482,14 +481,14 @@ object AppContextUtils {
     fun Context.filterSearchResultByFilmQuality(data: List<SearchResponse>): List<SearchResponse> {
         // Filter results omitting entries with certain quality
         if (data.isNotEmpty()) {
-            val filteredSearchQuality = AppSettings(this).ui.filterQuality.get() /*PreferenceManager.getDefaultSharedPreferences(this)
+            val filteredSearchQuality = PreferenceManager.getDefaultSharedPreferences(this)
                 ?.getStringSet(getString(R.string.pref_filter_search_quality_key), setOf())
                 ?.mapNotNull { entry ->
                     entry.toIntOrNull() ?: return@mapNotNull null
-                } ?: listOf()*/
+                } ?: listOf()
             if (filteredSearchQuality.isNotEmpty()) {
                 return data.filter { item ->
-                    val searchQualVal = item.quality //?.ordinal ?: -1
+                    val searchQualVal = item.quality?.ordinal ?: -1
                     //Log.i("filterSearch", "QuickSearch item => ${item.toJson()}")
                     !filteredSearchQuality.contains(searchQualVal)
                 }
@@ -501,17 +500,17 @@ object AppContextUtils {
     fun Context.filterHomePageListByFilmQuality(data: HomePageList): HomePageList {
         // Filter results omitting entries with certain quality
         if (data.list.isNotEmpty()) {
-            val filteredSearchQuality = AppSettings(this).ui.filterQuality.get() /*PreferenceManager.getDefaultSharedPreferences(this)
+            val filteredSearchQuality = PreferenceManager.getDefaultSharedPreferences(this)
                 ?.getStringSet(getString(R.string.pref_filter_search_quality_key), setOf())
                 ?.mapNotNull { entry ->
                     entry.toIntOrNull() ?: return@mapNotNull null
-                } ?: listOf()*/
+                } ?: listOf()
             if (filteredSearchQuality.isNotEmpty()) {
                 return HomePageList(
                     name = data.name,
                     isHorizontalImages = data.isHorizontalImages,
                     list = data.list.filter { item ->
-                        val searchQualVal = item.quality //?.ordinal ?: -1
+                        val searchQualVal = item.quality?.ordinal ?: -1
                         //Log.i("filterSearch", "QuickSearch item => ${item.toJson()}")
                         !filteredSearchQuality.contains(searchQualVal)
                     }

app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt

@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.utils
 
-import android.app.Activity
 import android.content.Context
 import android.net.Uri
 import android.widget.Toast
@@ -283,7 +282,7 @@ object BackupUtils {
         }
     }
 
-    fun Activity.restorePrompt() {
+    fun FragmentActivity.restorePrompt() {
         runOnUiThread {
             try {
                 restoreFileSelector?.launch(

app/src/main/java/com/lagradost/cloudstream3/utils/BaseComposeFragment.kt

@@ -1,43 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-import android.content.res.Configuration
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
-import com.lagradost.cloudstream3.ui.settings.Globals.TV
-import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
-import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
-import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
-import com.lagradost.cloudstream4.compose.Screen
-import com.lagradost.cloudstream4.compose.createComposeView
-
-abstract class BaseComposeFragment : Fragment(), Screen {
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View = createComposeView(inflater, container, savedInstanceState)
-
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        this.view?.let { view ->
-            fixSystemBarsPadding(
-                view,
-                padLeft = isLayout(TV or EMULATOR),
-                padBottom = isLandscape()
-            )
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        fixSystemBarsPadding(
-            view,
-            padLeft = isLayout(TV or EMULATOR),
-            padBottom = isLandscape()
-        )
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt

@@ -181,11 +181,11 @@ object DataStore {
     }
 
     fun <T : Any> Context.getKey(path: String, valueType: Class<T>): T? {
-        return try {
+        try {
             val json: String = getSharedPrefs().getString(path, null) ?: return null
-            parseJson(json, valueType.kotlin)
-        } catch (_: Exception) {
-            null
+            return parseJson(json, valueType.kotlin)
+        } catch (e: Exception) {
+            return null
         }
     }
 
@@ -193,37 +193,21 @@ object DataStore {
         setKey(getFolderName(folder, path), value)
     }
 
-    @Deprecated(
-        message = "Use parseJson<T>(this) directly instead.",
-        level = DeprecationLevel.WARNING,
-        replaceWith = ReplaceWith(
-            expression = "parseJson<T>(this)",
-            imports = ["com.lagradost.cloudstream3.utils.AppUtils.parseJson"],
-        ),
-    )
     inline fun <reified T : Any> String.toKotlinObject(): T {
         return parseJson(this)
     }
 
-    @Deprecated(
-        message = "Use parseJson<T>(this) directly instead.",
-        level = DeprecationLevel.WARNING,
-        replaceWith = ReplaceWith(
-            expression = "parseJson<T>(this)",
-            imports = ["com.lagradost.cloudstream3.utils.AppUtils.parseJson"],
-        ),
-    )
     fun <T : Any> String.toKotlinObject(valueType: Class<T>): T {
         return parseJson(this, valueType.kotlin)
     }
 
     // GET KEY GIVEN PATH AND DEFAULT VALUE, NULL IF ERROR
     inline fun <reified T : Any> Context.getKey(path: String, defVal: T?): T? {
-        return try {
+        try {
             val json: String = getSharedPrefs().getString(path, null) ?: return defVal
-            parseJson<T>(json)
-        } catch (_: Exception) {
-            null
+            return json.toKotlinObject()
+        } catch (e: Exception) {
+            return null
         }
     }
 

app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt

@@ -33,8 +33,6 @@ import com.lagradost.cloudstream3.ui.result.VideoWatchState
 import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 import com.lagradost.cloudstream3.utils.serializers.WriteOnlySerializer
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.KeepGeneratedSerializer
 import kotlinx.serialization.SerialName
@@ -182,10 +180,6 @@ object DataStoreHelper {
     var selectedKeyIndex by PreferenceDelegate("$TAG/account_key_index", 0)
     val currentAccount: String get() = selectedKeyIndex.toString()
 
-    private val _selectedAccountNumberFlow = MutableStateFlow(0)
-    /** What account instance we are on, this number changes whenever anything about local accounts changes */
-    val selectedAccountNumberFlow : StateFlow<Int> = _selectedAccountNumberFlow
-
     /**
      * Get or set the current account homepage.
      * Setting this does not automatically reload the homepage.
@@ -213,7 +207,6 @@ object DataStoreHelper {
             // This is not a new account, and the homepage has changed, reload it
             MainActivity.reloadHomeEvent(true)
         }
-        _selectedAccountNumberFlow.value += 1
     }
 
     fun getDefaultAccount(context: Context): Account {

app/src/main/java/com/lagradost/cloudstream3/utils/PowerManagerAPI.kt

@@ -63,7 +63,7 @@ object BatteryOptimizationChecker {
         return isRestricted && isOptimizedNotShown && isLayout(PHONE)
     }
 
-    fun Context.showRequestIgnoreBatteryOptDialog() {
+    private fun Context.showRequestIgnoreBatteryOptDialog() {
         try {
             val intent = Intent().apply {
                 action =  Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS

app/src/main/java/com/lagradost/cloudstream3/utils/TvChannelUtils.kt

@@ -149,12 +149,10 @@ object TvChannelUtils {
             .setInputId(inputId)
             .build()
 
-        val channelUri = runCatching {
-            context.contentResolver.insert(
-                TvContractCompat.Channels.CONTENT_URI,
-                channel.toContentValues()
-            )
-        }.getOrNull()
+        val channelUri = context.contentResolver.insert(
+            TvContractCompat.Channels.CONTENT_URI,
+            channel.toContentValues()
+        )
 
         channelUri?.let {
             val channelId = ContentUris.parseId(it)

app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.AnimeLoadResponse
 import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.LoadResponse
-import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvSeriesLoadResponse
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
@@ -26,7 +25,6 @@ import java.security.MessageDigest
 
 class AnimeSkipAuth : AuthAPI() {
     override val name = "AnimeSkip"
-    override val icon: Int = R.drawable.animeskip
     override val inAppLoginRequirement: AuthLoginRequirement =
         AuthLoginRequirement(password = true, username = true)
     override val idPrefix = "anime-skip"

app/src/main/res/drawable/article_24px.xml

@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal"
-    android:autoMirrored="true">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM200,760L760,760Q760,760 760,760Q760,760 760,760L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760ZM200,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200ZM320,680L520,680Q537,680 548.5,668.5Q560,657 560,640Q560,623 548.5,611.5Q537,600 520,600L320,600Q303,600 291.5,611.5Q280,623 280,640Q280,657 291.5,668.5Q303,680 320,680ZM320,520L640,520Q657,520 668.5,508.5Q680,497 680,480Q680,463 668.5,451.5Q657,440 640,440L320,440Q303,440 291.5,451.5Q280,463 280,480Q280,497 291.5,508.5Q303,520 320,520ZM320,360L640,360Q657,360 668.5,348.5Q680,337 680,320Q680,303 668.5,291.5Q657,280 640,280L320,280Q303,280 291.5,291.5Q280,303 280,320Q280,337 291.5,348.5Q303,360 320,360Z"/>
-</vector>

app/src/main/res/drawable/aspect_ratio_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M680,600L600,600Q583,600 571.5,611.5Q560,623 560,640Q560,657 571.5,668.5Q583,680 600,680L720,680Q737,680 748.5,668.5Q760,657 760,640L760,520Q760,503 748.5,491.5Q737,480 720,480Q703,480 691.5,491.5Q680,503 680,520L680,600ZM280,360L360,360Q377,360 388.5,348.5Q400,337 400,320Q400,303 388.5,291.5Q377,280 360,280L240,280Q223,280 211.5,291.5Q200,303 200,320L200,440Q200,457 211.5,468.5Q223,480 240,480Q257,480 268.5,468.5Q280,457 280,440L280,360ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720Z"/>
-</vector>

app/src/main/res/drawable/audio_capture_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M148,812Q129,831 104.5,820.5Q80,810 80,783L80,520Q80,503 91.5,491.5Q103,480 120,480Q137,480 148.5,491.5Q160,503 160,520L160,685L194,651Q199,646 206.5,643Q214,640 222,640L280,640Q297,640 308.5,651.5Q320,663 320,680Q320,697 308.5,708.5Q297,720 280,720L240,720L148,812ZM680,720Q663,720 651.5,708.5Q640,697 640,680Q640,663 651.5,651.5Q663,640 680,640L800,640Q800,640 800,640Q800,640 800,640L800,519Q800,502 811.5,491Q823,480 840,480Q857,480 868.5,491.5Q880,503 880,520L880,640Q880,673 856.5,696.5Q833,720 800,720L680,720ZM451.5,588.5Q440,577 440,560L440,240Q440,223 451.5,211.5Q463,200 480,200Q497,200 508.5,211.5Q520,223 520,240L520,560Q520,577 508.5,588.5Q497,600 480,600Q463,600 451.5,588.5ZM291.5,508.5Q280,497 280,480L280,320Q280,303 291.5,291.5Q303,280 320,280Q337,280 348.5,291.5Q360,303 360,320L360,480Q360,497 348.5,508.5Q337,520 320,520Q303,520 291.5,508.5ZM611.5,468.5Q600,457 600,440L600,360Q600,343 611.5,331.5Q623,320 640,320Q657,320 668.5,331.5Q680,343 680,360L680,440Q680,457 668.5,468.5Q657,480 640,480Q623,480 611.5,468.5ZM120,320Q103,320 91.5,308.5Q80,297 80,280L80,160Q80,127 103.5,103.5Q127,80 160,80L280,80Q297,80 308.5,91.5Q320,103 320,120Q320,137 308.5,148.5Q297,160 280,160L160,160Q160,160 160,160Q160,160 160,160L160,281Q160,298 148.5,309Q137,320 120,320ZM811.5,308.5Q800,297 800,280L800,160Q800,160 800,160Q800,160 800,160L680,160Q663,160 651.5,148.5Q640,137 640,120Q640,103 651.5,91.5Q663,80 680,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,281Q880,298 868.5,309Q857,320 840,320Q823,320 811.5,308.5Z"/>
-</vector>

app/src/main/res/drawable/autorenew_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M240,482Q240,498 242,513.5Q244,529 249,544Q254,561 248,576.5Q242,592 227,599Q211,607 195.5,600.5Q180,594 175,577Q167,554 163.5,530Q160,506 160,482Q160,348 253,254Q346,160 480,160L487,160L451,124Q440,113 440,96Q440,79 451,68Q462,57 479,57Q496,57 507,68L611,172Q623,184 623,200Q623,216 611,228L507,332Q496,343 479,343Q462,343 451,332Q440,321 440,304Q440,287 451,276L487,240L480,240Q380,240 310,310.5Q240,381 240,482ZM720,478Q720,462 718,446.5Q716,431 711,416Q706,399 712,383.5Q718,368 733,361Q749,353 764.5,359.5Q780,366 785,383Q793,406 796.5,430Q800,454 800,478Q800,612 707,706Q614,800 480,800L473,800L509,836Q520,847 520,864Q520,881 509,892Q498,903 481,903Q464,903 453,892L349,788Q337,776 337,760Q337,744 349,732L453,628Q464,617 481,617Q498,617 509,628Q520,639 520,656Q520,673 509,684L473,720L480,720Q580,720 650,649.5Q720,579 720,478Z"/>
-</vector>

app/src/main/res/drawable/battery_alert_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M320,880Q303,880 291.5,868.5Q280,857 280,840L280,200Q280,183 291.5,171.5Q303,160 320,160L400,160L400,120Q400,103 411.5,91.5Q423,80 440,80L520,80Q537,80 548.5,91.5Q560,103 560,120L560,160L640,160Q657,160 668.5,171.5Q680,183 680,200L680,840Q680,857 668.5,868.5Q657,880 640,880L320,880ZM360,800L600,800L600,240L360,240L360,800ZM360,800L360,800L600,800L600,800L360,800ZM508.5,548.5Q520,537 520,520L520,360Q520,343 508.5,331.5Q497,320 480,320Q463,320 451.5,331.5Q440,343 440,360L440,520Q440,537 451.5,548.5Q463,560 480,560Q497,560 508.5,548.5ZM480,720Q497,720 508.5,708.5Q520,697 520,680Q520,663 508.5,651.5Q497,640 480,640Q463,640 451.5,651.5Q440,663 440,680Q440,697 451.5,708.5Q463,720 480,720Z"/>
-</vector>

app/src/main/res/drawable/build_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M360,600Q260,600 190,530Q120,460 120,360Q120,340 123,320Q126,300 134,282Q139,272 146.5,267Q154,262 163,260Q172,258 181.5,260.5Q191,263 199,271L304,376L376,304L271,199Q263,191 260.5,181.5Q258,172 260,163Q262,154 267,146.5Q272,139 282,134Q300,126 320,123Q340,120 360,120Q460,120 530,190Q600,260 600,360Q600,383 596,403.5Q592,424 584,444L786,644Q815,673 815,715Q815,757 786,786Q757,815 715,815Q673,815 644,785L444,584Q424,592 403.5,596Q383,600 360,600ZM360,520Q386,520 412,512Q438,504 459,487L702,730Q707,735 715.5,734.5Q724,734 729,729Q734,724 734,715.5Q734,707 729,702L486,460Q504,440 512,413.5Q520,387 520,360Q520,300 481.5,255.5Q443,211 386,202L460,276Q472,288 472,304Q472,320 460,332L332,460Q320,472 304,472Q288,472 276,460L202,386Q211,443 255.5,481.5Q300,520 360,520ZM469,469Q469,469 469,469Q469,469 469,469L469,469Q469,469 469,469Q469,469 469,469L469,469Q469,469 469,469Q469,469 469,469L469,469Q469,469 469,469Q469,469 469,469Q469,469 469,469Q469,469 469,469L469,469Q469,469 469,469Q469,469 469,469Q469,469 469,469Q469,469 469,469L469,469Q469,469 469,469Q469,469 469,469Z"/>
-</vector>

app/src/main/res/drawable/cast.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480ZM880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L638,800Q621,800 609.5,788.5Q598,777 598,760Q598,743 609.5,731.5Q621,720 638,720L800,720Q800,720 800,720Q800,720 800,720L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,246Q160,263 148.5,274.5Q137,286 120,286Q103,286 91.5,274.5Q80,263 80,246L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240ZM320,800Q304,800 292,790.5Q280,781 277,765Q266,702 220.5,658Q175,614 112,603Q97,601 88.5,588.5Q80,576 80,560Q80,543 91,531.5Q102,520 117,522Q211,534 277.5,601Q344,668 357,762Q359,778 348,789Q337,800 320,800ZM480,800Q463,800 451.5,789Q440,778 438,761Q424,633 333.5,544Q243,455 115,442Q99,440 89.5,428Q80,416 80,400Q80,383 90.5,371Q101,359 116,361Q277,374 390,486Q503,598 518,759Q520,776 508.5,788Q497,800 480,800ZM130,800Q109,800 94.5,785.5Q80,771 80,750Q80,729 94.5,714.5Q109,700 130,700Q151,700 165.5,714.5Q180,729 180,750Q180,771 165.5,785.5Q151,800 130,800Z"/>
-</vector>

app/src/main/res/drawable/close_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M480,536L284,732Q273,743 256,743Q239,743 228,732Q217,721 217,704Q217,687 228,676L424,480L228,284Q217,273 217,256Q217,239 228,228Q239,217 256,217Q273,217 284,228L480,424L676,228Q687,217 704,217Q721,217 732,228Q743,239 743,256Q743,273 732,284L536,480L732,676Q743,687 743,704Q743,721 732,732Q721,743 704,743Q687,743 676,732L480,536Z"/>
-</vector>

app/src/main/res/drawable/colors_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M346,820L100,574Q90,564 85,552Q80,540 80,527Q80,514 85,502Q90,490 100,480L330,251L255,176Q242,163 241.5,145Q241,127 254,113Q267,99 286,99Q305,99 319,113L686,480Q696,490 700.5,502Q705,514 705,527Q705,540 700.5,552Q696,564 686,574L440,820Q430,830 418,835Q406,840 393,840Q380,840 368,835Q356,830 346,820ZM393,314L179,528Q179,528 179,528Q179,528 179,528L607,528Q607,528 607,528Q607,528 607,528L393,314ZM792,840Q756,840 731,814.5Q706,789 706,752Q706,725 719.5,701Q733,677 750,654L769,630Q778,619 792.5,618.5Q807,618 816,629L836,654Q852,677 866,701Q880,725 880,752Q880,789 854,814.5Q828,840 792,840Z"/>
-</vector>

app/src/main/res/drawable/construction_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M714,798L537,621L621,537L798,714Q815,731 815,756Q815,781 798,798Q781,815 756,815Q731,815 714,798ZM145,756Q145,731 162,714L396,480L328,412L328,412Q317,423 300,423Q283,423 272,412L249,389L249,479Q249,493 237,498Q225,503 215,493L106,384Q96,374 101,362Q106,350 120,350L210,350L188,328Q176,316 176,300Q176,284 188,272L302,158Q322,138 345,129Q368,120 392,120Q412,120 429.5,126Q447,132 464,144Q472,149 472.5,158Q473,167 466,174L390,250L412,272Q423,283 423,300Q423,317 412,328L412,328L480,396L570,306Q566,295 563.5,283Q561,271 561,259Q561,200 601.5,159.5Q642,119 701,119Q709,119 716,119.5Q723,120 730,122Q739,125 741.5,134.5Q744,144 737,151L672,216Q666,222 666,230Q666,238 672,244L716,288Q722,294 730,294Q738,294 744,288L809,223Q816,216 825.5,218Q835,220 838,230Q840,237 840.5,244Q841,251 841,259Q841,318 800.5,358.5Q760,399 701,399Q689,399 677,397Q665,395 654,390L246,798Q229,815 204,815Q179,815 162,798Q145,781 145,756Z"/>
-</vector>

app/src/main/res/drawable/copy_all_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M360,720Q327,720 303.5,696.5Q280,673 280,640L280,160Q280,127 303.5,103.5Q327,80 360,80L720,80Q753,80 776.5,103.5Q800,127 800,160L800,640Q800,673 776.5,696.5Q753,720 720,720L360,720ZM360,640L720,640Q720,640 720,640Q720,640 720,640L720,160Q720,160 720,160Q720,160 720,160L360,160Q360,160 360,160Q360,160 360,160L360,640Q360,640 360,640Q360,640 360,640ZM540,400Q540,400 540,400Q540,400 540,400L540,400Q540,400 540,400Q540,400 540,400L540,400Q540,400 540,400Q540,400 540,400L540,400Q540,400 540,400Q540,400 540,400ZM131.5,308.5Q120,297 120,280Q120,263 131.5,251.5Q143,240 160,240Q177,240 188.5,251.5Q200,263 200,280Q200,297 188.5,308.5Q177,320 160,320Q143,320 131.5,308.5ZM131.5,448.5Q120,437 120,420Q120,403 131.5,391.5Q143,380 160,380Q177,380 188.5,391.5Q200,403 200,420Q200,437 188.5,448.5Q177,460 160,460Q143,460 131.5,448.5ZM131.5,588.5Q120,577 120,560Q120,543 131.5,531.5Q143,520 160,520Q177,520 188.5,531.5Q200,543 200,560Q200,577 188.5,588.5Q177,600 160,600Q143,600 131.5,588.5ZM131.5,728.5Q120,717 120,700Q120,683 131.5,671.5Q143,660 160,660Q177,660 188.5,671.5Q200,683 200,700Q200,717 188.5,728.5Q177,740 160,740Q143,740 131.5,728.5ZM131.5,868.5Q120,857 120,840Q120,823 131.5,811.5Q143,800 160,800Q177,800 188.5,811.5Q200,823 200,840Q200,857 188.5,868.5Q177,880 160,880Q143,880 131.5,868.5ZM271.5,868.5Q260,857 260,840Q260,823 271.5,811.5Q283,800 300,800Q317,800 328.5,811.5Q340,823 340,840Q340,857 328.5,868.5Q317,880 300,880Q283,880 271.5,868.5ZM411.5,868.5Q400,857 400,840Q400,823 411.5,811.5Q423,800 440,800Q457,800 468.5,811.5Q480,823 480,840Q480,857 468.5,868.5Q457,880 440,880Q423,880 411.5,868.5ZM551.5,868.5Q540,857 540,840Q540,823 551.5,811.5Q563,800 580,800Q597,800 608.5,811.5Q620,823 620,840Q620,857 608.5,868.5Q597,880 580,880Q563,880 551.5,868.5Z"/>
-</vector>

app/src/main/res/drawable/description_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M360,720L600,720Q617,720 628.5,708.5Q640,697 640,680Q640,663 628.5,651.5Q617,640 600,640L360,640Q343,640 331.5,651.5Q320,663 320,680Q320,697 331.5,708.5Q343,720 360,720ZM360,560L600,560Q617,560 628.5,548.5Q640,537 640,520Q640,503 628.5,491.5Q617,480 600,480L360,480Q343,480 331.5,491.5Q320,503 320,520Q320,537 331.5,548.5Q343,560 360,560ZM240,880Q207,880 183.5,856.5Q160,833 160,800L160,160Q160,127 183.5,103.5Q207,80 240,80L527,80Q543,80 557.5,86Q572,92 583,103L777,297Q788,308 794,322.5Q800,337 800,353L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM520,320L520,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800L720,800Q720,800 720,800Q720,800 720,800L720,360L560,360Q543,360 531.5,348.5Q520,337 520,320ZM240,160L240,160L240,320Q240,337 240,348.5Q240,360 240,360L240,360L240,160L240,320Q240,337 240,348.5Q240,360 240,360L240,360L240,800Q240,800 240,800Q240,800 240,800L240,800Q240,800 240,800Q240,800 240,800L240,160Q240,160 240,160Q240,160 240,160Z"/>
-</vector>

app/src/main/res/drawable/dns_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M300,240Q275,240 257.5,257.5Q240,275 240,300Q240,325 257.5,342.5Q275,360 300,360Q325,360 342.5,342.5Q360,325 360,300Q360,275 342.5,257.5Q325,240 300,240ZM300,640Q275,640 257.5,657.5Q240,675 240,700Q240,725 257.5,742.5Q275,760 300,760Q325,760 342.5,742.5Q360,725 360,700Q360,675 342.5,657.5Q325,640 300,640ZM160,120L800,120Q817,120 828.5,131.5Q840,143 840,160L840,440Q840,457 828.5,468.5Q817,480 800,480L160,480Q143,480 131.5,468.5Q120,457 120,440L120,160Q120,143 131.5,131.5Q143,120 160,120ZM200,200L200,400L760,400L760,200L200,200ZM160,520L800,520Q817,520 828.5,531.5Q840,543 840,560L840,840Q840,857 828.5,868.5Q817,880 800,880L160,880Q143,880 131.5,868.5Q120,857 120,840L120,560Q120,543 131.5,531.5Q143,520 160,520ZM200,600L200,800L760,800L760,600L200,600ZM200,200L200,200L200,400L200,400L200,200ZM200,600L200,600L200,800L200,800L200,600Z"/>
-</vector>

app/src/main/res/drawable/encrypted_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M444,600L516,600Q525,600 531.5,592.5Q538,585 536,576L517,471Q537,461 548.5,442Q560,423 560,400Q560,367 536.5,343.5Q513,320 480,320Q447,320 423.5,343.5Q400,367 400,400Q400,423 411.5,442Q423,461 443,471L424,576Q422,585 428.5,592.5Q435,600 444,600ZM467,875Q461,874 455,872Q320,827 240,705.5Q160,584 160,444L160,255Q160,230 174.5,210Q189,190 212,181L452,91Q466,86 480,86Q494,86 508,91L748,181Q771,190 785.5,210Q800,230 800,255L800,444Q800,584 720,705.5Q640,827 505,872Q499,874 493,875Q487,876 480,876Q473,876 467,875ZM480,796Q584,763 652,664Q720,565 720,444L720,255Q720,255 720,255Q720,255 720,255L480,165Q480,165 480,165Q480,165 480,165L240,255Q240,255 240,255Q240,255 240,255L240,444Q240,565 308,664Q376,763 480,796ZM480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Z"/>
-</vector>

app/src/main/res/drawable/extension_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M200,760L720,760Q720,760 720,760Q720,760 720,760L720,601Q720,590 725.5,580Q731,570 742,565L765,554Q781,546 790.5,532Q800,518 800,500Q800,483 790.5,468.5Q781,454 765,446L743,436Q732,431 726,421.5Q720,412 720,400L720,240Q720,240 720,240Q720,240 720,240L563,240Q548,240 536.5,230.5Q525,221 523,206L518,172Q515,150 498.5,135Q482,120 460,120Q437,120 420.5,135Q404,150 401,172L396,206Q394,221 382.5,230.5Q371,240 356,240L200,240Q200,240 200,240Q200,240 200,240L200,326Q256,347 288,394Q320,441 320,500Q320,560 288,607Q256,654 200,675L200,760Q200,760 200,760Q200,760 200,760ZM200,840Q166,840 143,817Q120,794 120,760L120,635Q120,624 128,615.5Q136,607 147,605Q186,597 213,568.5Q240,540 240,500Q240,461 213,433Q186,405 147,396Q136,393 128,384.5Q120,376 120,365L120,240Q120,207 143.5,183.5Q167,160 200,160L322,160Q329,109 368,74.5Q407,40 460,40Q512,40 551,74.5Q590,109 598,160L720,160Q753,160 776.5,183.5Q800,207 800,240L800,374Q836,392 858,426Q880,460 880,500Q880,541 858,575Q836,609 800,626L800,760Q800,794 776.5,817Q753,840 720,840L200,840ZM500,500L500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500L500,500Q500,500 500,500Q500,500 500,500Z"/>
-</vector>

app/src/main/res/drawable/extention_download.xml

@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M334.49,359.62L334.49,217.46C334.49,211.35 336.74,206.11 341.24,201.76C345.74,197.41 351.15,195.24 357.48,195.24C363.8,195.24 369.22,197.41 373.72,201.76C378.22,206.11 380.47,211.35 380.47,217.46L380.47,359.62L437.77,304.24C442.38,299.77 447.86,297.54 454.18,297.54C460.51,297.54 465.98,299.77 470.61,304.24C474.98,308.71 477.17,314 477.17,320.11C477.17,326.23 474.86,331.52 470.24,335.99L373.9,429.11C371.71,431.23 369.16,432.88 366.24,434.05C363.32,435.23 360.4,435.82 357.48,435.82C354.56,435.82 351.64,435.23 348.73,434.05C345.8,432.88 343.25,431.23 341.06,429.11L244.36,335.63C239.73,331.17 237.42,325.93 237.42,319.94C237.42,313.94 239.73,308.71 244.36,304.24C248.98,299.77 254.45,297.54 260.78,297.54C267.1,297.54 272.58,299.77 277.2,304.24L334.49,359.62Z"
-      android:strokeWidth="1"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M93.09,357.71L210.69,357.71L249.64,395.37L93.09,395.37C82.47,395.37 73.46,391.76 66.3,384.54C59.02,377.33 55.44,368.38 55.44,357.71L55.44,298.88C55.44,295.43 56.67,292.37 59.26,289.7C61.73,287.03 64.69,285.39 68.15,284.76C80.37,282.25 90.74,276.52 99.26,267.58C107.78,258.64 111.97,247.89 111.97,235.34C111.97,223.1 107.78,212.59 99.26,203.8C90.74,195.01 80.37,189.22 68.15,186.39C64.69,185.44 61.73,183.64 59.26,180.98C56.67,178.3 55.44,175.25 55.44,171.79L55.44,112.97C55.44,102.61 59.14,93.75 66.55,86.37C73.83,79 82.72,75.31 93.09,75.31L150.61,75.31C152.83,59.3 159.99,45.9 172.21,35.07C184.55,24.24 199,18.83 215.66,18.83C231.96,18.83 246.27,24.24 258.49,35.07C270.72,45.9 278.12,59.3 280.59,75.31L338.11,75.31C348.48,75.31 357.37,79 364.73,86.37C372.1,93.75 375.79,102.61 375.79,112.97L375.79,160.48C370.9,156.68 364.95,154.59 358.81,154.59C351.21,154.59 343.92,157.78 338.55,163.45C338.4,163.61 338.26,163.76 338.11,163.92L338.11,112.97L264.17,112.97C259.48,112.97 255.29,111.48 251.71,108.49C248,105.51 245.9,101.66 245.29,96.96L242.94,80.96C241.95,74.05 238.87,68.26 233.68,63.54C228.62,58.83 222.45,56.48 215.66,56.48C208.38,56.48 202.21,58.83 197.02,63.54C191.84,68.26 188.75,74.05 187.76,80.96L185.42,96.96C184.8,101.66 182.7,105.51 179.12,108.49C175.42,111.48 171.35,112.97 166.66,112.97L93.09,112.97L93.09,153.44C110.74,160.03 124.56,170.7 134.56,185.44C144.68,200.2 149.62,216.83 149.62,235.34C149.62,254.17 144.68,270.95 134.56,285.7C124.56,300.45 110.74,311.12 93.09,317.71Z"
-      android:strokeWidth="1"/>
-</vector>

app/src/main/res/drawable/extention_renew.xml

@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#000000"
-        android:pathData="M828.649 786.425C828.649 789.514 828.814 792.438 829.145 795.196C829.477 797.953 829.973 800.766 830.634 803.635C832.181 809.372 832.181 814.997 830.634 820.514C829.089 826.03 825.78 830.332 820.707 833.421C815.633 836.509 810.337 837.172 804.82 835.407C799.304 833.641 795.553 830.111 793.568 824.816C791.36 818.638 789.706 812.35 788.603 805.952C787.501 799.553 786.949 793.044 786.949 786.425C786.949 755.536 797.761 728.894 819.382 706.5C841.003 684.105 866.93 672.91 897.157 672.91L899.804 672.91L894.509 667.614C891.421 664.523 889.932 660.883 890.042 656.692C890.15 652.499 891.752 648.859 894.84 645.771C897.927 642.679 901.568 641.138 905.762 641.138C909.955 641.138 913.596 642.679 916.683 645.771L949.779 678.865C953.972 683.057 956.067 688.021 956.067 693.758C956.067 699.495 953.972 704.459 949.779 708.651L916.683 741.746C913.596 744.835 909.955 746.38 905.762 746.38C901.568 746.38 897.927 744.835 894.84 741.746C891.752 738.657 890.207 734.962 890.207 730.66C890.207 726.357 891.752 722.661 894.84 719.572L899.804 714.608L898.149 714.608C878.954 714.608 862.572 721.613 849.003 735.624C835.433 749.634 828.649 766.568 828.649 786.425ZM972.283 786.425C972.283 783.336 972.118 780.413 971.787 777.655C971.456 774.897 970.96 772.083 970.298 769.215C968.752 763.479 968.752 757.852 970.298 752.337C971.843 746.821 975.153 742.519 980.227 739.43C985.3 736.34 990.542 735.624 995.947 737.279C1001.35 738.933 1005.05 742.298 1007.03 747.373C1009.46 753.771 1011.23 760.169 1012.33 766.568C1013.43 772.966 1013.98 779.585 1013.98 786.425C1013.98 817.314 1003.17 844.011 981.55 866.517C959.929 889.021 934.001 900.274 903.776 900.274L901.128 900.274L906.093 905.238C909.18 908.327 910.726 911.968 910.726 916.16C910.726 920.351 909.18 923.992 906.093 927.081C903.005 930.17 899.308 931.714 895.005 931.714C890.703 931.714 887.006 930.17 883.918 927.081L850.823 893.985C846.63 889.793 844.592 884.884 844.701 879.258C844.81 873.632 846.852 868.723 850.823 864.531L884.249 831.435C887.337 828.346 891.034 826.746 895.336 826.636C899.639 826.525 903.336 828.015 906.424 831.104C909.511 834.193 911.057 837.889 911.057 842.191C911.057 846.493 909.511 850.189 906.424 853.278L901.128 858.573L902.783 858.573C921.978 858.573 938.36 851.513 951.93 837.392C965.499 823.272 972.283 806.283 972.283 786.425Z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M130.425 375.105L242.731 375.105C244.138 386.796 246.964 398.225 251.107 409.155L130.425 409.155C120.778 409.155 112.692 405.892 106.164 399.366C99.639 392.839 96.375 384.752 96.375 375.105L96.375 321.903C96.375 318.781 97.511 316.015 99.78 313.604C102.053 311.192 104.747 309.701 107.867 309.135C118.934 306.864 128.297 301.686 135.958 293.599C143.62 285.513 147.451 275.794 147.451 264.444C147.451 253.378 143.62 243.873 135.958 235.928C128.297 227.983 118.934 222.734 107.867 220.18C104.747 219.329 102.053 217.697 99.78 215.285C97.511 212.874 96.375 210.107 96.375 206.986L96.375 153.783C96.375 144.419 99.712 136.404 106.377 129.738C113.046 123.07 121.061 119.732 130.425 119.732L182.35 119.732C184.337 105.267 190.863 93.133 201.93 83.344C212.996 73.555 226.05 68.661 241.087 68.661C255.845 68.661 268.753 73.555 279.82 83.344C290.887 93.133 297.556 105.267 299.82 119.732L351.747 119.732C361.107 119.732 369.129 123.07 375.798 129.738C382.466 136.404 385.797 144.419 385.797 153.783L385.797 207.371C375.371 204.086 363.868 202.111 351.747 201.76L351.747 153.783L284.926 153.783C280.67 153.783 276.911 152.436 273.648 149.74C270.385 147.044 268.468 143.569 267.904 139.313L265.77 124.844C264.92 118.597 262.153 113.35 257.469 109.094C252.792 104.838 247.334 102.711 241.087 102.711C234.562 102.711 228.956 104.838 224.274 109.094C219.593 113.35 216.827 118.597 215.976 124.844L213.847 139.313C213.281 143.569 211.366 147.044 208.101 149.74C204.837 152.436 201.078 153.783 196.822 153.783L130.425 153.783L130.425 190.387C146.316 196.345 158.8 205.993 167.88 219.329C176.96 232.665 181.499 247.703 181.499 264.444C181.499 281.47 176.96 296.649 167.88 309.986C158.8 323.321 146.316 332.968 130.425 338.928L130.425 375.105Z" />
-    <path
-        android:fillColor="#D8D8D8"
-        android:pathData="M362.193 643.11A0.726 2.177 0 0 1 360.741 643.11A0.726 2.177 0 0 1 362.193 643.11Z"
-        android:strokeWidth="1"
-        android:strokeColor="#000000" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M285.208 364.511C285.208 368.086 285.429 371.577 285.861 374.985C286.293 378.39 287.03 381.766 288.073 385.111C289.337 389.523 289.243 393.776 287.81 397.87C286.377 401.967 283.702 405.013 279.814 407.011C275.738 409.183 271.65 409.48 267.563 407.903C263.465 406.322 260.737 403.379 259.357 399.076C257.408 393.502 255.986 387.814 255.101 382.007C254.205 376.204 253.763 370.371 253.763 364.511C253.763 333.308 264.613 306.671 286.314 284.601C308.015 262.531 334.393 251.497 365.427 251.497L367.923 251.497L357.136 240.707C354.439 238.01 353.102 234.647 353.133 230.62C353.154 226.593 354.524 223.229 357.22 220.529C359.917 217.828 363.288 216.479 367.312 216.479C371.336 216.479 374.697 217.828 377.404 220.529L413.01 256.138C416.16 259.29 417.74 262.984 417.74 267.221C417.74 271.458 416.16 275.152 413.01 278.303L377.404 313.914C374.697 316.614 371.336 317.963 367.312 317.963C363.288 317.963 359.917 316.614 357.22 313.914C354.524 311.213 353.175 307.835 353.175 303.781C353.175 299.728 354.524 296.352 357.22 293.651L367.923 282.945L365.669 282.945C343.347 282.945 324.364 290.874 308.699 306.731C293.045 322.588 285.208 341.846 285.208 364.511ZM447.289 363.46C447.289 359.884 447.078 356.392 446.646 352.985C446.204 349.58 445.466 346.204 444.434 342.86C443.17 338.447 443.254 334.194 444.697 330.101C446.13 326.004 448.795 322.957 452.693 320.96C456.759 318.787 460.836 318.476 464.902 320.027C468.968 321.579 471.686 324.48 473.066 328.728C475.068 334.356 476.522 340.074 477.406 345.88C478.291 351.683 478.744 357.544 478.744 363.46C478.744 394.661 467.894 421.312 446.183 443.412C424.482 465.509 398.115 476.557 367.081 476.557L364.573 476.557L375.276 487.263C377.984 489.961 379.332 493.323 379.332 497.351C379.332 501.378 377.984 504.742 375.276 507.442C372.58 510.141 369.209 511.492 365.153 511.492C361.097 511.492 357.716 510.141 355.019 507.442L319.413 471.832C316.263 468.681 314.693 465 314.725 460.791C314.757 456.582 316.316 452.901 319.413 449.749L355.103 414.14C357.8 411.44 361.181 410.076 365.227 410.049C369.282 410.021 372.664 411.357 375.361 414.057C378.068 416.757 379.416 420.135 379.416 424.19C379.416 428.242 378.068 431.619 375.361 434.319L364.573 445.108L366.828 445.108C389.15 445.108 408.143 437.165 423.808 421.28C439.462 405.397 447.289 386.123 447.289 363.46Z" />
-</vector>

app/src/main/res/drawable/extention_renew2.xml

@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="512" android:viewportWidth="512" android:width="24dp">
-      
-    <path android:fillColor="#FF000000" android:pathData="M828.65,786.42C828.65,789.51 828.81,792.44 829.15,795.2C829.48,797.95 829.97,800.77 830.63,803.64C832.18,809.37 832.18,815 830.63,820.51C829.09,826.03 825.78,830.33 820.71,833.42C815.63,836.51 810.34,837.17 804.82,835.41C799.3,833.64 795.55,830.11 793.57,824.82C791.36,818.64 789.71,812.35 788.6,805.95C787.5,799.55 786.95,793.04 786.95,786.42C786.95,755.54 797.76,728.89 819.38,706.5C841,684.1 866.93,672.91 897.16,672.91L899.8,672.91L894.51,667.61C891.42,664.52 889.93,660.88 890.04,656.69C890.15,652.5 891.75,648.86 894.84,645.77C897.93,642.68 901.57,641.14 905.76,641.14C909.96,641.14 913.6,642.68 916.68,645.77L949.78,678.86C953.97,683.06 956.07,688.02 956.07,693.76C956.07,699.49 953.97,704.46 949.78,708.65L916.68,741.75C913.6,744.84 909.96,746.38 905.76,746.38C901.57,746.38 897.93,744.84 894.84,741.75C891.75,738.66 890.21,734.96 890.21,730.66C890.21,726.36 891.75,722.66 894.84,719.57L899.8,714.61L898.15,714.61C878.95,714.61 862.57,721.61 849,735.62C835.43,749.63 828.65,766.57 828.65,786.42ZM972.28,786.42C972.28,783.34 972.12,780.41 971.79,777.66C971.46,774.9 970.96,772.08 970.3,769.22C968.75,763.48 968.75,757.85 970.3,752.34C971.84,746.82 975.15,742.52 980.23,739.43C985.3,736.34 990.54,735.62 995.95,737.28C1001.35,738.93 1005.05,742.3 1007.03,747.37C1009.46,753.77 1011.23,760.17 1012.33,766.57C1013.43,772.97 1013.98,779.59 1013.98,786.42C1013.98,817.31 1003.17,844.01 981.55,866.52C959.93,889.02 934,900.27 903.78,900.27L901.13,900.27L906.09,905.24C909.18,908.33 910.73,911.97 910.73,916.16C910.73,920.35 909.18,923.99 906.09,927.08C903.01,930.17 899.31,931.71 895.01,931.71C890.7,931.71 887.01,930.17 883.92,927.08L850.82,893.98C846.63,889.79 844.59,884.88 844.7,879.26C844.81,873.63 846.85,868.72 850.82,864.53L884.25,831.43C887.34,828.35 891.03,826.75 895.34,826.64C899.64,826.53 903.34,828.02 906.42,831.1C909.51,834.19 911.06,837.89 911.06,842.19C911.06,846.49 909.51,850.19 906.42,853.28L901.13,858.57L902.78,858.57C921.98,858.57 938.36,851.51 951.93,837.39C965.5,823.27 972.28,806.28 972.28,786.42Z" android:strokeWidth="1"/>
-      
-    <path android:fillColor="#FF000000" android:pathData="M93.03,360.46L191.68,360.46C191.41,364.54 191.28,368.65 191.28,372.8C191.28,381.4 191.86,389.87 192.99,398.17L93.03,398.17C82.34,398.17 73.39,394.55 66.16,387.33C58.93,380.1 55.32,371.14 55.32,360.46L55.32,301.55C55.32,298.09 56.58,295.03 59.09,292.36C61.61,289.69 64.59,288.04 68.05,287.41C80.3,284.89 90.67,279.16 99.15,270.2C107.64,261.25 111.88,250.49 111.88,237.92C111.88,225.66 107.64,215.14 99.15,206.34C90.67,197.54 80.3,191.73 68.05,188.9C64.59,187.96 61.61,186.15 59.09,183.48C56.58,180.81 55.32,177.75 55.32,174.29L55.32,115.38C55.32,105.01 59.01,96.13 66.4,88.75C73.78,81.36 82.66,77.67 93.03,77.67L150.53,77.67C152.73,61.65 159.95,48.21 172.21,37.37C184.46,26.53 198.92,21.11 215.57,21.11C231.91,21.11 246.21,26.53 258.46,37.37C270.72,48.21 278.1,61.65 280.61,77.67L338.11,77.67C348.48,77.67 357.36,81.36 364.74,88.75C372.13,96.13 375.82,105.01 375.82,115.38L375.82,151.01C364.09,147.13 351.61,145.03 338.67,145.03C338.49,145.03 338.3,145.03 338.11,145.03L338.11,115.38L264.12,115.38C259.4,115.38 255.24,113.88 251.63,110.9C248.01,107.91 245.89,104.07 245.27,99.35L242.9,83.33C241.96,76.41 238.9,70.6 233.71,65.89C228.53,61.17 222.49,58.82 215.57,58.82C208.34,58.82 202.14,61.17 196.95,65.89C191.77,70.6 188.71,76.41 187.76,83.33L185.4,99.35C184.78,104.07 182.66,107.91 179.04,110.9C175.43,113.88 171.26,115.38 166.55,115.38L93.03,115.38L93.03,155.91C110.62,162.51 124.45,173.19 134.5,187.96C144.56,202.73 149.58,219.38 149.58,237.92C149.58,256.77 144.56,273.58 134.5,288.35C124.45,303.12 110.62,313.8 93.03,320.4Z" android:strokeWidth="1"/>
-      
-    <path android:fillColor="#D8D8D8" android:pathData="M360.74,643.11a0.73,2.18 0,1 0,1.45 0a0.73,2.18 0,1 0,-1.45 0z" android:strokeColor="#000000" android:strokeWidth="1"/>
-      
-    <path android:fillColor="#FF000000" android:pathData="M264.43,348.73C264.43,352.69 264.67,356.55 265.15,360.33C265.63,364.1 266.45,367.84 267.6,371.54C269,376.43 268.9,381.14 267.31,385.67C265.72,390.21 262.76,393.58 258.45,395.79C253.94,398.2 249.41,398.53 244.89,396.78C240.35,395.03 237.33,391.77 235.8,387.01C233.64,380.83 232.07,374.54 231.09,368.1C230.1,361.68 229.61,355.22 229.61,348.73C229.61,314.18 241.62,284.68 265.65,260.24C289.68,235.8 318.89,223.58 353.26,223.58L356.02,223.58L344.08,211.63C341.09,208.65 339.61,204.92 339.65,200.46C339.67,196 341.19,192.28 344.17,189.29C347.16,186.3 350.89,184.8 355.35,184.8C359.8,184.8 363.52,186.3 366.52,189.29L405.95,228.72C409.44,232.21 411.19,236.3 411.19,240.99C411.19,245.68 409.44,249.78 405.95,253.26L366.52,292.7C363.52,295.69 359.8,297.18 355.35,297.18C350.89,297.18 347.16,295.69 344.17,292.7C341.19,289.71 339.69,285.97 339.69,281.48C339.69,276.99 341.19,273.25 344.17,270.26L356.02,258.41L353.53,258.41C328.81,258.41 307.79,267.19 290.44,284.75C273.11,302.3 264.43,323.63 264.43,348.73ZM443.91,347.57C443.91,343.61 443.68,339.74 443.2,335.97C442.71,332.2 441.89,328.46 440.75,324.75C439.35,319.87 439.44,315.16 441.04,310.63C442.63,306.09 445.58,302.71 449.9,300.5C454.4,298.1 458.91,297.75 463.42,299.47C467.92,301.19 470.93,304.4 472.46,309.1C474.67,315.34 476.28,321.67 477.26,328.1C478.24,334.52 478.74,341.01 478.74,347.57C478.74,382.12 466.73,411.63 442.69,436.1C418.66,460.57 389.46,472.81 355.09,472.81L352.31,472.81L364.17,484.66C367.17,487.65 368.66,491.37 368.66,495.83C368.66,500.29 367.17,504.02 364.17,507.01C361.18,510 357.45,511.49 352.96,511.49C348.46,511.49 344.72,510 341.73,507.01L302.3,467.57C298.82,464.08 297.08,460.01 297.11,455.35C297.15,450.69 298.88,446.61 302.3,443.12L341.83,403.69C344.81,400.7 348.56,399.19 353.04,399.16C357.53,399.13 361.27,400.61 364.26,403.6C367.26,406.58 368.75,410.33 368.75,414.82C368.75,419.3 367.26,423.04 364.26,426.03L352.31,437.98L354.81,437.98C379.53,437.98 400.56,429.18 417.91,411.59C435.24,394.01 443.91,372.66 443.91,347.57Z" android:strokeWidth="1"/>
-    
-</vector>

app/src/main/res/drawable/face_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M324.5,555.5Q310,541 310,520Q310,499 324.5,484.5Q339,470 360,470Q381,470 395.5,484.5Q410,499 410,520Q410,541 395.5,555.5Q381,570 360,570Q339,570 324.5,555.5ZM564.5,555.5Q550,541 550,520Q550,499 564.5,484.5Q579,470 600,470Q621,470 635.5,484.5Q650,499 650,520Q650,541 635.5,555.5Q621,570 600,570Q579,570 564.5,555.5ZM480,800Q614,800 707,707Q800,614 800,480Q800,456 797,433.5Q794,411 786,390Q765,395 744,397.5Q723,400 700,400Q609,400 528,361Q447,322 390,252Q358,330 298.5,387.5Q239,445 160,474Q160,476 160,477Q160,478 160,480Q160,614 253,707Q346,800 480,800ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM426,165Q468,235 540,277.5Q612,320 700,320Q714,320 727,318.5Q740,317 754,315Q712,245 640,202.5Q568,160 480,160Q466,160 453,161.5Q440,163 426,165ZM177,379Q228,350 266,304Q304,258 323,201Q272,230 234,276Q196,322 177,379ZM426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165ZM323,201Q323,201 323,201Q323,201 323,201Q323,201 323,201Q323,201 323,201Z"/>
-</vector>

app/src/main/res/drawable/filter_alt_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M440,800Q423,800 411.5,788.5Q400,777 400,760L400,520L168,224Q153,204 163.5,182Q174,160 200,160L760,160Q786,160 796.5,182Q807,204 792,224L560,520L560,760Q560,777 548.5,788.5Q537,800 520,800L440,800ZM480,492L678,240L282,240L480,492ZM480,492L480,492L480,492Z"/>
-</vector>

app/src/main/res/drawable/folder_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L367,160Q383,160 397.5,166Q412,172 423,183L480,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,320Q800,320 800,320Q800,320 800,320L447,320L367,240Q367,240 367,240Q367,240 367,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240Q160,240 160,240Q160,240 160,240L160,320L160,320Q160,320 160,320Q160,320 160,320L160,720Q160,720 160,720Q160,720 160,720Z"/>
-</vector>

app/src/main/res/drawable/format_paint_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M440,880Q407,880 383.5,856.5Q360,833 360,800L360,640L240,640Q207,640 183.5,616.5Q160,593 160,560L160,280Q160,214 207,167Q254,120 320,120L760,120Q777,120 788.5,131.5Q800,143 800,160L800,560Q800,593 776.5,616.5Q753,640 720,640L600,640L600,800Q600,833 576.5,856.5Q553,880 520,880L440,880ZM240,400L720,400L720,200L680,200L680,320Q680,337 668.5,348.5Q657,360 640,360Q623,360 611.5,348.5Q600,337 600,320L600,200L560,200L560,240Q560,257 548.5,268.5Q537,280 520,280Q503,280 491.5,268.5Q480,257 480,240L480,200L320,200Q287,200 263.5,223.5Q240,247 240,280L240,400ZM240,560L720,560Q720,560 720,560Q720,560 720,560L720,480L240,480L240,560Q240,560 240,560Q240,560 240,560ZM240,560Q240,560 240,560Q240,560 240,560L240,480L240,480L240,560Q240,560 240,560Q240,560 240,560Z"/>
-</vector>

app/src/main/res/drawable/hard_drive_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,680L800,680Q800,680 800,680Q800,680 800,680L800,440L160,440L160,680Q160,680 160,680Q160,680 160,680ZM722.5,602.5Q740,585 740,560Q740,535 722.5,517.5Q705,500 680,500Q655,500 637.5,517.5Q620,535 620,560Q620,585 637.5,602.5Q655,620 680,620Q705,620 722.5,602.5ZM880,360L767,360L687,280L273,280L193,360L80,360L217,223Q228,212 242.5,206Q257,200 273,200L687,200Q703,200 717.5,206Q732,212 743,223L880,360ZM160,760Q127,760 103.5,736.5Q80,713 80,680L80,360L880,360L880,680Q880,713 856.5,736.5Q833,760 800,760L160,760Z"/>
-</vector>

app/src/main/res/drawable/high_res_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M240,660L264,660L293,724Q296,732 303,736Q310,740 318,740Q333,740 341.5,728Q350,716 344,702L324,656Q339,647 349.5,632.5Q360,618 360,600L360,560Q360,535 342.5,517.5Q325,500 300,500L220,500Q203,500 191.5,511.5Q180,523 180,540L180,710Q180,723 188.5,731.5Q197,740 210,740Q223,740 231.5,731.5Q240,723 240,710L240,660ZM530,740Q543,740 551.5,731.5Q560,723 560,710Q560,697 551.5,688.5Q543,680 530,680L460,680L460,650L510,650Q523,650 531.5,641.5Q540,633 540,620Q540,607 531.5,598.5Q523,590 510,590L460,590L460,560L530,560Q543,560 551.5,551.5Q560,543 560,530Q560,517 551.5,508.5Q543,500 530,500L440,500Q423,500 411.5,511.5Q400,523 400,540L400,700Q400,717 411.5,728.5Q423,740 440,740L530,740ZM720,680L630,680Q617,680 608.5,688.5Q600,697 600,710Q600,723 608.5,731.5Q617,740 630,740L740,740Q757,740 768.5,728.5Q780,717 780,700L780,640Q780,623 768.5,611.5Q757,600 740,600L660,600L660,560L750,560Q763,560 771.5,551.5Q780,543 780,530Q780,517 771.5,508.5Q763,500 750,500L640,500Q623,500 611.5,511.5Q600,523 600,540L600,600Q600,617 611.5,628.5Q623,640 640,640L720,640L720,680ZM240,600L240,560L300,560Q300,560 300,560Q300,560 300,560L300,600Q300,600 300,600Q300,600 300,600L240,600ZM360,370L420,370L420,430Q420,443 428.5,451.5Q437,460 450,460Q463,460 471.5,451.5Q480,443 480,430L480,250Q480,237 471.5,228.5Q463,220 450,220Q437,220 428.5,228.5Q420,237 420,250L420,310L360,310L360,250Q360,237 351.5,228.5Q343,220 330,220Q317,220 308.5,228.5Q300,237 300,250L300,430Q300,443 308.5,451.5Q317,460 330,460Q343,460 351.5,451.5Q360,443 360,430L360,370ZM580,250L580,430Q580,443 588.5,451.5Q597,460 610,460Q623,460 631.5,451.5Q640,443 640,430L640,250Q640,237 631.5,228.5Q623,220 610,220Q597,220 588.5,228.5Q580,237 580,250ZM120,840Q87,840 63.5,816.5Q40,793 40,760L40,200Q40,167 63.5,143.5Q87,120 120,120L840,120Q873,120 896.5,143.5Q920,167 920,200L920,760Q920,793 896.5,816.5Q873,840 840,840L120,840ZM120,760L840,760Q840,760 840,760Q840,760 840,760L840,200Q840,200 840,200Q840,200 840,200L120,200Q120,200 120,200Q120,200 120,200L120,760Q120,760 120,760Q120,760 120,760ZM120,760Q120,760 120,760Q120,760 120,760L120,200Q120,200 120,200Q120,200 120,200L120,200Q120,200 120,200Q120,200 120,200L120,760Q120,760 120,760Q120,760 120,760Z"/>
-</vector>

app/src/main/res/drawable/history_toggle_off_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M196.5,254Q185,242 185,225Q185,208 196.5,196.5Q208,185 225,185Q242,185 254,196.5Q266,208 266,225Q266,242 254,254Q242,266 225,266Q208,266 196.5,254ZM358,161Q346,149 346,132Q346,115 358,103.5Q370,92 387,92Q404,92 415.5,103.5Q427,115 427,132Q427,149 415.5,161Q404,173 387,173Q370,173 358,161ZM544.5,161Q533,149 533,132Q533,115 544.5,103.5Q556,92 573,92Q590,92 602,103.5Q614,115 614,132Q614,149 602,161Q590,173 573,173Q556,173 544.5,161ZM706,254Q694,242 694,225Q694,208 706,196Q718,184 735,184Q752,184 763.5,196Q775,208 775,225Q775,242 763.5,254Q752,266 735,266Q718,266 706,254ZM799,415.5Q787,404 787,387Q787,370 799,358.5Q811,347 828,347Q845,347 856.5,358.5Q868,370 868,387Q868,404 856.5,415.5Q845,427 828,427Q811,427 799,415.5ZM799,602Q787,590 787,573Q787,556 799,544.5Q811,533 828,533Q845,533 856.5,544.5Q868,556 868,573Q868,590 856.5,602Q845,614 828,614Q811,614 799,602ZM706,763.5Q694,752 694,735Q694,718 706,706Q718,694 735,694Q752,694 763.5,706Q775,718 775,735Q775,752 763.5,763.5Q752,775 735,775Q718,775 706,763.5ZM544.5,856.5Q533,845 533,828Q533,811 544.5,799Q556,787 573,787Q590,787 602,799Q614,811 614,828Q614,845 602,856.5Q590,868 573,868Q556,868 544.5,856.5ZM358,856.5Q346,845 346,828Q346,811 358,799Q370,787 387,787Q404,787 415.5,799Q427,811 427,828Q427,845 415.5,856.5Q404,868 387,868Q370,868 358,856.5ZM196.5,762.5Q185,751 185,734Q185,717 196.5,705.5Q208,694 225,694Q242,694 253.5,705.5Q265,717 265,734Q265,751 253.5,762.5Q242,774 225,774Q208,774 196.5,762.5ZM132,613Q115,613 103.5,601Q92,589 92,572Q92,555 103.5,543.5Q115,532 132,532Q149,532 161,543.5Q173,555 173,572Q173,589 161,601Q149,613 132,613ZM132,427Q115,427 103.5,415.5Q92,404 92,387Q92,370 103.5,358Q115,346 132,346Q149,346 161,358Q173,370 173,387Q173,404 161,415.5Q149,427 132,427ZM520,464L640,584Q651,595 651,612Q651,629 640,640Q629,651 612,651Q595,651 584,640L452,508Q446,502 443,494.5Q440,487 440,479L440,320Q440,303 451.5,291.5Q463,280 480,280Q497,280 508.5,291.5Q520,303 520,320L520,464Z"/>
-</vector>

app/src/main/res/drawable/ic_baseline_clock_24.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:pathData="m612,668 l56,-56 -148,-148v-184h-80v216l172,172ZM480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480q0,-83 31.5,-156T197,197q54,-54 127,-85.5T480,80q83,0 156,31.5T763,197q54,54 85.5,127T880,480q0,83 -31.5,156T763,763q-54,54 -127,85.5T480,880ZM480,480ZM480,800q133,0 226.5,-93.5T800,480q0,-133 -93.5,-226.5T480,160q-133,0 -226.5,93.5T160,480q0,133 93.5,226.5T480,800Z"
-      android:fillColor="#e3e3e3"/>
-</vector>

app/src/main/res/drawable/keyboard_arrow_left_24px.xml

@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal"
-    android:autoMirrored="true">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M432,480L588,636Q599,647 599,664Q599,681 588,692Q577,703 560,703Q543,703 532,692L348,508Q342,502 339.5,495Q337,488 337,480Q337,472 339.5,465Q342,458 348,452L532,268Q543,257 560,257Q577,257 588,268Q599,279 599,296Q599,313 588,324L432,480Z"/>
-</vector>

app/src/main/res/drawable/keyboard_double_arrow_right_24px.xml

@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal"
-    android:autoMirrored="true">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M383,480L228,324Q217,313 216.5,296.5Q216,280 228,268Q239,257 256,257Q273,257 284,268L468,452Q474,458 476.5,465Q479,472 479,480Q479,488 476.5,495Q474,502 468,508L284,692Q273,703 256.5,703.5Q240,704 228,692Q217,681 217,664Q217,647 228,636L383,480ZM647,480L492,324Q481,313 480.5,296.5Q480,280 492,268Q503,257 520,257Q537,257 548,268L732,452Q738,458 740.5,465Q743,472 743,480Q743,488 740.5,495Q738,502 732,508L548,692Q537,703 520.5,703.5Q504,704 492,692Q481,681 481,664Q481,647 492,636L647,480Z"/>
-</vector>

app/src/main/res/drawable/label_24px.xml

@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal"
-    android:autoMirrored="true">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L600,160Q619,160 636,168.5Q653,177 664,192L844,432Q860,453 860,480Q860,507 844,528L664,768Q653,783 636,791.5Q619,800 600,800L160,800ZM160,720L600,720Q600,720 600,720Q600,720 600,720L780,480Q780,480 780,480Q780,480 780,480L600,240Q600,240 600,240Q600,240 600,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM470,480Q470,480 470,480Q470,480 470,480L470,480Q470,480 470,480Q470,480 470,480L470,480Q470,480 470,480Q470,480 470,480L470,480Q470,480 470,480Q470,480 470,480L470,480Q470,480 470,480Q470,480 470,480Z"/>
-</vector>

app/src/main/res/drawable/language_korean_latin_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M260.5,491.5Q279,480 279,457Q279,434 260.5,422Q242,410 216,410Q190,410 171.5,422Q153,434 153,457Q153,480 171.5,491.5Q190,503 216,503Q242,503 260.5,491.5ZM97,352Q88,352 81.5,345.5Q75,339 75,330Q75,321 81.5,314.5Q88,308 97,308L189,308L189,278Q189,267 196.5,259.5Q204,252 215,252Q226,252 233.5,259.5Q241,267 241,278L241,308L334,308Q343,308 349.5,314.5Q356,321 356,330Q356,339 349.5,345.5Q343,352 334,352L97,352ZM216,547Q169,547 135.5,523.5Q102,500 102,457Q102,413 135.5,390Q169,367 216,367Q264,367 297.5,390Q331,413 331,457Q331,501 297.5,524Q264,547 216,547ZM183,708Q166,708 154.5,696.5Q143,685 143,668L143,594Q143,583 151,575.5Q159,568 170,568Q181,568 188.5,575.5Q196,583 196,594L196,664L438,664Q447,664 453.5,670.5Q460,677 460,686Q460,695 453.5,701.5Q447,708 438,708L183,708ZM414,603Q403,603 395.5,595.5Q388,588 388,577L388,277Q388,266 395.5,259Q403,252 414,252Q425,252 432,259Q439,266 439,277L439,402L486,402Q495,402 501.5,408.5Q508,415 508,424Q508,433 501.5,439.5Q495,446 486,446L440,446L440,577Q440,588 432.5,595.5Q425,603 414,603ZM702,626Q730,626 756.5,613Q783,600 805,576L805,470Q782,473 762.5,477Q743,481 726,486Q681,500 658.5,521Q636,542 636,570Q636,596 654,611Q672,626 702,626ZM679,694Q622,694 589,661.5Q556,629 556,573Q556,521 589,488Q622,455 695,435Q718,429 745.5,424Q773,419 805,415L805,415Q803,368 783,346.5Q763,325 721,325Q700,325 680,331Q660,337 633,351Q621,358 608,355Q595,352 588,340Q581,328 585,314.5Q589,301 601,294Q632,277 667.5,266.5Q703,256 740,256Q811,256 848,300Q885,344 885,428L885,652Q885,666 875.5,675.5Q866,685 852,685L847,685Q834,685 825,676.5Q816,668 814,656L812,640Q784,665 750.5,679.5Q717,694 679,694Z"/>
-</vector>

app/src/main/res/drawable/light_mode_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M565,565Q600,530 600,480Q600,430 565,395Q530,360 480,360Q430,360 395,395Q360,430 360,480Q360,530 395,565Q430,600 480,600Q530,600 565,565ZM338.5,621.5Q280,563 280,480Q280,397 338.5,338.5Q397,280 480,280Q563,280 621.5,338.5Q680,397 680,480Q680,563 621.5,621.5Q563,680 480,680Q397,680 338.5,621.5ZM80,520Q63,520 51.5,508.5Q40,497 40,480Q40,463 51.5,451.5Q63,440 80,440L160,440Q177,440 188.5,451.5Q200,463 200,480Q200,497 188.5,508.5Q177,520 160,520L80,520ZM800,520Q783,520 771.5,508.5Q760,497 760,480Q760,463 771.5,451.5Q783,440 800,440L880,440Q897,440 908.5,451.5Q920,463 920,480Q920,497 908.5,508.5Q897,520 880,520L800,520ZM451.5,188.5Q440,177 440,160L440,80Q440,63 451.5,51.5Q463,40 480,40Q497,40 508.5,51.5Q520,63 520,80L520,160Q520,177 508.5,188.5Q497,200 480,200Q463,200 451.5,188.5ZM451.5,908.5Q440,897 440,880L440,800Q440,783 451.5,771.5Q463,760 480,760Q497,760 508.5,771.5Q520,783 520,800L520,880Q520,897 508.5,908.5Q497,920 480,920Q463,920 451.5,908.5ZM226,282L183,240Q171,229 171.5,212Q172,195 183,183Q195,171 212,171Q229,171 240,183L282,226Q293,238 293,254Q293,270 282,282Q271,294 254.5,293.5Q238,293 226,282ZM720,777L678,734Q667,722 667,705.5Q667,689 678,678Q689,666 705.5,666.5Q722,667 734,678L777,720Q789,731 788.5,748Q788,765 777,777Q765,789 748,789Q731,789 720,777ZM678,282Q666,271 666.5,254.5Q667,238 678,226L720,183Q731,171 748,171.5Q765,172 777,183Q789,195 789,212Q789,229 777,240L734,282Q722,293 706,293Q690,293 678,282ZM183,777Q171,765 171,748Q171,731 183,720L226,678Q238,667 254.5,667Q271,667 282,678Q294,689 293.5,705.5Q293,722 282,734L240,777Q229,789 212,788.5Q195,788 183,777ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
-</vector>

app/src/main/res/drawable/match_word_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M120,761Q87,761 63.5,737.5Q40,714 40,681L40,601Q40,584 51.5,572.5Q63,561 80,561Q97,561 108.5,572.5Q120,584 120,601L120,681Q120,681 120,681Q120,681 120,681L840,681Q840,681 840,681Q840,681 840,681L840,601Q840,584 851.5,572.5Q863,561 880,561Q897,561 908.5,572.5Q920,584 920,601L920,681Q920,714 896.5,737.5Q873,761 840,761L120,761ZM294,609Q245,609 217,583.5Q189,558 189,514Q189,472 221.5,445.5Q254,419 305,419Q328,419 347.5,422.5Q367,426 381,434L381,420Q381,393 362.5,377Q344,361 312,361Q297,361 283.5,365.5Q270,370 259,378Q250,385 239.5,386Q229,387 220,380Q211,373 209,362.5Q207,352 215,344Q233,327 257.5,318Q282,309 313,309Q375,309 408,338.5Q441,368 441,424L441,571Q441,583 432.5,591.5Q424,600 412,600Q399,600 390.5,591.5Q382,583 382,570L382,566L379,566Q366,586 344,597.5Q322,609 294,609ZM316,466Q284,466 267,478.5Q250,491 250,514Q250,534 265,546.5Q280,559 304,559Q336,559 358.5,536.5Q381,514 381,482Q367,474 349,470Q331,466 316,466ZM653,609Q612,609 590.5,591Q569,573 563,563L560,563L560,576Q560,588 551.5,596.5Q543,605 531,605Q519,605 510,596Q501,587 501,575L501,230Q501,217 510,208Q519,199 532,199Q545,199 554,208Q563,217 563,230L563,312L560,352L563,352Q566,347 587,326.5Q608,306 653,306Q717,306 754,352Q791,398 791,458Q791,518 754.5,563.5Q718,609 653,609ZM644,362Q604,362 582,391.5Q560,421 560,457Q560,494 582,523Q604,552 644,552Q684,552 706.5,523Q729,494 729,457Q729,420 706.5,391Q684,362 644,362Z"/>
-</vector>

app/src/main/res/drawable/memory_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M360,560L360,400Q360,383 371.5,371.5Q383,360 400,360L560,360Q577,360 588.5,371.5Q600,383 600,400L600,560Q600,577 588.5,588.5Q577,600 560,600L400,600Q383,600 371.5,588.5Q360,577 360,560ZM440,520L520,520L520,440L440,440L440,520ZM360,800L360,760L280,760Q247,760 223.5,736.5Q200,713 200,680L200,600L160,600Q143,600 131.5,588.5Q120,577 120,560Q120,543 131.5,531.5Q143,520 160,520L200,520L200,440L160,440Q143,440 131.5,428.5Q120,417 120,400Q120,383 131.5,371.5Q143,360 160,360L200,360L200,280Q200,247 223.5,223.5Q247,200 280,200L360,200L360,160Q360,143 371.5,131.5Q383,120 400,120Q417,120 428.5,131.5Q440,143 440,160L440,200L520,200L520,160Q520,143 531.5,131.5Q543,120 560,120Q577,120 588.5,131.5Q600,143 600,160L600,200L680,200Q713,200 736.5,223.5Q760,247 760,280L760,360L800,360Q817,360 828.5,371.5Q840,383 840,400Q840,417 828.5,428.5Q817,440 800,440L760,440L760,520L800,520Q817,520 828.5,531.5Q840,543 840,560Q840,577 828.5,588.5Q817,600 800,600L760,600L760,680Q760,713 736.5,736.5Q713,760 680,760L600,760L600,800Q600,817 588.5,828.5Q577,840 560,840Q543,840 531.5,828.5Q520,817 520,800L520,760L440,760L440,800Q440,817 428.5,828.5Q417,840 400,840Q383,840 371.5,828.5Q360,817 360,800ZM680,680Q680,680 680,680Q680,680 680,680L680,280Q680,280 680,280Q680,280 680,280L280,280Q280,280 280,280Q280,280 280,280L280,680Q280,680 280,680Q280,680 280,680L680,680ZM480,480L480,480L480,480L480,480Z"/>
-</vector>

app/src/main/res/drawable/memory_alt_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M308.5,588.5Q320,577 320,560L320,400Q320,383 308.5,371.5Q297,360 280,360Q263,360 251.5,371.5Q240,383 240,400L240,560Q240,577 251.5,588.5Q263,600 280,600Q297,600 308.5,588.5ZM508.5,588.5Q520,577 520,560L520,400Q520,383 508.5,371.5Q497,360 480,360Q463,360 451.5,371.5Q440,383 440,400L440,560Q440,577 451.5,588.5Q463,600 480,600Q497,600 508.5,588.5ZM708.5,588.5Q720,577 720,560L720,400Q720,383 708.5,371.5Q697,360 680,360Q663,360 651.5,371.5Q640,383 640,400L640,560Q640,577 651.5,588.5Q663,600 680,600Q697,600 708.5,588.5ZM160,680L800,680Q800,680 800,680Q800,680 800,680L800,280Q800,280 800,280Q800,280 800,280L160,280Q160,280 160,280Q160,280 160,280L160,680Q160,680 160,680Q160,680 160,680ZM160,680Q160,680 160,680Q160,680 160,680L160,280Q160,280 160,280Q160,280 160,280L160,280Q160,280 160,280Q160,280 160,280L160,680Q160,680 160,680Q160,680 160,680ZM160,760Q127,760 103.5,736.5Q80,713 80,680L80,280Q80,247 103.5,223.5Q127,200 160,200L200,200L200,160Q200,143 211.5,131.5Q223,120 240,120Q257,120 268.5,131.5Q280,143 280,160L280,200L440,200L440,160Q440,143 451.5,131.5Q463,120 480,120Q497,120 508.5,131.5Q520,143 520,160L520,200L680,200L680,160Q680,143 691.5,131.5Q703,120 720,120Q737,120 748.5,131.5Q760,143 760,160L760,200L800,200Q833,200 856.5,223.5Q880,247 880,280L880,680Q880,713 856.5,736.5Q833,760 800,760L760,760L760,800Q760,817 748.5,828.5Q737,840 720,840Q703,840 691.5,828.5Q680,817 680,800L680,760L520,760L520,800Q520,817 508.5,828.5Q497,840 480,840Q463,840 451.5,828.5Q440,817 440,800L440,760L280,760L280,800Q280,817 268.5,828.5Q257,840 240,840Q223,840 211.5,828.5Q200,817 200,800L200,760L160,760Z"/>
-</vector>

app/src/main/res/drawable/mobile_arrow_down_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,244Q778,251 789,266Q800,281 800,300L800,380Q800,399 789,414Q778,429 760,436L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,840L680,840Q680,840 680,840Q680,840 680,840L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840ZM280,840Q280,840 280,840Q280,840 280,840L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840ZM495,620.5Q502,618 508,612L612,508Q623,497 623.5,480.5Q624,464 612,452Q601,441 584.5,440.5Q568,440 556,451L520,486L520,360Q520,343 508.5,331.5Q497,320 480,320Q463,320 451.5,331.5Q440,343 440,360L440,486L404,451Q393,440 376.5,440Q360,440 348,452Q337,463 337,480Q337,497 348,508L452,612Q458,618 465,620.5Q472,623 480,623Q488,623 495,620.5Z"/>
-</vector>

app/src/main/res/drawable/mobile_code_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M280,840L280,840Q280,840 280,840Q280,840 280,840L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,520L280,520Q280,520 280,590Q280,660 280,760L280,840ZM508.5,228.5Q520,217 520,200Q520,183 508.5,171.5Q497,160 480,160Q463,160 451.5,171.5Q440,183 440,200Q440,217 451.5,228.5Q463,240 480,240Q497,240 508.5,228.5ZM280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,244Q778,251 789,266Q800,281 800,300L800,380Q800,399 789,414Q778,429 760,436L760,480Q760,497 748.5,508.5Q737,520 720,520Q703,520 691.5,508.5Q680,497 680,480L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840L320,840Q337,840 348.5,851.5Q360,863 360,880Q360,897 348.5,908.5Q337,920 320,920L280,920ZM553,760L612,819Q623,830 623,846.5Q623,863 612,875Q600,887 583.5,887Q567,887 555,875L468,788Q456,776 456,760Q456,744 468,732L556,644Q568,632 584,632.5Q600,633 612,645Q623,657 623.5,673Q624,689 612,701L553,760ZM807,760L748,701Q737,690 737,673.5Q737,657 748,645Q760,633 776.5,633Q793,633 805,645L892,732Q904,744 904,760Q904,776 892,788L804,876Q792,888 776,887.5Q760,887 748,875Q737,863 736.5,847Q736,831 748,819L807,760Z"/>
-</vector>

app/src/main/res/drawable/mobile_wrench_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,244Q778,251 789,266Q800,281 800,300L800,380Q800,399 789,414Q778,429 760,436L760,440Q760,457 748.5,468.5Q737,480 720,480Q703,480 691.5,468.5Q680,457 680,440L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840L440,840Q457,840 468.5,851.5Q480,863 480,880Q480,897 468.5,908.5Q457,920 440,920L440,920L280,920ZM660,700Q671,688 671.5,671.5Q672,655 660,644L618,603Q609,594 611.5,581.5Q614,569 626,565Q634,563 642.5,562Q651,561 660,561Q718,561 759,601.5Q800,642 800,701Q800,713 798,725Q796,737 791,748L851,808Q863,820 863,836Q863,852 851,864L823,892Q811,903 795,903.5Q779,904 767,892L707,832Q696,837 684,838.5Q672,840 660,840Q601,840 560.5,799.5Q520,759 520,701Q520,692 521,683.5Q522,675 524,667Q527,655 539.5,652Q552,649 562,659L604,701Q616,713 632,712.5Q648,712 660,700ZM508.5,228.5Q520,217 520,200Q520,183 508.5,171.5Q497,160 480,160Q463,160 451.5,171.5Q440,183 440,200Q440,217 451.5,228.5Q463,240 480,240Q497,240 508.5,228.5ZM280,840L280,840Q280,840 280,840Q280,840 280,840L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840Q280,840 280,840Q280,840 280,840Q280,840 280,840Q280,840 280,840Z"/>
-</vector>

app/src/main/res/drawable/movie_edit_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,720L160,720Q160,720 160,720Q160,720 160,720L160,400L160,400L160,402Q160,406 160,415Q160,424 160,440L160,660Q160,671 160,686Q160,701 160,717L160,720ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L160,160L225,290Q232,304 245,312Q258,320 273,320Q303,320 319,294.5Q335,269 321,242L280,160L360,160L425,290Q432,304 445,312Q458,320 473,320Q503,320 519,294.5Q535,269 521,242L480,160L560,160L625,290Q632,304 645,312Q658,320 673,320Q703,320 719,294.5Q735,269 721,242L680,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,360Q880,377 868.5,388.5Q857,400 840,400L800,400L800,400L160,400L160,720Q160,720 160,720Q160,720 160,720L440,720Q457,720 468.5,731.5Q480,743 480,760Q480,777 468.5,788.5Q457,800 440,800L160,800ZM560,800L560,734Q560,726 563,718.5Q566,711 572,705L781,497Q790,488 801,484Q812,480 823,480Q835,480 846,484.5Q857,489 866,498L903,535Q911,544 915.5,555Q920,566 920,577Q920,588 916,599.5Q912,611 903,620L695,828Q689,834 681.5,837Q674,840 666,840L600,840Q583,840 571.5,828.5Q560,817 560,800ZM860,577L860,577L823,540L823,540L860,577ZM620,780L658,780L779,658L761,639L742,621L620,742L620,780ZM761,639L742,621L742,621L779,658L779,658L761,639Z"/>
-</vector>

app/src/main/res/drawable/movie_info_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,840Q127,840 103.5,816.5Q80,793 80,760L80,200Q80,167 103.5,143.5Q127,120 160,120L800,120Q833,120 856.5,143.5Q880,167 880,200L880,760Q880,793 856.5,816.5Q833,840 800,840L160,840ZM508.5,668.5Q520,657 520,640L520,480Q520,463 508.5,451.5Q497,440 480,440Q463,440 451.5,451.5Q440,463 440,480L440,640Q440,657 451.5,668.5Q463,680 480,680Q497,680 508.5,668.5ZM480,360Q497,360 508.5,348.5Q520,337 520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320Q440,337 451.5,348.5Q463,360 480,360ZM320,760L640,760L640,200L320,200L320,760ZM320,200L320,200L640,200L640,200L320,200ZM160,760L240,760L240,680L160,680L160,760Q160,760 160,760Q160,760 160,760ZM720,760L800,760Q800,760 800,760Q800,760 800,760L800,680L720,680L720,760ZM160,600L240,600L240,520L160,520L160,600ZM720,600L800,600L800,520L720,520L720,600ZM160,440L240,440L240,360L160,360L160,440ZM720,440L800,440L800,360L720,360L720,440ZM160,280L240,280L240,200L160,200Q160,200 160,200Q160,200 160,200L160,280ZM720,280L800,280L800,200Q800,200 800,200Q800,200 800,200L720,200L720,280Z"/>
-</vector>

app/src/main/res/drawable/notifications_active_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M200,760Q183,760 171.5,748.5Q160,737 160,720Q160,703 171.5,691.5Q183,680 200,680L240,680L240,400Q240,317 290,252.5Q340,188 420,168L420,140Q420,115 437.5,97.5Q455,80 480,80Q505,80 522.5,97.5Q540,115 540,140L540,168Q620,188 670,252.5Q720,317 720,400L720,680L760,680Q777,680 788.5,691.5Q800,703 800,720Q800,737 788.5,748.5Q777,760 760,760L200,760ZM480,460L480,460L480,460L480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460ZM480,880Q447,880 423.5,856.5Q400,833 400,800L560,800Q560,833 536.5,856.5Q513,880 480,880ZM320,680L640,680L640,400Q640,334 593,287Q546,240 480,240Q414,240 367,287Q320,334 320,400L320,680ZM120,400Q103,400 91.5,387Q80,374 82,357Q90,282 124,217.5Q158,153 211,105Q224,94 240.5,95Q257,96 267,110Q277,124 275,140Q273,156 260,168Q221,205 196,254Q171,303 163,360Q161,377 149,388.5Q137,400 120,400ZM840,400Q823,400 811,388.5Q799,377 797,360Q789,303 764,254Q739,205 700,168Q687,156 685,140Q683,124 693,110Q703,96 719.5,95Q736,94 749,105Q802,153 836,217.5Q870,282 878,357Q880,374 868.5,387Q857,400 840,400Z"/>
-</vector>

app/src/main/res/drawable/palette_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M480,880Q398,880 325,848.5Q252,817 197.5,762.5Q143,708 111.5,635Q80,562 80,480Q80,397 112.5,324Q145,251 200.5,197Q256,143 330,111.5Q404,80 488,80Q568,80 639,107.5Q710,135 763.5,183.5Q817,232 848.5,298.5Q880,365 880,442Q880,557 810,618.5Q740,680 640,680L566,680Q557,680 553.5,685Q550,690 550,696Q550,708 565,730.5Q580,753 580,782Q580,832 552.5,856Q525,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM303,503Q320,486 320,460Q320,434 303,417Q286,400 260,400Q234,400 217,417Q200,434 200,460Q200,486 217,503Q234,520 260,520Q286,520 303,503ZM423,343Q440,326 440,300Q440,274 423,257Q406,240 380,240Q354,240 337,257Q320,274 320,300Q320,326 337,343Q354,360 380,360Q406,360 423,343ZM623,343Q640,326 640,300Q640,274 623,257Q606,240 580,240Q554,240 537,257Q520,274 520,300Q520,326 537,343Q554,360 580,360Q606,360 623,343ZM743,503Q760,486 760,460Q760,434 743,417Q726,400 700,400Q674,400 657,417Q640,434 640,460Q640,486 657,503Q674,520 700,520Q726,520 743,503ZM480,800Q489,800 494.5,795Q500,790 500,782Q500,768 485,749Q470,730 470,692Q470,650 499,625Q528,600 570,600L640,600Q706,600 753,561.5Q800,523 800,442Q800,321 707.5,240.5Q615,160 488,160Q352,160 256,253Q160,346 160,480Q160,613 253.5,706.5Q347,800 480,800Z"/>
-</vector>

app/src/main/res/drawable/picture_in_picture_center_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM360,600L600,600Q617,600 628.5,588.5Q640,577 640,560L640,400Q640,383 628.5,371.5Q617,360 600,360L360,360Q343,360 331.5,371.5Q320,383 320,400L320,560Q320,577 331.5,588.5Q343,600 360,600ZM160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720Z"/>
-</vector>

app/src/main/res/drawable/pip_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M120,440Q103,440 91.5,428.5Q80,417 80,400Q80,383 91.5,371.5Q103,360 120,360L224,360L80,217Q68,205 68,188.5Q68,172 80,160Q92,148 108.5,148Q125,148 137,160L280,304L280,200Q280,183 291.5,171.5Q303,160 320,160Q337,160 348.5,171.5Q360,183 360,200L360,400Q360,417 348.5,428.5Q337,440 320,440L120,440ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,560Q80,543 91.5,531.5Q103,520 120,520Q137,520 148.5,531.5Q160,543 160,560L160,720Q160,720 160,720Q160,720 160,720L440,720Q457,720 468.5,731.5Q480,743 480,760Q480,777 468.5,788.5Q457,800 440,800L160,800ZM811.5,508.5Q800,497 800,480L800,240Q800,240 800,240Q800,240 800,240L480,240Q463,240 451.5,228.5Q440,217 440,200Q440,183 451.5,171.5Q463,160 480,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,480Q880,497 868.5,508.5Q857,520 840,520Q823,520 811.5,508.5ZM600,800Q583,800 571.5,788.5Q560,777 560,760L560,640Q560,623 571.5,611.5Q583,600 600,600L840,600Q857,600 868.5,611.5Q880,623 880,640L880,760Q880,777 868.5,788.5Q857,800 840,800L600,800Z"/>
-</vector>

app/src/main/res/drawable/play_arrow_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M320,687L320,273Q320,256 332,244.5Q344,233 360,233Q365,233 370.5,234.5Q376,236 381,239L707,446Q716,452 720.5,461Q725,470 725,480Q725,490 720.5,499Q716,508 707,514L381,721Q376,724 370.5,725.5Q365,727 360,727Q344,727 332,715.5Q320,704 320,687ZM400,480L400,480L400,480ZM400,614L610,480L400,346L400,614Z"/>
-</vector>

app/src/main/res/drawable/plugin_lang.xml

@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="512"
-    android:viewportHeight="512"
-    android:width="24dp"
-    android:height="24dp">
-    <path
-        android:pathData="M132.52 171.211C139.414 166.925 142.861 160.497 142.861 151.927C142.861 143.356 139.414 136.835 132.52 132.364C125.627 127.892 117.335 125.657 107.647 125.657C97.958 125.657 89.667 127.892 82.774 132.364C75.88 136.835 72.432 143.356 72.432 151.927C72.432 160.497 75.88 166.925 82.774 171.211C89.667 175.497 97.958 177.639 107.647 177.639C117.335 177.639 125.627 175.497 132.52 171.211ZM41.126 93.236C37.783 93.236 34.883 92.026 32.466 89.604C30.05 87.181 28.835 84.293 28.835 80.94C28.835 77.585 30.05 74.697 32.466 72.276C34.883 69.854 37.783 68.643 41.126 68.643L92.555 68.643L92.555 51.874C92.555 47.775 93.952 44.328 96.748 41.533C99.542 38.739 102.989 37.341 107.088 37.341C111.186 37.341 114.634 38.739 117.429 41.533C120.223 44.328 121.621 47.775 121.621 51.874L121.621 68.643L173.604 68.643C176.957 68.643 179.845 69.854 182.267 72.276C184.69 74.697 185.901 77.585 185.901 80.94C185.901 84.293 184.69 87.181 182.267 89.604C179.845 92.026 176.957 93.236 173.604 93.236L41.126 93.236ZM107.647 202.233C90.133 202.233 75.134 197.854 62.65 189.098C50.165 180.34 43.922 167.951 43.922 151.927C43.922 135.532 50.165 123.047 62.65 114.477C75.134 105.907 90.133 101.621 107.647 101.621C125.533 101.621 140.719 105.907 153.202 114.477C165.684 123.047 171.927 135.532 171.927 151.927C171.927 168.323 165.684 180.806 153.202 189.378C140.719 197.948 125.533 202.233 107.647 202.233ZM89.202 292.225C82.866 292.225 77.557 290.081 73.271 285.797C68.985 281.511 66.843 276.202 66.843 269.866L66.843 228.504C66.843 224.405 68.334 220.958 71.314 218.163C74.295 215.369 77.836 213.971 81.935 213.971C86.034 213.971 89.481 215.369 92.275 218.163C95.07 220.958 96.468 224.405 96.468 228.504L96.468 267.63L231.734 267.63C235.089 267.63 237.977 268.841 240.398 271.264C242.82 273.686 244.032 276.574 244.032 279.928C244.032 283.281 242.82 286.169 240.398 288.592C237.977 291.014 235.089 292.225 231.734 292.225L89.202 292.225ZM218.319 233.534C214.221 233.534 210.773 232.137 207.979 229.343C205.184 226.547 203.787 223.1 203.787 219.001L203.787 51.315C203.787 47.216 205.184 43.863 207.979 41.253C210.773 38.645 214.221 37.341 218.319 37.341C222.418 37.341 225.773 38.645 228.381 41.253C230.99 43.863 232.293 47.216 232.293 51.315L232.293 121.184L258.565 121.184C261.918 121.184 264.806 122.395 267.228 124.818C269.651 127.24 270.862 130.128 270.862 133.481C270.862 136.835 269.651 139.723 267.228 142.145C264.806 144.567 261.918 145.779 258.565 145.779L232.852 145.779L232.852 219.001C232.852 223.1 231.456 226.547 228.661 229.343C225.865 232.137 222.418 233.534 218.319 233.534ZM436.872 159.194C428.301 160.312 420.383 161.615 413.116 163.106C405.85 164.596 399.048 166.273 392.715 168.137C383.326 171.057 375.252 174.387 368.492 178.125C367.463 178.073 366.421 178.048 365.368 178.048C353.422 178.048 342.787 181.978 333.459 189.838C324.135 197.698 318.004 206.968 315.068 217.658L297.695 217.658C297.692 217.362 297.691 217.064 297.691 216.766C297.691 197.389 303.84 181.552 316.138 169.254C328.435 156.957 348.184 147.082 375.386 139.631C383.956 137.394 393.366 135.345 403.614 133.481C413.861 131.618 424.948 129.941 436.872 128.451C436.127 110.937 432.028 98.174 424.574 90.163C417.122 82.151 405.57 78.144 389.919 78.144C382.094 78.144 374.455 79.263 367.002 81.499C359.55 83.734 350.793 87.46 340.731 92.677C336.26 95.286 331.602 96.032 326.757 94.914C321.913 93.796 318.187 91 315.579 86.529C312.97 82.058 312.411 77.306 313.902 72.276C315.392 67.245 318.373 63.426 322.845 60.818C334.396 54.482 346.787 49.358 360.015 45.446C373.244 41.533 386.752 39.577 400.54 39.577C426.996 39.577 447.12 47.775 460.907 64.171C474.695 80.566 481.588 104.416 481.588 135.717L481.588 239.62C480.018 234.941 477.344 230.765 473.566 227.088C467.099 220.798 459.327 217.658 450.251 217.658L436.872 217.658L436.872 159.194Z"
-        android:fillColor="#000000" />
-    <path
-        android:pathData="M283.3 417.225L448.866 417.225L448.866 366.6C448.866 364.265 449.459 362.036 450.62 359.914C451.783 357.789 453.542 356.199 455.874 355.137L463.203 351.634C466.594 349.937 469.305 347.601 471.317 344.63C473.334 341.658 474.34 338.261 474.34 334.44C474.34 330.832 473.334 327.489 471.317 324.411C469.305 321.333 466.594 318.944 463.203 317.247L456.192 314.062C453.861 313.001 452.055 311.463 450.777 309.446C449.5 307.429 448.866 305.147 448.866 302.599L448.866 251.657L398.873 251.657C395.695 251.657 392.881 250.643 390.442 248.631C388.003 246.613 386.562 244.016 386.141 240.827L384.544 230.001C383.92 225.331 381.84 221.404 378.334 218.22C374.841 215.037 370.759 213.443 366.077 213.443C361.2 213.443 357.007 215.037 353.501 218.22C349.995 221.404 347.936 225.331 347.29 230.001L345.701 240.827C345.279 244.016 343.852 246.613 341.407 248.631C338.969 250.643 336.148 251.657 332.968 251.657L283.3 251.657L283.3 279.039C295.183 283.495 304.52 290.713 311.321 300.689C318.109 310.666 321.499 321.916 321.499 334.44C321.499 347.177 318.109 358.534 311.321 368.509C304.52 378.486 295.183 385.704 283.3 390.162L283.3 417.225ZM283.3 442.699C276.085 442.699 270.03 440.258 265.146 435.376C260.259 430.493 257.821 424.444 257.821 417.225L257.821 377.425C257.821 375.09 258.671 373.022 260.369 371.216C262.075 369.411 264.085 368.298 266.423 367.872C274.691 366.176 281.703 362.301 287.439 356.252C293.165 350.201 296.034 342.931 296.034 334.44C296.034 326.162 293.165 319.051 287.439 313.108C281.703 307.164 274.691 303.236 266.423 301.325C264.085 300.689 262.075 299.468 260.369 297.664C258.671 295.86 257.821 293.79 257.821 291.455L257.821 251.657C257.821 244.65 260.316 238.651 265.301 233.662C270.295 228.673 276.294 226.183 283.3 226.183L322.144 226.183C323.626 215.357 328.511 206.283 336.787 198.956C345.068 191.633 354.832 187.973 366.077 187.973C377.118 187.973 386.781 191.633 395.062 198.956C403.331 206.283 408.325 215.357 410.024 226.183L448.866 226.183C455.874 226.183 461.872 228.673 466.859 233.662C471.854 238.651 474.34 244.65 474.34 251.657L474.34 294.321C481.983 298.142 488.138 303.661 492.807 310.878C497.482 318.096 499.812 325.95 499.812 334.44C499.812 343.143 497.482 351.103 492.807 358.32C488.138 365.537 481.983 370.951 474.34 374.56L474.34 417.225C474.34 424.444 471.854 430.493 466.859 435.376C461.872 440.258 455.874 442.699 448.866 442.699L283.3 442.699ZM378.817 334.44Z"
-        android:fillColor="#000000" />
-</vector>

app/src/main/res/drawable/quick_novel_icon.xml

@@ -1,23 +1,31 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1000"
-    android:viewportHeight="1000">
-    <group android:scaleX="1"
-        android:scaleY="1"
-        android:translateX="0"
-        android:translateY="0">
-        <path
-            android:pathData="M491.9,400a19,19 0,0 0,-7 -14.7c-28.8,-23.5 -77.2,-55.2 -141.1,-64.5A254.4,254.4 0,0 0,261 322.4a19,19 0,0 0,-15.6 18.8l0.3,289.7a19.1,19.1 0,0 0,22.1 18.8,254 254,0 0,1 76.4,-0.6c49.2,7.1 89.3,27.6 118.2,47.4a19.1,19.1 0,0 0,29.8 -15.8Z"
-            android:fillColor="#3e80ef"/>
-        <path
-            android:pathData="M491.9,381a19.1,19.1 0,0 0,-7 -14.7c-28.8,-23.5 -77.2,-55.2 -141.1,-64.5a254.4,254.4 0,0 0,-82.8 1.7,19 19,0 0,0 -15.6,18.8l0.3,289.7a19.1,19.1 0,0 0,22 18.8,254 254,0 0,1 76.4,-0.6c49.2,7.1 89.3,27.6 118.2,47.4A19.1,19.1 0,0 0,492.2 661.8Z"
-            android:fillColor="#1f4adc"/>
-        <path
-            android:pathData="M508.9,398.5a19,19 0,0 1,7 -14.7c28.8,-23.5 77.1,-55.2 140.9,-64.5a253.8,253.8 0,0 1,82.7 1.7A19.1,19.1 0,0 1,755 339.7l-0.3,289.7a19.1,19.1 0,0 1,-22.1 18.8,253.3 253.3,0 0,0 -76.2,-0.6c-49.1,7.1 -89.1,27.6 -118,47.3a19.1,19.1 0,0 1,-29.9 -15.8Z"
-            android:fillColor="#3e80ef"/>
-        <path
-            android:pathData="M508.9,381a19,19 0,0 1,7 -14.7C544.6,342.8 593,311 656.8,301.8a253.5,253.5 0,0 1,82.7 1.7A19,19 0,0 1,755 322.2l-0.3,289.7a19.1,19.1 0,0 1,-22.1 18.8,253.3 253.3,0 0,0 -76.2,-0.6c-49.1,7.1 -89.1,27.6 -118,47.3a19.1,19.1 0,0 1,-29.8 -15.8Z"
-            android:fillColor="#1f4adc"/>
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="108"
+        android:viewportHeight="108"
+        android:name="vector"
+        android:tint="?attr/white"
+>
+    <!-- ScaleX = 108/24 -->
+    <group
+            android:scaleX="0.22"
+            android:scaleY="0.22"
+    >
+        <path android:name="path"
+              android:pathData="M 475.35 304.28 C 432.112 306.219 389.584 315.994 349.84 333.13 C 311.168 349.86 275.547 372.909 244.44 401.33 L 244.44 97.04 C 275.547 68.619 311.168 45.57 349.84 28.84 C 389.589 11.727 432.116 1.968 475.35 0.04 L 475.35 304.28"
+              android:fillColor="@color/white"
+              android:strokeWidth="1"/>
+        <path android:name="path_1"
+              android:pathData="M 348.22 364.24 C 310.074 381.02 275.008 404.073 244.48 432.44 L 244.48 411.44 C 275.006 383.062 310.072 359.999 348.22 343.21 M 348.22 364.24 C 387.267 347.125 429.132 337.342 471.72 335.38 L 471.72 314.38 C 429.134 316.333 387.269 326.106 348.22 343.21"
+              android:fillColor="@color/white"
+              android:strokeWidth="1"/>
+        <path android:name="path_2"
+              android:pathData="M 127.44 364.24 C 165.5 381.028 200.476 404.082 230.91 432.44 L 230.91 411.44 C 200.476 383.082 165.5 360.028 127.44 343.24 M 127.44 364.24 C 88.492 347.123 46.718 337.339 4.22 335.38 L 4.22 314.38 C 46.718 316.339 88.492 326.123 127.44 343.24"
+              android:fillColor="@color/white"
+              android:strokeWidth="1"/>
+        <path android:name="path_3"
+              android:pathData="M 0 304.28 C 43.238 306.218 85.766 315.994 125.51 333.13 C 164.182 349.86 199.803 372.909 230.91 401.33 L 230.91 97.04 C 199.803 68.619 164.182 45.57 125.51 28.84 C 85.761 11.725 43.234 1.967 0 0.04 L 0 304.28"
+              android:fillColor="@color/white"
+              android:strokeWidth="1"/>
     </group>
-</vector>
+</vector>

app/src/main/res/drawable/responsive_layout_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M120,840L120,320L320,320L320,120L840,120L840,840L120,840ZM640,760L760,760L760,200L400,200L400,320L640,320L640,760ZM400,760L560,760L560,400L400,400L400,760ZM200,760L320,760L320,400L200,400L200,760ZM640,320L640,320L640,320L640,320L640,400L640,400L640,400L640,400L640,400L640,400L640,400L640,400L640,320L640,320ZM320,400L320,400L320,400L320,400ZM560,400L560,400L560,400L560,400ZM640,320L640,320L640,320L640,320L640,320L640,320Z"/>
-</vector>

app/src/main/res/drawable/restore_page_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M388,430Q405,412 429,401Q453,390 480,390Q534,390 572,428Q610,466 610,520Q610,574 572,612Q534,650 480,650Q444,650 414.5,632Q385,614 368,585Q362,574 350.5,570.5Q339,567 328,572Q316,577 311.5,589.5Q307,602 314,613Q338,657 382,683.5Q426,710 480,710Q558,710 614,654Q670,598 670,520Q670,442 614,386Q558,330 480,330Q442,330 409,344Q376,358 350,382L350,350Q350,337 341.5,328.5Q333,320 320,320Q307,320 298.5,328.5Q290,337 290,350L290,460Q290,473 298.5,481.5Q307,490 320,490L430,490Q443,490 451.5,481.5Q460,473 460,460Q460,447 451.5,438.5Q443,430 430,430L388,430ZM240,880Q207,880 183.5,856.5Q160,833 160,800L160,160Q160,127 183.5,103.5Q207,80 240,80L527,80Q543,80 557.5,86Q572,92 583,103L777,297Q788,308 794,322.5Q800,337 800,353L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM240,800L720,800Q720,800 720,800Q720,800 720,800L720,354L526,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800ZM240,800Q240,800 240,800Q240,800 240,800L240,160Q240,160 240,160Q240,160 240,160L240,160L240,354L240,800Q240,800 240,800Q240,800 240,800Z"/>
-</vector>

app/src/main/res/drawable/save_as_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L647,120Q663,120 677.5,126Q692,132 703,143L817,257Q828,268 834,282.5Q840,297 840,313L840,440Q840,457 828.5,468.5Q817,480 800,480Q783,480 771.5,468.5Q760,457 760,440L760,313L647,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L400,760Q417,760 428.5,771.5Q440,783 440,800Q440,817 428.5,828.5Q417,840 400,840L200,840ZM200,200L200,313L200,482Q200,485 200,494.5Q200,504 200,519L200,760L200,760L200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200ZM520,880L520,814Q520,806 523,798.5Q526,791 532,785L741,577Q750,568 761,564Q772,560 783,560Q795,560 806,564.5Q817,569 826,578L863,615Q871,624 875.5,635Q880,646 880,657Q880,668 876,679.5Q872,691 863,700L655,908Q649,914 641.5,917Q634,920 626,920L560,920Q543,920 531.5,908.5Q520,897 520,880ZM820,657L820,657L783,620L783,620L820,657ZM580,860L618,860L739,738L721,719L702,701L580,822L580,860ZM721,719L702,701L702,701L739,738L739,738L721,719ZM280,400L560,400Q577,400 588.5,388.5Q600,377 600,360L600,280Q600,263 588.5,251.5Q577,240 560,240L280,240Q263,240 251.5,251.5Q240,263 240,280L240,360Q240,377 251.5,388.5Q263,400 280,400ZM480,720Q481,720 482,720Q483,720 484,720L600,605Q600,603 600,602.5Q600,602 600,600Q600,550 565,515Q530,480 480,480Q430,480 395,515Q360,550 360,600Q360,650 395,685Q430,720 480,720Z"/>
-</vector>

app/src/main/res/drawable/save_clock_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M200,760L200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200L200,200L200,314L200,403Q200,401 200,400.5Q200,400 200,400Q200,400 200,481.5Q200,563 200,679Q200,700 200,720Q200,740 200,760ZM200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L647,120Q663,120 677.5,126Q692,132 703,143L817,257Q828,268 834,282.5Q840,297 840,313L840,375Q840,392 828.5,403.5Q817,415 800,415Q783,415 771.5,403.5Q760,392 760,375L760,314L646,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L432,760Q449,760 460.5,771.5Q472,783 472,800Q472,817 460.5,828.5Q449,840 432,840L200,840ZM578.5,821.5Q520,763 520,680Q520,597 578.5,538.5Q637,480 720,480Q803,480 861.5,538.5Q920,597 920,680Q920,763 861.5,821.5Q803,880 720,880Q637,880 578.5,821.5ZM740,672L740,580Q740,572 734,566Q728,560 720,560Q712,560 706,566Q700,572 700,580L700,671Q700,679 703,686.5Q706,694 712,700L773,761Q779,767 787,767Q795,767 801,761Q807,755 807,747Q807,739 801,733L740,672ZM280,400L560,400Q577,400 588.5,388.5Q600,377 600,360L600,280Q600,263 588.5,251.5Q577,240 560,240L280,240Q263,240 251.5,251.5Q240,263 240,280L240,360Q240,377 251.5,388.5Q263,400 280,400ZM442,714Q441,705 440.5,696.5Q440,688 440,679Q440,625 460,575Q480,525 518,486Q509,483 499.5,481.5Q490,480 480,480Q430,480 395,515Q360,550 360,600Q360,639 382.5,670.5Q405,702 442,714Z"/>
-</vector>

app/src/main/res/drawable/screen_rotation_alt_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M487,856L219,589Q213,583 210,576Q207,569 207,561Q207,545 218,532.5Q229,520 247,520Q255,520 262.5,523Q270,526 276,532L544,800Q544,800 544,800Q544,800 544,800L744,600L680,600Q663,600 651.5,588.5Q640,577 640,560Q640,543 651.5,531.5Q663,520 680,520L840,520Q857,520 868.5,531.5Q880,543 880,560L880,720Q880,737 868.5,748.5Q857,760 840,760Q823,760 811.5,748.5Q800,737 800,720L800,656L600,856Q589,867 574.5,873Q560,879 544,879Q529,879 514,873Q499,867 487,856ZM120,440Q103,440 91.5,428.5Q80,417 80,400L80,240Q80,223 91.5,211.5Q103,200 120,200Q137,200 148.5,211.5Q160,223 160,240L160,304L360,104Q372,92 387,86.5Q402,81 417,81Q433,81 447.5,86.5Q462,92 473,104L741,371Q747,377 750,384Q753,391 753,399Q753,415 742,427.5Q731,440 713,440Q705,440 697.5,437Q690,434 684,428L416,160Q416,160 416,160Q416,160 416,160L216,360L280,360Q297,360 308.5,371.5Q320,383 320,400Q320,417 308.5,428.5Q297,440 280,440L120,440Z"/>
-</vector>

app/src/main/res/drawable/shuffle_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M560,800L560,720L664,720L537,593L594,536L720,662L720,560L800,560L800,800L560,800ZM216,800L160,744L664,240L560,240L560,160L800,160L800,400L720,400L720,296L216,800ZM367,423L160,216L216,160L423,367L367,423Z"/>
-</vector>

app/src/main/res/drawable/skip_next_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M660,720L660,240L740,240L740,720L660,720ZM220,720L220,240L580,480L220,720ZM300,480L300,480L300,480ZM300,570L436,480L300,390L300,570Z"/>
-</vector>

app/src/main/res/drawable/subtitles_gear_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M634,768L628,740Q616,735 605.5,729.5Q595,724 584,716L555,725Q542,729 529.5,724Q517,719 510,708L502,694Q495,682 497,668Q499,654 510,645L532,626Q530,612 530,600Q530,588 532,574L510,555Q499,546 497,532.5Q495,519 502,507L511,492Q518,481 530,476Q542,471 555,475L584,484Q595,476 605.5,470.5Q616,465 628,460L634,431Q637,417 647.5,408.5Q658,400 672,400L688,400Q702,400 712.5,409Q723,418 726,432L732,460Q744,465 754.5,471Q765,477 776,486L803,477Q817,472 830,477Q843,482 850,494L858,508Q865,520 863,534Q861,548 850,557L828,576Q830,588 830,601Q830,614 828,626L850,645Q861,654 863,667.5Q865,681 858,693L849,708Q842,719 830,724Q818,729 805,725L776,716Q765,724 754.5,729.5Q744,735 732,740L726,769Q723,783 712.5,791.5Q702,800 688,800L672,800Q658,800 647.5,791Q637,782 634,768ZM160,720L160,720Q160,720 160,720Q160,720 160,720L160,720Q160,540 160,442.5Q160,345 160,300Q160,255 160,247.5Q160,240 160,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720Q160,720 160,720Q160,720 160,720Q160,720 160,720Q160,720 160,720ZM429,478Q440,455 454,436Q468,417 486,400L440,400Q423,400 411.5,411.5Q400,423 400,440Q400,454 408,464Q416,474 429,478ZM404,640Q402,630 401.5,620.5Q401,611 401,600Q401,589 401.5,579.5Q402,570 404,560L280,560Q263,560 251.5,571.5Q240,583 240,600Q240,617 251.5,628.5Q263,640 280,640L404,640ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,337Q880,354 868.5,365.5Q857,377 840,377Q823,377 811.5,365.5Q800,354 800,337L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720L417,720Q434,720 445.5,731.5Q457,743 457,760Q457,777 445.5,788.5Q434,800 417,800L160,800ZM680,680Q713,680 736.5,656.5Q760,633 760,600Q760,567 736.5,543.5Q713,520 680,520Q647,520 623.5,543.5Q600,567 600,600Q600,633 623.5,656.5Q647,680 680,680ZM308.5,468.5Q320,457 320,440Q320,423 308.5,411.5Q297,400 280,400Q263,400 251.5,411.5Q240,423 240,440Q240,457 251.5,468.5Q263,480 280,480Q297,480 308.5,468.5Z"/>
-</vector>

app/src/main/res/drawable/swipe_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M311,131Q230,162 164,220L250,220Q263,220 271.5,228.5Q280,237 280,250Q280,263 271.5,271.5Q263,280 250,280L120,280Q103,280 91.5,268.5Q80,257 80,240L80,110Q80,97 88.5,88.5Q97,80 110,80Q123,80 131.5,88.5Q140,97 140,110L140,161Q212,102 299,71Q386,40 480,40Q574,40 661,71Q748,102 820,161L820,110Q820,97 828.5,88.5Q837,80 850,80Q863,80 871.5,88.5Q880,97 880,110L880,240Q880,257 868.5,268.5Q857,280 840,280L710,280Q697,280 688.5,271.5Q680,263 680,250Q680,237 688.5,228.5Q697,220 710,220L796,220Q730,162 649,131Q568,100 480,100Q392,100 311,131ZM473,880Q449,880 427,871Q405,862 388,845L212,668Q201,657 200.5,640.5Q200,624 211,612L214,609Q230,593 251.5,587.5Q273,582 294,588L360,607L360,280Q360,263 371.5,251.5Q383,240 400,240Q417,240 428.5,251.5Q440,263 440,280L440,660Q440,680 424,692Q408,704 389,699L343,686L445,788Q450,793 457.5,796.5Q465,800 473,800L640,800Q673,800 696.5,776.5Q720,753 720,720L720,560Q720,543 731.5,531.5Q743,520 760,520Q777,520 788.5,531.5Q800,543 800,560L800,720Q800,786 753,833Q706,880 640,880L473,880ZM548.5,411.5Q560,423 560,440L560,560Q560,577 548.5,588.5Q537,600 520,600L520,600Q503,600 491.5,588.5Q480,577 480,560L480,440Q480,423 491.5,411.5Q503,400 520,400Q537,400 548.5,411.5ZM668.5,451.5Q680,463 680,480L680,560Q680,577 668.5,588.5Q657,600 640,600L640,600Q623,600 611.5,588.5Q600,577 600,560L600,480Q600,463 611.5,451.5Q623,440 640,440Q657,440 668.5,451.5ZM571,680L571,680L571,680Q571,680 571,680Q571,680 571,680L571,680Q571,680 571,680Q571,680 571,680L571,680L571,680Q571,680 571,680Q571,680 571,680Z"/>
-</vector>

app/src/main/res/drawable/swipe_vertical_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M161,820Q102,748 71,661Q40,574 40,480Q40,386 71,299Q102,212 161,140L110,140Q97,140 88.5,131.5Q80,123 80,110Q80,97 88.5,88.5Q97,80 110,80L240,80Q257,80 268.5,91.5Q280,103 280,120L280,250Q280,263 271.5,271.5Q263,280 250,280Q237,280 228.5,271.5Q220,263 220,250L220,164Q162,230 131,311Q100,392 100,480Q100,568 131,649Q162,730 220,796L220,710Q220,697 228.5,688.5Q237,680 250,680Q263,680 271.5,688.5Q280,697 280,710L280,840Q280,857 268.5,868.5Q257,880 240,880L110,880Q97,880 88.5,871.5Q80,863 80,850Q80,837 88.5,828.5Q97,820 110,820L161,820ZM658,833Q635,841 611.5,840.5Q588,840 566,829L340,724Q325,717 319,701.5Q313,686 320,671L322,667Q332,647 350,634.5Q368,622 390,620L458,615L346,308Q340,292 347,277.5Q354,263 370,257Q386,251 400.5,258Q415,265 421,281L551,638Q558,657 547,673.5Q536,690 516,692L469,695L600,756Q607,759 615,759.5Q623,760 630,758L787,701Q818,690 832,659.5Q846,629 835,598L780,448Q774,432 781,417.5Q788,403 804,397Q820,391 834.5,398Q849,405 855,421L910,571Q933,634 905.5,693.5Q878,753 815,776L658,833ZM514,417Q508,401 515,386.5Q522,372 538,366Q554,360 568.5,367Q583,374 589,390L630,502Q636,518 629,533Q622,548 606,554L606,554Q590,560 575,553Q560,546 554,530L514,417ZM640,414Q634,398 641,383.5Q648,369 664,363Q680,357 694.5,364Q709,371 715,387L742,462Q748,478 741.5,492.5Q735,507 719,513L719,513Q703,519 688,512Q673,505 667,489L640,414ZM689,605L689,605L689,605Q689,605 689,605Q689,605 689,605L689,605Q689,605 689,605Q689,605 689,605L689,605L689,605Q689,605 689,605Q689,605 689,605Z"/>
-</vector>

app/src/main/res/drawable/tooltip_24px.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M480,880L373,720L160,720Q127,720 103.5,696.5Q80,673 80,640L80,160Q80,127 103.5,103.5Q127,80 160,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L587,720L480,880ZM480,736L544,640L800,640Q800,640 800,640Q800,640 800,640L800,160Q800,160 800,160Q800,160 800,160L160,160Q160,160 160,160Q160,160 160,160L160,640Q160,640 160,640Q160,640 160,640L416,640L480,736ZM480,400L480,400L480,400Q480,400 480,400Q480,400 480,400L480,400Q480,400 480,400Q480,400 480,400L480,400Q480,400 480,400Q480,400 480,400L480,400Q480,400 480,400Q480,400 480,400L480,400Z"/>
-</vector>