From 6baeadf55e108aeed1a3557ae5213e450f5b5ede Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Fri, 16 Sep 2022 17:01:16 +0200
Subject: [PATCH 001/273] let extensions patch all resources

---
 .../lagradost/cloudstream3/AcraApplication.kt |  2 +
 .../lagradost/cloudstream3/MainActivity.kt    | 22 ++++-
 .../lagradost/cloudstream3/plugins/Plugin.kt  | 12 +++
 .../cloudstream3/plugins/PluginManager.kt     |  2 +
 .../ui/player/DownloadedPlayerActivity.kt     | 16 +++-
 .../cloudstream3/ui/settings/SettingsUI.kt    | 24 ++++++
 .../utils/resources/MapResourcePatch.kt       | 47 +++++++++++
 .../utils/resources/ResourcePackManager.kt    | 66 +++++++++++++++
 .../utils/resources/ResourcePatch.kt          | 80 +++++++++++++++++++
 .../utils/resources/ResourcePatchActivity.kt  |  5 ++
 app/src/main/res/values/strings.xml           |  2 +
 app/src/main/res/xml/settins_ui.xml           |  4 +
 12 files changed, 277 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/resources/MapResourcePatch.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePackManager.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePatch.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePatchActivity.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
index 85f031b3..f343bb0c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
@@ -18,6 +18,7 @@ import com.lagradost.cloudstream3.utils.DataStore.getKeys
 import com.lagradost.cloudstream3.utils.DataStore.removeKey
 import com.lagradost.cloudstream3.utils.DataStore.removeKeys
 import com.lagradost.cloudstream3.utils.DataStore.setKey
+import com.lagradost.cloudstream3.utils.resources.ResourcePackManager
 import kotlinx.coroutines.runBlocking
 import org.acra.ACRA
 import org.acra.ReportField
@@ -79,6 +80,7 @@ class ExceptionHandler(val errorFile: File, val onError: (() -> Unit)): Thread.U
         ACRA.errorReporter.handleException(error)
         try {
             PrintStream(errorFile).use { ps ->
+                ps.println(String.format("Enabled resource pack: ${ResourcePackManager.activePackId ?: "none"}"))
                 ps.println(String.format("Currently loading extension: ${PluginManager.currentlyLoading ?: "none"}"))
                 ps.println(String.format("Fatal exception on thread %s (%d)", thread.name, thread.id))
                 error.printStackTrace(ps)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 6c9fadd8..9bc36847 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -4,13 +4,13 @@ import android.content.ComponentName
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.Configuration
+import android.content.res.Resources
 import android.os.Bundle
 import android.util.Log
 import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
 import android.view.WindowManager
-import android.widget.Toast
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
@@ -59,6 +59,9 @@ import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSet
 import com.lagradost.cloudstream3.ui.settings.SettingsGeneral
 import com.lagradost.cloudstream3.ui.setup.HAS_DONE_SETUP_KEY
 import com.lagradost.cloudstream3.ui.setup.SetupFragmentExtensions
+import com.lagradost.cloudstream3.utils.Event
+import com.lagradost.cloudstream3.utils.IOnBackPressed
+import com.lagradost.cloudstream3.utils.resources.ResourcePatch
 import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
 import com.lagradost.cloudstream3.utils.AppUtils.loadCache
 import com.lagradost.cloudstream3.utils.AppUtils.loadRepository
@@ -70,8 +73,6 @@ import com.lagradost.cloudstream3.utils.DataStore.removeKey
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.DataStoreHelper.migrateResumeWatching
 import com.lagradost.cloudstream3.utils.DataStoreHelper.setViewPos
-import com.lagradost.cloudstream3.utils.Event
-import com.lagradost.cloudstream3.utils.IOnBackPressed
 import com.lagradost.cloudstream3.utils.InAppUpdater.Companion.runAutoUpdate
 import com.lagradost.cloudstream3.utils.UIHelper.changeStatusBarState
 import com.lagradost.cloudstream3.utils.UIHelper.checkWrite
@@ -82,6 +83,8 @@ import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
 import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
 import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
+import com.lagradost.cloudstream3.utils.resources.ResourcePackManager
+import com.lagradost.cloudstream3.utils.resources.ResourcePatchActivity
 import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.ResponseParser
 import kotlinx.android.synthetic.main.activity_main.*
@@ -133,7 +136,18 @@ var app = Requests(responseParser = object : ResponseParser {
     defaultHeaders = mapOf("user-agent" to USER_AGENT)
 }
 
-class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
+class MainActivity : AppCompatActivity(), ColorPickerDialogListener, ResourcePatchActivity {
+    private var resourcePatch: ResourcePatch? = null
+
+    override fun getResources(): Resources = resourcePatch ?: super.getResources()
+    override fun reloadResourcePatch() {
+        resourcePatch = try {
+            ResourcePackManager.activePack?.invoke(super.getResources())
+        } catch (e: Throwable) {
+            null
+        }
+    }
+
     companion object {
         const val TAG = "MAINACT"
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt
index 242baf59..ec845d2c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt
@@ -9,6 +9,8 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.extractorApis
 import android.util.Log
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.utils.resources.ResourcePackManager
+import com.lagradost.cloudstream3.utils.resources.ResourcePatch
 
 const val PLUGIN_TAG = "PluginInstance"
 
@@ -50,6 +52,16 @@ abstract class Plugin {
         extractorApis.add(element)
     }
 
+    /**
+     * Used to register a new resource pack
+     * @param factory The function that provided the original resources will generate a ResourcePatch instance
+     * You should probably use MapResourcePatch
+     * @see com.lagradost.cloudstream3.utils.resources.MapResourcePatch
+     */
+    fun registerResourcePack(name: String, factory: (Resources) -> ResourcePatch) {
+        ResourcePackManager.registerPack(name, factory, this.__filename)
+    }
+
     class Manifest {
         @JsonProperty("name") var name: String? = null
         @JsonProperty("pluginClassName") var pluginClassName: String? = null
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index b5441b94..29603a5f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -27,6 +27,7 @@ import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIE
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.extractorApis
+import com.lagradost.cloudstream3.utils.resources.ResourcePackManager
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import org.acra.log.debug
@@ -376,6 +377,7 @@ object PluginManager {
         }
         APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.__filename }
         extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.__filename }
+        ResourcePackManager.unregisterPlugin(plugin.__filename)
 
         classLoaders.values.removeIf { v -> v == plugin }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
index dc1bbba3..0d9c819c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.ui.player
 
 import android.content.Intent
+import android.content.res.Resources
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
@@ -11,10 +12,13 @@ import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.utils.ExtractorUri
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
+import com.lagradost.cloudstream3.utils.resources.ResourcePackManager
+import com.lagradost.cloudstream3.utils.resources.ResourcePatch
+import com.lagradost.cloudstream3.utils.resources.ResourcePatchActivity
 
 const val DTAG = "PlayerActivity"
 
-class DownloadedPlayerActivity : AppCompatActivity() {
+class DownloadedPlayerActivity : AppCompatActivity(), ResourcePatchActivity {
     override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
         CommonActivity.dispatchKeyEvent(this, event)?.let {
             return it
@@ -106,4 +110,14 @@ class DownloadedPlayerActivity : AppCompatActivity() {
             return
         }
     }
+
+    private var resourcePatch: ResourcePatch? = null
+    override fun getResources(): Resources = resourcePatch ?: super.getResources()
+    override fun reloadResourcePatch() {
+        resourcePatch = try {
+            ResourcePackManager.activePack?.invoke(super.getResources())
+        } catch (e: Throwable) {
+            null
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
index 9ad3ee8f..b01d900e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
+import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchQuality
 import com.lagradost.cloudstream3.mvvm.logError
@@ -16,6 +17,8 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
+import com.lagradost.cloudstream3.utils.resources.ResourcePackManager
+import kotlin.streams.toList
 
 class SettingsUI : PreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -130,6 +133,27 @@ class SettingsUI : PreferenceFragmentCompat() {
             }
             return@setOnPreferenceClickListener true
         }
+        getPref(R.string.active_resource_pack_key)?.setOnPreferenceClickListener {
+            val prefNames = ResourcePackManager.packs.keys.toMutableList()
+            prefNames.add(0, getString(R.string.none))
+            val prefValues: MutableList<String?> = ResourcePackManager.packs.keys.toMutableList()
+            prefValues.add(0, null)
+
+            activity?.showDialog(
+                prefNames.toList(),
+                prefValues.indexOf(ResourcePackManager.activePackId),
+                getString(R.string.resource_pack),
+                true,
+                {}) {
+                try {
+                    ResourcePackManager.selectPack(prefValues[it], activity as MainActivity)
+                    activity?.recreate()
+                } catch (e: Exception) {
+                    logError(e)
+                }
+            }
+            return@setOnPreferenceClickListener true
+        }
 
         getPref(R.string.pref_filter_search_quality_key)?.setOnPreferenceClickListener {
             val names = enumValues<SearchQuality>().sorted().map { it.name }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/resources/MapResourcePatch.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/resources/MapResourcePatch.kt
new file mode 100644
index 00000000..732a95cc
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/resources/MapResourcePatch.kt
@@ -0,0 +1,47 @@
+package com.lagradost.cloudstream3.utils.resources
+
+import android.content.res.ColorStateList
+import android.content.res.Resources
+import android.content.res.XmlResourceParser
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.util.Log
+import androidx.annotation.RequiresApi
+
+typealias Generator<T> = () -> T?
+typealias GeneratorWithTheme<T> = (Resources.Theme?) -> T?
+
+open class MapResourcePatch(private val original: Resources): ResourcePatch(original) {
+    val mapping: HashMap<Int, Any> = hashMapOf()
+    val idMapping: HashMap<Int, Int> = hashMapOf()
+
+    override fun mapId(id: Int): Int =
+        idMapping[id] ?: super.mapId(id)
+
+    override fun getLayout(id: Int): XmlResourceParser =
+        mapping.getMappingKA(id, null) ?: super.getLayout(id)
+
+    override fun getDrawable(id: Int, theme: Theme?): Drawable =
+        mapping.getMappingKA(id, theme) ?: super.getDrawable(id, theme)
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun getColorStateList(id: Int, theme: Theme?): ColorStateList =
+        mapping.getMappingKA(id, theme) ?: super.getColorStateList(id, theme)
+
+    override fun getXml(id: Int): XmlResourceParser =
+        mapping.getMappingKA(id, null) ?: super.getXml(id)
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun getColor(id: Int, theme: Theme?): Int =
+        mapping.getMappingKA(id, theme) ?: super.getColor(id, theme)
+}
+
+private inline fun <K, reified V> HashMap<K, Any>.getMappingKA(id: K?, theme: Resources.Theme?): V? {
+    return when (val res = this[id]) {
+        equals(null) -> null
+        is V -> res
+        is Function0<*> -> (res as? Generator<V>)?.invoke()
+        is Function1<*, *> -> (res as? GeneratorWithTheme<V>)?.invoke(theme)
+        else -> null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePackManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePackManager.kt
new file mode 100644
index 00000000..f9d8c31c
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePackManager.kt
@@ -0,0 +1,66 @@
+package com.lagradost.cloudstream3.utils.resources
+
+import android.content.res.Resources
+import android.util.Log
+import com.lagradost.cloudstream3.AcraApplication
+import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
+import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
+import com.lagradost.cloudstream3.R
+
+typealias PatchFactory = (Resources) -> ResourcePatch
+
+object ResourcePackManager {
+    private const val KEY = "ResourcePackManager"
+    const val SETTINGS_KEY = "active_resource_pack_key" // TODO
+    val packs: HashMap<String, PatchFactory> = hashMapOf()
+    private val pluginMapping: HashMap<String, ArrayList<String>> = hashMapOf()
+    var activePackId: String? = null
+        internal set
+    val activePack: PatchFactory?
+        get() = if (activePackId == null) null else packs[activePackId]
+
+    init {
+        afterPluginsLoadedEvent += ::onExtensionsLoaded
+    }
+
+    fun registerPack(name: String, factory: PatchFactory, pluginId: String?) {
+        packs[name] = factory
+        if (pluginId != null) {
+            if (!pluginMapping.containsKey(pluginId))
+                pluginMapping[pluginId] = arrayListOf()
+            pluginMapping[pluginId]?.add(name)
+        }
+    }
+
+    fun unregisterPlugin(pluginId: String?) {
+        pluginMapping[pluginId]?.forEach {
+            packs.remove(it)
+            if (activePackId == it) // if pack is being removed make sure its not set
+                selectPack(null, AcraApplication.context?.getActivity() as? ResourcePatchActivity)
+        }
+        pluginMapping.remove(pluginId)
+    }
+
+    fun selectPack(packId: String?, activity: ResourcePatchActivity?) {
+        if (packId == null) activePackId = null
+        else if (packs.containsKey(packId)) activePackId = packId
+        else activePackId = null
+
+        Log.d(KEY, "Selecting: ${activePackId ?: "none"}")
+        setKey(SETTINGS_KEY, activePackId)
+
+        activity?.reloadResourcePatch()
+    }
+
+
+    private fun onExtensionsLoaded(successful: Boolean = false) {
+        if (!successful) return
+        activePackId = getKey(SETTINGS_KEY)
+        Log.d(KEY, "Selecting saved: ${activePackId ?: "none"}")
+        val activity = AcraApplication.context?.getActivity() as? ResourcePatchActivity
+        activity?.reloadResourcePatch()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePatch.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePatch.kt
new file mode 100644
index 00000000..71bcbb2c
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePatch.kt
@@ -0,0 +1,80 @@
+package com.lagradost.cloudstream3.utils.resources
+
+import android.annotation.SuppressLint
+import android.content.res.*
+import android.content.res.loader.ResourcesLoader
+import android.graphics.Typeface
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.os.Bundle
+import android.util.AttributeSet
+import android.util.DisplayMetrics
+import android.util.TypedValue
+import androidx.annotation.RequiresApi
+import java.io.InputStream
+
+open class ResourcePatch(private val original: Resources) :
+    Resources(original.assets, original.displayMetrics, original.configuration) {
+
+    open fun mapId(id: Int): Int = id
+
+    @RequiresApi(Build.VERSION_CODES.R)
+    override fun addLoaders(vararg loaders: ResourcesLoader?) = original.addLoaders(*loaders)
+    override fun getAnimation(id: Int): XmlResourceParser = original.getAnimation(mapId(id))
+    override fun getBoolean(id: Int): Boolean = original.getBoolean(mapId(id))
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun getColor(id: Int, theme: Theme?): Int = original.getColor(mapId(id), theme)
+    override fun getConfiguration(): Configuration = original.configuration
+    override fun getDisplayMetrics(): DisplayMetrics = original.displayMetrics
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun getColorStateList(id: Int, theme: Theme?): ColorStateList = original.getColorStateList(mapId(id), theme)
+    override fun getLayout(id: Int): XmlResourceParser = original.getLayout(mapId(id))
+    override fun getDimension(id: Int): Float = original.getDimension(mapId(id))
+    override fun getIdentifier(name: String?, defType: String?, defPackage: String?): Int = original.getIdentifier(name, defType, defPackage)
+    override fun getDimensionPixelOffset(id: Int): Int = original.getDimensionPixelOffset(mapId(id))
+    override fun getDimensionPixelSize(id: Int): Int = original.getDimensionPixelSize(mapId(id))
+    @SuppressLint("UseCompatLoadingForDrawables")
+    override fun getDrawable(id: Int, theme: Theme?): Drawable = original.getDrawable(mapId(id), theme)
+    override fun getDrawableForDensity(id: Int, density: Int, theme: Theme?): Drawable? = original.getDrawableForDensity(mapId(id), density, theme)
+    @RequiresApi(Build.VERSION_CODES.Q)
+    override fun getFloat(id: Int): Float = original.getFloat(mapId(id))
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun getFont(id: Int): Typeface = original.getFont(mapId(id))
+    override fun getIntArray(id: Int): IntArray = original.getIntArray(mapId(id))
+    override fun getFraction(id: Int, base: Int, pbase: Int): Float = original.getFraction(mapId(id), base, pbase)
+    override fun getInteger(id: Int): Int = original.getInteger(mapId(id))
+    override fun getQuantityString(id: Int, quantity: Int): String = original.getQuantityString(mapId(id), quantity)
+    override fun getQuantityString(id: Int, quantity: Int, vararg formatArgs: Any?): String = original.getQuantityString(mapId(id), quantity, *formatArgs)
+    override fun getQuantityText(id: Int, quantity: Int): CharSequence = original.getQuantityText(mapId(id), quantity)
+    override fun getResourceEntryName(id: Int): String = original.getResourceEntryName(mapId(id))
+    override fun getResourceName(id: Int): String = original.getResourceName(mapId(id))
+    override fun getResourcePackageName(id: Int): String = original.getResourcePackageName(mapId(id))
+    override fun getResourceTypeName(id: Int): String = original.getResourceTypeName(mapId(id))
+    override fun getString(id: Int): String = original.getString(mapId(id))
+    override fun getString(id: Int, vararg formatArgs: Any?): String = original.getString(mapId(id), *formatArgs)
+    override fun getStringArray(id: Int): Array<String> = original.getStringArray(mapId(id))
+    override fun getText(id: Int): CharSequence = original.getText(mapId(id))
+    override fun getText(id: Int, def: CharSequence?): CharSequence = original.getText(mapId(id), def)
+    override fun getTextArray(id: Int): Array<CharSequence> = original.getTextArray(mapId(id))
+    override fun getValue(id: Int, outValue: TypedValue?, resolveRefs: Boolean) = original.getValue(mapId(id), outValue, resolveRefs)
+    override fun getValue(name: String?, outValue: TypedValue?, resolveRefs: Boolean) = original.getValue(name, outValue, resolveRefs)
+    override fun getValueForDensity(id: Int, density: Int, outValue: TypedValue?, resolveRefs: Boolean) = original.getValueForDensity(mapId(id), density, outValue, resolveRefs)
+    override fun getXml(id: Int): XmlResourceParser = original.getXml(mapId(id))
+    override fun obtainTypedArray(id: Int): TypedArray = original.obtainTypedArray(mapId(id))
+    override fun openRawResource(id: Int): InputStream = original.openRawResource(mapId(id))
+    override fun openRawResource(id: Int, value: TypedValue?): InputStream = original.openRawResource(mapId(id), value)
+    override fun openRawResourceFd(id: Int): AssetFileDescriptor = original.openRawResourceFd(mapId(id))
+    override fun obtainAttributes(set: AttributeSet?, attrs: IntArray?): TypedArray = original.obtainAttributes(set, attrs)
+    override fun parseBundleExtra(tagName: String?, attrs: AttributeSet?, outBundle: Bundle?) = original.parseBundleExtra(tagName, attrs, outBundle)
+    override fun parseBundleExtras(parser: XmlResourceParser?, outBundle: Bundle?) = original.parseBundleExtras(parser, outBundle)
+    @RequiresApi(Build.VERSION_CODES.R)
+    override fun removeLoaders(vararg loaders: ResourcesLoader?) = original.removeLoaders(*loaders)
+    override fun equals(other: Any?): Boolean = original == other
+    override fun hashCode(): Int = original.hashCode()
+
+    override fun getColor(id: Int): Int = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) getColor(mapId(id), null) else original.getColor(mapId(id))
+    @SuppressLint("UseCompatLoadingForColorStateLists")
+    override fun getColorStateList(id: Int): ColorStateList = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) getColorStateList(mapId(id), null) else original.getColorStateList(mapId(id))
+    @SuppressLint("UseCompatLoadingForDrawables")
+    override fun getDrawable(id: Int): Drawable = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) getDrawable(mapId(id), null) else original.getDrawable(mapId(id))
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePatchActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePatchActivity.kt
new file mode 100644
index 00000000..dc1200d5
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePatchActivity.kt
@@ -0,0 +1,5 @@
+package com.lagradost.cloudstream3.utils.resources
+
+interface ResourcePatchActivity {
+    fun reloadResourcePatch()
+}
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8e6dadcf..c0008cd1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,6 +41,7 @@
     <string name="app_name_download_path" translatable="false">Cloudstream</string>
     <string name="app_layout_key" translatable="false">app_layout_key</string>
     <string name="primary_color_key" translatable="false">primary_color_key</string>
+    <string name="active_resource_pack_key" translatable="false">active_resource_pack_key</string>
     <string name="restore_key" translatable="false">restore_key</string>
     <string name="backup_key" translatable="false">backup_key</string>
     <string name="prefer_media_type_key" translatable="false">prefer_media_type_key_2</string>
@@ -457,6 +458,7 @@
 
     <string name="primary_color_settings">Primary color</string>
     <string name="app_theme_settings">App theme</string>
+    <string name="resource_pack">Resource pack</string>
     <string name="bottom_title_settings">Poster title location</string>
     <string name="bottom_title_settings_des">Put the title under the poster</string>
 
diff --git a/app/src/main/res/xml/settins_ui.xml b/app/src/main/res/xml/settins_ui.xml
index 071df918..bf92a17d 100644
--- a/app/src/main/res/xml/settins_ui.xml
+++ b/app/src/main/res/xml/settins_ui.xml
@@ -9,6 +9,10 @@
             android:icon="@drawable/ic_baseline_color_lens_24"
             android:key="@string/app_theme_key"
             android:title="@string/app_theme_settings" />
+    <Preference
+        android:icon="@drawable/ic_baseline_extension_24"
+        android:key="@string/active_resource_pack_key"
+        android:title="@string/resource_pack" />
     <Preference
             android:icon="@drawable/ic_baseline_tv_24"
             android:key="@string/app_layout_key"

From c80a8e863e11cb5f05b957ab3297fd118ac5282d Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Fri, 16 Sep 2022 20:16:32 +0200
Subject: [PATCH 002/273] some fixes

---
 .../com/lagradost/cloudstream3/MainActivity.kt  | 17 ++++++++---------
 .../ui/player/DownloadedPlayerActivity.kt       | 14 ++++++--------
 .../cloudstream3/ui/settings/SettingsUI.kt      |  2 +-
 .../utils/resources/MapResourcePatch.kt         |  2 +-
 .../utils/resources/ResourcePackManager.kt      | 15 +++++----------
 5 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 9bc36847..0262cd5a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -84,7 +84,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.requestRW
 import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
 import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 import com.lagradost.cloudstream3.utils.resources.ResourcePackManager
-import com.lagradost.cloudstream3.utils.resources.ResourcePatchActivity
 import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.ResponseParser
 import kotlinx.android.synthetic.main.activity_main.*
@@ -136,16 +135,11 @@ var app = Requests(responseParser = object : ResponseParser {
     defaultHeaders = mapOf("user-agent" to USER_AGENT)
 }
 
-class MainActivity : AppCompatActivity(), ColorPickerDialogListener, ResourcePatchActivity {
+class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
     private var resourcePatch: ResourcePatch? = null
 
-    override fun getResources(): Resources = resourcePatch ?: super.getResources()
-    override fun reloadResourcePatch() {
-        resourcePatch = try {
-            ResourcePackManager.activePack?.invoke(super.getResources())
-        } catch (e: Throwable) {
-            null
-        }
+    override fun getResources(): Resources {
+        return resourcePatch ?: super.getResources()
     }
 
     companion object {
@@ -472,6 +466,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, ResourcePat
     override fun onCreate(savedInstanceState: Bundle?) {
         app.initClient(this)
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+        resourcePatch = try {
+            ResourcePackManager.activePack?.invoke(super.getResources())
+        } catch (e: Throwable) {
+            null
+        }
 
         val errorFile = filesDir.resolve("last_error")
         var lastError: String? = null
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
index 0d9c819c..5b55a3b3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
@@ -18,7 +18,7 @@ import com.lagradost.cloudstream3.utils.resources.ResourcePatchActivity
 
 const val DTAG = "PlayerActivity"
 
-class DownloadedPlayerActivity : AppCompatActivity(), ResourcePatchActivity {
+class DownloadedPlayerActivity : AppCompatActivity() {
     override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
         CommonActivity.dispatchKeyEvent(this, event)?.let {
             return it
@@ -71,6 +71,11 @@ class DownloadedPlayerActivity : AppCompatActivity(), ResourcePatchActivity {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         Log.i(DTAG, "onCreate")
+        resourcePatch = try {
+            ResourcePackManager.activePack?.invoke(super.getResources())
+        } catch (e: Throwable) {
+            null
+        }
 
         CommonActivity.loadThemes(this)
         super.onCreate(savedInstanceState)
@@ -113,11 +118,4 @@ class DownloadedPlayerActivity : AppCompatActivity(), ResourcePatchActivity {
 
     private var resourcePatch: ResourcePatch? = null
     override fun getResources(): Resources = resourcePatch ?: super.getResources()
-    override fun reloadResourcePatch() {
-        resourcePatch = try {
-            ResourcePackManager.activePack?.invoke(super.getResources())
-        } catch (e: Throwable) {
-            null
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
index b01d900e..61a5b130 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
@@ -146,7 +146,7 @@ class SettingsUI : PreferenceFragmentCompat() {
                 true,
                 {}) {
                 try {
-                    ResourcePackManager.selectPack(prefValues[it], activity as MainActivity)
+                    ResourcePackManager.selectPack(prefValues[it])
                     activity?.recreate()
                 } catch (e: Exception) {
                     logError(e)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/resources/MapResourcePatch.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/resources/MapResourcePatch.kt
index 732a95cc..e5e885cb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/resources/MapResourcePatch.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/resources/MapResourcePatch.kt
@@ -22,7 +22,7 @@ open class MapResourcePatch(private val original: Resources): ResourcePatch(orig
         mapping.getMappingKA(id, null) ?: super.getLayout(id)
 
     override fun getDrawable(id: Int, theme: Theme?): Drawable =
-        mapping.getMappingKA(id, theme) ?: super.getDrawable(id, theme)
+        mapping.getMappingKA<Int, Drawable>(id, theme) ?: super.getDrawable(id, theme)
 
     @RequiresApi(Build.VERSION_CODES.M)
     override fun getColorStateList(id: Int, theme: Theme?): ColorStateList =
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePackManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePackManager.kt
index f9d8c31c..6aadfe10 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePackManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/resources/ResourcePackManager.kt
@@ -7,7 +7,6 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
-import com.lagradost.cloudstream3.R
 
 typealias PatchFactory = (Resources) -> ResourcePatch
 
@@ -38,20 +37,18 @@ object ResourcePackManager {
         pluginMapping[pluginId]?.forEach {
             packs.remove(it)
             if (activePackId == it) // if pack is being removed make sure its not set
-                selectPack(null, AcraApplication.context?.getActivity() as? ResourcePatchActivity)
+                selectPack(null)
         }
         pluginMapping.remove(pluginId)
     }
 
-    fun selectPack(packId: String?, activity: ResourcePatchActivity?) {
-        if (packId == null) activePackId = null
-        else if (packs.containsKey(packId)) activePackId = packId
-        else activePackId = null
+    fun selectPack(packId: String?) {
+        activePackId = if (packId == null) null
+        else if (packs.containsKey(packId)) packId
+        else null
 
         Log.d(KEY, "Selecting: ${activePackId ?: "none"}")
         setKey(SETTINGS_KEY, activePackId)
-
-        activity?.reloadResourcePatch()
     }
 
 
@@ -59,8 +56,6 @@ object ResourcePackManager {
         if (!successful) return
         activePackId = getKey(SETTINGS_KEY)
         Log.d(KEY, "Selecting saved: ${activePackId ?: "none"}")
-        val activity = AcraApplication.context?.getActivity() as? ResourcePatchActivity
-        activity?.reloadResourcePatch()
     }
 
 }
\ No newline at end of file

From 61fb302a373814380257eac5f0e03d2d96a3d99f Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Sun, 9 Oct 2022 01:36:06 +0200
Subject: [PATCH 003/273] delay mainpage

---
 .../com/lagradost/cloudstream3/MainAPI.kt     | 11 +++++++-
 .../cloudstream3/ui/APIRepository.kt          | 27 +++++++++++++++++--
 .../cloudstream3/ui/home/HomeViewModel.kt     |  2 ++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 47afbc42..416a7238 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -381,7 +381,16 @@ abstract class MainAPI {
     open var storedCredentials: String? = null
     open var canBeOverridden: Boolean = true
 
-    //open val uniqueId : Int by lazy { this.name.hashCode() } // in case of duplicate providers you can have a shared id
+    /** if this is turned on then it will request the homepage one after the other,
+    used to delay if they block many request at the same time*/
+    open var sequentialMainPage : Boolean = false
+    /** in milliseconds, this can be used to add more delay between homepage requests
+     *  on first load if sequentialMainPage is turned on */
+    open var sequentialMainPageDelay : Long = 0L
+    /** in milliseconds, this can be used to add more delay between homepage requests when scrolling */
+    open var sequentialMainPageScrollDelay : Long = 0L
+    /** used to keep track when last homepage request was in unixtime ms */
+    var lastHomepageRequest : Long = 0L
 
     open var lang = "en" // ISO_639_1 check SubtitleHelper
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
index 34cb262c..b43b1434 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
@@ -1,10 +1,12 @@
 package com.lagradost.cloudstream3.ui
 
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import kotlinx.coroutines.delay
 
 class APIRepository(val api: MainAPI) {
     companion object {
@@ -62,12 +64,33 @@ class APIRepository(val api: MainAPI) {
         }
     }
 
+    suspend fun waitForHomeDelay() {
+        val delta = api.sequentialMainPageScrollDelay + api.lastHomepageRequest - unixTimeMS
+        if(delta < 0) return
+        delay(delta)
+    }
+
     suspend fun getMainPage(page: Int, nameIndex: Int? = null): Resource<List<HomePageResponse?>> {
         return safeApiCall {
+            api.lastHomepageRequest = unixTimeMS
+
             nameIndex?.let { api.mainPage.getOrNull(it) }?.let { data ->
                 listOf(api.getMainPage(page, MainPageRequest(data.name, data.data)))
-            } ?: api.mainPage.apmap { data ->
-                api.getMainPage(page, MainPageRequest(data.name, data.data))
+            } ?: run {
+                if (api.sequentialMainPage) {
+                    var first = true
+                    api.mainPage.map { data ->
+                        if (!first) // dont want to sleep on first request
+                            delay(api.sequentialMainPageDelay)
+                        first = false
+
+                        api.getMainPage(page, MainPageRequest(data.name, data.data))
+                    }
+                } else {
+                    api.mainPage.apmap { data ->
+                        api.getMainPage(page, MainPageRequest(data.name, data.data))
+                    }
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index d8497876..30fd45c1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -162,6 +162,8 @@ class HomeViewModel : ViewModel() {
         lock += name
 
         repo?.apply {
+            waitForHomeDelay()
+
             expandable[name]?.let { current ->
                 debugAssert({ !current.hasNext }) {
                     "Expand called when not needed"

From e2118c3271ef29dd7f1ebe3b30eea3fb12c60bf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samet=20Mert=20Karata=C5=9F?=
 <107170849+samertkaratas@users.noreply.github.com>
Date: Sun, 9 Oct 2022 00:35:19 +0000
Subject: [PATCH 004/273] Update Turkish translation (#143)

* Update strings.xml and array.xml

* Fix escape characters

* Little changes
---
 app/src/main/res/values-tr/array.xml   |  46 ++++++++++-
 app/src/main/res/values-tr/strings.xml | 105 ++++++++++++++++++++++++-
 2 files changed, 145 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-tr/array.xml b/app/src/main/res/values-tr/array.xml
index 177be03b..dca01736 100644
--- a/app/src/main/res/values-tr/array.xml
+++ b/app/src/main/res/values-tr/array.xml
@@ -14,6 +14,41 @@
         <item>@id/cast_button_type_forward_30_seconds</item>
     </array>
 
+    <array name="dns_pref">
+        <item>@string/none</item>
+        <item>Google</item>
+        <item>Cloudflare</item>
+        <!--        <item>OpenDns</item>-->
+        <item>AdGuard</item>
+        <item>DNS.WATCH</item>
+        <item>Quad9</item>
+    </array>
+    <array name="dns_pref_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <!--        <item>3</item>-->
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+    </array>
+
+    <array name="player_pref_names">
+        <item>@string/player_settings_play_in_app</item>
+        <item>@string/player_settings_play_in_vlc</item>
+        <item>@string/player_settings_play_in_mpv</item>
+        <item>@string/player_settings_play_in_web</item>
+        <item>@string/player_settings_play_in_browser</item>
+    </array>
+
+    <array name="player_pref_values">
+        <item>1</item>
+        <item>2</item>
+        <item>5</item>
+        <item>4</item>
+        <item>3</item>
+    </array>
+
     <array name="limit_title_rez_pref_names">
         <item>@string/resolution_and_title</item>
         <item>@string/title</item>
@@ -210,7 +245,7 @@
         <item>Parti</item>
         <item>Pembe</item>
         <item>Material You</item>
-        <item>Material You (Secondary)</item>
+        <item>Material You (İkincil)</item>
     </string-array>
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
@@ -233,7 +268,6 @@
         <item>Monet2</item>
     </string-array>
 
-
     <string-array name="themes_names">
         <item>Koyu</item>
         <item>Gri</item>
@@ -249,6 +283,14 @@
         <item>Monet</item>
     </string-array>
 
+    <string-array name="extension_statuses">
+        <item>Çöktü</item>
+        <!-- "Ok" is usually capitalized as "OK". Ok android studio 🤓-->
+        <item>Ok</item>
+        <item>Yavaş</item>
+        <item>Beta</item>
+    </string-array>
+
     <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->
     <string-array name="subtitles_encoding_list" tools:ignore="TypographyDashes">
         <item>@string/automatic</item>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 48e36013..54b9ebea 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,6 +1,16 @@
 <!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
 <resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
+    <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
+    <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
+    <string name="download_size_format" formatted="true" translatable="false">%s / %s</string>
+    <string name="episode_name_format" formatted="true" translatable="false">%s %s</string>
+    <string name="ffw_text_format" formatted="true" translatable="false">+%d</string>
+    <string name="rew_text_format" formatted="true" translatable="false">-%d</string>
+    <string name="ffw_text_regular_format" formatted="true" translatable="false">%d</string>
+    <string name="rew_text_regular_format" formatted="true" translatable="false">%d</string>
+    <string name="rating_format" formatted="true" translatable="false">%.1f/10.0</string>
+    <string name="year_format" formatted="true" translatable="false">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
     <string name="next_episode_format" formatted="true">Bölüm %d şu tarihte yayınlanacak: </string>
@@ -14,7 +24,9 @@
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
+    <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
     <string name="go_back_img_des">Go back</string>
+    <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">Change Provider</string>
     <string name="preview_background_img_des">Preview Background</string>
 
@@ -38,6 +50,7 @@
     <string name="no_data">Veri yok</string>
     <string name="episode_more_options_des">Daha fazla seçenek</string>
     <string name="next_episode">Sonraki bölüm</string>
+    <string name="result_plot" translatable="false">@string/synopsis</string>
     <string name="result_tags">Türler</string>
     <string name="result_share">Paylaş</string>
     <string name="result_open_in_browser">Tarayıcıda aç</string>
@@ -70,6 +83,7 @@
     <string name="download_failed">İndirme başarısız oldu</string>
     <string name="download_canceled">İndirme iptal edildi</string>
     <string name="download_done">İndirme bitti</string>
+    <string name="download_format" translatable="false">%s - %s</string>
     <string name="stream">Yayınla</string>
 
     <string name="error_loading_links_toast">Bağlantılar yüklenirken hata oluştu</string>
@@ -149,11 +163,15 @@
     <string name="chromecast_subtitles_settings_des">Chromecast alt yazı ayarları</string>
 
     <string name="eigengraumode_settings">Eigengravy modu</string>
-    <string name="eigengraumode_settings_des">Oynatıcıya bir hız seçeneği ekler</string>
+    <string name="eigengraumode_settings_des">Oynatıcıya bir hız seçeneği ekle</string>
     <string name="swipe_to_seek_settings">Gözlemek için kaydır</string>
     <string name="swipe_to_seek_settings_des">Zamanı ayarlamak için sağa veya sola kaydır</string>
     <string name="swipe_to_change_settings">Ayarları değiştirmek için kaydır</string>
     <string name="swipe_to_change_settings_des">Sol ve sağ taraftan kaydırarak parlaklık ve sesi ayarla</string>
+
+    <string name="autoplay_next_settings">Sonraki bölümü otomatik oynat</string>
+    <string name="autoplay_next_settings_des">Mevcut bölüm bittiğinde sonraki bölüme başla</string>
+
     <string name="double_tap_to_seek_settings">Gözlemek için çift tıkla</string>
     <string name="double_tap_to_pause_settings">Durdurmak için çift tıkla</string>
     <string name="double_tap_to_seek_amount_settings">Oynatıcı gözleme miktarı</string>
@@ -177,16 +195,18 @@
     <string name="search">Ara</string>
     <string name="category_account">Hesaplar</string>
     <string name="category_updates">Güncellemeler ve yedek</string>
-    
+
     <string name="settings_info">Bilgi</string>
     <string name="advanced_search">Gelişmiş arama</string>
-    <string name="advanced_search_des">Sağlayıcılara göre ayrılmış arama sonuçlarını verir</string>
+    <string name="advanced_search_des">Sağlayıcılara göre ayrılmış arama sonuçlarını ver</string>
     <string name="bug_report_settings_off">Yalnızca çökmelerle ilgili verileri gönderir</string>
     <string name="bug_report_settings_on">Hiç veri göndermez</string>
     <string name="show_fillers_settings">Anime için filler bölümleri gösterir</string>
     <string name="show_trailers_settings">Fragmanları göster</string>
     <string name="kitsu_settings">Kitsu\'dan posterleri göster</string>
+    <string name="pref_filter_search_quality">Arama sonuçlarında seçilen video kalitelerini gizle</string>
 
+    <string name="automatic_plugin_updates">Otomatik eklenti güncellemeleri</string>
     <string name="updates_settings">Uygulama güncellemelerini göster</string>
     <string name="updates_settings_des">Başlangıçta yeni güncellemeleri otomatik olarak ara</string>
     <string name="uprereleases_settings">Ön sürümlere güncelle</string>
@@ -208,15 +228,19 @@
     <string name="acra_report_toast">Üzgünüz, uygulama çöktü. Geliştiricilere isimsiz bir hata raporu gönderilecek</string>
 
     <string name="season">Sezon</string>
+    <string name="season_format">%s %d%s</string>
     <string name="no_season">Sezon yok</string>
     <string name="episode">Bölüm</string>
     <string name="episodes">Bölümler</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
     <string name="season_short">S</string>
     <string name="episode_short">B</string>
     <string name="no_episodes_found">Bölüm bulunamadı</string>
 
     <string name="delete_file">Dosyayı sil</string>
     <string name="delete">Sil</string>
+    <string name="cancel" translatable="false">@string/sort_cancel</string>
     <string name="pause">Durdur</string>
     <string name="resume">Sürdür</string>
     <string name="go_back_30">-30</string>
@@ -251,6 +275,8 @@
     <string name="ova">OVA</string>
     <string name="asian_drama">Asya dramaları</string>
     <string name="livestreams">Canlı yayınlar</string>
+    <string name="nsfw">NSFW</string>
+    <string name="others">Diğerleri</string>
 
     <!--singular-->
     <string name="movies_singular">Film</string>
@@ -262,6 +288,8 @@
     <string name="documentaries_singular">Belgesel</string>
     <string name="asian_drama_singular">Asya draması</string>
     <string name="live_singular">Canlı yayın</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="other_singular">Video</string>
 
     <string name="source_error">Kaynak hatası</string>
     <string name="remote_error">Sunucu hatası</string>
@@ -272,7 +300,7 @@
     <string name="episode_action_chromecast_episode">Bölümü Chromecast ile yayınla</string>
     <string name="episode_action_chromecast_mirror">Bağlantıyı Chromecast ile yayınla</string>
     <string name="episode_action_play_in_app">Uygulamada oynat</string>
-    <string name="episode_action_play_in_format">%s\'de oynat</string>
+    <string name="episode_action_play_in_format">%s\'de\/da oynat</string>
     <string name="episode_action_play_in_browser">Tarayıcıda oynat</string>
     <string name="episode_action_copy_link">Linki kopyala</string>
     <string name="episode_action_auto_download">Otomatik indir</string>
@@ -284,6 +312,10 @@
     <string name="show_dub">Dublaj etiketi</string>
     <string name="show_sub">Alt yazı etiketi</string>
     <string name="show_title">Başlık</string>
+    <string name="show_hd_key" translatable="false">show_hd_key</string>
+    <string name="show_dub_key" translatable="false">show_dub_key</string>
+    <string name="show_sub_key" translatable="false">show_sub_key</string>
+    <string name="show_title_key" translatable="false">show_title_key</string>
     <string name="poster_ui_settings">Poster üzerindeki öğeler</string>
 
     <string name="no_update_found">Güncelleme bulunamadı</string>
@@ -327,6 +359,7 @@
     <string name="resize_zoom">Yakınlaştır</string>
 
     <string name="legal_notice">Disclaimer</string>
+    <string name="legal_notice_key" translatable="false">legal_notice_key</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
         should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
 
@@ -349,7 +382,9 @@
     <string name="provider_lang_settings">Sağlayıcı dilleri</string>
     <string name="app_layout">Uygulama düzeni</string>
     <string name="preferred_media_settings">Tercih edilen medya</string>
+    <string name="enable_nsfw_on_providers">Desteklenen sağlayıcılarda NSFW\'yi etkinleştir</string>
     <string name="subtitles_encoding">Alt yazı kodlaması</string>
+    <string name="category_providers">Sağlayıcılar</string>
     <string name="category_ui">Düzen</string>
 
     <string name="automatic">Otomatik</string>
@@ -364,6 +399,10 @@
 
 
     <!-- account stuff -->
+    <string name="anilist_key" translatable="false">anilist_key</string>
+    <string name="mal_key" translatable="false">mal_key</string>
+    <string name="opensubtitles_key" translatable="false">opensubtitles_key</string>
+    <string name="nginx_key" translatable="false">nginx_key</string>
     <string name="example_password">şifre123</string>
     <string name="example_username">HavalıKullanıcıAdı</string>
     <string name="example_email">hello@world.com</string>
@@ -403,6 +442,7 @@
     <string name="all">Hepsi</string>
     <string name="max">Maksimum</string>
     <string name="min">Minimum</string>
+    <string name="subtitles_none" translatable="false">@string/none</string>
     <string name="subtitles_outline">Dış hat</string>
     <string name="subtitles_depressed">Çökmüş</string>
     <string name="subtitles_shadow">Gölge</string>
@@ -464,6 +504,7 @@
     <string name="error">Hata</string>
     <string name="subtitles_remove_captions">Alt yazılardan seçmeli alt yazıyı kaldır</string>
     <string name="subtitles_remove_bloat">Alt yazılardaki şişkinliği kaldır</string>
+    <string name="subtitles_filter_lang">Tercih edilen medya diline göre filtrele</string>
     <string name="extras">Ekstralar</string>
     <string name="trailer">Fragman</string>
     <string name="network_adress_example">Yayına bağlan</string>
@@ -476,5 +517,61 @@
     <string name="crash_reporting_title">Çökme raporları</string>
     <string name="preferred_media_subtext">Ne izlemek istiyorsunuz?</string>
     <string name="setup_done">Bitti</string>
+    <string name="extensions">Eklentiler</string>
+    <string name="add_repository">Depo ekle</string>
+    <string name="repository_name_hint">Depo ismi</string>
+    <string name="repository_url_hint">Depo URL\'i</string>
+    <string name="plugin_loaded">Eklenti yüklendi</string>
+    <string name="plugin_deleted">Eklenti silindi</string>
+    <string name="plugin_load_fail" formatted="true">%s yüklenemedi</string>
+    <string name="is_adult">+18</string>
+    <string name="batch_download_start_format" formatted="true">%d %s indirilmeye başlandı</string>
+    <string name="batch_download_finish_format" formatted="true">%d %s başarıyla indirildi</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">%s\'nin tamamı zaten indirildi</string>
+    <string name="batch_download">Toplu indir</string>
+    <string name="plugin_singular">eklenti</string>
+    <string name="plugin">eklentiler</string>
+    <string name="delete_repository_plugins">Bu aynı zamanda tüm depo eklentilerini de siler</string>
+    <string name="delete_repository">Depoyu sil</string>
+    <string name="setup_extensions_subtext">Kullanmak istediğiniz sitelerin listesini indirin</string>
+    <string name="plugins_downloaded" formatted="true">İndirilen: %d</string>
+    <string name="plugins_disabled" formatted="true">Devre dışı: %d</string>
+    <string name="plugins_not_downloaded" formatted="true">İndirilmeyen: %d</string>
+    <string name="plugins_updated" formatted="true">%d eklenti(ler) güncellendi</string>
+    <string name="blank_repo_message">Site eklentilerini yüklemek için bir depo ekleyin</string>
+    <string name="view_public_repositories_button">Topluluk depolarını görüntüle</string>
+    <string name="view_public_repositories_button_short">Herkese açık liste</string>
+    <string name="uppercase_all_subtitles">Tüm alt yazılar büyük harf</string>
+
+    <string name="download_all_plugins_from_repo">Bu depodaki tüm eklentiler indirilsin mi?</string>
+    <string name="single_plugin_disabled" formatted="true">%s devre dışı bırakıldı</string>
+    <string name="tracks">Parçalar</string>
+    <string name="audio_tracks">Ses parçaları</string>
+    <string name="video_tracks">Video parçaları</string>
+    <string name="apply_on_restart">Yeniden başlatmada uygula</string>
+
+    <string name="safe_mode_title">Güvenli mod etkin</string>
+    <string name="safe_mode_description">Kurtarılamaz bir çökme meydana geldi ve soruna neden olan eklentiyi bulup kaldırabilmeniz için tüm eklentileri otomatik olarak devre dışı bıraktık.</string>
+    <string name="safe_mode_crash_info">Çökme bilgisini göster</string>
+
+    <string name="extension_rating" formatted="true">Puan: %s</string>
+    <string name="extension_description">Açıklama</string>
+    <string name="extension_version">Versiyon</string>
+    <string name="extension_status">Durum</string>
+    <string name="extension_size">Boyut</string>
+    <string name="extension_authors">Geliştiriciler</string>
+    <string name="extension_types">Desteklenen</string>
+    <string name="extension_language">Dil</string>
+    <string name="extension_install_first">Önce eklentiyi yükleyin</string>
+
+    <string name="hls_playlist">HLS Oynatma Listesi</string>
+
+    <string name="player_pref">Tercih edilen video oynatıcısı</string>
+    <string name="player_settings_play_in_app">Dahili oynatıcı</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">Web Video Yayını</string>
+    <string name="player_settings_play_in_browser">Tarayıcı</string>
+    <string name="app_not_found_error">Uygulama bulunamadı</string>
 </resources>
 

From b3ff3ec086f2fd7aa62d545da06218f64c65a732 Mon Sep 17 00:00:00 2001
From: Thanasis Trispiotis <79643637+thanasistrisp@users.noreply.github.com>
Date: Mon, 10 Oct 2022 22:42:59 +0300
Subject: [PATCH 005/273] update strings.xml Greek (#145)

* update strings.xml

Add new translations to greek language (el) and fix typos.

* remove duplicate
---
 app/src/main/res/values-el/strings.xml | 401 +++++++++++++++++++++----
 1 file changed, 348 insertions(+), 53 deletions(-)

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index de9ac4f4..11b74938 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -5,39 +5,39 @@
     <string name="title_search">Αναζήτηση</string>
     <string name="title_downloads">Λήψεις</string>
     <string name="title_settings">Ρυθμίσεις</string>
-    <string name="search_hint">Ψάξε…</string>
+    <string name="play_with_app_name">Άνοιγμα με CloudStream</string>
+    <string name="search_hint">Αναζήτηση…</string>
     <string name="search_poster_img_des">Πόστερ</string>
     <string name="no_data">Χωρίς δεδομένα</string>
     <string name="episode_more_options_des">Περισσότερες Επιλογές</string>
     <string name="go_back_img_des">Πίσω</string>
-    <string name="next_episode">Επόμενο Επισόδειο</string>
+    <string name="next_episode">Επόμενο Επεισόδιο</string>
     <string name="result_poster_img_des">Πόστερ</string>
-    <string name="synopsis">Πλοκή</string>
-    <string name="result_tags">Genres</string>
-    <string name="result_share">Μοίρασε</string>
+    <string name="result_tags">Κατηγορίες</string>
+    <string name="result_share">Κοινοποίηση</string>
     <string name="result_open_in_browser">Άνοιγμα στον περιηγητή</string>
-    <string name="skip_loading">Προσπέραση φορτώματος</string>
+    <string name="skip_loading">Παράλειψη φόρτωσης</string>
     <string name="loading">Φόρτωση…</string>
 
-    <string name="type_watching">Watching</string>
-    <string name="type_on_hold">On-Hold</string>
-    <string name="type_completed">Completed</string>
-    <string name="type_dropped">Dropped</string>
-    <string name="type_plan_to_watch">Plan to Watch</string>
-    <string name="type_none">None</string>
+    <string name="type_watching">Παρακολούθηση</string>
+    <string name="type_on_hold">Σε αναμονή</string>
+    <string name="type_completed">Ολοκληρώθηκε</string>
+    <string name="type_dropped">Διακόπηκε</string>
+    <string name="type_plan_to_watch">Για παρακολούθηση</string>
+    <string name="type_none">Τίποτα</string>
 
-    <string name="play_movie_button">Αναπαραγωγή Ταινείας</string>
+    <string name="play_movie_button">Αναπαραγωγή Ταινίας</string>
     <string name="play_torrent_button">Μετάδοση Torrent</string>
     <string name="pick_source">Πηγές</string>
     <string name="pick_subtitle">Υπότιτλοι</string>
-    <string name="reload_error">Ξανά φόρτωσε…</string>
+    <string name="reload_error">Προσπάθεια επανασύνδεσης…</string>
     <string name="go_back">Πίσω</string>
     <string name="episode_poster_img_des">Πόστερ</string>
-    <string name="play_episode">Αναπαραγωγή Επισοδείου</string>
-    <!--<string name="need_storage">Δώσε άδεια για την λήψη επισοδείου</string>-->
-    <string name="download">Λήξη</string>
-    <string name="error_loading_links_toast">Σφάλμα φόρτωσεις συνδέσμων</string>
-    <string name="download_storage_text">Εσωτερικός χώρος</string>
+    <string name="play_episode">Αναπαραγωγή Επεισοδίου</string>
+    <!--<string name="need_storage">Απαιτείται άδεια για την λήψη επεισοδίου</string>-->
+    <string name="download">Λήψη</string>
+    <string name="error_loading_links_toast">Σφάλμα φόρτωσης συνδέσμων</string>
+    <string name="download_storage_text">Εσωτερικός χώρος αποθήκευσης</string>
     <!--<string name="options">Επιλογές</string>-->
 
     <string name="app_dubbed_text">Dub</string>
@@ -50,77 +50,372 @@
 
     <string name="acra_report_toast">Λυπούμαστε, η εφαρμογή κατέρρευσε. Μια ανώνυμη αναφορά σφαλμάτων θα σταλεί στους προγραμματιστές</string>
     <string name="pref_disable_acra">Απενεργοποιήστε την αυτόματη αναφορά σφαλμάτων</string>
+    <string name="show_log_cat">Εμφάνιση logcat 🐈</string>
     <string name="home_more_info">Παραπάνω πληροφορίες</string>
-    <string name="home_expanded_hide">Κρύψιμο</string>
+    <string name="home_expanded_hide">Απόκρυψη</string>
     <string name="home_main_poster_img_des">Κύριο Πόστερ</string>
     <string name="home_play">Αναπαραγωγή</string>
     <string name="home_info">Πληροφορίες</string>
     <string name="home_next_random_img_des">Next Random</string>
-    <string name="home_change_provider_img_des">Change Provider</string>
-    <string name="filter_bookmarks">Filter Bookmarks</string>
-    <string name="error_bookmarks_text">Bookmarks</string>
-    <string name="action_remove_from_bookmarks">Remove</string>
-    <string name="play_episode_toast">Αναπαραγωγή Episode</string>
+    <string name="home_change_provider_img_des">Αλλαγή Παρόχου</string>
+    <string name="filter_bookmarks">Φιλτράρισμα Σελιδοδεικτών</string>
+    <string name="error_bookmarks_text">Σελιδοδείκτες</string>
+    <string name="action_remove_from_bookmarks">Αφαίρεση</string>
+    <string name="play_episode_toast">Αναπαραγωγή Επεισοδίου</string>
     <string name="sort_apply">Υποβολή</string>
     <string name="sort_cancel">Ακύρωση</string>
     <string name="player_speed">Ταχύτητα αναπαραγωγής</string>
     <string name="subtitles_settings">Ρυθμίσεις υπότιτλων</string>
-    <string name="subs_text_color">Χρώμα κείμενου</string>
+    <string name="subs_text_color">Χρώμα κειμένου</string>
     <string name="subs_outline_color">Χρώμα περιγράμματος</string>
     <string name="subs_background_color">Χρώμα φόντου</string>
     <string name="subs_window_color">Χρώμα παραθύρου</string>
     <string name="subs_edge_type">Τύπος άκρων</string>
     <string name="subs_subtitle_elevation">Ύψωση υπότιτλων</string>
-    <string name="subs_default_reset_toast">Επαναφορά στην προεπιλεγμένη τιμή</string>
+    <string name="subs_default_reset_toast">Επαναφορά στις προεπιλεγμένες τιμές</string>
     <string name="preview_background_img_des">Προεπισκόπηση φόντου</string>
     <string name="subs_font">Γραμματοσειρά</string>
-    <string name="search_provider_text_providers">Αναζήτηση με τους παρόχους</string>
-    <string name="search_provider_text_types">Αναζήτηση με τύπους</string>
-    <string name="benene_count_text">%d Benenes given to devs</string>
-    <string name="benene_count_text_none">No Benenes given</string>
+    <string name="search_provider_text_providers">Αναζήτηση βάσει παρόχων</string>
+    <string name="search_provider_text_types">Αναζήτηση βάσει τύπων</string>
+    <string name="benene_count_text">%d μπανάνες δόθηκαν στους προγραμματιστές</string>
+    <string name="benene_count_text_none">Καμία μπανάνα δεν δόθηκε</string>
 
     <string name="subs_auto_select_language">Αυτόματη επιλογή γλώσσας</string>
     <string name="subs_download_languages">Λήψη γλωσσών</string>
-    <string name="subs_hold_to_reset_to_default">Κρατήστε πατημένο για επαναφορά στα προεπιλεγμένα</string>
+    <string name="subs_hold_to_reset_to_default">Κρατήστε πατημένο για επαναφορά στις προεπιλεγμένες τιμές</string>
     <string name="continue_watching">Συνέχεια Παρακολούθησης</string>
 
     <string name="action_remove_watching">Αφαίρεση</string>
-    <string name="action_open_watching">Παραπάνω Πληροφορίες</string>
+    <string name="action_open_watching">Επιπλέον Πληροφορίες</string>
 
-    <string name="vpn_might_be_needed">A VPN might be needed for this provider to work correctly</string>
-    <string name="vpn_torrent">This providers is a torrent, a VPN is recommended</string>
+    <string name="vpn_might_be_needed">Η χρήση ενός VPN ίσως χρειαστεί για την ομαλή λειτουργία του τρέχοντος παρόχου</string>
+    <string name="vpn_torrent">Πρόκειται για torrent, η χρήση ενός VPN συνιστάται</string>
     <string name="torrent_plot">Περιγραφή</string>
     <string name="normal_no_plot">Δεν βρέθηκε περιγραφή</string>
     <string name="torrent_no_plot">Δεν βρέθηκε περιγραφή</string>
     
-    <string name="picture_in_picture">Picture-in-picture</string>
-    <string name="picture_in_picture_des">Συνεχίζει την αναπαραγωγή σε ένα μίνι παίκτη πάνω από άλλες εφαρμογές</string>
-    <string name="player_size_settings">Αλλαγή μεγέθους παίκτη</string>
+    <string name="picture_in_picture">Εικόνα-σε-Εικόνα</string>
+    <string name="picture_in_picture_des">Συνεχίζει την αναπαραγωγή σε ένα μίνι παράθυρο πάνω από άλλες εφαρμογές</string>
+    <string name="player_size_settings">Αλλαγή μεγέθους παραθύρου</string>
     <string name="player_size_settings_des">Αφαίρεση μαύρων περιγραμμάτων</string>
     <string name="player_subtitles_settings">Υπότιτλοι</string>
-    <string name="player_subtitles_settings_des">Ρυθμίσεις υποτίτλων του παίκτη</string>
+    <string name="player_subtitles_settings_des">Ρυθμίσεις υποτίτλων του προγράμματος αναπαραγωγής</string>
+    <string name="chromecast_subtitles_settings">Chromecast Υπότιτλοι</string>
+    <string name="chromecast_subtitles_settings_des">Ρυθμίσεις Chromecast υποτίτλων</string>
     <string name="eigengraumode_settings">Eigengrau Mode</string>
-    <string name="eigengraumode_settings_des">Προσθέτει την επιλογή ταχύτητας στον παίκτη</string>
-    <string name="swipe_to_seek_settings">Σύρετε για seek</string>
-    <string name="swipe_to_seek_settings_des">Σύρετε αριστερά ή δεξιά για να ελέγξετε τον χρόνο στον παίκτη</string>
+    <string name="eigengraumode_settings_des">Προσθέτει την επιλογή ταχύτητας στο πρόγραμμα αναπαραγωγής</string>
+    <string name="swipe_to_seek_settings">Σύρετε για αναζήτηση</string>
+    <string name="swipe_to_seek_settings_des">Σύρετε αριστερά ή δεξιά για να ελέγξετε τον χρόνο στην κάτω μπάρα</string>
     <string name="swipe_to_change_settings">Σύρετε για να αλλάξετε ρυθμίσεις</string>
     <string name="swipe_to_change_settings_des">Σύρετε αριστερά ή δεξιά για να αλλάξετε τη φωτεινότητα ή την ένταση</string>
-    <string name="double_tap_to_seek_settings">Διπλό πάτημα για seek</string>
-    <string name="double_tap_to_seek_settings_des">Διπλό πάτημα στα αριστερά ή δεξιά για seek μπροστά ή πίσω</string>
+    <string name="double_tap_to_seek_settings">Διπλό πάτημα για αναζήτηση</string>
+    <string name="double_tap_to_seek_settings_des">Διπλό πάτημα στα αριστερά ή δεξιά για αναζήτηση μπροστά ή πίσω</string>
     <string name="search">Αναζήτηση</string>
-    <string name="settings_info">Πληροφορείες</string>
+    <string name="settings_info">Πληροφορίες</string>
     <string name="advanced_search">Προχωρημένη Αναζήτηση</string>
-    <string name="advanced_search_des">Δίνει τα αποτελέσματα αναζήτησης χωρισμένα ανά πάροχο</string>
+    <string name="advanced_search_des">Δίνει τα αποτελέσματα αναζήτησης ταξινομημένα ανά πάροχο</string>
     <string name="bug_report_settings_off">Αποστέλλει δεδομένα μόνο για σφάλματα</string>
     <string name="bug_report_settings_on">Δεν στέλνει δεδομένα</string>
     <string name="updates_settings">Εμφάνιση ενημερώσεων</string>
     <string name="updates_settings_des">Αυτόματη αναζήτηση νέων ενημερώσεων</string>
-    <string name="uprereleases_settings">Ενημέρωση σε προ-εκδόσεις</string>
-    <string name="uprereleases_settings_des">Αναζητήστε ενημερώσεις προ-εκδόσεων αντί για κανονικές εκδόσεις</string>
+    <string name="uprereleases_settings">Ενημέρωση σε προ-εκδόσεις (beta)</string>
+    <string name="uprereleases_settings_des">Αναζητήστε ενημερώσεις προ-εκδόσεων (beta) αντί για σταθερές εκδόσεις</string>
     <string name="github">Github</string>
-    <string name="lightnovel">Light novel app by the same devs</string>
-    <string name="anim">Anime app by the same devs</string>
-    <string name="discord">Join Discord</string>
-    <string name="benene">Δώσε benene στους devs</string>
-    <string name="benene_des">Βenene δώθηκε</string>
+    <string name="lightnovel">Ελαφριά novel εφαρμογή από τους ίδιους προγραμματιστές</string>
+    <string name="anim">Anime εφαρμογή από τους ίδιους προγραμματιστές</string>
+    <string name="discord">Εγγραφείτε στο Discord</string>
+    <string name="benene">Δώστε μπανάνα στους προγραμματιστές</string>
+    <string name="benene_des">Μπανάνα δόθηκε δώθηκε</string>
+    
+    <string name="player_speed_text_format" formatted="true">Ταχύτητα (%.2fx)</string>
+    <string name="rated_format" formatted="true">Βαθμολογία: %.1f</string>
+    <string name="new_update_format" formatted="true">Νέα ενημέρωση διαθέσιμη!\n%s -> %s</string>
+    
+    <string name="double_tap_to_pause_settings_des">Πάτημα στη μέση για παύση</string>
+    <string name="use_system_brightness_settings">Χρήση φωτεινότητας συστήματος</string>
+    <string name="use_system_brightness_settings_des">Χρήση φωτεινότητας συστήματος στο ενσωματωμένο πρόγραμμα αναπαραγωγής αντί να εφαρμοστεί το προεπιλεγμένο σκούρο επικάλυμμα
+    </string>
+
+    <string name="episode_sync_settings">Ενημέρωση προόδου παρακολούθησης</string>
+    <string name="episode_sync_settings_des">Αυτόματος συγχρονισμός της προόδου του τρέχοντος επεισοδίου</string>
+
+    <string name="restore_settings">Επαναφορά δεδομένων από αντίγραφο ασφαλείας</string>
+
+    <string name="backup_settings">Αντίγραφα ασφαλείας</string>
+    <string name="restore_success">Τα αντίγραφα ασφαλείας φορτώθηκαν</string>
+    <string name="restore_failed_format" formatted="true">Η επαναφορά αντιγράφων ασφαλαείας απέτυχε από το αρχείο %s</string>
+    <string name="backup_success">Επιτυχής αποθήκευση δεδομένων</string>
+    <string name="backup_failed">Δεν έχει δοθεί άδεια για πρόσβαση στον αποθηκευτικό χώρο, προσπαθήστε ξανά</string>
+    <string name="backup_failed_error_format">Σφάλμα δημιουργίας αντιγράφων ασφαλείας %s</string>
+
+    <string name="category_account">Λογαριασμοί</string>
+    <string name="category_updates">Ενημερώσεις και αντίγραφα ασφαλείας</string>
+
+    <string name="show_fillers_settings">Εμφάνιση filler επεισοδίου για anime</string>
+    <string name="show_trailers_settings">Εμφάνιση trailers</string>
+    <string name="kitsu_settings">Εμφάνιση posters από kitsu</string>
+    <string name="pref_filter_search_quality">Απόκρυψη επιλεγμένης ποιότητας βίντεο στα αποτελέσματα αναζήτησης</string>
+    
+    <string name="app_language">App Language</string>
+
+    <string name="no_chromecast_support_toast">Αυτός ο πάροχος δεν έχει υποστήριξη Chromecast</string>
+    <string name="no_links_found_toast">Δεν βρέθηκαν διαθέσιμοι σύνδεσμοι</string>
+    <string name="copy_link_toast">Ο σύνδεσμος αντιγράφηκε στο πρόχειρο</string>
+    
+    <string name="season">Season</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="no_season">No Season</string>
+    <string name="episode">Episode</string>
+    <string name="episodes">Episodes</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="season_short">S</string>
+    <string name="episode_short">E</string>
+    <string name="no_episodes_found">No Episodes found</string>
+
+    <string name="delete_file">Διαγραφή αρχείου</string>
+    <string name="delete">Διαγραφή</string>
+    <string name="pause">Πάυση</string>
+    <string name="resume">Συνέχιση</string>
+    <string name="delete_message" formatted="true">Αυτό θα διαγράψει μόνιμα το %s\nΕπιβεβαίωση;</string>
+    <string name="resume_time_left" formatted="true">%dm\nαπομένουν</string>
+    
+    <string name="status_ongoing">Σε εξέλιξη</string>
+    <string name="status">Κατάσταση</string>
+    <string name="year">Έτος</string>
+    <string name="duration">Διάρκεια</string>
+    <string name="site">Ιστότοπος</string>
+    <string name="synopsis">Περίληψη</string>
+
+    <string name="queued">προστέθηκε στην ουρά</string>
+    <string name="no_subtitles">Δεν υπάρχουν διαθέσιμοι υπότιτλοι</string>
+    <string name="default_subtitles">Προεπιλεγμένοι υπότιτλοι</string>
+    
+    <string name="free_storage">Ελέυθερος</string>
+    <string name="used_storage">Σε χρήση</string>
+    <string name="app_storage">Εφαρμογή</string>
+
+    <string name="movies">Ταινίες</string>
+    <string name="tv_series">Τηλεοπτικές Σειρές</string>
+    <string name="cartoons">Κινούμενα σχέδια</string>
+    <string name="torrent">Torrents</string>
+    <string name="documentaries">Ντοκιμαντέρ</string>
+    <string name="asian_drama">Ασιατικά Δράμα</string>
+    <string name="livestreams">Ζωντανές ροές</string>
+    <string name="others">Άλλα</string>
+    
+    <string name="movies_singular">Ταινία</string>
+    <string name="tv_series_singular">Σειρά</string>
+    <string name="cartoons_singular">Cartoon</string>
+    <string name="documentaries_singular">Ντοκιμαντέρ</string>
+    <string name="asian_drama_singular">Ασιατικό Δράμα</string>
+    <string name="live_singular">Ζωντανή ροή</string>
+    <string name="other_singular">Άλλο</string>
+    
+    <string name="source_error">Σφάλμα πηγής</string>
+    <string name="remote_error">Απομακρυσμένο σφάλμα</string>
+    <string name="render_error">Σφάλμα απόδοσης</string>
+    <string name="unexpected_error">Μη αναμενόμενο σφάλμα αναπαραγωγής</string>
+    <string name="storage_error">Σφάλμα λήψης, επιβεβαιώστε ότι η άδεια αποθήκευσης είναι ενεργοποιημένη</string>
+
+    <string name="episode_action_chromecast_episode">Chromecast επεισόδο</string>
+    <string name="episode_action_play_in_app">Αναπαραγωγή εντός της εφαρμογής</string>
+    <string name="episode_action_play_in_format">Αναπαραγωγή σε %s</string>
+    <string name="episode_action_play_in_browser">Αναπαραγωγή στον περιηγητή</string>
+    <string name="episode_action_copy_link">Αντιγραφή συνδέσμου</string>
+    <string name="episode_action_auto_download">Αυτόματη λήψη</string>
+    <string name="episode_action_download_mirror">Λήψη mirror</string>
+    <string name="episode_action_reload_links">Επαναφόρτωση συνδέσμων</string>
+    <string name="episode_action_download_subtitle">Λήψη υποτίτλων</string>
+    
+    <string name="show_hd">Ποιότητα</string>
+    <string name="show_dub">Dub</string>
+    <string name="show_sub">Sub</string>
+    <string name="show_title">Τίτλος</string>
+    <string name="poster_ui_settings">Εναλλαγή των στοιχείων UI στο poster</string>
+
+    <string name="video_lock">Κλείδωμα</string>
+    <string name="video_aspect_ratio_resize">Αλλαγή μεγέθους</string>
+    <string name="video_source">Πηγή</string>
+    <string name="video_skip_op">Παράλειψη OP</string>
+    
+    <string name="dont_show_again">Να μην εμφανιστεί ξανά</string>
+    <string name="skip_update">Παράλειψη της τρέχουσας ενημέρωσης</string>
+    <string name="update">Ενημέρωση</string>
+    <string name="watch_quality_pref">Προτίμηση ποιότητας παρακολούθησης</string>
+    <string name="limit_title">Μέγιστοι χαρακτήρες για τίτλο</string>
+    <string name="limit_title_rez">Ανάλυση αναπαραγωγής βίντεο</string>
+
+    <string name="video_buffer_size_settings">Μέγεθος buffer βίντεο</string>
+    <string name="video_buffer_length_settings">Μήκος buffer βίντεο</string>
+    <string name="video_buffer_disk_settings">Προσωρινή μνήμη βίντεο στο δίσκο</string>
+    <string name="video_buffer_clear_settings">Εκκαθάριση προσωρινής μνήμης βίντεο και εικόνων</string>
+
+    <string name="video_ram_description">Θα προκαλέσει τυχαία σφάλματα εάν οριστεί πολύ ψηλά. Μην το αλλάξετε εάν έχετε χαμηλή ποσότητα μνήμης ram, όπως σε Android TV ή παλιό τηλέφωνο</string>
+    <string name="video_disk_description">Μπορεί να προκαλέσει προβλήματα σε συστήματα με χαμηλό αποθηκευτικό χώρο, όπως σε συσκευές Android TV, εάν τον ρυθμίσετε πολύ ψηλά</string>
+
+    <string name="dns_pref_summary">Χρήσιμο για παράκαμψη μπλοκ ISP</string>
+
+    <string name="add_site_pref">Αντίγραφο ιστοτόπου</string>
+    <string name="remove_site_pref">Αφαίρεση ιστοτόπου</string>
+    <string name="add_site_summary">Προσθήκη αντιγράφου ενός υπάρχοντος ιστοτόπου, με έναν διαφορετικό σύνδεσμο</string>
+
+    <string name="download_path_pref">Διαδρομή λήψης</string>
+
+    <string name="display_subbed_dubbed_settings">Εμφάνιση Dubbed/Subbed Anime</string>
+
+    <string name="resize_fit">Προσαρμογή στην οθόνη</string>
+    <string name="resize_fill">Τέντωμα</string>
+    <string name="resize_zoom">Μεγέθυνση</string>
+    
+    <string name="legal_notice">Αποποίηση ευθυνών</string>
+    
+    <string name="category_general">Γενικά</string>
+    <string name="random_button_settings">Τυχαίο κουμπί</string>
+    <string name="random_button_settings_desc">Εμφάνιση τυχαίου κουμπιού στην Αρχική οθόνη</string>
+    <string name="provider_lang_settings">Γλώσσες παρόχων</string>
+    <string name="app_layout">Διάταξη εφαρμογής</string>
+    <string name="preferred_media_settings">Προτιμώμενα μέσα</string>
+    <string name="enable_nsfw_on_providers">Ενεργοποίηση NSFW σε υποστηριζόμενους παρόχους</string>
+    <string name="subtitles_encoding">Κωδικοποίηση υποτίτλων</string>
+    <string name="category_providers">Πάροχοι</string>
+    <string name="category_ui">Διάταξη</string>
+    
+    <string name="automatic">Αυτόματο</string>
+    <string name="tv_layout">Διάταξη TV</string>
+    <string name="phone_layout">Διάταξη τηλεφώνου</string>
+    <string name="emulator_layout">Διάταξη emulator</string>
+
+    <string name="primary_color_settings">Πρωτεύον χρώμα</string>
+    <string name="app_theme_settings">Θέμα εφαρμογής</string>
+    <string name="bottom_title_settings">Τοποθεσία τίτλου Poster</string>
+    <string name="bottom_title_settings_des">Τοποθετήστε τον τίτλο κάτω από το poster</string>
+    
+    <string name="example_lang_name">Κωδικός γλώσσας (el)</string>
+
+    <string name="account">Λογαριασμός</string>
+    <string name="logout">Αποσύνδεση</string>
+    <string name="login">Σύνδεση</string>
+    <string name="switch_account">Εναλλαγή λογαριασμού</string>
+    <string name="add_account">Προσθήκη λογαριασμού</string>
+    <string name="create_account">Δημιουργία λογαριασμού</string>
+    <string name="add_sync">Προσθήκη παρακολούθησης</string>
+    <string name="added_sync_format" formatted="true">Προστέθηκε %s</string>
+    <string name="upload_sync">Συγχρονισμός</string>
+    <string name="sync_score">Βαθμολογήθηκε</string>
+    <string name="authenticated_user" formatted="true">Πιστοποιήθηκε %s</string>
+    <string name="authenticated_user_fail" formatted="true">Αποτυχία πιστοποίησης σε %s</string>
+    
+    <string name="none">Τίποτα</string>
+    <string name="normal">Κανονικά</string>
+    <string name="all">Όλα</string>
+    <string name="max">Μέγιστο</string>
+    <string name="min">Ελάχιστο</string>
+    <string name="subtitles_outline">Περίγραμμα</string>
+    <string name="subtitles_depressed">Σε κατάθλιψη</string>
+    <string name="subtitles_shadow">Σκιά</string>
+    <string name="subtitles_raised">Ανεβασμένοι</string>
+    <string name="subtitle_offset">Συγχρονισμός υποτίτλων</string>
+    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_title">Καθυστέρηση υποτίτλων</string>
+    <string name="subtitle_offset_extra_hint_later_format">Χρησιμοποιήστε αυτό αν οι υπότιτλοι εμφανίζονται %dms πολύ νωρίς</string>
+    <string name="subtitle_offset_extra_hint_before_format">Χρησιμοποιήστε αυτό αν οι υπότιτλοι εμφανίζονται %dms πολύ αργά</string>
+    <string name="subtitle_offset_extra_hint_none_format">Καμία καθυστέρηση υποτίτλων</string>
+
+    <string name="recommended">Συνιστώμενο</string>
+    <string name="player_loaded_subtitles" formatted="true">Φόρτωση %s</string>
+    <string name="player_load_subtitles">Φόρτωση από αρχείο</string>
+    <string name="player_load_subtitles_online">Φόρτωση από το Ίντερνετ</string>
+    <string name="downloaded_file">Λήψη αρχείου</string>
+    <string name="actor_main">Κύριο</string>
+    <string name="actor_supporting">Υποστηρίζεται</string>
+    <string name="actor_background">Φόντο</string>
+
+    <string name="home_source">Πηγή</string>
+    <string name="home_random">Τυχαίο</string>
+
+    <string name="coming_soon">Έρχεται σύντομα…</string>
+    
+    
+    <string name="poster_image">Εικόνα Poster</string>
+    <string name="category_player">Πρόγραμμα αναπαραγωγής</string>
+    <string name="resolution_and_title">Ανάλυση και τίτλος</string>
+    <string name="title">Τίτλος</string>
+    <string name="resolution">Ανάλυση</string>
+    <string name="error_invalid_id">Μη έγκυρο id</string>
+    <string name="error_invalid_data">Μη έγκυρα δεδομένα</string>
+    <string name="error_invalid_url">Μη έγκυρος σύνδεσμος</string>
+    <string name="error">Σφάλμα</string>
+    <string name="subtitles_remove_captions">Αφαίρεση closed captions (για άτομα με προβλήματα ακοής) από τους υπότιτλους</string>
+    <string name="subtitles_remove_bloat">Αφαίρεση bloat από τους υπότιτλους</string>
+    <string name="subtitles_filter_lang">Φιλτράρισμα ανά την προτεινόμενη γλώσσα του μέσου</string>
+    <string name="extras">Έξτρα</string>
+    <string name="trailer">Τρέιλερ</string>
+    <string name="network_adress_example">Σύνδεσμος για stream</string>
+    <string name="referer">Παραπομπή</string>
+    <string name="next">Επόμενο</string>
+    <string name="provider_languages_tip">Παρακολούθηση βίντεο σε αυτή την γλώσσα</string>
+    <string name="previous">Προηγούμενο</string>
+    <string name="skip_setup">Παράλειψη διαμόρφωσης</string>
+    <string name="app_layout_subtext">Αλλαγή της εμφάνισης της συσκευής για να ταιριάζει με την συσκευή σας</string>
+    <string name="crash_reporting_title">Αναφορά κατάρρευσης</string>
+    <string name="preferred_media_subtext">Τι θα θέλατε να δείτε</string>
+    <string name="setup_done">Έγινε</string>
+    <string name="extensions">Πρόσθετα</string>
+    <string name="add_repository">Προσθήκη αποθετηρίου</string>
+    <string name="repository_name_hint">Όνομα αποθετηρίου</string>
+    <string name="repository_url_hint">Σύνδεσμος αποθετηρίου</string>
+    <string name="plugin_loaded">Το πρόσθετο φορτώθηκε</string>
+    <string name="plugin_deleted">Το πρόσθετο διαγράφηκε</string>
+    <string name="plugin_load_fail" formatted="true">Απέτυχε να φορτωθεί το %s</string>
+    <string name="batch_download_start_format" formatted="true">Ξεκίνησε η λήψη %d %s</string>
+        <string name="batch_download_finish_format" formatted="true">Κατέβηκε το %d %s επιτυχώς</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Όλα τα %s έχουν ήδη κατέβει</string>
+    <string name="batch_download">Μαζική λήψη</string>
+    <string name="plugin_singular">Πρόσθετο</string>
+    <string name="plugin">Πρόσθετα</string>
+    <string name="delete_repository_plugins">Αυτό θα διαγράψει όλα τα πρόσθετα του αποθετηρίου</string>
+    <string name="delete_repository">Διαγραφή αποθετηρίου</string>
+    <string name="setup_extensions_subtext">Λήψη της λίστας των ιστοσελίδων που θέλετε να δείτε</string>
+    <string name="plugins_downloaded" formatted="true">Κατέβηκε: %d</string>
+    <string name="plugins_disabled" formatted="true">Απενεργοποιήθηκε: %d</string>
+    <string name="plugins_not_downloaded" formatted="true">Δεν κατέβηκε: %d</string>
+    <string name="plugins_updated" formatted="true">Ενημερώθηκαν %d πρόσθετα</string>
+    <string name="blank_repo_message">Προσθήκη ενός αποθετηρίου για να εγκαταστήσετε πρόσθετα ιστοσελίδας</string>
+    <string name="view_public_repositories_button">Προβολή αποθετηρίων κοινότητας</string>
+    <string name="view_public_repositories_button_short">Δημόσια λίστα</string>
+    <string name="uppercase_all_subtitles">Κεφαλοποίηση υποτίτλων</string>
+    
+    <string name="download_all_plugins_from_repo">Λήψη όλων των προσθέτων από αυτό το αποθετήριο;</string>
+    <string name="single_plugin_disabled" formatted="true">%s (Απενεργοποιήθηκε)</string>
+    <string name="tracks">Κομμάτια</string>
+    <string name="audio_tracks">Ηχητικά κομμάτια</string>
+    <string name="video_tracks">Κομμάτια βίντεο</string>
+    <string name="apply_on_restart">Εφαρμογή στην επανεκκίνηση</string>
+
+    <string name="safe_mode_title">Η ασφαλής λειτουργία ενεργοποιήθηκε</string>
+    <string name="safe_mode_description">Ένα μη αντιστρέψιμο σφάλμα συνέβη και απενεργοποιήσαμε όλα τα πρόσθετα, ώστε να μπορέσετε να διαπιστώσετε ποιο πρόσθετο προκάλεσε αυτή τη κατάρρευση.</string>
+    <string name="safe_mode_crash_info">Προβολή πληροφορίας κατάρρευσης</string>
+
+    <string name="extension_rating" formatted="true">Βαθμολογία: %s</string>
+    <string name="extension_description">Περιγραφή</string>
+    <string name="extension_version">Έκδοση</string>
+    <string name="extension_status">Κατάσταση</string>
+    <string name="extension_size">Μέγεθος</string>
+    <string name="extension_authors">Συγγραφείς</string>
+    <string name="extension_types">Υποστηρίζονται</string>
+    <string name="extension_language">Γλώσσα</string>
+    <string name="extension_install_first">Εγκατάσταση προσθέτου πρώτα</string>
+
+    <string name="hls_playlist">HLS Playlist</string>
+
+    <string name="player_pref">Προτεινόμενο πρόγραμμα αναπαραγωγής</string>
+    <string name="player_settings_play_in_app">Ενσωματωμένο πρόγραμμα αναπαραγωγής</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="player_settings_play_in_browser">Περιηγητής</string>
+    <string name="app_not_found_error">Η εφαρμογή δεν βρέθηκε</string>
+    
+    
 </resources>

From 98ef6a3f160d73f66095643892858a24f4ed43ce Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Tue, 11 Oct 2022 02:43:56 +0700
Subject: [PATCH 006/273] added Vidmoly & Voe (extractor) (#147)

---
 .../cloudstream3/extractors/Vidmoly.kt        | 69 +++++++++++++++++++
 .../lagradost/cloudstream3/extractors/Voe.kt  | 32 +++++++++
 .../cloudstream3/utils/ExtractorApi.kt        | 30 ++++++--
 3 files changed, 127 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/extractors/Vidmoly.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/extractors/Voe.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidmoly.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidmoly.kt
new file mode 100644
index 00000000..615cfd74
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidmoly.kt
@@ -0,0 +1,69 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+
+class Vidmolyme : Vidmoly() {
+    override val mainUrl = "https://vidmoly.me"
+}
+
+open class Vidmoly : ExtractorApi() {
+    override val name = "Vidmoly"
+    override val mainUrl = "https://vidmoly.to"
+    override val requiresReferer = true
+
+    private fun String.addMarks(str: String): String {
+        return this.replace(Regex("\"?$str\"?"), "\"$str\"")
+    }
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+
+        val script = app.get(
+            url,
+            referer = referer,
+        ).document.select("script")
+            .find { it.data().contains("sources:") }?.data()
+        val videoData = script?.substringAfter("sources: [")
+            ?.substringBefore("],")?.addMarks("file")
+        val subData = script?.substringAfter("tracks: [")?.substringBefore("]")?.addMarks("file")
+            ?.addMarks("label")?.addMarks("kind")
+
+        tryParseJson<Source>(videoData)?.file?.let { m3uLink ->
+            M3u8Helper.generateM3u8(
+                name,
+                m3uLink,
+                "$mainUrl/"
+            ).forEach(callback)
+        }
+
+        tryParseJson<List<SubSource>>("[${subData}]")
+            ?.filter { it.kind == "captions" }?.map {
+                subtitleCallback.invoke(
+                    SubtitleFile(
+                        it.label.toString(),
+                        fixUrl(it.file.toString())
+                    )
+                )
+            }
+
+    }
+
+    private data class Source(
+        @JsonProperty("file") val file: String? = null,
+    )
+
+    private data class SubSource(
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("kind") val kind: String? = null,
+    )
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Voe.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Voe.kt
new file mode 100644
index 00000000..12a76a9b
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Voe.kt
@@ -0,0 +1,32 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper
+
+open class Voe : ExtractorApi() {
+    override val name = "Voe"
+    override val mainUrl = "https://voe.sx"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val res = app.get(url, referer = referer).document
+        val link = res.select("script").find { it.data().contains("const sources") }?.data()
+            ?.substringAfter("\"hls\": \"")?.substringBefore("\",")
+
+        M3u8Helper.generateM3u8(
+            name,
+            link ?: return,
+            "$mainUrl/",
+            headers = mapOf("Origin" to "$mainUrl/")
+        ).forEach(callback)
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 199f0398..ebaaa12b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -1,10 +1,7 @@
 package com.lagradost.cloudstream3.utils
 
 import android.net.Uri
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.USER_AGENT
-import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.extractors.*
 import kotlinx.coroutines.delay
@@ -323,6 +320,9 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Embedgram(),
     Mvidoo(),
     Streamplay(),
+    Vidmoly(),
+    Vidmolyme(),
+    Voe(),
 
     Gdriveplayerapi(),
     Gdriveplayerapp(),
@@ -399,6 +399,28 @@ suspend fun getPostForm(requestUrl: String, html: String): String? {
     ).text
 }
 
+fun ExtractorApi.fixUrl(url: String): String {
+    if (url.startsWith("http") ||
+        // Do not fix JSON objects when passed as urls.
+        url.startsWith("{\"")
+    ) {
+        return url
+    }
+    if (url.isEmpty()) {
+        return ""
+    }
+
+    val startsWithNoHttp = url.startsWith("//")
+    if (startsWithNoHttp) {
+        return "https:$url"
+    } else {
+        if (url.startsWith('/')) {
+            return mainUrl + url
+        }
+        return "$mainUrl/$url"
+    }
+}
+
 abstract class ExtractorApi {
     abstract val name: String
     abstract val mainUrl: String

From a43e950a488637873553d4a46f49a8bb80a86542 Mon Sep 17 00:00:00 2001
From: LagradOst <46196380+Blatzar@users.noreply.github.com>
Date: Mon, 10 Oct 2022 21:51:03 +0200
Subject: [PATCH 007/273] Remove provider language (#141)

---
 .../com/lagradost/cloudstream3/MainAPI.kt     | 30 ++++++++++++-------
 .../ui/setup/SetupFragmentExtensions.kt       |  2 +-
 .../ui/setup/SetupFragmentLanguage.kt         |  2 +-
 .../main/res/navigation/mobile_navigation.xml | 14 +++++++++
 app/src/main/res/xml/settings_providers.xml   |  1 +
 5 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 416a7238..a06dd95e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -17,8 +17,7 @@ import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.loadExtractor
+import com.lagradost.cloudstream3.utils.SubtitleHelper
 import okhttp3.Interceptor
 import java.text.SimpleDateFormat
 import java.util.*
@@ -191,17 +190,26 @@ object APIHolder {
         return list.filter { names.contains(it) }.map { DubStatus.valueOf(it) }.toHashSet()
     }
 
+    /**
+     * Gets all the activated provider languages
+     * Used to obey the preference provider_lang_key
+     * but it turned out too complicated and unnecessary with extensions.
+     **/
     fun Context.getApiProviderLangSettings(): HashSet<String> {
-        val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
-        val hashSet = HashSet<String>()
-        hashSet.add("en") // def is only en
-        val list = settingsManager.getStringSet(
-            this.getString(R.string.provider_lang_key),
-            hashSet.toMutableSet()
-        )
+        val langs = apis.map { it.lang }.toSet()
+            .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) }
+        return langs.toHashSet()
 
-        if (list.isNullOrEmpty()) return hashSet
-        return list.toHashSet()
+//        val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+//        val hashSet = HashSet<String>()
+//        hashSet.add("en") // def is only en
+//        val list = settingsManager.getStringSet(
+//            this.getString(R.string.provider_lang_key),
+//            hashSet.toMutableSet()
+//        )
+//
+//        if (list.isNullOrEmpty()) return hashSet
+//        return list.toHashSet()
     }
 
     fun Context.getApiTypeSettings(): HashSet<TvType> {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
index 43037038..0f11f214 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
@@ -100,7 +100,7 @@ class SetupFragmentExtensions : Fragment() {
             next_btt?.setOnClickListener {
                 // Continue setup
                 if (isSetup)
-                    findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_provider_languages)
+                    findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_media)
                 else
                     findNavController().navigate(R.id.navigation_home)
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
index 71472328..f9268d77 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
@@ -85,7 +85,7 @@ class SetupFragmentLanguage : Fragment() {
                         && PluginManager.getPluginsLocal().isEmpty()
                     //&& PREBUILT_REPOSITORIES.isNotEmpty()
                     ) R.id.action_navigation_global_to_navigation_setup_extensions
-                    else R.id.action_navigation_setup_language_to_navigation_setup_provider_languages
+                    else R.id.action_navigation_setup_language_to_navigation_setup_media
 
                     findNavController().navigate(
                         nextDestination,
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 3c45ee70..94d489fd 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -522,6 +522,13 @@
             app:exitAnim="@anim/exit_anim"
             app:popEnterAnim="@anim/enter_anim"
             app:popExitAnim="@anim/exit_anim" />
+        <action
+            android:id="@+id/action_navigation_setup_language_to_navigation_setup_media"
+            app:destination="@id/navigation_setup_media"
+            app:enterAnim="@anim/enter_anim"
+            app:exitAnim="@anim/exit_anim"
+            app:popEnterAnim="@anim/enter_anim"
+            app:popExitAnim="@anim/exit_anim" />
     </fragment>
 
     <action
@@ -553,6 +560,13 @@
             app:exitAnim="@anim/exit_anim"
             app:popEnterAnim="@anim/enter_anim"
             app:popExitAnim="@anim/exit_anim" />
+        <action
+            android:id="@+id/action_navigation_setup_extensions_to_navigation_setup_media"
+            app:destination="@id/navigation_setup_media"
+            app:enterAnim="@anim/enter_anim"
+            app:exitAnim="@anim/exit_anim"
+            app:popEnterAnim="@anim/enter_anim"
+            app:popExitAnim="@anim/exit_anim" />
     </fragment>
 
     <fragment
diff --git a/app/src/main/res/xml/settings_providers.xml b/app/src/main/res/xml/settings_providers.xml
index a177865b..86857653 100644
--- a/app/src/main/res/xml/settings_providers.xml
+++ b/app/src/main/res/xml/settings_providers.xml
@@ -2,6 +2,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto">
     <Preference
+            app:isPreferenceVisible="false"
             android:icon="@drawable/ic_baseline_language_24"
             android:key="@string/provider_lang_key"
             android:title="@string/provider_lang_settings" />

From fc7e39e3ccd0a18ec2cf95a445d3f481a58b3473 Mon Sep 17 00:00:00 2001
From: SANCTI-afk <63229113+SANCTI-afk@users.noreply.github.com>
Date: Mon, 10 Oct 2022 21:58:28 +0200
Subject: [PATCH 008/273] arabicLanguage (#118)

* arabicLanguage100%

* Update strings.xml

* Arabic Full

* translated(preffVplayerBtn)
---
 app/src/main/res/values-ar/strings.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 3fb2e26c..edac2760 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -13,16 +13,16 @@
 
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">سرعة (%.2fx)</string>
-    <string name="rated_format" formatted="true">Rated: %.1f</string>
+    <string name="rated_format" formatted="true">تقييم: %.1f</string>
 
-    <string name="new_update_format" formatted="true">!تم إيجاد تحديث جديد\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">!تم العثور علي تحديث جديد\n%s -> %s</string>
     <string name="duration_format" formatted="true">%d دقيقة</string>
 
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">تشغيل بواسطة CloudStream</string>
     <string name="title_home">الصفحة الرئيسية</string>
     <string name="title_search">البحث</string>
-    <string name="title_downloads">التحميلات</string>
+    <string name="title_downloads">التنزيلات</string>
     <string name="title_settings">الإعدادات</string>
 
     <string name="search_hint">…بحث</string>
@@ -210,14 +210,14 @@
     <string name="no_season">لا موسم</string>
     <string name="episode">حلقة</string>
     <string name="episodes">حلقات</string>
-    <string name="season_short">ح</string>
-    <string name="episode_short">م</string>
+    <string name="season_short">م</string>
+    <string name="episode_short">ح</string>
     <string name="no_episodes_found">لم يتم العثور على أي حلقات</string>
 
     <string name="delete_file">حذف الملف</string>
     <string name="delete">حذف</string>
     <string name="pause">إيقاف مؤقت</string>
-    <string name="resume">أكمل</string>
+    <string name="resume">إستئناف</string>
     <string name="go_back_30">-٣٠</string>
     <string name="go_forward_30">+٣٠</string>
     <string name="delete_message">سوف يتم الحذف نهائيا %s\nهل أنت متأكد?</string>
@@ -292,7 +292,7 @@
     <string name="show_title_key" translatable="false">show_title_key</string>
     <string name="poster_ui_settings">التحكم في عناصر الواجهة علي الملصق </string>
 
-    <string name="no_update_found">لم يتم العثور على تحديث</string>
+    <string name="no_update_found">لم يتم العثور على تحديثات</string>
     <string name="check_for_update">تحقق من التحديثات</string>
 
     <string name="video_lock">قفل</string>
@@ -404,7 +404,7 @@
     <string name="add_sync">إضافة تتبع</string>
     <string name="added_sync_format" formatted="true">تم إضافة %s</string>
     <string name="upload_sync">مزامنة</string>
-    <string name="sync_score">مقيّم</string>
+    <string name="sync_score">تقييم</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
@@ -538,4 +538,5 @@
     <string name="extension_language">اللغة</string>
 
     <string name="hls_playlist">قائمة HLS</string>
+    <string name="player_pref">مُشغل الفيديو المفضل</string>
 </resources>

From a565319ecb60d3e1f8519619776337126ad92161 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Mon, 10 Oct 2022 23:57:50 +0200
Subject: [PATCH 009/273] Remove links to website in app & fix plugin deletion
 bug

---
 .../settings/extensions/ExtensionsFragment.kt | 41 ++++++++---------
 .../settings/extensions/PluginsViewModel.kt   | 44 ++++++++++++++-----
 .../ui/setup/SetupFragmentExtensions.kt       | 24 +++++-----
 app/src/main/res/layout/add_repo_input.xml    | 19 ++++----
 .../main/res/layout/fragment_extensions.xml   | 12 ++---
 .../res/layout/fragment_setup_extensions.xml  | 22 +++++-----
 app/src/main/res/values/strings.xml           |  2 +-
 7 files changed, 89 insertions(+), 75 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
index 8480c94d..f674cafe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
@@ -16,7 +16,6 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
-import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainActivity.Companion.afterRepositoryLoadedEvent
 import com.lagradost.cloudstream3.R
@@ -25,7 +24,6 @@ import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.plugins.RepositoryManager
 import com.lagradost.cloudstream3.ui.result.setText
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.utils.AppUtils.downloadAllPluginsDialog
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
@@ -34,7 +32,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.widget.LinearRecycleViewLayoutManager
 import kotlinx.android.synthetic.main.add_repo_input.*
 import kotlinx.android.synthetic.main.fragment_extensions.*
-import kotlinx.android.synthetic.main.fragment_extensions.list_repositories
 
 const val PUBLIC_REPOSITORIES_LIST = "https://recloudstream.github.io/repos/"
 
@@ -128,20 +125,20 @@ class ExtensionsFragment : Fragment() {
             }
         }
 
-        list_repositories?.setOnClickListener {
-            // Open webview on tv if browser fails
-            val isTv = isTvSettings()
-            openBrowser(PUBLIC_REPOSITORIES_LIST, isTv, this)
-
-            // Set clipboard on TV because the browser might not exist or work properly
-            if (isTv) {
-                val serviceClipboard =
-                    (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?)
-                        ?: return@setOnClickListener
-                val clip = ClipData.newPlainText("Repository url", PUBLIC_REPOSITORIES_LIST)
-                serviceClipboard.setPrimaryClip(clip)
-            }
-        }
+//        list_repositories?.setOnClickListener {
+//            // Open webview on tv if browser fails
+//            val isTv = isTvSettings()
+//            openBrowser(PUBLIC_REPOSITORIES_LIST, isTv, this)
+//
+//            // Set clipboard on TV because the browser might not exist or work properly
+//            if (isTv) {
+//                val serviceClipboard =
+//                    (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?)
+//                        ?: return@setOnClickListener
+//                val clip = ClipData.newPlainText("Repository url", PUBLIC_REPOSITORIES_LIST)
+//                serviceClipboard.setPrimaryClip(clip)
+//            }
+//        }
 
         observe(extensionViewModel.pluginStats) {
             when (it) {
@@ -200,11 +197,11 @@ class ExtensionsFragment : Fragment() {
                 }
             }
 
-            dialog.list_repositories?.setOnClickListener {
-                // Open webview on tv if browser fails
-                openBrowser(PUBLIC_REPOSITORIES_LIST, isTvSettings(), this)
-                dialog.dismissSafe()
-            }
+//            dialog.list_repositories?.setOnClickListener {
+//                // Open webview on tv if browser fails
+//                openBrowser(PUBLIC_REPOSITORIES_LIST, isTvSettings(), this)
+//                dialog.dismissSafe()
+//            }
 
 //            dialog.text2?.text = provider.name
             dialog.apply_btt?.setOnClickListener secondListener@{
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
index 6d94f91e..b0e253be 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
@@ -12,7 +12,6 @@ import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.apmap
 import com.lagradost.cloudstream3.mvvm.launchSafe
-import com.lagradost.cloudstream3.plugins.PluginData
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.PluginManager.getPluginPath
 import com.lagradost.cloudstream3.plugins.RepositoryManager
@@ -21,8 +20,8 @@ import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
-import kotlinx.coroutines.launch
 import me.xdrop.fuzzywuzzy.FuzzySearch
+import java.io.File
 
 typealias Plugin = Pair<String, SitePlugin>
 /**
@@ -47,7 +46,11 @@ class PluginsViewModel : ViewModel() {
         private val repositoryCache: MutableMap<String, List<Plugin>> = mutableMapOf()
         const val TAG = "PLG"
 
-        private fun isDownloaded(context: Context, pluginName: String, repositoryUrl: String): Boolean {
+        private fun isDownloaded(
+            context: Context,
+            pluginName: String,
+            repositoryUrl: String
+        ): Boolean {
             return getPluginPath(context, pluginName, repositoryUrl).exists()
         }
 
@@ -73,7 +76,13 @@ class PluginsViewModel : ViewModel() {
                 if (activity == null) return@ioSafe
                 val plugins = getPlugins(repositoryUrl)
 
-                plugins.filter { plugin -> !isDownloaded(activity, plugin.second.internalName, repositoryUrl) }.also { list ->
+                plugins.filter { plugin ->
+                    !isDownloaded(
+                        activity,
+                        plugin.second.internalName,
+                        repositoryUrl
+                    )
+                }.also { list ->
                     main {
                         showToast(
                             activity,
@@ -133,9 +142,13 @@ class PluginsViewModel : ViewModel() {
         if (activity == null) return@ioSafe
         val (repo, metadata) = plugin
 
-        val file = getPluginPath(activity, plugin.second.internalName, plugin.first)
+        val file = if (isLocal) File(plugin.second.url) else getPluginPath(
+            activity,
+            plugin.second.internalName,
+            plugin.first
+        )
 
-        val (success, message) = if (file.exists() || isLocal) {
+        val (success, message) = if (file.exists()) {
             PluginManager.deletePlugin(file) to R.string.plugin_deleted
         } else {
             PluginManager.downloadAndLoadPlugin(
@@ -167,7 +180,9 @@ class PluginsViewModel : ViewModel() {
         }
 
         this.plugins = list
-        _filteredPlugins.postValue(false to list.filterTvTypes().filterLang().sortByQuery(currentQuery))
+        _filteredPlugins.postValue(
+            false to list.filterTvTypes().filterLang().sortByQuery(currentQuery)
+        )
     }
 
     // Perhaps can be optimized?
@@ -175,7 +190,8 @@ class PluginsViewModel : ViewModel() {
         if (tvTypes.isEmpty()) return this
         return this.filter {
             (it.plugin.second.tvTypes?.any { type -> tvTypes.contains(type) } == true) ||
-            (tvTypes.contains("Others") && (it.plugin.second.tvTypes ?: emptyList()).isEmpty())
+                    (tvTypes.contains("Others") && (it.plugin.second.tvTypes
+                        ?: emptyList()).isEmpty())
         }
     }
 
@@ -199,7 +215,9 @@ class PluginsViewModel : ViewModel() {
     }
 
     fun updateFilteredPlugins() {
-        _filteredPlugins.postValue(false to plugins.filterTvTypes().filterLang().sortByQuery(currentQuery))
+        _filteredPlugins.postValue(
+            false to plugins.filterTvTypes().filterLang().sortByQuery(currentQuery)
+        )
     }
 
     fun updatePluginList(context: Context?, repositoryUrl: String) = viewModelScope.launchSafe {
@@ -210,7 +228,9 @@ class PluginsViewModel : ViewModel() {
 
     fun search(query: String?) {
         currentQuery = query
-        _filteredPlugins.postValue(true to (filteredPlugins.value?.second?.sortByQuery(query) ?: emptyList()))
+        _filteredPlugins.postValue(
+            true to (filteredPlugins.value?.second?.sortByQuery(query) ?: emptyList())
+        )
     }
 
     /**
@@ -226,6 +246,8 @@ class PluginsViewModel : ViewModel() {
             }
 
         plugins = downloadedPlugins
-        _filteredPlugins.postValue(false to downloadedPlugins.filterTvTypes().filterLang().sortByQuery(currentQuery))
+        _filteredPlugins.postValue(
+            false to downloadedPlugins.filterTvTypes().filterLang().sortByQuery(currentQuery)
+        )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
index 43037038..7b7e5458 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
@@ -7,21 +7,16 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
-import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
 import com.lagradost.cloudstream3.MainActivity.Companion.afterRepositoryLoadedEvent
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.plugins.RepositoryManager
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
-import com.lagradost.cloudstream3.ui.settings.extensions.PUBLIC_REPOSITORIES_LIST
 import com.lagradost.cloudstream3.ui.settings.extensions.PluginsViewModel
 import com.lagradost.cloudstream3.ui.settings.extensions.RepoAdapter
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import kotlinx.android.synthetic.main.fragment_extensions.blank_repo_screen
-import kotlinx.android.synthetic.main.fragment_extensions.list_repositories
 import kotlinx.android.synthetic.main.fragment_extensions.repo_recycler_view
-import kotlinx.android.synthetic.main.fragment_setup_extensions.*
 import kotlinx.android.synthetic.main.fragment_setup_media.next_btt
 import kotlinx.android.synthetic.main.fragment_setup_media.prev_btt
 import kotlinx.android.synthetic.main.fragment_setup_media.setup_root
@@ -64,18 +59,19 @@ class SetupFragmentExtensions : Fragment() {
             val hasRepos = repositories.isNotEmpty()
             repo_recycler_view?.isVisible = hasRepos
             blank_repo_screen?.isVisible = !hasRepos
-            view_public_repositories_button?.isVisible = hasRepos
+//            view_public_repositories_button?.isVisible = hasRepos
 
             if (hasRepos) {
                 repo_recycler_view?.adapter = RepoAdapter(true, {}, {
                     PluginsViewModel.downloadAll(activity, it.url, null)
                 }).apply { updateList(repositories) }
-            } else {
-                list_repositories?.setOnClickListener {
-                    // Open webview on tv if browser fails
-                    openBrowser(PUBLIC_REPOSITORIES_LIST, isTvSettings(), this)
-                }
             }
+//            else {
+//                list_repositories?.setOnClickListener {
+//                    // Open webview on tv if browser fails
+//                    openBrowser(PUBLIC_REPOSITORIES_LIST, isTvSettings(), this)
+//                }
+//            }
         }
     }
 
@@ -84,9 +80,9 @@ class SetupFragmentExtensions : Fragment() {
         context?.fixPaddingStatusbar(setup_root)
         val isSetup = arguments?.getBoolean(SETUP_EXTENSION_BUNDLE_IS_SETUP) ?: false
 
-        view_public_repositories_button?.setOnClickListener {
-            openBrowser(PUBLIC_REPOSITORIES_LIST, isTvSettings(), this)
-        }
+//        view_public_repositories_button?.setOnClickListener {
+//            openBrowser(PUBLIC_REPOSITORIES_LIST, isTvSettings(), this)
+//        }
 
         with(context) {
             if (this == null) return
diff --git a/app/src/main/res/layout/add_repo_input.xml b/app/src/main/res/layout/add_repo_input.xml
index 445e71ec..6f6b4d5b 100644
--- a/app/src/main/res/layout/add_repo_input.xml
+++ b/app/src/main/res/layout/add_repo_input.xml
@@ -28,15 +28,15 @@
             android:textSize="20sp"
             android:textStyle="bold" />
 
-        <com.google.android.material.button.MaterialButton
-            android:nextFocusDown="@id/repo_name_input"
-            android:id="@+id/list_repositories"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            style="@style/WhiteButton"
-            android:layout_width="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:text="@string/view_public_repositories_button_short" />
+<!--        <com.google.android.material.button.MaterialButton-->
+<!--            android:nextFocusDown="@id/repo_name_input"-->
+<!--            android:id="@+id/list_repositories"-->
+<!--            android:nextFocusLeft="@id/apply_btt"-->
+<!--            android:nextFocusRight="@id/cancel_btt"-->
+<!--            style="@style/WhiteButton"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_gravity="center_vertical"-->
+<!--            android:text="@string/view_public_repositories_button_short" />-->
     </LinearLayout>
 
     <TextView
@@ -70,7 +70,6 @@
             android:autofillHints="username"
             android:hint="@string/repository_name_hint"
             android:inputType="text"
-            android:nextFocusUp="@id/list_repositories"
             android:nextFocusLeft="@id/apply_btt"
             android:nextFocusRight="@id/cancel_btt"
             android:nextFocusDown="@id/site_url_input"
diff --git a/app/src/main/res/layout/fragment_extensions.xml b/app/src/main/res/layout/fragment_extensions.xml
index 2601fbc5..7d262bf3 100644
--- a/app/src/main/res/layout/fragment_extensions.xml
+++ b/app/src/main/res/layout/fragment_extensions.xml
@@ -47,12 +47,12 @@
             android:text="@string/blank_repo_message"
             android:textSize="16sp" />
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/list_repositories"
-            style="@style/WhiteButton"
-            android:layout_width="wrap_content"
-            android:nextFocusDown="@id/add_repo_button"
-            android:text="@string/view_public_repositories_button" />
+<!--        <com.google.android.material.button.MaterialButton-->
+<!--            android:id="@+id/list_repositories"-->
+<!--            style="@style/WhiteButton"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:nextFocusDown="@id/add_repo_button"-->
+<!--            android:text="@string/view_public_repositories_button" />-->
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/fragment_setup_extensions.xml b/app/src/main/res/layout/fragment_setup_extensions.xml
index 3ea3f49a..e5288504 100644
--- a/app/src/main/res/layout/fragment_setup_extensions.xml
+++ b/app/src/main/res/layout/fragment_setup_extensions.xml
@@ -44,11 +44,11 @@
             android:text="@string/blank_repo_message"
             android:textSize="16sp" />
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/list_repositories"
-            style="@style/WhiteButton"
-            android:layout_width="wrap_content"
-            android:text="@string/view_public_repositories_button" />
+<!--        <com.google.android.material.button.MaterialButton-->
+<!--            android:id="@+id/list_repositories"-->
+<!--            style="@style/WhiteButton"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:text="@string/view_public_repositories_button" />-->
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
@@ -68,12 +68,12 @@
         android:gravity="bottom|end"
         android:orientation="horizontal">
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/view_public_repositories_button"
-            style="@style/WhiteButton"
-            android:layout_width="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:text="@string/add_repository" />
+<!--        <com.google.android.material.button.MaterialButton-->
+<!--            android:id="@+id/view_public_repositories_button"-->
+<!--            style="@style/WhiteButton"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_gravity="center_vertical|end"-->
+<!--            android:text="@string/add_repository" />-->
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/next_btt"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 924e5eb9..c3ebd29d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -602,7 +602,7 @@
     <string name="plugins_disabled" formatted="true">Disabled: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Not downloaded: %d</string>
     <string name="plugins_updated" formatted="true">Updated %d plugins</string>
-    <string name="blank_repo_message">Add a repository to install site extensions</string>
+    <string name="blank_repo_message">CloudStream has no sites installed by default. You need to install the sites from repositories.\n\nBecause of a brainless DMCA takedown by Sky Uk Limited 🤮 we cannot link the repository sites in app.\n\nJoin our discord for links or search online.</string>
     <string name="view_public_repositories_button">View community repositories</string>
     <string name="view_public_repositories_button_short">Public list</string>
     <string name="uppercase_all_subtitles">Uppercase all subtitles</string>

From 661f8c3c4e8b6ee72f40477d73bd8677db15174e Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Tue, 11 Oct 2022 15:24:16 +0200
Subject: [PATCH 010/273] mini api fix

---
 .../com/lagradost/cloudstream3/MainAPI.kt     | 39 +++++++++++++++----
 .../cloudstream3/ui/APIRepository.kt          | 14 +++++--
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index a06dd95e..e5896434 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -22,7 +22,6 @@ import okhttp3.Interceptor
 import java.text.SimpleDateFormat
 import java.util.*
 import kotlin.math.absoluteValue
-import kotlin.collections.MutableList
 
 const val USER_AGENT =
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
@@ -332,13 +331,24 @@ data class SettingsJson(
 data class MainPageData(
     val name: String,
     val data: String,
+    val horizontalImages: Boolean = false
 )
 
 data class MainPageRequest(
     val name: String,
     val data: String,
+    val horizontalImages: Boolean,
+    //TODO genre selection or smth
 )
 
+fun mainPage(url: String, name: String, horizontalImages: Boolean = false): MainPageData {
+    return MainPageData(name = name, data = url, horizontalImages = horizontalImages)
+}
+
+fun mainPageOf(vararg elements: MainPageData): List<MainPageData> {
+    return elements.toList()
+}
+
 /** return list of MainPageData with url to name, make for more readable code */
 fun mainPageOf(vararg elements: Pair<String, String>): List<MainPageData> {
     return elements.map { (url, name) -> MainPageData(name = name, data = url) }
@@ -347,7 +357,7 @@ fun mainPageOf(vararg elements: Pair<String, String>): List<MainPageData> {
 fun newHomePageResponse(
     name: String,
     list: List<SearchResponse>,
-    hasNext: Boolean? = null
+    hasNext: Boolean? = null,
 ): HomePageResponse {
     return HomePageResponse(
         listOf(HomePageList(name, list)),
@@ -355,6 +365,17 @@ fun newHomePageResponse(
     )
 }
 
+fun newHomePageResponse(
+    data: MainPageRequest,
+    list: List<SearchResponse>,
+    hasNext: Boolean? = null,
+): HomePageResponse {
+    return HomePageResponse(
+        listOf(HomePageList(data.name, list, data.horizontalImages)),
+        hasNext = hasNext ?: list.isNotEmpty()
+    )
+}
+
 fun newHomePageResponse(list: HomePageList, hasNext: Boolean? = null): HomePageResponse {
     return HomePageResponse(listOf(list), hasNext = hasNext ?: list.list.isNotEmpty())
 }
@@ -391,14 +412,17 @@ abstract class MainAPI {
 
     /** if this is turned on then it will request the homepage one after the other,
     used to delay if they block many request at the same time*/
-    open var sequentialMainPage : Boolean = false
+    open var sequentialMainPage: Boolean = false
+
     /** in milliseconds, this can be used to add more delay between homepage requests
      *  on first load if sequentialMainPage is turned on */
-    open var sequentialMainPageDelay : Long = 0L
+    open var sequentialMainPageDelay: Long = 0L
+
     /** in milliseconds, this can be used to add more delay between homepage requests when scrolling */
-    open var sequentialMainPageScrollDelay : Long = 0L
+    open var sequentialMainPageScrollDelay: Long = 0L
+
     /** used to keep track when last homepage request was in unixtime ms */
-    var lastHomepageRequest : Long = 0L
+    var lastHomepageRequest: Long = 0L
 
     open var lang = "en" // ISO_639_1 check SubtitleHelper
 
@@ -431,7 +455,8 @@ abstract class MainAPI {
     open val vpnStatus = VPNStatus.None
     open val providerType = ProviderType.DirectProvider
 
-    open val mainPage = listOf(MainPageData("", ""))
+    //emptyList<MainPageData>() //
+    open val mainPage = listOf(MainPageData("", "", false))
 
     @WorkerThread
     open suspend fun getMainPage(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
index b43b1434..0e5e544b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
@@ -66,7 +66,7 @@ class APIRepository(val api: MainAPI) {
 
     suspend fun waitForHomeDelay() {
         val delta = api.sequentialMainPageScrollDelay + api.lastHomepageRequest - unixTimeMS
-        if(delta < 0) return
+        if (delta < 0) return
         delay(delta)
     }
 
@@ -75,7 +75,7 @@ class APIRepository(val api: MainAPI) {
             api.lastHomepageRequest = unixTimeMS
 
             nameIndex?.let { api.mainPage.getOrNull(it) }?.let { data ->
-                listOf(api.getMainPage(page, MainPageRequest(data.name, data.data)))
+                listOf(api.getMainPage(page, MainPageRequest(data.name, data.data, data.horizontalImages)))
             } ?: run {
                 if (api.sequentialMainPage) {
                     var first = true
@@ -84,11 +84,17 @@ class APIRepository(val api: MainAPI) {
                             delay(api.sequentialMainPageDelay)
                         first = false
 
-                        api.getMainPage(page, MainPageRequest(data.name, data.data))
+                        api.getMainPage(
+                            page,
+                            MainPageRequest(data.name, data.data, data.horizontalImages)
+                        )
                     }
                 } else {
                     api.mainPage.apmap { data ->
-                        api.getMainPage(page, MainPageRequest(data.name, data.data))
+                        api.getMainPage(
+                            page,
+                            MainPageRequest(data.name, data.data, data.horizontalImages)
+                        )
                     }
                 }
             }

From 1228701f0eddb40d0b4b1957068d26b736e8c344 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Thu, 13 Oct 2022 22:58:18 +0200
Subject: [PATCH 011/273] Fix focusing add repo on firestick

---
 .../ui/settings/extensions/ExtensionsFragment.kt             | 5 +++++
 app/src/main/res/layout/fragment_extensions.xml              | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
index f674cafe..418519e2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
@@ -232,6 +232,11 @@ class ExtensionsFragment : Fragment() {
         val isTv = isTrueTvSettings()
         add_repo_button?.isGone = isTv
         add_repo_button_imageview_holder?.isVisible = isTv
+
+        // Band-aid for Fire TV
+        plugin_storage_appbar?.isFocusableInTouchMode = isTv
+        add_repo_button_imageview?.isFocusableInTouchMode = isTv
+
         add_repo_button?.setOnClickListener(addRepositoryClick)
         add_repo_button_imageview?.setOnClickListener(addRepositoryClick)
 
diff --git a/app/src/main/res/layout/fragment_extensions.xml b/app/src/main/res/layout/fragment_extensions.xml
index 7d262bf3..c786e2bc 100644
--- a/app/src/main/res/layout/fragment_extensions.xml
+++ b/app/src/main/res/layout/fragment_extensions.xml
@@ -56,6 +56,7 @@
     </LinearLayout>
 
     <LinearLayout
+        android:focusable="true"
         android:id="@+id/plugin_storage_appbar"
         android:nextFocusRight="@id/add_repo_button_imageview"
         android:layout_width="match_parent"
@@ -185,6 +186,7 @@
                 android:background="@drawable/outline_drawable"
                 android:nextFocusLeft="@id/plugin_storage_appbar"
                 android:layout_gravity="center"
+                android:focusable="true"
 
                 android:id="@+id/add_repo_button_imageview"
                 android:layout_width="40dp"

From 63c713fc6830df7c7d7bb42a8b2bdc183eeb09f9 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 14 Oct 2022 20:18:32 +0200
Subject: [PATCH 012/273] Changed home selection sheet to fully open and allow
 upwards scrolling :)

---
 .../java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt     | 2 ++
 app/src/main/res/layout/home_select_mainpage.xml                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 520b6b99..0d571b76 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -23,6 +23,7 @@ import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearSnapHelper
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.*
@@ -280,6 +281,7 @@ class HomeFragment : Fragment() {
             val builder =
                 BottomSheetDialog(this)
 
+            builder.behavior.state = BottomSheetBehavior.STATE_EXPANDED
             builder.setContentView(R.layout.home_select_mainpage)
             builder.show()
             builder.let { dialog ->
diff --git a/app/src/main/res/layout/home_select_mainpage.xml b/app/src/main/res/layout/home_select_mainpage.xml
index ca9fa517..8546d9b1 100644
--- a/app/src/main/res/layout/home_select_mainpage.xml
+++ b/app/src/main/res/layout/home_select_mainpage.xml
@@ -10,7 +10,7 @@
         android:id="@+id/listview1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-
+        android:nestedScrollingEnabled="true"
         android:layout_rowWeight="1"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="60dp"

From e67d248f7f18f13fa67f668b85ae1c6e96350592 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 14 Oct 2022 23:56:21 +0200
Subject: [PATCH 013/273] Fix searching in repos & search provider selection
 bottom sheet

---
 .../cloudstream3/ui/search/SearchFragment.kt       |  2 ++
 .../ui/settings/extensions/PluginsFragment.kt      | 13 ++++---------
 .../ui/settings/extensions/PluginsViewModel.kt     |  2 +-
 app/src/main/res/menu/repository.xml               | 14 +++++++++-----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 69f8a274..5f108cd1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -17,6 +17,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.*
@@ -232,6 +233,7 @@ class SearchFragment : Fragment() {
                 val builder =
                     BottomSheetDialog(ctx)
 
+                builder.behavior.state = BottomSheetBehavior.STATE_EXPANDED
                 builder.setContentView(R.layout.home_select_mainpage)
                 builder.show()
                 builder.let { dialog ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
index e4435fff..aa302c5a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
@@ -1,27 +1,22 @@
 package com.lagradost.cloudstream3.ui.settings.extensions
 
 import android.os.Bundle
-import android.view.*
-import android.widget.SearchView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.map
-import com.lagradost.cloudstream3.AcraApplication
-import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.getPairList
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.ui.settings.appLanguages
-import com.lagradost.cloudstream3.ui.settings.getCurrentLocale
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 import kotlinx.android.synthetic.main.fragment_plugins.*
 
 const val PLUGINS_BUNDLE_NAME = "name"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
index b0e253be..536dc33b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
@@ -210,7 +210,7 @@ class PluginsViewModel : ViewModel() {
             // Return list to base state if no query
             this.sortedBy { it.plugin.second.name }
         } else {
-            this.sortedBy { -FuzzySearch.ratio(it.plugin.second.name, query) }
+            this.sortedBy { -FuzzySearch.partialRatio(it.plugin.second.name.lowercase(), query.lowercase()) }
         }
     }
 
diff --git a/app/src/main/res/menu/repository.xml b/app/src/main/res/menu/repository.xml
index d44c9764..be99b1a8 100644
--- a/app/src/main/res/menu/repository.xml
+++ b/app/src/main/res/menu/repository.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+<!--        app:searchHintIcon="@drawable/search_icon"-->
+<!--        android:icon="@drawable/search_icon"-->
     <item
         android:id="@+id/search_button"
-        android:icon="@drawable/search_icon"
         android:title="@string/title_search"
-        app:actionViewClass="android.widget.SearchView"
-        app:searchHintIcon="@drawable/search_icon"
-        app:showAsAction="ifRoom" />
+        android:icon="@drawable/search_icon"
+        android:searchIcon="@drawable/search_icon"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="always|collapseActionView"
+        tools:ignore="AppCompatResource" />
     <item
         android:id="@+id/lang_filter"
         android:icon="@drawable/ic_baseline_language_24"

From cf08c958eb74f39c8feab5feab98002ddeb28d8e Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sat, 15 Oct 2022 22:01:16 +0200
Subject: [PATCH 014/273] [skip ci] remove link to site

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 1c9ca358..e7221440 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 # CloudStream
 
 **⚠️ Warning: By default this app doesn't provide any video sources, you have to install extensions in order to add functionality to the app.**
-You can find the list of community-maintained extension repositories [here
-](https://recloudstream.github.io/repos/)
 
 
 [![Discord](https://invidget.switchblade.xyz/5Hus6fM)](https://discord.gg/5Hus6fM)

From 78bf779136bcc97c126a1c32933cdb4de433110f Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sun, 16 Oct 2022 09:47:03 +0200
Subject: [PATCH 015/273] fix merge issue

---
 app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 409da7c6..aa64caa6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -75,8 +75,6 @@ import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.DataStoreHelper.migrateResumeWatching
 import com.lagradost.cloudstream3.utils.DataStoreHelper.setViewPos
-import com.lagradost.cloudstream3.utils.Event
-import com.lagradost.cloudstream3.utils.IOnBackPressed
 import com.lagradost.cloudstream3.utils.InAppUpdater.Companion.runAutoUpdate
 import com.lagradost.cloudstream3.utils.UIHelper.changeStatusBarState
 import com.lagradost.cloudstream3.utils.UIHelper.checkWrite

From f49d9de09be37e26633a8449e637a2525e8c8c48 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sun, 16 Oct 2022 19:42:32 +0200
Subject: [PATCH 016/273] Added CineGrabber Extractor

---
 .../cloudstream3/extractors/GuardareStream.kt | 81 +++++++++++++++----
 .../cloudstream3/utils/ExtractorApi.kt        |  1 +
 2 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/GuardareStream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/GuardareStream.kt
index 57435161..f25cb5ba 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/GuardareStream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/GuardareStream.kt
@@ -1,36 +1,83 @@
 package com.lagradost.cloudstream3.extractors
+
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 
+class CineGrabber : GuardareStream() {
+    override var name = "CineGrabber"
+    override var mainUrl = "https://cinegrabber.com"
+}
+
 open class GuardareStream : ExtractorApi() {
     override var name = "Guardare"
     override var mainUrl = "https://guardare.stream"
     override val requiresReferer = false
 
-    data class GuardareJsonData (
-        @JsonProperty("data") val data : List<GuardareData>,
+    data class GuardareJsonData(
+        @JsonProperty("data") val data: List<GuardareData>,
+        @JsonProperty("captions") val captions: List<GuardareCaptions?>?,
     )
 
-    data class GuardareData (
-        @JsonProperty("file") val file : String,
-        @JsonProperty("label") val label : String,
-        @JsonProperty("type") val type : String
+    data class GuardareData(
+        @JsonProperty("file") val file: String,
+        @JsonProperty("label") val label: String,
+        @JsonProperty("type") val type: String
     )
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val response = app.post(url.replace("/v/","/api/source/"), data = mapOf("d" to mainUrl)).text
-        val jsonvideodata = AppUtils.parseJson<GuardareJsonData>(response)
-        return jsonvideodata.data.map {
-            ExtractorLink(
-                it.file+".${it.type}",
-                this.name,
-                it.file+".${it.type}",
-                mainUrl,
-                it.label.filter{ it.isDigit() }.toInt(),
-                false
+
+    // https://cinegrabber.com/asset/userdata/224879/caption/gqdmzh-71ez76z8/876438.srt
+    data class GuardareCaptions(
+        @JsonProperty("id") val id: String,
+        @JsonProperty("hash") val hash: String,
+        @JsonProperty("language") val language: String?,
+        @JsonProperty("extension") val extension: String
+    ) {
+        fun getUrl(mainUrl: String, userId: String): String {
+            return "$mainUrl/asset/userdata/$userId/caption/$hash/$id.$extension"
+        }
+    }
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val response =
+            app.post(url.replace("/v/", "/api/source/"), data = mapOf("d" to mainUrl)).text
+
+        val jsonVideoData = AppUtils.parseJson<GuardareJsonData>(response)
+        jsonVideoData.data.forEach {
+            callback.invoke(
+                ExtractorLink(
+                    it.file + ".${it.type}",
+                    this.name,
+                    it.file + ".${it.type}",
+                    mainUrl,
+                    it.label.filter { it.isDigit() }.toInt(),
+                    false
+                )
             )
         }
+
+        if (!jsonVideoData.captions.isNullOrEmpty()){
+            val iframe = app.get(url)
+            // var USER_ID = '224879';
+            val userIdRegex = Regex("""USER_ID.*?(\d+)""")
+            val userId = userIdRegex.find(iframe.text)?.groupValues?.getOrNull(1) ?: return
+            jsonVideoData.captions.forEach {
+                if (it == null) return@forEach
+                val subUrl = it.getUrl(mainUrl, userId)
+                subtitleCallback.invoke(
+                    SubtitleFile(
+                        it.language ?: "",
+                        subUrl
+                    )
+                )
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index ebaaa12b..8d6b1b82 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -283,6 +283,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Userload(),
     Supervideo(),
     GuardareStream(),
+    CineGrabber(),
 
     // StreamSB.kt works
     //  SBPlay(),

From a58ca547d7e85c96e7627cf9c712517400b9c55e Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sun, 16 Oct 2022 19:51:00 +0200
Subject: [PATCH 017/273] Apply fixes from CodeFactor (#157)

Co-authored-by: codefactor-io <support@codefactor.io>
---
 .../main/java/com/lagradost/cloudstream3/extractors/Evolaod.kt  | 2 +-
 .../main/java/com/lagradost/cloudstream3/extractors/Uqload.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Evolaod.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Evolaod.kt
index 4a9f2f52..eddbf6df 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Evolaod.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Evolaod.kt
@@ -26,7 +26,7 @@ open class Evoload : ExtractorApi() {
             } else {
                 ""
             }
-        
+
         val cleaned_url = if (lang == "ht") {  // if url doesn't contain a flag and the url starts with http://
             url
         } else {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Uqload.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Uqload.kt
index e5d2875f..5109acc3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Uqload.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Uqload.kt
@@ -25,7 +25,7 @@ open class Uqload : ExtractorApi() {
             } else {
                 ""
             }
-        
+
         val cleaned_url = if (lang == "ht") {  // if url doesn't contain a flag and the url starts with http://
             url
         } else {

From 4848e43c97dac696fc23e03b123ec0a892ce6db6 Mon Sep 17 00:00:00 2001
From: Sdarfeesh <50188628+Sdarfeesh@users.noreply.github.com>
Date: Tue, 18 Oct 2022 18:33:17 +0800
Subject: [PATCH 018/273] Simplified Chinese Correction and Update (#150)

---
 app/src/main/res/values-zh/strings.xml | 225 +++++++++++++------------
 1 file changed, 118 insertions(+), 107 deletions(-)

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index a6557990..8f436fe9 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -12,27 +12,27 @@
     <string name="rating_format" formatted="true" translatable="false">%.1f/10.0</string>
     <string name="year_format" formatted="true" translatable="false">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s 共 %d 集</string>
-    <string name="cast_format" formatted="true">演员： %s</string>
+    <string name="cast_format" formatted="true">演员：%s</string>
     <string name="next_episode_format" formatted="true">第 %d 集将发布于</string>
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
 
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
-    <string name="result_poster_img_des">海报</string>
+    <string name="result_poster_img_des">封面</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
-    <string name="episode_poster_img_des">剧集海报</string>
-    <string name="home_main_poster_img_des">主海报</string>
+    <string name="episode_poster_img_des">剧集封面</string>
+    <string name="home_main_poster_img_des">主封面</string>
     <string name="home_next_random_img_des">随机下一个</string>
     <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
     <string name="go_back_img_des">返回</string>
     <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
-    <string name="home_change_provider_img_des">更改内容提供者</string>
+    <string name="home_change_provider_img_des">更改片源</string>
     <string name="preview_background_img_des">预览背景</string>
 
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
-    <string name="player_speed_text_format" formatted="true">速度 （%.2fx）</string>
-    <string name="rated_format" formatted="true">评分： %.1f</string>
+    <string name="player_speed_text_format" formatted="true">速度（%.2fx）</string>
+    <string name="rated_format" formatted="true">评分：%.1f</string>
     <string name="new_update_format" formatted="true">发现新版本！\n%s -> %s</string>
     <string name="filler" formatted="true">填充</string>
     <string name="duration_format" formatted="true">%d 分钟</string>
@@ -55,7 +55,7 @@
     <string name="result_share">分享</string>
     <string name="result_open_in_browser">在浏览器中打开</string>
     <string name="skip_loading">跳过加载</string>
-    <string name="loading">正在加载…</string>
+    <string name="loading">加载中…</string>
 
     <string name="type_watching">正在观看</string>
     <string name="type_on_hold">暂时搁置</string>
@@ -77,16 +77,16 @@
 
     <string name="download">下载</string>
     <string name="downloaded">已下载</string>
-    <string name="downloading">正在下载</string>
+    <string name="downloading">下载中</string>
     <string name="download_paused">下载暂停</string>
     <string name="download_started">下载开始</string>
     <string name="download_failed">下载失败</string>
     <string name="download_canceled">下载取消</string>
     <string name="download_done">下载完毕</string>
     <string name="download_format" translatable="false">%s - %s</string>
-    <string name="stream">流媒体</string>
+    <string name="stream">播放</string>
 
-    <string name="error_loading_links_toast">加载链接时出错</string>
+    <string name="error_loading_links_toast">加载链接错误</string>
     <string name="download_storage_text">内部存储</string>
 
     <string name="app_dubbed_text">配音</string>
@@ -125,33 +125,33 @@
     <string name="subs_font">字体</string>
     <string name="subs_font_size">字体大小</string>
 
-    <string name="search_provider_text_providers">按内容提供者搜索</string>
+    <string name="search_provider_text_providers">按片源搜索</string>
     <string name="search_provider_text_types">按类型搜索</string>
 
-    <string name="benene_count_text">送给开发者 %d 根香蕉</string>
+    <string name="benene_count_text">给开发者送 %d 根香蕉</string>
     <string name="benene_count_text_none">不送香蕉</string>
 
     <string name="subs_auto_select_language">自动选择语言</string>
     <string name="subs_download_languages">下载语言</string>
     <string name="subs_subtitle_languages">字幕语言</string>
     <string name="subs_hold_to_reset_to_default">按住重置为默认值</string>
-    <string name="subs_import_text" formatted="true">将字体置于 %s 导入</string>
+    <string name="subs_import_text" formatted="true">将字体导入到 %s</string>
     <string name="continue_watching">继续观看</string>
 
     <string name="action_remove_watching">移除</string>
     <string name="action_open_watching">更多信息</string>
     <string name="action_open_play">@string/home_play </string>
 
-    <string name="vpn_might_be_needed">此内容提供者可能需要 VPN 才能正常工作</string>
-    <string name="vpn_torrent">此内容提供者是一个种子 ，建议使用 VPN</string>
+    <string name="vpn_might_be_needed">此片源可能需要 VPN 才能正常使用</string>
+    <string name="vpn_torrent">此片源是种子，建议使用 VPN</string>
 
     <string name="provider_info_meta">站点不提供元数据，如果站点上不存在元数据，视频加载将失败。</string>
 
     <string name="torrent_plot">简介</string>
-    <string name="normal_no_plot">没有找到简介</string>
-    <string name="torrent_no_plot">没有找到简介</string>
+    <string name="normal_no_plot">未找到简介</string>
+    <string name="torrent_no_plot">未找到简介</string>
 
-    <string name="show_log_cat">显示日志</string>
+    <string name="show_log_cat">显示日志 🐈</string>
 
     <string name="picture_in_picture">画中画</string>
     <string name="picture_in_picture_des">在其他应用之上的迷你播放器中继续播放</string>
@@ -162,24 +162,24 @@
     <string name="chromecast_subtitles_settings">投屏字幕</string>
     <string name="chromecast_subtitles_settings_des">投屏字幕设置</string>
 
-    <string name="eigengraumode_settings">本征模式</string>
+    <string name="eigengraumode_settings">倍速模式</string>
     <string name="eigengraumode_settings_des">在播放器中添加播放速度选项</string>
     <string name="swipe_to_seek_settings">滑动控制进度</string>
-    <string name="swipe_to_seek_settings_des">向屏幕左侧或右侧滑动来控制播放进度</string>
+    <string name="swipe_to_seek_settings_des">左右滑动控制播放进度</string>
     <string name="swipe_to_change_settings">滑动更改设置</string>
-    <string name="swipe_to_change_settings_des">在屏幕左侧或右侧滑动来更改亮度或音量</string>
+    <string name="swipe_to_change_settings_des">上下滑动修改亮度或音量</string>
 
     <string name="autoplay_next_settings">自动播放下一集</string>
-    <string name="autoplay_next_settings_des">当前一集结束时开始下一集</string>
+    <string name="autoplay_next_settings_des">播放完毕后播放下一集</string>
 
     <string name="double_tap_to_seek_settings">双击控制进度</string>
     <string name="double_tap_to_pause_settings">双击暂停</string>
-    <string name="double_tap_to_seek_amount_settings">播放器快进或快退时间</string>
-    <string name="double_tap_to_seek_settings_des">在屏幕左侧或右侧双击来快进或快退
+    <string name="double_tap_to_seek_amount_settings">双击控制进度时间</string>
+    <string name="double_tap_to_seek_settings_des">在左右侧双击快进或快退
     </string>
-    <string name="double_tap_to_pause_settings_des">双击屏幕中间暂停</string>
+    <string name="double_tap_to_pause_settings_des">双击中间暂停</string>
     <string name="use_system_brightness_settings">使用系统亮度</string>
-    <string name="use_system_brightness_settings_des">在应用播放器中使用系统亮度，而不是黑色遮罩
+    <string name="use_system_brightness_settings_des">在应用播放器中使用系统亮度替代黑色遮罩
     </string>
 
     <string name="episode_sync_settings">更新观看进度</string>
@@ -189,48 +189,49 @@
 
     <string name="backup_settings">备份数据</string>
     <string name="restore_success">已加载备份文件</string>
-    <string name="restore_failed_format" formatted="true">无法从文件 %s 中还原数据</string>
-    <string name="backup_success">成功存储数据</string>
+    <string name="restore_failed_format" formatted="true">无法从 %s 文件中还原数据</string>
+    <string name="backup_success">成功保存数据</string>
     <string name="backup_failed">缺少存储权限，请重试</string>
-    <string name="backup_failed_error_format">备份 %s 时出错</string>
+    <string name="backup_failed_error_format">备份 %s 出错</string>
 
     <string name="search">搜索</string>
     <string name="category_account">账户</string>
-    <string name="category_updates">更新和备份</string>
-    
+    <string name="category_updates">更新与备份</string>
+
     <string name="settings_info">信息</string>
     <string name="advanced_search">高级搜索</string>
-    <string name="advanced_search_des">给出按内容提供者分隔的搜索结果</string>
-    <string name="bug_report_settings_off">只发送关于崩溃的数据</string>
+    <string name="advanced_search_des">按片源分割搜索结果</string>
+    <string name="bug_report_settings_off">仅发送关于崩溃的数据</string>
     <string name="bug_report_settings_on">不发送数据</string>
-    <string name="show_fillers_settings">为动画显示下一集</string>
+    <string name="show_fillers_settings">显示动画外传</string>
     <string name="show_trailers_settings">显示预告片</string>
-    <string name="kitsu_settings">显示来自 Kitsu 的海报</string>
-    <string name="pref_filter_search_quality">在搜索结果中隐藏选中视频质量</string>
+    <string name="kitsu_settings">显示来自 Kitsu 的封面</string>
+    <string name="pref_filter_search_quality">在搜索结果中隐藏选中视频画质</string>
 
     <string name="automatic_plugin_updates">自动更新插件</string>
     <string name="updates_settings">显示应用更新</string>
     <string name="updates_settings_des">启动时自动搜索更新</string>
     <string name="uprereleases_settings">更新至预览版</string>
-    <string name="uprereleases_settings_des">搜索预览版更新，而不是仅搜索完整版本</string>
+    <string name="uprereleases_settings_des">搜索预览版更新替代仅搜索完整版本</string>
     <string name="github">Github</string>
-    <string name="lightnovel">由同一开发者开发的轻小说应用</string>
-    <string name="anim">由同一开发者开发的动漫应用</string>
+    <string name="lightnovel">由相同开发者开发的轻小说应用</string>
+    <string name="anim">由相同开发者开发的动漫应用</string>
     <string name="discord">加入 Discord</string>
-    <string name="benene">送给开发者一根香蕉</string>
+    <string name="benene">给开发者送一根香蕉</string>
     <string name="benene_des">送香蕉</string>
 
     <string name="app_language">应用语言</string>
 
-    <string name="no_chromecast_support_toast">此内容提供者不支持投屏</string>
+    <string name="no_chromecast_support_toast">此片源不支持投屏</string>
     <string name="no_links_found_toast">未找到链接</string>
-    <string name="copy_link_toast">链接已复制到剪贴板</string>
+    <string name="copy_link_toast">连接已复制到剪贴板</string>
     <string name="play_episode_toast">播放剧集</string>
     <string name="subs_default_reset_toast">重置为默认值</string>
-    <string name="acra_report_toast">抱歉，应用崩溃了，将向开发人员发送一份匿名错误报告
+    <string name="acra_report_toast">抱歉，应用崩溃了，将发送一份匿名错误报告给开发者
     </string>
 
     <string name="season">季</string>
+    <string name="season_format">%s %d%s</string>
     <string name="no_season">无季</string>
     <string name="episode">集</string>
     <string name="episodes">集</string>
@@ -247,8 +248,8 @@
     <string name="resume">继续</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">这将永久删除 %s\n确定吗？</string>
-    <string name="resume_time_left" formatted="true">剩余 %dm 分钟\n</string>
+    <string name="delete_message" formatted="true">这将永久删除 %s\n您确定吗?</string>
+    <string name="resume_time_left" formatted="true">剩余 %d 分钟</string>
 
 
     <string name="status_ongoing">连载中</string>
@@ -256,11 +257,11 @@
     <string name="status">状态</string>
     <string name="year">年份</string>
     <string name="rating">评分</string>
-    <string name="duration">持续时间</string>
+    <string name="duration">时间</string>
     <string name="site">网站</string>
     <string name="synopsis">简介</string>
 
-    <string name="queued">队列</string>
+    <string name="queued">已加入队列</string>
     <string name="no_subtitles">无字幕</string>
     <string name="default_subtitles">默认</string>
 
@@ -270,29 +271,29 @@
 
     <!--plural-->
     <string name="movies">电影</string>
-    <string name="tv_series">剧集</string>
+    <string name="tv_series">电视剧</string>
     <string name="cartoons">卡通</string>
     <string name="anime">动漫</string>
     <string name="torrent">种子</string>
     <string name="documentaries">纪录片</string>
-    <string name="ova">原创影像动画</string>
+    <string name="ova">OVA</string>
     <string name="asian_drama">亚洲剧</string>
     <string name="livestreams">直播</string>
-    <string name="nsfw">工作场所不宜</string>
-    <string name="others">视频</string>
+    <string name="nsfw">NSFW</string>
+    <string name="others">其他</string>
 
     <!--singular-->
     <string name="movies_singular">电影</string>
-    <string name="tv_series_singular">剧集</string>
+    <string name="tv_series_singular">电视剧</string>
     <string name="cartoons_singular">卡通</string>
-    <string name="anime_singular">动漫</string>
-    <string name="ova_singular">原创影像动画</string>
+    <string name="anime_singular">@string/anime</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="torrent_singular">种子</string>
     <string name="documentaries_singular">纪录片</string>
     <string name="asian_drama_singular">亚洲剧</string>
     <string name="live_singular">直播</string>
-    <string name="nsfw_singular">工作场所不宜</string>
-    <string name="other_singular">视频</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="other_singular">其他</string>
 
     <string name="source_error">来源错误</string>
     <string name="remote_error">远程错误</string>
@@ -308,10 +309,10 @@
     <string name="episode_action_copy_link">复制链接</string>
     <string name="episode_action_auto_download">自动下载</string>
     <string name="episode_action_download_mirror">下载镜像</string>
-    <string name="episode_action_reload_links">重新加载镜像</string>
+    <string name="episode_action_reload_links">重新加载链接</string>
     <string name="episode_action_download_subtitle">下载字幕</string>
 
-    <string name="show_hd">质量标签</string>
+    <string name="show_hd">画质标签</string>
     <string name="show_dub">配音标签</string>
     <string name="show_sub">字幕标签</string>
     <string name="show_title">标题</string>
@@ -319,7 +320,7 @@
     <string name="show_dub_key" translatable="false">show_dub_key</string>
     <string name="show_sub_key" translatable="false">show_sub_key</string>
     <string name="show_title_key" translatable="false">show_title_key</string>
-    <string name="poster_ui_settings">开关海报上的 UI 元素</string>
+    <string name="poster_ui_settings">封面内容</string>
 
     <string name="no_update_found">未找到更新</string>
     <string name="check_for_update">检查更新</string>
@@ -327,37 +328,37 @@
     <string name="video_lock">锁定</string>
     <string name="video_aspect_ratio_resize">调整画面</string>
     <string name="video_source">来源</string>
-    <string name="video_skip_op">跳过片头曲</string>
+    <string name="video_skip_op">跳过片头</string>
 
     <string name="dont_show_again">不再显示</string>
     <string name="skip_update">跳过此更新</string>
     <string name="update">更新</string>
-    <string name="watch_quality_pref">首选播放质量</string>
-    <string name="limit_title">视频播放器标题最大字符数</string>
-    <string name="limit_title_rez">视频播放器分辨率</string>
+    <string name="watch_quality_pref">首选播放画质</string>
+    <string name="limit_title">视频播放器标题最多字符</string>
+    <string name="limit_title_rez">视频播放器标题</string>
 
     <string name="video_buffer_size_settings">视频缓冲大小</string>
-    <string name="video_buffer_length_settings">视频缓冲时长</string>
-    <string name="video_buffer_disk_settings">磁盘上的视频缓存</string>
-    <string name="video_buffer_clear_settings">清除视频和图像缓存</string>
+    <string name="video_buffer_length_settings">视频缓冲长度</string>
+    <string name="video_buffer_disk_settings">视频缓存存储</string>
+    <string name="video_buffer_clear_settings">清除视频与图像缓存</string>
 
-    <string name="video_ram_description">如果设置太高，可能会在内存较低的系统（如 Android TV 设备或旧手机）上导致问题</string>
-    <string name="video_disk_description">如果将存储空间设置得太高，可能会导致 Android TV 设备等存储空间不足的系统出现问题</string>
+    <string name="video_ram_description">设置过高可能导致崩溃。如果您使用如 Android TV 或旧手机此类低内存设备，请勿修改</string>
+    <string name="video_disk_description">设置过高可能导致如 Android TV 此类低存储空间设备出现系统问题</string>
 
     <string name="dns_pref">DNS over HTTPS</string>
-    <string name="dns_pref_summary">用于绕过 ISP 的封锁</string>
+    <string name="dns_pref_summary">防止 DNS 劫持</string>
 
-    <string name="add_site_pref">克隆网站</string>
-    <string name="remove_site_pref">移除网站</string>
-    <string name="add_site_summary">添加现有站点具有不同的 URL 的克隆</string>
+    <string name="add_site_pref">复制片源</string>
+    <string name="remove_site_pref">移除片源</string>
+    <string name="add_site_summary">添加不同链接的已有片源复制</string>
 
     <string name="download_path_pref">下载路径</string>
 
-    <string name="nginx_url_pref">Nginx 服务器 URL</string>
+    <string name="nginx_url_pref">Nginx 服务器链接</string>
 
-    <string name="display_subbed_dubbed_settings">显示有配音或字幕的动画</string>
+    <string name="display_subbed_dubbed_settings">显示有配音/字幕的动漫</string>
 
-    <string name="resize_fit">适应屏幕</string>
+    <string name="resize_fit">适应</string>
     <string name="resize_fill">拉伸</string>
     <string name="resize_zoom">缩放</string>
 
@@ -379,15 +380,15 @@
         responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
         CloudStream 3 at your own risk.
     </string>
-    <string name="category_general">全局</string>
+    <string name="category_general">通用</string>
     <string name="random_button_settings">随机按钮</string>
     <string name="random_button_settings_desc">在主页中显示随机按钮</string>
-    <string name="provider_lang_settings">内容提供者语言</string>
+    <string name="provider_lang_settings">片源语言</string>
     <string name="app_layout">应用布局</string>
-    <string name="preferred_media_settings">首选媒体</string>
-    <string name="enable_nsfw_on_providers">在支持的内容提供者中开启工作场所不宜内容</string>
+    <string name="preferred_media_settings">首选类型</string>
+    <string name="enable_nsfw_on_providers">在支持的片源中启用 NSFW 内容</string>
     <string name="subtitles_encoding">字幕编码</string>
-    <string name="category_providers">内容提供者</string>
+    <string name="category_providers">片源</string>
     <string name="category_ui">布局</string>
 
     <string name="automatic">自动</string>
@@ -397,8 +398,8 @@
 
     <string name="primary_color_settings">主题色</string>
     <string name="app_theme_settings">应用主题</string>
-    <string name="bottom_title_settings">海报标题位置</string>
-    <string name="bottom_title_settings_des">将标题置于海报下方</string>
+    <string name="bottom_title_settings">封面标题位置</string>
+    <string name="bottom_title_settings_des">将标题移至封面下方</string>
 
 
     <!-- account stuff -->
@@ -411,7 +412,7 @@
     <string name="example_email">邮箱</string>
     <string name="example_ip">IP</string>
     <string name="example_site_name">网站名称</string>
-    <string name="example_site_url">网站 URL</string>
+    <string name="example_site_url">网站链接</string>
     <string name="example_lang_name">语言代码 (zh)</string>
 
     <!--
@@ -496,34 +497,34 @@
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
 
-    <string name="poster_image">海报图像</string>
+    <string name="poster_image">封面图像</string>
     <string name="category_player">播放器</string>
-    <string name="resolution_and_title">分辨率和标题</string>
+    <string name="resolution_and_title">分辨率与标题</string>
     <string name="title">标题</string>
     <string name="resolution">分辨率</string>
     <string name="error_invalid_id">无效 ID</string>
     <string name="error_invalid_data">无效数据</string>
-    <string name="error_invalid_url">无效 URL</string>
+    <string name="error_invalid_url">无效链接</string>
     <string name="error">错误</string>
-    <string name="subtitles_remove_captions">从字幕中移除隐藏式字幕</string>
-    <string name="subtitles_remove_bloat">从字幕中移除广告</string>
-    <string name="subtitles_filter_lang">按首选媒体语言过滤</string>
+    <string name="subtitles_remove_captions">移除隐藏式字幕</string>
+    <string name="subtitles_remove_bloat">移除字幕广告</string>
+    <string name="subtitles_filter_lang">按首选片源语言过滤</string>
     <string name="extras">附加</string>
     <string name="trailer">预告片</string>
-    <string name="network_adress_example">流媒体链接</string>
+    <string name="network_adress_example">播放链接</string>
     <string name="referer">Referer</string>
     <string name="next">下一个</string>
-    <string name="provider_languages_tip">观看此些语言的视频</string>
+    <string name="provider_languages_tip">观看这些语言的视频</string>
     <string name="previous">上一个</string>
     <string name="skip_setup">跳过设置向导</string>
-    <string name="app_layout_subtext">更改应用程序的外观以适合您的设备</string>
+    <string name="app_layout_subtext">更改为适应您的设备的应用布局</string>
     <string name="crash_reporting_title">崩溃报告</string>
-    <string name="preferred_media_subtext">想要看什么</string>
+    <string name="preferred_media_subtext">您想要看什么</string>
     <string name="setup_done">完成</string>
     <string name="extensions">扩展</string>
     <string name="add_repository">添加仓库</string>
     <string name="repository_name_hint">仓库名称</string>
-    <string name="repository_url_hint">仓库 URL</string>
+    <string name="repository_url_hint">仓库链接</string>
     <string name="plugin_loaded">插件已加载</string>
     <string name="plugin_deleted">插件已删除</string>
     <string name="plugin_load_fail" formatted="true">加载 %s 失败</string>
@@ -534,36 +535,46 @@
     <string name="batch_download">批量下载</string>
     <string name="plugin_singular">插件</string>
     <string name="plugin">插件</string>
-    <string name="delete_repository_plugins">这也将删除所有仓库的插件</string>
+    <string name="delete_repository_plugins">这也将删除所有仓库插件</string>
     <string name="delete_repository">删除仓库</string>
-    <string name="setup_extensions_subtext">下载需用的网站列表</string>
-    <string name="plugins_downloaded" formatted="true">已下载： %d</string>
-    <string name="plugins_disabled" formatted="true">已禁用： %d</string>
-    <string name="plugins_not_downloaded" formatted="true">未下载： %d</string>
-    <string name="blank_repo_message">添加仓库以安装网站扩展</string>
+    <string name="setup_extensions_subtext">下载您所需的片源</string>
+    <string name="plugins_downloaded" formatted="true">已下载：%d</string>
+    <string name="plugins_disabled" formatted="true">已禁用：%d</string>
+    <string name="plugins_not_downloaded" formatted="true">未下载：%d</string>
+    <string name="plugins_updated" formatted="true">已更新 %d 插件</string>
+    <string name="blank_repo_message">CloudStream 默认不安装片源。您需要从仓库中安装片源。\n\nBecause of a brainless DMCA takedown by Sky Uk Limited 🤮 we cannot link the repository sites in app.\n\n加入我们的 Discord 获得链接或在网上搜索。</string>
     <string name="view_public_repositories_button">查看社区仓库</string>
     <string name="view_public_repositories_button_short">公开列表</string>
     <string name="uppercase_all_subtitles">字幕全大写</string>
 
     <string name="download_all_plugins_from_repo">从此仓库下载所有插件？</string>
-    <string name="single_plugin_disabled" formatted="true">%s (禁用)</string>
+    <string name="single_plugin_disabled" formatted="true">%s（禁用）</string>
     <string name="tracks">轨道</string>
     <string name="audio_tracks">音频轨道</string>
     <string name="video_tracks">视频轨道</string>
-    <string name="apply_on_restart">重启后生效</string>
+    <string name="apply_on_restart">重启生效</string>
 
-    <string name="safe_mode_title">已启动安全模式</string>
+    <string name="safe_mode_title">安全模式已启用</string>
     <string name="safe_mode_description">发生了不可恢复的崩溃，已自动禁用所有扩展，因此可以找到并删除导致问题的扩展。</string>
     <string name="safe_mode_crash_info">查看崩溃信息</string>
 
-    <string name="extension_rating" formatted="true">评分： %s</string>
+    <string name="extension_rating" formatted="true">评分：%s</string>
     <string name="extension_description">简介</string>
     <string name="extension_version">版本</string>
     <string name="extension_status">状态</string>
     <string name="extension_size">大小</string>
     <string name="extension_authors">作者</string>
-    <string name="extension_types">支持</string>
+    <string name="extension_types">类型</string>
     <string name="extension_language">语言</string>
-    
+    <string name="extension_install_first">请先安装扩展</string>
+
     <string name="hls_playlist">HLS 播放列表</string>
+
+    <string name="player_pref">首选视频播放器</string>
+    <string name="player_settings_play_in_app">内部播放器</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">投屏</string>
+    <string name="player_settings_play_in_browser">浏览器</string>
+    <string name="app_not_found_error">未找到应用</string>
 </resources>

From 4c0f6df1a2f77e640a78bb9cf6fae7219f09c7f9 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Tue, 18 Oct 2022 12:33:25 +0200
Subject: [PATCH 019/273] update newpipe (#160)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 291e71ff..cdc5e652 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -194,7 +194,7 @@ dependencies {
     //implementation 'com.github.HaarigerHarald:android-youtubeExtractor:master-SNAPSHOT'
 
     // newpipe yt
-    implementation 'com.github.recloudstream:NewPipeExtractor:master-SNAPSHOT'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:dev-SNAPSHOT'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
     // Library/extensions searching with Levenshtein distance

From 6a5286e3638d93868cc548582a5d400fa9897477 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Wed, 19 Oct 2022 00:14:15 +0200
Subject: [PATCH 020/273] Several crashfixes

---
 .../com/lagradost/cloudstream3/MainAPI.kt     | 20 +++++++++++--------
 .../cloudstream3/network/WebViewResolver.kt   |  3 ++-
 .../cloudstream3/utils/Coroutines.kt          | 12 +++++++++--
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index e5896434..940d3391 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -16,6 +16,7 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import okhttp3.Interceptor
@@ -39,7 +40,7 @@ object APIHolder {
     private const val defProvider = 0
 
     // ConcurrentModificationException is possible!!!
-    val allProviders: MutableList<MainAPI> = arrayListOf()
+    val allProviders = threadSafeListOf<MainAPI>()
 
     fun initAll() {
         for (api in allProviders) {
@@ -52,7 +53,7 @@ object APIHolder {
         return this.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
     }
 
-    var apis: List<MainAPI> = arrayListOf()
+    var apis: List<MainAPI> = threadSafeListOf()
     var apiMap: Map<String, Int>? = null
 
     fun addPluginMapping(plugin: MainAPI) {
@@ -72,16 +73,19 @@ object APIHolder {
 
     fun getApiFromNameNull(apiName: String?): MainAPI? {
         if (apiName == null) return null
-        initMap()
-        return apiMap?.get(apiName)?.let { apis.getOrNull(it) }
-            ?: allProviders.firstOrNull { it.name == apiName }
+        synchronized(allProviders) {
+            initMap()
+            return apiMap?.get(apiName)?.let { apis.getOrNull(it) }
+                ?: allProviders.firstOrNull { it.name == apiName }
+        }
     }
 
     fun getApiFromUrlNull(url: String?): MainAPI? {
         if (url == null) return null
-        for (api in allProviders) {
-            if (url.startsWith(api.mainUrl))
-                return api
+        synchronized(allProviders) {
+            allProviders.forEach { api ->
+                if (url.startsWith(api.mainUrl)) return api
+            }
         }
         return null
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt b/app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt
index 538b96f8..7b4343d9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt
@@ -10,6 +10,7 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.Coroutines.mainWork
+import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.nicehttp.requestCreator
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
@@ -96,7 +97,7 @@ class WebViewResolver(
         }
 
         var fixedRequest: Request? = null
-        val extraRequestList = mutableListOf<Request>()
+        val extraRequestList = threadSafeListOf<Request>()
 
         main {
             // Useful for debugging
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/Coroutines.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/Coroutines.kt
index 1b4c36f7..c3b244c2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/Coroutines.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/Coroutines.kt
@@ -4,9 +4,8 @@ import android.os.Handler
 import android.os.Looper
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream3.utils.Coroutines.main
 import kotlinx.coroutines.*
+import java.util.Collections.synchronizedList
 
 object Coroutines {
     fun <T> T.main(work: suspend ((T) -> Unit)): Job {
@@ -56,4 +55,13 @@ object Coroutines {
             work()
         }
     }
+
+    /**
+     * Safe to add and remove how you want
+     * If you want to iterate over the list then you need to do:
+     * synchronized(allProviders) { code here }
+     **/
+    fun <T> threadSafeListOf(vararg items: T): MutableList<T> {
+        return synchronizedList(items.toMutableList())
+    }
 }
\ No newline at end of file

From 034bad289f0b742c881d87e243e06e9cd449df6d Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sun, 23 Oct 2022 18:59:01 +0200
Subject: [PATCH 021/273] Crashfix + version bump

---
 app/build.gradle                              |  4 +-
 .../cloudstream3/network/WebViewResolver.kt   | 37 +++++++++++++------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cdc5e652..9df01079 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,8 +35,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
 
-        versionCode 51
-        versionName "3.1.5"
+        versionCode 52
+        versionName "3.1.6"
 
         resValue "string", "app_version",
                 "${defaultConfig.versionName}${versionNameSuffix ?: ""}"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt b/app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt
index 7b4343d9..9171aed9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt
@@ -7,7 +7,9 @@ import com.lagradost.cloudstream3.AcraApplication
 import com.lagradost.cloudstream3.AcraApplication.Companion.context
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.mvvm.debugException
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.Coroutines.mainWork
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
@@ -65,9 +67,15 @@ class WebViewResolver(
         method: String = "GET",
         requestCallBack: (Request) -> Boolean = { false },
     ): Pair<Request?, List<Request>> {
-        return resolveUsingWebView(
-            requestCreator(method, url, referer = referer), requestCallBack
-        )
+        return try {
+            resolveUsingWebView(
+                requestCreator(method, url, referer = referer), requestCallBack
+            )
+        } catch (e: java.lang.IllegalArgumentException) {
+            logError(e)
+            debugException { "ILLEGAL URL IN resolveUsingWebView!" }
+            return null to emptyList()
+        }
     }
 
     /**
@@ -129,7 +137,7 @@ class WebViewResolver(
                         println("Loading WebView URL: $webViewUrl")
 
                         if (interceptUrl.containsMatchIn(webViewUrl)) {
-                            fixedRequest = request.toRequest().also {
+                            fixedRequest = request.toRequest()?.also {
                                 requestCallBack(it)
                             }
                             println("Web-view request finished: $webViewUrl")
@@ -138,9 +146,9 @@ class WebViewResolver(
                         }
 
                         if (additionalUrls.any { it.containsMatchIn(webViewUrl) }) {
-                            extraRequestList.add(request.toRequest().also {
+                            request.toRequest()?.also {
                                 if (requestCallBack(it)) destroyWebView()
-                            })
+                            }?.let(extraRequestList::add)
                         }
 
                         // Suppress image requests as we don't display them anywhere
@@ -251,14 +259,19 @@ class WebViewResolver(
 
 }
 
-fun WebResourceRequest.toRequest(): Request {
+fun WebResourceRequest.toRequest(): Request? {
     val webViewUrl = this.url.toString()
 
-    return requestCreator(
-        this.method,
-        webViewUrl,
-        this.requestHeaders,
-    )
+    // If invalid url then it can crash with
+    // java.lang.IllegalArgumentException: Expected URL scheme 'http' or 'https' but was 'data'
+    // At Request.Builder().url(addParamsToUrl(url, params))
+    return normalSafeApiCall {
+        requestCreator(
+            this.method,
+            webViewUrl,
+            this.requestHeaders,
+        )
+    }
 }
 
 fun Response.toWebResourceResponse(): WebResourceResponse {

From 544f277d0cb87cb2601086286e34aa75c9bfce67 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Mon, 24 Oct 2022 15:31:35 +0200
Subject: [PATCH 022/273] Fixed player caching being invalidated by OOM

---
 app/src/main/AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 216a5f21..d22e95c0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,6 +27,7 @@
         <package android:name="is.xyz.mpv" />
     </queries>
 
+    <!-- Without the large heap Exoplayer buffering gets reset due to OOM. -->
     <!--TODO https://stackoverflow.com/questions/41799732/chromecast-button-not-visible-in-android-->
     <application
         android:name=".AcraApplication"
@@ -36,6 +37,7 @@
         android:fullBackupContent="@xml/backup_descriptor"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:largeHeap="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"

From 4c309bbb2a498909e48fe396a1a7f19ca916431e Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Tue, 25 Oct 2022 10:41:12 +0200
Subject: [PATCH 023/273] [skip ci] increase issue analysis threshold

---
 .github/workflows/issue_action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/issue_action.yml b/.github/workflows/issue_action.yml
index 79e7766c..a81c4b42 100644
--- a/.github/workflows/issue_action.yml
+++ b/.github/workflows/issue_action.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions-cool/issues-similarity-analysis@v1
         with:
           token: ${{ steps.generate_token.outputs.token }}
-          filter-threshold: 0.5
+          filter-threshold: 0.60
           title-excludes: ''
           comment-title: |
             ### Your issue looks similar to these issues:

From 7f71eef75550661eb9b418ebea31560d457442e3 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Wed, 26 Oct 2022 14:59:29 +0200
Subject: [PATCH 024/273] Allow playback from buffer with no internet

---
 .../cloudstream3/ui/player/CS3IPlayer.kt         | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index ea466120..a838c85c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -17,10 +17,7 @@ import com.google.android.exoplayer2.text.TextRenderer
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
 import com.google.android.exoplayer2.trackselection.TrackSelector
 import com.google.android.exoplayer2.ui.SubtitleView
-import com.google.android.exoplayer2.upstream.DataSource
-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
-import com.google.android.exoplayer2.upstream.HttpDataSource
+import com.google.android.exoplayer2.upstream.*
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource
 import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
 import com.google.android.exoplayer2.upstream.cache.SimpleCache
@@ -880,7 +877,16 @@ class CS3IPlayer : IPlayer {
                 }
 
                 override fun onPlayerError(error: PlaybackException) {
-                    playerError?.invoke(error)
+                    // If the Network fails then ignore the exception if the duration is set.
+                    // This is to switch mirrors automatically if the stream has not been fetched, but
+                    // allow playing the buffer without internet as then the duration is fetched.
+                    if (error.errorCode == PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED
+                        && exoPlayer?.duration != C.TIME_UNSET
+                    ) {
+                        exoPlayer?.prepare()
+                    } else {
+                        playerError?.invoke(error)
+                    }
 
                     super.onPlayerError(error)
                 }

From ecd363992c42d4c489f52191f657842a0a23eaf4 Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Wed, 26 Oct 2022 22:38:46 +0700
Subject: [PATCH 025/273] added sub to streamsb & xtreamCdn (#163)

---
 .../cloudstream3/extractors/Gdriveplayer.kt   | 55 ++++++++++++----
 .../cloudstream3/extractors/Moviehab.kt       | 40 ++++++++++++
 .../cloudstream3/extractors/SpeedoStream.kt   |  6 +-
 .../cloudstream3/extractors/StreamSB.kt       | 20 +++++-
 .../extractors/VidSrcExtractor.kt             |  8 +--
 .../cloudstream3/extractors/XStreamCdn.kt     | 64 ++++++++++++++-----
 .../cloudstream3/utils/ExtractorApi.kt        |  6 ++
 7 files changed, 159 insertions(+), 40 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
index dfccc118..df9c74a4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.extractors
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import org.jsoup.nodes.Element
 import java.security.DigestException
 import java.security.MessageDigest
@@ -10,43 +11,47 @@ import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
 
+class DatabaseGdrive2 : Gdriveplayer() {
+    override var mainUrl = "https://databasegdriveplayer.co"
+}
+
 class DatabaseGdrive : Gdriveplayer() {
     override var mainUrl = "https://series.databasegdriveplayer.co"
 }
 
-class Gdriveplayerapi: Gdriveplayer() {
+class Gdriveplayerapi : Gdriveplayer() {
     override val mainUrl: String = "https://gdriveplayerapi.com"
 }
 
-class Gdriveplayerapp: Gdriveplayer() {
+class Gdriveplayerapp : Gdriveplayer() {
     override val mainUrl: String = "https://gdriveplayer.app"
 }
 
-class Gdriveplayerfun: Gdriveplayer() {
+class Gdriveplayerfun : Gdriveplayer() {
     override val mainUrl: String = "https://gdriveplayer.fun"
 }
 
-class Gdriveplayerio: Gdriveplayer() {
+class Gdriveplayerio : Gdriveplayer() {
     override val mainUrl: String = "https://gdriveplayer.io"
 }
 
-class Gdriveplayerme: Gdriveplayer() {
+class Gdriveplayerme : Gdriveplayer() {
     override val mainUrl: String = "https://gdriveplayer.me"
 }
 
-class Gdriveplayerbiz: Gdriveplayer() {
+class Gdriveplayerbiz : Gdriveplayer() {
     override val mainUrl: String = "https://gdriveplayer.biz"
 }
 
-class Gdriveplayerorg: Gdriveplayer() {
+class Gdriveplayerorg : Gdriveplayer() {
     override val mainUrl: String = "https://gdriveplayer.org"
 }
 
-class Gdriveplayerus: Gdriveplayer() {
+class Gdriveplayerus : Gdriveplayer() {
     override val mainUrl: String = "https://gdriveplayer.us"
 }
 
-class Gdriveplayerco: Gdriveplayer() {
+class Gdriveplayerco : Gdriveplayer() {
     override val mainUrl: String = "https://gdriveplayer.co"
 }
 
@@ -136,6 +141,10 @@ open class Gdriveplayer : ExtractorApi() {
         return find(str)?.groupValues?.getOrNull(1)
     }
 
+    private fun String.addMarks(str: String): String {
+        return this.replace(Regex("\"?$str\"?"), "\"$str\"")
+    }
+
     override suspend fun getUrl(
         url: String,
         referer: String?,
@@ -145,18 +154,19 @@ open class Gdriveplayer : ExtractorApi() {
         val document = app.get(url).document
 
         val eval = unpackJs(document)?.replace("\\", "") ?: return
-        val data = AppUtils.tryParseJson<AesData>(Regex("data='(\\S+?)'").first(eval)) ?: return
+        val data = tryParseJson<AesData>(Regex("data='(\\S+?)'").first(eval)) ?: return
         val password = Regex("null,['|\"](\\w+)['|\"]").first(eval)
             ?.split(Regex("\\D+"))
             ?.joinToString("") {
                 Char(it.toInt()).toString()
             }.let { Regex("var pass = \"(\\S+?)\"").first(it ?: return)?.toByteArray() }
             ?: throw ErrorLoadingException("can't find password")
-        val decryptedData =
-            cryptoAESHandler(data, password, false)?.let { getAndUnpack(it) }?.replace("\\", "")
-                ?.substringAfter("sources:[")?.substringBefore("],")
+        val decryptedData = cryptoAESHandler(data, password, false)?.let { getAndUnpack(it) }?.replace("\\", "")
 
-        Regex("\"file\":\"(\\S+?)\".*?res=(\\d+)").findAll(decryptedData ?: return).map {
+        val sourceData = decryptedData?.substringAfter("sources:[")?.substringBefore("],")
+        val subData = decryptedData?.substringAfter("tracks:[")?.substringBefore("],")
+
+        Regex("\"file\":\"(\\S+?)\".*?res=(\\d+)").findAll(sourceData ?: return).map {
             it.groupValues[1] to it.groupValues[2]
         }.toList().distinctBy { it.second }.map { (link, quality) ->
             callback.invoke(
@@ -171,6 +181,17 @@ open class Gdriveplayer : ExtractorApi() {
             )
         }
 
+        subData?.addMarks("file")?.addMarks("kind")?.addMarks("label").let { dataSub ->
+            tryParseJson<List<Tracks>>("[$dataSub]")?.map { sub ->
+                subtitleCallback.invoke(
+                    SubtitleFile(
+                        sub.label,
+                        httpsify(sub.file)
+                    )
+                )
+            }
+        }
+
     }
 
     data class AesData(
@@ -179,4 +200,10 @@ open class Gdriveplayer : ExtractorApi() {
         @JsonProperty("s") val s: String
     )
 
+    data class Tracks(
+        @JsonProperty("file") val file: String,
+        @JsonProperty("kind") val kind: String,
+        @JsonProperty("label") val label: String
+    )
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt
new file mode 100644
index 00000000..e2eb7bf0
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt
@@ -0,0 +1,40 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper
+
+class Moviehab : ExtractorApi() {
+    override var name = "Moviehab"
+    override var mainUrl = "https://play.moviehab.com"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val res = app.get(url)
+        res.document.select("video#player").let {
+            //should redirect first for making it works
+            val link = app.get("$mainUrl/${it.select("source").attr("src")}", referer = url).url
+            M3u8Helper.generateM3u8(
+                this.name,
+                link,
+                url
+            ).forEach(callback)
+
+            Regex("src[\"|'],\\s[\"|'](\\S+)[\"|']\\)").find(res.text)?.groupValues?.get(1).let {sub ->
+                subtitleCallback.invoke(
+                    SubtitleFile(
+                        it.select("track").attr("label"),
+                        "$mainUrl/$sub"
+                    )
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt
index 6153a7c1..8ef6c463 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt
@@ -7,7 +7,11 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 
-class SpeedoStream : ExtractorApi() {
+class SpeedoStream1 : SpeedoStream() {
+    override val mainUrl = "https://speedostream.nl"
+}
+
+open class SpeedoStream : ExtractorApi() {
     override val name = "SpeedoStream"
     override val mainUrl = "https://speedostream.com"
     override val requiresReferer = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
index 30a0496d..913b410b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
@@ -7,6 +7,11 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 
+class Sbspeed : StreamSB() {
+    override var name = "Sbspeed"
+    override var mainUrl = "https://sbspeed.com"
+}
+
 class Streamsss : StreamSB() {
     override var mainUrl = "https://streamsss.net"
 }
@@ -93,15 +98,15 @@ open class StreamSB : ExtractorApi() {
     }
 
     data class Subs (
-        @JsonProperty("file") val file: String,
-        @JsonProperty("label") val label: String,
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: String? = null,
     )
 
     data class StreamData (
         @JsonProperty("file") val file: String,
         @JsonProperty("cdn_img") val cdnImg: String,
         @JsonProperty("hash") val hash: String,
-        @JsonProperty("subs") val subs: List<Subs>?,
+        @JsonProperty("subs") val subs: ArrayList<Subs>? = arrayListOf(),
         @JsonProperty("length") val length: String,
         @JsonProperty("id") val id: String,
         @JsonProperty("title") val title: String,
@@ -141,5 +146,14 @@ open class StreamSB : ExtractorApi() {
             url,
             headers = headers
         ).forEach(callback)
+
+        mapped.streamData.subs?.map {sub ->
+            subtitleCallback.invoke(
+                SubtitleFile(
+                    sub.label.toString(),
+                    sub.file ?: return@map null,
+                )
+            )
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
index 63634704..287fe4d4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
@@ -85,18 +85,12 @@ open class VidSrcExtractor : ExtractorApi() {
                         this.name,
                         this.name,
                         srcm3u8,
-                        this.mainUrl,
+                        "https://vidsrc.stream/",
                         Qualities.Unknown.value,
                         extractorData = pass,
                         isM3u8 = true
                     )
                 )
-
-//                M3u8Helper.generateM3u8(
-//                    name,
-//                    srcm3u8,
-//                    absoluteUrl
-//                ).forEach(callback)
             } else {
                 loadExtractor(linkfixed, url, subtitleCallback, callback)
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
index 9e3585ae..15ff0436 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
@@ -1,12 +1,23 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 
+class Cdnplayer: XStreamCdn() {
+    override val name: String = "Cdnplayer"
+    override val mainUrl: String = "https://cdnplayer.online"
+}
+
+class Kotakajair: XStreamCdn() {
+    override val name: String = "Kotakajair"
+    override val mainUrl: String = "https://kotakajair.xyz"
+}
+
 class FEnet: XStreamCdn() {
     override val name: String = "FEnet"
     override val mainUrl: String = "https://fembed.net"
@@ -59,44 +70,67 @@ open class XStreamCdn : ExtractorApi() {
         //val type: String // Mp4
     )
 
+    private data class Player(
+        @JsonProperty("poster_file") val poster_file: String? = null,
+    )
+
     private data class ResponseJson(
         @JsonProperty("success") val success: Boolean,
-        @JsonProperty("data") val data: List<ResponseData>?
+        @JsonProperty("player") val player: Player? = null,
+        @JsonProperty("data") val data: List<ResponseData>?,
+        @JsonProperty("captions") val captions: List<Captions?>?,
+    )
+
+    private data class Captions(
+        @JsonProperty("id") val id: String,
+        @JsonProperty("hash") val hash: String,
+        @JsonProperty("language") val language: String,
+        @JsonProperty("extension") val extension: String
     )
 
     override fun getExtractorUrl(id: String): String {
         return "$domainUrl/api/source/$id"
     }
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val headers = mapOf(
             "Referer" to url,
             "User-Agent" to "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0",
         )
         val id = url.trimEnd('/').split("/").last()
         val newUrl = "https://${domainUrl}/api/source/${id}"
-        val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
-        with(app.post(newUrl, headers = headers)) {
-            if (this.code != 200) return listOf()
-            val text = this.text
-            if (text.isEmpty()) return listOf()
-            if (text == """{"success":false,"data":"Video not found or has been removed"}""") return listOf()
-            AppUtils.parseJson<ResponseJson?>(text)?.let {
+        app.post(newUrl, headers = headers).let { res ->
+            val sources = tryParseJson<ResponseJson?>(res.text)
+            sources?.let {
                 if (it.success && it.data != null) {
-                    it.data.forEach { data ->
-                        extractedLinksList.add(
+                    it.data.map { source ->
+                        callback.invoke(
                             ExtractorLink(
                                 name,
                                 name = name,
-                                data.file,
+                                source.file,
                                 url,
-                                getQualityFromName(data.label),
+                                getQualityFromName(source.label),
                             )
                         )
                     }
                 }
             }
+
+            val userData = sources?.player?.poster_file?.split("/")?.get(2)
+            sources?.captions?.map {
+                subtitleCallback.invoke(
+                    SubtitleFile(
+                        it?.language.toString(),
+                        "$mainUrl/asset/userdata/$userData/caption/${it?.hash}/${it?.id}.${it?.extension}"
+                    )
+                )
+            }
         }
-        return extractedLinksList
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 8d6b1b82..ca612385 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -235,6 +235,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Vidgomunime(),
     Sbflix(),
     Streamsss(),
+    Sbspeed(),
 
     Fastream(),
 
@@ -246,6 +247,8 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     LayarKaca(),
     Rasacintaku(),
     FEnet(),
+    Kotakajair(),
+    Cdnplayer(),
     //  WatchSB(), 'cause StreamSB.kt works
     Uqload(),
     Uqload1(),
@@ -317,6 +320,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Linkbox(),
     Acefile(),
     SpeedoStream(),
+    SpeedoStream1(),
     Zorofile(),
     Embedgram(),
     Mvidoo(),
@@ -324,6 +328,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Vidmoly(),
     Vidmolyme(),
     Voe(),
+    Moviehab(),
 
     Gdriveplayerapi(),
     Gdriveplayerapp(),
@@ -336,6 +341,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Gdriveplayerco(),
     Gdriveplayer(),
     DatabaseGdrive(),
+    DatabaseGdrive2(),
 
     YoutubeExtractor(),
     YoutubeShortLinkExtractor(),

From 044822040f7da8c777958057a12d1f7ee3a4222c Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Wed, 26 Oct 2022 21:55:59 +0200
Subject: [PATCH 026/273] Translation in Bulgarian language.

Co-authored-by: ardoslav <fifata@gmail.com>
---
 README.md                                     |   1 +
 .../ui/settings/SettingsGeneral.kt            |   1 +
 app/src/main/res/values-bg/strings.xml        | 547 ++++++++++++++++++
 3 files changed, 549 insertions(+)
 create mode 100644 app/src/main/res/values-bg/strings.xml

diff --git a/README.md b/README.md
index e7221440..5e961c61 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@
 
 ***The list of supported languages:***
 * 🇱🇧 Arabic
+* 🇧🇬 Bulgarian
 * 🇭🇷 Croatian
 * 🇨🇿 Czech
 * 🇳🇱 Dutch
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 57074e74..8ea76cda 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -79,6 +79,7 @@ val appLanguages = arrayListOf(
     Triple("\uD83C\uDDEE\uD83C\uDDE9", "Indonesian", "in"),
     Triple("", "Czech", "cs"),
     Triple("", "Croatian", "hr"),
+    Triple("", "Bulgarian", "bg"),
 ).sortedBy { it.second } //ye, we go alphabetical, so ppl don't put their lang on top
 
 class SettingsGeneral : PreferenceFragmentCompat() {
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
new file mode 100644
index 00000000..b8f43dd0
--- /dev/null
+++ b/app/src/main/res/values-bg/strings.xml
@@ -0,0 +1,547 @@
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
+
+    <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
+    <string formatted="true" name="app_dub_sub_episode_text_format">%s еп. %d</string>
+    <string formatted="true" name="cast_format">Актьори: %s</string>
+    <string formatted="true" name="next_episode_format">Епизод %d ще бъде пуснат след</string>
+    <string formatted="true" name="next_episode_time_day_format">%DD %dh %dm</string>
+    <string formatted="true" name="next_episode_time_hour_format">%dh %dm</string>
+    <string formatted="true" name="next_episode_time_min_format">%dm</string>
+
+    
+    <string name="result_poster_img_des">Плакат</string>
+    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="episode_poster_img_des">Плакат на епизод</string>
+    <string name="home_main_poster_img_des">Основен плакат</string>
+    <string name="home_next_random_img_des">Следващ произволен</string>
+    <string name="go_back_img_des">Върни се</string>
+    <string name="home_change_provider_img_des">Смяна на доставчика</string>
+    <string name="preview_background_img_des">Визуализация на фона</string>
+
+    
+    <string formatted="true" name="player_speed_text_format">Скорост (%.2fx)</string>
+    <string formatted="true" name="rated_format">Оценка: %.1f</string>
+    <string formatted="true" name="new_update_format">Намерена е нова актуализация!\n%s -&gt; %s</string>
+    <string formatted="true" name="filler">Шаблон</string>
+    <string formatted="true" name="duration_format">%d мин</string>
+
+    <string name="app_name">CloudStream</string>
+    <string name="play_with_app_name">Пусни с CloudStream</string>
+    <string name="title_home">Начало</string>
+    <string name="title_search">Търсене</string>
+    <string name="title_downloads">Изтегляния</string>
+    <string name="title_settings">Настройки</string>
+
+    <string name="search_hint">Търсене…</string>
+    <string formatted="true" name="search_hint_site">Търсете %s...</string>
+
+    <string name="no_data">Няма данни</string>
+    <string name="episode_more_options_des">Още опций</string>
+    <string name="next_episode">Следващ епизод</string>
+    <string name="result_tags">Жанрове</string>
+    <string name="result_share">Сподели</string>
+    <string name="result_open_in_browser">Отвори в браузъра</string>
+    <string name="skip_loading">Пропусни зареждането</string>
+    <string name="loading">Зареждане…</string>
+
+    <string name="type_watching">Гледане</string>
+    <string name="type_on_hold">На изчакване</string>
+    <string name="type_completed">Завършено</string>
+    <string name="type_dropped">Изпуснат</string>
+    <string name="type_plan_to_watch">План за гледане</string>
+    <string name="type_none">Нито един</string>
+    <string name="type_re_watching">Повторно гледане</string>
+
+    <string name="play_movie_button">Пускане на филм</string>
+    <string name="play_livestream_button">Възпроизвеждане на живо</string>
+    <string name="play_torrent_button">Поточно предаване на торент</string>
+    <string name="pick_source">Източници</string>
+    <string name="pick_subtitle">субтитри</string>
+    <string name="reload_error">Повторен опит за свързване...</string>
+    <string name="go_back">Върни се</string>
+    <string name="play_episode">Пусни епизод</string>
+    
+
+    <string name="download">Изтегли</string>
+    <string name="downloaded">Изтеглено</string>
+    <string name="downloading">Изтегля се</string>
+    <string name="download_paused">Изтеглянето е на пауза</string>
+    <string name="download_started">Изтеглянето започна</string>
+    <string name="download_failed">Изтеглянето се провали</string>
+    <string name="download_canceled">Изтеглянето е отменено</string>
+    <string name="download_done">Изтеглянето е завършено</string>
+    <string name="stream">Поток</string>
+
+    <string name="error_loading_links_toast">Грешка при зареждане на връзки</string>
+    <string name="download_storage_text">Вътрешна памет</string>
+
+    <string name="app_dubbed_text">Дублаж</string>
+    <string name="app_subbed_text">Субтитри</string>
+
+    <string name="popup_delete_file">Изтрий файла</string>
+    <string name="popup_play_file">Възпроизвеждане на файл</string>
+    <string name="popup_resume_download">Възобновете изтеглянето</string>
+    <string name="popup_pause_download">Пауза на изтеглянето</string>
+
+    <string name="pref_disable_acra">Деактивирайте автоматичното докладване на грешки</string>
+    <string name="home_more_info">Повече информация</string>
+    <string name="home_expanded_hide">Скрий</string>
+    <string name="home_play">Пусни</string>
+    <string name="home_info">Информация</string>
+    <string name="filter_bookmarks">Филтриране на отметки</string>
+    <string name="error_bookmarks_text">Отметки</string>
+    <string name="action_remove_from_bookmarks">Премахване</string>
+    <string name="action_add_to_bookmarks">Задайте статус на гледане</string>
+    <string name="sort_apply">Приложи</string>
+    <string name="sort_cancel">Отказ</string>
+    <string name="sort_copy">Копирай</string>
+    <string name="sort_close">Затвори</string>
+    <string name="sort_clear">Изчисти</string>
+    <string name="sort_save">Запазване</string>
+
+    <string name="player_speed">Скорост на възпроизвеждане</string>
+
+    <string name="subtitles_settings">Настройки на субтитрите</string>
+    <string name="subs_text_color">Цвят на текста</string>
+    <string name="subs_outline_color">Цвят на контура</string>
+    <string name="subs_background_color">Цвят на фона</string>
+    <string name="subs_window_color">Цвят на прозореца</string>
+    <string name="subs_edge_type">Тип ръб</string>
+    <string name="subs_subtitle_elevation">Височина на субтитрите</string>
+    <string name="subs_font">Шрифт</string>
+    <string name="subs_font_size">Размер на шрифта</string>
+
+    <string name="search_provider_text_providers">Търсене чрез доставчици</string>
+    <string name="search_provider_text_types">Търсене с помощта на типове</string>
+
+    <string name="benene_count_text">%d Банан/а даден/и на разработчиците</string>
+    <string name="benene_count_text_none">Не е/са даден/и Банан/и</string>
+
+    <string name="subs_auto_select_language">Автоматичен избор на език</string>
+    <string name="subs_download_languages">Изтегляне на езици</string>
+    <string name="subs_subtitle_languages">Език на субтитрите</string>
+    <string name="subs_hold_to_reset_to_default">Задръжте, за да нулирате по подразбиране</string>
+    <string formatted="true" name="subs_import_text">Импортирайте шрифтове, като ги поставите в %s</string>
+    <string name="continue_watching">Продължете да гледате</string>
+
+    <string name="action_remove_watching">Премахване</string>
+    <string name="action_open_watching">Повече информация</string>
+    <string name="action_open_play">@string/home_play</string>
+
+    <string name="vpn_might_be_needed">Може да е необходим VPN, за да работи правилно този доставчик</string>
+    <string name="vpn_torrent">Този доставчик е торент, препоръчва се VPN</string>
+
+    <string name="provider_info_meta">Метаданните не се предоставят от сайта, зареждането на видео ще бъде неуспешно, ако не съществува на сайта.</string>
+
+    <string name="torrent_plot">Описание</string>
+    <string name="normal_no_plot">Няма намерен съдържание</string>
+    <string name="torrent_no_plot">Няма намерено описание</string>
+
+    <string name="show_log_cat">Покажи logcat 🐈</string>
+
+    <string name="picture_in_picture">Картина в картина</string>
+    <string name="picture_in_picture_des">Продължава възпроизвеждането в миниатюрен плейър върху други приложения</string>
+    <string name="player_size_settings">Бутон за преоразмеряване на плейъра</string>
+    <string name="player_size_settings_des">Премахнете черните граници</string>
+    <string name="player_subtitles_settings">Субтитри</string>
+    <string name="player_subtitles_settings_des">Настройки на субтитрите на плейъра</string>
+    <string name="chromecast_subtitles_settings">Chromecast субтитри</string>
+    <string name="chromecast_subtitles_settings_des">Настройки за субтитри на Chromecast</string>
+
+    <string name="eigengraumode_settings">Режим Eigengravy (промяна скорост на възпроизвеждане)</string>
+    <string name="eigengraumode_settings_des">Добавя опция за скорост в плейъра</string>
+    <string name="swipe_to_seek_settings">Плъзнете за преместване</string>
+    <string name="swipe_to_seek_settings_des">Плъзнете наляво или надясно, за да контролирате времето във видеоплейъра</string>
+    <string name="swipe_to_change_settings">Плъзнете, за да промените настройките</string>
+    <string name="swipe_to_change_settings_des">Плъзнете наляво или надясно, за да промените яркостта или силата на звука</string>
+
+    <string name="autoplay_next_settings">Автоматично пускане на следващ епизод</string>
+    <string name="autoplay_next_settings_des">Започнете следващия епизод, когато текущият приключи</string>
+
+    <string name="double_tap_to_seek_settings">Докоснете двукратно за превъртане</string>
+    <string name="double_tap_to_pause_settings">Докоснете два пъти за пауза</string>
+    <string name="double_tap_to_seek_amount_settings">Размер на превъртане</string>
+    <string name="double_tap_to_seek_settings_des">Докоснете два пъти от дясната или лявата страна, за да превъртите напред или назад</string>
+    <string name="double_tap_to_pause_settings_des">Докоснете в средата, за да направите пауза</string>
+    <string name="use_system_brightness_settings">Използвайте яркостта на системата</string>
+    <string name="use_system_brightness_settings_des">Използвайте системна яркост в плейъра на приложението вместо тъмно
+        наслагване</string>
+
+    <string name="episode_sync_settings">Актуализирайте прогреса на гледане</string>
+    <string name="episode_sync_settings_des">Автоматично синхронизирайте прогреса на текущия си епизод</string>
+
+    <string name="restore_settings">Възстановете данните от архив</string>
+
+    <string name="backup_settings">Архивиране на данни</string>
+    <string name="restore_success">Зареден архивен файл</string>
+    <string formatted="true" name="restore_failed_format">Неуспешно възстановяване на данни от файл %s</string>
+    <string name="backup_success">Успешно съхранени данни</string>
+    <string name="backup_failed">Липсват разрешения за съхранение, моля, опитайте отново</string>
+    <string name="backup_failed_error_format">Грешка при архивирането на %s</string>
+
+    <string name="search">Търсене</string>
+    <string name="category_account">Акаунти</string>
+    <string name="category_updates">Актуализации и архивиране</string>
+
+    <string name="settings_info">Информация</string>
+    <string name="advanced_search">Подробно търсене</string>
+    <string name="advanced_search_des">Дава ви резултатите от търсенето, разделени по доставчик</string>
+    <string name="bug_report_settings_off">Изпраща данни само за сривове</string>
+    <string name="bug_report_settings_on">Не изпраща данни</string>
+    <string name="show_fillers_settings">Показване заместващ епизод за аниме</string>
+    <string name="show_trailers_settings">Показване на трейлъри</string>
+    <string name="kitsu_settings">Покажете плакати от kitsu</string>
+    <string name="pref_filter_search_quality">Скриване на избраното видео качество в резултатите от търсенето</string>
+
+    <string name="automatic_plugin_updates">Автоматични актуализации на плъгини</string>
+    <string name="updates_settings">Показвай актуализации на приложението</string>
+    <string name="updates_settings_des">Автоматично търси нови актуализации при стартиране</string>
+    <string name="uprereleases_settings">Актуализация до експериментални версии</string>
+    <string name="uprereleases_settings_des">Търсете експериментални актуализации вместо само пълни версии</string>
+    <string name="github">Github</string>
+    <string name="lightnovel">Light novel - приложение от същите разработчици</string>
+    <string name="anim">Приложение за аниме от същите разработчици</string>
+    <string name="discord">Присъединете се към Discord</string>
+    <string name="benene">Дайте банан/и разработчиците</string>
+    <string name="benene_des">Даден/и банан/и</string>
+
+    <string name="app_language">Език на приложението</string>
+
+    <string name="no_chromecast_support_toast">Този доставчик няма поддръжка за Chromecast</string>
+    <string name="no_links_found_toast">Няма намерени връзки</string>
+    <string name="copy_link_toast">Връзката е копирана в клипборда</string>
+    <string name="play_episode_toast">Пусни епизода</string>
+    <string name="subs_default_reset_toast">Възстановяване на стойността по подразбиране</string>
+    <string name="acra_report_toast">За съжаление приложението се срина. Анонимен доклад за грешка ще бъде изпратен до
+        разработчиците</string>
+
+    <string name="season">Сезон</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="no_season">Без сезон</string>
+    <string name="episode">Епизод</string>
+    <string name="episodes">Епизоди</string>
+    <string name="episodes_range">%d-%d</string>
+    <string formatted="true" name="episode_format">%d %s</string>
+    <string name="season_short">С</string>
+    <string name="episode_short">Е</string>
+    <string name="no_episodes_found">Няма намерени епизоди</string>
+
+    <string name="delete_file">Изтрий файла</string>
+    <string name="delete">Изтрий</string>
+    <string name="pause">Пауза</string>
+    <string name="resume">Продължи</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">30</string>
+    <string formatted="true" name="delete_message">Това ще изтрие за постоянно %s\nСигурни ли сте?</string>
+    <string formatted="true" name="resume_time_left">%dm\nостава</string>
+
+
+    <string name="status_ongoing">Продължава</string>
+    <string name="status_completed">Завършен</string>
+    <string name="status">Статус</string>
+    <string name="year">Година</string>
+    <string name="rating">Рейтинг</string>
+    <string name="duration">Продължителност</string>
+    <string name="site">Уебсайт</string>
+    <string name="synopsis">Синопсис</string>
+
+    <string name="queued">На опашката</string>
+    <string name="no_subtitles">Без субтитри</string>
+    <string name="default_subtitles">По подразбиране</string>
+
+    <string name="free_storage">Безплатно</string>
+    <string name="used_storage">Използвано</string>
+    <string name="app_storage">Приложения</string>
+
+    
+    <string name="movies">Филми</string>
+    <string name="tv_series">Телевизионен сериал</string>
+    <string name="cartoons">Анимационни филми</string>
+    <string name="anime">Аниме</string>
+    <string name="torrent">Торенти</string>
+    <string name="documentaries">Документални</string>
+    <string name="ova">OVA</string>
+    <string name="asian_drama">Азиатски драми</string>
+    <string name="livestreams">На живо</string>
+    <string name="nsfw">Разпоретини</string>
+    <string name="others">други</string>
+
+    
+    <string name="movies_singular">Филм</string>
+    <string name="tv_series_singular">Серия</string>
+    <string name="cartoons_singular">Анимационен филм</string>
+    <string name="anime_singular">@string/аниме</string>
+    <string name="ova_singular">@string/ova</string>
+    <string name="torrent_singular">Торент</string>
+    <string name="documentaries_singular">Документален филм</string>
+    <string name="asian_drama_singular">Азиатска драма</string>
+    <string name="live_singular">Поток на живо</string>
+    <string name="nsfw_singular">Разпоретинa</string>
+    <string name="other_singular">Видео</string>
+
+    <string name="source_error">Грешка в източника</string>
+    <string name="remote_error">Дистанционна грешка</string>
+    <string name="render_error">Грешка в рендъра</string>
+    <string name="unexpected_error">Неочаквана грешка на плеъра</string>
+    <string name="storage_error">Грешка при изтегляне, проверете разрешенията за съхранение</string>
+
+    <string name="episode_action_chromecast_episode">Епизод за Chromecast</string>
+    <string name="episode_action_chromecast_mirror">Chromecast огледало</string>
+    <string name="episode_action_play_in_app">Пусни в приложението</string>
+    <string name="episode_action_play_in_format">Пусни в %s</string>
+    <string name="episode_action_play_in_browser">Пусни в браузър</string>
+    <string name="episode_action_copy_link">Копирай връзка</string>
+    <string name="episode_action_auto_download">Автоматично изтегляне</string>
+    <string name="episode_action_download_mirror">Изтегляне на огледало</string>
+    <string name="episode_action_reload_links">Презареждане на връзки</string>
+    <string name="episode_action_download_subtitle">Изтегляне на субтитри</string>
+
+    <string name="show_hd">покажи качество</string>
+    <string name="show_dub">Покажи дублаж</string>
+    <string name="show_sub">Покажи субтитри</string>
+    <string name="show_title">Заглавие</string>
+    <string name="poster_ui_settings">Превключване на елементите на потребителския интерфейс на плаката</string>
+
+    <string name="no_update_found">Няма намерена актуализация</string>
+    <string name="check_for_update">Проверка за актуализация</string>
+
+    <string name="video_lock">Заключен</string>
+    <string name="video_aspect_ratio_resize">Преоразмеряване</string>
+    <string name="video_source">Източник</string>
+    <string name="video_skip_op">Пропусни</string>
+
+    <string name="dont_show_again">Не показвай отново</string>
+    <string name="skip_update">Пропуснете тази актуализация</string>
+    <string name="update">Актуализация</string>
+    <string name="watch_quality_pref">Предпочитано качество за гледане</string>
+    <string name="limit_title">Максимален брой знаци за заглавие във видеоплейъра</string>
+    <string name="limit_title_rez">Разделителна способност на видео плейъра</string>
+
+    <string name="video_buffer_size_settings">Размер на видео буфера</string>
+    <string name="video_buffer_length_settings">Дължина на видео буфера</string>
+    <string name="video_buffer_disk_settings">Видео кеш на диск</string>
+    <string name="video_buffer_clear_settings">Изчистете кеша за видео и изображения</string>
+
+    <string name="video_ram_description">Ще предизвика случайни сривове, ако е зададено твърде високо. Не променяйте, ако имате малко количество RAM, като Android TV или стар телефон</string>
+    <string name="video_disk_description">Може да причини проблеми на системи с малко място за съхранение, като устройства с Android TV, ако го зададете твърде високо</string>
+
+    <string name="dns_pref">DNS през HTTPS</string>
+    <string name="dns_pref_summary">Полезно за заобикаляне на блокирания от ISP доставчик</string>
+
+    <string name="add_site_pref">Сайт за клониране</string>
+    <string name="remove_site_pref">Премахване на сайта</string>
+    <string name="add_site_summary">Добавяне на клонинг на съществуващ сайт с различен URL адрес</string>
+
+    <string name="download_path_pref">Път за изтегляне</string>
+
+    <string name="nginx_url_pref">URL адрес на сървъра на Nginx</string>
+
+    <string name="display_subbed_dubbed_settings">Показване на дублирани/субирани аниме</string>
+
+    <string name="resize_fit">Побиране в екрана</string>
+    <string name="resize_fill">Разтягане</string>
+    <string name="resize_zoom">Мащабиране</string>
+
+    <string name="legal_notice">Опровержение</string>
+        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
+
+        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
+
+        The app is purely for educational and personal use.
+
+        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down.
+        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or
+        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
+        user-friendly interface.
+
+        It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the
+        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
+        CloudStream 3 at your own risk.
+    </string>
+    <string name="category_general">Общ</string>
+    <string name="random_button_settings">Случаен бутон</string>
+    <string name="random_button_settings_desc">Показване на произволен бутон на началната страница</string>
+    <string name="provider_lang_settings">Езици на доставчика</string>
+    <string name="app_layout">Оформление на приложението</string>
+    <string name="preferred_media_settings">Предпочитана медия</string>
+    <string name="enable_nsfw_on_providers">Активирайте разпоретините на поддържани доставчици</string>
+    <string name="subtitles_encoding">Кодиране на субтитрите</string>
+    <string name="category_providers">Доставчици</string>
+    <string name="category_ui">Оформление</string>
+
+    <string name="automatic">Автоматично</string>
+    <string name="tv_layout">ТВ оформление</string>
+    <string name="phone_layout">Оформление като телефон</string>
+    <string name="emulator_layout">Оформление като емулатор</string>
+
+    <string name="primary_color_settings">Основен цвят</string>
+    <string name="app_theme_settings">Тема на приложението</string>
+    <string name="bottom_title_settings">Местоположение на заглавието на плаката</string>
+    <string name="bottom_title_settings_des">Поставете заглавието под плаката</string>
+
+    <string name="example_password">парола123</string>
+    <string name="example_username">MyCoolUsername</string>
+    <string name="example_email">hello@world.com</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="example_site_name">MyCoolSite</string>
+    <string name="example_site_url">example.com</string>
+    <string name="example_lang_name">Езиков код (en)</string>
+
+    <!--
+    -->
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="account">Акаунт</string>
+    <string name="logout">Излизане</string>
+    <string name="login">Влизане</string>
+    <string name="switch_account">Превключване на акаунт</string>
+    <string name="add_account">Добавяне на акаунт</string>
+    <string name="create_account">Създай акаунт</string>
+    <string name="add_sync">Добавете проследяване</string>
+    <string formatted="true" name="added_sync_format">Добавен %s</string>
+    <string name="upload_sync">Синхронизиране</string>
+    <string name="sync_score">Оценен</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string formatted="true" name="authenticated_user">Удостоверен %s</string>
+    <string formatted="true" name="authenticated_user_fail">Неуспешно удостоверяване на %s</string>
+
+    
+    <string name="none">Нито един</string>
+    <string name="normal">Нормално</string>
+    <string name="all">Всичко</string>
+    <string name="max">Макс</string>
+    <string name="min">Мин</string>
+    <string name="subtitles_outline">Контур</string>
+    <string name="subtitles_depressed">Удвоени</string>
+    <string name="subtitles_shadow">Сянка</string>
+    <string name="subtitles_raised">Повдигнати</string>
+    <string name="subtitle_offset">Синхронизиране на суб</string>
+    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_title">Забавяне на субтитрите</string>
+    <string name="subtitle_offset_extra_hint_later_format">Използвайте това, ако субтитрите се показват %dms твърде рано</string>
+    <string name="subtitle_offset_extra_hint_before_format">Използвайте това, ако субтитрите се показват %dms твърде късно</string>
+    <string name="subtitle_offset_extra_hint_none_format">Без забавяне на субтитрите</string>
+
+    
+    <!--
+    Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
+    see: 
+	https://en.wikipedia.org/w/index.php?title=Pangram&oldid=225849300
+	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
+    -->
+    <string name="subtitles_example_text">Бързата кафява лисица прескача мързеливото куче</string>
+
+    <string name="recommended">Препоръчва се</string>
+    <string formatted="true" name="player_loaded_subtitles">Заредено %s</string>
+    <string name="player_load_subtitles">Зареди от файл</string>
+    <string name="player_load_subtitles_online">Зареди от Интернет</string>
+    <string name="downloaded_file">Изтеглен файл</string>
+    <string name="actor_main">Главен</string>
+    <string name="actor_supporting">Поддържащ</string>
+    <string name="actor_background">Заден план</string>
+
+    <string name="home_source">Източник</string>
+    <string name="home_random">Случаен</string>
+
+    <string name="coming_soon">Очаквайте скоро…</string>
+
+    <string name="quality_cam">Cam</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
+    <string name="quality_hq">HQ</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_tc">TC</string>
+    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="quality_4k">4K</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="quality_webrip">Web</string>
+
+    <string name="poster_image">Снимка на плакат</string>
+    <string name="category_player">Плеър</string>
+    <string name="resolution_and_title">Резолюция и заглавие</string>
+    <string name="title">Заглавие</string>
+    <string name="resolution">Резолюция</string>
+    <string name="error_invalid_id">Невалиден идентификатор</string>
+    <string name="error_invalid_data">Невалидни данни</string>
+    <string name="error_invalid_url">Невалиден адрес</string>
+    <string name="error">Грешка</string>
+    <string name="subtitles_remove_captions">Премахнете затворените надписи от субтитрите</string>
+    <string name="subtitles_remove_bloat">Премахнете рекламирането в субтитрите</string>
+    <string name="subtitles_filter_lang">Филтриране по предпочитан медиен език</string>
+    <string name="extras">Екстри</string>
+    <string name="trailer">Трейлър</string>
+    <string name="network_adress_example">Връзка към потока</string>
+    <string name="referer">Обратно към</string>
+    <string name="next">Следващ</string>
+    <string name="provider_languages_tip">Гледайте видеоклипове на тези езици</string>
+    <string name="previous">Предишен</string>
+    <string name="skip_setup">Пропуснете настройката</string>
+    <string name="app_layout_subtext">Променете външния вид на приложението, за да отговаря на вашето устройство</string>
+    <string name="crash_reporting_title">Докладване за сривове</string>
+    <string name="preferred_media_subtext">Какво искате да видите</string>
+    <string name="setup_done">Край</string>
+    <string name="extensions">Разширения</string>
+    <string name="add_repository">Добавяне на хранилище</string>
+    <string name="repository_name_hint">Име на хранилище</string>
+    <string name="repository_url_hint">URL адрес на хранилището</string>
+    <string name="plugin_loaded">Приставката е заредена</string>
+    <string name="plugin_deleted">Приставката е изтрита</string>
+    <string name="plugin_load_fail" formatted="true">Неуспешно зареждане %s</string>
+    <string name="is_adult">18+</string>
+    <string name="batch_download_start_format" formatted="true">Започна да изтегля %d %s</string>
+    <string name="batch_download_finish_format" formatted="true">Изтеглено %d %s успешно</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Всички %s вече са изтеглени</string>
+    <string name="batch_download">Пакетно изтегляне</string>
+    <string name="plugin_singular">Плъгин</string>
+    <string name="plugin">Плъгини</string>
+    <string name="delete_repository_plugins">Това също ще изтрие всички хранилища за плъгини</string>
+    <string name="delete_repository">Изтриване на хранилище</string>
+    <string name="setup_extensions_subtext">Изтеглете списъка със сайтове, които искате да използвате</string>
+    <string formatted="true" name="plugins_downloaded">Изтеглено: %d</string>
+    <string formatted="true" name="plugins_disabled">Деактивирано: %d</string>
+    <string formatted="true" name="plugins_not_downloaded">Не е изтеглено: %d</string>
+    <string formatted="true" name="plugins_updated">Актуализирани %d плъгини</string>
+    <string name="blank_repo_message">CloudStream няма инсталирани сайтове по подразбиране. Трябва да инсталирате сайтовете от хранилища.\n\nПоради безмозъчно премахване на DMCA от Sky Uk Limited 🤮 не можем да свържем сайтовете на хранилищата в приложението.\n\nПрисъединете се към нашия дискорд за връзки или търсете онлайн.</string>
+    <string name="view_public_repositories_button">Вижте хранилищата на общността</string>
+    <string name="view_public_repositories_button_short">Публичен списък</string>
+    <string name="uppercase_all_subtitles">Всички субтитри с главни букви</string>
+
+    <string name="download_all_plugins_from_repo">Изтегляне на всички добавки от това хранилище?</string>
+    <string name="single_plugin_disabled" formatted="true">%s (Disabled)</string>
+    <string name="tracks">Потоци</string>
+    <string name="audio_tracks">Аудио потоци</string>
+    <string name="video_tracks">Видео потоци</string>
+    <string name="apply_on_restart">Приложете при рестартиране</string>
+
+    <string name="safe_mode_title">Безопасният режим е активиран</string>
+    <string name="safe_mode_description">Възникна непоправим срив и ние автоматично деактивирахме всички разширения, така че можете да намерите и премахнете разширението, което причинява проблеми.</string>
+    <string name="safe_mode_crash_info">Вижте информация за срива</string>
+
+    <string formatted="true" name="extension_rating">Оценка: %s</string>
+    <string name="extension_description">Описание</string>
+    <string name="extension_version">Версия</string>
+    <string name="extension_status">Статус</string>
+    <string name="extension_size">Размер</string>
+    <string name="extension_authors">Автори</string>
+    <string name="extension_types">Поддържани</string>
+    <string name="extension_language">език</string>
+    <string name="extension_install_first">Първо инсталирайте разширението</string>
+
+    <string name="hls_playlist">HLS плейлист</string>
+
+    <string name="player_pref">Предпочитан видео плеър</string>
+    <string name="player_settings_play_in_app">Вътрешен плеър</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">Уеб видео предаване</string>
+    <string name="player_settings_play_in_browser">Браузър</string>
+    <string name="app_not_found_error">Приложението не е намерено</string>
+</resources>
\ No newline at end of file

From 0f625142dacb4553b9af57f7f949eff9eab7b218 Mon Sep 17 00:00:00 2001
From: "J. Fronny" <github@akbvopenfl1.hopto.org>
Date: Wed, 26 Oct 2022 19:56:31 +0000
Subject: [PATCH 027/273] Switch to kotlin build scripts (#158)

---
 .github/workflows/prerelease.yml         |   4 +-
 .github/workflows/pull_request.yml       |   4 +-
 .idea/jarRepositories.xml                |   5 +
 app/build.gradle                         | 233 ---------------------
 app/build.gradle.kts                     | 250 +++++++++++++++++++++++
 app/proguard-rules.pro                   |   2 +-
 app/src/main/AndroidManifest.xml         |   3 +-
 build.gradle                             |  27 ---
 build.gradle.kts                         |  26 +++
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 settings.gradle                          |   2 -
 settings.gradle.kts                      |   3 +
 12 files changed, 291 insertions(+), 270 deletions(-)
 delete mode 100644 app/build.gradle
 create mode 100644 app/build.gradle.kts
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts
 delete mode 100644 settings.gradle
 create mode 100644 settings.gradle.kts

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 37161d6b..a7615ad5 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -43,7 +43,7 @@ jobs:
         echo "::set-output name=key_pwd::$KEY_PWD"
     - name: Run Gradle
       run: |
-        ./gradlew assemblePrerelease makeJar androidSourcesJar
+        ./gradlew assemblePrereleaseRelease makeJar androidSourcesJar
       env:
         SIGNING_KEY_ALIAS: "key0"
         SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
@@ -56,6 +56,6 @@ jobs:
         prerelease: true
         title: "Pre-release Build"
         files: |
-          app/build/outputs/apk/prerelease/*.apk
+          app/build/outputs/apk/prerelease/stable/*.apk
           app/build/libs/app-sources.jar
           app/build/classes.jar
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 1a4db134..36199cd6 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -15,9 +15,9 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Run Gradle
-      run: ./gradlew assembleDebug
+      run: ./gradlew assemblePrereleaseDebug
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
       with:
         name: pull-request-build
-        path: "app/build/outputs/apk/debug/*.apk"
+        path: "app/build/outputs/apk/prerelease/debug/*.apk"
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 652d9f3f..333d4937 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -31,5 +31,10 @@
       <option name="name" value="maven2" />
       <option name="url" value="https://jitpack.io" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 9df01079..00000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,233 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-android-extensions'
-    id 'org.jetbrains.dokka'
-}
-
-def tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
-def allFilesFromDir = new File(tmpFilePath).listFiles()
-def prereleaseStoreFile = null
-if (allFilesFromDir != null) {
-    prereleaseStoreFile = allFilesFromDir.first()
-}
-
-android {
-    testOptions {
-        unitTests.returnDefaultValues = true
-    }
-    signingConfigs {
-        prerelease {
-            if (prereleaseStoreFile != null) {
-                storeFile = file(prereleaseStoreFile)
-                storePassword System.getenv("SIGNING_STORE_PASSWORD")
-                keyAlias System.getenv("SIGNING_KEY_ALIAS")
-                keyPassword System.getenv("SIGNING_KEY_PASSWORD")
-            }
-        }
-    }
-    compileSdkVersion 31
-    buildToolsVersion "30.0.3"
-
-    defaultConfig {
-        applicationId "com.lagradost.cloudstream3"
-        minSdkVersion 21
-        targetSdkVersion 30
-
-        versionCode 52
-        versionName "3.1.6"
-
-        resValue "string", "app_version",
-                "${defaultConfig.versionName}${versionNameSuffix ?: ""}"
-
-        resValue "string", "commit_hash",
-                ("git rev-parse --short HEAD".execute().text.trim() ?: "")
-        
-        resValue "bool", "is_prerelease", "false"
-
-        buildConfigField("String", "BUILDDATE", "new java.text.SimpleDateFormat(\"yyyy-MM-dd HH:mm\").format(new java.util.Date(" + System.currentTimeMillis() + "L));")
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        kapt {
-            includeCompileClasspath = true
-        }
-    }
-
-    buildTypes {
-        // release {
-        //     debuggable false
-        //     minifyEnabled false
-        //     shrinkResources false
-        //     proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        //     resValue "bool", "is_prerelease", "false"
-        // }
-        prerelease {
-            applicationIdSuffix ".prerelease"
-            buildConfigField("boolean", "BETA", "true")
-            signingConfig signingConfigs.prerelease
-            versionNameSuffix '-PRE'
-            debuggable false
-            minifyEnabled false
-            shrinkResources false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            resValue "bool", "is_prerelease", "true"
-        }
-        debug {
-            debuggable true
-            applicationIdSuffix ".debug"
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            resValue "bool", "is_prerelease", "true"
-        }
-    }
-    compileOptions {
-        coreLibraryDesugaringEnabled true
-
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-        freeCompilerArgs = ['-Xjvm-default=compatibility']
-    }
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
-}
-
-repositories {
-    maven { url 'https://jitpack.io' }
-}
-
-dependencies {
-    implementation 'com.google.android.mediahome:video:1.0.0'
-    implementation 'androidx.test.ext:junit-ktx:1.1.3'
-    testImplementation 'org.json:json:20180813'
-
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.appcompat:appcompat:1.4.2' // need target 32 for 1.5.0
-
-    // dont change this to 1.6.0 it looks ugly af
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-
-    //implementation "io.karn:khttp-android:0.1.2" //okhttp instead
-//    implementation 'org.jsoup:jsoup:1.13.1'
-    implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1"
-
-    implementation "androidx.preference:preference-ktx:1.2.0"
-
-    implementation 'com.github.bumptech.glide:glide:4.13.1'
-    kapt 'com.github.bumptech.glide:compiler:4.13.1'
-    implementation 'com.github.bumptech.glide:okhttp3-integration:4.13.0'
-
-    implementation 'jp.wasabeef:glide-transformations:4.3.0'
-
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-
-    // implementation "androidx.leanback:leanback-paging:1.1.0-alpha09"
-
-    // Exoplayer
-    implementation 'com.google.android.exoplayer:exoplayer:2.16.1'
-    implementation 'com.google.android.exoplayer:extension-cast:2.16.1'
-    implementation "com.google.android.exoplayer:extension-mediasession:2.16.1"
-    implementation 'com.google.android.exoplayer:extension-okhttp:2.16.1'
-
-    //implementation "com.google.android.exoplayer:extension-leanback:2.14.0"
-
-    // Bug reports
-    implementation "ch.acra:acra-core:5.8.4"
-    implementation "ch.acra:acra-toast:5.8.4"
-
-    compileOnly "com.google.auto.service:auto-service-annotations:1.0"
-    //either for java sources:
-    annotationProcessor "com.google.auto.service:auto-service:1.0"
-    //or for kotlin sources (requires kapt gradle plugin):
-    kapt "com.google.auto.service:auto-service:1.0"
-
-    // subtitle color picker
-    implementation 'com.jaredrummler:colorpicker:1.1.0'
-
-    //run JS
-    implementation 'org.mozilla:rhino:1.7.14'
-
-    // TorrentStream
-    //implementation 'com.github.TorrentStream:TorrentStream-Android:2.7.0'
-
-    // Downloading
-    implementation "androidx.work:work-runtime:2.7.1"
-    implementation "androidx.work:work-runtime-ktx:2.7.1"
-
-    // Networking
-//    implementation "com.squareup.okhttp3:okhttp:4.9.2"
-//    implementation "com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1"
-    implementation 'com.github.Blatzar:NiceHttp:0.3.3'
-
-    // Util to skip the URI file fuckery 🙏
-    implementation "com.github.tachiyomiorg:unifile:17bec43"
-
-    // API because cba maintaining it myself
-    implementation "com.uwetrottmann.tmdb2:tmdb-java:2.6.0"
-
-    implementation 'com.github.discord:OverlappingPanels:0.1.3'
-    // debugImplementation because LeakCanary should only run in debug builds.
-    // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
-
-    // for shimmer when loading
-    implementation 'com.facebook.shimmer:shimmer:0.5.0'
-
-    implementation "androidx.tvprovider:tvprovider:1.0.0"
-
-    // used for subtitle decoding https://github.com/albfernandez/juniversalchardet
-    implementation 'com.github.albfernandez:juniversalchardet:2.4.0'
-
-    // slow af yt
-    //implementation 'com.github.HaarigerHarald:android-youtubeExtractor:master-SNAPSHOT'
-
-    // newpipe yt
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:dev-SNAPSHOT'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
-
-    // Library/extensions searching with Levenshtein distance
-    implementation 'me.xdrop:fuzzywuzzy:1.4.0'
-}
-
-task androidSourcesJar(type: Jar) {
-    getArchiveClassifier().set('sources')
-    from android.sourceSets.main.java.srcDirs//full sources
-}
-
-// this is used by the gradlew plugin
-task makeJar(type: Copy) {
-    from('build/intermediates/compile_app_classes_jar/debug')
-    into('build')
-    include('classes.jar')
-    dependsOn('build')
-}
-
-dokkaHtml {
-    moduleName.set("Cloudstream")
-    dokkaSourceSets {
-        main {
-            sourceLink {
-                // Unix based directory relative path to the root of the project (where you execute gradle respectively). 
-                localDirectory.set(file("src/main/java"))
-
-                // URL showing where the source code can be accessed through the web browser
-                remoteUrl.set(new URL(
-                    "https://github.com/recloudstream/cloudstream/tree/master/app/src/main/java"))
-                // Suffix which is used to append the line number to the URL. Use #L for GitHub
-                remoteLineSuffix.set("#L")
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 00000000..ed2ad5a0
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,250 @@
+import com.android.build.gradle.api.BaseVariantOutput
+import org.jetbrains.dokka.gradle.DokkaTask
+import java.io.ByteArrayOutputStream
+import java.net.URL
+
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    id("kotlin-kapt")
+    id("kotlin-android-extensions")
+    id("org.jetbrains.dokka")
+}
+
+val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
+val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
+
+fun String.execute() = ByteArrayOutputStream().use { baot ->
+    if (project.exec {
+            workingDir = projectDir
+            commandLine = this@execute.split(Regex("\\s"))
+            standardOutput = baot
+    }.exitValue == 0)
+        String(baot.toByteArray()).trim()
+    else null
+}
+
+android {
+    testOptions {
+        unitTests.isReturnDefaultValues = true
+    }
+    signingConfigs {
+        create("prerelease") {
+            if (prereleaseStoreFile != null) {
+                storeFile = file(prereleaseStoreFile)
+                storePassword = System.getenv("SIGNING_STORE_PASSWORD")
+                keyAlias = System.getenv("SIGNING_KEY_ALIAS")
+                keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
+            }
+        }
+    }
+
+    compileSdk = 31
+    buildToolsVersion = "30.0.3"
+
+    defaultConfig {
+        applicationId = "com.lagradost.cloudstream3"
+        minSdk = 21
+        targetSdk = 30
+
+        versionCode = 52
+        versionName = "3.1.6"
+
+        resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
+
+        resValue("string", "commit_hash", "git rev-parse --short HEAD".execute() ?: "")
+
+        resValue("bool", "is_prerelease", "false")
+
+        buildConfigField(
+            "String",
+            "BUILDDATE",
+            "new java.text.SimpleDateFormat(\"yyyy-MM-dd HH:mm\").format(new java.util.Date(" + System.currentTimeMillis() + "L));"
+        )
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+        kapt {
+            includeCompileClasspath = true
+        }
+    }
+
+    buildTypes {
+        release {
+            isDebuggable = false
+            isMinifyEnabled = false
+            isShrinkResources = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+        debug {
+            isDebuggable = true
+            applicationIdSuffix = ".debug"
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    flavorDimensions.add("state")
+    productFlavors {
+        create("stable") {
+            dimension = "state"
+            resValue("bool", "is_prerelease", "false")
+        }
+        create("prerelease") {
+            dimension = "state"
+            resValue("bool", "is_prerelease", "true")
+            buildConfigField("boolean", "BETA", "true")
+            applicationIdSuffix = ".prerelease"
+            signingConfig = signingConfigs.getByName("prerelease")
+            versionNameSuffix = "-PRE"
+            versionCode = (System.currentTimeMillis() / 60000).toInt()
+        }
+    }
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+        freeCompilerArgs = listOf("-Xjvm-default=compatibility")
+    }
+    lint {
+        abortOnError = false
+        checkReleaseBuilds = false
+    }
+    namespace = "com.lagradost.cloudstream3"
+}
+
+repositories {
+    maven("https://jitpack.io")
+}
+
+dependencies {
+    implementation("com.google.android.mediahome:video:1.0.0")
+    implementation("androidx.test.ext:junit-ktx:1.1.3")
+    testImplementation("org.json:json:20180813")
+
+    implementation("androidx.core:core-ktx:1.8.0")
+    implementation("androidx.appcompat:appcompat:1.4.2") // need target 32 for 1.5.0
+
+    // dont change this to 1.6.0 it looks ugly af
+    implementation("com.google.android.material:material:1.5.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.5.1")
+    implementation("androidx.navigation:navigation-ui-ktx:2.5.1")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.3")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+
+    //implementation("io.karn:khttp-android:0.1.2") //okhttp instead
+//    implementation("org.jsoup:jsoup:1.13.1")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1")
+
+    implementation("androidx.preference:preference-ktx:1.2.0")
+
+    implementation("com.github.bumptech.glide:glide:4.13.1")
+    kapt("com.github.bumptech.glide:compiler:4.13.1")
+    implementation("com.github.bumptech.glide:okhttp3-integration:4.13.0")
+
+    implementation("jp.wasabeef:glide-transformations:4.3.0")
+
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
+
+    // implementation("androidx.leanback:leanback-paging:1.1.0-alpha09")
+
+    // Exoplayer
+    implementation("com.google.android.exoplayer:exoplayer:2.16.1")
+    implementation("com.google.android.exoplayer:extension-cast:2.16.1")
+    implementation("com.google.android.exoplayer:extension-mediasession:2.16.1")
+    implementation("com.google.android.exoplayer:extension-okhttp:2.16.1")
+
+    //implementation("com.google.android.exoplayer:extension-leanback:2.14.0")
+
+    // Bug reports
+    implementation("ch.acra:acra-core:5.8.4")
+    implementation("ch.acra:acra-toast:5.8.4")
+
+    compileOnly("com.google.auto.service:auto-service-annotations:1.0")
+    //either for java sources:
+    annotationProcessor("com.google.auto.service:auto-service:1.0")
+    //or for kotlin sources (requires kapt gradle plugin):
+    kapt("com.google.auto.service:auto-service:1.0")
+
+    // subtitle color picker
+    implementation("com.jaredrummler:colorpicker:1.1.0")
+
+    //run JS
+    implementation("org.mozilla:rhino:1.7.14")
+
+    // TorrentStream
+    //implementation("com.github.TorrentStream:TorrentStream-Android:2.7.0")
+
+    // Downloading
+    implementation("androidx.work:work-runtime:2.7.1")
+    implementation("androidx.work:work-runtime-ktx:2.7.1")
+
+    // Networking
+//    implementation("com.squareup.okhttp3:okhttp:4.9.2")
+//    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1")
+    implementation("com.github.Blatzar:NiceHttp:0.3.3")
+
+    // Util to skip the URI file fuckery 🙏
+    implementation("com.github.tachiyomiorg:unifile:17bec43")
+
+    // API because cba maintaining it myself
+    implementation("com.uwetrottmann.tmdb2:tmdb-java:2.6.0")
+
+    implementation("com.github.discord:OverlappingPanels:0.1.3")
+    // debugImplementation because LeakCanary should only run in debug builds.
+    // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
+
+    // for shimmer when loading
+    implementation("com.facebook.shimmer:shimmer:0.5.0")
+
+    implementation("androidx.tvprovider:tvprovider:1.0.0")
+
+    // used for subtitle decoding https://github.com/albfernandez/juniversalchardet
+    implementation("com.github.albfernandez:juniversalchardet:2.4.0")
+
+    // slow af yt
+    //implementation("com.github.HaarigerHarald:android-youtubeExtractor:master-SNAPSHOT")
+
+    // newpipe yt
+    implementation("com.github.TeamNewPipe:NewPipeExtractor:dev-SNAPSHOT")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
+
+    // Library/extensions searching with Levenshtein distance
+    implementation("me.xdrop:fuzzywuzzy:1.4.0")
+}
+
+tasks.register("androidSourcesJar", Jar::class) {
+    archiveClassifier.set("sources")
+    from(android.sourceSets.getByName("main").java.srcDirs) //full sources
+}
+
+// this is used by the gradlew plugin
+tasks.register("makeJar", Copy::class) {
+    from("build/intermediates/compile_app_classes_jar/debug")
+    into("build")
+    include("classes.jar")
+    dependsOn("build")
+}
+
+tasks.withType<DokkaTask>().configureEach {
+    moduleName.set("Cloudstream")
+    dokkaSourceSets {
+        named("main") {
+            sourceLink {
+                // Unix based directory relative path to the root of the project (where you execute gradle respectively).
+                localDirectory.set(file("src/main/java"))
+
+                // URL showing where the source code can be accessed through the web browser
+                remoteUrl.set(URL("https://github.com/recloudstream/cloudstream/tree/master/app/src/main/java"))
+                // Suffix which is used to append the line number to the URL. Use #L for GitHub
+                remoteLineSuffix.set("#L")
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 481bb434..ff59496d 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d22e95c0..47676059 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.lagradost.cloudstream3">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- I dont remember, probs has to do with downloads -->
     <uses-permission android:name="android.permission.INTERNET" /> <!-- unless you only use cs3 as a player for downloaded stuff, you need this -->
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 90f9ac32..00000000
--- a/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    ext.kotlin_version = "1.7.10"
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.5.0"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 00000000..6e2a24f3
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,26 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("com.android.tools.build:gradle:7.3.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
+        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle.kts files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+tasks.register("clean", Delete::class) {
+    delete(rootProject.buildDir)
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a2c4ced7..baa28c97 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Apr 30 17:11:15 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 5d77faec..00000000
--- a/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-include ':app'
-rootProject.name = "CloudStream"
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 00000000..17070047
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,3 @@
+rootProject.name = "CloudStream"
+
+include(":app")
\ No newline at end of file

From 49ebd27f80786eb2d067a5a2ba343c3b02b7a5cf Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Wed, 26 Oct 2022 22:06:19 +0200
Subject: [PATCH 028/273] fix broken strings.xml and migrate to $GITHUB_OUTPUT

---
 .github/workflows/issue_action.yml     |  2 +-
 .github/workflows/prerelease.yml       |  2 +-
 app/src/main/res/values-bg/strings.xml | 14 --------------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/issue_action.yml b/.github/workflows/issue_action.yml
index a81c4b42..28b737b3 100644
--- a/.github/workflows/issue_action.yml
+++ b/.github/workflows/issue_action.yml
@@ -41,7 +41,7 @@ jobs:
           wget --output-document check_issue.py "https://raw.githubusercontent.com/recloudstream/.github/master/.github/check_issue.py"
           pip3 install httpx
           RES="$(python3 ./check_issue.py)"
-          echo "::set-output name=name::${RES}"
+          echo "name=${RES}" >> $GITHUB_OUTPUT
       - name: Comment if issue mentions a provider
         if: steps.provider_check.outputs.name != 'none'
         uses: actions-cool/issues-helper@v3
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index a7615ad5..bac0430f 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -40,7 +40,7 @@ jobs:
         curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "keystore_password.txt" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore_password.txt"
         KEY_PWD="$(cat keystore_password.txt)"
         echo "::add-mask::${KEY_PWD}"
-        echo "::set-output name=key_pwd::$KEY_PWD"
+        echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
     - name: Run Gradle
       run: |
         ./gradlew assemblePrereleaseRelease makeJar androidSourcesJar
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index b8f43dd0..d67ab55c 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -344,21 +344,7 @@
     <string name="resize_zoom">Мащабиране</string>
 
     <string name="legal_notice">Опровержение</string>
-        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
 
-        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
-
-        The app is purely for educational and personal use.
-
-        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down.
-        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or
-        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
-        user-friendly interface.
-
-        It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the
-        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
-        CloudStream 3 at your own risk.
-    </string>
     <string name="category_general">Общ</string>
     <string name="random_button_settings">Случаен бутон</string>
     <string name="random_button_settings_desc">Показване на произволен бутон на началната страница</string>

From c9c339795ad94dc3027c44c97ab15098d089240c Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Wed, 26 Oct 2022 22:12:17 +0200
Subject: [PATCH 029/273] fix the bulgarian string once again

---
 app/src/main/res/values-bg/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index d67ab55c..e32d3d93 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -271,7 +271,7 @@
     <string name="movies_singular">Филм</string>
     <string name="tv_series_singular">Серия</string>
     <string name="cartoons_singular">Анимационен филм</string>
-    <string name="anime_singular">@string/аниме</string>
+    <string name="anime_singular">@string/anime</string>
     <string name="ova_singular">@string/ova</string>
     <string name="torrent_singular">Торент</string>
     <string name="documentaries_singular">Документален филм</string>

From fa6a620bf995073b48b4d5582e7266dae1a489f2 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Wed, 26 Oct 2022 22:39:36 +0200
Subject: [PATCH 030/273] fix builds

---
 .github/workflows/prerelease.yml | 2 +-
 app/build.gradle.kts             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index bac0430f..99ab00df 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -43,7 +43,7 @@ jobs:
         echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
     - name: Run Gradle
       run: |
-        ./gradlew assemblePrereleaseRelease makeJar androidSourcesJar
+        ./gradlew assemblePrerelease makeJar androidSourcesJar
       env:
         SIGNING_KEY_ALIAS: "key0"
         SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ed2ad5a0..42ca93fd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -226,7 +226,7 @@ tasks.register("androidSourcesJar", Jar::class) {
 
 // this is used by the gradlew plugin
 tasks.register("makeJar", Copy::class) {
-    from("build/intermediates/compile_app_classes_jar/debug")
+    from("build/intermediates/compile_app_classes_jar/prereleaseDebug")
     into("build")
     include("classes.jar")
     dependsOn("build")

From 7e750a40e055b15ac303cf6eb8b977fa9a72de47 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Wed, 26 Oct 2022 23:09:28 +0200
Subject: [PATCH 031/273] fix da build (again)

---
 .github/workflows/prerelease.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 99ab00df..4ce7dba1 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -56,6 +56,6 @@ jobs:
         prerelease: true
         title: "Pre-release Build"
         files: |
-          app/build/outputs/apk/prerelease/stable/*.apk
+          app/build/outputs/apk/prerelease/release/*.apk
           app/build/libs/app-sources.jar
           app/build/classes.jar

From 93cbd29f3dce5ee994030051f6a51271d330a631 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Thu, 27 Oct 2022 15:38:53 +0200
Subject: [PATCH 032/273] Bumped the exoplayer version and fixed the audio &
 video track selection

---
 app/build.gradle.kts                          |   8 +-
 .../cloudstream3/ui/ControllerActivity.kt     |  14 +--
 .../cloudstream3/ui/player/CS3IPlayer.kt      | 100 ++++++++++++++----
 .../cloudstream3/ui/player/GeneratorPlayer.kt |   5 +-
 .../cloudstream3/ui/player/IPlayer.kt         |   8 +-
 .../ui/player/NonFinalTextRenderer.kt         |   5 +-
 .../ui/subtitles/SubtitlesFragment.kt         |   2 +-
 .../cloudstream3/utils/CastOptionsProvider.kt |   9 +-
 8 files changed, 108 insertions(+), 43 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 42ca93fd..b3318675 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -155,10 +155,10 @@ dependencies {
     // implementation("androidx.leanback:leanback-paging:1.1.0-alpha09")
 
     // Exoplayer
-    implementation("com.google.android.exoplayer:exoplayer:2.16.1")
-    implementation("com.google.android.exoplayer:extension-cast:2.16.1")
-    implementation("com.google.android.exoplayer:extension-mediasession:2.16.1")
-    implementation("com.google.android.exoplayer:extension-okhttp:2.16.1")
+    implementation("com.google.android.exoplayer:exoplayer:2.18.1")
+    implementation("com.google.android.exoplayer:extension-cast:2.18.1")
+    implementation("com.google.android.exoplayer:extension-mediasession:2.18.1")
+    implementation("com.google.android.exoplayer:extension-okhttp:2.18.1")
 
     //implementation("com.google.android.exoplayer:extension-leanback:2.14.0")
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
index ad0b4399..46ddce09 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
@@ -150,7 +150,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                             } else {
                                 ChromecastSubtitlesFragment.getCurrentSavedStyle().apply {
                                     val font = TextTrackStyle()
-                                    font.fontFamily = fontFamily ?: "Google Sans"
+                                    font.setFontFamily(fontFamily ?: "Google Sans")
                                     fontGenericFamily?.let {
                                         font.fontGenericFamily = it
                                     }
@@ -183,7 +183,9 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                     val contentUrl = (remoteMediaClient?.currentItem?.media?.contentUrl
                         ?: remoteMediaClient?.currentItem?.media?.contentId)
 
-                    val sortingMethods = items.map { "${it.name} ${Qualities.getStringByInt(it.quality)}" }.toTypedArray()
+                    val sortingMethods =
+                        items.map { "${it.name} ${Qualities.getStringByInt(it.quality)}" }
+                            .toTypedArray()
                     val sotringIndex = items.indexOfFirst { it.url == contentUrl }
 
                     val arrayAdapter =
@@ -279,7 +281,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                     val currentPosition = remoteMediaClient?.approximateStreamPosition
                     if (currentDuration != null && currentPosition != null)
                         DataStoreHelper.setViewPos(epData.id, currentPosition, currentDuration)
-                } catch (t : Throwable) {
+                } catch (t: Throwable) {
                     logError(t)
                 }
 
@@ -358,10 +360,8 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
         }
     }
 
-    override fun onSessionConnected(castSession: CastSession?) {
-        castSession?.let {
-            super.onSessionConnected(it)
-        }
+    override fun onSessionConnected(castSession: CastSession) {
+        super.onSessionConnected(castSession)
         remoteMediaClient?.queueSetRepeatMode(REPEAT_MODE_REPEAT_OFF, JSONObject())
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index a838c85c..f60d8c78 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -15,6 +15,7 @@ import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource
 import com.google.android.exoplayer2.source.*
 import com.google.android.exoplayer2.text.TextRenderer
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
+import com.google.android.exoplayer2.trackselection.TrackSelectionOverride
 import com.google.android.exoplayer2.trackselection.TrackSelector
 import com.google.android.exoplayer2.ui.SubtitleView
 import com.google.android.exoplayer2.upstream.*
@@ -218,7 +219,43 @@ class CS3IPlayer : IPlayer {
 
     var currentSubtitles: SubtitleData? = null
 
-    override fun setMaxVideoSize(width: Int, height: Int) {
+    private fun List<Tracks.Group>.getTrack(id: String?): Pair<TrackGroup, Int>? {
+        if (id == null) return null
+        // This beast of an expression does:
+        // 1. Filter all audio tracks
+        // 2. Get all formats in said audio tacks
+        // 3. Gets all ids of the formats
+        // 4. Filters to find the first audio track with the same id as the audio track we are looking for
+        // 5. Returns the media group and the index of the audio track in the group
+        return this.firstNotNullOfOrNull { group ->
+            (0 until group.mediaTrackGroup.length).map {
+                group.getTrackFormat(it) to it
+            }.firstOrNull { it.first.id == id }
+                ?.let { group.mediaTrackGroup to it.second }
+        }
+    }
+
+    override fun setMaxVideoSize(width: Int, height: Int, id: String?) {
+        if (id != null) {
+            val videoTrack =
+                exoPlayer?.currentTracks?.groups?.filter { it.type == TRACK_TYPE_VIDEO }
+                    ?.getTrack(id)
+
+            if (videoTrack != null) {
+                exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
+                    ?.buildUpon()
+                    ?.setOverrideForType(
+                        TrackSelectionOverride(
+                            videoTrack.first,
+                            videoTrack.second
+                        )
+                    )
+                    ?.build()
+                    ?: return
+                return
+            }
+        }
+
         exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
             ?.buildUpon()
             ?.setMaxVideoSize(width, height)
@@ -226,8 +263,29 @@ class CS3IPlayer : IPlayer {
             ?: return
     }
 
-    override fun setPreferredAudioTrack(trackLanguage: String?) {
+    override fun setPreferredAudioTrack(trackLanguage: String?, id: String?) {
         preferredAudioTrackLanguage = trackLanguage
+
+        if (id != null) {
+            val audioTrack =
+                exoPlayer?.currentTracks?.groups?.filter { it.type == TRACK_TYPE_AUDIO }
+                    ?.getTrack(id)
+
+            if (audioTrack != null) {
+                exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
+                    ?.buildUpon()
+                    ?.setOverrideForType(
+                        TrackSelectionOverride(
+                            audioTrack.first,
+                            audioTrack.second
+                        )
+                    )
+                    ?.build()
+                    ?: return
+                return
+            }
+        }
+
         exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
             ?.buildUpon()
             ?.setPreferredAudioLanguage(trackLanguage)
@@ -239,11 +297,11 @@ class CS3IPlayer : IPlayer {
     /**
      * Gets all supported formats in a list
      * */
-    private fun List<TracksInfo.TrackGroupInfo>.getFormats(): List<Format> {
+    private fun List<Tracks.Group>.getFormats(): List<Pair<Format, Int>> {
         return this.map {
-            (0 until it.trackGroup.length).mapNotNull { i ->
+            (0 until it.mediaTrackGroup.length).mapNotNull { i ->
                 if (it.isSupported)
-                    it.trackGroup.getFormat(i) // to it.isSelected
+                    it.mediaTrackGroup.getFormat(i) to i
                 else null
             }
         }.flatten()
@@ -270,11 +328,12 @@ class CS3IPlayer : IPlayer {
     }
 
     override fun getVideoTracks(): CurrentTracks {
-        val allTracks = exoPlayer?.currentTracksInfo?.trackGroupInfos ?: emptyList()
-        val videoTracks = allTracks.filter { it.trackType == TRACK_TYPE_VIDEO }.getFormats()
-            .map { it.toVideoTrack() }
-        val audioTracks = allTracks.filter { it.trackType == TRACK_TYPE_AUDIO }.getFormats()
-            .map { it.toAudioTrack() }
+        val allTracks = exoPlayer?.currentTracks?.groups ?: emptyList()
+        val videoTracks = allTracks.filter { it.type == TRACK_TYPE_VIDEO }
+            .getFormats()
+            .map { it.first.toVideoTrack() }
+        val audioTracks = allTracks.filter { it.type == TRACK_TYPE_AUDIO }.getFormats()
+            .map { it.first.toAudioTrack() }
 
         return CurrentTracks(
             exoPlayer?.videoFormat?.toVideoTrack(),
@@ -611,7 +670,12 @@ class CS3IPlayer : IPlayer {
                             } else it
                         }.toTypedArray()
                     }
-                    .setTrackSelector(trackSelector ?: getTrackSelector(context, maxVideoHeight))
+                    .setTrackSelector(
+                        trackSelector ?: getTrackSelector(
+                            context,
+                            maxVideoHeight
+                        )
+                    )
                     .setLoadControl(
                         DefaultLoadControl.Builder()
                             .setTargetBufferBytes(
@@ -781,10 +845,7 @@ class CS3IPlayer : IPlayer {
                 isPlaying = exo.isPlaying
             }
             exoPlayer?.addListener(object : Player.Listener {
-                /**
-                 * Records the current used subtitle/track. Needed as exoplayer seems to have loose track language selection.
-                 * */
-                override fun onTracksInfoChanged(tracksInfo: TracksInfo) {
+                override fun onTracksChanged(tracks: Tracks) {
                     fun Format.isSubtitle(): Boolean {
                         return this.sampleMimeType?.contains("video/") == false &&
                                 this.sampleMimeType?.contains("audio/") == false
@@ -792,17 +853,17 @@ class CS3IPlayer : IPlayer {
 
                     normalSafeApiCall {
                         exoPlayerSelectedTracks =
-                            tracksInfo.trackGroupInfos.mapNotNull {
-                                val format = it.trackGroup.getFormat(0)
+                            tracks.groups.mapNotNull {
+                                val format = it.mediaTrackGroup.getFormat(0)
                                 if (format.isSubtitle())
                                     format.language?.let { lang -> lang to it.isSelected }
                                 else null
                             }
 
-                        val exoPlayerReportedTracks = tracksInfo.trackGroupInfos.mapNotNull {
+                        val exoPlayerReportedTracks = tracks.groups.mapNotNull {
                             // Filter out unsupported tracks
                             if (it.isSupported)
-                                it.trackGroup.getFormat(0)
+                                it.mediaTrackGroup.getFormat(0)
                             else
                                 null
                         }.mapNotNull {
@@ -827,7 +888,6 @@ class CS3IPlayer : IPlayer {
                         onTracksInfoChanged?.invoke()
                         subtitlesUpdates?.invoke()
                     }
-                    super.onTracksInfoChanged(tracksInfo)
                 }
 
                 override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index e20a6c7b..172984a2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -796,15 +796,16 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 tracksDialog.apply_btt?.setOnClickListener {
+                    val currentTrack = currentAudioTracks.getOrNull(audioIndexStart)
                     player.setPreferredAudioTrack(
-                        currentAudioTracks.getOrNull(audioIndexStart)?.language
+                        currentTrack?.language, currentTrack?.id
                     )
 
                     val currentVideo = currentVideoTracks.getOrNull(videoIndex)
                     val width = currentVideo?.width ?: NO_VALUE
                     val height = currentVideo?.height ?: NO_VALUE
                     if (width != NO_VALUE && height != NO_VALUE) {
-                        player.setMaxVideoSize(width, height)
+                        player.setMaxVideoSize(width, height, currentVideo?.id)
                     }
 
                     tracksDialog.dismissSafe(activity)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
index e8934250..473b3e65 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
@@ -161,9 +161,9 @@ interface IPlayer {
 
     fun getVideoTracks(): CurrentTracks
 
-    /** If no parameters are set it'll default to no set size */
-    fun setMaxVideoSize(width: Int = Int.MAX_VALUE, height: Int = Int.MAX_VALUE)
+    /** If no parameters are set it'll default to no set size, Specifying the id allows for track overrides to force the player to pick the quality. */
+    fun setMaxVideoSize(width: Int = Int.MAX_VALUE, height: Int = Int.MAX_VALUE, id: String? = null)
 
-    /** If no trackLanguage is set it'll default to first track */
-    fun setPreferredAudioTrack(trackLanguage: String?)
+    /** If no trackLanguage is set it'll default to first track. Specifying the id allows for track overrides as the language can be identical. */
+    fun setPreferredAudioTrack(trackLanguage: String?, id: String? = null)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt
index f7fb3139..7acb7c34 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt
@@ -75,7 +75,7 @@ open class NonFinalTextRenderer @JvmOverloads constructor(
         return TAG
     }
 
-    @RendererCapabilities.Capabilities
+//    @RendererCapabilities.Capabilities
     override fun supportsFormat(format: Format): Int {
         return if (decoderFactory.supportsFormat(format)) {
             RendererCapabilities.create(
@@ -202,7 +202,8 @@ open class NonFinalTextRenderer @JvmOverloads constructor(
                     return
                 }
                 // Try and read the next subtitle from the source.
-                @ReadDataResult val result =
+//                @ReadDataResult
+                val result =
                     readSource(formatHold, nextInputBuffer,  /* readFlags= */0)
                 if (result == C.RESULT_BUFFER_READ) {
                     if (nextInputBuffer.isEndOfStream) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
index b97468e7..05a9416d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
@@ -49,7 +49,7 @@ data class SaveCaptionStyle(
     @JsonProperty("foregroundColor") var foregroundColor: Int,
     @JsonProperty("backgroundColor") var backgroundColor: Int,
     @JsonProperty("windowColor") var windowColor: Int,
-    @CaptionStyleCompat.EdgeType
+//    @CaptionStyleCompat.EdgeType
     @JsonProperty("edgeType") var edgeType: Int,
     @JsonProperty("edgeColor") var edgeColor: Int,
     @FontRes
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/CastOptionsProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/CastOptionsProvider.kt
index 17ec775b..ece9a4c0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/CastOptionsProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/CastOptionsProvider.kt
@@ -20,10 +20,13 @@ class CastOptionsProvider : OptionsProvider {
             MediaIntentReceiver.ACTION_FORWARD,
             MediaIntentReceiver.ACTION_STOP_CASTING
         )
+
+        val name = ControllerActivity::class.qualifiedName!!
+
         val compatButtonAction = intArrayOf(1, 3)
         val notificationOptions =
             NotificationOptions.Builder()
-                .setTargetActivityClassName(ControllerActivity::class.qualifiedName)
+                .setTargetActivityClassName(name)
                 .setActions(buttonActions, compatButtonAction)
                 .setForward30DrawableResId(R.drawable.go_forward_30)
                 .setRewind30DrawableResId(R.drawable.go_back_30)
@@ -32,7 +35,7 @@ class CastOptionsProvider : OptionsProvider {
 
         val mediaOptions = CastMediaOptions.Builder()
             .setNotificationOptions(notificationOptions)
-            .setExpandedControllerActivityClassName(ControllerActivity::class.qualifiedName)
+            .setExpandedControllerActivityClassName(name)
             .build()
 
         return CastOptions.Builder()
@@ -44,7 +47,7 @@ class CastOptionsProvider : OptionsProvider {
             .build()
     }
 
-    override fun getAdditionalSessionProviders(p0: Context?): MutableList<SessionProvider> {
+    override fun getAdditionalSessionProviders(p0: Context): MutableList<SessionProvider> {
         return Collections.emptyList()
     }
 }
\ No newline at end of file

From 6b586388b9ff68469a3312c61a3c7ec96e904609 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Thu, 27 Oct 2022 18:31:38 +0200
Subject: [PATCH 033/273] Revert "Bumped the exoplayer version and fixed the
 audio & video track selection"

This reverts commit 93cbd29f3dce5ee994030051f6a51271d330a631.
---
 app/build.gradle.kts                          |   8 +-
 .../cloudstream3/ui/ControllerActivity.kt     |  14 +--
 .../cloudstream3/ui/player/CS3IPlayer.kt      | 100 ++++--------------
 .../cloudstream3/ui/player/GeneratorPlayer.kt |   5 +-
 .../cloudstream3/ui/player/IPlayer.kt         |   8 +-
 .../ui/player/NonFinalTextRenderer.kt         |   5 +-
 .../ui/subtitles/SubtitlesFragment.kt         |   2 +-
 .../cloudstream3/utils/CastOptionsProvider.kt |   9 +-
 8 files changed, 43 insertions(+), 108 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b3318675..42ca93fd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -155,10 +155,10 @@ dependencies {
     // implementation("androidx.leanback:leanback-paging:1.1.0-alpha09")
 
     // Exoplayer
-    implementation("com.google.android.exoplayer:exoplayer:2.18.1")
-    implementation("com.google.android.exoplayer:extension-cast:2.18.1")
-    implementation("com.google.android.exoplayer:extension-mediasession:2.18.1")
-    implementation("com.google.android.exoplayer:extension-okhttp:2.18.1")
+    implementation("com.google.android.exoplayer:exoplayer:2.16.1")
+    implementation("com.google.android.exoplayer:extension-cast:2.16.1")
+    implementation("com.google.android.exoplayer:extension-mediasession:2.16.1")
+    implementation("com.google.android.exoplayer:extension-okhttp:2.16.1")
 
     //implementation("com.google.android.exoplayer:extension-leanback:2.14.0")
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
index 46ddce09..ad0b4399 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
@@ -150,7 +150,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                             } else {
                                 ChromecastSubtitlesFragment.getCurrentSavedStyle().apply {
                                     val font = TextTrackStyle()
-                                    font.setFontFamily(fontFamily ?: "Google Sans")
+                                    font.fontFamily = fontFamily ?: "Google Sans"
                                     fontGenericFamily?.let {
                                         font.fontGenericFamily = it
                                     }
@@ -183,9 +183,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                     val contentUrl = (remoteMediaClient?.currentItem?.media?.contentUrl
                         ?: remoteMediaClient?.currentItem?.media?.contentId)
 
-                    val sortingMethods =
-                        items.map { "${it.name} ${Qualities.getStringByInt(it.quality)}" }
-                            .toTypedArray()
+                    val sortingMethods = items.map { "${it.name} ${Qualities.getStringByInt(it.quality)}" }.toTypedArray()
                     val sotringIndex = items.indexOfFirst { it.url == contentUrl }
 
                     val arrayAdapter =
@@ -281,7 +279,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                     val currentPosition = remoteMediaClient?.approximateStreamPosition
                     if (currentDuration != null && currentPosition != null)
                         DataStoreHelper.setViewPos(epData.id, currentPosition, currentDuration)
-                } catch (t: Throwable) {
+                } catch (t : Throwable) {
                     logError(t)
                 }
 
@@ -360,8 +358,10 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
         }
     }
 
-    override fun onSessionConnected(castSession: CastSession) {
-        super.onSessionConnected(castSession)
+    override fun onSessionConnected(castSession: CastSession?) {
+        castSession?.let {
+            super.onSessionConnected(it)
+        }
         remoteMediaClient?.queueSetRepeatMode(REPEAT_MODE_REPEAT_OFF, JSONObject())
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index f60d8c78..a838c85c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -15,7 +15,6 @@ import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource
 import com.google.android.exoplayer2.source.*
 import com.google.android.exoplayer2.text.TextRenderer
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
-import com.google.android.exoplayer2.trackselection.TrackSelectionOverride
 import com.google.android.exoplayer2.trackselection.TrackSelector
 import com.google.android.exoplayer2.ui.SubtitleView
 import com.google.android.exoplayer2.upstream.*
@@ -219,43 +218,7 @@ class CS3IPlayer : IPlayer {
 
     var currentSubtitles: SubtitleData? = null
 
-    private fun List<Tracks.Group>.getTrack(id: String?): Pair<TrackGroup, Int>? {
-        if (id == null) return null
-        // This beast of an expression does:
-        // 1. Filter all audio tracks
-        // 2. Get all formats in said audio tacks
-        // 3. Gets all ids of the formats
-        // 4. Filters to find the first audio track with the same id as the audio track we are looking for
-        // 5. Returns the media group and the index of the audio track in the group
-        return this.firstNotNullOfOrNull { group ->
-            (0 until group.mediaTrackGroup.length).map {
-                group.getTrackFormat(it) to it
-            }.firstOrNull { it.first.id == id }
-                ?.let { group.mediaTrackGroup to it.second }
-        }
-    }
-
-    override fun setMaxVideoSize(width: Int, height: Int, id: String?) {
-        if (id != null) {
-            val videoTrack =
-                exoPlayer?.currentTracks?.groups?.filter { it.type == TRACK_TYPE_VIDEO }
-                    ?.getTrack(id)
-
-            if (videoTrack != null) {
-                exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
-                    ?.buildUpon()
-                    ?.setOverrideForType(
-                        TrackSelectionOverride(
-                            videoTrack.first,
-                            videoTrack.second
-                        )
-                    )
-                    ?.build()
-                    ?: return
-                return
-            }
-        }
-
+    override fun setMaxVideoSize(width: Int, height: Int) {
         exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
             ?.buildUpon()
             ?.setMaxVideoSize(width, height)
@@ -263,29 +226,8 @@ class CS3IPlayer : IPlayer {
             ?: return
     }
 
-    override fun setPreferredAudioTrack(trackLanguage: String?, id: String?) {
+    override fun setPreferredAudioTrack(trackLanguage: String?) {
         preferredAudioTrackLanguage = trackLanguage
-
-        if (id != null) {
-            val audioTrack =
-                exoPlayer?.currentTracks?.groups?.filter { it.type == TRACK_TYPE_AUDIO }
-                    ?.getTrack(id)
-
-            if (audioTrack != null) {
-                exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
-                    ?.buildUpon()
-                    ?.setOverrideForType(
-                        TrackSelectionOverride(
-                            audioTrack.first,
-                            audioTrack.second
-                        )
-                    )
-                    ?.build()
-                    ?: return
-                return
-            }
-        }
-
         exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
             ?.buildUpon()
             ?.setPreferredAudioLanguage(trackLanguage)
@@ -297,11 +239,11 @@ class CS3IPlayer : IPlayer {
     /**
      * Gets all supported formats in a list
      * */
-    private fun List<Tracks.Group>.getFormats(): List<Pair<Format, Int>> {
+    private fun List<TracksInfo.TrackGroupInfo>.getFormats(): List<Format> {
         return this.map {
-            (0 until it.mediaTrackGroup.length).mapNotNull { i ->
+            (0 until it.trackGroup.length).mapNotNull { i ->
                 if (it.isSupported)
-                    it.mediaTrackGroup.getFormat(i) to i
+                    it.trackGroup.getFormat(i) // to it.isSelected
                 else null
             }
         }.flatten()
@@ -328,12 +270,11 @@ class CS3IPlayer : IPlayer {
     }
 
     override fun getVideoTracks(): CurrentTracks {
-        val allTracks = exoPlayer?.currentTracks?.groups ?: emptyList()
-        val videoTracks = allTracks.filter { it.type == TRACK_TYPE_VIDEO }
-            .getFormats()
-            .map { it.first.toVideoTrack() }
-        val audioTracks = allTracks.filter { it.type == TRACK_TYPE_AUDIO }.getFormats()
-            .map { it.first.toAudioTrack() }
+        val allTracks = exoPlayer?.currentTracksInfo?.trackGroupInfos ?: emptyList()
+        val videoTracks = allTracks.filter { it.trackType == TRACK_TYPE_VIDEO }.getFormats()
+            .map { it.toVideoTrack() }
+        val audioTracks = allTracks.filter { it.trackType == TRACK_TYPE_AUDIO }.getFormats()
+            .map { it.toAudioTrack() }
 
         return CurrentTracks(
             exoPlayer?.videoFormat?.toVideoTrack(),
@@ -670,12 +611,7 @@ class CS3IPlayer : IPlayer {
                             } else it
                         }.toTypedArray()
                     }
-                    .setTrackSelector(
-                        trackSelector ?: getTrackSelector(
-                            context,
-                            maxVideoHeight
-                        )
-                    )
+                    .setTrackSelector(trackSelector ?: getTrackSelector(context, maxVideoHeight))
                     .setLoadControl(
                         DefaultLoadControl.Builder()
                             .setTargetBufferBytes(
@@ -845,7 +781,10 @@ class CS3IPlayer : IPlayer {
                 isPlaying = exo.isPlaying
             }
             exoPlayer?.addListener(object : Player.Listener {
-                override fun onTracksChanged(tracks: Tracks) {
+                /**
+                 * Records the current used subtitle/track. Needed as exoplayer seems to have loose track language selection.
+                 * */
+                override fun onTracksInfoChanged(tracksInfo: TracksInfo) {
                     fun Format.isSubtitle(): Boolean {
                         return this.sampleMimeType?.contains("video/") == false &&
                                 this.sampleMimeType?.contains("audio/") == false
@@ -853,17 +792,17 @@ class CS3IPlayer : IPlayer {
 
                     normalSafeApiCall {
                         exoPlayerSelectedTracks =
-                            tracks.groups.mapNotNull {
-                                val format = it.mediaTrackGroup.getFormat(0)
+                            tracksInfo.trackGroupInfos.mapNotNull {
+                                val format = it.trackGroup.getFormat(0)
                                 if (format.isSubtitle())
                                     format.language?.let { lang -> lang to it.isSelected }
                                 else null
                             }
 
-                        val exoPlayerReportedTracks = tracks.groups.mapNotNull {
+                        val exoPlayerReportedTracks = tracksInfo.trackGroupInfos.mapNotNull {
                             // Filter out unsupported tracks
                             if (it.isSupported)
-                                it.mediaTrackGroup.getFormat(0)
+                                it.trackGroup.getFormat(0)
                             else
                                 null
                         }.mapNotNull {
@@ -888,6 +827,7 @@ class CS3IPlayer : IPlayer {
                         onTracksInfoChanged?.invoke()
                         subtitlesUpdates?.invoke()
                     }
+                    super.onTracksInfoChanged(tracksInfo)
                 }
 
                 override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 172984a2..e20a6c7b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -796,16 +796,15 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 tracksDialog.apply_btt?.setOnClickListener {
-                    val currentTrack = currentAudioTracks.getOrNull(audioIndexStart)
                     player.setPreferredAudioTrack(
-                        currentTrack?.language, currentTrack?.id
+                        currentAudioTracks.getOrNull(audioIndexStart)?.language
                     )
 
                     val currentVideo = currentVideoTracks.getOrNull(videoIndex)
                     val width = currentVideo?.width ?: NO_VALUE
                     val height = currentVideo?.height ?: NO_VALUE
                     if (width != NO_VALUE && height != NO_VALUE) {
-                        player.setMaxVideoSize(width, height, currentVideo?.id)
+                        player.setMaxVideoSize(width, height)
                     }
 
                     tracksDialog.dismissSafe(activity)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
index 473b3e65..e8934250 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
@@ -161,9 +161,9 @@ interface IPlayer {
 
     fun getVideoTracks(): CurrentTracks
 
-    /** If no parameters are set it'll default to no set size, Specifying the id allows for track overrides to force the player to pick the quality. */
-    fun setMaxVideoSize(width: Int = Int.MAX_VALUE, height: Int = Int.MAX_VALUE, id: String? = null)
+    /** If no parameters are set it'll default to no set size */
+    fun setMaxVideoSize(width: Int = Int.MAX_VALUE, height: Int = Int.MAX_VALUE)
 
-    /** If no trackLanguage is set it'll default to first track. Specifying the id allows for track overrides as the language can be identical. */
-    fun setPreferredAudioTrack(trackLanguage: String?, id: String? = null)
+    /** If no trackLanguage is set it'll default to first track */
+    fun setPreferredAudioTrack(trackLanguage: String?)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt
index 7acb7c34..f7fb3139 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt
@@ -75,7 +75,7 @@ open class NonFinalTextRenderer @JvmOverloads constructor(
         return TAG
     }
 
-//    @RendererCapabilities.Capabilities
+    @RendererCapabilities.Capabilities
     override fun supportsFormat(format: Format): Int {
         return if (decoderFactory.supportsFormat(format)) {
             RendererCapabilities.create(
@@ -202,8 +202,7 @@ open class NonFinalTextRenderer @JvmOverloads constructor(
                     return
                 }
                 // Try and read the next subtitle from the source.
-//                @ReadDataResult
-                val result =
+                @ReadDataResult val result =
                     readSource(formatHold, nextInputBuffer,  /* readFlags= */0)
                 if (result == C.RESULT_BUFFER_READ) {
                     if (nextInputBuffer.isEndOfStream) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
index 05a9416d..b97468e7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
@@ -49,7 +49,7 @@ data class SaveCaptionStyle(
     @JsonProperty("foregroundColor") var foregroundColor: Int,
     @JsonProperty("backgroundColor") var backgroundColor: Int,
     @JsonProperty("windowColor") var windowColor: Int,
-//    @CaptionStyleCompat.EdgeType
+    @CaptionStyleCompat.EdgeType
     @JsonProperty("edgeType") var edgeType: Int,
     @JsonProperty("edgeColor") var edgeColor: Int,
     @FontRes
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/CastOptionsProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/CastOptionsProvider.kt
index ece9a4c0..17ec775b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/CastOptionsProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/CastOptionsProvider.kt
@@ -20,13 +20,10 @@ class CastOptionsProvider : OptionsProvider {
             MediaIntentReceiver.ACTION_FORWARD,
             MediaIntentReceiver.ACTION_STOP_CASTING
         )
-
-        val name = ControllerActivity::class.qualifiedName!!
-
         val compatButtonAction = intArrayOf(1, 3)
         val notificationOptions =
             NotificationOptions.Builder()
-                .setTargetActivityClassName(name)
+                .setTargetActivityClassName(ControllerActivity::class.qualifiedName)
                 .setActions(buttonActions, compatButtonAction)
                 .setForward30DrawableResId(R.drawable.go_forward_30)
                 .setRewind30DrawableResId(R.drawable.go_back_30)
@@ -35,7 +32,7 @@ class CastOptionsProvider : OptionsProvider {
 
         val mediaOptions = CastMediaOptions.Builder()
             .setNotificationOptions(notificationOptions)
-            .setExpandedControllerActivityClassName(name)
+            .setExpandedControllerActivityClassName(ControllerActivity::class.qualifiedName)
             .build()
 
         return CastOptions.Builder()
@@ -47,7 +44,7 @@ class CastOptionsProvider : OptionsProvider {
             .build()
     }
 
-    override fun getAdditionalSessionProviders(p0: Context): MutableList<SessionProvider> {
+    override fun getAdditionalSessionProviders(p0: Context?): MutableList<SessionProvider> {
         return Collections.emptyList()
     }
 }
\ No newline at end of file

From 997420a942bd643f17d0fb00d221af9a1faa2ef4 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Fri, 28 Oct 2022 03:51:27 +0200
Subject: [PATCH 034/273] phone UI changes + cache

---
 .../cloudstream3/ui/APIRepository.kt          |  17 +-
 .../lagradost/cloudstream3/ui/WatchType.kt    |  13 +-
 .../cloudstream3/ui/home/HomeFragment.kt      | 235 ++---
 .../cloudstream3/ui/home/HomeViewModel.kt     |  39 +-
 .../ui/result/ResultViewModel2.kt             |  47 +-
 .../cloudstream3/ui/search/SearchFragment.kt  | 241 ++----
 .../ui/settings/extensions/PluginsFragment.kt |  59 +-
 app/src/main/res/color/chip_color.xml         |   5 +
 app/src/main/res/layout/activity_main.xml     | 118 +--
 app/src/main/res/layout/fragment_home.xml     | 814 +++++++++---------
 app/src/main/res/layout/fragment_plugins.xml  | 103 +--
 app/src/main/res/layout/fragment_search.xml   |  81 +-
 .../main/res/layout/home_select_mainpage.xml  | 156 +---
 app/src/main/res/layout/tvtypes_chips.xml     |  68 ++
 .../main/res/layout/tvtypes_chips_scroll.xml  |  10 +
 app/src/main/res/values/styles.xml            |   4 +
 16 files changed, 905 insertions(+), 1105 deletions(-)
 create mode 100644 app/src/main/res/color/chip_color.xml
 create mode 100644 app/src/main/res/layout/tvtypes_chips.xml
 create mode 100644 app/src/main/res/layout/tvtypes_chips_scroll.xml

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
index 0e5e544b..ce695873 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
@@ -26,6 +26,8 @@ class APIRepository(val api: MainAPI) {
         fun isInvalidData(data: String): Boolean {
             return data.isEmpty() || data == "[]" || data == "about:blank"
         }
+
+        private val cacheHash: HashMap<Pair<String,String>, LoadResponse> = hashMapOf()
     }
 
     val hasMainPage = api.hasMainPage
@@ -39,7 +41,13 @@ class APIRepository(val api: MainAPI) {
     suspend fun load(url: String): Resource<LoadResponse> {
         return safeApiCall {
             if (isInvalidData(url)) throw ErrorLoadingException()
-            api.load(api.fixUrl(url)) ?: throw ErrorLoadingException()
+            val fixedUrl = api.fixUrl(url)
+            val key = Pair(api.name,url)
+            cacheHash[key] ?: api.load(fixedUrl)?.also {
+                // we cache 20 responses because ppl often go back to the same shit + 20 because I dont want to cause too much memory leak
+                if (cacheHash.size > 20) cacheHash.remove(cacheHash.keys.random())
+                cacheHash[key] = it
+            } ?: throw ErrorLoadingException()
         }
     }
 
@@ -75,7 +83,12 @@ class APIRepository(val api: MainAPI) {
             api.lastHomepageRequest = unixTimeMS
 
             nameIndex?.let { api.mainPage.getOrNull(it) }?.let { data ->
-                listOf(api.getMainPage(page, MainPageRequest(data.name, data.data, data.horizontalImages)))
+                listOf(
+                    api.getMainPage(
+                        page,
+                        MainPageRequest(data.name, data.data, data.horizontalImages)
+                    )
+                )
             } ?: run {
                 if (api.sequentialMainPage) {
                     var first = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt
index 417b4408..eb4eb666 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt
@@ -5,13 +5,12 @@ import androidx.annotation.StringRes
 import com.lagradost.cloudstream3.R
 
 enum class WatchType(val internalId: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) {
-    // FIX ICONS
-    WATCHING(0, R.string.type_watching, R.drawable.ic_baseline_remove_red_eye_24),
-    COMPLETED(1, R.string.type_completed, R.drawable.ic_baseline_check_24),
-    ONHOLD(2, R.string.type_on_hold, R.drawable.ic_baseline_pause_24),
-    DROPPED(3, R.string.type_dropped, R.drawable.ic_baseline_close_24),
-    PLANTOWATCH(4, R.string.type_plan_to_watch, R.drawable.ic_baseline_close_24),
-    NONE(5, R.string.type_none, R.drawable.ic_baseline_remove_red_eye_24);
+    WATCHING(0, R.string.type_watching, R.drawable.ic_baseline_bookmark_24),
+    COMPLETED(1, R.string.type_completed, R.drawable.ic_baseline_bookmark_24),
+    ONHOLD(2, R.string.type_on_hold, R.drawable.ic_baseline_bookmark_24),
+    DROPPED(3, R.string.type_dropped, R.drawable.ic_baseline_bookmark_24),
+    PLANTOWATCH(4, R.string.type_plan_to_watch, R.drawable.ic_baseline_bookmark_24),
+    NONE(5, R.string.type_none, R.drawable.ic_baseline_add_24);
 
     companion object {
         fun fromInternalId(id: Int?) = values().find { value -> value.internalId == id } ?: NONE
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 0d571b76..2f539a33 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -14,6 +14,8 @@ import android.view.ViewGroup
 import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
+import androidx.core.content.ContextCompat
+import androidx.core.content.ContextCompat.getDrawable
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.widget.NestedScrollView
@@ -26,11 +28,14 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipGroup
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
+import com.lagradost.cloudstream3.APIHolder.getId
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.MainActivity.Companion.mainPluginsLoadedEvent
@@ -43,6 +48,7 @@ import com.lagradost.cloudstream3.ui.APIRepository.Companion.randomApi
 import com.lagradost.cloudstream3.ui.AutofitRecyclerView
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
+import com.lagradost.cloudstream3.ui.result.ResultViewModel2.Companion.updateWatchStatus
 import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.search.*
@@ -50,6 +56,7 @@ import com.lagradost.cloudstream3.ui.search.SearchHelper.handleSearchClickCallba
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.isRecyclerScrollable
+import com.lagradost.cloudstream3.utils.AppUtils.loadResult
 import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.AppUtils.setMaxViewPoolSize
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
@@ -61,11 +68,11 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.deleteAllResumeStateIds
 import com.lagradost.cloudstream3.utils.DataStoreHelper.removeLastWatched
 import com.lagradost.cloudstream3.utils.DataStoreHelper.setResultWatchState
 import com.lagradost.cloudstream3.utils.Event
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectStringRes
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
@@ -82,14 +89,12 @@ import kotlinx.android.synthetic.main.fragment_home.home_loading
 import kotlinx.android.synthetic.main.fragment_home.home_loading_error
 import kotlinx.android.synthetic.main.fragment_home.home_loading_shimmer
 import kotlinx.android.synthetic.main.fragment_home.home_loading_statusbar
-import kotlinx.android.synthetic.main.fragment_home.home_main_poster_recyclerview
 import kotlinx.android.synthetic.main.fragment_home.home_master_recycler
 import kotlinx.android.synthetic.main.fragment_home.home_plan_to_watch_btt
 import kotlinx.android.synthetic.main.fragment_home.home_provider_meta_info
 import kotlinx.android.synthetic.main.fragment_home.home_provider_name
 import kotlinx.android.synthetic.main.fragment_home.home_reload_connection_open_in_browser
 import kotlinx.android.synthetic.main.fragment_home.home_reload_connectionerror
-import kotlinx.android.synthetic.main.fragment_home.home_statusbar
 import kotlinx.android.synthetic.main.fragment_home.home_type_completed_btt
 import kotlinx.android.synthetic.main.fragment_home.home_type_dropped_btt
 import kotlinx.android.synthetic.main.fragment_home.home_type_on_hold_btt
@@ -100,6 +105,8 @@ import kotlinx.android.synthetic.main.fragment_home.home_watch_parent_item_title
 import kotlinx.android.synthetic.main.fragment_home.result_error_text
 import kotlinx.android.synthetic.main.fragment_home_tv.*
 import kotlinx.android.synthetic.main.home_episodes_expanded.*
+import kotlinx.android.synthetic.main.tvtypes_chips.*
+import kotlinx.android.synthetic.main.tvtypes_chips.view.*
 import java.util.*
 
 const val HOME_BOOKMARK_VALUE_LIST = "home_bookmarked_last_list"
@@ -247,16 +254,16 @@ class HomeFragment : Fragment() {
         }
 
         fun getPairList(
-            anime: MaterialButton?,
-            cartoons: MaterialButton?,
-            tvs: MaterialButton?,
-            docs: MaterialButton?,
-            movies: MaterialButton?,
-            asian: MaterialButton?,
-            livestream: MaterialButton?,
-            nsfw: MaterialButton?,
-            others: MaterialButton?,
-        ): List<Pair<MaterialButton?, List<TvType>>> {
+            anime: Chip?,
+            cartoons: Chip?,
+            tvs: Chip?,
+            docs: Chip?,
+            movies: Chip?,
+            asian: Chip?,
+            livestream: Chip?,
+            nsfw: Chip?,
+            others: Chip?,
+        ): List<Pair<Chip?, List<TvType>>> {
             // This list should be same order as home screen to aid navigation
             return listOf(
                 Pair(movies, listOf(TvType.Movie, TvType.Torrent)),
@@ -271,6 +278,59 @@ class HomeFragment : Fragment() {
             )
         }
 
+        private fun getPairList(header: ChipGroup) = getPairList(
+            header.home_select_anime,
+            header.home_select_cartoons,
+            header.home_select_tv_series,
+            header.home_select_documentaries,
+            header.home_select_movies,
+            header.home_select_asian,
+            header.home_select_livestreams,
+            header.home_select_nsfw,
+            header.home_select_others
+        )
+
+        fun validateChips(header: ChipGroup?, validTypes: List<TvType>) {
+            if (header == null) return
+            val pairList = getPairList(header)
+            for ((button, types) in pairList) {
+                val isValid = validTypes.any { types.contains(it) }
+                button?.isVisible = isValid
+            }
+        }
+
+        fun updateChips(header: ChipGroup?, selectedTypes: List<TvType>) {
+            if (header == null) return
+            val pairList = getPairList(header)
+            for ((button, types) in pairList) {
+                button?.isChecked =
+                    button?.isVisible == true && selectedTypes.any { types.contains(it) }
+            }
+        }
+
+        fun bindChips(
+            header: ChipGroup?,
+            selectedTypes: List<TvType>,
+            validTypes: List<TvType>,
+            callback: (List<TvType>) -> Unit
+        ) {
+            if (header == null) return
+            val pairList = getPairList(header)
+            for ((button, types) in pairList) {
+                val isValid = validTypes.any { types.contains(it) }
+                button?.isVisible = isValid
+                button?.isChecked = isValid && selectedTypes.any { types.contains(it) }
+                button?.setOnCheckedChangeListener { _, _ ->
+                    val list = ArrayList<TvType>()
+                    for ((sbutton, vvalidTypes) in pairList) {
+                        if (sbutton?.isChecked == true)
+                            list.addAll(vvalidTypes)
+                    }
+                    callback(list)
+                }
+            }
+        }
+
         fun Context.selectHomepage(selectedApiName: String?, callback: (String) -> Unit) {
             val validAPIs = filterProviderByPreferredMedia().toMutableList()
 
@@ -296,21 +356,9 @@ class HomeFragment : Fragment() {
                     ?.toMutableList()
                     ?: mutableListOf(TvType.Movie, TvType.TvSeries)
 
-                val anime = dialog.findViewById<MaterialButton>(R.id.home_select_anime)
-                val cartoons = dialog.findViewById<MaterialButton>(R.id.home_select_cartoons)
-                val tvs = dialog.findViewById<MaterialButton>(R.id.home_select_tv_series)
-                val docs = dialog.findViewById<MaterialButton>(R.id.home_select_documentaries)
-                val movies = dialog.findViewById<MaterialButton>(R.id.home_select_movies)
-                val asian = dialog.findViewById<MaterialButton>(R.id.home_select_asian)
-                val livestream = dialog.findViewById<MaterialButton>(R.id.home_select_livestreams)
-                val nsfw = dialog.findViewById<MaterialButton>(R.id.home_select_nsfw)
-                val others = dialog.findViewById<MaterialButton>(R.id.home_select_others)
                 val cancelBtt = dialog.findViewById<MaterialButton>(R.id.cancel_btt)
                 val applyBtt = dialog.findViewById<MaterialButton>(R.id.apply_btt)
 
-                val pairList =
-                    getPairList(anime, cartoons, tvs, docs, movies, asian, livestream, nsfw, others)
-
                 cancelBtt?.setOnClickListener {
                     dialog.dismissSafe()
                 }
@@ -355,52 +403,14 @@ class HomeFragment : Fragment() {
                     arrayAdapter.notifyDataSetChanged()
                 }
 
-                /**
-                 * Since fire tv is fucked we need to manually define the focus layout.
-                 * Since visible buttons are only known in runtime this is required.
-                 **/
-                var lastButton: MaterialButton? = null
-
-                for ((button, validTypes) in pairList) {
-                    val isValid =
-                        validAPIs.any { api -> validTypes.any { api.supportedTypes.contains(it) } }
-                    button?.isVisible = isValid
-                    if (isValid) {
-
-                        // Set focus navigation
-                        button?.let { currentButton ->
-                            lastButton?.nextFocusRightId = currentButton.id
-                            lastButton?.id?.let { currentButton.nextFocusLeftId = it }
-                            lastButton = currentButton
-                        }
-
-                        fun buttonContains(): Boolean {
-                            return preSelectedTypes.any { validTypes.contains(it) }
-                        }
-
-                        button?.isSelected = buttonContains()
-                        button?.setOnClickListener {
-                            preSelectedTypes.clear()
-                            preSelectedTypes.addAll(validTypes)
-                            for ((otherButton, _) in pairList) {
-                                otherButton?.isSelected = false
-                            }
-                            button.isSelected = true
-                            updateList()
-                        }
-
-                        button?.setOnLongClickListener {
-                            if (!buttonContains()) {
-                                button.isSelected = true
-                                preSelectedTypes.addAll(validTypes)
-                            } else {
-                                button.isSelected = false
-                                preSelectedTypes.removeAll(validTypes)
-                            }
-                            updateList()
-                            return@setOnLongClickListener true
-                        }
-                    }
+                bindChips(
+                    dialog.home_select_group,
+                    preSelectedTypes,
+                    validAPIs.flatMap { it.supportedTypes }.distinct()
+                ) { list ->
+                    preSelectedTypes.clear()
+                    preSelectedTypes.addAll(list)
+                    updateList()
                 }
                 updateList()
             }
@@ -422,7 +432,6 @@ class HomeFragment : Fragment() {
     }
 
     private fun toggleMainVisibility(visible: Boolean) {
-        home_main_holder?.isVisible = visible
         home_main_poster_recyclerview?.isVisible = visible
     }
 
@@ -531,6 +540,51 @@ class HomeFragment : Fragment() {
             home_random?.visibility = View.GONE
         }
 
+        observe(homeViewModel.preview) { preview ->
+            when (preview) {
+                is Resource.Success -> {
+                    home_preview?.isVisible = true
+                    preview.value.apply {
+                        home_preview_tags?.text = tags?.joinToString(" • ") ?: ""
+                        home_preview_tags?.isGone = tags.isNullOrEmpty()
+                        home_preview_image?.setImage(posterUrl, posterHeaders)
+                        home_preview_title?.text = name
+                        home_preview_play?.setOnClickListener {
+                            activity?.loadResult(url, apiName, START_ACTION_RESUME_LATEST)
+                            //activity.loadSearchResult(url, START_ACTION_RESUME_LATEST)
+                        }
+                        home_preview_info?.setOnClickListener {
+                            activity?.loadResult(url, apiName)
+                            //activity.loadSearchResult(random)
+                        }
+                        // very ugly code, but I dont care
+                        val watchType = DataStoreHelper.getResultWatchState(preview.value.getId())
+                        home_preview_bookmark?.setText(watchType.stringRes)
+                        home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(null,getDrawable(home_preview_bookmark.context, watchType.iconRes),null,null)
+                        home_preview_bookmark?.setOnClickListener { fab ->
+                            activity?.showBottomDialog(
+                                WatchType.values().map { fab.context.getString(it.stringRes) }
+                                    .toList(),
+                                DataStoreHelper.getResultWatchState(preview.value.getId()).ordinal,
+                                fab.context.getString(R.string.action_add_to_bookmarks),
+                                showApply = false,
+                                {}) {
+                                val newValue = WatchType.values()[it]
+                                home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(null,getDrawable(home_preview_bookmark.context, newValue.iconRes),null,null)
+                                home_preview_bookmark?.setText(newValue.stringRes)
+
+                                updateWatchStatus(preview.value, newValue)
+                                reloadStored()
+                            }
+                        }
+                    }
+                }
+                else -> {
+                    home_preview?.isVisible = false
+                }
+            }
+        }
+
         observe(homeViewModel.apiName) { apiName ->
             currentApiName = apiName
             // setKey(USER_SELECTED_HOMEPAGE_API, apiName)
@@ -563,17 +617,17 @@ class HomeFragment : Fragment() {
             HomeChildItemAdapter(
                 mutableListOf(),
                 R.layout.home_result_big_grid,
-                nextFocusUp = home_main_poster_recyclerview.nextFocusUpId,
-                nextFocusDown = home_main_poster_recyclerview.nextFocusDownId
+                nextFocusUp = home_main_poster_recyclerview?.nextFocusUpId,
+                nextFocusDown = home_main_poster_recyclerview?.nextFocusDownId
             ) { callback ->
                 homeHandleSearch(callback)
             }
-        home_main_poster_recyclerview.setLinearListLayout()
+        home_main_poster_recyclerview?.setLinearListLayout()
         observe(homeViewModel.randomItems) { items ->
             if (items.isNullOrEmpty()) {
                 toggleMainVisibility(false)
             } else {
-                val tempAdapter = home_main_poster_recyclerview.adapter as HomeChildItemAdapter?
+                val tempAdapter = home_main_poster_recyclerview?.adapter as? HomeChildItemAdapter?
                 // no need to reload if it has the same data
                 if (tempAdapter != null && tempAdapter.cardList == items) {
                     toggleMainVisibility(true)
@@ -938,7 +992,7 @@ class HomeFragment : Fragment() {
             }
         }
 
-        context?.fixPaddingStatusbarView(home_statusbar)
+        //context?.fixPaddingStatusbarView(home_statusbar)
         context?.fixPaddingStatusbar(home_loading_statusbar)
 
         home_master_recycler.adapter =
@@ -959,33 +1013,6 @@ class HomeFragment : Fragment() {
             }
         } // GridLayoutManager(context, 1).also { it.supportsPredictiveItemAnimations() }
 
-        if (!isTvSettings()) {
-            LinearSnapHelper().attachToRecyclerView(home_main_poster_recyclerview) // snap
-            val centerLayoutManager =
-                CenterZoomLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
-            centerLayoutManager.setOnSizeListener { index ->
-                (home_main_poster_recyclerview?.adapter as HomeChildItemAdapter?)?.cardList?.get(
-                    index
-                )?.let { random ->
-                    home_main_play?.setOnClickListener {
-                        activity.loadSearchResult(random, START_ACTION_RESUME_LATEST)
-                    }
-                    home_main_info?.setOnClickListener {
-                        activity.loadSearchResult(random)
-                    }
-
-                    home_main_text?.text =
-                        random.name + if (random is AnimeSearchResponse && !random.dubStatus.isNullOrEmpty()) {
-                            random.dubStatus?.joinToString(
-                                prefix = " • ",
-                                separator = " | "
-                            ) { it.name }
-                        } else ""
-                }
-            }
-            home_main_poster_recyclerview?.layoutManager = centerLayoutManager  // scale
-        }
-
         reloadStored()
         loadHomePage()
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index 30fd45c1..0b928a55 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -13,6 +13,7 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.context
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.HomePageList
+import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.mvvm.*
@@ -32,7 +33,6 @@ import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.util.*
 import kotlin.collections.set
@@ -58,7 +58,9 @@ class HomeViewModel : ViewModel() {
     val bookmarks: LiveData<Pair<Boolean, List<SearchResponse>>> = _bookmarks
 
     private val _resumeWatching = MutableLiveData<List<SearchResponse>>()
+    private val _preview = MutableLiveData<Resource<LoadResponse>>()
     val resumeWatching: LiveData<List<SearchResponse>> = _resumeWatching
+    val preview: LiveData<Resource<LoadResponse>> = _preview
 
     fun loadResumeWatching() = viewModelScope.launchSafe {
         val resumeWatching = withContext(Dispatchers.IO) {
@@ -207,6 +209,7 @@ class HomeViewModel : ViewModel() {
         expandAndReturn(name)
     }
 
+
     private fun load(api: MainAPI?) = viewModelScope.launchSafe {
         repo = if (api != null) {
             APIRepository(api)
@@ -219,6 +222,7 @@ class HomeViewModel : ViewModel() {
 
         if (repo?.hasMainPage == true) {
             _page.postValue(Resource.Loading())
+            _preview.postValue(Resource.Loading())
 
             when (val data = repo?.getMainPage(1, null)) {
                 is Resource.Success -> {
@@ -232,8 +236,38 @@ class HomeViewModel : ViewModel() {
                                     ExpandableHomepageList(filteredList, 1, home.hasNext)
                             }
                         }
-                        _page.postValue(Resource.Success(expandable))
                         val items = data.value.mapNotNull { it?.items }.flatten()
+                        items.randomOrNull()?.list?.randomOrNull()?.url?.let { url ->
+                            // backup request in case first fails
+                            var first = repo?.load(url)
+                            if(first == null ||first is Resource.Failure) {
+                                first = repo?.load(items.random().list.random().url)
+                            }
+                            first?.let {
+                                _preview.postValue(it)
+                            } ?: run {
+                                _preview.postValue(
+                                    Resource.Failure(
+                                        false,
+                                        null,
+                                        null,
+                                        "No repo found, this should never happen"
+                                    )
+                                )
+                            }
+                        } ?: run {
+                            _preview.postValue(
+                                Resource.Failure(
+                                    false,
+                                    null,
+                                    null,
+                                    "No homepage items"
+                                )
+                            )
+                        }
+
+                        _page.postValue(Resource.Success(expandable))
+
 
                         //val home = data.value
                         if (items.isNotEmpty()) {
@@ -263,6 +297,7 @@ class HomeViewModel : ViewModel() {
             }
         } else {
             _page.postValue(Resource.Success(emptyMap()))
+            _preview.postValue(Resource.Failure(false, null, null, "No homepage"))
         }
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 906b652d..7c099793 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -412,6 +412,29 @@ class ResultViewModel2 : ViewModel() {
             return this?.firstOrNull { it.season == season }
         }
 
+        fun updateWatchStatus(currentResponse : LoadResponse, status: WatchType) {
+            val currentId = currentResponse.getId()
+            val resultPage = currentResponse
+
+            DataStoreHelper.setResultWatchState(currentId, status.internalId)
+            val current = DataStoreHelper.getBookmarkedData(currentId)
+            val currentTime = System.currentTimeMillis()
+            DataStoreHelper.setBookmarkedData(
+                currentId,
+                DataStoreHelper.BookmarkedData(
+                    currentId,
+                    current?.bookmarkedTime ?: currentTime,
+                    currentTime,
+                    resultPage.name,
+                    resultPage.url,
+                    resultPage.apiName,
+                    resultPage.type,
+                    resultPage.posterUrl,
+                    resultPage.year
+                )
+            )
+        }
+
         private fun filterName(name: String?): String? {
             if (name == null) return null
             Regex("[eE]pisode [0-9]*(.*)").find(name)?.groupValues?.get(1)?.let {
@@ -764,28 +787,10 @@ class ResultViewModel2 : ViewModel() {
     private val _selectPopup: MutableLiveData<Some<SelectPopup>> = MutableLiveData(Some.None)
     val selectPopup: LiveData<Some<SelectPopup>> get() = _selectPopup
 
-    fun updateWatchStatus(status: WatchType) {
-        val currentId = currentId ?: return
-        val resultPage = currentResponse ?: return
-        _watchStatus.postValue(status)
 
-        DataStoreHelper.setResultWatchState(currentId, status.internalId)
-        val current = DataStoreHelper.getBookmarkedData(currentId)
-        val currentTime = System.currentTimeMillis()
-        DataStoreHelper.setBookmarkedData(
-            currentId,
-            DataStoreHelper.BookmarkedData(
-                currentId,
-                current?.bookmarkedTime ?: currentTime,
-                currentTime,
-                resultPage.name,
-                resultPage.url,
-                resultPage.apiName,
-                resultPage.type,
-                resultPage.posterUrl,
-                resultPage.year
-            )
-        )
+    fun updateWatchStatus(status: WatchType) {
+        updateWatchStatus(currentResponse ?: return,status)
+        _watchStatus.postValue(status)
     }
 
     private fun startChromecast(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 5f108cd1..8f588bf7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -26,15 +26,19 @@ import com.lagradost.cloudstream3.APIHolder.filterSearchResultByFilmQuality
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
 import com.lagradost.cloudstream3.APIHolder.getApiSettings
+import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
+import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.home.HomeFragment
+import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.currentSpan
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.loadHomepageList
+import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.updateChips
 import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.utils.Coroutines.main
@@ -46,6 +50,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import kotlinx.android.synthetic.main.fragment_search.*
+import kotlinx.android.synthetic.main.tvtypes_chips.*
 import java.util.concurrent.locks.ReentrantLock
 
 const val SEARCH_PREF_TAGS = "search_pref_tags"
@@ -130,65 +135,26 @@ class SearchFragment : Fragment() {
 
     // Null if defined as a variable
     // This needs to be run after view created
-    private fun getPairList(): List<Pair<MaterialButton?, List<TvType>>> {
-        return HomeFragment.getPairList(
-            search_select_anime,
-            search_select_cartoons,
-            search_select_tv_series,
-            search_select_documentaries,
-            search_select_movies,
-            search_select_asian,
-            search_select_livestreams,
-            search_select_nsfw,
-            search_select_others
-        )
-    }
 
     private fun reloadRepos(success: Boolean = false) = main {
-        val pairList = getPairList()
-
         searchViewModel.reloadRepos()
         context?.filterProviderByPreferredMedia()?.let { validAPIs ->
-            for ((button, validTypes) in pairList) {
-                val isValid =
-                    validAPIs.any { api -> validTypes.any { api.supportedTypes.contains(it) } }
-                button?.isVisible = isValid
-                if (isValid) {
-                    fun buttonContains(): Boolean {
-                        return selectedSearchTypes.any { validTypes.contains(it) }
-                    }
-
-                    button?.isSelected = buttonContains()
-                    button?.setOnClickListener {
-                        val last = selectedSearchTypes.toSet()
-                        selectedSearchTypes.clear()
-                        selectedSearchTypes.addAll(validTypes)
-                        for ((otherButton, _) in pairList) {
-                            otherButton?.isSelected = false
-                        }
-                        it?.context?.setKey(SEARCH_PREF_TAGS, selectedSearchTypes)
-                        it?.isSelected = true
-                        if (last != selectedSearchTypes.toSet()) // if you click the same button again the it does nothing
-                            search(main_search?.query?.toString())
-                    }
-
-                    button?.setOnLongClickListener {
-                        if (!buttonContains()) {
-                            it?.isSelected = true
-                            selectedSearchTypes.addAll(validTypes)
-                        } else {
-                            it?.isSelected = false
-                            selectedSearchTypes.removeAll(validTypes)
-                        }
-                        it?.context?.setKey(SEARCH_PREF_TAGS, selectedSearchTypes)
-                        search(main_search?.query?.toString())
-                        return@setOnLongClickListener true
-                    }
+            bindChips(
+                home_select_group,
+                selectedSearchTypes,
+                validAPIs.flatMap { api -> api.supportedTypes }.distinct()
+            ) { list ->
+                if (selectedSearchTypes.toSet() != list.toSet()) {
+                    setKey(SEARCH_PREF_TAGS, selectedSearchTypes)
+                    selectedSearchTypes.clear()
+                    selectedSearchTypes.addAll(list)
+                    search(main_search?.query?.toString())
                 }
             }
         }
     }
 
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -239,31 +205,67 @@ class SearchFragment : Fragment() {
                 builder.let { dialog ->
                     val isMultiLang = ctx.getApiProviderLangSettings().size > 1
 
-                    val anime = dialog.findViewById<MaterialButton>(R.id.home_select_anime)
-                    val cartoons = dialog.findViewById<MaterialButton>(R.id.home_select_cartoons)
-                    val tvs = dialog.findViewById<MaterialButton>(R.id.home_select_tv_series)
-                    val docs = dialog.findViewById<MaterialButton>(R.id.home_select_documentaries)
-                    val movies = dialog.findViewById<MaterialButton>(R.id.home_select_movies)
-                    val asian = dialog.findViewById<MaterialButton>(R.id.home_select_asian)
-                    val livestream =
-                        dialog.findViewById<MaterialButton>(R.id.home_select_livestreams)
-                    val nsfw = dialog.findViewById<MaterialButton>(R.id.home_select_nsfw)
-                    val other = dialog.findViewById<MaterialButton>(R.id.home_select_others)
                     val cancelBtt = dialog.findViewById<MaterialButton>(R.id.cancel_btt)
                     val applyBtt = dialog.findViewById<MaterialButton>(R.id.apply_btt)
 
-                    val pairList =
-                        HomeFragment.getPairList(
-                            anime,
-                            cartoons,
-                            tvs,
-                            docs,
-                            movies,
-                            asian,
-                            livestream,
-                            nsfw,
-                            other
-                        )
+                    val listView = dialog.findViewById<ListView>(R.id.listview1)
+                    val arrayAdapter = ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
+                    listView?.adapter = arrayAdapter
+                    listView?.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
+
+                    listView?.setOnItemClickListener { _, _, i, _ ->
+                        if (currentValidApis.isNotEmpty()) {
+                            val api = currentValidApis[i].name
+                            if (currentSelectedApis.contains(api)) {
+                                listView.setItemChecked(i, false)
+                                currentSelectedApis -= api
+                            } else {
+                                listView.setItemChecked(i, true)
+                                currentSelectedApis += api
+                            }
+                        }
+                    }
+
+                    fun updateList(types: List<TvType>) {
+                        setKey(SEARCH_PREF_TAGS, types.map {it.name})
+
+                        arrayAdapter.clear()
+                        currentValidApis = validAPIs.filter { api ->
+                            api.supportedTypes.any {
+                                types.contains(it)
+                            }
+                        }.sortedBy { it.name.lowercase() }
+
+                        val names = currentValidApis.map {
+                            if (isMultiLang) "${
+                                SubtitleHelper.getFlagFromIso(
+                                    it.lang
+                                )?.plus(" ") ?: ""
+                            }${it.name}" else it.name
+                        }
+                        for ((index, api) in currentValidApis.map { it.name }.withIndex()) {
+                            listView?.setItemChecked(index, currentSelectedApis.contains(api))
+                        }
+
+                        //arrayAdapter.notifyDataSetChanged()
+                        arrayAdapter.addAll(names)
+                        arrayAdapter.notifyDataSetChanged()
+                    }
+
+                    val selectedSearchTypes = getKey<List<String>>(SEARCH_PREF_TAGS)
+                        ?.mapNotNull { listName ->
+                            TvType.values().firstOrNull { it.name == listName }
+                        }
+                        ?.toMutableList()
+                        ?: mutableListOf(TvType.Movie, TvType.TvSeries)
+
+                    bindChips(
+                        dialog.home_select_group,
+                        selectedSearchTypes,
+                        TvType.values().toList()
+                    ) { list ->
+                        updateList(list)
+                    }
 
                     cancelBtt?.setOnClickListener {
                         dialog.dismissSafe()
@@ -284,90 +286,7 @@ class SearchFragment : Fragment() {
                         context?.setKey(SEARCH_PREF_PROVIDERS, currentSelectedApis.toList())
                         selectedApis = currentSelectedApis
                     }
-
-                    val selectedSearchTypes = context?.getKey<List<String>>(SEARCH_PREF_TAGS)
-                        ?.mapNotNull { listName ->
-                            TvType.values().firstOrNull { it.name == listName }
-                        }
-                        ?.toMutableList()
-                        ?: mutableListOf(TvType.Movie, TvType.TvSeries)
-
-                    val listView = dialog.findViewById<ListView>(R.id.listview1)
-                    val arrayAdapter = ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
-                    listView?.adapter = arrayAdapter
-                    listView?.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
-
-                    listView?.setOnItemClickListener { _, _, i, _ ->
-                        if (currentValidApis.isNotEmpty()) {
-                            val api = currentValidApis[i].name
-                            if (currentSelectedApis.contains(api)) {
-                                listView.setItemChecked(i, false)
-                                currentSelectedApis -= api
-                            } else {
-                                listView.setItemChecked(i, true)
-                                currentSelectedApis += api
-                            }
-                        }
-                    }
-
-                    fun updateList() {
-                        arrayAdapter.clear()
-                        currentValidApis = validAPIs.filter { api ->
-                            api.supportedTypes.any {
-                                selectedSearchTypes.contains(it)
-                            }
-                        }.sortedBy { it.name.lowercase() }
-
-                        val names = currentValidApis.map {
-                            if (isMultiLang) "${
-                                SubtitleHelper.getFlagFromIso(
-                                    it.lang
-                                )?.plus(" ") ?: ""
-                            }${it.name}" else it.name
-                        }
-                        for ((index, api) in currentValidApis.map { it.name }.withIndex()) {
-                            listView?.setItemChecked(index, currentSelectedApis.contains(api))
-                        }
-
-                        //arrayAdapter.notifyDataSetChanged()
-                        arrayAdapter.addAll(names)
-                        arrayAdapter.notifyDataSetChanged()
-                    }
-
-                    for ((button, validTypes) in pairList) {
-                        val isValid =
-                            validAPIs.any { api -> validTypes.any { api.supportedTypes.contains(it) } }
-                        button?.isVisible = isValid
-                        if (isValid) {
-                            fun buttonContains(): Boolean {
-                                return selectedSearchTypes.any { validTypes.contains(it) }
-                            }
-
-                            button?.isSelected = buttonContains()
-                            button?.setOnClickListener {
-                                selectedSearchTypes.clear()
-                                selectedSearchTypes.addAll(validTypes)
-                                for ((otherButton, _) in pairList) {
-                                    otherButton?.isSelected = false
-                                }
-                                button.isSelected = true
-                                updateList()
-                            }
-
-                            button?.setOnLongClickListener {
-                                if (!buttonContains()) {
-                                    button.isSelected = true
-                                    selectedSearchTypes.addAll(validTypes)
-                                } else {
-                                    button.isSelected = false
-                                    selectedSearchTypes.removeAll(validTypes)
-                                }
-                                updateList()
-                                return@setOnLongClickListener true
-                            }
-                        }
-                    }
-                    updateList()
+                    updateList(selectedSearchTypes.toList())
                 }
             }
         }
@@ -380,14 +299,6 @@ class SearchFragment : Fragment() {
             ?.toMutableList()
             ?: mutableListOf(TvType.Movie, TvType.TvSeries)
 
-        val pairList = getPairList()
-        fun updateSelectedList(list: MutableList<TvType>) {
-            selectedSearchTypes = list
-            for ((button, validTypes) in pairList) {
-                button?.isSelected = selectedSearchTypes.any { validTypes.contains(it) }
-            }
-        }
-
         if (isTrueTvSettings()) {
             search_filter.isFocusable = true
             search_filter.isFocusableInTouchMode = true
@@ -500,7 +411,7 @@ class SearchFragment : Fragment() {
                 SEARCH_HISTORY_OPEN -> {
                     searchViewModel.clearSearch()
                     if (searchItem.type.isNotEmpty())
-                        updateSelectedList(searchItem.type.toMutableList())
+                        updateChips(home_select_group, searchItem.type.toMutableList())
                     main_search?.setQuery(searchItem.searchText, true)
                 }
                 SEARCH_HISTORY_REMOVE -> {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
index aa302c5a..bacd26c8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
@@ -9,8 +9,9 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.mvvm.observe
-import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.getPairList
+import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.ui.settings.appLanguages
@@ -18,6 +19,8 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import kotlinx.android.synthetic.main.fragment_plugins.*
+import kotlinx.android.synthetic.main.tvtypes_chips.*
+import kotlinx.android.synthetic.main.tvtypes_chips_scroll.*
 
 const val PLUGINS_BUNDLE_NAME = "name"
 const val PLUGINS_BUNDLE_URL = "url"
@@ -145,56 +148,10 @@ class PluginsFragment : Fragment() {
             pluginViewModel.updatePluginList(context, url)
             tv_types_scroll_view?.isVisible = true
 
-            // 💀💀💀💀💀💀💀 Recyclerview when
-            val pairList = getPairList(
-                home_select_anime,
-                home_select_cartoons,
-                home_select_tv_series,
-                home_select_documentaries,
-                home_select_movies,
-                home_select_asian,
-                home_select_livestreams,
-                home_select_nsfw,
-                home_select_others
-            )
-
-//            val supportedTypes: Array<String> =
-//                pluginViewModel.filteredPlugins.value!!.second.flatMap { it -> it.plugin.second.tvTypes ?: listOf("Other") }.distinct().toTypedArray()
-
-            // Copy pasted code
-            for ((button, validTypes) in pairList) {
-                val validTypesMapped = validTypes.map { it.name }
-                val isValid = true
-                //validTypes.any { it -> supportedTypes.contains(it.name) }
-                button?.isVisible = isValid
-                if (isValid) {
-                    fun buttonContains(): Boolean {
-                        return pluginViewModel.tvTypes.any { validTypesMapped.contains(it) }
-                    }
-
-                    button?.isSelected = buttonContains()
-                    button?.setOnClickListener {
-                        pluginViewModel.tvTypes.clear()
-                        pluginViewModel.tvTypes.addAll(validTypesMapped)
-                        for ((otherButton, _) in pairList) {
-                            otherButton?.isSelected = false
-                        }
-                        button.isSelected = true
-                        pluginViewModel.updateFilteredPlugins()
-                    }
-
-                    button?.setOnLongClickListener {
-                        if (!buttonContains()) {
-                            button.isSelected = true
-                            pluginViewModel.tvTypes.addAll(validTypesMapped)
-                        } else {
-                            button.isSelected = false
-                            pluginViewModel.tvTypes.removeAll(validTypesMapped)
-                        }
-                        pluginViewModel.updateFilteredPlugins()
-                        return@setOnLongClickListener true
-                    }
-                }
+            bindChips(home_select_group, emptyList(), TvType.values().toList()) { list ->
+                pluginViewModel.tvTypes.clear()
+                pluginViewModel.tvTypes.addAll(list.map { it.name })
+                pluginViewModel.updateFilteredPlugins()
             }
         }
     }
diff --git a/app/src/main/res/color/chip_color.xml b/app/src/main/res/color/chip_color.xml
new file mode 100644
index 00000000..f4190551
--- /dev/null
+++ b/app/src/main/res/color/chip_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/colorPrimary" android:state_checked="true"/>
+    <item android:color="?attr/primaryGrayBackground" android:state_checked="false"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f8ca8cbd..4905d454 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,79 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/homeRoot"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|keyboard|navigation"
-        android:paddingTop="0dp">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/homeRoot"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|keyboard|navigation"
+    android:paddingTop="0dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_height="match_parent"
-            android:layout_width="match_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <com.google.android.material.navigationrail.NavigationRailView
-                android:layout_width="62dp"
-                android:layout_height="match_parent"
-                android:id="@+id/nav_rail_view"
-                android:background="?attr/primaryGrayBackground"
-                app:itemTextColor="@color/item_select_color"
+            android:id="@+id/nav_rail_view"
+            android:layout_width="62dp"
+            android:layout_height="match_parent"
+            android:background="?attr/primaryGrayBackground"
+            app:itemIconTint="@color/item_select_color"
 
-                app:itemIconTint="@color/item_select_color"
-                app:menuGravity="center"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:labelVisibilityMode="unlabeled"
-                app:menu="@menu/bottom_nav_menu">
+            app:itemTextColor="@color/item_select_color"
+            app:labelVisibilityMode="unlabeled"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:menu="@menu/bottom_nav_menu"
+            app:menuGravity="center">
 
         </com.google.android.material.navigationrail.NavigationRailView>
+        <!-- android:layout_height="65dp"
+                              app:labelVisibilityMode="unlabeled"
 
+                  -->
         <com.google.android.material.bottomnavigation.BottomNavigationView
-                android:id="@+id/nav_view"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:background="?attr/primaryGrayBackground"
+            android:id="@+id/nav_view"
+            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            app:labelVisibilityMode="labeled"
+            android:background="?attr/primaryGrayBackground"
 
-                app:labelVisibilityMode="labeled"
-                app:itemTextColor="@color/item_select_color"
-                app:itemIconTint="@color/item_select_color"
+            app:itemIconTint="@color/item_select_color"
+            app:itemTextColor="@color/item_select_color"
 
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:menu="@menu/bottom_nav_menu"
-                app:layout_constraintBottom_toBottomOf="parent" />
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:menu="@menu/bottom_nav_menu" />
 
         <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/nav_host_fragment"
-                android:name="androidx.navigation.fragment.NavHostFragment"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:defaultNavHost="true"
-                app:navGraph="@navigation/mobile_navigation"
-                app:layout_constraintStart_toEndOf="@+id/nav_rail_view"
-                app:layout_constraintBottom_toTopOf="@+id/cast_mini_controller_holder"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
+            android:id="@+id/nav_host_fragment"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:defaultNavHost="true"
+            app:layout_constraintBottom_toTopOf="@+id/cast_mini_controller_holder"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/nav_rail_view"
+            app:layout_constraintTop_toTopOf="parent"
+            app:navGraph="@navigation/mobile_navigation" />
 
         <LinearLayout
-                tools:layout_height="100dp"
-                android:layout_width="0dp"
-                app:layout_constraintStart_toEndOf="@+id/nav_rail_view"
-                android:layout_height="wrap_content"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/nav_view"
-                android:id="@+id/cast_mini_controller_holder">
+            android:id="@+id/cast_mini_controller_holder"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toTopOf="@+id/nav_view"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/nav_rail_view"
+            tools:layout_height="100dp">
             <!--com.google.android.gms.cast.framework.media.widget.MiniControllerFragment-->
             <fragment
-                    app:customCastBackgroundColor="?attr/primaryGrayBackground"
-                    app:castControlButtons="@array/cast_mini_controller_control_buttons"
-                    android:id="@+id/cast_mini_controller"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    class="com.lagradost.cloudstream3.ui.MyMiniControllerFragment"
-                    tools:ignore="FragmentTagUsage" />
+                android:id="@+id/cast_mini_controller"
+                class="com.lagradost.cloudstream3.ui.MyMiniControllerFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+
+                app:castControlButtons="@array/cast_mini_controller_control_buttons"
+                app:customCastBackgroundColor="?attr/primaryGrayBackground"
+                tools:ignore="FragmentTagUsage" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4abdef0b..9d430e3d 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,87 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/home_root"
+    android:layout_width="match_parent"
 
-        android:id="@+id/home_root"
-        tools:context=".ui.home.HomeFragment">
+    android:layout_height="match_parent"
+    tools:context=".ui.home.HomeFragment">
 
     <FrameLayout
-            android:visibility="gone"
-            tools:visibility="gone"
-            android:id="@+id/home_loading"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:id="@+id/home_loading"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        tools:visibility="gone">
 
         <ProgressBar
-                android:layout_gravity="center"
-                android:visibility="gone"
-                tools:visibility="gone"
-                android:layout_width="50dp"
-                android:layout_height="50dp" />
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center"
+            android:visibility="gone"
+            tools:visibility="gone" />
 
         <com.facebook.shimmer.ShimmerFrameLayout
-                android:id="@+id/home_loading_shimmer"
-                app:shimmer_base_alpha="0.2"
-                app:shimmer_highlight_alpha="0.3"
-                app:shimmer_duration="@integer/loading_time"
-                app:shimmer_auto_start="true"
-                android:paddingTop="40dp"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:layout_marginTop="15dp"
-                android:orientation="vertical">
+            android:id="@+id/home_loading_shimmer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_marginTop="15dp"
+            android:orientation="vertical"
+            android:paddingTop="40dp"
+            app:shimmer_auto_start="true"
+            app:shimmer_base_alpha="0.2"
+            app:shimmer_duration="@integer/loading_time"
+            app:shimmer_highlight_alpha="0.3">
 
             <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
                 <FrameLayout
-                        android:orientation="horizontal"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
                     <androidx.cardview.widget.CardView
-                            android:layout_margin="@dimen/loading_margin"
-                            android:layout_gravity="center"
-                            app:cardCornerRadius="@dimen/loading_radius"
-                            android:background="@color/grayShimmer"
-                            android:translationX="-164dp"
-                            android:layout_width="125dp"
-                            android:layout_height="200dp" />
+                        android:layout_width="125dp"
+                        android:layout_height="200dp"
+                        android:layout_gravity="center"
+                        android:layout_margin="@dimen/loading_margin"
+                        android:background="@color/grayShimmer"
+                        android:translationX="-164dp"
+                        app:cardCornerRadius="@dimen/loading_radius" />
 
                     <androidx.cardview.widget.CardView
-                            android:layout_margin="@dimen/loading_margin"
-                            android:layout_gravity="center"
-                            app:cardCornerRadius="@dimen/loading_radius"
-                            android:background="@color/grayShimmer"
-                            android:layout_width="148dp"
-                            android:layout_height="234dp" />
+                        android:layout_width="148dp"
+                        android:layout_height="234dp"
+                        android:layout_gravity="center"
+                        android:layout_margin="@dimen/loading_margin"
+                        android:background="@color/grayShimmer"
+                        app:cardCornerRadius="@dimen/loading_radius" />
 
                     <androidx.cardview.widget.CardView
-                            android:layout_margin="@dimen/loading_margin"
-                            android:layout_gravity="center"
-                            app:cardCornerRadius="@dimen/loading_radius"
-                            android:background="@color/grayShimmer"
-                            android:translationX="164dp"
-                            android:layout_width="125dp"
-                            android:layout_height="200dp" />
+                        android:layout_width="125dp"
+                        android:layout_height="200dp"
+                        android:layout_gravity="center"
+                        android:layout_margin="@dimen/loading_margin"
+                        android:background="@color/grayShimmer"
+                        android:translationX="164dp"
+                        app:cardCornerRadius="@dimen/loading_radius" />
                 </FrameLayout>
 
                 <include layout="@layout/loading_line_short_center" />
 
                 <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_marginTop="@dimen/result_padding"
-                        android:layout_marginStart="@dimen/result_padding"
-                        android:layout_marginEnd="@dimen/result_padding"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/result_padding"
+                    android:layout_marginTop="@dimen/result_padding"
 
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:layout_marginEnd="@dimen/result_padding"
+                    android:orientation="vertical">
 
                     <include layout="@layout/loading_list" />
 
@@ -93,168 +93,170 @@
         </com.facebook.shimmer.ShimmerFrameLayout>
 
         <FrameLayout
-                android:id="@+id/home_loading_statusbar"
-                android:layout_width="match_parent"
-                android:layout_height="70dp">
+            android:id="@+id/home_loading_statusbar"
+            android:layout_width="match_parent"
+            android:layout_height="70dp">
 
             <ImageView
-                    android:id="@+id/home_change_api_loading"
-                    android:layout_margin="10dp"
-                    android:layout_gravity="center_vertical|end"
-                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:id="@+id/home_change_api_loading"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_vertical|end"
 
-                    android:src="@drawable/ic_baseline_keyboard_arrow_down_24"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:contentDescription="@string/home_change_provider_img_des" />
+                android:layout_margin="10dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/home_change_provider_img_des"
+                android:src="@drawable/ic_baseline_keyboard_arrow_down_24" />
         </FrameLayout>
     </FrameLayout>
 
     <LinearLayout
-            android:visibility="gone"
-            tools:visibility="gone"
-            android:id="@+id/home_loading_error"
-            android:orientation="vertical"
+        android:id="@+id/home_loading_error"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="gone">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/home_reload_connectionerror"
+            style="@style/WhiteButton"
+
+            android:layout_width="wrap_content"
+
             android:layout_gravity="center"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_margin="5dp"
+            android:minWidth="200dp"
+            android:text="@string/reload_error"
+            app:icon="@drawable/ic_baseline_autorenew_24" />
 
         <com.google.android.material.button.MaterialButton
-                android:layout_gravity="center"
-                style="@style/WhiteButton"
+            android:id="@+id/home_reload_connection_open_in_browser"
+            style="@style/BlackButton"
 
-                android:layout_margin="5dp"
+            android:layout_width="wrap_content"
 
-                app:icon="@drawable/ic_baseline_autorenew_24"
-                android:text="@string/reload_error"
-                android:id="@+id/home_reload_connectionerror"
-                android:layout_width="wrap_content"
-                android:minWidth="200dp" />
-
-        <com.google.android.material.button.MaterialButton
-                android:layout_gravity="center"
-                style="@style/BlackButton"
-
-                android:layout_margin="5dp"
-
-                app:icon="@drawable/ic_baseline_public_24"
-                android:text="@string/result_open_in_browser"
-                android:id="@+id/home_reload_connection_open_in_browser"
-                android:layout_width="wrap_content"
-                android:minWidth="200dp" />
+            android:layout_gravity="center"
+            android:layout_margin="5dp"
+            android:minWidth="200dp"
+            android:text="@string/result_open_in_browser"
+            app:icon="@drawable/ic_baseline_public_24" />
 
         <TextView
-                android:layout_margin="5dp"
-                android:gravity="center"
-                android:layout_gravity="center"
-                android:id="@+id/result_error_text"
-                android:textColor="?attr/textColor"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+            android:id="@+id/result_error_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_margin="5dp"
+            android:gravity="center"
+            android:textColor="?attr/textColor" />
     </LinearLayout>
 
     <androidx.core.widget.NestedScrollView
-            android:background="?attr/primaryBlackBackground"
-            tools:visibility="visible"
-            android:visibility="gone"
-            android:id="@+id/home_loaded"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:id="@+id/home_loaded"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/primaryBlackBackground"
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
             <View
-                    android:background="?attr/primaryGrayBackground"
-                    android:id="@+id/home_statusbar"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent" />
+                android:id="@+id/home_statusbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/primaryGrayBackground" />
 
             <FrameLayout
-                    android:id="@+id/home_settings_bar"
-                    android:background="?attr/primaryGrayBackground"
-                    android:layout_width="match_parent"
-                    android:layout_height="70dp">
+                android:id="@+id/home_settings_bar"
+
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:background="?attr/primaryGrayBackground"
+                android:visibility="gone">
 
                 <LinearLayout
-                        android:paddingTop="10dp"
-                        android:paddingBottom="10dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
 
-                        android:paddingStart="10dp"
-                        android:paddingEnd="10dp"
+                    android:orientation="horizontal"
+                    android:paddingStart="10dp"
 
-                        android:orientation="horizontal"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent">
+                    android:paddingTop="10dp"
+                    android:paddingEnd="10dp"
+                    android:paddingBottom="10dp">
 
                     <androidx.cardview.widget.CardView
-                            android:id="@+id/home_profile_picture_holder"
-                            android:layout_marginEnd="10dp"
-                            app:cardCornerRadius="100dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_width="40dp"
-                            android:layout_height="40dp">
+                        android:id="@+id/home_profile_picture_holder"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginEnd="10dp"
+                        app:cardCornerRadius="100dp">
 
                         <ImageView
-                                android:scaleType="centerCrop"
-                                android:id="@+id/home_profile_picture"
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                tools:ignore="ContentDescription" />
+                            android:id="@+id/home_profile_picture"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:scaleType="centerCrop"
+                            tools:ignore="ContentDescription" />
                     </androidx.cardview.widget.CardView>
 
                     <FrameLayout
-                            android:layout_gravity="center_vertical"
-                            android:visibility="visible"
-                            android:background="@drawable/search_background"
-                            android:layout_width="match_parent"
-                            android:layout_height="40dp">
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:layout_gravity="center_vertical"
+                        android:background="@drawable/search_background"
+                        android:visibility="visible">
 
                         <androidx.appcompat.widget.SearchView
-                                android:id="@+id/home_search"
-                                app:queryBackground="@color/transparent"
+                            android:id="@+id/home_search2"
+                            android:layout_width="match_parent"
 
-                                app:searchIcon="@drawable/search_icon"
-                                android:paddingStart="-10dp"
-                                android:iconifiedByDefault="false"
-                                app:queryHint="@string/search_hint"
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="center_vertical"
-                                app:iconifiedByDefault="false"
-                                tools:ignore="RtlSymmetry" />
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center_vertical"
+                            android:iconifiedByDefault="false"
+                            android:paddingStart="-10dp"
+                            app:iconifiedByDefault="false"
+                            app:queryBackground="@color/transparent"
+                            app:queryHint="@string/search_hint"
+                            app:searchIcon="@drawable/search_icon"
+                            tools:ignore="RtlSymmetry" />
                     </FrameLayout>
 
                     <LinearLayout
-                            android:visibility="gone"
-                            android:gravity="center"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
 
-                            android:orientation="vertical"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:id="@+id/home_provider_name"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent">
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:gravity="center_vertical"
+                            android:textColor="?attr/textColor"
+                            android:textSize="20sp"
+
+                            tools:text="Hello World" />
 
                         <TextView
-                                android:gravity="center_vertical"
-                                android:layout_gravity="center"
-                                android:id="@+id/home_provider_name"
-                                android:textColor="?attr/textColor"
-                                android:textSize="20sp"
-                                tools:text="Hello World"
-                                android:layout_width="match_parent"
-
-                                android:layout_height="wrap_content" />
-
-                        <TextView
-                                android:gravity="center_vertical"
-                                android:layout_gravity="center"
-                                android:id="@+id/home_provider_meta_info"
-                                android:textColor="?attr/grayTextColor"
-                                android:textSize="14sp"
-                                tools:text="Hello World"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content" />
+                            android:id="@+id/home_provider_meta_info"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:gravity="center_vertical"
+                            android:textColor="?attr/grayTextColor"
+                            android:textSize="14sp"
+                            tools:text="Hello World" />
                     </LinearLayout>
                 </LinearLayout>
 
@@ -278,273 +280,309 @@
                                 </ImageView>-->
             </FrameLayout>
 
-            <LinearLayout
-                    android:layout_marginTop="10dp"
-                    android:id="@+id/home_main_holder"
-                    android:orientation="vertical"
+            <FrameLayout
+                tools:visibility="visible"
+                android:visibility="gone"
+                android:id="@+id/home_preview"
+                android:layout_width="match_parent"
+                android:layout_height="500dp">
+
+                <ImageView
+                    android:alpha="0.8"
+                    android:id="@+id/home_preview_image"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="match_parent"
+                    android:scaleType="centerCrop"
+                    tools:src="@drawable/example_poster" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                        android:descendantFocusability="afterDescendants"
-                        android:nextFocusUp="@id/home_change_api"
-                        android:nextFocusDown="@id/home_main_info"
-
-                        android:clipToPadding="false"
-                        android:paddingStart="148dp"
-                        android:paddingEnd="148dp"
-
-                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                        android:id="@+id/home_main_poster_recyclerview"
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        tools:listitem="@layout/home_result_grid" />
-                <!--<ImageView
-                        android:foreground="@drawable/outline_drawable"
-                        android:id="@+id/home_main_poster"
-                        tools:src="@drawable/example_poster"
-                        android:layout_gravity="center"
-                        android:scaleType="centerCrop"
-                        android:layout_width="150dp"
-                        android:layout_height="212dp"
-                        android:contentDescription="@string/home_main_poster_img_des">
-                </ImageView>-->
-                <TextView
-                        android:id="@+id/home_main_text"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        tools:text="Perfect Run"
-                        android:textStyle="bold"
-                        android:layout_margin="5dp"
-                        android:textSize="15sp"
-                        android:textColor="?attr/textColor"
-                        android:layout_width="match_parent"
-                        android:maxLines="2"
-                        android:ellipsize="end"
-                        android:layout_height="40sp" />
-
-                <LinearLayout
-                        android:visibility="visible"
-                        android:padding="5dp"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:orientation="horizontal"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                    <com.google.android.material.button.MaterialButton
-                            android:nextFocusLeft="@id/nav_rail_view"
-                            android:nextFocusUp="@id/home_main_poster_recyclerview"
-                            android:nextFocusRight="@id/home_main_info"
-                            android:nextFocusDown="@id/home_watch_child_more_info"
-
-                            style="@style/WhiteButton"
-                            android:visibility="visible"
-                            android:layout_gravity="center"
-                            android:id="@+id/home_main_play"
-                            android:text="@string/home_play"
-
-                            app:icon="@drawable/ic_baseline_play_arrow_24"
-                            android:minWidth="120dp"
-                            android:layout_width="wrap_content" />
-
-                    <com.google.android.material.button.MaterialButton
-                            android:nextFocusLeft="@id/home_main_play"
-                            android:nextFocusUp="@id/home_main_poster_recyclerview"
-                            android:nextFocusRight="@id/home_change_api"
-                            android:nextFocusDown="@id/home_watch_child_more_info"
-
-                            style="@style/BlackButton"
-                            android:visibility="visible"
-                            android:layout_gravity="center"
-                            android:text="@string/home_info"
-                            app:icon="@drawable/ic_outline_info_24"
-
-                            android:id="@+id/home_main_info"
-                            android:clickable="true"
-                            android:focusable="true"
-
-                            android:minWidth="120dp"
-                            android:layout_width="wrap_content" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                    android:id="@+id/home_watch_holder"
-                    android:orientation="vertical"
-                    android:visibility="gone"
-                    tools:visibility="visible"
+                <View
+                    android:id="@+id/title_shadow"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="300dp"
+                    android:layout_gravity="bottom"
+                    android:background="@drawable/background_shadow" />
 
                 <FrameLayout
-                        android:nextFocusLeft="@id/nav_rail_view"
-                        android:nextFocusUp="@id/home_main_info"
-                        android:nextFocusDown="@id/home_watch_child_recyclerview"
 
-                        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                        android:id="@+id/home_watch_child_more_info"
-                        android:padding="12dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="80dp"
+                    android:layout_gravity="top"
+                    android:visibility="gone">
+
+                    <androidx.appcompat.widget.SearchView
+                        android:id="@+id/home_search"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center_vertical"
+                        android:iconifiedByDefault="false"
+                        android:paddingStart="-10dp"
+                        app:iconifiedByDefault="false"
+
+                        app:queryBackground="@color/transparent"
+                        app:queryHint="@string/search_hint"
+
+                        app:searchIcon="@drawable/search_icon"
+                        tools:ignore="RtlSymmetry" />
+                </FrameLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:orientation="vertical">
+                    <TextView
+                        android:textStyle="bold"
+                        android:paddingBottom="10dp"
+                        android:id="@+id/home_preview_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:textColor="@color/white"
+                        android:textSize="17sp"
+                        tools:text="The Perfect Run" />
+                    <!--<TextView
+                        android:paddingStart="30dp"
+                        android:paddingEnd="30dp"
+                        android:id="@+id/home_season_tags"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:textColor="@color/white"
+                        android:textSize="14sp"
+                        tools:text="5 seasons 50 episodes" />-->
+                    <TextView
+                        android:paddingStart="30dp"
+                        android:paddingEnd="30dp"
+                        android:id="@+id/home_preview_tags"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:textColor="@color/white"
+                        android:textSize="14sp"
+                        tools:text="Hello • World • Tags" />
+
+                    <LinearLayout
+                        android:padding="20dp"
+                        android:gravity="center"
+                        android:layout_gravity="center"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/home_preview_bookmark"
+                            android:background="?android:attr/selectableItemBackgroundBorderless"
+                            android:layout_gravity="center"
+                            android:gravity="center"
+                            android:layout_marginStart="25dp"
+                            android:layout_marginEnd="25dp"
+                            android:layout_width="70dp"
+                            android:layout_height="wrap_content"
+                            android:text="@string/none"
+                            android:textColor="@color/white"
+                            app:drawableTopCompat="@drawable/ic_baseline_add_24"
+                            app:tint="@color/white" />
+                        <com.google.android.material.button.MaterialButton
+                            android:layout_gravity="center"
+                            style="@style/WhiteButton"
+                            android:id="@+id/home_preview_play"
+                            android:layout_width="wrap_content"
+
+                            android:text="@string/home_play"
+                            app:icon="@drawable/ic_baseline_play_arrow_24" />
+                        <TextView
+                            android:background="?android:attr/selectableItemBackgroundBorderless"
+                            android:id="@+id/home_preview_info"
+                            android:gravity="center"
+                            android:layout_gravity="center"
+                            android:layout_marginStart="25dp"
+                            android:layout_marginEnd="25dp"
+                            android:layout_width="70dp"
+                            android:layout_height="wrap_content"
+                            android:text="@string/home_info"
+                            android:textColor="@color/white"
+                            app:drawableTopCompat="@drawable/ic_outline_info_24"
+                            app:tint="@color/white" />
+                    </LinearLayout>
+                </LinearLayout>
+            </FrameLayout>
+
+
+            <LinearLayout
+                android:id="@+id/home_watch_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <FrameLayout
+                    android:id="@+id/home_watch_child_more_info"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+
+                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    android:nextFocusLeft="@id/nav_rail_view"
+                    android:nextFocusDown="@id/home_watch_child_recyclerview"
+                    android:padding="12dp">
 
                     <TextView
-                            android:layout_gravity="center_vertical"
-                            android:id="@+id/home_watch_parent_item_title"
-                            style="@style/WatchHeaderText"
-                            android:text="@string/continue_watching" />
+                        android:id="@+id/home_watch_parent_item_title"
+                        style="@style/WatchHeaderText"
+                        android:layout_gravity="center_vertical"
+                        android:text="@string/continue_watching" />
 
                     <ImageView
-                            app:tint="?attr/textColor"
-                            android:layout_marginEnd="5dp"
-                            android:layout_gravity="end|center_vertical"
-                            android:src="@drawable/ic_baseline_arrow_forward_24"
-                            android:layout_width="30dp"
-                            android:layout_height="match_parent"
-                            android:contentDescription="@string/home_more_info" />
+                        android:layout_width="30dp"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_marginEnd="5dp"
+                        android:contentDescription="@string/home_more_info"
+                        android:src="@drawable/ic_baseline_arrow_forward_24"
+                        app:tint="?attr/textColor" />
                 </FrameLayout>
 
 
                 <androidx.recyclerview.widget.RecyclerView
-                        android:paddingHorizontal="5dp"
-                        android:clipToPadding="false"
-                        android:descendantFocusability="afterDescendants"
-                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                        android:id="@+id/home_watch_child_recyclerview"
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        tools:listitem="@layout/home_result_grid" />
+                    android:id="@+id/home_watch_child_recyclerview"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:clipToPadding="false"
+                    android:descendantFocusability="afterDescendants"
+                    android:orientation="horizontal"
+                    android:paddingHorizontal="5dp"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:listitem="@layout/home_result_grid" />
 
             </LinearLayout>
 
             <LinearLayout
-                    android:id="@+id/home_bookmarked_holder"
-                    android:orientation="vertical"
-                    android:visibility="gone"
-                    tools:visibility="visible"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                android:id="@+id/home_bookmarked_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone"
+                tools:visibility="visible">
 
                 <FrameLayout
-                        android:nextFocusLeft="@id/nav_rail_view"
-                        android:nextFocusUp="@id/home_watch_child_recyclerview"
-                        android:nextFocusForward="@id/home_bookmarked_child_recyclerview"
+                    android:id="@+id/home_bookmarked_child_more_info"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
 
-                        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                        android:id="@+id/home_bookmarked_child_more_info"
-                        android:paddingTop="5dp"
-                        android:paddingBottom="5dp"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    android:nextFocusLeft="@id/nav_rail_view"
+                    android:nextFocusUp="@id/home_watch_child_recyclerview"
+                    android:nextFocusForward="@id/home_bookmarked_child_recyclerview"
+                    android:paddingStart="12dp"
+                    android:paddingTop="5dp"
+                    android:paddingEnd="12dp"
+                    android:paddingBottom="5dp">
 
                     <HorizontalScrollView
-                            android:fadingEdge="horizontal"
-                            android:requiresFadingEdge="horizontal"
-                            android:layout_marginEnd="50dp"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content">
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="50dp"
+                        android:fadingEdge="horizontal"
+                        android:requiresFadingEdge="horizontal">
 
                         <LinearLayout
-                                android:orientation="horizontal"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content">
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
 
                             <com.google.android.material.button.MaterialButton
-                                    android:nextFocusLeft="@id/nav_rail_view"
-                                    android:nextFocusRight="@id/home_plan_to_watch_btt"
+                                android:id="@+id/home_type_watching_btt"
+                                style="@style/RoundedSelectableButton"
 
-                                    android:id="@+id/home_type_watching_btt"
-                                    android:text="@string/type_watching"
-                                    style="@style/RoundedSelectableButton" />
+                                android:nextFocusLeft="@id/nav_rail_view"
+                                android:nextFocusRight="@id/home_plan_to_watch_btt"
+                                android:text="@string/type_watching" />
 
                             <com.google.android.material.button.MaterialButton
-                                    android:nextFocusLeft="@id/home_type_watching_btt"
-                                    android:nextFocusRight="@id/home_type_on_hold_btt"
+                                android:id="@+id/home_plan_to_watch_btt"
+                                style="@style/RoundedSelectableButton"
 
-                                    android:id="@+id/home_plan_to_watch_btt"
-                                    android:text="@string/type_plan_to_watch"
-                                    style="@style/RoundedSelectableButton" />
+                                android:nextFocusLeft="@id/home_type_watching_btt"
+                                android:nextFocusRight="@id/home_type_on_hold_btt"
+                                android:text="@string/type_plan_to_watch" />
 
                             <com.google.android.material.button.MaterialButton
-                                    android:nextFocusLeft="@id/home_plan_to_watch_btt"
-                                    android:nextFocusRight="@id/home_type_dropped_btt"
+                                android:id="@+id/home_type_on_hold_btt"
+                                style="@style/RoundedSelectableButton"
 
-                                    android:id="@+id/home_type_on_hold_btt"
-                                    android:text="@string/type_on_hold"
-                                    style="@style/RoundedSelectableButton" />
+                                android:nextFocusLeft="@id/home_plan_to_watch_btt"
+                                android:nextFocusRight="@id/home_type_dropped_btt"
+                                android:text="@string/type_on_hold" />
 
                             <com.google.android.material.button.MaterialButton
-                                    android:nextFocusLeft="@id/home_type_on_hold_btt"
-                                    android:nextFocusRight="@id/home_type_completed_btt"
+                                android:id="@+id/home_type_dropped_btt"
+                                style="@style/RoundedSelectableButton"
 
-                                    android:id="@+id/home_type_dropped_btt"
-                                    android:text="@string/type_dropped"
-                                    style="@style/RoundedSelectableButton" />
+                                android:nextFocusLeft="@id/home_type_on_hold_btt"
+                                android:nextFocusRight="@id/home_type_completed_btt"
+                                android:text="@string/type_dropped" />
 
                             <com.google.android.material.button.MaterialButton
-                                    android:nextFocusLeft="@id/home_type_dropped_btt"
+                                android:id="@+id/home_type_completed_btt"
 
-                                    android:id="@+id/home_type_completed_btt"
-                                    android:text="@string/type_completed"
-                                    style="@style/RoundedSelectableButton" />
+                                style="@style/RoundedSelectableButton"
+                                android:nextFocusLeft="@id/home_type_dropped_btt"
+                                android:text="@string/type_completed" />
                         </LinearLayout>
                     </HorizontalScrollView>
 
                     <ImageView
-                            app:tint="?attr/textColor"
-                            android:layout_marginEnd="5dp"
-                            android:layout_gravity="end|center_vertical"
-                            android:src="@drawable/ic_baseline_arrow_forward_24"
-                            android:layout_width="30dp"
-                            android:layout_height="match_parent"
-                            android:contentDescription="@string/home_more_info" />
+                        android:layout_width="30dp"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_marginEnd="5dp"
+                        android:contentDescription="@string/home_more_info"
+                        android:src="@drawable/ic_baseline_arrow_forward_24"
+                        app:tint="?attr/textColor" />
                 </FrameLayout>
 
                 <androidx.recyclerview.widget.RecyclerView
-                        android:paddingHorizontal="5dp"
-                        android:clipToPadding="false"
-                        android:descendantFocusability="afterDescendants"
+                    android:id="@+id/home_bookmarked_child_recyclerview"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
 
-                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                        android:id="@+id/home_bookmarked_child_recyclerview"
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        tools:listitem="@layout/home_result_grid" />
+                    android:clipToPadding="false"
+                    android:descendantFocusability="afterDescendants"
+                    android:orientation="horizontal"
+                    android:paddingHorizontal="5dp"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:listitem="@layout/home_result_grid" />
             </LinearLayout>
 
             <androidx.recyclerview.widget.RecyclerView
-                    android:nextFocusLeft="@id/nav_rail_view"
-                    android:descendantFocusability="afterDescendants"
-                    android:id="@+id/home_master_recycler"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    tools:listitem="@layout/homepage_parent" />
+                android:id="@+id/home_master_recycler"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:descendantFocusability="afterDescendants"
+                android:nextFocusLeft="@id/nav_rail_view"
+                tools:listitem="@layout/homepage_parent" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-            android:visibility="gone"
-            tools:visibility="visible"
-            android:text="@string/home_source"
-            android:id="@+id/home_api_fab"
-            app:icon="@drawable/ic_baseline_filter_list_24"
-            style="@style/ExtendedFloatingActionButton"
-            android:textColor="?attr/textColor"
-            tools:ignore="ContentDescription" />
+        android:id="@+id/home_api_fab"
+        style="@style/ExtendedFloatingActionButton"
+        android:text="@string/home_source"
+        android:textColor="?attr/textColor"
+        android:visibility="gone"
+        app:icon="@drawable/ic_baseline_filter_list_24"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible" />
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-            android:visibility="gone"
-            tools:visibility="visible"
-            android:text="@string/home_random"
-            android:id="@+id/home_random"
-            android:layout_gravity="bottom|start"
-            app:icon="@drawable/ic_baseline_play_arrow_24"
-            style="@style/ExtendedFloatingActionButton"
-            android:textColor="?attr/textColor"
-            tools:ignore="ContentDescription" />
+        android:id="@+id/home_random"
+        style="@style/ExtendedFloatingActionButton"
+        android:layout_gravity="bottom|start"
+        android:text="@string/home_random"
+        android:textColor="?attr/textColor"
+        android:visibility="gone"
+        app:icon="@drawable/ic_baseline_play_arrow_24"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_plugins.xml b/app/src/main/res/layout/fragment_plugins.xml
index 15e0d2f9..40a0299c 100644
--- a/app/src/main/res/layout/fragment_plugins.xml
+++ b/app/src/main/res/layout/fragment_plugins.xml
@@ -25,108 +25,7 @@
             app:titleTextColor="?attr/textColor"
             tools:title="Overlord" />
 
-        <HorizontalScrollView
-            android:id="@+id/tv_types_scroll_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/primaryGrayBackground"
-            android:clipToPadding="true"
-            android:fadingEdge="horizontal"
-            android:paddingStart="10dp"
-            android:paddingEnd="10dp"
-            android:requiresFadingEdge="horizontal"
-            app:layout_scrollFlags="scroll|enterAlways">
-
-            <!--        Man what the fuck we need a recyclerview -->
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <!--  android:minWidth="0dp"
-                        app:iconTint="?attr/textColor"
-                        android:insetLeft="0dp"
-                        android:insetTop="0dp"
-                        android:insetRight="0dp"
-                        android:insetBottom="0dp"
-                        app:iconGravity="textStart"
-                        app:iconPadding="0dp"
-                        android:layout_height="35dp"-->
-                <!-- <com.google.android.material.button.MaterialButton
-                         android:nextFocusRight="@id/home_select_tv_series"
-                         app:icon="@drawable/ic_baseline_close_24"
-
-                         android:id="@+id/home_select_none"
-                         style="@style/RoundedSelectableButtonIcon"/>-->
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/home_select_movies"
-
-                    style="@style/RoundedSelectableButton"
-                    android:nextFocusRight="@id/home_select_tv_series"
-                    android:text="@string/movies" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/home_select_tv_series"
-                    style="@style/RoundedSelectableButton"
-
-                    android:nextFocusLeft="@id/home_select_movies"
-                    android:nextFocusRight="@id/home_select_anime"
-                    android:text="@string/tv_series" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/home_select_anime"
-                    style="@style/RoundedSelectableButton"
-
-                    android:nextFocusLeft="@id/home_select_tv_series"
-                    android:nextFocusRight="@id/home_select_asian"
-                    android:text="@string/anime" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/home_select_asian"
-                    style="@style/RoundedSelectableButton"
-
-                    android:nextFocusLeft="@id/home_select_anime"
-                    android:nextFocusRight="@id/home_select_cartoons"
-                    android:text="@string/asian_drama" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/home_select_cartoons"
-                    style="@style/RoundedSelectableButton"
-
-                    android:nextFocusLeft="@id/home_select_asian"
-                    android:nextFocusRight="@id/home_select_documentaries"
-                    android:text="@string/cartoons" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/home_select_documentaries"
-
-                    style="@style/RoundedSelectableButton"
-                    android:nextFocusLeft="@id/home_select_cartoons"
-                    android:nextFocusRight="@id/home_select_livestreams"
-                    android:text="@string/documentaries" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/home_select_livestreams"
-                    style="@style/RoundedSelectableButton"
-                    android:nextFocusLeft="@id/home_select_documentaries"
-                    android:nextFocusRight="@id/home_select_nsfw"
-                    android:text="@string/livestreams" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/home_select_nsfw"
-                    style="@style/RoundedSelectableButton"
-                    android:nextFocusLeft="@id/home_select_livestreams"
-                    android:nextFocusRight="@id/home_select_nsfw"
-                    android:text="@string/nsfw" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/home_select_others"
-                    style="@style/RoundedSelectableButton"
-                    android:nextFocusLeft="@id/home_select_nsfw"
-                    android:text="@string/others" />
-
-            </LinearLayout>
-        </HorizontalScrollView>
+        <include layout="@layout/tvtypes_chips_scroll" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 31a6b7cd..083cd64e 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -82,86 +82,7 @@
             app:tint="?attr/textColor" />
     </FrameLayout>
 
-    <HorizontalScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fadingEdge="horizontal"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp"
-        android:requiresFadingEdge="horizontal">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/search_select_movies"
-
-                style="@style/RoundedSelectableButton"
-                android:nextFocusRight="@id/search_select_tv_series"
-                android:text="@string/movies" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/search_select_tv_series"
-                style="@style/RoundedSelectableButton"
-
-                android:nextFocusLeft="@id/search_select_movies"
-                android:nextFocusRight="@id/search_select_anime"
-                android:text="@string/tv_series" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/search_select_anime"
-                style="@style/RoundedSelectableButton"
-
-                android:nextFocusLeft="@id/search_select_tv_series"
-                android:nextFocusRight="@id/search_select_asian"
-                android:text="@string/anime" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/search_select_asian"
-                style="@style/RoundedSelectableButton"
-
-                android:nextFocusLeft="@id/search_select_anime"
-                android:nextFocusRight="@id/search_select_cartoons"
-                android:text="@string/asian_drama" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/search_select_cartoons"
-                style="@style/RoundedSelectableButton"
-
-                android:nextFocusLeft="@id/search_select_asian"
-                android:nextFocusRight="@id/search_select_documentaries"
-                android:text="@string/cartoons" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/search_select_documentaries"
-                style="@style/RoundedSelectableButton"
-                android:nextFocusLeft="@id/search_select_cartoons"
-                android:nextFocusRight="@id/search_select_livestreams"
-                android:text="@string/documentaries" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/search_select_livestreams"
-                style="@style/RoundedSelectableButton"
-                android:nextFocusLeft="@id/search_select_documentaries"
-                android:nextFocusRight="@id/search_select_nsfw"
-                android:text="@string/livestreams" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/search_select_nsfw"
-                style="@style/RoundedSelectableButton"
-                android:nextFocusLeft="@id/search_select_livestreams"
-                android:nextFocusRight="@id/search_select_others"
-                android:text="@string/nsfw" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/search_select_others"
-                style="@style/RoundedSelectableButton"
-                android:nextFocusLeft="@id/search_select_nsfw"
-                android:text="@string/others" />
-        </LinearLayout>
-    </HorizontalScrollView>
+    <include layout="@layout/tvtypes_chips_scroll" />
 
 
     <com.lagradost.cloudstream3.ui.AutofitRecyclerView
diff --git a/app/src/main/res/layout/home_select_mainpage.xml b/app/src/main/res/layout/home_select_mainpage.xml
index 8546d9b1..a4bb686c 100644
--- a/app/src/main/res/layout/home_select_mainpage.xml
+++ b/app/src/main/res/layout/home_select_mainpage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -10,143 +10,47 @@
         android:id="@+id/listview1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:nestedScrollingEnabled="true"
         android:layout_rowWeight="1"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="60dp"
         android:clipToPadding="false"
         android:minHeight="0dp"
+        android:nestedScrollingEnabled="true"
         android:nextFocusLeft="@id/apply_btt"
         android:nextFocusRight="@id/cancel_btt"
         android:requiresFadingEdge="vertical"
         tools:listitem="@layout/sort_bottom_single_choice" />
 
-    <HorizontalScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-60dp"
-        android:clipToPadding="true"
-        android:fadingEdge="horizontal"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp"
-        android:requiresFadingEdge="horizontal">
-
-        <!--        Man what the fuck we need a recyclerview -->
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <!--  android:minWidth="0dp"
-                    app:iconTint="?attr/textColor"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    android:layout_height="35dp"-->
-            <!-- <com.google.android.material.button.MaterialButton
-                     android:nextFocusRight="@id/home_select_tv_series"
-                     app:icon="@drawable/ic_baseline_close_24"
-
-                     android:id="@+id/home_select_none"
-                     style="@style/RoundedSelectableButtonIcon"/>-->
-
-            <!--
-            If you reorder this fix getPairList() too!
-            That shit is responsible for focus selection
-            -->
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/home_select_movies"
-
-                style="@style/RoundedSelectableButton"
-                android:nextFocusRight="@id/home_select_tv_series"
-                android:text="@string/movies" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/home_select_tv_series"
-                style="@style/RoundedSelectableButton"
-
-                android:nextFocusLeft="@id/home_select_movies"
-                android:nextFocusRight="@id/home_select_anime"
-                android:text="@string/tv_series" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/home_select_anime"
-                style="@style/RoundedSelectableButton"
-
-                android:nextFocusLeft="@id/home_select_tv_series"
-                android:nextFocusRight="@id/home_select_asian"
-                android:text="@string/anime" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/home_select_asian"
-                style="@style/RoundedSelectableButton"
-
-                android:nextFocusLeft="@id/home_select_anime"
-                android:nextFocusRight="@id/home_select_cartoons"
-                android:text="@string/asian_drama" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/home_select_cartoons"
-                style="@style/RoundedSelectableButton"
-
-                android:nextFocusLeft="@id/home_select_asian"
-                android:nextFocusRight="@id/home_select_documentaries"
-                android:text="@string/cartoons" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/home_select_documentaries"
-                style="@style/RoundedSelectableButton"
-                android:nextFocusLeft="@id/home_select_cartoons"
-                android:nextFocusRight="@id/home_select_livestreams"
-                android:text="@string/documentaries" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/home_select_livestreams"
-                style="@style/RoundedSelectableButton"
-                android:nextFocusLeft="@id/home_select_documentaries"
-                android:nextFocusRight="@id/home_select_nsfw"
-                android:text="@string/livestreams" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/home_select_nsfw"
-                style="@style/RoundedSelectableButton"
-                android:nextFocusLeft="@id/home_select_livestreams"
-                android:nextFocusRight="@id/home_select_others"
-                android:text="@string/nsfw" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/home_select_others"
-                style="@style/RoundedSelectableButton"
-                android:nextFocusLeft="@id/home_select_nsfw"
-                android:text="@string/others" />
-
-        </LinearLayout>
-    </HorizontalScrollView>
-
     <LinearLayout
-        android:id="@+id/apply_btt_holder"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
+        android:orientation="vertical"
         android:layout_gravity="bottom"
-        android:gravity="bottom|end"
-        android:orientation="horizontal"
-        android:visibility="gone">
+        android:layout_width="match_parent"
+        android:layout_height="60dp">
+        <include layout="@layout/tvtypes_chips_scroll" />
+        <LinearLayout
+            android:id="@+id/apply_btt_holder"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_marginTop="-60dp"
+            android:layout_gravity="bottom"
+            android:gravity="bottom|end"
+            android:orientation="horizontal"
+            android:visibility="gone">
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/apply_btt"
-            style="@style/WhiteButton"
-            android:layout_width="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:text="@string/sort_apply" />
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/apply_btt"
+                style="@style/WhiteButton"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                android:text="@string/sort_apply" />
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/cancel_btt"
-            style="@style/BlackButton"
-            android:layout_width="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:text="@string/sort_cancel" />
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/cancel_btt"
+                style="@style/BlackButton"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                android:text="@string/sort_cancel" />
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tvtypes_chips.xml b/app/src/main/res/layout/tvtypes_chips.xml
new file mode 100644
index 00000000..33ca7762
--- /dev/null
+++ b/app/src/main/res/layout/tvtypes_chips.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.chip.ChipGroup android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
+    android:id="@+id/home_select_group"
+    app:singleSelection="false"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <com.google.android.material.chip.Chip
+        android:id="@+id/home_select_movies"
+        style="@style/ChipFilled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/movies" />
+
+    <com.google.android.material.chip.Chip
+        android:id="@+id/home_select_tv_series"
+        style="@style/ChipFilled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/tv_series" />
+
+    <com.google.android.material.chip.Chip
+        android:id="@+id/home_select_anime"
+        style="@style/ChipFilled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/anime" />
+
+    <com.google.android.material.chip.Chip
+        android:id="@+id/home_select_asian"
+        style="@style/ChipFilled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/asian_drama" />
+    <com.google.android.material.chip.Chip
+        android:id="@+id/home_select_cartoons"
+        style="@style/ChipFilled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cartoons" />
+    <com.google.android.material.chip.Chip
+        android:id="@+id/home_select_documentaries"
+        style="@style/ChipFilled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/documentaries" />
+    <com.google.android.material.chip.Chip
+        android:id="@+id/home_select_livestreams"
+        style="@style/ChipFilled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/livestreams" />
+    <com.google.android.material.chip.Chip
+        android:id="@+id/home_select_nsfw"
+        style="@style/ChipFilled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/nsfw" />
+    <com.google.android.material.chip.Chip
+        android:id="@+id/home_select_others"
+        style="@style/ChipFilled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/others" />
+</com.google.android.material.chip.ChipGroup>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tvtypes_chips_scroll.xml b/app/src/main/res/layout/tvtypes_chips_scroll.xml
new file mode 100644
index 00000000..45b27dbc
--- /dev/null
+++ b/app/src/main/res/layout/tvtypes_chips_scroll.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<HorizontalScrollView android:id="@+id/tv_types_scroll_view"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:fadingEdge="horizontal"
+    android:requiresFadingEdge="horizontal"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <include layout="@layout/tvtypes_chips" />
+</HorizontalScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9840cb80..9e235bf3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -75,6 +75,10 @@
         <item name="primaryGrayBackground">@color/amoledModeLight</item>
     </style>
 
+    <style name="ChipFilled" parent="@style/Widget.Material3.Chip.Filter">
+         <item name="chipBackgroundColor">@color/chip_color</item>
+    </style>
+
     <style name="AmoledMode">
         <item name="primaryGrayBackground">@color/black</item>
         <item name="primaryBlackBackground">@color/black</item>

From c18856c8c336cda03805a442aea77cfd82bc13b9 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Fri, 28 Oct 2022 18:43:14 +0200
Subject: [PATCH 035/273] minor UI and icon changes + tmp readded search

---
 .../cloudstream3/ui/home/HomeFragment.kt      |  43 ++-
 .../cloudstream3/ui/home/HomeViewModel.kt     |   8 +-
 .../cloudstream3/ui/result/ResultFragment.kt  |  34 ++-
 .../ui/result/ResultFragmentPhone.kt          |  18 +-
 app/src/main/res/drawable/home_alt.xml        |   9 +
 .../main/res/drawable/ic_baseline_add_24.xml  |  13 +-
 .../drawable/ic_baseline_arrow_back_24.xml    |  13 +-
 .../drawable/ic_baseline_arrow_forward_24.xml |  13 +-
 .../res/drawable/ic_baseline_bookmark_24.xml  |  11 +-
 .../ic_baseline_delete_outline_24.xml         |  16 +-
 .../drawable/ic_baseline_filter_list_24.xml   |  13 +-
 .../ic_baseline_keyboard_arrow_down_24.xml    |  13 +-
 .../main/res/drawable/ic_baseline_tune_24.xml |  11 +-
 app/src/main/res/drawable/search_icon.xml     |  30 +--
 app/src/main/res/drawable/settings_alt.xml    |   9 +
 .../main/res/drawable/storage_bar_left.xml    |   7 +
 .../res/drawable/storage_bar_left_box.xml     |   5 +
 app/src/main/res/drawable/storage_bar_mid.xml |   4 +
 .../main/res/drawable/storage_bar_mid_box.xml |   5 +
 .../main/res/drawable/storage_bar_right.xml   |   7 +
 .../res/drawable/storage_bar_right_box.xml    |   5 +
 .../main/res/layout/fragment_downloads.xml    | 252 +++++++++---------
 .../main/res/layout/fragment_extensions.xml   | 113 ++++----
 app/src/main/res/layout/fragment_home.xml     |  90 +++++--
 app/src/main/res/layout/fragment_home_tv.xml  |  80 +++---
 app/src/main/res/layout/fragment_result.xml   |   9 +-
 app/src/main/res/menu/bottom_nav_menu.xml     |   4 +-
 app/src/main/res/values/dimens.xml            |   3 +
 app/src/main/res/values/styles.xml            |   3 +-
 29 files changed, 508 insertions(+), 333 deletions(-)
 create mode 100644 app/src/main/res/drawable/home_alt.xml
 create mode 100644 app/src/main/res/drawable/settings_alt.xml
 create mode 100644 app/src/main/res/drawable/storage_bar_left.xml
 create mode 100644 app/src/main/res/drawable/storage_bar_left_box.xml
 create mode 100644 app/src/main/res/drawable/storage_bar_mid.xml
 create mode 100644 app/src/main/res/drawable/storage_bar_mid_box.xml
 create mode 100644 app/src/main/res/drawable/storage_bar_right.xml
 create mode 100644 app/src/main/res/drawable/storage_bar_right_box.xml

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 2f539a33..7026eb12 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
 import android.content.res.Configuration
+import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -14,7 +15,6 @@ import android.view.ViewGroup
 import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
-import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.getDrawable
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
@@ -23,7 +23,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.LinearSnapHelper
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
@@ -104,11 +103,13 @@ import kotlinx.android.synthetic.main.fragment_home.home_watch_holder
 import kotlinx.android.synthetic.main.fragment_home.home_watch_parent_item_title
 import kotlinx.android.synthetic.main.fragment_home.result_error_text
 import kotlinx.android.synthetic.main.fragment_home_tv.*
+import kotlinx.android.synthetic.main.fragment_search.*
 import kotlinx.android.synthetic.main.home_episodes_expanded.*
 import kotlinx.android.synthetic.main.tvtypes_chips.*
 import kotlinx.android.synthetic.main.tvtypes_chips.view.*
 import java.util.*
 
+
 const val HOME_BOOKMARK_VALUE_LIST = "home_bookmarked_last_list"
 const val HOME_PREF_HOMEPAGE = "home_pref_homepage"
 
@@ -560,7 +561,12 @@ class HomeFragment : Fragment() {
                         // very ugly code, but I dont care
                         val watchType = DataStoreHelper.getResultWatchState(preview.value.getId())
                         home_preview_bookmark?.setText(watchType.stringRes)
-                        home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(null,getDrawable(home_preview_bookmark.context, watchType.iconRes),null,null)
+                        home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
+                            null,
+                            getDrawable(home_preview_bookmark.context, watchType.iconRes),
+                            null,
+                            null
+                        )
                         home_preview_bookmark?.setOnClickListener { fab ->
                             activity?.showBottomDialog(
                                 WatchType.values().map { fab.context.getString(it.stringRes) }
@@ -570,7 +576,12 @@ class HomeFragment : Fragment() {
                                 showApply = false,
                                 {}) {
                                 val newValue = WatchType.values()[it]
-                                home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(null,getDrawable(home_preview_bookmark.context, newValue.iconRes),null,null)
+                                home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
+                                    null,
+                                    getDrawable(home_preview_bookmark.context, newValue.iconRes),
+                                    null,
+                                    null
+                                )
                                 home_preview_bookmark?.setText(newValue.stringRes)
 
                                 updateWatchStatus(preview.value, newValue)
@@ -585,6 +596,11 @@ class HomeFragment : Fragment() {
             }
         }
 
+        val searchText =
+            home_search?.findViewById<SearchView.SearchAutoComplete>(androidx.appcompat.R.id.search_src_text)
+        searchText?.setTextColor(Color.WHITE)
+        searchText?.setHintTextColor(Color.WHITE)
+
         observe(homeViewModel.apiName) { apiName ->
             currentApiName = apiName
             // setKey(USER_SELECTED_HOMEPAGE_API, apiName)
@@ -749,14 +765,22 @@ class HomeFragment : Fragment() {
             Pair(home_type_on_hold_btt, WatchType.ONHOLD),
             Pair(home_plan_to_watch_btt, WatchType.PLANTOWATCH),
         )
+        val currentSet = getKey<IntArray>(HOME_BOOKMARK_VALUE_LIST)
+            ?.map { WatchType.fromInternalId(it) }?.toSet() ?: emptySet()
+
+        for ((chip, watch) in toggleList) {
+            chip.isChecked = currentSet.contains(watch)
+            chip?.setOnCheckedChangeListener { _, _ ->
+                homeViewModel.loadStoredData(toggleList.filter { it.first?.isChecked == true }
+                    .map { it.second }.toSet())
+            }
+            /*chip?.setOnClickListener {
+
 
-        for (item in toggleList) {
-            val watch = item.second
-            item.first?.setOnClickListener {
                 homeViewModel.loadStoredData(EnumSet.of(watch))
             }
 
-            item.first?.setOnLongClickListener { itemView ->
+            chip?.setOnLongClickListener { itemView ->
                 val list = EnumSet.noneOf(WatchType::class.java)
                 itemView.context.getKey<IntArray>(HOME_BOOKMARK_VALUE_LIST)
                     ?.map { WatchType.fromInternalId(it) }?.let {
@@ -770,7 +794,7 @@ class HomeFragment : Fragment() {
                 }
                 homeViewModel.loadStoredData(list)
                 return@setOnLongClickListener true
-            }
+            }*/
         }
 
         observe(homeViewModel.availableWatchStatusTypes) { availableWatchStatusTypes ->
@@ -993,6 +1017,7 @@ class HomeFragment : Fragment() {
         }
 
         //context?.fixPaddingStatusbarView(home_statusbar)
+        context?.fixPaddingStatusbar(home_padding)
         context?.fixPaddingStatusbar(home_loading_statusbar)
 
         home_master_recycler.adapter =
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index 0b928a55..af24973d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -51,8 +51,8 @@ class HomeViewModel : ViewModel() {
     }
 
     private val _availableWatchStatusTypes =
-        MutableLiveData<Pair<EnumSet<WatchType>, EnumSet<WatchType>>>()
-    val availableWatchStatusTypes: LiveData<Pair<EnumSet<WatchType>, EnumSet<WatchType>>> =
+        MutableLiveData<Pair<Set<WatchType>, Set<WatchType>>>()
+    val availableWatchStatusTypes: LiveData<Pair<Set<WatchType>, Set<WatchType>>> =
         _availableWatchStatusTypes
     private val _bookmarks = MutableLiveData<Pair<Boolean, List<SearchResponse>>>()
     val bookmarks: LiveData<Pair<Boolean, List<SearchResponse>>> = _bookmarks
@@ -98,7 +98,7 @@ class HomeViewModel : ViewModel() {
         }
     }
 
-    fun loadStoredData(preferredWatchStatus: EnumSet<WatchType>?) = viewModelScope.launchSafe {
+    fun loadStoredData(preferredWatchStatus: Set<WatchType>?) = viewModelScope.launchSafe {
         val watchStatusIds = withContext(Dispatchers.IO) {
             getAllWatchStateIds()?.map { id ->
                 Pair(id, getResultWatchState(id))
@@ -106,7 +106,7 @@ class HomeViewModel : ViewModel() {
         }?.distinctBy { it.first } ?: return@launchSafe
 
         val length = WatchType.values().size
-        val currentWatchTypes = EnumSet.noneOf(WatchType::class.java)
+        val currentWatchTypes = mutableSetOf<WatchType>()
 
         for (watch in watchStatusIds) {
             currentWatchTypes.add(watch.second)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index a173f1c1..3aae7fd2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -22,7 +22,7 @@ import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
 import com.discord.panels.OverlappingPanelsLayout
-import com.google.android.material.button.MaterialButton
+import com.google.android.material.chip.Chip
 import com.lagradost.cloudstream3.APIHolder.getApiDubstatusSettings
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.APIHolder.updateHasTrailers
@@ -99,6 +99,7 @@ import kotlinx.android.synthetic.main.result_sync.*
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 
+import com.google.android.material.chip.ChipDrawable
 
 const val START_ACTION_RESUME_LATEST = 1
 const val START_ACTION_LOAD_EP = 2
@@ -926,18 +927,37 @@ open class ResultFragment : ResultTrailerPlayer() {
 
                     val tags = d.tags
                     result_tag_holder?.isVisible = tags.isNotEmpty()
-                    if (tags.isNotEmpty()) {
-                        //result_tag_holder?.visibility = VISIBLE
-                        val isOnTv = isTrueTvSettings()
-                        for ((index, tag) in tags.withIndex()) {
+                    result_tag?.apply {
+                        tags.forEach { tag ->
+                            val chip = Chip(context)
+                            val chipDrawable = ChipDrawable.createFromAttributes(
+                                context,
+                                null,
+                                0,
+                                R.style.ChipFilled
+                            )
+                            chip.setChipDrawable(chipDrawable)
+                            chip.text = tag
+                            chip.isCheckable = false
+                            chip.isFocusable = false
+                            chip.isClickable = false
+                            addView(chip)
+                        }
+                    }
+                    // if (tags.isNotEmpty()) {
+                    //result_tag_holder?.visibility = VISIBLE
+                    //val isOnTv = isTrueTvSettings()
+
+
+                    /*for ((index, tag) in tags.withIndex()) {
                             val viewBtt = layoutInflater.inflate(R.layout.result_tag, null)
                             val btt = viewBtt.findViewById<MaterialButton>(R.id.result_tag_card)
                             btt.text = tag
                             btt.isFocusable = !isOnTv
                             btt.isClickable = !isOnTv
                             result_tag?.addView(viewBtt, index)
-                        }
-                    }
+                        }*/
+                    //}
                 }
                 is Resource.Failure -> {
                     result_error_text.text = storedData?.url?.plus("\n") + data.errorString
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index 1cd3641d..813872c9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -27,8 +27,10 @@ import com.lagradost.cloudstream3.ui.search.SearchHelper
 import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
 import com.lagradost.cloudstream3.utils.AppUtils.openBrowser
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIcons
@@ -127,6 +129,8 @@ class ResultFragmentPhone : ResultFragment() {
         down.nextFocusUpId = upper.id
     }
 
+    var selectSeason : String? = null
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         val apiName = arguments?.getString(API_NAME_BUNDLE) ?: return
 
@@ -297,6 +301,7 @@ class ResultFragmentPhone : ResultFragment() {
         observe(viewModel.selectedSeason) { text ->
             result_season_button.setText(text)
 
+            selectSeason = (if (text is Some.Success) text.value else null)?.asStringNull(result_season_button?.context)
             // If the season button is visible the result season button will be next focus down
             if (result_season_button?.isVisible == true)
                 if (result_resume_parent?.isVisible == true)
@@ -366,17 +371,24 @@ class ResultFragmentPhone : ResultFragment() {
 
         observe(viewModel.seasonSelections) { seasonList ->
             result_season_button?.setOnClickListener { view ->
+
                 view?.context?.let { ctx ->
                     val names = seasonList
                         .mapNotNull { (text, r) ->
                             r to (text?.asStringNull(ctx) ?: return@mapNotNull null)
                         }
 
-                    view.popupMenuNoIconsAndNoStringRes(names.mapIndexed { index, (_, name) ->
-                        index to name
-                    }) {
+                    activity?.showDialog(names.map { it.second },names.indexOfFirst { it.second == selectSeason },"",false,{}) { itemId->
                         viewModel.changeSeason(names[itemId].first)
                     }
+
+
+
+                    //view.popupMenuNoIconsAndNoStringRes(names.mapIndexed { index, (_, name) ->
+                    //    index to name
+                    //}) {
+                    //    viewModel.changeSeason(names[itemId].first)
+                    //}
                 }
             }
         }
diff --git a/app/src/main/res/drawable/home_alt.xml b/app/src/main/res/drawable/home_alt.xml
new file mode 100644
index 00000000..ae0e68a4
--- /dev/null
+++ b/app/src/main/res/drawable/home_alt.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?attr/white"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.05,39H17.95V26.15H30.1V39H36.95V19.55L24,9.85L11.05,19.55ZM11.05,42.65Q9.5,42.65 8.45,41.6Q7.4,40.55 7.4,39V19.55Q7.4,18.7 7.775,17.925Q8.15,17.15 8.85,16.65L21.8,6.9Q22.3,6.55 22.875,6.375Q23.45,6.2 24,6.2Q24.6,6.2 25.15,6.375Q25.7,6.55 26.2,6.9L39.15,16.65Q39.85,17.15 40.225,17.925Q40.6,18.7 40.6,19.55V39Q40.6,40.55 39.55,41.6Q38.5,42.65 36.95,42.65H26.45V29.8H21.6V42.65ZM24,24.4Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_add_24.xml b/app/src/main/res/drawable/ic_baseline_add_24.xml
index 9fdd2903..b56c474c 100644
--- a/app/src/main/res/drawable/ic_baseline_add_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_add_24.xml
@@ -1,5 +1,8 @@
-<vector android:height="24dp" android:tint="?attr/white"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
-</vector>
+<vector android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?attr/white"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M24,38.35Q23.25,38.35 22.725,37.825Q22.2,37.3 22.2,36.5V25.8H11.45Q10.7,25.8 10.175,25.25Q9.65,24.7 9.65,23.95Q9.65,23.2 10.175,22.675Q10.7,22.15 11.45,22.15H22.2V11.4Q22.2,10.65 22.725,10.125Q23.25,9.6 24,9.6Q24.75,9.6 25.3,10.125Q25.85,10.65 25.85,11.4V22.15H36.55Q37.3,22.15 37.85,22.675Q38.4,23.2 38.4,23.95Q38.4,24.75 37.85,25.275Q37.3,25.8 36.55,25.8H25.85V36.5Q25.85,37.3 25.3,37.825Q24.75,38.35 24,38.35Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
index a6108143..ebe459b2 100644
--- a/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
@@ -1,5 +1,8 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="?attr/white" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
-</vector>
+<vector android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?attr/white"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M22,39.35 L7.95,25.3Q7.65,25.05 7.525,24.725Q7.4,24.4 7.4,24Q7.4,23.65 7.525,23.325Q7.65,23 7.95,22.75L22.05,8.6Q22.6,8.1 23.325,8.125Q24.05,8.15 24.6,8.7Q25.1,9.25 25.1,10Q25.1,10.75 24.55,11.3L13.65,22.2H38.1Q38.85,22.2 39.375,22.725Q39.9,23.25 39.9,24Q39.9,24.8 39.375,25.325Q38.85,25.85 38.1,25.85H13.65L24.65,36.8Q25.15,37.35 25.125,38.075Q25.1,38.8 24.55,39.35Q24,39.9 23.25,39.9Q22.5,39.9 22,39.35Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml
index 23072282..2ec8c110 100644
--- a/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml
@@ -1,5 +1,8 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
-</vector>
+<vector android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?attr/white"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M22.7,39.3Q22.15,38.75 22.175,38Q22.2,37.25 22.75,36.7L33.6,25.85H9.2Q8.45,25.85 7.925,25.325Q7.4,24.8 7.4,24Q7.4,23.25 7.925,22.725Q8.45,22.2 9.2,22.2H33.6L22.75,11.35Q22.2,10.8 22.175,10.025Q22.15,9.25 22.7,8.7Q23.25,8.15 24,8.15Q24.75,8.15 25.3,8.7L39.35,22.75Q39.65,23.05 39.8,23.35Q39.95,23.65 39.95,24Q39.95,24.35 39.8,24.675Q39.65,25 39.35,25.3L25.3,39.35Q24.75,39.9 24,39.875Q23.25,39.85 22.7,39.3Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_bookmark_24.xml b/app/src/main/res/drawable/ic_baseline_bookmark_24.xml
index 8f0b1b18..42cb88d5 100644
--- a/app/src/main/res/drawable/ic_baseline_bookmark_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_bookmark_24.xml
@@ -1,5 +1,8 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
+<vector android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?attr/white"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.75,41.85Q10.85,42.25 10.05,41.725Q9.25,41.2 9.25,40.25V8.5Q9.25,7.05 10.35,5.95Q11.45,4.85 12.9,4.85H35.1Q36.55,4.85 37.65,5.95Q38.75,7.05 38.75,8.5V40.25Q38.75,41.2 37.95,41.725Q37.15,42.25 36.25,41.85L24,36.65Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_delete_outline_24.xml b/app/src/main/res/drawable/ic_baseline_delete_outline_24.xml
index a93d8ab0..b5cd9ffe 100644
--- a/app/src/main/res/drawable/ic_baseline_delete_outline_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_delete_outline_24.xml
@@ -1,10 +1,8 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="24dp"
-        android:tint="?attr/white"
-        android:viewportHeight="24"
-        android:viewportWidth="24"
-        android:width="24dp">
-    <path
-            android:fillColor="?white"
-            android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8,9h8v10L8,19L8,9zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z" />
+<vector android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?attr/white"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12.95,42.8Q11.5,42.8 10.4,41.7Q9.3,40.6 9.3,39.15V10.4H8.75Q8,10.4 7.475,9.85Q6.95,9.3 6.95,8.55Q6.95,7.8 7.475,7.275Q8,6.75 8.75,6.75H17.35Q17.35,6 17.875,5.525Q18.4,5.05 19.15,5.05H28.9Q29.65,5.05 30.175,5.525Q30.7,6 30.7,6.75H39.3Q40.05,6.75 40.6,7.275Q41.15,7.8 41.15,8.55Q41.15,9.35 40.6,9.875Q40.05,10.4 39.3,10.4H38.75V39.15Q38.75,40.6 37.65,41.7Q36.55,42.8 35.1,42.8ZM12.95,10.4V39.15Q12.95,39.15 12.95,39.15Q12.95,39.15 12.95,39.15H35.1Q35.1,39.15 35.1,39.15Q35.1,39.15 35.1,39.15V10.4ZM17.85,33Q17.85,33.75 18.375,34.275Q18.9,34.8 19.65,34.8Q20.4,34.8 20.95,34.275Q21.5,33.75 21.5,33V16.5Q21.5,15.75 20.95,15.2Q20.4,14.65 19.65,14.65Q18.9,14.65 18.375,15.2Q17.85,15.75 17.85,16.5ZM26.6,33Q26.6,33.75 27.125,34.275Q27.65,34.8 28.4,34.8Q29.15,34.8 29.7,34.275Q30.25,33.75 30.25,33V16.5Q30.25,15.75 29.7,15.2Q29.15,14.65 28.4,14.65Q27.65,14.65 27.125,15.2Q26.6,15.75 26.6,16.5ZM12.95,10.4V39.15Q12.95,39.15 12.95,39.15Q12.95,39.15 12.95,39.15Q12.95,39.15 12.95,39.15Q12.95,39.15 12.95,39.15V10.4Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_filter_list_24.xml b/app/src/main/res/drawable/ic_baseline_filter_list_24.xml
index 05e18bfa..f016d9b6 100644
--- a/app/src/main/res/drawable/ic_baseline_filter_list_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_filter_list_24.xml
@@ -1,5 +1,8 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
-</vector>
+<vector android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?attr/white"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21.5,37.35Q20.7,37.35 20.175,36.825Q19.65,36.3 19.65,35.55Q19.65,34.8 20.175,34.25Q20.7,33.7 21.5,33.7H26.5Q27.25,33.7 27.8,34.25Q28.35,34.8 28.35,35.55Q28.35,36.3 27.8,36.825Q27.25,37.35 26.5,37.35ZM7.35,13.1Q6.55,13.1 6.025,12.575Q5.5,12.05 5.5,11.3Q5.5,10.55 6.025,10Q6.55,9.45 7.35,9.45H40.65Q41.4,9.45 41.95,10Q42.5,10.55 42.5,11.3Q42.5,12.05 41.95,12.575Q41.4,13.1 40.65,13.1ZM13.4,25.25Q12.6,25.25 12.075,24.7Q11.55,24.15 11.55,23.4Q11.55,22.65 12.075,22.125Q12.6,21.6 13.4,21.6H34.6Q35.35,21.6 35.875,22.125Q36.4,22.65 36.4,23.4Q36.4,24.2 35.875,24.725Q35.35,25.25 34.6,25.25Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml
index 1aeaa998..0f4bc25f 100644
--- a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml
@@ -1,5 +1,8 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z"/>
-</vector>
+<vector android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?attr/white"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M24,30.55Q23.65,30.55 23.325,30.4Q23,30.25 22.75,29.95L12.8,20.05Q12.3,19.55 12.325,18.725Q12.35,17.9 12.85,17.4Q13.45,16.8 14.175,16.875Q14.9,16.95 15.45,17.45L24,26.05L32.6,17.45Q33.1,16.95 33.9,16.9Q34.7,16.85 35.25,17.45Q35.8,17.95 35.75,18.75Q35.7,19.55 35.2,20.05L25.3,29.95Q25,30.25 24.675,30.4Q24.35,30.55 24,30.55Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_tune_24.xml b/app/src/main/res/drawable/ic_baseline_tune_24.xml
index 2ce603c5..d0c63a3d 100644
--- a/app/src/main/res/drawable/ic_baseline_tune_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_tune_24.xml
@@ -1,5 +1,8 @@
-<vector android:height="24dp" android:tint="?attr/white"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M3,17v2h6v-2L3,17zM3,5v2h10L13,5L3,5zM13,21v-2h8v-2h-8v-2h-2v6h2zM7,9v2L3,11v2h4v2h2L9,9L7,9zM21,13v-2L11,11v2h10zM15,9h2L17,7h4L21,5h-4L17,3h-2v6z"/>
+<vector android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?attr/white"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M7.35,38.4Q6.55,38.4 6.025,37.85Q5.5,37.3 5.5,36.55Q5.5,35.8 6.025,35.275Q6.55,34.75 7.35,34.75H16.95Q17.7,34.75 18.225,35.275Q18.75,35.8 18.75,36.55Q18.75,37.35 18.225,37.875Q17.7,38.4 16.95,38.4ZM7.35,13.25Q6.55,13.25 6.025,12.7Q5.5,12.15 5.5,11.4Q5.5,10.65 6.025,10.125Q6.55,9.6 7.35,9.6H24.9Q25.65,9.6 26.2,10.125Q26.75,10.65 26.75,11.4Q26.75,12.2 26.2,12.725Q25.65,13.25 24.9,13.25ZM23.1,42.5Q22.3,42.5 21.775,41.975Q21.25,41.45 21.25,40.7V32.4Q21.25,31.65 21.8,31.1Q22.35,30.55 23.1,30.55Q23.85,30.55 24.375,31.1Q24.9,31.65 24.9,32.4V34.75H40.65Q41.4,34.75 41.95,35.275Q42.5,35.8 42.5,36.55Q42.5,37.35 41.95,37.875Q41.4,38.4 40.65,38.4H24.9V40.7Q24.9,41.45 24.375,41.975Q23.85,42.5 23.1,42.5ZM16.95,29.95Q16.15,29.95 15.625,29.425Q15.1,28.9 15.1,28.1V25.8H7.35Q6.55,25.8 6.025,25.275Q5.5,24.75 5.5,24Q5.5,23.25 6.025,22.7Q6.55,22.15 7.35,22.15H15.1V19.75Q15.1,19 15.65,18.475Q16.2,17.95 16.95,17.95Q17.7,17.95 18.225,18.475Q18.75,19 18.75,19.75V28.1Q18.75,28.9 18.225,29.425Q17.7,29.95 16.95,29.95ZM23.1,25.8Q22.3,25.8 21.775,25.275Q21.25,24.75 21.25,24Q21.25,23.25 21.775,22.7Q22.3,22.15 23.1,22.15H40.65Q41.4,22.15 41.95,22.7Q42.5,23.25 42.5,24Q42.5,24.75 41.95,25.275Q41.4,25.8 40.65,25.8ZM31.05,17.4Q30.3,17.4 29.775,16.875Q29.25,16.35 29.25,15.6V7.3Q29.25,6.55 29.775,6Q30.3,5.45 31.05,5.45Q31.8,5.45 32.35,6Q32.9,6.55 32.9,7.3V9.6H40.65Q41.4,9.6 41.95,10.125Q42.5,10.65 42.5,11.4Q42.5,12.2 41.95,12.725Q41.4,13.25 40.65,13.25H32.9V15.6Q32.9,16.35 32.35,16.875Q31.8,17.4 31.05,17.4Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/search_icon.xml b/app/src/main/res/drawable/search_icon.xml
index 18e5e6f8..f6cd5ca5 100644
--- a/app/src/main/res/drawable/search_icon.xml
+++ b/app/src/main/res/drawable/search_icon.xml
@@ -1,20 +1,10 @@
-<vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:name="vector"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="850"
-        android:viewportHeight="850">
-    <path
-            android:name="path"
-            android:pathData="M 425.2 172.91 C 363.2 172.91 303.676 197.566 259.836 241.406 C 215.996 285.246 191.34 344.77 191.34 406.77 C 191.34 468.77 215.996 528.294 259.836 572.134 C 303.676 615.974 363.2 640.63 425.2 640.63 C 487.2 640.63 546.724 615.974 590.564 572.134 C 634.404 528.294 659.06 468.77 659.06 406.77 C 659.06 344.77 634.404 285.246 590.564 241.406 C 546.724 197.566 487.2 172.91 425.2 172.91 Z"
-            android:strokeColor="?attr/white"
-            android:strokeWidth="60"
-            android:strokeMiterLimit="10"/>
-    <path
-            android:name="path_1"
-            android:pathData="M 599.86 562.28 L 719.87 682.29"
-            android:strokeColor="?attr/white"
-            android:strokeWidth="60"
-            android:strokeMiterLimit="10"/>
-</vector>
+<vector android:name="vector"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="850"
+    android:viewportHeight="850"
+    android:tint="?attr/white"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:name="path" android:pathData="M 425.2 172.91 C 363.2 172.91 303.676 197.566 259.836 241.406 C 215.996 285.246 191.34 344.77 191.34 406.77 C 191.34 468.77 215.996 528.294 259.836 572.134 C 303.676 615.974 363.2 640.63 425.2 640.63 C 487.2 640.63 546.724 615.974 590.564 572.134 C 634.404 528.294 659.06 468.77 659.06 406.77 C 659.06 344.77 634.404 285.246 590.564 241.406 C 546.724 197.566 487.2 172.91 425.2 172.91 Z" android:strokeColor="#ffffff" android:strokeWidth="60" android:strokeMiterLimit="10"/>
+    <path android:name="path_1" android:pathData="M 583.631 547.663 L 583.624 547.67 C 587.388 543.906 592.078 541.198 597.22 539.82 C 602.363 538.442 607.778 538.442 612.92 539.82 C 618.063 541.198 622.752 543.906 626.517 547.67 L 719.049 640.202 C 722.813 643.966 725.521 648.656 726.899 653.798 C 728.277 658.941 728.277 664.356 726.899 669.498 C 725.521 674.641 722.813 679.331 719.049 683.095 L 719.056 683.088 C 713.37 688.774 705.65 691.971 697.609 691.971 C 689.568 691.971 681.849 688.774 676.163 683.088 L 583.631 590.556 C 577.945 584.87 574.747 577.15 574.747 569.109 C 574.747 561.068 577.945 553.349 583.631 547.663" android:fillColor="#ffffff" android:strokeWidth="1"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/settings_alt.xml b/app/src/main/res/drawable/settings_alt.xml
new file mode 100644
index 00000000..74983a2e
--- /dev/null
+++ b/app/src/main/res/drawable/settings_alt.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?attr/white"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M27.6,44.8H20.4Q19.7,44.8 19.175,44.4Q18.65,44 18.6,43.3L17.8,38.3Q17,38 16.025,37.475Q15.05,36.95 14.35,36.35L9.75,38.45Q9.15,38.8 8.45,38.55Q7.75,38.3 7.4,37.65L3.8,31.15Q3.4,30.55 3.6,29.9Q3.8,29.25 4.35,28.85L8.5,25.75Q8.45,25.4 8.425,24.85Q8.4,24.3 8.4,23.9Q8.4,23.55 8.425,23.025Q8.45,22.5 8.5,22.1L4.35,19.1Q3.75,18.7 3.6,18.025Q3.45,17.35 3.8,16.75L7.4,10.3Q7.8,9.7 8.45,9.45Q9.1,9.2 9.75,9.5L14.25,11.6Q14.95,11.05 15.95,10.475Q16.95,9.9 17.8,9.6L18.6,4.65Q18.65,3.95 19.175,3.55Q19.7,3.15 20.4,3.15H27.6Q28.3,3.15 28.825,3.55Q29.35,3.95 29.45,4.65L30.2,9.6Q31.05,9.9 32.075,10.475Q33.1,11.05 33.75,11.6L38.25,9.5Q38.85,9.2 39.55,9.45Q40.25,9.7 40.6,10.3L44.2,16.7Q44.55,17.3 44.4,18Q44.25,18.7 43.7,19.1L39.45,22.05Q39.5,22.5 39.55,23.05Q39.6,23.6 39.6,24Q39.6,24.4 39.55,24.925Q39.5,25.45 39.5,25.85L43.65,28.85Q44.2,29.25 44.375,29.925Q44.55,30.6 44.2,31.2L40.6,37.7Q40.2,38.35 39.525,38.575Q38.85,38.8 38.25,38.45L33.65,36.35Q32.95,36.9 32,37.475Q31.05,38.05 30.25,38.3L29.45,43.3Q29.35,44 28.825,44.4Q28.3,44.8 27.6,44.8ZM23.95,31.15Q26.95,31.15 29.05,29.05Q31.15,26.95 31.15,23.95Q31.15,20.95 29.05,18.85Q26.95,16.75 23.95,16.75Q20.95,16.75 18.85,18.85Q16.75,20.95 16.75,23.95Q16.75,26.95 18.85,29.05Q20.95,31.15 23.95,31.15ZM23.9,27.5Q22.45,27.5 21.425,26.45Q20.4,25.4 20.4,23.95Q20.4,22.45 21.425,21.425Q22.45,20.4 23.95,20.4Q25.4,20.4 26.45,21.45Q27.5,22.5 27.5,23.95Q27.5,25.45 26.45,26.475Q25.4,27.5 23.9,27.5ZM24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95Q24,23.95 24,23.95ZM21.8,41.15H26.2L26.9,35.5Q28.6,35.1 30.1,34.25Q31.6,33.4 32.85,32.15L38.1,34.45L40.1,30.85L35.45,27.4Q35.65,26.55 35.8,25.7Q35.95,24.85 35.95,23.95Q35.95,23.05 35.825,22.225Q35.7,21.4 35.5,20.5L40.1,17.1L38.15,13.5L32.85,15.75Q31.7,14.45 30.2,13.525Q28.7,12.6 26.9,12.35L26.25,6.8H21.75L21.1,12.35Q19.3,12.75 17.775,13.625Q16.25,14.5 15.1,15.75L9.9,13.5L7.85,17.1L12.5,20.55Q12.3,21.45 12.175,22.275Q12.05,23.1 12.05,23.9Q12.05,24.75 12.175,25.6Q12.3,26.45 12.5,27.4L7.85,30.85L9.9,34.45L15.15,32.15Q16.45,33.45 17.95,34.3Q19.45,35.15 21.1,35.55Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/storage_bar_left.xml b/app/src/main/res/drawable/storage_bar_left.xml
new file mode 100644
index 00000000..493db394
--- /dev/null
+++ b/app/src/main/res/drawable/storage_bar_left.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/white" />
+    <corners
+        android:bottomLeftRadius="@dimen/storage_radius"
+        android:topLeftRadius="@dimen/storage_radius" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/storage_bar_left_box.xml b/app/src/main/res/drawable/storage_bar_left_box.xml
new file mode 100644
index 00000000..4c624a3a
--- /dev/null
+++ b/app/src/main/res/drawable/storage_bar_left_box.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/white" />
+    <corners android:radius="@dimen/storage_radius" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/storage_bar_mid.xml b/app/src/main/res/drawable/storage_bar_mid.xml
new file mode 100644
index 00000000..111a7345
--- /dev/null
+++ b/app/src/main/res/drawable/storage_bar_mid.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/colorPrimary" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/storage_bar_mid_box.xml b/app/src/main/res/drawable/storage_bar_mid_box.xml
new file mode 100644
index 00000000..090cd54c
--- /dev/null
+++ b/app/src/main/res/drawable/storage_bar_mid_box.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/colorPrimary" />
+    <corners android:radius="@dimen/storage_radius" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/storage_bar_right.xml b/app/src/main/res/drawable/storage_bar_right.xml
new file mode 100644
index 00000000..42f60344
--- /dev/null
+++ b/app/src/main/res/drawable/storage_bar_right.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/grayTextColor" />
+    <corners
+        android:bottomRightRadius="@dimen/storage_radius"
+        android:topRightRadius="@dimen/storage_radius" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/storage_bar_right_box.xml b/app/src/main/res/drawable/storage_bar_right_box.xml
new file mode 100644
index 00000000..29ecd908
--- /dev/null
+++ b/app/src/main/res/drawable/storage_bar_right_box.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/grayTextColor" />
+    <corners android:radius="@dimen/storage_radius" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_downloads.xml b/app/src/main/res/layout/fragment_downloads.xml
index 5e12eb4c..9ee5d716 100644
--- a/app/src/main/res/layout/fragment_downloads.xml
+++ b/app/src/main/res/layout/fragment_downloads.xml
@@ -1,149 +1,149 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/download_root"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/primaryGrayBackground"
-        tools:context=".ui.download.DownloadFragment">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/download_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/primaryGrayBackground"
+    android:orientation="vertical"
+    tools:context=".ui.download.DownloadFragment">
 
     <com.google.android.material.appbar.AppBarLayout
-            android:background="?attr/primaryGrayBackground"
-            tools:layout_height="100dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/primaryGrayBackground"
+        tools:layout_height="100dp">
         <!--
         For Scroll add to LinearLayout
         app:layout_scrollFlags="scroll|enterAlways"
         -->
         <LinearLayout
-                android:id="@+id/download_storage_appbar"
-                tools:visibility="visible"
-                android:visibility="gone"
-                android:layout_margin="10dp"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            android:id="@+id/download_storage_appbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:orientation="vertical"
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <TextView
-                    android:textColor="?attr/textColor"
-                    android:layout_marginBottom="5dp"
-                    android:text="@string/download_storage_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:text="@string/download_storage_text"
+                android:textColor="?attr/textColor" />
 
             <LinearLayout
-                    android:layout_marginBottom="5dp"
-                    android:layout_width="fill_parent"
-                    android:layout_height="12dp"
-                    android:orientation="horizontal">
+                android:layout_width="fill_parent"
+                android:layout_height="12dp"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
 
                 <View
-                        android:layout_weight="0.5"
-                        android:id="@+id/download_used"
-                        android:background="?attr/white"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent" />
+                    android:id="@+id/download_used"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.5"
+                    android:background="@drawable/storage_bar_left" />
 
                 <View
-                        android:id="@+id/download_app"
-                        android:layout_weight="0.10"
-                        android:background="?attr/colorPrimary"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent" />
+                    android:id="@+id/download_app"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.10"
+                    android:background="@drawable/storage_bar_mid" />
 
                 <View
-                        android:id="@+id/download_free"
-                        android:layout_weight="0.10"
-                        android:background="?attr/grayTextColor"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent" />
+                    android:id="@+id/download_free"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.10"
+                    android:background="@drawable/storage_bar_right" />
             </LinearLayout>
 
             <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
                 <View
-                        android:layout_marginEnd="5dp"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginBottom="5dp"
-                        android:layout_gravity="center_vertical"
-                        android:background="?attr/white"
-                        android:layout_width="10dp"
-                        android:layout_height="10dp" />
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:background="@drawable/storage_bar_left_box" />
 
                 <TextView
-                        android:id="@+id/download_used_txt"
-                        android:layout_gravity="center_vertical"
-                        tools:text="Used • 30.58GB"
-                        android:textSize="12sp"
-                        android:textColor="?attr/textColor"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                    android:id="@+id/download_used_txt"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="?attr/textColor"
+                    android:textSize="12sp"
+                    tools:text="Used • 30.58GB" />
 
                 <View
-                        android:layout_margin="5dp"
-                        android:layout_gravity="center_vertical"
-                        android:background="?attr/colorPrimary"
-                        android:layout_width="10dp"
-                        android:layout_height="10dp" />
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_margin="5dp"
+                    android:background="@drawable/storage_bar_mid_box" />
 
                 <TextView
-                        android:id="@+id/download_app_txt"
-                        android:layout_gravity="center_vertical"
-                        tools:text="App • 30.58GB"
-                        android:textSize="12sp"
-                        android:textColor="?attr/textColor"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                    android:id="@+id/download_app_txt"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="?attr/textColor"
+                    android:textSize="12sp"
+                    tools:text="App • 30.58GB" />
 
                 <View
-                        android:layout_margin="5dp"
-                        android:layout_gravity="center_vertical"
-                        android:background="?attr/grayTextColor"
-                        android:layout_width="10dp"
-                        android:layout_height="10dp" />
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_margin="5dp"
+                    android:background="@drawable/storage_bar_right_box" />
 
                 <TextView
-                        android:id="@+id/download_free_txt"
-                        android:textSize="12sp"
-                        android:layout_gravity="center_vertical"
-                        tools:text="Free • 30.58GB"
-                        android:textColor="?attr/textColor"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                    android:id="@+id/download_free_txt"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="?attr/textColor"
+                    android:textSize="12sp"
+                    tools:text="Free • 30.58GB" />
             </LinearLayout>
         </LinearLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
-            android:nextFocusLeft="@id/nav_rail_view"
-            android:descendantFocusability="afterDescendants"
+        android:id="@+id/download_list"
+        android:layout_width="match_parent"
 
-            android:background="?attr/primaryBlackBackground"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            android:id="@+id/download_list"
-            android:layout_width="match_parent"
-            tools:listitem="@layout/download_header_episode"
-            android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:background="?attr/primaryBlackBackground"
+        android:descendantFocusability="afterDescendants"
+        android:nextFocusLeft="@id/nav_rail_view"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:listitem="@layout/download_header_episode" />
 
     <TextView
-            android:id="@+id/text_no_downloads"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:textAlignment="center"
-            android:textSize="20sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
+        android:id="@+id/text_no_downloads"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:textAlignment="center"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <!--
     <ProgressBar
@@ -155,24 +155,24 @@
     </ProgressBar>-->
 
     <com.facebook.shimmer.ShimmerFrameLayout
-            tools:visibility="gone"
-            android:id="@+id/download_loading"
-            app:shimmer_base_alpha="0.2"
-            app:shimmer_highlight_alpha="0.3"
-            app:shimmer_duration="@integer/loading_time"
-            app:shimmer_auto_start="true"
-            android:paddingTop="40dp"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:orientation="vertical">
+        android:id="@+id/download_loading"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:paddingTop="40dp"
+        app:shimmer_auto_start="true"
+        app:shimmer_base_alpha="0.2"
+        app:shimmer_duration="@integer/loading_time"
+        app:shimmer_highlight_alpha="0.3"
+        tools:visibility="gone">
 
         <LinearLayout
-                android:layout_marginStart="@dimen/loading_margin"
-                android:layout_marginEnd="@dimen/loading_margin"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/loading_margin"
+            android:layout_marginEnd="@dimen/loading_margin"
+            android:orientation="vertical">
 
             <include layout="@layout/loading_downloads" />
 
@@ -189,10 +189,10 @@
     </com.facebook.shimmer.ShimmerFrameLayout>
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-            android:text="@string/stream"
-            android:id="@+id/download_stream_button"
-            app:icon="@drawable/netflix_play"
-            style="@style/ExtendedFloatingActionButton"
-            android:textColor="?attr/textColor"
-            tools:ignore="ContentDescription" />
+        android:id="@+id/download_stream_button"
+        style="@style/ExtendedFloatingActionButton"
+        android:text="@string/stream"
+        android:textColor="?attr/textColor"
+        app:icon="@drawable/netflix_play"
+        tools:ignore="ContentDescription" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_extensions.xml b/app/src/main/res/layout/fragment_extensions.xml
index c786e2bc..3d0404fc 100644
--- a/app/src/main/res/layout/fragment_extensions.xml
+++ b/app/src/main/res/layout/fragment_extensions.xml
@@ -11,12 +11,12 @@
     <include layout="@layout/standard_toolbar" />
 
     <androidx.recyclerview.widget.RecyclerView
-        android:nextFocusUp="@id/settings_toolbar"
-        android:nextFocusDown="@id/plugin_storage_appbar"
         android:id="@+id/repo_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="80dp"
+        android:nextFocusUp="@id/settings_toolbar"
+        android:nextFocusDown="@id/plugin_storage_appbar"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         app:layout_constraintBottom_toTopOf="@id/download_storage_appbar"
@@ -47,32 +47,32 @@
             android:text="@string/blank_repo_message"
             android:textSize="16sp" />
 
-<!--        <com.google.android.material.button.MaterialButton-->
-<!--            android:id="@+id/list_repositories"-->
-<!--            style="@style/WhiteButton"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:nextFocusDown="@id/add_repo_button"-->
-<!--            android:text="@string/view_public_repositories_button" />-->
+        <!--        <com.google.android.material.button.MaterialButton-->
+        <!--            android:id="@+id/list_repositories"-->
+        <!--            style="@style/WhiteButton"-->
+        <!--            android:layout_width="wrap_content"-->
+        <!--            android:nextFocusDown="@id/add_repo_button"-->
+        <!--            android:text="@string/view_public_repositories_button" />-->
     </LinearLayout>
 
     <LinearLayout
-        android:focusable="true"
         android:id="@+id/plugin_storage_appbar"
-        android:nextFocusRight="@id/add_repo_button_imageview"
         android:layout_width="match_parent"
         android:layout_height="80dp"
         android:layout_gravity="bottom"
         android:background="?attr/primaryGrayBackground"
+        android:focusable="true"
         android:foreground="@drawable/outline_drawable"
+        android:nextFocusRight="@id/add_repo_button_imageview"
+        android:orientation="horizontal"
         android:padding="10dp"
-        android:visibility="visible"
 
-        android:orientation="horizontal">
+        android:visibility="visible">
 
         <LinearLayout
-            android:layout_weight="1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
 
             android:orientation="vertical">
 
@@ -83,33 +83,39 @@
                 android:text="@string/extensions"
                 android:textColor="?attr/textColor" />
 
-            <LinearLayout
+            <androidx.cardview.widget.CardView
                 android:layout_width="fill_parent"
                 android:layout_height="12dp"
                 android:layout_marginBottom="5dp"
-                android:orientation="horizontal">
+                app:cardCornerRadius="@dimen/storage_radius">
 
-                <View
-                    android:id="@+id/plugin_download"
-                    android:layout_width="0dp"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="?attr/white"
-                    tools:layout_weight="0.5" />
+                    android:orientation="horizontal">
 
-                <View
-                    android:id="@+id/plugin_disabled"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:background="?attr/colorPrimary"
-                    tools:layout_weight="0.10" />
+                    <View
+                        android:id="@+id/plugin_download"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:background="@drawable/storage_bar_left"
+                        tools:layout_weight="0.5" />
 
-                <View
-                    android:id="@+id/plugin_not_downloaded"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:background="?attr/grayTextColor"
-                    tools:layout_weight="0.10" />
-            </LinearLayout>
+                    <View
+                        android:id="@+id/plugin_disabled"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:background="@drawable/storage_bar_mid"
+                        tools:layout_weight="0.10" />
+
+                    <View
+                        android:id="@+id/plugin_not_downloaded"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:background="@drawable/storage_bar_right"
+                        tools:layout_weight="0.10" />
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -123,7 +129,7 @@
                     android:layout_marginTop="5dp"
                     android:layout_marginEnd="5dp"
                     android:layout_marginBottom="5dp"
-                    android:background="?attr/white" />
+                    android:background="@drawable/storage_bar_left_box" />
 
                 <TextView
                     android:id="@+id/plugin_download_txt"
@@ -139,7 +145,7 @@
                     android:layout_height="10dp"
                     android:layout_gravity="center_vertical"
                     android:layout_margin="5dp"
-                    android:background="?attr/colorPrimary" />
+                    android:background="@drawable/storage_bar_mid_box" />
 
                 <TextView
                     android:id="@+id/plugin_disabled_txt"
@@ -155,7 +161,7 @@
                     android:layout_height="10dp"
                     android:layout_gravity="center_vertical"
                     android:layout_margin="5dp"
-                    android:background="?attr/grayTextColor" />
+                    android:background="@drawable/storage_bar_right_box" />
 
                 <TextView
                     android:id="@+id/plugin_not_downloaded_txt"
@@ -167,34 +173,35 @@
                     tools:text="Not downloaded 3" />
             </LinearLayout>
         </LinearLayout>
+
         <LinearLayout
             android:id="@+id/add_repo_button_imageview_holder"
-            android:paddingStart="10dp"
-            android:paddingEnd="10dp"
-            android:orientation="vertical"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp">
 
             <TextView
-                android:textColor="?attr/textColor"
-                android:layout_gravity="center"
-
-                android:text="@string/add_repository"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-            <ImageView
-                android:background="@drawable/outline_drawable"
-                android:nextFocusLeft="@id/plugin_storage_appbar"
-                android:layout_gravity="center"
-                android:focusable="true"
+                android:layout_height="wrap_content"
 
+                android:layout_gravity="center"
+                android:text="@string/add_repository"
+                android:textColor="?attr/textColor" />
+
+            <ImageView
                 android:id="@+id/add_repo_button_imageview"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:src="@drawable/ic_baseline_add_24"
+                android:layout_gravity="center"
+
+                android:background="@drawable/outline_drawable"
                 android:contentDescription="@string/add_repository"
-                app:tint="?attr/textColor">
-            </ImageView>
+                android:focusable="true"
+                android:nextFocusLeft="@id/plugin_storage_appbar"
+                android:src="@drawable/ic_baseline_add_24"
+                app:tint="?attr/textColor" />
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 9d430e3d..d127f811 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -294,7 +294,15 @@
                     android:layout_height="match_parent"
                     android:scaleType="centerCrop"
                     tools:src="@drawable/example_poster" />
-
+                <View
+                    android:visibility="visible"
+                    android:id="@+id/title_shadow_top"
+                    android:layout_width="match_parent"
+                    android:layout_height="150dp"
+                    android:alpha="1"
+                    android:rotation="180"
+                    android:layout_gravity="top"
+                    android:background="@drawable/background_shadow" />
                 <View
                     android:id="@+id/title_shadow"
                     android:layout_width="match_parent"
@@ -302,29 +310,47 @@
                     android:layout_gravity="bottom"
                     android:background="@drawable/background_shadow" />
 
-                <FrameLayout
-
+                <LinearLayout
+                    android:id="@+id/home_padding"
+                    android:orientation="vertical"
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:layout_gravity="top"
-                    android:visibility="gone">
+                    android:layout_height="wrap_content">
 
                     <androidx.appcompat.widget.SearchView
                         android:id="@+id/home_search"
                         android:layout_width="match_parent"
-
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center_vertical"
-                        android:iconifiedByDefault="false"
-                        android:paddingStart="-10dp"
-                        app:iconifiedByDefault="false"
-
+                        android:gravity="start"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="start"
+                        android:iconifiedByDefault="true"
+                        app:iconifiedByDefault="true"
                         app:queryBackground="@color/transparent"
-                        app:queryHint="@string/search_hint"
+                        app:queryHint="@string/search"
+                        android:textColor="@color/white"
+                        android:textColorHint="@color/white"
+                        android:editTextColor="@color/white"
 
                         app:searchIcon="@drawable/search_icon"
                         tools:ignore="RtlSymmetry" />
-                </FrameLayout>
+                </LinearLayout>
+
+<!--
+                <TextView
+                    android:visibility="gone"
+                    android:id="@+id/test_search"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:layout_gravity="start"
+                    android:gravity="center"
+
+                    android:textSize="20dp"
+                    android:layout_margin="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/search"
+                    android:textColor="@color/white"
+                    app:drawableLeftCompat="@drawable/search_icon"
+                    app:tint="@color/white" />
+-->
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -486,50 +512,60 @@
                         android:fadingEdge="horizontal"
                         android:requiresFadingEdge="horizontal">
 
-                        <LinearLayout
+                        <com.google.android.material.chip.ChipGroup
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:orientation="horizontal">
 
-                            <com.google.android.material.button.MaterialButton
+                            <com.google.android.material.chip.Chip
                                 android:id="@+id/home_type_watching_btt"
-                                style="@style/RoundedSelectableButton"
+                                style="@style/ChipFilled"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
 
                                 android:nextFocusLeft="@id/nav_rail_view"
                                 android:nextFocusRight="@id/home_plan_to_watch_btt"
                                 android:text="@string/type_watching" />
 
-                            <com.google.android.material.button.MaterialButton
+                            <com.google.android.material.chip.Chip
                                 android:id="@+id/home_plan_to_watch_btt"
-                                style="@style/RoundedSelectableButton"
+                                style="@style/ChipFilled"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
 
                                 android:nextFocusLeft="@id/home_type_watching_btt"
                                 android:nextFocusRight="@id/home_type_on_hold_btt"
                                 android:text="@string/type_plan_to_watch" />
 
-                            <com.google.android.material.button.MaterialButton
+                            <com.google.android.material.chip.Chip
                                 android:id="@+id/home_type_on_hold_btt"
-                                style="@style/RoundedSelectableButton"
+                                style="@style/ChipFilled"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
 
                                 android:nextFocusLeft="@id/home_plan_to_watch_btt"
                                 android:nextFocusRight="@id/home_type_dropped_btt"
                                 android:text="@string/type_on_hold" />
 
-                            <com.google.android.material.button.MaterialButton
+                            <com.google.android.material.chip.Chip
                                 android:id="@+id/home_type_dropped_btt"
-                                style="@style/RoundedSelectableButton"
+                                style="@style/ChipFilled"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
 
                                 android:nextFocusLeft="@id/home_type_on_hold_btt"
                                 android:nextFocusRight="@id/home_type_completed_btt"
                                 android:text="@string/type_dropped" />
 
-                            <com.google.android.material.button.MaterialButton
+                            <com.google.android.material.chip.Chip
                                 android:id="@+id/home_type_completed_btt"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
 
-                                style="@style/RoundedSelectableButton"
+                                style="@style/ChipFilled"
                                 android:nextFocusLeft="@id/home_type_dropped_btt"
                                 android:text="@string/type_completed" />
-                        </LinearLayout>
+                        </com.google.android.material.chip.ChipGroup>
                     </HorizontalScrollView>
 
                     <ImageView
diff --git a/app/src/main/res/layout/fragment_home_tv.xml b/app/src/main/res/layout/fragment_home_tv.xml
index 0636f3dc..5b092927 100644
--- a/app/src/main/res/layout/fragment_home_tv.xml
+++ b/app/src/main/res/layout/fragment_home_tv.xml
@@ -359,52 +359,60 @@
                         android:fadingEdge="horizontal"
                         android:requiresFadingEdge="horizontal">
 
-                        <LinearLayout
-                                android:layout_gravity="center_vertical"
-                                android:orientation="horizontal"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content">
+                    <com.google.android.material.chip.ChipGroup
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
 
-                            <com.google.android.material.button.MaterialButton
-                                    android:nextFocusLeft="@id/nav_rail_view"
-                                    android:nextFocusRight="@id/home_plan_to_watch_btt"
+                        <com.google.android.material.chip.Chip
+                            android:id="@+id/home_type_watching_btt"
+                            style="@style/ChipFilled"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
 
-                                    android:id="@+id/home_type_watching_btt"
-                                    android:text="@string/type_watching"
-                                    style="@style/RoundedSelectableButton" />
+                            android:nextFocusLeft="@id/nav_rail_view"
+                            android:nextFocusRight="@id/home_plan_to_watch_btt"
+                            android:text="@string/type_watching" />
 
-                            <com.google.android.material.button.MaterialButton
-                                    android:nextFocusLeft="@id/home_type_watching_btt"
-                                    android:nextFocusRight="@id/home_type_on_hold_btt"
+                        <com.google.android.material.chip.Chip
+                            android:id="@+id/home_plan_to_watch_btt"
+                            style="@style/ChipFilled"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
 
-                                    android:id="@+id/home_plan_to_watch_btt"
-                                    android:text="@string/type_plan_to_watch"
-                                    style="@style/RoundedSelectableButton" />
+                            android:nextFocusLeft="@id/home_type_watching_btt"
+                            android:nextFocusRight="@id/home_type_on_hold_btt"
+                            android:text="@string/type_plan_to_watch" />
 
-                            <com.google.android.material.button.MaterialButton
-                                    android:nextFocusLeft="@id/home_plan_to_watch_btt"
-                                    android:nextFocusRight="@id/home_type_dropped_btt"
+                        <com.google.android.material.chip.Chip
+                            android:id="@+id/home_type_on_hold_btt"
+                            style="@style/ChipFilled"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
 
-                                    android:id="@+id/home_type_on_hold_btt"
-                                    android:text="@string/type_on_hold"
-                                    style="@style/RoundedSelectableButton" />
+                            android:nextFocusLeft="@id/home_plan_to_watch_btt"
+                            android:nextFocusRight="@id/home_type_dropped_btt"
+                            android:text="@string/type_on_hold" />
 
-                            <com.google.android.material.button.MaterialButton
-                                    android:nextFocusLeft="@id/home_type_on_hold_btt"
-                                    android:nextFocusRight="@id/home_type_completed_btt"
+                        <com.google.android.material.chip.Chip
+                            android:id="@+id/home_type_dropped_btt"
+                            style="@style/ChipFilled"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
 
-                                    android:id="@+id/home_type_dropped_btt"
-                                    android:text="@string/type_dropped"
-                                    style="@style/RoundedSelectableButton" />
+                            android:nextFocusLeft="@id/home_type_on_hold_btt"
+                            android:nextFocusRight="@id/home_type_completed_btt"
+                            android:text="@string/type_dropped" />
 
-                            <com.google.android.material.button.MaterialButton
-                                    android:nextFocusLeft="@id/home_type_dropped_btt"
+                        <com.google.android.material.chip.Chip
+                            android:id="@+id/home_type_completed_btt"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
 
-                                    android:id="@+id/home_type_completed_btt"
-                                    android:text="@string/type_completed"
-                                    style="@style/RoundedSelectableButton" />
-                        </LinearLayout>
-                </HorizontalScrollView>
+                            style="@style/ChipFilled"
+                            android:nextFocusLeft="@id/home_type_dropped_btt"
+                            android:text="@string/type_completed" />
+                    </com.google.android.material.chip.ChipGroup>                </HorizontalScrollView>
 
                 <androidx.recyclerview.widget.RecyclerView
                         android:paddingHorizontal="5dp"
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index d26c1b5a..ceab8f94 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -487,11 +487,14 @@
                             android:textStyle="normal"
                             android:visibility="gone" />
 
-
-                    <com.lagradost.cloudstream3.widget.FlowLayout
+                    <com.google.android.material.chip.ChipGroup
+                        android:id="@+id/result_tag"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                    <!--<com.lagradost.cloudstream3.widget.FlowLayout
                             android:id="@+id/result_tag"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
+                            android:layout_height="wrap_content" />-->
 
                     <TextView
                             android:id="@+id/result_coming_soon"
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
index e3fd3d22..3a5e0929 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -3,7 +3,7 @@
 
     <item
             android:id="@+id/navigation_home"
-            android:icon="@drawable/ic_outline_home_24"
+            android:icon="@drawable/home_alt"
             android:title="@string/title_home"/>
     <item
             android:id="@+id/navigation_search"
@@ -15,6 +15,6 @@
             android:title="@string/title_downloads"/>
     <item
             android:id="@+id/navigation_settings"
-            android:icon="@drawable/ic_outline_settings_24"
+            android:icon="@drawable/settings_alt"
             android:title="@string/title_settings"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index fb9180f3..e748868b 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -14,4 +14,7 @@
     <dimen name="loading_margin">15dp</dimen>
 
     <integer name="loading_time">2000</integer>
+
+    <dimen name="storage_radius">3dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9e235bf3..d6e7b65f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -76,7 +76,8 @@
     </style>
 
     <style name="ChipFilled" parent="@style/Widget.Material3.Chip.Filter">
-         <item name="chipBackgroundColor">@color/chip_color</item>
+        <item name="chipBackgroundColor">@color/chip_color</item>
+        <item name="chipStrokeColor">@color/transparent</item>
     </style>
 
     <style name="AmoledMode">

From 9ee0653ecfed5fa1c9652d4f0fb755cfe3bc3120 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 28 Oct 2022 21:14:57 +0200
Subject: [PATCH 036/273] Fixed critical TV crash and made the bookmarks single
 select

---
 .../cloudstream3/ui/home/HomeFragment.kt         | 16 +++++++++++++---
 app/src/main/res/layout/fragment_home.xml        |  1 +
 app/src/main/res/layout/fragment_result_tv.xml   |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 7026eb12..813cf870 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -770,9 +770,19 @@ class HomeFragment : Fragment() {
 
         for ((chip, watch) in toggleList) {
             chip.isChecked = currentSet.contains(watch)
-            chip?.setOnCheckedChangeListener { _, _ ->
-                homeViewModel.loadStoredData(toggleList.filter { it.first?.isChecked == true }
-                    .map { it.second }.toSet())
+            chip?.setOnCheckedChangeListener { _, isChecked ->
+                if (isChecked) {
+                    homeViewModel.loadStoredData(
+                        setOf(watch)
+                        // If we filter all buttons then two can be checked at the same time
+                        // Revert this if you want to go back to multi selection
+//                    toggleList.filter { it.first?.isChecked == true }.map { it.second }.toSet()
+                    )
+                }
+                // Else if all are unchecked -> Do not load data
+                else if (toggleList.all { it.first?.isChecked != true }) {
+                    homeViewModel.loadStoredData(emptySet())
+                }
             }
             /*chip?.setOnClickListener {
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index d127f811..222852f7 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -514,6 +514,7 @@
 
                         <com.google.android.material.chip.ChipGroup
                             android:layout_width="wrap_content"
+                            app:singleSelection="true"
                             android:layout_height="wrap_content"
                             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/fragment_result_tv.xml b/app/src/main/res/layout/fragment_result_tv.xml
index a428b80f..15e25b51 100644
--- a/app/src/main/res/layout/fragment_result_tv.xml
+++ b/app/src/main/res/layout/fragment_result_tv.xml
@@ -354,7 +354,7 @@
                         android:visibility="gone" />
 
 
-                    <com.lagradost.cloudstream3.widget.FlowLayout
+                  <com.google.android.material.chip.ChipGroup
                         android:id="@+id/result_tag"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />

From 617fc4a2957cadbb766f4d161111f06f7e81d703 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 28 Oct 2022 21:43:56 +0200
Subject: [PATCH 037/273] Fix status bar padding on None

---
 .../java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt | 3 +++
 app/src/main/res/layout/fragment_home.xml                   | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 813cf870..43732dd6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -545,6 +545,8 @@ class HomeFragment : Fragment() {
             when (preview) {
                 is Resource.Success -> {
                     home_preview?.isVisible = true
+                    home_watch_holder?.setPadding(0,0,0,0)
+
                     preview.value.apply {
                         home_preview_tags?.text = tags?.joinToString(" • ") ?: ""
                         home_preview_tags?.isGone = tags.isNullOrEmpty()
@@ -592,6 +594,7 @@ class HomeFragment : Fragment() {
                 }
                 else -> {
                     home_preview?.isVisible = false
+                    context?.fixPaddingStatusbar(home_watch_holder)
                 }
             }
         }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 222852f7..17bce297 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -434,7 +434,11 @@
                 </LinearLayout>
             </FrameLayout>
 
-
+            <!--
+            All padding in home_watch_holder is determined in runtime
+            This is because the home poster can be invisible which forces
+            us to take the status bar space into account
+            -->
             <LinearLayout
                 android:id="@+id/home_watch_holder"
                 android:layout_width="match_parent"

From fd7cf51f570b757069d06dd6a2f333dba0d9982d Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 28 Oct 2022 21:49:14 +0200
Subject: [PATCH 038/273] Fix status bar padding again

---
 .../java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 43732dd6..78ca4bfe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -542,10 +542,11 @@ class HomeFragment : Fragment() {
         }
 
         observe(homeViewModel.preview) { preview ->
+            // Always reset the padding, otherwise the will move lower and lower
+            home_watch_holder?.setPadding(0, 0, 0, 0)
             when (preview) {
                 is Resource.Success -> {
                     home_preview?.isVisible = true
-                    home_watch_holder?.setPadding(0,0,0,0)
 
                     preview.value.apply {
                         home_preview_tags?.text = tags?.joinToString(" • ") ?: ""

From 65b5efb848bb2110651194325d558fccdfb232bd Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 28 Oct 2022 22:29:32 +0200
Subject: [PATCH 039/273] Make searching always respect your preferred media
 setting

---
 .../cloudstream3/ui/search/SearchFragment.kt  | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 8f588bf7..a4b2be8f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -117,18 +117,36 @@ class SearchFragment : Fragment() {
     var selectedSearchTypes = mutableListOf<TvType>()
     var selectedApis = mutableSetOf<String>()
 
+    /**
+     * Will filter all providers by preferred media and selectedSearchTypes.
+     * If that results in no available providers then only filter
+     * providers by preferred media
+     **/
     fun search(query: String?) {
         if (query == null) return
-        context?.getApiSettings()?.let { settings ->
+
+        context?.let { ctx ->
+            val default = enumValues<TvType>().sorted().filter { it != TvType.NSFW }
+                .map { it.ordinal.toString() }.toSet()
+            val preferredTypes = PreferenceManager.getDefaultSharedPreferences(ctx)
+                .getStringSet(this.getString(R.string.prefer_media_type_key), default)
+                ?.mapNotNull { it.toIntOrNull() ?: return@mapNotNull null } ?: default
+
+            val settings = ctx.getApiSettings()
+
+            val notFilteredBySelectedTypes = selectedApis.filter { name ->
+                settings.contains(name)
+            }.map { name ->
+                name to getApiFromNameNull(name)?.supportedTypes
+            }.filter { (_, types) ->
+                types?.any { preferredTypes.contains(it.ordinal) } == true
+            }
+
             searchViewModel.searchAndCancel(
                 query = query,
-                providersActive = selectedApis.filter { name ->
-                    settings.contains(name) && getApiFromNameNull(name)?.supportedTypes?.any {
-                        selectedSearchTypes.contains(
-                            it
-                        )
-                    } == true
-                }.toSet()
+                providersActive = notFilteredBySelectedTypes.filter { (_, types) ->
+                    types?.any { selectedSearchTypes.contains(it) } == true
+                }.ifEmpty { notFilteredBySelectedTypes }.map { it.first }.toSet()
             )
         }
     }
@@ -227,7 +245,7 @@ class SearchFragment : Fragment() {
                     }
 
                     fun updateList(types: List<TvType>) {
-                        setKey(SEARCH_PREF_TAGS, types.map {it.name})
+                        setKey(SEARCH_PREF_TAGS, types.map { it.name })
 
                         arrayAdapter.clear()
                         currentValidApis = validAPIs.filter { api ->

From 47b79550f13732040b64f515ee3d0f45d26df9a2 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Sun, 30 Oct 2022 23:15:43 +0100
Subject: [PATCH 040/273] color fixes

---
 .../cloudstream3/ui/home/HomeFragment.kt      |  9 ++--
 .../cloudstream3/ui/result/ResultFragment.kt  |  1 +
 app/src/main/res/color/chip_color_text.xml    |  5 ++
 .../main/res/layout/fragment_downloads.xml    | 49 +++++++++++--------
 .../main/res/layout/fragment_extensions.xml   |  3 ++
 app/src/main/res/layout/fragment_home.xml     | 16 +++---
 app/src/main/res/values/colors.xml            |  3 ++
 app/src/main/res/values/styles.xml            | 38 ++++++++------
 8 files changed, 78 insertions(+), 46 deletions(-)
 create mode 100644 app/src/main/res/color/chip_color_text.xml

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 78ca4bfe..e86a0742 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -6,7 +6,6 @@ import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
 import android.content.res.Configuration
-import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -72,6 +71,7 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectSt
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
@@ -602,9 +602,10 @@ class HomeFragment : Fragment() {
 
         val searchText =
             home_search?.findViewById<SearchView.SearchAutoComplete>(androidx.appcompat.R.id.search_src_text)
-        searchText?.setTextColor(Color.WHITE)
-        searchText?.setHintTextColor(Color.WHITE)
-
+        searchText?.context?.getResourceColor(R.attr.white)?.let { color ->
+            searchText.setTextColor(color)
+            searchText.setHintTextColor(color)
+        }
         observe(homeViewModel.apiName) { apiName ->
             currentApiName = apiName
             // setKey(USER_SELECTED_HOMEPAGE_API, apiName)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 3aae7fd2..db71b714 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -938,6 +938,7 @@ open class ResultFragment : ResultTrailerPlayer() {
                             )
                             chip.setChipDrawable(chipDrawable)
                             chip.text = tag
+                            chip.isChecked = false
                             chip.isCheckable = false
                             chip.isFocusable = false
                             chip.isClickable = false
diff --git a/app/src/main/res/color/chip_color_text.xml b/app/src/main/res/color/chip_color_text.xml
new file mode 100644
index 00000000..03d1e7b0
--- /dev/null
+++ b/app/src/main/res/color/chip_color_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/colorOnPrimary" android:state_checked="true"/>
+    <item android:color="?attr/textColor" android:state_checked="false"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_downloads.xml b/app/src/main/res/layout/fragment_downloads.xml
index 9ee5d716..f88e39d0 100644
--- a/app/src/main/res/layout/fragment_downloads.xml
+++ b/app/src/main/res/layout/fragment_downloads.xml
@@ -34,33 +34,42 @@
                 android:text="@string/download_storage_text"
                 android:textColor="?attr/textColor" />
 
-            <LinearLayout
+            <androidx.cardview.widget.CardView
                 android:layout_width="fill_parent"
                 android:layout_height="12dp"
                 android:layout_marginBottom="5dp"
-                android:orientation="horizontal">
+                android:elevation="0dp"
+                app:cardCornerRadius="@dimen/storage_radius"
+                app:cardElevation="0dp"
+                app:cardMaxElevation="0dp">
 
-                <View
-                    android:id="@+id/download_used"
-                    android:layout_width="0dp"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_weight="0.5"
-                    android:background="@drawable/storage_bar_left" />
+                    android:orientation="horizontal">
 
-                <View
-                    android:id="@+id/download_app"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.10"
-                    android:background="@drawable/storage_bar_mid" />
+                    <View
+                        android:id="@+id/download_used"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0.5"
+                        android:background="@drawable/storage_bar_left" />
 
-                <View
-                    android:id="@+id/download_free"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.10"
-                    android:background="@drawable/storage_bar_right" />
-            </LinearLayout>
+                    <View
+                        android:id="@+id/download_app"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0.10"
+                        android:background="@drawable/storage_bar_mid" />
+
+                    <View
+                        android:id="@+id/download_free"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0.10"
+                        android:background="@drawable/storage_bar_right" />
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_extensions.xml b/app/src/main/res/layout/fragment_extensions.xml
index 3d0404fc..a550efa4 100644
--- a/app/src/main/res/layout/fragment_extensions.xml
+++ b/app/src/main/res/layout/fragment_extensions.xml
@@ -84,6 +84,9 @@
                 android:textColor="?attr/textColor" />
 
             <androidx.cardview.widget.CardView
+                app:cardElevation="0dp"
+                android:elevation="0dp"
+                app:cardMaxElevation="0dp"
                 android:layout_width="fill_parent"
                 android:layout_height="12dp"
                 android:layout_marginBottom="5dp"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 17bce297..bce49c22 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -358,13 +358,15 @@
                     android:layout_gravity="bottom"
                     android:orientation="vertical">
                     <TextView
+                        android:paddingStart="30dp"
+                        android:paddingEnd="30dp"
                         android:textStyle="bold"
                         android:paddingBottom="10dp"
                         android:id="@+id/home_preview_title"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:textColor="@color/white"
+                        android:textColor="?attr/white"
                         android:textSize="17sp"
                         tools:text="The Perfect Run" />
                     <!--<TextView
@@ -384,7 +386,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:textColor="@color/white"
+                        android:textColor="?attr/white"
                         android:textSize="14sp"
                         tools:text="Hello • World • Tags" />
 
@@ -406,9 +408,10 @@
                             android:layout_width="70dp"
                             android:layout_height="wrap_content"
                             android:text="@string/none"
-                            android:textColor="@color/white"
+                            android:textColor="?attr/white"
                             app:drawableTopCompat="@drawable/ic_baseline_add_24"
-                            app:tint="@color/white" />
+                            app:tint="?attr/white"
+                            app:drawableTint="?attr/white" />
                         <com.google.android.material.button.MaterialButton
                             android:layout_gravity="center"
                             style="@style/WhiteButton"
@@ -427,9 +430,10 @@
                             android:layout_width="70dp"
                             android:layout_height="wrap_content"
                             android:text="@string/home_info"
-                            android:textColor="@color/white"
+                            android:textColor="?attr/white"
                             app:drawableTopCompat="@drawable/ic_outline_info_24"
-                            app:tint="@color/white" />
+                            app:tint="?attr/white"
+                            app:drawableTint="?attr/white" />
                     </LinearLayout>
                 </LinearLayout>
             </FrameLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d745c7a1..8b3d0fbf 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,6 +22,9 @@
     <color name="white">#FFF</color>
     <color name="black">#000</color>
 
+    <color name="whiteText">#FFF</color>
+    <color name="blackText">#000</color>
+
     <color name="dubColor">#3d50fa</color> <!--3b65f5 f18c82 8294F1-->
     <color name="amoledModeLight">#121213</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d6e7b65f..70ac7516 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -56,6 +56,7 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="textColor">@color/textColor</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <item name="grayTextColor">@color/grayTextColor</item>
         <item name="primaryGrayBackground">@color/primaryGrayBackground</item>
         <item name="primaryBlackBackground">@color/primaryBlackBackground</item>
@@ -78,6 +79,8 @@
     <style name="ChipFilled" parent="@style/Widget.Material3.Chip.Filter">
         <item name="chipBackgroundColor">@color/chip_color</item>
         <item name="chipStrokeColor">@color/transparent</item>
+        <item name="textColor">@color/chip_color_text</item>
+        <item name="android:textColor">@color/chip_color_text</item>
     </style>
 
     <style name="AmoledMode">
@@ -88,6 +91,7 @@
         <item name="textColor">@color/textColor</item>
         <item name="grayTextColor">@color/grayTextColor</item>
         <item name="white">@color/white</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
     </style>
 
     <style name="LightMode">
@@ -98,6 +102,7 @@
         <item name="textColor">@color/lightTextColor</item>
         <item name="grayTextColor">@color/lightGrayTextColor</item>
         <item name="white">#000</item>
+        <item name="colorOnPrimary">@color/blackText</item>
     </style>
 
     <style name="MonetMode">
@@ -108,6 +113,7 @@
         <item name="textColor">@color/material_dynamic_neutral90</item>
         <item name="grayTextColor">@color/material_dynamic_neutral60</item>
         <item name="white">@color/material_dynamic_neutral90</item>
+        <item name="colorOnPrimary">@color/material_on_primary_emphasis_medium</item>
     </style>
 
     <style name="OverlayPrimaryColorNormal">
@@ -115,7 +121,7 @@
         <item name="android:colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="colorOnPrimary">@color/colorAccent</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <!-- Needed for leanback fuckery -->
         <item name="android:colorAccent">@color/colorAccent</item>
     </style>
@@ -145,7 +151,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryBlue</item>
         <item name="colorPrimaryDark">#4855A2</item>
         <item name="colorAccent">#5A6BCB</item>
-        <item name="colorOnPrimary">#5A6BCB</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <!-- Needed for leanback fuckery -->
         <item name="android:colorAccent">@color/colorPrimaryBlue</item>
     </style>
@@ -155,7 +161,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryPurple</item>
         <item name="colorPrimaryDark">#4704A3</item>
         <item name="colorAccent">#7125DB</item>
-        <item name="colorOnPrimary">#7125DB</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <item name="android:colorAccent">@color/colorPrimaryPurple</item>
     </style>
 
@@ -164,7 +170,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryGreen</item>
         <item name="colorPrimaryDark">#007363</item>
         <item name="colorAccent">#39C1AE</item>
-        <item name="colorOnPrimary">#39C1AE</item>
+        <item name="colorOnPrimary">@color/blackText</item>
         <item name="android:colorAccent">@color/colorPrimaryGreen</item>
     </style>
 
@@ -173,7 +179,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryGreenApple</item>
         <item name="colorPrimaryDark">#319B5A</item>
         <item name="colorAccent">#51C57E</item>
-        <item name="colorOnPrimary">#51C57E</item>
+        <item name="colorOnPrimary">@color/blackText</item>
         <item name="android:colorAccent">@color/colorPrimaryGreenApple</item>
     </style>
 
@@ -182,7 +188,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryRed</item>
         <item name="colorPrimaryDark">#B62B2B</item>
         <item name="colorAccent">@color/colorPrimaryRed</item> <!--#F53B3B-->
-        <item name="colorOnPrimary">@color/colorPrimaryRed</item> <!--#EC3838-->
+        <item name="colorOnPrimary">@color/whiteText</item> <!--#EC3838-->
         <!-- Needed for leanback fuckery -->
         <item name="android:colorAccent">@color/colorPrimaryRed</item>
     </style>
@@ -192,7 +198,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryBanana</item>
         <item name="colorPrimaryDark">#9B7D31</item>
         <item name="colorAccent">#C5B251</item>
-        <item name="colorOnPrimary">#C5A851</item>
+        <item name="colorOnPrimary">@color/blackText</item>
         <item name="android:colorAccent">@color/colorPrimaryBanana</item>
     </style>
 
@@ -201,7 +207,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryParty</item>
         <item name="colorPrimaryDark">#C1495B</item>
         <item name="colorAccent">#FD798C</item>
-        <item name="colorOnPrimary">#BF5968</item>
+        <item name="colorOnPrimary">@color/blackText</item>
         <item name="android:colorAccent">@color/colorPrimaryParty</item>
     </style>
 
@@ -210,7 +216,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryPink</item>
         <item name="colorPrimaryDark">#DD1280</item>
         <item name="colorAccent">#FF4DAE</item>
-        <item name="colorOnPrimary">#DD1280</item>
+        <item name="colorOnPrimary">@color/blackText</item>
         <item name="android:colorAccent">@color/colorPrimaryPink</item>
     </style>
 
@@ -219,7 +225,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryCarnationPink</item>
         <item name="colorPrimaryDark">#83366f</item>
         <item name="colorAccent">#BD5DA5</item>
-        <item name="colorOnPrimary">#BD5DA5</item>
+        <item name="colorOnPrimary">@color/blackText</item>
         <!--   Needed for leanback fuckery   -->
         <item name="android:colorAccent">@color/colorPrimaryCarnationPink</item>
     </style>
@@ -229,7 +235,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryMaroon</item>
         <item name="colorPrimaryDark">#370C0C</item>
         <item name="colorAccent">#451010</item>
-        <item name="colorOnPrimary">#451010</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <!--   Needed for leanback fuckery   -->
         <item name="android:colorAccent">@color/colorPrimaryMaroon</item>
     </style>
@@ -239,7 +245,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryDarkGreen</item>
         <item name="colorPrimaryDark">#003d00</item>
         <item name="colorAccent">#004500</item>
-        <item name="colorOnPrimary">#004500</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <!--   Needed for leanback fuckery   -->
         <item name="android:colorAccent">@color/colorPrimaryDarkGreen</item>
     </style>
@@ -249,7 +255,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryNavyBlue</item>
         <item name="colorPrimaryDark">#000073</item>
         <item name="colorAccent">#000080</item>
-        <item name="colorOnPrimary">#000080</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <!--   Needed for leanback fuckery   -->
         <item name="android:colorAccent">@color/colorPrimaryNavyBlue</item>
     </style>
@@ -259,7 +265,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryGrey</item>
         <item name="colorPrimaryDark">#484848</item>
         <item name="colorAccent">#515151</item>
-        <item name="colorOnPrimary">#515151</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <!--   Needed for leanback fuckery   -->
         <item name="android:colorAccent">@color/colorPrimaryGrey</item>
     </style>
@@ -269,7 +275,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryWhite</item>
         <item name="colorPrimaryDark">#CCCCCC</item>
         <item name="colorAccent">#FFFFFF</item>
-        <item name="colorOnPrimary">#FFFFFF</item>
+        <item name="colorOnPrimary">@color/blackText</item>
         <!--   Needed for leanback fuckery   -->
         <item name="android:colorAccent">@color/colorPrimaryWhite</item>
     </style>
@@ -279,7 +285,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryBrown</item>
         <item name="colorPrimaryDark">#582700</item>
         <item name="colorAccent">#622C00</item>
-        <item name="colorOnPrimary">#622C00</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <!--   Needed for leanback fuckery   -->
         <item name="android:colorAccent">@color/colorPrimaryBrown</item>
     </style>

From d349190238d99e0604e71c4be0dcff42fbfb08f4 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Mon, 31 Oct 2022 01:16:15 +0100
Subject: [PATCH 041/273] scroll

---
 .../cloudstream3/ExampleInstrumentedTest.kt   |   4 +-
 .../com/lagradost/cloudstream3/MainAPI.kt     |   2 +-
 .../lagradost/cloudstream3/MainActivity.kt    |   2 +-
 .../lagradost/cloudstream3/ParCollections.kt  |  24 ++-
 .../cloudstream3/extractors/Fastream.kt       |   6 +-
 .../cloudstream3/extractors/Pelisplus.kt      |  10 +-
 .../extractors/VidSrcExtractor.kt             |   6 +-
 .../cloudstream3/extractors/Vidstream.kt      |  10 +-
 .../cloudstream3/extractors/Zplayer.kt        |   4 +-
 .../extractors/helper/AsianEmbedHelper.kt     |   4 +-
 .../metaproviders/CrossTmdbProvider.kt        |   6 +-
 .../metaproviders/MultiAnimeProvider.kt       |   2 +-
 .../cloudstream3/plugins/PluginManager.kt     |  21 ++-
 .../cloudstream3/plugins/RepositoryManager.kt |   4 +-
 .../cloudstream3/ui/APIRepository.kt          |  23 ++-
 .../cloudstream3/ui/home/HomeFragment.kt      | 103 +++++++------
 .../cloudstream3/ui/home/HomeScrollAdapter.kt |  60 ++++++++
 .../ui/home/HomeScrollTransformer.kt          |  13 ++
 .../cloudstream3/ui/home/HomeViewModel.kt     |  39 ++++-
 .../cloudstream3/ui/player/GeneratorPlayer.kt |   2 +-
 .../cloudstream3/ui/player/LinkGenerator.kt   |   4 +-
 .../ui/result/ResultViewModel2.kt             |   2 +-
 .../cloudstream3/ui/result/SyncViewModel.kt   |   4 +-
 .../cloudstream3/ui/search/SearchViewModel.kt |   6 +-
 .../extensions/ExtensionsViewModel.kt         |   4 +-
 .../settings/extensions/PluginsViewModel.kt   |   4 +-
 .../cloudstream3/utils/BackupUtils.kt         |   2 -
 app/src/main/res/layout/fragment_home.xml     | 141 ++++++++++--------
 .../lagradost/cloudstream3/ProviderTests.kt   |   4 +-
 29 files changed, 337 insertions(+), 179 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollTransformer.kt

diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
index 201ddea3..2a3e13e5 100644
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
@@ -180,7 +180,7 @@ class ExampleInstrumentedTest {
     @Test
     fun providerCorrectHomepage() {
         runBlocking {
-            getAllProviders().apmap { api ->
+            getAllProviders().amap { api ->
                 if (api.hasMainPage) {
                     try {
                         val homepage = api.getMainPage()
@@ -217,7 +217,7 @@ class ExampleInstrumentedTest {
         runBlocking {
             val invalidProvider = ArrayList<Pair<MainAPI, Exception?>>()
             val providers = getAllProviders()
-            providers.apmap { api ->
+            providers.amap { api ->
                 try {
                     println("Trying $api")
                     if (testSingleProviderApi(api)) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 940d3391..da257d69 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -1066,7 +1066,7 @@ interface LoadResponse {
         ) {
             if (!isTrailersEnabled || trailerUrls == null) return
             trailers.addAll(trailerUrls.map { TrailerData(it, referer, addRaw) })
-            /*val trailers = trailerUrls.filter { it.isNotBlank() }.apmap { trailerUrl ->
+            /*val trailers = trailerUrls.filter { it.isNotBlank() }.amap { trailerUrl ->
                 val links = arrayListOf<ExtractorLink>()
                 val subs = arrayListOf<SubtitleFile>()
                 if (!loadExtractor(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 4c193f42..eb83b08a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -592,7 +592,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                 api.init()
             }
 
-            inAppAuths.apmap { api ->
+            inAppAuths.amap { api ->
                 try {
                     api.initialize()
                 } catch (e: Exception) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ParCollections.kt b/app/src/main/java/com/lagradost/cloudstream3/ParCollections.kt
index badb6631..46955427 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ParCollections.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ParCollections.kt
@@ -1,8 +1,7 @@
 package com.lagradost.cloudstream3
 
 import com.lagradost.cloudstream3.mvvm.logError
-import kotlinx.coroutines.async
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.*
 
 //https://stackoverflow.com/questions/34697828/parallel-operations-on-kotlin-collections
 /*
@@ -26,10 +25,25 @@ fun <T, R> Iterable<T>.pmap(
     return ArrayList<R>(destination)
 }*/
 
+
+@OptIn(DelicateCoroutinesApi::class)
+suspend fun <K, V, R> Map<out K, V>.amap(f: suspend (Map.Entry<K, V>) -> R): List<R> =
+    with(CoroutineScope(GlobalScope.coroutineContext)) {
+        map { async { f(it) } }.map { it.await() }
+    }
+
 fun <K, V, R> Map<out K, V>.apmap(f: suspend (Map.Entry<K, V>) -> R): List<R> = runBlocking {
     map { async { f(it) } }.map { it.await() }
 }
 
+
+@OptIn(DelicateCoroutinesApi::class)
+suspend fun <A, B> List<A>.amap(f: suspend (A) -> B): List<B> =
+    with(CoroutineScope(GlobalScope.coroutineContext)) {
+        map { async { f(it) } }.map { it.await() }
+    }
+
+
 fun <A, B> List<A>.apmap(f: suspend (A) -> B): List<B> = runBlocking {
     map { async { f(it) } }.map { it.await() }
 }
@@ -38,6 +52,12 @@ fun <A, B> List<A>.apmapIndexed(f: suspend (index: Int, A) -> B): List<B> = runB
     mapIndexed { index, a -> async { f(index, a) } }.map { it.await() }
 }
 
+@OptIn(DelicateCoroutinesApi::class)
+suspend fun <A, B> List<A>.amapIndexed(f: suspend (index: Int, A) -> B): List<B> =
+    with(CoroutineScope(GlobalScope.coroutineContext)) {
+        mapIndexed { index, a -> async { f(index, a) } }.map { it.await() }
+    }
+
 // run code in parallel
 /*fun <R> argpmap(
     vararg transforms: () -> R,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Fastream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Fastream.kt
index 16b109be..0d5a5c78 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Fastream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Fastream.kt
@@ -1,6 +1,6 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -21,10 +21,10 @@ class Fastream: ExtractorApi() {
             Pair("file_code",id),
             Pair("auto","1")
         )).document
-        response.select("script").apmap { script ->
+        response.select("script").amap { script ->
             if (script.data().contains("sources")) {
                 val m3u8regex = Regex("((https:|http:)\\/\\/.*\\.m3u8)")
-                val m3u8 = m3u8regex.find(script.data())?.value ?: return@apmap
+                val m3u8 = m3u8regex.find(script.data())?.value ?: return@amap
                 generateM3u8(
                     name,
                     m3u8,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt
index cc743d5e..de469b22 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt
@@ -1,7 +1,7 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -35,7 +35,7 @@ class Pelisplus(val mainUrl: String) {
         callback: (ExtractorLink) -> Unit
     ): Boolean {
         try {
-            normalApis.apmap { api ->
+            normalApis.amap { api ->
                 val url = api.getExtractorUrl(id)
                 api.getSafeUrl(url, subtitleCallback = subtitleCallback, callback = callback)
             }
@@ -51,8 +51,8 @@ class Pelisplus(val mainUrl: String) {
                 val qualityRegex = Regex("(\\d+)P")
 
                 //a[download]
-                pageDoc.select(".dowload > a")?.apmap { element ->
-                    val href = element.attr("href") ?: return@apmap
+                pageDoc.select(".dowload > a")?.amap { element ->
+                    val href = element.attr("href") ?: return@amap
                     val qual = if (element.text()
                             .contains("HDP")
                     ) "1080" else qualityRegex.find(element.text())?.destructured?.component1()
@@ -84,7 +84,7 @@ class Pelisplus(val mainUrl: String) {
                     //val name = element.text()
 
                     // Matches vidstream links with extractors
-                    extractorApis.filter { !it.requiresReferer || !isCasting }.apmap { api ->
+                    extractorApis.filter { !it.requiresReferer || !isCasting }.amap { api ->
                         if (link.startsWith(api.mainUrl)) {
                             api.getSafeUrl(link, extractorUrl, subtitleCallback, callback)
                         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
index 287fe4d4..b910f9dd 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
@@ -1,7 +1,7 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import kotlinx.coroutines.delay
@@ -69,12 +69,12 @@ open class VidSrcExtractor : ExtractorApi() {
                 } else ""
             }
 
-        serverslist.apmap { server ->
+        serverslist.amap { server ->
             val linkfixed = server.replace("https://vidsrc.xyz/", "https://embedsito.com/")
             if (linkfixed.contains("/pro")) {
                 val srcresponse = app.get(server, referer = absoluteUrl).text
                 val m3u8Regex = Regex("((https:|http:)//.*\\.m3u8)")
-                val srcm3u8 = m3u8Regex.find(srcresponse)?.value ?: return@apmap
+                val srcm3u8 = m3u8Regex.find(srcresponse)?.value ?: return@amap
                 val passRegex = Regex("""['"](.*set_pass[^"']*)""")
                 val pass = passRegex.find(srcresponse)?.groupValues?.get(1)?.replace(
                     Regex("""^//"""), "https://"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidstream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidstream.kt
index 1d853b2d..7eb7fbac 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidstream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidstream.kt
@@ -1,7 +1,7 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.argamap
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -37,7 +37,7 @@ class Vidstream(val mainUrl: String) {
         val extractorUrl = getExtractorUrl(id)
         argamap(
             {
-                normalApis.apmap { api ->
+                normalApis.amap { api ->
                     val url = api.getExtractorUrl(id)
                     api.getSafeUrl(
                         url,
@@ -55,8 +55,8 @@ class Vidstream(val mainUrl: String) {
                 val qualityRegex = Regex("(\\d+)P")
 
                 //a[download]
-                pageDoc.select(".dowload > a")?.apmap { element ->
-                    val href = element.attr("href") ?: return@apmap
+                pageDoc.select(".dowload > a")?.amap { element ->
+                    val href = element.attr("href") ?: return@amap
                     val qual = if (element.text()
                             .contains("HDP")
                     ) "1080" else qualityRegex.find(element.text())?.destructured?.component1()
@@ -87,7 +87,7 @@ class Vidstream(val mainUrl: String) {
                         //val name = element.text()
 
                         // Matches vidstream links with extractors
-                        extractorApis.filter { !it.requiresReferer || !isCasting }.apmap { api ->
+                        extractorApis.filter { !it.requiresReferer || !isCasting }.amap { api ->
                             if (link.startsWith(api.mainUrl)) {
                                 api.getSafeUrl(link, extractorUrl, subtitleCallback, callback)
                             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Zplayer.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Zplayer.kt
index 6108d2c5..d17b427d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Zplayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Zplayer.kt
@@ -1,6 +1,6 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -36,7 +36,7 @@ open class ZplayerV2 : ExtractorApi() {
                 val m3u8regex = Regex("((https:|http:)\\/\\/.*\\.m3u8)")
                 m3u8regex.findAll(testdata).map {
                     it.value
-                }.toList().apmap { urlm3u8 ->
+                }.toList().amap { urlm3u8 ->
                     if (urlm3u8.contains("m3u8")) {
                         val testurl = app.get(urlm3u8, headers = mapOf("Referer" to url)).text
                         if (testurl.contains("EXTM3U")) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt
index e70a9474..0b401c06 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt
@@ -2,7 +2,7 @@ package com.lagradost.cloudstream3.extractors.helper
 
 import android.util.Log
 import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.loadExtractor
@@ -18,7 +18,7 @@ class AsianEmbedHelper {
             val doc = app.get(url).document
             val links = doc.select("div#list-server-more > ul > li.linkserver")
             if (!links.isNullOrEmpty()) {
-                links.apmap {
+                links.amap {
                     val datavid = it.attr("data-video") ?: ""
                     //Log.i("AsianEmbed", "Result => (datavid) ${datavid}")
                     if (datavid.isNotBlank()) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
index b01d188c..07aa904e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
@@ -39,7 +39,7 @@ class CrossTmdbProvider : TmdbProvider() {
     ): Boolean {
         tryParseJson<CrossMetaData>(data)?.let { metaData ->
             if (!metaData.isSuccess) return false
-            metaData.movies?.apmap { (apiName, data) ->
+            metaData.movies?.amap { (apiName, data) ->
                 getApiFromNameNull(apiName)?.let {
                     try {
                         it.loadLinks(data, isCasting, subtitleCallback, callback)
@@ -64,10 +64,10 @@ class CrossTmdbProvider : TmdbProvider() {
             val matchName = filterName(this.name)
             when (this) {
                 is MovieLoadResponse -> {
-                    val data = validApis.apmap { api ->
+                    val data = validApis.amap { api ->
                         try {
                             if (api.supportedTypes.contains(TvType.Movie)) { //|| api.supportedTypes.contains(TvType.AnimeMovie)
-                                return@apmap api.search(this.name)?.first {
+                                return@amap api.search(this.name)?.first {
                                     if (filterName(it.name).equals(
                                             matchName,
                                             ignoreCase = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt
index 0ab44b68..e8ac1876 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt
@@ -45,7 +45,7 @@ class MultiAnimeProvider : MainAPI() {
 
     override suspend fun load(url: String): LoadResponse? {
         return syncApi.getResult(url)?.let { res ->
-            val data = SyncUtil.getUrlsFromId(res.id, syncUtilType).apmap { url ->
+            val data = SyncUtil.getUrlsFromId(res.id, syncUtilType).amap { url ->
                 validApis.firstOrNull { api -> url.startsWith(api.mainUrl) }?.load(url)
             }.filterNotNull()
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index 35e041be..c0f35601 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -217,18 +217,17 @@ object PluginManager {
      * 3. If outdated download and load the plugin
      * 4. Else load the plugin normally
      **/
-    fun updateAllOnlinePluginsAndLoadThem(activity: Activity) {
+    fun updateAllOnlinePluginsAndLoadThem(activity: Activity) = ioSafe {
         // Load all plugins as fast as possible!
         loadAllOnlinePlugins(activity)
 
-        ioSafe {
             afterPluginsLoadedEvent.invoke(true)
-        }
+
 
         val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
             ?: emptyArray()) + PREBUILT_REPOSITORIES
 
-        val onlinePlugins = urls.toList().apmap {
+        val onlinePlugins = urls.toList().amap {
             getRepoPlugins(it.url)?.toList() ?: emptyList()
         }.flatten().distinctBy { it.second.url }
 
@@ -249,7 +248,7 @@ object PluginManager {
 
         val updatedPlugins = mutableListOf<String>()
 
-        outdatedPlugins.apmap { pluginData ->
+        outdatedPlugins.amap { pluginData ->
             if (pluginData.isDisabled) {
                 //updatedPlugins.add(activity.getString(R.string.single_plugin_disabled, pluginData.onlineData.second.name))
                 unloadPlugin(pluginData.savedData.filePath)
@@ -270,9 +269,9 @@ object PluginManager {
             createNotification(activity, updatedPlugins)
         }
 
-        ioSafe {
+       // ioSafe {
             afterPluginsLoadedEvent.invoke(true)
-        }
+       // }
 
         Log.i(TAG, "Plugin update done!")
     }
@@ -280,9 +279,9 @@ object PluginManager {
     /**
      * Use updateAllOnlinePluginsAndLoadThem
      * */
-    fun loadAllOnlinePlugins(activity: Activity) {
+    fun loadAllOnlinePlugins(activity: Activity) = ioSafe {
         // Load all plugins as fast as possible!
-        (getPluginsOnline()).toList().apmap { pluginData ->
+        (getPluginsOnline()).toList().amap { pluginData ->
             loadPlugin(
                 activity,
                 File(pluginData.filePath),
@@ -291,7 +290,7 @@ object PluginManager {
         }
     }
 
-    fun loadAllLocalPlugins(activity: Activity) {
+    fun loadAllLocalPlugins(activity: Activity) = ioSafe {
         val dir = File(LOCAL_PLUGINS_PATH)
         removeKey(PLUGINS_KEY_LOCAL)
 
@@ -299,7 +298,7 @@ object PluginManager {
             val res = dir.mkdirs()
             if (!res) {
                 Log.w(TAG, "Failed to create local directories")
-                return
+                return@ioSafe
             }
         }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
index e3203787..2564abd0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
-import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
@@ -95,7 +95,7 @@ object RepositoryManager {
      * */
     suspend fun getRepoPlugins(repositoryUrl: String): List<Pair<String, SitePlugin>>? {
         val repo = parseRepository(repositoryUrl) ?: return null
-        return repo.pluginLists.apmap { url ->
+        return repo.pluginLists.amap { url ->
             parsePlugins(url).map {
                 repositoryUrl to it
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
index ce695873..ef50019c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
@@ -6,6 +6,10 @@ import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.GlobalScope.coroutineContext
+import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 
 class APIRepository(val api: MainAPI) {
@@ -27,7 +31,7 @@ class APIRepository(val api: MainAPI) {
             return data.isEmpty() || data == "[]" || data == "about:blank"
         }
 
-        private val cacheHash: HashMap<Pair<String,String>, LoadResponse> = hashMapOf()
+        private val cacheHash: HashMap<Pair<String, String>, LoadResponse> = hashMapOf()
     }
 
     val hasMainPage = api.hasMainPage
@@ -42,7 +46,7 @@ class APIRepository(val api: MainAPI) {
         return safeApiCall {
             if (isInvalidData(url)) throw ErrorLoadingException()
             val fixedUrl = api.fixUrl(url)
-            val key = Pair(api.name,url)
+            val key = Pair(api.name, url)
             cacheHash[key] ?: api.load(fixedUrl)?.also {
                 // we cache 20 responses because ppl often go back to the same shit + 20 because I dont want to cause too much memory leak
                 if (cacheHash.size > 20) cacheHash.remove(cacheHash.keys.random())
@@ -78,6 +82,7 @@ class APIRepository(val api: MainAPI) {
         delay(delta)
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     suspend fun getMainPage(page: Int, nameIndex: Int? = null): Resource<List<HomePageResponse?>> {
         return safeApiCall {
             api.lastHomepageRequest = unixTimeMS
@@ -103,11 +108,15 @@ class APIRepository(val api: MainAPI) {
                         )
                     }
                 } else {
-                    api.mainPage.apmap { data ->
-                        api.getMainPage(
-                            page,
-                            MainPageRequest(data.name, data.data, data.horizontalImages)
-                        )
+                    with(CoroutineScope(coroutineContext)) {
+                        api.mainPage.map { data ->
+                            async {
+                                api.getMainPage(
+                                    page,
+                                    MainPageRequest(data.name, data.data, data.horizontalImages)
+                                )
+                            }
+                        }.map { it.await() }
                     }
                 }
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index e86a0742..9792fa43 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -547,51 +547,14 @@ class HomeFragment : Fragment() {
             when (preview) {
                 is Resource.Success -> {
                     home_preview?.isVisible = true
-
-                    preview.value.apply {
-                        home_preview_tags?.text = tags?.joinToString(" • ") ?: ""
-                        home_preview_tags?.isGone = tags.isNullOrEmpty()
-                        home_preview_image?.setImage(posterUrl, posterHeaders)
-                        home_preview_title?.text = name
-                        home_preview_play?.setOnClickListener {
-                            activity?.loadResult(url, apiName, START_ACTION_RESUME_LATEST)
-                            //activity.loadSearchResult(url, START_ACTION_RESUME_LATEST)
-                        }
-                        home_preview_info?.setOnClickListener {
-                            activity?.loadResult(url, apiName)
-                            //activity.loadSearchResult(random)
-                        }
-                        // very ugly code, but I dont care
-                        val watchType = DataStoreHelper.getResultWatchState(preview.value.getId())
-                        home_preview_bookmark?.setText(watchType.stringRes)
-                        home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
-                            null,
-                            getDrawable(home_preview_bookmark.context, watchType.iconRes),
-                            null,
-                            null
-                        )
-                        home_preview_bookmark?.setOnClickListener { fab ->
-                            activity?.showBottomDialog(
-                                WatchType.values().map { fab.context.getString(it.stringRes) }
-                                    .toList(),
-                                DataStoreHelper.getResultWatchState(preview.value.getId()).ordinal,
-                                fab.context.getString(R.string.action_add_to_bookmarks),
-                                showApply = false,
-                                {}) {
-                                val newValue = WatchType.values()[it]
-                                home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
-                                    null,
-                                    getDrawable(home_preview_bookmark.context, newValue.iconRes),
-                                    null,
-                                    null
-                                )
-                                home_preview_bookmark?.setText(newValue.stringRes)
-
-                                updateWatchStatus(preview.value, newValue)
-                                reloadStored()
-                            }
-                        }
+                    (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.apply {
+                        setItems(preview.value)
+                       // home_preview_viewpager?.setCurrentItem(1000, false)
                     }
+
+                    //.also {
+                    //home_preview_viewpager?.adapter =
+                    //}
                 }
                 else -> {
                     home_preview?.isVisible = false
@@ -606,6 +569,58 @@ class HomeFragment : Fragment() {
             searchText.setTextColor(color)
             searchText.setHintTextColor(color)
         }
+
+        home_preview_viewpager?.apply {
+            setPageTransformer(false, HomeScrollTransformer())
+            adapter = HomeScrollAdapter { load ->
+                load.apply {
+                    home_preview_tags?.text = tags?.joinToString(" • ") ?: ""
+                    home_preview_tags?.isGone = tags.isNullOrEmpty()
+                    home_preview_image?.setImage(posterUrl, posterHeaders)
+                    home_preview_title?.text = name
+                    home_preview_play?.setOnClickListener {
+                        activity?.loadResult(url, apiName, START_ACTION_RESUME_LATEST)
+                        //activity.loadSearchResult(url, START_ACTION_RESUME_LATEST)
+                    }
+                    home_preview_info?.setOnClickListener {
+                        activity?.loadResult(url, apiName)
+                        //activity.loadSearchResult(random)
+                    }
+                    // very ugly code, but I dont care
+                    val watchType = DataStoreHelper.getResultWatchState(load.getId())
+                    home_preview_bookmark?.setText(watchType.stringRes)
+                    home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
+                        null,
+                        getDrawable(home_preview_bookmark.context, watchType.iconRes),
+                        null,
+                        null
+                    )
+                    home_preview_bookmark?.setOnClickListener { fab ->
+                        activity?.showBottomDialog(
+                            WatchType.values().map { fab.context.getString(it.stringRes) }
+                                .toList(),
+                            DataStoreHelper.getResultWatchState(load.getId()).ordinal,
+                            fab.context.getString(R.string.action_add_to_bookmarks),
+                            showApply = false,
+                            {}) {
+                            val newValue = WatchType.values()[it]
+                            home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
+                                null,
+                                getDrawable(home_preview_bookmark.context, newValue.iconRes),
+                                null,
+                                null
+                            )
+                            home_preview_bookmark?.setText(newValue.stringRes)
+
+                            updateWatchStatus(load, newValue)
+                            reloadStored()
+                        }
+                    }
+                }
+
+            }
+        }
+
         observe(homeViewModel.apiName) { apiName ->
             currentApiName = apiName
             // setKey(USER_SELECTED_HOMEPAGE_API, apiName)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
new file mode 100644
index 00000000..b36d7582
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
@@ -0,0 +1,60 @@
+package com.lagradost.cloudstream3.ui.home
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.viewpager.widget.PagerAdapter
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.utils.UIHelper.setImage
+
+
+class HomeScrollAdapter(private val onPrimaryCallback: (LoadResponse) -> Unit) : PagerAdapter() {
+    private var items: List<LoadResponse> = listOf()
+
+    fun setItems(newItems: List<LoadResponse>) {
+        items = newItems
+
+        notifyDataSetChanged()
+    }
+
+    override fun getCount(): Int {
+        return Int.MAX_VALUE//items.size
+    }
+
+    override fun getItemPosition(`object`: Any): Int {
+        return POSITION_NONE//super.getItemPosition(`object`)
+    }
+
+    private fun getItemAtPosition(idx: Int): LoadResponse {
+        return items[idx % items.size]
+    }
+
+    override fun setPrimaryItem(container: ViewGroup, position: Int, `object`: Any) {
+        super.setPrimaryItem(container, position, `object`)
+        onPrimaryCallback.invoke(getItemAtPosition(position))
+    }
+
+    override fun instantiateItem(container: ViewGroup, position: Int): Any {
+        val image = ImageView(container.context)
+        val item = getItemAtPosition(position)
+        image.scaleType = ImageView.ScaleType.CENTER_CROP
+        image.setImage(item.posterUrl ?: item.backgroundPosterUrl, item.posterHeaders)
+
+        // val itemView: View = mLayoutInflater.inflate(R.layout.pager_item, container, false)
+
+        // val imageView: ImageView = itemView.findViewById<View>(R.id.imageView) as ImageView
+        // imageView.setImageResource(mResources.get(position))
+
+        container.addView(image)
+
+        return image
+    }
+
+    override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
+        container.removeView(`object` as View)
+    }
+
+    override fun isViewFromObject(view: View, `object`: Any): Boolean {
+        return view === `object`
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollTransformer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollTransformer.kt
new file mode 100644
index 00000000..04b6964b
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollTransformer.kt
@@ -0,0 +1,13 @@
+package com.lagradost.cloudstream3.ui.home
+
+import android.view.View
+import androidx.viewpager.widget.ViewPager
+
+class HomeScrollTransformer : ViewPager.PageTransformer {
+    override fun transformPage(page: View, position: Float) {
+        page.setPadding(
+            maxOf(0, (-position * page.width / 2).toInt()), 0,
+            maxOf(0, (position * page.width / 2).toInt()), 0
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index af24973d..43d849cf 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -21,6 +21,8 @@ import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.noneApi
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.randomApi
 import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.Coroutines.ioWork
 import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllResumeStateIds
@@ -33,6 +35,7 @@ import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
 import kotlinx.coroutines.withContext
 import java.util.*
 import kotlin.collections.set
@@ -58,9 +61,9 @@ class HomeViewModel : ViewModel() {
     val bookmarks: LiveData<Pair<Boolean, List<SearchResponse>>> = _bookmarks
 
     private val _resumeWatching = MutableLiveData<List<SearchResponse>>()
-    private val _preview = MutableLiveData<Resource<LoadResponse>>()
+    private val _preview = MutableLiveData<Resource<List<LoadResponse>>>()
     val resumeWatching: LiveData<List<SearchResponse>> = _resumeWatching
-    val preview: LiveData<Resource<LoadResponse>> = _preview
+    val preview: LiveData<Resource<List<LoadResponse>>> = _preview
 
     fun loadResumeWatching() = viewModelScope.launchSafe {
         val resumeWatching = withContext(Dispatchers.IO) {
@@ -210,7 +213,7 @@ class HomeViewModel : ViewModel() {
     }
 
 
-    private fun load(api: MainAPI?) = viewModelScope.launchSafe {
+    private fun load(api: MainAPI?) = ioSafe {
         repo = if (api != null) {
             APIRepository(api)
         } else {
@@ -236,7 +239,35 @@ class HomeViewModel : ViewModel() {
                                     ExpandableHomepageList(filteredList, 1, home.hasNext)
                             }
                         }
+
                         val items = data.value.mapNotNull { it?.items }.flatten()
+                        val responses = ioWork {
+                            items.flatMap { it.list }.shuffled().take(6).map { searchResponse ->
+                                async { repo?.load(searchResponse.url) }
+                            }.map { it.await() }.mapNotNull { if (it != null && it is Resource.Success) it.value else null } }
+                        //.amap  { searchResponse ->
+                        //   repo?.load(searchResponse.url)
+                        ///}
+
+                        //.map { searchResponse ->
+                        //   async { repo?.load(searchResponse.url) }
+                        // }.map { it.await() }
+
+
+                        if (responses.isEmpty()) {
+                            _preview.postValue(
+                                Resource.Failure(
+                                    false,
+                                    null,
+                                    null,
+                                    "No homepage responses"
+                                )
+                            )
+                        } else {
+                            _preview.postValue(Resource.Success(responses))
+                        }
+
+                        /*
                         items.randomOrNull()?.list?.randomOrNull()?.url?.let { url ->
                             // backup request in case first fails
                             var first = repo?.load(url)
@@ -264,7 +295,7 @@ class HomeViewModel : ViewModel() {
                                     "No homepage items"
                                 )
                             )
-                        }
+                        }*/
 
                         _page.postValue(Resource.Success(expandable))
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index e20a6c7b..816b1298 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -344,7 +344,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                         seasonNumber = currentTempMeta.season,
                         lang = currentLanguageTwoLetters.ifBlank { null }
                     )
-                    val results = providers.apmap {
+                    val results = providers.amap {
                         try {
                             it.search(search)
                         } catch (e: Exception) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt
index 2c8a5372..1f242481 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt
@@ -1,6 +1,6 @@
 package com.lagradost.cloudstream3.ui.player
 
-import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.utils.*
 import java.net.URI
@@ -46,7 +46,7 @@ class LinkGenerator(
         subtitleCallback: (SubtitleData) -> Unit,
         offset: Int
     ): Boolean {
-        links.apmap { link ->
+        links.amap { link ->
             if (!extract || !loadExtractor(link, referer, {
                     subtitleCallback(PlayerSubtitleHelper.getSubtitleData(it))
                 }) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 7c099793..f424989e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -1972,7 +1972,7 @@ class ResultViewModel2 : ViewModel() {
     ): List<ExtractedTrailerData> =
         coroutineScope {
             var currentCount = 0
-            return@coroutineScope loadResponse.trailers.apmap { trailerData ->
+            return@coroutineScope loadResponse.trailers.amap { trailerData ->
                 try {
                     val links = arrayListOf<ExtractorLink>()
                     val subs = arrayListOf<SubtitleFile>()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt
index 513d68e8..91415d26 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt
@@ -4,7 +4,7 @@ import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis
@@ -197,7 +197,7 @@ class SyncViewModel : ViewModel() {
     /// modifies the current sync data, return null if you don't want to change it
     private fun modifyData(update: ((SyncAPI.SyncStatus) -> (SyncAPI.SyncStatus?))) =
         ioSafe {
-            syncs.apmap { (prefix, id) ->
+            syncs.amap { (prefix, id) ->
                 repos.firstOrNull { it.idPrefix == prefix }?.let { repo ->
                     if (repo.hasAccount()) {
                         val result = repo.getStatus(id)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
index b629b73f..aceda644 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
@@ -9,7 +9,7 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.SearchResponse
-import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.ui.APIRepository
@@ -108,9 +108,9 @@ class SearchViewModel : ViewModel() {
 
                 repos.filter { a ->
                     (ignoreSettings || (providersActive.isEmpty() || providersActive.contains(a.name))) && (!isQuickSearch || a.hasQuickSearch)
-                }.apmap { a -> // Parallel
+                }.amap { a -> // Parallel
                     val search = if (isQuickSearch) a.quickSearch(query) else a.search(query)
-                    if (currentSearchIndex != currentIndex) return@apmap
+                    if (currentSearchIndex != currentIndex) return@amap
                     currentList.add(OnGoingSearch(a.name, search))
                     _currentSearch.postValue(currentList)
                 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt
index 897e7366..63ed5357 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt
@@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModel
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.Some
 import com.lagradost.cloudstream3.mvvm.debugAssert
 import com.lagradost.cloudstream3.plugins.PluginManager
@@ -49,7 +49,7 @@ class ExtensionsViewModel : ViewModel() {
         val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
             ?: emptyArray()) + PREBUILT_REPOSITORIES
 
-        val onlinePlugins = urls.toList().apmap {
+        val onlinePlugins = urls.toList().amap {
             RepositoryManager.getRepoPlugins(it.url)?.toList() ?: emptyList()
         }.flatten().distinctBy { it.second.url }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
index 536dc33b..894a9331 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
@@ -10,7 +10,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.PluginManager.getPluginPath
@@ -101,7 +101,7 @@ class PluginsViewModel : ViewModel() {
                             Toast.LENGTH_SHORT
                         )
                     }
-                }.apmap { (repo, metadata) ->
+                }.amap { (repo, metadata) ->
                     PluginManager.downloadAndLoadPlugin(
                         activity,
                         metadata.url,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
index 08c03d6c..338b1ed2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
@@ -13,7 +13,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.apmap
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.plugins.PLUGINS_KEY
 import com.lagradost.cloudstream3.plugins.PLUGINS_KEY_LOCAL
@@ -28,7 +27,6 @@ import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_S
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_TOKEN_KEY
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_UNIXTIME_KEY
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_USER_KEY
-import com.lagradost.cloudstream3.syncproviders.providers.OpenSubtitlesApi
 import com.lagradost.cloudstream3.syncproviders.providers.OpenSubtitlesApi.Companion.OPEN_SUBTITLES_USER_KEY
 import com.lagradost.cloudstream3.utils.DataStore.getDefaultSharedPrefs
 import com.lagradost.cloudstream3.utils.DataStore.getSharedPrefs
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index bce49c22..3d7e3ba5 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -279,30 +279,40 @@
                                     <requestFocus />
                                 </ImageView>-->
             </FrameLayout>
-
+            <!--https://www.digitalocean.com/community/tutorials/android-viewpager-example-tutorial-->
             <FrameLayout
-                tools:visibility="visible"
-                android:visibility="gone"
                 android:id="@+id/home_preview"
                 android:layout_width="match_parent"
-                android:layout_height="500dp">
+                android:layout_height="500dp"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <androidx.viewpager.widget.ViewPager
+                    android:id="@+id/home_preview_viewpager"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                </androidx.viewpager.widget.ViewPager>
 
                 <ImageView
-                    android:alpha="0.8"
+                    android:visibility="gone"
                     android:id="@+id/home_preview_image"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:alpha="0.8"
                     android:scaleType="centerCrop"
                     tools:src="@drawable/example_poster" />
+
                 <View
-                    android:visibility="visible"
                     android:id="@+id/title_shadow_top"
                     android:layout_width="match_parent"
                     android:layout_height="150dp"
-                    android:alpha="1"
-                    android:rotation="180"
                     android:layout_gravity="top"
-                    android:background="@drawable/background_shadow" />
+                    android:alpha="1"
+                    android:background="@drawable/background_shadow"
+                    android:rotation="180"
+                    android:visibility="visible" />
+
                 <View
                     android:id="@+id/title_shadow"
                     android:layout_width="match_parent"
@@ -312,62 +322,63 @@
 
                 <LinearLayout
                     android:id="@+id/home_padding"
-                    android:orientation="vertical"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
 
                     <androidx.appcompat.widget.SearchView
                         android:id="@+id/home_search"
                         android:layout_width="match_parent"
-                        android:gravity="start"
                         android:layout_height="wrap_content"
                         android:layout_gravity="start"
+                        android:editTextColor="@color/white"
+                        android:gravity="start"
                         android:iconifiedByDefault="true"
+                        android:textColor="@color/white"
+                        android:textColorHint="@color/white"
                         app:iconifiedByDefault="true"
                         app:queryBackground="@color/transparent"
                         app:queryHint="@string/search"
-                        android:textColor="@color/white"
-                        android:textColorHint="@color/white"
-                        android:editTextColor="@color/white"
 
                         app:searchIcon="@drawable/search_icon"
                         tools:ignore="RtlSymmetry" />
                 </LinearLayout>
 
-<!--
-                <TextView
-                    android:visibility="gone"
-                    android:id="@+id/test_search"
-                    android:background="?android:attr/selectableItemBackgroundBorderless"
-                    android:layout_gravity="start"
-                    android:gravity="center"
+                <!--
+                                <TextView
+                                    android:visibility="gone"
+                                    android:id="@+id/test_search"
+                                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                                    android:layout_gravity="start"
+                                    android:gravity="center"
 
-                    android:textSize="20dp"
-                    android:layout_margin="20dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/search"
-                    android:textColor="@color/white"
-                    app:drawableLeftCompat="@drawable/search_icon"
-                    app:tint="@color/white" />
--->
+                                    android:textSize="20dp"
+                                    android:layout_margin="20dp"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/search"
+                                    android:textColor="@color/white"
+                                    app:drawableLeftCompat="@drawable/search_icon"
+                                    app:tint="@color/white" />
+                -->
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom"
                     android:orientation="vertical">
+
                     <TextView
-                        android:paddingStart="30dp"
-                        android:paddingEnd="30dp"
-                        android:textStyle="bold"
-                        android:paddingBottom="10dp"
                         android:id="@+id/home_preview_title"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center"
+                        android:paddingStart="30dp"
+                        android:paddingEnd="30dp"
+                        android:paddingBottom="10dp"
                         android:textColor="?attr/white"
                         android:textSize="17sp"
+                        android:textStyle="bold"
                         tools:text="The Perfect Run" />
                     <!--<TextView
                         android:paddingStart="30dp"
@@ -380,60 +391,62 @@
                         android:textSize="14sp"
                         tools:text="5 seasons 50 episodes" />-->
                     <TextView
-                        android:paddingStart="30dp"
-                        android:paddingEnd="30dp"
                         android:id="@+id/home_preview_tags"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center"
+                        android:paddingStart="30dp"
+                        android:paddingEnd="30dp"
                         android:textColor="?attr/white"
                         android:textSize="14sp"
                         tools:text="Hello • World • Tags" />
 
                     <LinearLayout
-                        android:padding="20dp"
-                        android:gravity="center"
-                        android:layout_gravity="center"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal">
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:orientation="horizontal"
+                        android:padding="20dp">
 
                         <TextView
                             android:id="@+id/home_preview_bookmark"
-                            android:background="?android:attr/selectableItemBackgroundBorderless"
-                            android:layout_gravity="center"
-                            android:gravity="center"
-                            android:layout_marginStart="25dp"
-                            android:layout_marginEnd="25dp"
                             android:layout_width="70dp"
                             android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_marginStart="25dp"
+                            android:layout_marginEnd="25dp"
+                            android:background="?android:attr/selectableItemBackgroundBorderless"
+                            android:gravity="center"
                             android:text="@string/none"
                             android:textColor="?attr/white"
+                            app:drawableTint="?attr/white"
                             app:drawableTopCompat="@drawable/ic_baseline_add_24"
-                            app:tint="?attr/white"
-                            app:drawableTint="?attr/white" />
+                            app:tint="?attr/white" />
+
                         <com.google.android.material.button.MaterialButton
-                            android:layout_gravity="center"
-                            style="@style/WhiteButton"
                             android:id="@+id/home_preview_play"
+                            style="@style/WhiteButton"
                             android:layout_width="wrap_content"
+                            android:layout_gravity="center"
 
                             android:text="@string/home_play"
                             app:icon="@drawable/ic_baseline_play_arrow_24" />
+
                         <TextView
-                            android:background="?android:attr/selectableItemBackgroundBorderless"
                             android:id="@+id/home_preview_info"
-                            android:gravity="center"
+                            android:layout_width="70dp"
+                            android:layout_height="wrap_content"
                             android:layout_gravity="center"
                             android:layout_marginStart="25dp"
                             android:layout_marginEnd="25dp"
-                            android:layout_width="70dp"
-                            android:layout_height="wrap_content"
+                            android:background="?android:attr/selectableItemBackgroundBorderless"
+                            android:gravity="center"
                             android:text="@string/home_info"
                             android:textColor="?attr/white"
+                            app:drawableTint="?attr/white"
                             app:drawableTopCompat="@drawable/ic_outline_info_24"
-                            app:tint="?attr/white"
-                            app:drawableTint="?attr/white" />
+                            app:tint="?attr/white" />
                     </LinearLayout>
                 </LinearLayout>
             </FrameLayout>
@@ -522,15 +535,15 @@
 
                         <com.google.android.material.chip.ChipGroup
                             android:layout_width="wrap_content"
-                            app:singleSelection="true"
                             android:layout_height="wrap_content"
-                            android:orientation="horizontal">
+                            android:orientation="horizontal"
+                            app:singleSelection="true">
 
                             <com.google.android.material.chip.Chip
                                 android:id="@+id/home_type_watching_btt"
                                 style="@style/ChipFilled"
-                                android:layout_height="wrap_content"
                                 android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
 
                                 android:nextFocusLeft="@id/nav_rail_view"
                                 android:nextFocusRight="@id/home_plan_to_watch_btt"
@@ -539,8 +552,8 @@
                             <com.google.android.material.chip.Chip
                                 android:id="@+id/home_plan_to_watch_btt"
                                 style="@style/ChipFilled"
-                                android:layout_height="wrap_content"
                                 android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
 
                                 android:nextFocusLeft="@id/home_type_watching_btt"
                                 android:nextFocusRight="@id/home_type_on_hold_btt"
@@ -549,8 +562,8 @@
                             <com.google.android.material.chip.Chip
                                 android:id="@+id/home_type_on_hold_btt"
                                 style="@style/ChipFilled"
-                                android:layout_height="wrap_content"
                                 android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
 
                                 android:nextFocusLeft="@id/home_plan_to_watch_btt"
                                 android:nextFocusRight="@id/home_type_dropped_btt"
@@ -559,8 +572,8 @@
                             <com.google.android.material.chip.Chip
                                 android:id="@+id/home_type_dropped_btt"
                                 style="@style/ChipFilled"
-                                android:layout_height="wrap_content"
                                 android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
 
                                 android:nextFocusLeft="@id/home_type_on_hold_btt"
                                 android:nextFocusRight="@id/home_type_completed_btt"
@@ -568,10 +581,10 @@
 
                             <com.google.android.material.chip.Chip
                                 android:id="@+id/home_type_completed_btt"
-                                android:layout_height="wrap_content"
+                                style="@style/ChipFilled"
                                 android:layout_width="wrap_content"
 
-                                style="@style/ChipFilled"
+                                android:layout_height="wrap_content"
                                 android:nextFocusLeft="@id/home_type_dropped_btt"
                                 android:text="@string/type_completed" />
                         </com.google.android.material.chip.ChipGroup>
diff --git a/app/src/test/java/com/lagradost/cloudstream3/ProviderTests.kt b/app/src/test/java/com/lagradost/cloudstream3/ProviderTests.kt
index 34bd9f18..846dfdb5 100644
--- a/app/src/test/java/com/lagradost/cloudstream3/ProviderTests.kt
+++ b/app/src/test/java/com/lagradost/cloudstream3/ProviderTests.kt
@@ -162,7 +162,7 @@ class ProviderTests {
 //     @Test
 //     fun providerCorrectHomepage() {
 //         runBlocking {
-//             getAllProviders().apmap { api ->
+//             getAllProviders().amap { api ->
 //                 if (api.hasMainPage) {
 //                     try {
 //                         val homepage = api.getMainPage()
@@ -197,7 +197,7 @@ class ProviderTests {
 //     suspend fun providerCorrect() {
 //         val invalidProvider = ArrayList<Pair<MainAPI, Exception?>>()
 //         val providers = getAllProviders()
-//         providers.apmap { api ->
+//         providers.amap { api ->
 //             try {
 //                 println("Trying $api")
 //                 if (testSingleProviderApi(api)) {

From 7272dc67b74c0e36177222a15c3cbd20ea34bd5b Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Mon, 31 Oct 2022 12:33:09 +0100
Subject: [PATCH 042/273] fix chip tint and make adding repos by url easier

---
 .../cloudstream3/plugins/RepositoryManager.kt | 22 +++++++++++
 .../settings/extensions/ExtensionsFragment.kt | 38 +++++++------------
 app/src/main/res/values/styles.xml            | 13 ++++---
 3 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
index 2564abd0..542e2136 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
@@ -70,6 +70,28 @@ object RepositoryManager {
         getKey("PREBUILT_REPOSITORIES") ?: emptyArray()
     }
 
+    suspend fun parseRepoUrl(url: String): String? {
+        val fixedUrl = url.trim()
+        return if (fixedUrl.contains("^https?://".toRegex())) {
+            fixedUrl
+        } else if (fixedUrl.contains("^(cloudstreamrepo://)|(https://cs\\.repo/)".toRegex())) {
+            fixedUrl.replace("^(cloudstreamrepo://)|(https://cs\\.repo/)".toRegex(), "").let {
+                return@let if (!it.contains("^https?://".toRegex()))
+                     "https://${it}"
+                else fixedUrl
+            }
+        } else if (fixedUrl.matches("^[a-zA-Z0-9!_-]+$".toRegex())) {
+            suspendSafeApiCall {
+                app.get("https://l.cloudstream.cf/${fixedUrl}").let {
+                    return@let if (it.isSuccessful && !it.url.startsWith("https://cutt.ly/branded-domains")) it.url
+                    else app.get("https://cutt.ly/${fixedUrl}").let let2@{ it2 ->
+                        return@let2 if (it2.isSuccessful) it2.url else null
+                    }
+                }
+            }
+        } else null
+    }
+
     suspend fun parseRepository(url: String): Repository? {
         return suspendSafeApiCall {
             // Take manifestVersion and such into account later
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
index 418519e2..49f40879 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
@@ -33,8 +33,6 @@ import com.lagradost.cloudstream3.widget.LinearRecycleViewLayoutManager
 import kotlinx.android.synthetic.main.add_repo_input.*
 import kotlinx.android.synthetic.main.fragment_extensions.*
 
-const val PUBLIC_REPOSITORIES_LIST = "https://recloudstream.github.io/repos/"
-
 class ExtensionsFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -186,15 +184,7 @@ class ExtensionsFragment : Fragment() {
             (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager?)?.primaryClip?.getItemAt(
                 0
             )?.text?.toString()?.let { copy ->
-                // Fix our own repo links and only paste the text if it's a link.
-                if (copy.startsWith("http")) {
-                    val fixedUrl = if (copy.startsWith("https://cs.repo")) {
-                        "https://" + copy.substringAfter("?")
-                    } else {
-                        copy
-                    }
-                    dialog.repo_url_input?.setText(fixedUrl)
-                }
+                dialog.repo_url_input?.setText(copy)
             }
 
 //            dialog.list_repositories?.setOnClickListener {
@@ -206,21 +196,21 @@ class ExtensionsFragment : Fragment() {
 //            dialog.text2?.text = provider.name
             dialog.apply_btt?.setOnClickListener secondListener@{
                 val name = dialog.repo_name_input?.text?.toString()
-                val url = dialog.repo_url_input?.text?.toString()
-                if (url.isNullOrBlank()) {
-                    showToast(activity, R.string.error_invalid_data, Toast.LENGTH_SHORT)
-                    return@secondListener
-                }
-
                 ioSafe {
-                    val fixedName = if (!name.isNullOrBlank()) name
-                    else RepositoryManager.parseRepository(url)?.name ?: "No name"
+                    val url = dialog.repo_url_input?.text?.toString()
+                        ?.let { it1 -> RepositoryManager.parseRepoUrl(it1) }
+                    if (url.isNullOrBlank()) {
+                        showToast(activity, R.string.error_invalid_data, Toast.LENGTH_SHORT)
+                    } else {
+                        val fixedName = if (!name.isNullOrBlank()) name
+                        else RepositoryManager.parseRepository(url)?.name ?: "No name"
 
-                    val newRepo = RepositoryData(fixedName, url)
-                    RepositoryManager.addRepository(newRepo)
-                    extensionViewModel.loadStats()
-                    extensionViewModel.loadRepositories()
-                    this@ExtensionsFragment.activity?.downloadAllPluginsDialog(url, fixedName)
+                        val newRepo = RepositoryData(fixedName, url)
+                        RepositoryManager.addRepository(newRepo)
+                        extensionViewModel.loadStats()
+                        extensionViewModel.loadRepositories()
+                        this@ExtensionsFragment.activity?.downloadAllPluginsDialog(url, fixedName)
+                    }
                 }
                 dialog.dismissSafe(activity)
             }
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 70ac7516..f0bb2214 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -81,6 +81,7 @@
         <item name="chipStrokeColor">@color/transparent</item>
         <item name="textColor">@color/chip_color_text</item>
         <item name="android:textColor">@color/chip_color_text</item>
+        <item name="checkedIconTint">@color/chip_color_text</item>
     </style>
 
     <style name="AmoledMode">
@@ -137,13 +138,13 @@
     </style>
 
     <style name="OverlayPrimaryColorMonetTwo">
-        <item name="colorPrimary">@color/material_dynamic_tertiary80</item>
-        <item name="android:colorPrimary">@color/material_dynamic_tertiary80</item>
-        <item name="colorPrimaryDark">@color/material_dynamic_tertiary30</item>
-        <item name="colorAccent">@color/material_dynamic_tertiary80</item>
-        <item name="colorOnPrimary">@color/material_dynamic_tertiary20</item>
+        <item name="colorPrimary">@color/material_dynamic_secondary80</item>
+        <item name="android:colorPrimary">@color/material_dynamic_secondary80</item>
+        <item name="colorPrimaryDark">@color/material_dynamic_secondary30</item>
+        <item name="colorAccent">@color/material_dynamic_secondary80</item>
+        <item name="colorOnPrimary">@color/material_dynamic_secondary20</item>
         <!-- Needed for leanback fuckery -->
-        <item name="android:colorAccent">@color/material_dynamic_tertiary30</item>
+        <item name="android:colorAccent">@color/material_dynamic_secondary30</item>
     </style>
 
     <style name="OverlayPrimaryColorBlue">

From 8406f6de6543445159aaf3de9e45f32cdb303922 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Mon, 31 Oct 2022 12:37:06 +0100
Subject: [PATCH 043/273] i forgor the ?

---
 .../com/lagradost/cloudstream3/plugins/RepositoryManager.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
index 542e2136..e77747ec 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
@@ -74,8 +74,8 @@ object RepositoryManager {
         val fixedUrl = url.trim()
         return if (fixedUrl.contains("^https?://".toRegex())) {
             fixedUrl
-        } else if (fixedUrl.contains("^(cloudstreamrepo://)|(https://cs\\.repo/)".toRegex())) {
-            fixedUrl.replace("^(cloudstreamrepo://)|(https://cs\\.repo/)".toRegex(), "").let {
+        } else if (fixedUrl.contains("^(cloudstreamrepo://)|(https://cs\\.repo/\??)".toRegex())) {
+            fixedUrl.replace("^(cloudstreamrepo://)|(https://cs\\.repo/\??)".toRegex(), "").let {
                 return@let if (!it.contains("^https?://".toRegex()))
                      "https://${it}"
                 else fixedUrl

From e72f3ff8b921923c7d46283bbc40711a1622d9b0 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Mon, 31 Oct 2022 12:49:00 +0100
Subject: [PATCH 044/273] oops forgor \ this time

---
 .../com/lagradost/cloudstream3/plugins/RepositoryManager.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
index e77747ec..0f23782d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
@@ -74,8 +74,8 @@ object RepositoryManager {
         val fixedUrl = url.trim()
         return if (fixedUrl.contains("^https?://".toRegex())) {
             fixedUrl
-        } else if (fixedUrl.contains("^(cloudstreamrepo://)|(https://cs\\.repo/\??)".toRegex())) {
-            fixedUrl.replace("^(cloudstreamrepo://)|(https://cs\\.repo/\??)".toRegex(), "").let {
+        } else if (fixedUrl.contains("^(cloudstreamrepo://)|(https://cs\\.repo/\\??)".toRegex())) {
+            fixedUrl.replace("^(cloudstreamrepo://)|(https://cs\\.repo/\\??)".toRegex(), "").let {
                 return@let if (!it.contains("^https?://".toRegex()))
                      "https://${it}"
                 else fixedUrl
@@ -213,4 +213,4 @@ object RepositoryManager {
             output.write(dataBuffer, 0, readBytes)
         }
     }
-}
\ No newline at end of file
+}

From 0e8aacf98902fd200d038084ae75f9a54b075fd9 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Mon, 31 Oct 2022 14:23:11 +0100
Subject: [PATCH 045/273] [skip ci] add builds archive

---
 .github/workflows/build_to_archive.yml | 76 ++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 .github/workflows/build_to_archive.yml

diff --git a/.github/workflows/build_to_archive.yml b/.github/workflows/build_to_archive.yml
new file mode 100644
index 00000000..83430766
--- /dev/null
+++ b/.github/workflows/build_to_archive.yml
@@ -0,0 +1,76 @@
+name: Archive build
+
+on:
+  push:
+    branches: [ master ]
+    paths-ignore:
+      - '*.md'
+      - '*.json'
+      - '**/wcokey.txt'
+  workflow_dispatch:
+
+concurrency: 
+  group: "Archive-build"
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Generate access token
+      id: generate_token
+      uses: tibdex/github-app-token@v1
+      with:
+        app_id: ${{ secrets.GH_APP_ID }}
+        private_key: ${{ secrets.GH_APP_KEY }}
+        repository: "recloudstream/secrets"
+    - name: Generate access token (archive)
+      id: generate_archive_token
+      uses: tibdex/github-app-token@v1
+      with:
+        app_id: ${{ secrets.GH_APP_ID }}
+        private_key: ${{ secrets.GH_APP_KEY }}
+        repository: "recloudstream/cloudstream-archive"
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Fetch keystore
+      id: fetch_keystore
+      run: |
+        TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore
+        mkdir -p "${TMP_KEYSTORE_FILE_PATH}"
+        curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "${TMP_KEYSTORE_FILE_PATH}/prerelease_keystore.keystore" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore.jks"
+        curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "keystore_password.txt" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore_password.txt"
+        KEY_PWD="$(cat keystore_password.txt)"
+        echo "::add-mask::${KEY_PWD}"
+        echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
+    - name: Run Gradle
+      run: |
+        ./gradlew assemblePrerelease
+      env:
+        SIGNING_KEY_ALIAS: "key0"
+        SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
+        SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
+    - uses: actions/checkout@v3
+      with:
+        repository: "recloudstream/cloudstream-archive"
+        token: ${{ steps.generate_archive_token.outputs.token }}
+        path: "archive"
+
+    - name: Move build
+      run: |
+        cp app/build/outputs/apk/prerelease/release/*.apk "archive/$(git rev-parse --short HEAD).apk"
+    
+    - name: Push archive
+      run: |
+        cd $GITHUB_WORKSPACE/archive
+        git config --local user.email "actions@github.com"
+        git config --local user.name "GitHub Actions"
+        git add .
+        git commit --amend -m "Build $GITHUB_SHA" || exit 0   # do not error if nothing to commit
+        git push --force
\ No newline at end of file

From a201f5e4f88a89d96a12b16e82f6f10f6b90c983 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Mon, 31 Oct 2022 16:46:02 +0100
Subject: [PATCH 046/273] Add a few more animations to homepage

---
 .../com/lagradost/cloudstream3/ui/home/HomeFragment.kt | 10 +++++++++-
 app/src/main/res/layout/fragment_home.xml              |  9 +++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 9792fa43..95e34b7a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.home
 
+import android.animation.LayoutTransition
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
@@ -23,6 +24,8 @@ import androidx.fragment.app.activityViewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import androidx.transition.ChangeBounds
+import androidx.transition.TransitionManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
@@ -549,7 +552,7 @@ class HomeFragment : Fragment() {
                     home_preview?.isVisible = true
                     (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.apply {
                         setItems(preview.value)
-                       // home_preview_viewpager?.setCurrentItem(1000, false)
+                        // home_preview_viewpager?.setCurrentItem(1000, false)
                     }
 
                     //.also {
@@ -574,10 +577,15 @@ class HomeFragment : Fragment() {
             setPageTransformer(false, HomeScrollTransformer())
             adapter = HomeScrollAdapter { load ->
                 load.apply {
+                    home_preview_title_holder?.let { parent ->
+                        TransitionManager.beginDelayedTransition(parent, ChangeBounds())
+                    }
+
                     home_preview_tags?.text = tags?.joinToString(" • ") ?: ""
                     home_preview_tags?.isGone = tags.isNullOrEmpty()
                     home_preview_image?.setImage(posterUrl, posterHeaders)
                     home_preview_title?.text = name
+
                     home_preview_play?.setOnClickListener {
                         activity?.loadResult(url, apiName, START_ACTION_RESUME_LATEST)
                         //activity.loadSearchResult(url, START_ACTION_RESUME_LATEST)
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 3d7e3ba5..99fee606 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -363,19 +363,20 @@
                 -->
 
                 <LinearLayout
+                    android:id="@+id/home_preview_title_holder"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom"
+                    android:gravity="center"
                     android:orientation="vertical">
 
                     <TextView
                         android:id="@+id/home_preview_title"
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:paddingStart="30dp"
-                        android:paddingEnd="30dp"
                         android:paddingBottom="10dp"
+                        android:paddingHorizontal="30dp"
                         android:textColor="?attr/white"
                         android:textSize="17sp"
                         android:textStyle="bold"
@@ -392,7 +393,7 @@
                         tools:text="5 seasons 50 episodes" />-->
                     <TextView
                         android:id="@+id/home_preview_tags"
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="center"
                         android:paddingStart="30dp"

From 64303eab8d3cd09e93cabef7e2d48c2142f91b49 Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Tue, 1 Nov 2022 02:47:15 +0700
Subject: [PATCH 047/273] [extractor] added Jeniusplay (#183)

---
 .../cloudstream3/extractors/Jeniusplay.kt     | 72 +++++++++++++++++++
 .../cloudstream3/extractors/Moviehab.kt       |  6 +-
 .../cloudstream3/utils/ExtractorApi.kt        |  2 +
 3 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/extractors/Jeniusplay.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Jeniusplay.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Jeniusplay.kt
new file mode 100644
index 00000000..11b66d99
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Jeniusplay.kt
@@ -0,0 +1,72 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+
+open class Jeniusplay : ExtractorApi() {
+    override val name = "Jeniusplay"
+    override val mainUrl = "https://jeniusplay.com"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val document = app.get(url, referer = "$mainUrl/").document
+        val hash = url.split("/").last().substringAfter("data=")
+
+        val m3uLink = app.post(
+            url = "$mainUrl/player/index.php?data=$hash&do=getVideo",
+            data = mapOf("hash" to hash, "r" to "$referer"),
+            referer = url,
+            headers = mapOf("X-Requested-With" to "XMLHttpRequest")
+        ).parsed<ResponseSource>().videoSource
+
+        M3u8Helper.generateM3u8(
+            this.name,
+            m3uLink,
+            url,
+        ).forEach(callback)
+
+
+        document.select("script").map { script ->
+            if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
+                val subData =
+                    getAndUnpack(script.data()).substringAfter("\"tracks\":[").substringBefore("],")
+                tryParseJson<List<Tracks>>("[$subData]")?.map { subtitle ->
+                    subtitleCallback.invoke(
+                        SubtitleFile(
+                            getLanguage(subtitle.label ?: ""),
+                            subtitle.file
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    private fun getLanguage(str: String): String {
+        return when {
+            str.contains("indonesia", true) || str
+                .contains("bahasa", true) -> "Indonesian"
+            else -> str
+        }
+    }
+
+    data class ResponseSource(
+        @JsonProperty("hls") val hls: Boolean,
+        @JsonProperty("videoSource") val videoSource: String,
+        @JsonProperty("securedLink") val securedLink: String?,
+    )
+
+    data class Tracks(
+        @JsonProperty("kind") val kind: String?,
+        @JsonProperty("file") val file: String,
+        @JsonProperty("label") val label: String?,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt
index e2eb7bf0..aaa33ca1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt
@@ -6,7 +6,11 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 
-class Moviehab : ExtractorApi() {
+class MoviehabNet : Moviehab() {
+    override var mainUrl = "https://play.moviehab.net"
+}
+
+open class Moviehab : ExtractorApi() {
     override var name = "Moviehab"
     override var mainUrl = "https://play.moviehab.com"
     override val requiresReferer = false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index ca612385..1a1afb68 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -329,6 +329,8 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Vidmolyme(),
     Voe(),
     Moviehab(),
+    MoviehabNet(),
+    Jeniusplay(),
 
     Gdriveplayerapi(),
     Gdriveplayerapp(),

From ddae2ddf3c228bf2177697708ad7dadc9a1a3257 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Mon, 31 Oct 2022 20:55:33 +0100
Subject: [PATCH 048/273] Revert "Remove provider language (#141)"

This reverts commit a43e950a488637873553d4a46f49a8bb80a86542.
---
 .../com/lagradost/cloudstream3/MainAPI.kt     | 30 +++++++------------
 .../ui/setup/SetupFragmentExtensions.kt       |  2 +-
 .../ui/setup/SetupFragmentLanguage.kt         |  2 +-
 .../main/res/navigation/mobile_navigation.xml | 14 ---------
 app/src/main/res/xml/settings_providers.xml   |  1 -
 5 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index da257d69..f6ecaae8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -18,7 +18,8 @@ import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSet
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.SubtitleHelper
+import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.loadExtractor
 import okhttp3.Interceptor
 import java.text.SimpleDateFormat
 import java.util.*
@@ -193,26 +194,17 @@ object APIHolder {
         return list.filter { names.contains(it) }.map { DubStatus.valueOf(it) }.toHashSet()
     }
 
-    /**
-     * Gets all the activated provider languages
-     * Used to obey the preference provider_lang_key
-     * but it turned out too complicated and unnecessary with extensions.
-     **/
     fun Context.getApiProviderLangSettings(): HashSet<String> {
-        val langs = apis.map { it.lang }.toSet()
-            .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) }
-        return langs.toHashSet()
+        val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+        val hashSet = HashSet<String>()
+        hashSet.add("en") // def is only en
+        val list = settingsManager.getStringSet(
+            this.getString(R.string.provider_lang_key),
+            hashSet.toMutableSet()
+        )
 
-//        val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
-//        val hashSet = HashSet<String>()
-//        hashSet.add("en") // def is only en
-//        val list = settingsManager.getStringSet(
-//            this.getString(R.string.provider_lang_key),
-//            hashSet.toMutableSet()
-//        )
-//
-//        if (list.isNullOrEmpty()) return hashSet
-//        return list.toHashSet()
+        if (list.isNullOrEmpty()) return hashSet
+        return list.toHashSet()
     }
 
     fun Context.getApiTypeSettings(): HashSet<TvType> {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
index c4bf7580..7b7e5458 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
@@ -96,7 +96,7 @@ class SetupFragmentExtensions : Fragment() {
             next_btt?.setOnClickListener {
                 // Continue setup
                 if (isSetup)
-                    findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_media)
+                    findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_provider_languages)
                 else
                     findNavController().navigate(R.id.navigation_home)
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
index f9268d77..71472328 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
@@ -85,7 +85,7 @@ class SetupFragmentLanguage : Fragment() {
                         && PluginManager.getPluginsLocal().isEmpty()
                     //&& PREBUILT_REPOSITORIES.isNotEmpty()
                     ) R.id.action_navigation_global_to_navigation_setup_extensions
-                    else R.id.action_navigation_setup_language_to_navigation_setup_media
+                    else R.id.action_navigation_setup_language_to_navigation_setup_provider_languages
 
                     findNavController().navigate(
                         nextDestination,
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 94d489fd..3c45ee70 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -522,13 +522,6 @@
             app:exitAnim="@anim/exit_anim"
             app:popEnterAnim="@anim/enter_anim"
             app:popExitAnim="@anim/exit_anim" />
-        <action
-            android:id="@+id/action_navigation_setup_language_to_navigation_setup_media"
-            app:destination="@id/navigation_setup_media"
-            app:enterAnim="@anim/enter_anim"
-            app:exitAnim="@anim/exit_anim"
-            app:popEnterAnim="@anim/enter_anim"
-            app:popExitAnim="@anim/exit_anim" />
     </fragment>
 
     <action
@@ -560,13 +553,6 @@
             app:exitAnim="@anim/exit_anim"
             app:popEnterAnim="@anim/enter_anim"
             app:popExitAnim="@anim/exit_anim" />
-        <action
-            android:id="@+id/action_navigation_setup_extensions_to_navigation_setup_media"
-            app:destination="@id/navigation_setup_media"
-            app:enterAnim="@anim/enter_anim"
-            app:exitAnim="@anim/exit_anim"
-            app:popEnterAnim="@anim/enter_anim"
-            app:popExitAnim="@anim/exit_anim" />
     </fragment>
 
     <fragment
diff --git a/app/src/main/res/xml/settings_providers.xml b/app/src/main/res/xml/settings_providers.xml
index 86857653..a177865b 100644
--- a/app/src/main/res/xml/settings_providers.xml
+++ b/app/src/main/res/xml/settings_providers.xml
@@ -2,7 +2,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto">
     <Preference
-            app:isPreferenceVisible="false"
             android:icon="@drawable/ic_baseline_language_24"
             android:key="@string/provider_lang_key"
             android:title="@string/provider_lang_settings" />

From 1c494f0ce25a94f0efe1d62897c83351225c9632 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Mon, 31 Oct 2022 22:09:56 +0100
Subject: [PATCH 049/273] Add back provider languages option (settings >
 providers) If any of your favorite sites disappear check that setting

---
 .../com/lagradost/cloudstream3/MainAPI.kt     | 20 +++++----
 .../cloudstream3/ui/home/HomeFragment.kt      |  5 ++-
 .../cloudstream3/ui/search/SearchFragment.kt  |  4 +-
 .../ui/settings/SettingsProviders.kt          | 42 ++++++++++---------
 .../ui/setup/SetupFragmentExtensions.kt       | 12 +++++-
 .../ui/setup/SetupFragmentLanguage.kt         |  1 -
 .../ui/setup/SetupFragmentProviderLanguage.kt | 18 +++++---
 .../main/res/navigation/mobile_navigation.xml |  7 ++++
 app/src/main/res/values/strings.xml           |  1 +
 9 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index f6ecaae8..190c0cf5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -18,8 +18,6 @@ import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSet
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.loadExtractor
 import okhttp3.Interceptor
 import java.text.SimpleDateFormat
 import java.util.*
@@ -32,6 +30,12 @@ const val USER_AGENT =
 val mapper = JsonMapper.builder().addModule(KotlinModule())
     .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()!!
 
+/**
+ * Defines the constant for the all languages preference, if this is set then it is
+ * the equivalent of all languages being set
+ **/
+const val AllLanguagesName = "universal"
+
 object APIHolder {
     val unixTime: Long
         get() = System.currentTimeMillis() / 1000L
@@ -160,7 +164,8 @@ object APIHolder {
 
         val hashSet = HashSet<String>()
         val activeLangs = getApiProviderLangSettings()
-        hashSet.addAll(apis.filter { activeLangs.contains(it.lang) }.map { it.name })
+        val hasUniversal = activeLangs.contains(AllLanguagesName)
+        hashSet.addAll(apis.filter { hasUniversal || activeLangs.contains(it.lang) }.map { it.name })
 
         /*val set = settingsManager.getStringSet(
             this.getString(R.string.search_providers_list_key),
@@ -196,11 +201,11 @@ object APIHolder {
 
     fun Context.getApiProviderLangSettings(): HashSet<String> {
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
-        val hashSet = HashSet<String>()
-        hashSet.add("en") // def is only en
+        val hashSet = hashSetOf(AllLanguagesName) // def is all languages
+//        hashSet.add("en") // def is only en
         val list = settingsManager.getStringSet(
             this.getString(R.string.provider_lang_key),
-            hashSet.toMutableSet()
+            hashSet
         )
 
         if (list.isNullOrEmpty()) return hashSet
@@ -246,7 +251,8 @@ object APIHolder {
             null
         } ?: default
         val langs = this.getApiProviderLangSettings()
-        val allApis = apis.filter { langs.contains(it.lang) }
+        val hasUniversal = langs.contains(AllLanguagesName)
+        val allApis = apis.filter { hasUniversal || langs.contains(it.lang) }
             .filter { api -> api.hasMainPage || !hasHomePageIsRequired }
         return if (currentPrefMedia.isEmpty()) {
             allApis
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 95e34b7a..a2dd469c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -32,6 +32,7 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.APIHolder.allProviders
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
@@ -349,7 +350,9 @@ class HomeFragment : Fragment() {
             builder.setContentView(R.layout.home_select_mainpage)
             builder.show()
             builder.let { dialog ->
-                val isMultiLang = getApiProviderLangSettings().size > 1
+                val isMultiLang = getApiProviderLangSettings().let { set ->
+                    set.size > 1 || set.contains(AllLanguagesName)
+                }
                 //dialog.window?.setGravity(Gravity.BOTTOM)
 
                 var currentApiName = selectedApiName
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index a4b2be8f..bcb36f7e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -221,7 +221,9 @@ class SearchFragment : Fragment() {
                 builder.setContentView(R.layout.home_select_mainpage)
                 builder.show()
                 builder.let { dialog ->
-                    val isMultiLang = ctx.getApiProviderLangSettings().size > 1
+                    val isMultiLang = ctx.getApiProviderLangSettings().let { set ->
+                        set.size > 1 || set.contains(AllLanguagesName)
+                    }
 
                     val cancelBtt = dialog.findViewById<MaterialButton>(R.id.cancel_btt)
                     val applyBtt = dialog.findViewById<MaterialButton>(R.id.apply_btt)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
index 7bba9d88..4371fc39 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.ui.settings
 
-import android.content.Context
 import android.os.Bundle
 import android.view.View
 import androidx.preference.PreferenceFragmentCompat
@@ -9,17 +8,15 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.getApiDubstatusSettings
 import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
-import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
-
+import kotlin.reflect.jvm.internal.impl.descriptors.deserialization.PlatformDependentDeclarationFilter.All
 
 
 class SettingsProviders : PreferenceFragmentCompat() {
@@ -63,13 +60,17 @@ class SettingsProviders : PreferenceFragmentCompat() {
 
         getPref(R.string.prefer_media_type_key)?.setOnPreferenceClickListener {
             val names = enumValues<TvType>().sorted().map { it.name }
-            val default = enumValues<TvType>().sorted().filter { it != TvType.NSFW }.map { it.ordinal }
+            val default =
+                enumValues<TvType>().sorted().filter { it != TvType.NSFW }.map { it.ordinal }
             val defaultSet = default.map { it.toString() }.toSet()
             val currentList = try {
-                settingsManager.getStringSet(getString(R.string.prefer_media_type_key), defaultSet)?.map {
-                    it.toInt()
-                }
-            } catch (e: Throwable) { null }  ?: default
+                settingsManager.getStringSet(getString(R.string.prefer_media_type_key), defaultSet)
+                    ?.map {
+                        it.toInt()
+                    }
+            } catch (e: Throwable) {
+                null
+            } ?: default
 
             activity?.showMultiDialog(
                 names,
@@ -89,19 +90,22 @@ class SettingsProviders : PreferenceFragmentCompat() {
 
         getPref(R.string.provider_lang_key)?.setOnPreferenceClickListener {
             activity?.getApiProviderLangSettings()?.let { current ->
-                val langs = APIHolder.apis.map { it.lang }.toSet()
-                    .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) }
+                val languages = APIHolder.apis.map { it.lang }.toSet()
+                    .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) } + AllLanguagesName
 
-                val currentList = ArrayList<Int>()
-                for (i in current) {
-                    currentList.add(langs.indexOf(i))
+                val currentList = current.map {
+                    languages.indexOf(it)
                 }
 
-                val names = langs.map {
-                    val emoji = SubtitleHelper.getFlagFromIso(it)
-                    val name = SubtitleHelper.fromTwoLettersToLanguage(it)
-                    val fullName = "$emoji $name"
-                    Pair(it, fullName)
+                val names = languages.map {
+                    if (it == AllLanguagesName) {
+                        Pair(it, getString(R.string.all_languages_preference))
+                    } else {
+                        val emoji = SubtitleHelper.getFlagFromIso(it)
+                        val name = SubtitleHelper.fromTwoLettersToLanguage(it)
+                        val fullName = "$emoji $name"
+                        Pair(it, fullName)
+                    }
                 }
 
                 activity?.showMultiDialog(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
index 7b7e5458..b7d2fff6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
@@ -7,6 +7,9 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
+import com.lagradost.cloudstream3.APIHolder.apis
+import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
+import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.MainActivity.Companion.afterRepositoryLoadedEvent
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.plugins.RepositoryManager
@@ -96,7 +99,14 @@ class SetupFragmentExtensions : Fragment() {
             next_btt?.setOnClickListener {
                 // Continue setup
                 if (isSetup)
-                    findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_provider_languages)
+                    if (
+                    // If any available languages
+                        apis.distinctBy { it.lang }.size > 1
+                    ) {
+                        findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_provider_languages)
+                    } else {
+                        findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_media)
+                    }
                 else
                     findNavController().navigate(R.id.navigation_home)
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
index 71472328..80db59ee 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
@@ -15,7 +15,6 @@ import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
 import com.lagradost.cloudstream3.ui.settings.appLanguages
 import com.lagradost.cloudstream3.ui.settings.getCurrentLocale
 import com.lagradost.cloudstream3.utils.SubtitleHelper
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
index 3e24cc4d..51abee90 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
@@ -12,6 +12,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
+import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
@@ -39,14 +40,21 @@ class SetupFragmentProviderLanguage : Fragment() {
 
             val current = this.getApiProviderLangSettings()
             val langs = APIHolder.apis.map { it.lang }.toSet()
-                .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) }
+                .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) } + AllLanguagesName
+
+            val currentList =
+                current.map { langs.indexOf(it) }.filter { it != -1 } // TODO LOOK INTO
 
-            val currentList = current.map { langs.indexOf(it) }.filter { it != -1 } // TODO LOOK INTO
             val languageNames = langs.map {
-                val emoji = SubtitleHelper.getFlagFromIso(it)
-                val name = SubtitleHelper.fromTwoLettersToLanguage(it)
-                "$emoji $name"
+                if (it == AllLanguagesName) {
+                    getString(R.string.all_languages_preference)
+                } else {
+                    val emoji = SubtitleHelper.getFlagFromIso(it)
+                    val name = SubtitleHelper.fromTwoLettersToLanguage(it)
+                    "$emoji $name"
+                }
             }
+
             arrayAdapter.addAll(languageNames)
 
             listview1?.adapter = arrayAdapter
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 3c45ee70..6ae2fa04 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -553,6 +553,13 @@
             app:exitAnim="@anim/exit_anim"
             app:popEnterAnim="@anim/enter_anim"
             app:popExitAnim="@anim/exit_anim" />
+        <action
+            android:id="@+id/action_navigation_setup_extensions_to_navigation_setup_media"
+            app:destination="@id/navigation_setup_media"
+            app:enterAnim="@anim/enter_anim"
+            app:exitAnim="@anim/exit_anim"
+            app:popEnterAnim="@anim/enter_anim"
+            app:popExitAnim="@anim/exit_anim" />
     </fragment>
 
     <fragment
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3ebd29d..5665ea5c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -637,4 +637,5 @@
     <string name="player_settings_play_in_web">Web Video Cast</string>
     <string name="player_settings_play_in_browser">Browser</string>
     <string name="app_not_found_error">App not found</string>
+    <string name="all_languages_preference">All Languages</string>
 </resources>

From f268418190e9f3d1c1395d8c455d08507ed942a1 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Tue, 1 Nov 2022 00:29:10 +0100
Subject: [PATCH 050/273] fixed homepage

---
 .../cloudstream3/plugins/PluginManager.kt     |  39 +++---
 .../cloudstream3/ui/home/HomeFragment.kt      | 125 ++++++++++-------
 .../cloudstream3/ui/home/HomeScrollAdapter.kt |  97 ++++++++-----
 .../ui/home/HomeScrollTransformer.kt          |  18 ++-
 .../cloudstream3/ui/home/HomeViewModel.kt     | 130 +++++++++---------
 app/src/main/res/layout/fragment_home.xml     |  60 +-------
 app/src/main/res/layout/home_scroll_view.xml  |  74 ++++++++++
 7 files changed, 316 insertions(+), 227 deletions(-)
 create mode 100644 app/src/main/res/layout/home_scroll_view.xml

diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index c0f35601..b9c775c0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -1,40 +1,39 @@
 package com.lagradost.cloudstream3.plugins
 
 import android.app.*
-import dalvik.system.PathClassLoader
-import com.google.gson.Gson
+import android.content.Context
 import android.content.res.AssetManager
 import android.content.res.Resources
-import android.os.Environment
-import android.widget.Toast
-import android.content.Context
 import android.os.Build
+import android.os.Environment
 import android.util.Log
+import android.widget.Toast
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.google.gson.Gson
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.APIHolder.removePluginMapping
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
-import com.lagradost.cloudstream3.plugins.RepositoryManager.ONLINE_PLUGINS_FOLDER
-import com.lagradost.cloudstream3.plugins.RepositoryManager.downloadPluginToFile
 import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.plugins.RepositoryManager.getRepoPlugins
-import com.lagradost.cloudstream3.ui.settings.extensions.REPOSITORIES_KEY
-import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
-import com.lagradost.cloudstream3.utils.VideoDownloadManager.sanitizeFilename
-import com.lagradost.cloudstream3.APIHolder.removePluginMapping
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.mvvm.debugPrint
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.plugins.RepositoryManager.ONLINE_PLUGINS_FOLDER
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
-import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.plugins.RepositoryManager.downloadPluginToFile
+import com.lagradost.cloudstream3.plugins.RepositoryManager.getRepoPlugins
+import com.lagradost.cloudstream3.ui.settings.extensions.REPOSITORIES_KEY
+import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.sanitizeFilename
 import com.lagradost.cloudstream3.utils.extractorApis
+import dalvik.system.PathClassLoader
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import java.io.File
@@ -217,7 +216,7 @@ object PluginManager {
      * 3. If outdated download and load the plugin
      * 4. Else load the plugin normally
      **/
-    fun updateAllOnlinePluginsAndLoadThem(activity: Activity) = ioSafe {
+    fun updateAllOnlinePluginsAndLoadThem(activity: Activity) {
         // Load all plugins as fast as possible!
         loadAllOnlinePlugins(activity)
 
@@ -227,7 +226,7 @@ object PluginManager {
         val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
             ?: emptyArray()) + PREBUILT_REPOSITORIES
 
-        val onlinePlugins = urls.toList().amap {
+        val onlinePlugins = urls.toList().apmap {
             getRepoPlugins(it.url)?.toList() ?: emptyList()
         }.flatten().distinctBy { it.second.url }
 
@@ -248,7 +247,7 @@ object PluginManager {
 
         val updatedPlugins = mutableListOf<String>()
 
-        outdatedPlugins.amap { pluginData ->
+        outdatedPlugins.apmap { pluginData ->
             if (pluginData.isDisabled) {
                 //updatedPlugins.add(activity.getString(R.string.single_plugin_disabled, pluginData.onlineData.second.name))
                 unloadPlugin(pluginData.savedData.filePath)
@@ -279,9 +278,9 @@ object PluginManager {
     /**
      * Use updateAllOnlinePluginsAndLoadThem
      * */
-    fun loadAllOnlinePlugins(activity: Activity) = ioSafe {
+    fun loadAllOnlinePlugins(activity: Activity) {
         // Load all plugins as fast as possible!
-        (getPluginsOnline()).toList().amap { pluginData ->
+        (getPluginsOnline()).toList().apmap { pluginData ->
             loadPlugin(
                 activity,
                 File(pluginData.filePath),
@@ -290,7 +289,7 @@ object PluginManager {
         }
     }
 
-    fun loadAllLocalPlugins(activity: Activity) = ioSafe {
+    fun loadAllLocalPlugins(activity: Activity) {
         val dir = File(LOCAL_PLUGINS_PATH)
         removeKey(PLUGINS_KEY_LOCAL)
 
@@ -298,7 +297,7 @@ object PluginManager {
             val res = dir.mkdirs()
             if (!res) {
                 Log.w(TAG, "Failed to create local directories")
-                return@ioSafe
+                return
             }
         }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index a2dd469c..4b9dd5be 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.ui.home
 
-import android.animation.LayoutTransition
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
@@ -26,13 +25,13 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.ChangeBounds
 import androidx.transition.TransitionManager
+import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
 import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.APIHolder.allProviders
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
@@ -554,7 +553,9 @@ class HomeFragment : Fragment() {
                 is Resource.Success -> {
                     home_preview?.isVisible = true
                     (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.apply {
-                        setItems(preview.value)
+                        if (!setItems(preview.value.second, preview.value.first)) {
+                            home_preview_viewpager?.setCurrentItem(0, false)
+                        }
                         // home_preview_viewpager?.setCurrentItem(1000, false)
                     }
 
@@ -563,6 +564,10 @@ class HomeFragment : Fragment() {
                     //}
                 }
                 else -> {
+                    (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.setItems(
+                        listOf(),
+                        false
+                    )
                     home_preview?.isVisible = false
                     context?.fixPaddingStatusbar(home_watch_holder)
                 }
@@ -577,59 +582,75 @@ class HomeFragment : Fragment() {
         }
 
         home_preview_viewpager?.apply {
-            setPageTransformer(false, HomeScrollTransformer())
-            adapter = HomeScrollAdapter { load ->
-                load.apply {
-                    home_preview_title_holder?.let { parent ->
-                        TransitionManager.beginDelayedTransition(parent, ChangeBounds())
-                    }
-
-                    home_preview_tags?.text = tags?.joinToString(" • ") ?: ""
-                    home_preview_tags?.isGone = tags.isNullOrEmpty()
-                    home_preview_image?.setImage(posterUrl, posterHeaders)
-                    home_preview_title?.text = name
-
-                    home_preview_play?.setOnClickListener {
-                        activity?.loadResult(url, apiName, START_ACTION_RESUME_LATEST)
-                        //activity.loadSearchResult(url, START_ACTION_RESUME_LATEST)
-                    }
-                    home_preview_info?.setOnClickListener {
-                        activity?.loadResult(url, apiName)
-                        //activity.loadSearchResult(random)
-                    }
-                    // very ugly code, but I dont care
-                    val watchType = DataStoreHelper.getResultWatchState(load.getId())
-                    home_preview_bookmark?.setText(watchType.stringRes)
-                    home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
-                        null,
-                        getDrawable(home_preview_bookmark.context, watchType.iconRes),
-                        null,
-                        null
-                    )
-                    home_preview_bookmark?.setOnClickListener { fab ->
-                        activity?.showBottomDialog(
-                            WatchType.values().map { fab.context.getString(it.stringRes) }
-                                .toList(),
-                            DataStoreHelper.getResultWatchState(load.getId()).ordinal,
-                            fab.context.getString(R.string.action_add_to_bookmarks),
-                            showApply = false,
-                            {}) {
-                            val newValue = WatchType.values()[it]
-                            home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
-                                null,
-                                getDrawable(home_preview_bookmark.context, newValue.iconRes),
-                                null,
-                                null
-                            )
-                            home_preview_bookmark?.setText(newValue.stringRes)
-
-                            updateWatchStatus(load, newValue)
-                            reloadStored()
+            setPageTransformer(HomeScrollTransformer())
+            val callback: OnPageChangeCallback = object : OnPageChangeCallback() {
+                override fun onPageSelected(position: Int) {
+                    (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.apply {
+                        if (position >= itemCount - 1 && hasMoreItems) {
+                            hasMoreItems = false // dont make two requests
+                            homeViewModel.loadMoreHomeScrollResponses()
                         }
+
+                        getItem(position)
+                            ?.apply {
+                                home_preview_title_holder?.let { parent ->
+                                    TransitionManager.beginDelayedTransition(parent, ChangeBounds())
+                                }
+
+                                // home_preview_tags?.text = tags?.joinToString(" • ") ?: ""
+                                // home_preview_tags?.isGone = tags.isNullOrEmpty()
+                                // home_preview_image?.setImage(posterUrl, posterHeaders)
+                                // home_preview_title?.text = name
+
+                                home_preview_play?.setOnClickListener {
+                                    activity?.loadResult(url, apiName, START_ACTION_RESUME_LATEST)
+                                    //activity.loadSearchResult(url, START_ACTION_RESUME_LATEST)
+                                }
+                                home_preview_info?.setOnClickListener {
+                                    activity?.loadResult(url, apiName)
+                                    //activity.loadSearchResult(random)
+                                }
+                                // very ugly code, but I dont care
+                                val watchType = DataStoreHelper.getResultWatchState(this.getId())
+                                home_preview_bookmark?.setText(watchType.stringRes)
+                                home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
+                                    null,
+                                    getDrawable(home_preview_bookmark.context, watchType.iconRes),
+                                    null,
+                                    null
+                                )
+                                home_preview_bookmark?.setOnClickListener { fab ->
+                                    activity?.showBottomDialog(
+                                        WatchType.values()
+                                            .map { fab.context.getString(it.stringRes) }
+                                            .toList(),
+                                        DataStoreHelper.getResultWatchState(this.getId()).ordinal,
+                                        fab.context.getString(R.string.action_add_to_bookmarks),
+                                        showApply = false,
+                                        {}) {
+                                        val newValue = WatchType.values()[it]
+                                        home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
+                                            null,
+                                            getDrawable(
+                                                home_preview_bookmark.context,
+                                                newValue.iconRes
+                                            ),
+                                            null,
+                                            null
+                                        )
+                                        home_preview_bookmark?.setText(newValue.stringRes)
+
+                                        updateWatchStatus(this, newValue)
+                                        reloadStored()
+                                    }
+                                }
+
+                            }
                     }
                 }
-
             }
+            registerOnPageChangeCallback(callback)
+            adapter = HomeScrollAdapter()
         }
 
         observe(homeViewModel.apiName) { apiName ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
index b36d7582..a3eaf7c7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
@@ -1,60 +1,89 @@
 package com.lagradost.cloudstream3.ui.home
 
+import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import androidx.viewpager.widget.PagerAdapter
+import androidx.core.view.isGone
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import kotlinx.android.synthetic.main.home_scroll_view.view.*
 
 
-class HomeScrollAdapter(private val onPrimaryCallback: (LoadResponse) -> Unit) : PagerAdapter() {
-    private var items: List<LoadResponse> = listOf()
+class HomeScrollAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+    private var items: MutableList<LoadResponse> = mutableListOf()
+    var hasMoreItems: Boolean = false
 
-    fun setItems(newItems: List<LoadResponse>) {
-        items = newItems
-
-        notifyDataSetChanged()
+    fun getItem(position: Int) : LoadResponse? {
+        return items.getOrNull(position)
     }
 
-    override fun getCount(): Int {
-        return Int.MAX_VALUE//items.size
+    fun setItems(newItems: List<LoadResponse>, hasNext: Boolean): Boolean {
+        val isSame = newItems.firstOrNull()?.url == items.firstOrNull()?.url
+        hasMoreItems = hasNext
+
+        val diffResult = DiffUtil.calculateDiff(
+            HomeScrollDiffCallback(this.items, newItems)
+        )
+
+        items.clear()
+        items.addAll(newItems)
+
+
+        diffResult.dispatchUpdatesTo(this)
+
+        return isSame
     }
 
-    override fun getItemPosition(`object`: Any): Int {
-        return POSITION_NONE//super.getItemPosition(`object`)
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        return CardViewHolder(
+            LayoutInflater.from(parent.context).inflate(R.layout.home_scroll_view, parent, false),
+        )
     }
 
-    private fun getItemAtPosition(idx: Int): LoadResponse {
-        return items[idx % items.size]
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is CardViewHolder -> {
+                holder.bind(items[position])
+            }
+        }
     }
 
-    override fun setPrimaryItem(container: ViewGroup, position: Int, `object`: Any) {
-        super.setPrimaryItem(container, position, `object`)
-        onPrimaryCallback.invoke(getItemAtPosition(position))
+    class CardViewHolder
+    constructor(
+        itemView: View,
+    ) :
+        RecyclerView.ViewHolder(itemView) {
+
+        fun bind(card: LoadResponse) {
+            card.apply {
+                itemView.home_scroll_preview_tags?.text = tags?.joinToString(" • ") ?: ""
+                itemView.home_scroll_preview_tags?.isGone = tags.isNullOrEmpty()
+                itemView.home_scroll_preview?.setImage(posterUrl, posterHeaders)
+                itemView.home_scroll_preview_title?.text = name
+            }
+        }
     }
 
-    override fun instantiateItem(container: ViewGroup, position: Int): Any {
-        val image = ImageView(container.context)
-        val item = getItemAtPosition(position)
-        image.scaleType = ImageView.ScaleType.CENTER_CROP
-        image.setImage(item.posterUrl ?: item.backgroundPosterUrl, item.posterHeaders)
+    class HomeScrollDiffCallback(
+        private val oldList: List<LoadResponse>,
+        private val newList: List<LoadResponse>
+    ) :
+        DiffUtil.Callback() {
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+            oldList[oldItemPosition].url == newList[newItemPosition].url
 
-        // val itemView: View = mLayoutInflater.inflate(R.layout.pager_item, container, false)
+        override fun getOldListSize() = oldList.size
 
-        // val imageView: ImageView = itemView.findViewById<View>(R.id.imageView) as ImageView
-        // imageView.setImageResource(mResources.get(position))
+        override fun getNewListSize() = newList.size
 
-        container.addView(image)
-
-        return image
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+            oldList[oldItemPosition] == newList[newItemPosition]
     }
 
-    override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
-        container.removeView(`object` as View)
-    }
-
-    override fun isViewFromObject(view: View, `object`: Any): Boolean {
-        return view === `object`
+    override fun getItemCount(): Int {
+        return items.size
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollTransformer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollTransformer.kt
index 04b6964b..2d6757f9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollTransformer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollTransformer.kt
@@ -1,13 +1,23 @@
 package com.lagradost.cloudstream3.ui.home
 
 import android.view.View
-import androidx.viewpager.widget.ViewPager
+import androidx.viewpager2.widget.ViewPager2
 
-class HomeScrollTransformer : ViewPager.PageTransformer {
+class HomeScrollTransformer : ViewPager2.PageTransformer {
     override fun transformPage(page: View, position: Float) {
+        //page.translationX = -position * page.width / 2.0f
+
+        //val params = RecyclerView.LayoutParams(
+        //    RecyclerView.LayoutParams.MATCH_PARENT,
+        //    0
+        //)
+        //page.layoutParams = params
+        //progressBar?.layoutParams = params
+
+        val padding = (-position * page.width / 2).toInt()
         page.setPadding(
-            maxOf(0, (-position * page.width / 2).toInt()), 0,
-            maxOf(0, (position * page.width / 2).toInt()), 0
+            padding, 0,
+            -padding, 0
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index 43d849cf..9d75b0f0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.filterHomePageListByFilmQuality
 import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
@@ -12,17 +13,12 @@ import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.AcraApplication.Companion.context
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
-import com.lagradost.cloudstream3.HomePageList
-import com.lagradost.cloudstream3.LoadResponse
-import com.lagradost.cloudstream3.MainAPI
-import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.mvvm.*
 import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.noneApi
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.randomApi
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream3.utils.Coroutines.ioWork
 import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllResumeStateIds
@@ -35,7 +31,6 @@ import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.async
 import kotlinx.coroutines.withContext
 import java.util.*
 import kotlin.collections.set
@@ -49,6 +44,8 @@ class HomeViewModel : ViewModel() {
     private val _randomItems = MutableLiveData<List<SearchResponse>?>(null)
     val randomItems: LiveData<List<SearchResponse>?> = _randomItems
 
+    private var currentShuffledList: List<SearchResponse> = listOf()
+
     private fun autoloadRepo(): APIRepository {
         return APIRepository(apis.first { it.hasMainPage })
     }
@@ -61,9 +58,12 @@ class HomeViewModel : ViewModel() {
     val bookmarks: LiveData<Pair<Boolean, List<SearchResponse>>> = _bookmarks
 
     private val _resumeWatching = MutableLiveData<List<SearchResponse>>()
-    private val _preview = MutableLiveData<Resource<List<LoadResponse>>>()
+    private val _preview = MutableLiveData<Resource<Pair<Boolean, List<LoadResponse>>>>()
+    private val previewResponses = mutableListOf<LoadResponse>()
+    private val previewResponsesAdded = mutableSetOf<String>()
+
     val resumeWatching: LiveData<List<SearchResponse>> = _resumeWatching
-    val preview: LiveData<Resource<List<LoadResponse>>> = _preview
+    val preview: LiveData<Resource<Pair<Boolean, List<LoadResponse>>>> = _preview
 
     fun loadResumeWatching() = viewModelScope.launchSafe {
         val resumeWatching = withContext(Dispatchers.IO) {
@@ -212,6 +212,40 @@ class HomeViewModel : ViewModel() {
         expandAndReturn(name)
     }
 
+    // returns the amount of items added and modifies current
+    private suspend fun updatePreviewResponses(
+        current: MutableList<LoadResponse>,
+        alreadyAdded: MutableSet<String>,
+        shuffledList: List<SearchResponse>,
+        size: Int
+    ): Int {
+        var count = 0
+
+        val addItems = arrayListOf<SearchResponse>()
+        for (searchResponse in shuffledList) {
+            if (!alreadyAdded.contains(searchResponse.url)) {
+                addItems.add(searchResponse)
+                previewResponsesAdded.add(searchResponse.url)
+                if (++count >= size) {
+                    break
+                }
+            }
+        }
+
+        val add = addItems.amap { searchResponse ->
+            repo?.load(searchResponse.url)
+        }.mapNotNull { if (it != null && it is Resource.Success) it.value else null }
+        current.addAll(add)
+        return add.size
+    }
+
+    private var addJob: Job? = null
+    fun loadMoreHomeScrollResponses() {
+        addJob = ioSafe {
+            updatePreviewResponses(previewResponses, previewResponsesAdded, currentShuffledList, 1)
+            _preview.postValue(Resource.Success((previewResponsesAdded.size < currentShuffledList.size) to previewResponses))
+        }
+    }
 
     private fun load(api: MainAPI?) = ioSafe {
         repo = if (api != null) {
@@ -226,6 +260,7 @@ class HomeViewModel : ViewModel() {
         if (repo?.hasMainPage == true) {
             _page.postValue(Resource.Loading())
             _preview.postValue(Resource.Loading())
+            addJob?.cancel()
 
             when (val data = repo?.getMainPage(1, null)) {
                 is Resource.Success -> {
@@ -241,64 +276,10 @@ class HomeViewModel : ViewModel() {
                         }
 
                         val items = data.value.mapNotNull { it?.items }.flatten()
-                        val responses = ioWork {
-                            items.flatMap { it.list }.shuffled().take(6).map { searchResponse ->
-                                async { repo?.load(searchResponse.url) }
-                            }.map { it.await() }.mapNotNull { if (it != null && it is Resource.Success) it.value else null } }
-                        //.amap  { searchResponse ->
-                        //   repo?.load(searchResponse.url)
-                        ///}
-
-                        //.map { searchResponse ->
-                        //   async { repo?.load(searchResponse.url) }
-                        // }.map { it.await() }
 
 
-                        if (responses.isEmpty()) {
-                            _preview.postValue(
-                                Resource.Failure(
-                                    false,
-                                    null,
-                                    null,
-                                    "No homepage responses"
-                                )
-                            )
-                        } else {
-                            _preview.postValue(Resource.Success(responses))
-                        }
-
-                        /*
-                        items.randomOrNull()?.list?.randomOrNull()?.url?.let { url ->
-                            // backup request in case first fails
-                            var first = repo?.load(url)
-                            if(first == null ||first is Resource.Failure) {
-                                first = repo?.load(items.random().list.random().url)
-                            }
-                            first?.let {
-                                _preview.postValue(it)
-                            } ?: run {
-                                _preview.postValue(
-                                    Resource.Failure(
-                                        false,
-                                        null,
-                                        null,
-                                        "No repo found, this should never happen"
-                                    )
-                                )
-                            }
-                        } ?: run {
-                            _preview.postValue(
-                                Resource.Failure(
-                                    false,
-                                    null,
-                                    null,
-                                    "No homepage items"
-                                )
-                            )
-                        }*/
-
-                        _page.postValue(Resource.Success(expandable))
-
+                        previewResponses.clear()
+                        previewResponsesAdded.clear()
 
                         //val home = data.value
                         if (items.isNotEmpty()) {
@@ -313,9 +294,30 @@ class HomeViewModel : ViewModel() {
                                     context?.filterSearchResultByFilmQuality(currentList.shuffled())
                                         ?: currentList.shuffled()
 
+                                updatePreviewResponses(
+                                    previewResponses,
+                                    previewResponsesAdded,
+                                    randomItems,
+                                    3
+                                )
+
                                 _randomItems.postValue(randomItems)
+                                currentShuffledList = randomItems
                             }
                         }
+                        if (previewResponses.isEmpty()) {
+                            _preview.postValue(
+                                Resource.Failure(
+                                    false,
+                                    null,
+                                    null,
+                                    "No homepage responses"
+                                )
+                            )
+                        } else {
+                            _preview.postValue(Resource.Success((previewResponsesAdded.size < currentShuffledList.size) to previewResponses))
+                        }
+                        _page.postValue(Resource.Success(expandable))
                     } catch (e: Exception) {
                         _randomItems.postValue(emptyList())
                         logError(e)
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 99fee606..4eb7b9ee 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -287,39 +287,23 @@
                 android:visibility="gone"
                 tools:visibility="visible">
 
-                <androidx.viewpager.widget.ViewPager
+                <androidx.viewpager2.widget.ViewPager2
                     android:id="@+id/home_preview_viewpager"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal">
 
-                </androidx.viewpager.widget.ViewPager>
+                </androidx.viewpager2.widget.ViewPager2>
 
                 <ImageView
-                    android:visibility="gone"
                     android:id="@+id/home_preview_image"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:alpha="0.8"
                     android:scaleType="centerCrop"
+                    android:visibility="gone"
                     tools:src="@drawable/example_poster" />
 
-                <View
-                    android:id="@+id/title_shadow_top"
-                    android:layout_width="match_parent"
-                    android:layout_height="150dp"
-                    android:layout_gravity="top"
-                    android:alpha="1"
-                    android:background="@drawable/background_shadow"
-                    android:rotation="180"
-                    android:visibility="visible" />
-
-                <View
-                    android:id="@+id/title_shadow"
-                    android:layout_width="match_parent"
-                    android:layout_height="300dp"
-                    android:layout_gravity="bottom"
-                    android:background="@drawable/background_shadow" />
-
                 <LinearLayout
                     android:id="@+id/home_padding"
                     android:layout_width="match_parent"
@@ -363,44 +347,14 @@
                 -->
 
                 <LinearLayout
+
                     android:id="@+id/home_preview_title_holder"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="100dp"
                     android:layout_gravity="bottom"
                     android:gravity="center"
                     android:orientation="vertical">
 
-                    <TextView
-                        android:id="@+id/home_preview_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingBottom="10dp"
-                        android:paddingHorizontal="30dp"
-                        android:textColor="?attr/white"
-                        android:textSize="17sp"
-                        android:textStyle="bold"
-                        tools:text="The Perfect Run" />
-                    <!--<TextView
-                        android:paddingStart="30dp"
-                        android:paddingEnd="30dp"
-                        android:id="@+id/home_season_tags"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:textColor="@color/white"
-                        android:textSize="14sp"
-                        tools:text="5 seasons 50 episodes" />-->
-                    <TextView
-                        android:id="@+id/home_preview_tags"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingStart="30dp"
-                        android:paddingEnd="30dp"
-                        android:textColor="?attr/white"
-                        android:textSize="14sp"
-                        tools:text="Hello • World • Tags" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/home_scroll_view.xml b/app/src/main/res/layout/home_scroll_view.xml
new file mode 100644
index 00000000..c106bee0
--- /dev/null
+++ b/app/src/main/res/layout/home_scroll_view.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:background="?attr/primaryGrayBackground"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/home_scroll_preview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        tools:src="@drawable/example_poster" />
+
+    <View
+        android:id="@+id/title_shadow_top"
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:layout_gravity="top"
+        android:alpha="1"
+        android:background="@drawable/background_shadow"
+        android:rotation="180"
+        android:visibility="visible" />
+
+    <View
+        android:id="@+id/title_shadow"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        android:layout_gravity="bottom"
+        android:background="@drawable/background_shadow" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|bottom"
+        android:layout_marginBottom="100dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/home_scroll_preview_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center"
+            android:paddingHorizontal="30dp"
+            android:paddingBottom="10dp"
+            android:textColor="?attr/white"
+            android:textSize="17sp"
+            android:textStyle="bold"
+            tools:text="The Perfect Run" />
+        <!--<TextView
+            android:paddingStart="30dp"
+            android:paddingEnd="30dp"
+            android:id="@+id/home_season_tags"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            tools:text="5 seasons 50 episodes" />-->
+        <TextView
+            android:id="@+id/home_scroll_preview_tags"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center"
+            android:paddingStart="30dp"
+            android:paddingEnd="30dp"
+            android:textColor="?attr/white"
+            android:textSize="14sp"
+            tools:text="Hello • World • Tags" />
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file

From 28b4456dfd6e808553a7bbffbd06c8ef4e6dfc9a Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Tue, 1 Nov 2022 18:01:29 +0100
Subject: [PATCH 051/273] resultpage UI update and readded trailers

---
 app/build.gradle.kts                          |   10 +-
 .../extractors/YoutubeExtractor.kt            |    1 +
 .../cloudstream3/ui/result/ResultFragment.kt  |    6 +-
 .../ui/result/ResultFragmentPhone.kt          |   66 +-
 .../ui/result/ResultTrailerPlayer.kt          |    2 +
 .../ui/result/ResultViewModel2.kt             |    4 +
 .../cloudstream3/ui/result/UiText.kt          |    8 +-
 .../lagradost/cloudstream3/utils/UIHelper.kt  |   15 +-
 app/src/main/res/layout/fragment_player.xml   |    1 -
 .../main/res/layout/fragment_player_tv.xml    |    1 -
 app/src/main/res/layout/fragment_result.xml   | 1125 +++++++++--------
 app/src/main/res/layout/fragment_trailer.xml  |    1 -
 .../main/res/layout/trailer_custom_layout.xml |  681 +++++-----
 app/src/main/res/values/styles.xml            |    2 +
 14 files changed, 1009 insertions(+), 914 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 42ca93fd..2f31f1c2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -176,7 +176,9 @@ dependencies {
     implementation("com.jaredrummler:colorpicker:1.1.0")
 
     //run JS
-    implementation("org.mozilla:rhino:1.7.14")
+    // do not upgrade to 1.7.14, since in 1.7.14 Rhino uses the `SourceVersion` class, which is not
+    // available on Android (even when using desugaring), and `NoClassDefFoundError` is thrown
+    implementation("org.mozilla:rhino:1.7.13")
 
     // TorrentStream
     //implementation("com.github.TorrentStream:TorrentStream-Android:2.7.0")
@@ -211,9 +213,9 @@ dependencies {
     // slow af yt
     //implementation("com.github.HaarigerHarald:android-youtubeExtractor:master-SNAPSHOT")
 
-    // newpipe yt
-    implementation("com.github.TeamNewPipe:NewPipeExtractor:dev-SNAPSHOT")
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
+    // newpipe yt taken from https://github.com/TeamNewPipe/NewPipe/blob/dev/app/build.gradle#L190
+    implementation("com.github.TeamNewPipe:NewPipeExtractor:9ffdd0948b2ecd82655f5ff2a3e127b2b7695d5b")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.6")
 
     // Library/extensions searching with Levenshtein distance
     implementation("me.xdrop:fuzzywuzzy:1.4.0")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
index 23704e90..572d93a3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
@@ -46,6 +46,7 @@ open class YoutubeExtractor : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
+        println("TRYING TO ExTRACT: $url")
         if (ytVideos[url].isNullOrEmpty()) {
             val link =
                 YoutubeStreamLinkHandlerFactory.getInstance().fromUrl(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index db71b714..26dbb03e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -23,6 +23,7 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
 import com.discord.panels.OverlappingPanelsLayout
 import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipDrawable
 import com.lagradost.cloudstream3.APIHolder.getApiDubstatusSettings
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.APIHolder.updateHasTrailers
@@ -96,11 +97,10 @@ import kotlinx.android.synthetic.main.fragment_result.result_vpn
 import kotlinx.android.synthetic.main.fragment_result_swipe.*
 import kotlinx.android.synthetic.main.fragment_result_tv.*
 import kotlinx.android.synthetic.main.result_sync.*
+import kotlinx.android.synthetic.main.trailer_custom_layout.*
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 
-import com.google.android.material.chip.ChipDrawable
-
 const val START_ACTION_RESUME_LATEST = 1
 const val START_ACTION_LOAD_EP = 2
 
@@ -839,6 +839,8 @@ open class ResultFragment : ResultTrailerPlayer() {
                     result_next_airing.setText(d.nextAiringEpisode)
                     result_next_airing_time.setText(d.nextAiringDate)
                     result_poster.setImage(d.posterImage)
+                    result_poster_background.setImage(d.posterBackgroundImage)
+                    //result_trailer_thumbnail.setImage(d.posterBackgroundImage, fadeIn = false)
 
                     if (d.posterImage != null && !isTrueTvSettings())
                         result_poster_holder?.setOnClickListener {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index 813872c9..9bae8753 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -5,6 +5,9 @@ import android.graphics.Rect
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
+import android.view.animation.AlphaAnimation
+import android.view.animation.Animation
+import android.view.animation.DecelerateInterpolator
 import android.widget.Toast
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
@@ -20,27 +23,33 @@ import com.lagradost.cloudstream3.APIHolder.updateHasTrailers
 import com.lagradost.cloudstream3.mvvm.Some
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
-import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
 import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
 import com.lagradost.cloudstream3.utils.AppUtils.openBrowser
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIcons
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
 import kotlinx.android.synthetic.main.fragment_result.*
+import kotlinx.android.synthetic.main.fragment_result.result_cast_items
+import kotlinx.android.synthetic.main.fragment_result.result_episodes_text
+import kotlinx.android.synthetic.main.fragment_result.result_resume_parent
+import kotlinx.android.synthetic.main.fragment_result.result_scroll
+import kotlinx.android.synthetic.main.fragment_result.result_smallscreen_holder
 import kotlinx.android.synthetic.main.fragment_result_swipe.*
+import kotlinx.android.synthetic.main.fragment_result_swipe.result_back
+import kotlinx.android.synthetic.main.fragment_result_tv.*
 import kotlinx.android.synthetic.main.fragment_trailer.*
 import kotlinx.android.synthetic.main.result_recommendations.*
+import kotlinx.android.synthetic.main.result_recommendations.result_recommendations
 import kotlinx.android.synthetic.main.trailer_custom_layout.*
 
+
 class ResultFragmentPhone : ResultFragment() {
     var currentTrailers: List<ExtractorLink> = emptyList()
     var currentTrailerIndex = 0
@@ -84,8 +93,36 @@ class ResultFragmentPhone : ResultFragment() {
             } ?: run {
                 false
             }
+        //result_trailer_thumbnail?.setImageBitmap(result_poster_background?.drawable?.toBitmap())
+
+
         result_trailer_loading?.isVisible = isSuccess
-        result_smallscreen_holder?.isVisible = !isSuccess && !isFullScreenPlayer
+        val turnVis = !isSuccess && !isFullScreenPlayer
+        result_smallscreen_holder?.isVisible = turnVis
+        result_poster_background_holder?.apply {
+            val fadeIn: Animation = AlphaAnimation(alpha, if (turnVis) 1.0f else 0.0f).apply {
+                interpolator = DecelerateInterpolator()
+                duration = 200
+                fillAfter = true
+            }
+            clearAnimation()
+            startAnimation(fadeIn)
+        }
+
+        //player_view?.apply {
+        //alpha = 0.0f
+        //ObjectAnimator.ofFloat(player_view, "alpha", 1f).apply {
+        //    duration = 200
+        //    start()
+        //}
+
+        //val fadeIn: Animation = AlphaAnimation(0.0f, 1f).apply {
+        //    interpolator = DecelerateInterpolator()
+        //    duration = 2000
+        //    fillAfter = true
+        //}
+        //startAnimation(fadeIn)
+        // }
 
         // We don't want the trailer to be focusable if it's not visible
         result_smallscreen_holder?.descendantFocusability = if (isSuccess) {
@@ -129,7 +166,7 @@ class ResultFragmentPhone : ResultFragment() {
         down.nextFocusUpId = upper.id
     }
 
-    var selectSeason : String? = null
+    var selectSeason: String? = null
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         val apiName = arguments?.getString(API_NAME_BUNDLE) ?: return
@@ -301,13 +338,14 @@ class ResultFragmentPhone : ResultFragment() {
         observe(viewModel.selectedSeason) { text ->
             result_season_button.setText(text)
 
-            selectSeason = (if (text is Some.Success) text.value else null)?.asStringNull(result_season_button?.context)
+            selectSeason =
+                (if (text is Some.Success) text.value else null)?.asStringNull(result_season_button?.context)
             // If the season button is visible the result season button will be next focus down
             if (result_season_button?.isVisible == true)
                 if (result_resume_parent?.isVisible == true)
                     setFocusUpAndDown(result_resume_series_button, result_season_button)
-                //else
-                //    setFocusUpAndDown(result_bookmark_button, result_season_button)
+            //else
+            //    setFocusUpAndDown(result_bookmark_button, result_season_button)
         }
 
         observe(viewModel.selectedDubStatus) { status ->
@@ -317,8 +355,8 @@ class ResultFragmentPhone : ResultFragment() {
                 if (result_season_button?.isVisible != true && result_episode_select?.isVisible != true) {
                     if (result_resume_parent?.isVisible == true)
                         setFocusUpAndDown(result_resume_series_button, result_dub_select)
-                   //else
-                   //    setFocusUpAndDown(result_bookmark_button, result_dub_select)
+                    //else
+                    //    setFocusUpAndDown(result_bookmark_button, result_dub_select)
                 }
         }
         observe(viewModel.selectedRange) { range ->
@@ -378,12 +416,16 @@ class ResultFragmentPhone : ResultFragment() {
                             r to (text?.asStringNull(ctx) ?: return@mapNotNull null)
                         }
 
-                    activity?.showDialog(names.map { it.second },names.indexOfFirst { it.second == selectSeason },"",false,{}) { itemId->
+                    activity?.showDialog(
+                        names.map { it.second },
+                        names.indexOfFirst { it.second == selectSeason },
+                        "",
+                        false,
+                        {}) { itemId ->
                         viewModel.changeSeason(names[itemId].first)
                     }
 
 
-
                     //view.popupMenuNoIconsAndNoStringRes(names.mapIndexed { index, (_, name) ->
                     //    index to name
                     //}) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
index 26c9249d..8a6e5b37 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
@@ -13,7 +13,9 @@ import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.utils.IOnBackPressed
 import kotlinx.android.synthetic.main.fragment_result.*
+import kotlinx.android.synthetic.main.fragment_result.result_smallscreen_holder
 import kotlinx.android.synthetic.main.fragment_result_swipe.*
+import kotlinx.android.synthetic.main.fragment_result_tv.*
 import kotlinx.android.synthetic.main.fragment_trailer.*
 import kotlinx.android.synthetic.main.trailer_custom_layout.*
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index f424989e..6b04ebf9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -88,6 +88,7 @@ data class ResultData(
     var syncData: Map<String, String>,
 
     val posterImage: UiImage?,
+    val posterBackgroundImage: UiImage?,
     val plotText: UiText,
     val apiName: UiText,
     val ratingText: UiText?,
@@ -170,6 +171,9 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData {
         posterImage = img(
             posterUrl, posterHeaders
         ) ?: img(R.drawable.default_cover),
+        posterBackgroundImage = img(
+            backgroundPosterUrl ?: posterUrl, posterHeaders
+        ) ?: img(R.drawable.default_cover),
         titleText = txt(name),
         url = url,
         tags = tags ?: emptyList(),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt
index 0ca232e1..81ef8d57 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt
@@ -70,9 +70,9 @@ sealed class UiImage {
     data class Drawable(@DrawableRes val resId: Int) : UiImage()
 }
 
-fun ImageView?.setImage(value: UiImage?) {
+fun ImageView?.setImage(value: UiImage?, fadeIn: Boolean = true) {
     when (value) {
-        is UiImage.Image -> setImageImage(value)
+        is UiImage.Image -> setImageImage(value,fadeIn)
         is UiImage.Drawable -> setImageDrawable(value)
         null -> {
             this?.isVisible = false
@@ -80,9 +80,9 @@ fun ImageView?.setImage(value: UiImage?) {
     }
 }
 
-fun ImageView?.setImageImage(value: UiImage.Image) {
+fun ImageView?.setImageImage(value: UiImage.Image, fadeIn: Boolean = true) {
     if (this == null) return
-    this.isVisible = setImage(value.url, value.headers, value.errorDrawable)
+    this.isVisible = setImage(value.url, value.headers, value.errorDrawable, fadeIn)
 }
 
 fun ImageView?.setImageDrawable(value: UiImage.Drawable) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
index ab49492a..20d6d03e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
@@ -136,7 +136,7 @@ object UIHelper {
                     navigation, arguments
                 )
             }
-        } catch (t : Throwable) {
+        } catch (t: Throwable) {
             logError(t)
         }
     }
@@ -159,17 +159,20 @@ object UIHelper {
         url: String?,
         headers: Map<String, String>? = null,
         @DrawableRes
-        errorImageDrawable: Int? = null
+        errorImageDrawable: Int? = null,
+        fadeIn: Boolean = true
     ): Boolean {
         if (this == null || url.isNullOrBlank()) return false
 
         return try {
             val builder = GlideApp.with(this)
-                .load(GlideUrl(url) { headers ?: emptyMap() }).transition(
-                    DrawableTransitionOptions.withCrossFade()
-                )
+                .load(GlideUrl(url) { headers ?: emptyMap() })
                 .skipMemoryCache(true)
-                .diskCacheStrategy(DiskCacheStrategy.ALL)
+                .diskCacheStrategy(DiskCacheStrategy.ALL).let { req ->
+                    if (fadeIn)
+                        req.transition(DrawableTransitionOptions.withCrossFade())
+                    else req
+                }
 
             val res = if (errorImageDrawable != null)
                 builder.error(errorImageDrawable).into(this)
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index c3660a58..232dcaa0 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -5,7 +5,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="horizontal"
-        android:keepScreenOn="true"
         android:id="@+id/player_background"
         app:backgroundTint="@android:color/black"
         android:background="@android:color/black"
diff --git a/app/src/main/res/layout/fragment_player_tv.xml b/app/src/main/res/layout/fragment_player_tv.xml
index b84aaf7d..fec649a8 100644
--- a/app/src/main/res/layout/fragment_player_tv.xml
+++ b/app/src/main/res/layout/fragment_player_tv.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/black"
-    android:keepScreenOn="true"
     android:orientation="horizontal"
     android:screenOrientation="sensorLandscape"
     app:backgroundTint="@android:color/black"
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index ceab8f94..ed2ec6bd 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/result_root"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        style="@style/DarkFragment"
-        android:background="?attr/primaryBlackBackground"
-        android:clickable="true"
-        android:focusable="true">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/result_root"
+    style="@style/DarkFragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/primaryBlackBackground"
+    android:clickable="true"
+    android:focusable="true">
 
     <com.facebook.shimmer.ShimmerFrameLayout
-            android:id="@+id/result_loading"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:orientation="vertical"
-            app:shimmer_auto_start="true"
-            app:shimmer_base_alpha="0.2"
-            app:shimmer_duration="@integer/loading_time"
-            app:shimmer_highlight_alpha="0.3"
-            tools:visibility="gone">
+        android:id="@+id/result_loading"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        app:shimmer_auto_start="true"
+        app:shimmer_base_alpha="0.2"
+        app:shimmer_duration="@integer/loading_time"
+        app:shimmer_highlight_alpha="0.3"
+        tools:visibility="gone">
 
         <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/result_padding"
-                android:orientation="vertical">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/result_padding"
+            android:orientation="vertical">
 
             <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginBottom="@dimen/loading_margin"
-                    android:orientation="horizontal">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="@dimen/loading_margin"
+                android:orientation="horizontal">
 
                 <include layout="@layout/loading_poster" />
 
                 <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/loading_margin"
-                        android:layout_marginEnd="@dimen/loading_margin"
-                        android:orientation="vertical">
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/loading_margin"
+                    android:layout_marginEnd="@dimen/loading_margin"
+                    android:orientation="vertical">
 
                     <include layout="@layout/loading_line" />
 
@@ -56,9 +56,9 @@
             </LinearLayout>
 
             <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="20dp"
-                    tools:ignore="ContentDescription" />
+                android:layout_width="match_parent"
+                android:layout_height="20dp"
+                tools:ignore="ContentDescription" />
 
             <include layout="@layout/loading_episode" />
 
@@ -75,106 +75,100 @@
             android:layout_width="50dp" android:layout_height="50dp">
     </ProgressBar>-->
     <LinearLayout
-            android:id="@+id/result_loading_error"
+        android:id="@+id/result_loading_error"
 
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="gone">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/result_reload_connectionerror"
+            style="@style/WhiteButton"
+
+            android:layout_width="wrap_content"
+
+            android:layout_gravity="center"
+            android:layout_margin="5dp"
+            android:minWidth="200dp"
+            android:text="@string/reload_error"
+            app:icon="@drawable/ic_baseline_autorenew_24" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/result_reload_connection_open_in_browser"
+            style="@style/BlackButton"
+
+            android:layout_width="wrap_content"
+
+            android:layout_gravity="center"
+            android:layout_margin="5dp"
+            android:minWidth="200dp"
+            android:text="@string/result_open_in_browser"
+            app:icon="@drawable/ic_baseline_public_24" />
+
+        <TextView
+            android:id="@+id/result_error_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:orientation="vertical"
-            android:visibility="gone"
-            tools:visibility="gone">
-
-        <com.google.android.material.button.MaterialButton
-                android:id="@+id/result_reload_connectionerror"
-                style="@style/WhiteButton"
-
-                android:layout_width="wrap_content"
-
-                android:layout_gravity="center"
-                android:layout_margin="5dp"
-                android:minWidth="200dp"
-                android:text="@string/reload_error"
-                app:icon="@drawable/ic_baseline_autorenew_24" />
-
-        <com.google.android.material.button.MaterialButton
-                android:id="@+id/result_reload_connection_open_in_browser"
-                style="@style/BlackButton"
-
-                android:layout_width="wrap_content"
-
-                android:layout_gravity="center"
-                android:layout_margin="5dp"
-                android:minWidth="200dp"
-                android:text="@string/result_open_in_browser"
-                app:icon="@drawable/ic_baseline_public_24" />
-
-        <TextView
-                android:id="@+id/result_error_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_margin="5dp"
-                android:gravity="center"
-                android:textColor="?attr/textColor" />
+            android:layout_margin="5dp"
+            android:gravity="center"
+            android:textColor="?attr/textColor" />
     </LinearLayout>
 
     <LinearLayout
-            android:id="@+id/result_finish_loading"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone"
-            tools:visibility="visible"
-            android:orientation="vertical">
+        android:id="@+id/result_finish_loading"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <androidx.core.widget.NestedScrollView
-                android:id="@+id/result_scroll"
-                android:layout_width="match_parent"
+            android:id="@+id/result_scroll"
+            android:layout_width="match_parent"
 
-                android:layout_height="wrap_content"
-                android:background="?attr/primaryGrayBackground">
+            android:layout_height="wrap_content"
+            android:background="?attr/primaryGrayBackground">
 
             <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="?attr/primaryBlackBackground"
-                    android:orientation="vertical">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="?attr/primaryBlackBackground"
+                android:orientation="vertical">
 
+                <!--
                 <com.facebook.shimmer.ShimmerFrameLayout
-                        tools:visibility="gone"
-                        android:visibility="gone"
-                        android:id="@+id/result_trailer_loading"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:orientation="vertical"
-                        app:shimmer_auto_start="true"
-                        app:shimmer_base_alpha="0.2"
-                        app:shimmer_duration="@integer/loading_time"
-                        app:shimmer_highlight_alpha="0.3">
+                    android:id="@+id/result_trailer_loading"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:orientation="vertical"
+                    android:visibility="gone"
+                    app:shimmer_auto_start="true"
+                    app:shimmer_base_alpha="0.2"
+                    app:shimmer_duration="@integer/loading_time"
+                    app:shimmer_highlight_alpha="0.3"
+                    tools:visibility="gone">
 
                     <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_margin="@dimen/result_padding"
-                            android:orientation="vertical">
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/result_padding"
+                        android:orientation="vertical">
 
                         <androidx.cardview.widget.CardView
-                                android:background="@color/grayShimmer"
-                                app:cardCornerRadius="@dimen/loading_radius"
-                                android:layout_width="match_parent"
-                                android:layout_height="150dp"
-                                android:foreground="@drawable/outline_drawable" />
+                            android:layout_width="match_parent"
+                            android:layout_height="150dp"
+                            android:background="@color/grayShimmer"
+                            android:foreground="@drawable/outline_drawable"
+                            app:cardCornerRadius="@dimen/loading_radius" />
                     </LinearLayout>
                 </com.facebook.shimmer.ShimmerFrameLayout>
+-->
 
-                <FrameLayout
-                        android:descendantFocusability="blocksDescendants"
-                        android:id="@+id/result_smallscreen_holder"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-
-                    <include layout="@layout/fragment_trailer" />
-                </FrameLayout>
 
                 <!--
                 <FrameLayout
@@ -272,93 +266,124 @@
                                 app:tint="?attr/textColor" />
                     </LinearLayout>
                 </FrameLayout>-->
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="200dp">
 
-                <LinearLayout
+
+                    <FrameLayout
+                        android:id="@+id/result_smallscreen_holder"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:descendantFocusability="blocksDescendants">
+
+                        <include layout="@layout/fragment_trailer" />
+                    </FrameLayout>
+                    <FrameLayout
+                        android:id="@+id/result_poster_background_holder"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+                    <ImageView
+                        android:id="@+id/result_poster_background"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:clipToPadding="false"
-                        android:orientation="vertical"
-                        android:paddingStart="@dimen/result_padding"
-                        android:paddingEnd="@dimen/result_padding">
+                        android:scaleType="centerCrop" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="60dp"
+                        android:layout_gravity="bottom"
+                        android:background="@drawable/background_shadow" />
+                    </FrameLayout>
+                </FrameLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:clipToPadding="false"
+                    android:orientation="vertical"
+                    android:paddingStart="@dimen/result_padding"
+                    android:paddingEnd="@dimen/result_padding">
+
 
                     <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="10dp"
-                            android:layout_marginBottom="15dp"
-                            android:orientation="horizontal"
-                            android:visibility="visible">
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginBottom="15dp"
+                        android:orientation="horizontal"
+                        android:visibility="visible">
+
 
                         <androidx.cardview.widget.CardView
-                                android:id="@+id/result_poster_holder"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                app:cardCornerRadius="@dimen/rounded_image_radius">
+                            android:id="@+id/result_poster_holder"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:visibility="gone"
+                            app:cardCornerRadius="@dimen/rounded_image_radius">
 
                             <ImageView
-                                    android:id="@+id/result_poster"
+                                android:id="@+id/result_poster"
 
-                                    android:layout_width="100dp"
-                                    android:layout_height="140dp"
-                                    android:contentDescription="@string/result_poster_img_des"
-                                    android:foreground="@drawable/outline_drawable"
-                                    android:scaleType="centerCrop"
-                                    tools:src="@drawable/example_poster" />
+                                android:layout_width="100dp"
+                                android:layout_height="140dp"
+                                android:contentDescription="@string/result_poster_img_des"
+                                android:foreground="@drawable/outline_drawable"
+                                android:scaleType="centerCrop"
+                                tools:src="@drawable/example_poster" />
                         </androidx.cardview.widget.CardView>
 
                         <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:orientation="vertical">
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:orientation="vertical">
 
                             <TextView
-                                    android:layout_marginHorizontal="10dp"
-                                    android:id="@+id/result_title"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginBottom="5dp"
-                                    android:maxLines="2"
-                                    android:textColor="?attr/textColor"
-                                    android:textSize="20sp"
-                                    android:textStyle="bold"
-                                    tools:text="The Perfect Run The Perfect Run" />
+                                android:id="@+id/result_title"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginBottom="5dp"
+                                android:maxLines="2"
+                                android:textColor="?attr/textColor"
+                                android:textSize="20sp"
+                                android:textStyle="bold"
+                                tools:text="The Perfect Run The Perfect Run" />
 
                             <com.lagradost.cloudstream3.widget.FlowLayout
-                                    android:layout_marginHorizontal="10dp"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    app:itemSpacing="10dp">
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                app:itemSpacing="10dp">
 
                                 <com.google.android.material.button.MaterialButton
-                                        android:id="@+id/result_meta_site"
-                                        style="@style/SmallBlackButton"
-                                        android:layout_gravity="center_vertical"
-                                        tools:text="Gogoanime" />
+                                    android:id="@+id/result_meta_site"
+                                    style="@style/SmallBlackButton"
+                                    android:layout_gravity="center_vertical"
+                                    tools:text="Gogoanime" />
 
                                 <TextView
-                                        android:id="@+id/result_meta_type"
-                                        style="@style/ResultInfoText"
-                                        tools:text="Movie" />
+                                    android:id="@+id/result_meta_type"
+                                    style="@style/ResultInfoText"
+                                    tools:text="Movie" />
 
                                 <TextView
-                                        android:id="@+id/result_meta_year"
-                                        style="@style/ResultInfoText"
-                                        tools:text="2022" />
+                                    android:id="@+id/result_meta_year"
+                                    style="@style/ResultInfoText"
+                                    tools:text="2022" />
 
                                 <TextView
-                                        android:id="@+id/result_meta_rating"
-                                        style="@style/ResultInfoText"
-                                        tools:text="Rated: 8.5/10.0" />
+                                    android:id="@+id/result_meta_rating"
+                                    style="@style/ResultInfoText"
+                                    tools:text="Rated: 8.5/10.0" />
 
                                 <TextView
-                                        android:id="@+id/result_meta_status"
-                                        style="@style/ResultInfoText"
-                                        tools:text="Ongoing" />
+                                    android:id="@+id/result_meta_status"
+                                    style="@style/ResultInfoText"
+                                    tools:text="Ongoing" />
 
                                 <TextView
-                                        android:id="@+id/result_meta_duration"
-                                        style="@style/ResultInfoText"
-                                        tools:text="121min" />
+                                    android:id="@+id/result_meta_duration"
+                                    style="@style/ResultInfoText"
+                                    tools:text="121min" />
                             </com.lagradost.cloudstream3.widget.FlowLayout>
 
                             <!--
@@ -366,126 +391,126 @@
                             The focus outline now settles between the poster and text.
                             -->
                             <FrameLayout
-                                    android:layout_marginHorizontal="5dp"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent">
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent">
 
                                 <TextView
-                                        android:padding="5dp"
-                                        android:maxLength="1000"
-                                        android:ellipsize="end"
-                                        android:id="@+id/result_description"
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:foreground="@drawable/outline_drawable"
-                                        android:nextFocusUp="@id/result_back"
-                                        android:nextFocusDown="@id/result_bookmark_button"
-                                        android:textColor="?attr/textColor"
-                                        android:textSize="15sp"
-                                        tools:text="Ryan Quicksave Romano is an eccentric adventurer with a strange power: he can create a save-point in time and redo his life whenever he dies. Arriving in New Rome, the glitzy capital of sin of a rebuilding Europe, he finds the city torn between mega-corporations, sponsored heroes, superpowered criminals, and true monsters. It's a time of chaos, where potions can grant the power to rule the world and dangers lurk everywhere. " />
+                                    android:id="@+id/result_description"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:ellipsize="end"
+                                    android:foreground="@drawable/outline_drawable"
+                                    android:maxLength="1000"
+                                    android:nextFocusUp="@id/result_back"
+                                    android:nextFocusDown="@id/result_bookmark_button"
+                                    android:paddingTop="5dp"
+                                    android:textColor="?attr/textColor"
+                                    android:textSize="15sp"
+                                    tools:text="Ryan Quicksave Romano is an eccentric adventurer with a strange power: he can create a save-point in time and redo his life whenever he dies. Arriving in New Rome, the glitzy capital of sin of a rebuilding Europe, he finds the city torn between mega-corporations, sponsored heroes, superpowered criminals, and true monsters. It's a time of chaos, where potions can grant the power to rule the world and dangers lurk everywhere. " />
 
                                 <ImageView
-                                        android:layout_width="match_parent"
-                                        android:layout_height="30dp"
-                                        android:layout_gravity="bottom"
-                                        android:src="@drawable/background_shadow"
-                                        tools:ignore="ContentDescription" />
+                                    android:layout_width="match_parent"
+                                    android:layout_height="30dp"
+                                    android:layout_gravity="bottom"
+                                    android:src="@drawable/background_shadow"
+                                    android:visibility="gone"
+                                    tools:ignore="ContentDescription" />
                             </FrameLayout>
                         </LinearLayout>
                     </LinearLayout>
 
-<!--
-                    <com.google.android.material.button.MaterialButton
-                            android:id="@+id/result_bookmark_button"
-                            style="@style/BlackButton"
-                            android:layout_width="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginStart="0dp"
-                            android:layout_marginTop="0dp"
+                    <!--
+                                        <com.google.android.material.button.MaterialButton
+                                                android:id="@+id/result_bookmark_button"
+                                                style="@style/BlackButton"
+                                                android:layout_width="wrap_content"
+                                                android:layout_gravity="center_vertical"
+                                                android:layout_marginStart="0dp"
+                                                android:layout_marginTop="0dp"
 
-                            android:layout_marginBottom="10dp"
-                            android:backgroundTint="?attr/primaryBlackBackground"
+                                                android:layout_marginBottom="10dp"
+                                                android:backgroundTint="?attr/primaryBlackBackground"
 
-                            android:minWidth="100dp"
-                            android:nextFocusLeft="@id/result_back"
-                            android:nextFocusRight="@id/result_search"
-                            android:nextFocusUp="@id/result_description"
+                                                android:minWidth="100dp"
+                                                android:nextFocusLeft="@id/result_back"
+                                                android:nextFocusRight="@id/result_search"
+                                                android:nextFocusUp="@id/result_description"
 
-                            android:nextFocusDown="@id/result_cast_items"
-                            android:paddingTop="0dp"
-                            app:cornerRadius="4dp"
-                            app:icon="@drawable/ic_baseline_bookmark_24"
-                            tools:text="Bookmark"
-                            tools:visibility="visible" />
--->
+                                                android:nextFocusDown="@id/result_cast_items"
+                                                android:paddingTop="0dp"
+                                                app:cornerRadius="4dp"
+                                                app:icon="@drawable/ic_baseline_bookmark_24"
+                                                tools:text="Bookmark"
+                                                tools:visibility="visible" />
+                    -->
 
                     <TextView
-                            android:id="@+id/result_cast_text"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="5dp"
-                            android:ellipsize="end"
-                            android:maxLines="2"
-                            android:textColor="?attr/grayTextColor"
-                            android:textSize="15sp"
-                            tools:text="Cast: Joe Ligma" />
+                        android:id="@+id/result_cast_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:ellipsize="end"
+                        android:maxLines="2"
+                        android:textColor="?attr/grayTextColor"
+                        android:textSize="15sp"
+                        tools:text="Cast: Joe Ligma" />
 
                     <androidx.recyclerview.widget.RecyclerView
-                            tools:visibility="gone"
-                            android:nextFocusUp="@id/result_bookmark_button"
-                            android:nextFocusDown="@id/result_play_movie"
+                        android:id="@+id/result_cast_items"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
 
-                            android:id="@+id/result_cast_items"
-                            android:layout_width="match_parent"
-                            android:descendantFocusability="afterDescendants"
-                            android:layout_height="wrap_content"
-                            android:fadingEdge="horizontal"
-                            android:focusableInTouchMode="false"
-                            android:focusable="false"
-                            android:orientation="horizontal"
-                            android:paddingTop="5dp"
-                            android:requiresFadingEdge="horizontal"
-                            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                            tools:itemCount="2"
-                            tools:listitem="@layout/cast_item" />
+                        android:descendantFocusability="afterDescendants"
+                        android:fadingEdge="horizontal"
+                        android:focusable="false"
+                        android:focusableInTouchMode="false"
+                        android:nextFocusUp="@id/result_bookmark_button"
+                        android:nextFocusDown="@id/result_play_movie"
+                        android:orientation="horizontal"
+                        android:paddingTop="5dp"
+                        android:requiresFadingEdge="horizontal"
+                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                        tools:itemCount="2"
+                        tools:listitem="@layout/cast_item"
+                        tools:visibility="gone" />
 
                     <TextView
-                            android:id="@+id/result_vpn"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:textColor="?attr/grayTextColor"
-                            android:textSize="15sp"
-                            tools:text="@string/vpn_torrent" />
+                        android:id="@+id/result_vpn"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textColor="?attr/grayTextColor"
+                        android:textSize="15sp"
+                        tools:text="@string/vpn_torrent" />
 
                     <TextView
-                            android:id="@+id/result_info"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="5dp"
-                            android:textColor="?attr/grayTextColor"
-                            android:textSize="15sp"
-                            tools:text="@string/provider_info_meta" />
+                        android:id="@+id/result_info"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:textColor="?attr/grayTextColor"
+                        android:textSize="15sp"
+                        tools:text="@string/provider_info_meta" />
 
                     <TextView
-                            android:id="@+id/result_no_episodes"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="5dp"
-                            android:textColor="?attr/grayTextColor"
-                            android:textSize="15sp"
-                            tools:text="@string/no_episodes_found" />
+                        android:id="@+id/result_no_episodes"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:textColor="?attr/grayTextColor"
+                        android:textSize="15sp"
+                        tools:text="@string/no_episodes_found" />
 
                     <TextView
-                            android:id="@+id/result_tag_holder"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="10dp"
-                            android:layout_marginBottom="10dp"
-                            android:text="@string/result_tags"
-                            android:textColor="?attr/textColor"
-                            android:textSize="17sp"
-                            android:textStyle="normal"
-                            android:visibility="gone" />
+                        android:id="@+id/result_tag_holder"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginBottom="10dp"
+                        android:text="@string/result_tags"
+                        android:textColor="?attr/textColor"
+                        android:textSize="17sp"
+                        android:textStyle="normal"
+                        android:visibility="gone" />
 
                     <com.google.android.material.chip.ChipGroup
                         android:id="@+id/result_tag"
@@ -497,58 +522,58 @@
                             android:layout_height="wrap_content" />-->
 
                     <TextView
-                            android:id="@+id/result_coming_soon"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:gravity="center"
-                            android:paddingTop="50dp"
-                            android:text="@string/coming_soon"
-                            android:textColor="?attr/textColor"
-                            android:textSize="20sp"
-                            android:textStyle="bold"
-                            android:visibility="gone" />
+                        android:id="@+id/result_coming_soon"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:paddingTop="50dp"
+                        android:text="@string/coming_soon"
+                        android:textColor="?attr/textColor"
+                        android:textSize="20sp"
+                        android:textStyle="bold"
+                        android:visibility="gone" />
 
                     <LinearLayout
-                            android:id="@+id/result_data_holder"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical">
+                        android:id="@+id/result_data_holder"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
 
                         <com.google.android.material.button.MaterialButton
-                                android:id="@+id/result_add_sync"
-                                style="@style/WhiteButton"
-                                android:layout_width="match_parent"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginStart="0dp"
+                            android:id="@+id/result_add_sync"
+                            style="@style/WhiteButton"
+                            android:layout_width="match_parent"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginStart="0dp"
 
-                                android:layout_marginBottom="10dp"
-                                android:text="@string/add_sync"
-                                android:visibility="gone"
-                                app:icon="@drawable/ic_baseline_add_24" />
+                            android:layout_marginBottom="10dp"
+                            android:text="@string/add_sync"
+                            android:visibility="gone"
+                            app:icon="@drawable/ic_baseline_add_24" />
 
                         <LinearLayout
-                                android:id="@+id/result_movie_parent"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="5dp"
-                                android:orientation="vertical"
-                                tools:visibility="visible">
+                            android:id="@+id/result_movie_parent"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:orientation="vertical"
+                            tools:visibility="visible">
 
                             <com.google.android.material.button.MaterialButton
-                                    android:id="@+id/result_play_movie"
-                                    style="@style/WhiteButton"
-                                    android:layout_width="match_parent"
+                                android:id="@+id/result_play_movie"
+                                style="@style/WhiteButton"
+                                android:layout_width="match_parent"
 
-                                    android:layout_gravity="center_vertical"
-                                    android:layout_marginStart="0dp"
-                                    android:layout_marginEnd="0dp"
-                                    android:layout_marginBottom="10dp"
-                                    android:nextFocusUp="@id/result_bookmark_button"
-                                    android:nextFocusDown="@id/result_download_movie"
-                                    android:text="@string/play_movie_button"
-                                    android:visibility="visible"
-                                    app:icon="@drawable/ic_baseline_play_arrow_24">
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginStart="0dp"
+                                android:layout_marginEnd="0dp"
+                                android:layout_marginBottom="10dp"
+                                android:nextFocusUp="@id/result_bookmark_button"
+                                android:nextFocusDown="@id/result_download_movie"
+                                android:text="@string/play_movie_button"
+                                android:visibility="visible"
+                                app:icon="@drawable/ic_baseline_play_arrow_24">
 
                                 <requestFocus />
 
@@ -574,85 +599,85 @@
                                     android:layout_width="match_parent" />-->
 
                             <FrameLayout
-                                    android:id="@+id/result_movie_progress_downloaded_holder"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content">
+                                android:id="@+id/result_movie_progress_downloaded_holder"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
 
                                 <com.google.android.material.button.MaterialButton
-                                        android:id="@+id/result_download_movie"
-                                        style="@style/BlackButton"
+                                    android:id="@+id/result_download_movie"
+                                    style="@style/BlackButton"
 
-                                        android:layout_width="match_parent"
-                                        android:layout_gravity="center_vertical"
-                                        android:layout_marginStart="0dp"
-                                        android:layout_marginEnd="0dp"
-                                        android:clickable="true"
-                                        android:focusable="true"
+                                    android:layout_width="match_parent"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_marginStart="0dp"
+                                    android:layout_marginEnd="0dp"
+                                    android:clickable="true"
+                                    android:focusable="true"
 
-                                        android:nextFocusUp="@id/result_play_movie"
-                                        android:nextFocusDown="@id/result_season_button"
-                                        android:visibility="visible" />
+                                    android:nextFocusUp="@id/result_play_movie"
+                                    android:nextFocusDown="@id/result_season_button"
+                                    android:visibility="visible" />
 
                                 <LinearLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:layout_gravity="center"
-                                        android:gravity="center"
-                                        android:orientation="horizontal">
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:gravity="center"
+                                    android:orientation="horizontal">
 
                                     <androidx.core.widget.ContentLoadingProgressBar
-                                            android:id="@+id/result_movie_progress_downloaded"
-                                            style="?android:attr/progressBarStyleHorizontal"
-                                            android:layout_width="25dp"
-                                            android:layout_height="25dp"
-                                            android:layout_gravity="end|center_vertical"
-                                            android:layout_margin="5dp"
-                                            android:background="@drawable/circle_shape"
-                                            android:indeterminate="false"
-                                            android:max="100"
-                                            android:paddingStart="5dp"
-                                            android:paddingEnd="5dp"
-                                            android:progress="30"
-                                            android:progressDrawable="@drawable/circular_progress_bar_filled"
-                                            android:visibility="visible" />
+                                        android:id="@+id/result_movie_progress_downloaded"
+                                        style="?android:attr/progressBarStyleHorizontal"
+                                        android:layout_width="25dp"
+                                        android:layout_height="25dp"
+                                        android:layout_gravity="end|center_vertical"
+                                        android:layout_margin="5dp"
+                                        android:background="@drawable/circle_shape"
+                                        android:indeterminate="false"
+                                        android:max="100"
+                                        android:paddingStart="5dp"
+                                        android:paddingEnd="5dp"
+                                        android:progress="30"
+                                        android:progressDrawable="@drawable/circular_progress_bar_filled"
+                                        android:visibility="visible" />
 
                                     <ImageView
-                                            android:id="@+id/result_movie_download_icon"
-                                            android:layout_width="30dp"
-                                            android:layout_height="wrap_content"
-                                            android:layout_gravity="center"
-                                            android:background="?selectableItemBackgroundBorderless"
-                                            android:contentDescription="@string/download"
-                                            android:src="@drawable/ic_baseline_play_arrow_24"
-                                            android:visibility="visible"
-                                            app:tint="?attr/white" />
+                                        android:id="@+id/result_movie_download_icon"
+                                        android:layout_width="30dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center"
+                                        android:background="?selectableItemBackgroundBorderless"
+                                        android:contentDescription="@string/download"
+                                        android:src="@drawable/ic_baseline_play_arrow_24"
+                                        android:visibility="visible"
+                                        app:tint="?attr/white" />
 
                                     <TextView
-                                            android:id="@+id/result_movie_download_text"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="match_parent"
-                                            android:gravity="center"
-                                            android:letterSpacing="0.09"
-                                            android:textAllCaps="false"
-                                            android:textColor="?attr/textColor"
-                                            android:textSize="15sp"
-                                            android:textStyle="bold"
-                                            tools:text="Downloading" />
+                                        android:id="@+id/result_movie_download_text"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="match_parent"
+                                        android:gravity="center"
+                                        android:letterSpacing="0.09"
+                                        android:textAllCaps="false"
+                                        android:textColor="?attr/textColor"
+                                        android:textSize="15sp"
+                                        android:textStyle="bold"
+                                        tools:text="Downloading" />
 
                                     <TextView
-                                            android:id="@+id/result_movie_download_text_precentage"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="match_parent"
-                                            android:gravity="center"
-                                            android:letterSpacing="0.09"
-                                            android:paddingStart="5dp"
-                                            android:paddingEnd="5dp"
-                                            android:textAllCaps="false"
-                                            android:textColor="?attr/textColor"
-                                            android:textSize="15sp"
-                                            android:textStyle="bold"
-                                            android:visibility="gone"
-                                            tools:text="68%" />
+                                        android:id="@+id/result_movie_download_text_precentage"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="match_parent"
+                                        android:gravity="center"
+                                        android:letterSpacing="0.09"
+                                        android:paddingStart="5dp"
+                                        android:paddingEnd="5dp"
+                                        android:textAllCaps="false"
+                                        android:textColor="?attr/textColor"
+                                        android:textSize="15sp"
+                                        android:textStyle="bold"
+                                        android:visibility="gone"
+                                        tools:text="68%" />
                                 </LinearLayout>
                             </FrameLayout>
 
@@ -682,217 +707,217 @@
                         </LinearLayout>
 
                         <LinearLayout
-                                android:id="@+id/result_resume_parent"
+                            android:id="@+id/result_resume_parent"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:orientation="vertical"
+                            android:visibility="gone"
+                            tools:visibility="visible">
+
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/result_resume_series_button"
+                                style="@style/WhiteButton"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="5dp"
-                                android:orientation="vertical"
+
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginStart="0dp"
+                                android:layout_marginEnd="0dp"
+                                android:layout_marginBottom="10dp"
+                                android:nextFocusUp="@id/result_bookmark_button"
+                                android:nextFocusDown="@id/result_download_movie"
+                                android:text="@string/resume"
+                                android:visibility="visible"
+                                app:icon="@drawable/ic_baseline_play_arrow_24"
+                                tools:visibility="visible" />
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/result_next_series_button"
+                                style="@style/WhiteButton"
+                                android:layout_width="match_parent"
+
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginStart="0dp"
+                                android:layout_marginEnd="0dp"
+                                android:layout_marginBottom="10dp"
+                                android:nextFocusUp="@id/result_bookmark_button"
+                                android:nextFocusDown="@id/result_download_movie"
+                                android:text="@string/next_episode"
                                 android:visibility="gone"
-                                tools:visibility="visible">
-
-
-                            <com.google.android.material.button.MaterialButton
-                                    android:id="@+id/result_resume_series_button"
-                                    style="@style/WhiteButton"
-                                    android:layout_width="match_parent"
-
-                                    android:layout_gravity="center_vertical"
-                                    android:layout_marginStart="0dp"
-                                    android:layout_marginEnd="0dp"
-                                    android:layout_marginBottom="10dp"
-                                    android:nextFocusUp="@id/result_bookmark_button"
-                                    android:nextFocusDown="@id/result_download_movie"
-                                    android:text="@string/resume"
-                                    android:visibility="visible"
-                                    app:icon="@drawable/ic_baseline_play_arrow_24"
-                                    tools:visibility="visible" />
-
-                            <com.google.android.material.button.MaterialButton
-                                    android:id="@+id/result_next_series_button"
-                                    style="@style/WhiteButton"
-                                    android:layout_width="match_parent"
-
-                                    android:layout_gravity="center_vertical"
-                                    android:layout_marginStart="0dp"
-                                    android:layout_marginEnd="0dp"
-                                    android:layout_marginBottom="10dp"
-                                    android:nextFocusUp="@id/result_bookmark_button"
-                                    android:nextFocusDown="@id/result_download_movie"
-                                    android:text="@string/next_episode"
-                                    android:visibility="gone"
-                                    app:icon="@drawable/cast_ic_mini_controller_skip_next" />
+                                app:icon="@drawable/cast_ic_mini_controller_skip_next" />
 
                             <TextView
-                                    android:id="@+id/result_resume_series_title"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:textColor="?attr/textColor"
-                                    android:textSize="17sp"
-                                    android:textStyle="bold"
-                                    tools:text="S1E1 Episode 1" />
+                                android:id="@+id/result_resume_series_title"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:textColor="?attr/textColor"
+                                android:textSize="17sp"
+                                android:textStyle="bold"
+                                tools:text="S1E1 Episode 1" />
                         </LinearLayout>
 
                         <LinearLayout
-                                android:id="@+id/result_resume_progress_holder"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:orientation="horizontal"
-                                android:paddingTop="10dp"
-                                android:visibility="gone"
-                                tools:visibility="visible">
+                            android:id="@+id/result_resume_progress_holder"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:paddingTop="10dp"
+                            android:visibility="gone"
+                            tools:visibility="visible">
 
                             <androidx.core.widget.ContentLoadingProgressBar
-                                    android:id="@+id/result_resume_series_progress"
-                                    style="?android:attr/progressBarStyleHorizontal"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="20dp"
-                                    android:layout_gravity="end|center_vertical"
-                                    android:layout_weight="1"
-                                    android:indeterminate="false"
-                                    android:max="100"
-                                    android:progress="0"
-                                    android:progressBackgroundTint="?attr/colorPrimary"
-                                    android:visibility="visible"
-                                    tools:progress="50"
-                                    tools:visibility="visible" />
+                                android:id="@+id/result_resume_series_progress"
+                                style="?android:attr/progressBarStyleHorizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="20dp"
+                                android:layout_gravity="end|center_vertical"
+                                android:layout_weight="1"
+                                android:indeterminate="false"
+                                android:max="100"
+                                android:progress="0"
+                                android:progressBackgroundTint="?attr/colorPrimary"
+                                android:visibility="visible"
+                                tools:progress="50"
+                                tools:visibility="visible" />
 
                             <TextView
-                                    android:id="@+id/result_resume_series_progress_text"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:layout_weight="0"
-                                    android:gravity="center"
-                                    android:paddingStart="10dp"
-                                    android:textColor="?attr/grayTextColor"
-                                    tools:ignore="RtlSymmetry"
-                                    tools:text="69m\nremaining" />
+                                android:id="@+id/result_resume_series_progress_text"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:layout_weight="0"
+                                android:gravity="center"
+                                android:paddingStart="10dp"
+                                android:textColor="?attr/grayTextColor"
+                                tools:ignore="RtlSymmetry"
+                                tools:text="69m\nremaining" />
                         </LinearLayout>
 
 
                         <LinearLayout
-                                android:id="@+id/result_episodes_tab"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:orientation="vertical">
+                            android:id="@+id/result_episodes_tab"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
 
                             <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginBottom="10dp"
-                                    android:gravity="center_vertical"
-                                    android:orientation="horizontal">
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginBottom="10dp"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
 
                                 <com.google.android.material.button.MaterialButton
-                                        android:id="@+id/result_season_button"
-                                        style="@style/MultiSelectButton"
-                                        android:layout_gravity="center_vertical"
-                                        android:layout_marginStart="0dp"
-                                        android:layout_marginEnd="10dp"
-                                        android:nextFocusLeft="@id/result_episode_select"
-                                        android:nextFocusRight="@id/result_episode_select"
-                                        android:nextFocusUp="@id/result_description"
-                                        android:nextFocusDown="@id/result_episodes"
-                                        android:visibility="gone"
-                                        tools:text="Season 1"
-                                        tools:visibility="visible" />
+                                    android:id="@+id/result_season_button"
+                                    style="@style/MultiSelectButton"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_marginStart="0dp"
+                                    android:layout_marginEnd="10dp"
+                                    android:nextFocusLeft="@id/result_episode_select"
+                                    android:nextFocusRight="@id/result_episode_select"
+                                    android:nextFocusUp="@id/result_description"
+                                    android:nextFocusDown="@id/result_episodes"
+                                    android:visibility="gone"
+                                    tools:text="Season 1"
+                                    tools:visibility="visible" />
 
                                 <com.google.android.material.button.MaterialButton
-                                        android:id="@+id/result_episode_select"
-                                        style="@style/MultiSelectButton"
+                                    android:id="@+id/result_episode_select"
+                                    style="@style/MultiSelectButton"
 
-                                        android:layout_gravity="center_vertical"
-                                        android:layout_marginStart="0dp"
-                                        android:layout_marginEnd="10dp"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_marginStart="0dp"
+                                    android:layout_marginEnd="10dp"
 
-                                        android:nextFocusLeft="@id/result_season_button"
-                                        android:nextFocusRight="@id/result_season_button"
+                                    android:nextFocusLeft="@id/result_season_button"
+                                    android:nextFocusRight="@id/result_season_button"
 
-                                        android:nextFocusUp="@id/result_description"
-                                        android:nextFocusDown="@id/result_episodes"
-                                        android:visibility="gone"
-                                        tools:text="50-100"
-                                        tools:visibility="visible" />
+                                    android:nextFocusUp="@id/result_description"
+                                    android:nextFocusDown="@id/result_episodes"
+                                    android:visibility="gone"
+                                    tools:text="50-100"
+                                    tools:visibility="visible" />
 
                                 <com.google.android.material.button.MaterialButton
-                                        android:id="@+id/result_dub_select"
-                                        style="@style/MultiSelectButton"
+                                    android:id="@+id/result_dub_select"
+                                    style="@style/MultiSelectButton"
 
-                                        android:layout_gravity="center_vertical"
-                                        android:layout_marginStart="0dp"
-                                        android:layout_marginEnd="10dp"
-                                        android:nextFocusLeft="@id/result_season_button"
-                                        android:nextFocusRight="@id/result_season_button"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_marginStart="0dp"
+                                    android:layout_marginEnd="10dp"
+                                    android:nextFocusLeft="@id/result_season_button"
+                                    android:nextFocusRight="@id/result_season_button"
 
-                                        android:nextFocusUp="@id/result_description"
-                                        android:nextFocusDown="@id/result_episodes"
-                                        android:visibility="gone"
-                                        tools:text="Dubbed"
-                                        tools:visibility="visible" />
+                                    android:nextFocusUp="@id/result_description"
+                                    android:nextFocusDown="@id/result_episodes"
+                                    android:visibility="gone"
+                                    tools:text="Dubbed"
+                                    tools:visibility="visible" />
 
                                 <TextView
-                                        android:id="@+id/result_episodes_text"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:layout_gravity="center_vertical"
-                                        android:paddingTop="10dp"
-                                        android:paddingBottom="10dp"
-                                        android:textColor="?attr/textColor"
-                                        android:textSize="17sp"
-                                        android:textStyle="normal"
-                                        tools:text="8 Episodes" />
+                                    android:id="@+id/result_episodes_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:paddingTop="10dp"
+                                    android:paddingBottom="10dp"
+                                    android:textColor="?attr/textColor"
+                                    android:textSize="17sp"
+                                    android:textStyle="normal"
+                                    tools:text="8 Episodes" />
                             </LinearLayout>
 
 
                             <!--TODO add next airing-->
                             <LinearLayout
-                                    android:id="@+id/result_next_airing_holder"
-                                    android:layout_gravity="start"
-                                    android:orientation="horizontal"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content">
+                                android:id="@+id/result_next_airing_holder"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="start"
+                                android:orientation="horizontal">
 
                                 <TextView
-                                        android:gravity="center"
+                                    android:id="@+id/result_next_airing"
 
-                                        android:id="@+id/result_next_airing"
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:textColor="?attr/grayTextColor"
-                                        android:textSize="17sp"
-                                        android:textStyle="normal"
-                                        tools:text="Episode 1022 will be released in" />
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center"
+                                    android:textColor="?attr/grayTextColor"
+                                    android:textSize="17sp"
+                                    android:textStyle="normal"
+                                    tools:text="Episode 1022 will be released in" />
 
                                 <TextView
-                                        android:paddingEnd="5dp"
-                                        android:paddingStart="5dp"
-                                        android:gravity="center"
-                                        android:id="@+id/result_next_airing_time"
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:textColor="?attr/textColor"
-                                        android:textSize="17sp"
-                                        android:textStyle="normal"
-                                        tools:text="5d 3h 30m" />
+                                    android:id="@+id/result_next_airing_time"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center"
+                                    android:paddingStart="5dp"
+                                    android:paddingEnd="5dp"
+                                    android:textColor="?attr/textColor"
+                                    android:textSize="17sp"
+                                    android:textStyle="normal"
+                                    tools:text="5d 3h 30m" />
                             </LinearLayout>
 
                             <com.facebook.shimmer.ShimmerFrameLayout
-                                    android:id="@+id/result_episode_loading"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
-                                    android:layout_gravity="center"
-                                    android:layout_marginTop="15dp"
-                                    android:orientation="vertical"
-                                    app:shimmer_auto_start="true"
-                                    app:shimmer_base_alpha="0.2"
-                                    app:shimmer_duration="@integer/loading_time"
-                                    app:shimmer_highlight_alpha="0.3"
-                                    tools:visibility="visible">
+                                android:id="@+id/result_episode_loading"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="center"
+                                android:layout_marginTop="15dp"
+                                android:orientation="vertical"
+                                app:shimmer_auto_start="true"
+                                app:shimmer_base_alpha="0.2"
+                                app:shimmer_duration="@integer/loading_time"
+                                app:shimmer_highlight_alpha="0.3"
+                                tools:visibility="visible">
 
                                 <LinearLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:orientation="vertical">
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="vertical">
 
                                     <include layout="@layout/loading_episode" />
 
@@ -912,15 +937,15 @@
                                     android:layout_height="50dp" />-->
 
                             <androidx.recyclerview.widget.RecyclerView
-                                    android:id="@+id/result_episodes"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="0dp"
-                                    android:clipToPadding="false"
-                                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                                    android:descendantFocusability="afterDescendants"
-                                    android:paddingBottom="100dp"
-                                    tools:listitem="@layout/result_episode_both_tv" />
+                                android:id="@+id/result_episodes"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="0dp"
+                                android:clipToPadding="false"
+                                android:descendantFocusability="afterDescendants"
+                                android:paddingBottom="100dp"
+                                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                                tools:listitem="@layout/result_episode_both_tv" />
                         </LinearLayout>
                     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_trailer.xml b/app/src/main/res/layout/fragment_trailer.xml
index 64633483..fd348760 100644
--- a/app/src/main/res/layout/fragment_trailer.xml
+++ b/app/src/main/res/layout/fragment_trailer.xml
@@ -6,7 +6,6 @@
         android:layout_height="0dp"
         android:visibility="visible"
         android:orientation="horizontal"
-        android:keepScreenOn="true"
         android:id="@+id/player_background"
         app:backgroundTint="@android:color/black"
         android:background="@android:color/black"
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index 22137a1c..854855ef 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -1,452 +1,467 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/player_holder"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:screenOrientation="landscape"
-        tools:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/player_holder"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:screenOrientation="landscape"
+    tools:orientation="vertical">
 
 
     <TextView
-            android:id="@+id/player_time_text"
-            android:layout_width="match_parent"
-            android:layout_height="200dp"
-            android:gravity="center"
-            android:shadowColor="@android:color/black"
-            android:shadowRadius="10.0"
-            android:textColor="@android:color/white"
-            android:textSize="30sp"
-            tools:text="+100" />
+        android:id="@+id/player_time_text"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:gravity="center"
+        android:shadowColor="@android:color/black"
+        android:shadowRadius="10.0"
+        android:textColor="@android:color/white"
+        android:textSize="30sp"
+        tools:text="+100" />
 
     <FrameLayout
-            android:id="@+id/subtitle_holder"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:id="@+id/subtitle_holder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <View
-                android:id="@+id/shadow_overlay"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/black_overlay" />
+            android:id="@+id/shadow_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/black_overlay" />
     </FrameLayout>
 
 
     <FrameLayout
-            android:id="@+id/player_intro_play"
+        android:id="@+id/player_intro_play"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <!--     <View
+                     android:layout_width="match_parent"
+                     android:layout_height="match_parent"
+                     android:background="@drawable/player_gradient_tv" />
+     -->
+
+        <!--
+        <ImageView
+            android:id="@+id/result_trailer_thumbnail"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:scaleType="centerCrop" />-->
 
         <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/player_gradient_tv" />
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_gravity="bottom"
+            android:background="@drawable/background_shadow" />
 
         <TextView
-                android:textSize="20sp"
-                android:textStyle="bold"
-                android:textColor="@android:color/white"
-                android:text="@string/trailer"
-                android:padding="10dp"
-                android:layout_gravity="start|bottom"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|bottom"
+            android:padding="10dp"
+            android:text="@string/trailer"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:textStyle="bold" />
 
         <ImageView
-                android:layout_gravity="center"
-                android:src="@drawable/play_button"
-                android:layout_width="60dp"
-                android:layout_height="60dp" />
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:src="@drawable/play_button" />
     </FrameLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/player_video_holder"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:id="@+id/player_video_holder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <!--use for thinner app:trackThickness="3dp" com.google.android.material.progressindicator.CircularProgressIndicator-->
         <ProgressBar
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
+            android:id="@+id/player_buffering"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
 
-                android:focusable="false"
-                android:clickable="false"
-                android:focusableInTouchMode="false"
+            android:clickable="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
 
-                android:indeterminate="true"
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:id="@+id/player_buffering"
-                android:layout_gravity="center"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content" />
+            android:indeterminate="true"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
 
         <!-- This nested layout is necessary because of buffering and clicking-->
         <FrameLayout
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                android:id="@+id/player_pause_play_holder_holder">
+            android:id="@+id/player_pause_play_holder_holder"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <FrameLayout
-                    tools:ignore="uselessParent"
-                    android:id="@+id/player_pause_play_holder"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                android:id="@+id/player_pause_play_holder"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:ignore="uselessParent">
 
                 <ImageView
-                        app:tint="@color/white"
-                        android:id="@+id/player_pause_play"
-                        android:nextFocusLeft="@id/exo_rew"
-                        android:nextFocusRight="@id/exo_ffwd"
-                        android:nextFocusUp="@id/player_go_back"
-                        android:nextFocusDown="@id/player_lock"
+                    android:id="@+id/player_pause_play"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_gravity="center"
+                    android:background="@drawable/video_tap_button"
+                    android:nextFocusLeft="@id/exo_rew"
 
-                        android:layout_gravity="center"
+                    android:nextFocusRight="@id/exo_ffwd"
 
-                        android:src="@drawable/netflix_pause"
-                        android:background="@drawable/video_tap_button"
+                    android:nextFocusUp="@id/player_go_back"
+                    android:nextFocusDown="@id/player_lock"
 
-                        android:layout_width="70dp"
-                        android:layout_height="70dp"
-                        tools:ignore="ContentDescription" />
+                    android:src="@drawable/netflix_pause"
+                    app:tint="@color/white"
+                    tools:ignore="ContentDescription" />
             </FrameLayout>
         </FrameLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/player_center_menu"
-                android:layout_width="match_parent"
-                android:layout_height="100dp"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:orientation="horizontal"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
+            android:id="@+id/player_center_menu"
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <FrameLayout
-                    android:id="@+id/player_rew_holder"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintWidth_percent="0.5"
-                    android:layout_gravity="center_vertical|start"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toLeftOf="@id/player_ffwd_holder"
-                    app:layout_constraintTop_toTopOf="parent">
+                android:id="@+id/player_rew_holder"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|start"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/player_ffwd_holder"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintWidth_percent="0.5">
 
                 <TextView
-                        android:id="@+id/exo_rew_text"
-                        android:layout_width="200dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center"
+                    android:id="@+id/exo_rew_text"
+                    android:layout_width="200dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
 
-                        android:gravity="center"
-                        android:textColor="@color/white"
-                        android:textSize="19sp"
+                    android:gravity="center"
+                    android:textColor="@color/white"
+                    android:textSize="19sp"
 
-                        android:textStyle="bold"
-                        tools:text="10" />
+                    android:textStyle="bold"
+                    tools:text="10" />
 
                 <ImageButton
-                        android:id="@id/exo_rew"
-                        android:layout_width="70dp"
-                        android:layout_height="70dp"
-                        android:layout_gravity="center"
+                    android:id="@id/exo_rew"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_gravity="center"
 
-                        android:background="@drawable/video_tap_button_skip"
-                        android:nextFocusLeft="@id/exo_rew"
-                        android:nextFocusUp="@id/player_go_back"
-                        android:nextFocusDown="@id/player_lock"
-                        android:padding="10dp"
-                        android:scaleType="fitCenter"
-                        android:scaleX="-1"
-                        android:src="@drawable/netflix_skip_forward"
-                        app:tint="@color/white"
-                        android:tintMode="src_in"
-                        tools:ignore="ContentDescription" />
+                    android:background="@drawable/video_tap_button_skip"
+                    android:nextFocusLeft="@id/exo_rew"
+                    android:nextFocusUp="@id/player_go_back"
+                    android:nextFocusDown="@id/player_lock"
+                    android:padding="10dp"
+                    android:scaleType="fitCenter"
+                    android:scaleX="-1"
+                    android:src="@drawable/netflix_skip_forward"
+                    android:tintMode="src_in"
+                    app:tint="@color/white"
+                    tools:ignore="ContentDescription" />
             </FrameLayout>
 
             <FrameLayout
-                    android:id="@+id/player_ffwd_holder"
-                    android:layout_width="0dp"
-                    app:layout_constraintWidth_percent="0.5"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical|end"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toRightOf="@id/player_rew_holder"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
+                android:id="@+id/player_ffwd_holder"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toRightOf="@id/player_rew_holder"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintWidth_percent="0.5">
 
                 <TextView
-                        android:id="@+id/exo_ffwd_text"
-                        android:layout_width="200dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:textColor="@color/white"
-                        android:textSize="19sp"
-                        android:textStyle="bold"
-                        tools:text="10" />
+                    android:id="@+id/exo_ffwd_text"
+                    android:layout_width="200dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:textColor="@color/white"
+                    android:textSize="19sp"
+                    android:textStyle="bold"
+                    tools:text="10" />
 
                 <ImageButton
-                        android:id="@id/exo_ffwd"
-                        android:layout_width="70dp"
-                        android:layout_height="70dp"
-                        android:layout_gravity="center"
+                    android:id="@id/exo_ffwd"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_gravity="center"
 
-                        android:background="@drawable/video_tap_button_skip"
-                        android:nextFocusRight="@id/exo_rew"
-                        android:nextFocusUp="@id/player_go_back"
-                        android:nextFocusDown="@id/player_lock"
-                        android:padding="10dp"
-                        android:scaleType="fitCenter"
-                        android:src="@drawable/netflix_skip_forward"
-                        app:tint="@color/white"
-                        android:tintMode="src_in"
-                        tools:ignore="ContentDescription" />
+                    android:background="@drawable/video_tap_button_skip"
+                    android:nextFocusRight="@id/exo_rew"
+                    android:nextFocusUp="@id/player_go_back"
+                    android:nextFocusDown="@id/player_lock"
+                    android:padding="10dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/netflix_skip_forward"
+                    android:tintMode="src_in"
+                    app:tint="@color/white"
+                    tools:ignore="ContentDescription" />
             </FrameLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:layout_marginBottom="20dp"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingTop="4dp"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="20dp"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingTop="4dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
 
             <ImageButton
-                    android:id="@id/exo_prev"
-                    style="@style/ExoMediaButton.Previous"
-                    app:tint="?attr/colorPrimaryDark"
-                    android:tintMode="src_in"
-                    tools:ignore="ContentDescription" />
+                android:id="@id/exo_prev"
+                style="@style/ExoMediaButton.Previous"
+                android:tintMode="src_in"
+                app:tint="?attr/colorPrimaryDark"
+                tools:ignore="ContentDescription" />
 
 
             <ImageButton
-                    android:id="@id/exo_repeat_toggle"
-                    style="@style/ExoMediaButton"
-                    app:tint="?attr/colorPrimaryDark"
-                    android:tintMode="src_in"
-                    tools:ignore="ContentDescription" />
+                android:id="@id/exo_repeat_toggle"
+                style="@style/ExoMediaButton"
+                android:tintMode="src_in"
+                app:tint="?attr/colorPrimaryDark"
+                tools:ignore="ContentDescription" />
 
 
             <ImageButton
-                    android:id="@id/exo_next"
-                    style="@style/ExoMediaButton.Next"
-                    app:tint="?attr/colorPrimaryDark"
-                    android:tintMode="src_in"
-                    tools:ignore="ContentDescription" />
+                android:id="@id/exo_next"
+                style="@style/ExoMediaButton.Next"
+                android:tintMode="src_in"
+                app:tint="?attr/colorPrimaryDark"
+                tools:ignore="ContentDescription" />
 
             <ImageButton
-                    android:id="@id/exo_vr"
-                    style="@style/ExoMediaButton.VR"
-                    app:tint="?attr/colorPrimaryDark"
-                    android:tintMode="src_in"
-                    tools:ignore="ContentDescription" />
+                android:id="@id/exo_vr"
+                style="@style/ExoMediaButton.VR"
+                android:tintMode="src_in"
+                app:tint="?attr/colorPrimaryDark"
+                tools:ignore="ContentDescription" />
 
             <ImageButton
-                    android:id="@id/exo_play"
-                    app:tint="?attr/colorPrimaryDark"
-                    android:tintMode="src_in"
-                    tools:ignore="ContentDescription"
-                    android:layout_height="0dp"
-                    android:layout_width="0dp" />
+                android:id="@id/exo_play"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:tintMode="src_in"
+                app:tint="?attr/colorPrimaryDark"
+                tools:ignore="ContentDescription" />
 
             <ImageButton
-                    android:id="@id/exo_pause"
-                    app:tint="?attr/colorPrimaryDark"
-                    android:tintMode="src_in"
-                    tools:ignore="ContentDescription"
-                    android:layout_height="0dp"
-                    android:layout_width="0dp" />
+                android:id="@id/exo_pause"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:tintMode="src_in"
+                app:tint="?attr/colorPrimaryDark"
+                tools:ignore="ContentDescription" />
         </LinearLayout>
 
         <ImageView
-                android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:id="@+id/player_open_source"
-                app:tint="@color/white"
-                android:src="@drawable/ic_baseline_public_24"
-                android:layout_margin="20dp"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+            android:id="@+id/player_open_source"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_margin="20dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_baseline_public_24"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/white" />
 
         <LinearLayout
-                android:id="@+id/bottom_player_bar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent">
+            android:id="@+id/bottom_player_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
 
             <LinearLayout
-                    android:layout_weight="1"
-                    android:id="@+id/player_video_bar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                android:id="@+id/player_video_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="horizontal">
 
                 <TextView
-                        android:id="@id/exo_position"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginStart="20dp"
-                        android:gravity="end"
-                        android:includeFontPadding="false"
-                        android:minWidth="50dp"
-                        android:paddingLeft="4dp"
-                        android:paddingRight="4dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp"
-                        android:textStyle="normal"
-                        tools:text="15:30" />
+                    android:id="@id/exo_position"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="20dp"
+                    android:gravity="end"
+                    android:includeFontPadding="false"
+                    android:minWidth="50dp"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    android:textStyle="normal"
+                    tools:text="15:30" />
                 <!--app:buffered_color="@color/videoCache"-->
                 <com.google.android.exoplayer2.ui.DefaultTimeBar
-                        android:id="@id/exo_progress"
-                        android:layout_width="0dp"
-                        android:layout_height="30dp"
-                        android:layout_weight="1"
-                        app:bar_height="2dp"
-                        app:played_color="?attr/colorPrimary"
+                    android:id="@id/exo_progress"
+                    android:layout_width="0dp"
+                    android:layout_height="30dp"
+                    android:layout_weight="1"
+                    app:bar_height="2dp"
+                    app:played_color="?attr/colorPrimary"
 
-                        app:scrubber_color="?attr/colorPrimary"
-                        app:scrubber_dragged_size="26dp"
-                        app:scrubber_enabled_size="24dp"
-                        app:unplayed_color="@color/videoProgress" />
+                    app:scrubber_color="?attr/colorPrimary"
+                    app:scrubber_dragged_size="26dp"
+                    app:scrubber_enabled_size="24dp"
+                    app:unplayed_color="@color/videoProgress" />
 
                 <!-- exo_duration-->
                 <TextView
-                        android:id="@id/exo_duration"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginEnd="20dp"
-                        android:includeFontPadding="false"
-                        android:minWidth="50dp"
-                        android:paddingLeft="4dp"
-                        android:paddingRight="4dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp"
-                        android:textStyle="normal"
-                        tools:text="23:20" />
+                    android:id="@id/exo_duration"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginEnd="20dp"
+                    android:includeFontPadding="false"
+                    android:minWidth="50dp"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    android:textStyle="normal"
+                    tools:text="23:20" />
 
             </LinearLayout>
 
             <ImageView
-                    android:background="?android:attr/selectableItemBackgroundBorderless"
-                    android:id="@+id/player_fullscreen"
-                    app:tint="@color/white"
-                    android:layout_gravity="center_vertical"
-                    android:src="@drawable/baseline_fullscreen_24"
-                    android:layout_marginEnd="20dp"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp" />
+                android:id="@+id/player_fullscreen"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="20dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:src="@drawable/baseline_fullscreen_24"
+                app:tint="@color/white" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
 
         <RelativeLayout
-                android:id="@+id/player_progressbar_left_holder"
-                android:layout_width="100dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:gravity="start"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@+id/centerMenuView"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:alpha="1"
-                tools:visibility="visible">
+            android:id="@+id/player_progressbar_left_holder"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:gravity="start"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/centerMenuView"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:alpha="1"
+            tools:visibility="visible">
             <!--VERY hacky layout -->
             <ImageView
-                    android:id="@+id/player_progressbar_left_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginBottom="220dp"
-                    android:src="@drawable/ic_baseline_volume_up_24"
-                    app:tint="@android:color/white"
-                    tools:ignore="ContentDescription">
+                android:id="@+id/player_progressbar_left_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="220dp"
+                android:src="@drawable/ic_baseline_volume_up_24"
+                app:tint="@android:color/white"
+                tools:ignore="ContentDescription">
 
             </ImageView>
 
             <ProgressBar
-                    android:id="@+id/player_progressbar_left"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                    android:layout_width="4dp"
-                    android:layout_height="150dp"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginStart="40dp"
-                    android:indeterminate="false"
-                    android:max="100"
-                    android:progress="100"
-                    android:progressDrawable="@drawable/progress_drawable_vertical"
-                    tools:progress="30"
-                    android:layout_centerInParent="true" />
+                android:id="@+id/player_progressbar_left"
+                style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                android:layout_width="4dp"
+                android:layout_height="150dp"
+                android:layout_centerInParent="true"
+                android:layout_gravity="end|center_vertical"
+                android:layout_marginStart="40dp"
+                android:indeterminate="false"
+                android:max="100"
+                android:progress="100"
+                android:progressDrawable="@drawable/progress_drawable_vertical"
+                tools:progress="30" />
         </RelativeLayout>
 
         <RelativeLayout
-                android:id="@+id/player_progressbar_right_holder"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:gravity="right"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toRightOf="@+id/centerMenuView"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:alpha="1"
-                tools:ignore="RtlHardcoded"
-                tools:visibility="visible">
+            android:id="@+id/player_progressbar_right_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:gravity="right"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toRightOf="@+id/centerMenuView"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:alpha="1"
+            tools:ignore="RtlHardcoded"
+            tools:visibility="visible">
 
             <ImageView
-                    android:id="@+id/player_progressbar_right_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginBottom="220dp"
-                    android:src="@drawable/ic_baseline_brightness_7_24"
-                    app:tint="@android:color/white"
-                    tools:ignore="ContentDescription">
+                android:id="@+id/player_progressbar_right_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="220dp"
+                android:src="@drawable/ic_baseline_brightness_7_24"
+                app:tint="@android:color/white"
+                tools:ignore="ContentDescription">
 
             </ImageView>
 
             <ProgressBar
-                    android:id="@+id/player_progressbar_right"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                    android:layout_width="4dp"
-                    android:layout_height="150dp"
-                    android:layout_centerHorizontal="true"
-                    android:layout_centerVertical="true"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginEnd="40dp"
-                    android:indeterminate="false"
-                    android:max="100"
-                    android:progress="100"
-                    android:progressDrawable="@drawable/progress_drawable_vertical" />
+                android:id="@+id/player_progressbar_right"
+                style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                android:layout_width="4dp"
+                android:layout_height="150dp"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="end|center_vertical"
+                android:layout_marginEnd="40dp"
+                android:indeterminate="false"
+                android:max="100"
+                android:progress="100"
+                android:progressDrawable="@drawable/progress_drawable_vertical" />
         </RelativeLayout>
     </LinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f0bb2214..13089cc2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -82,6 +82,8 @@
         <item name="textColor">@color/chip_color_text</item>
         <item name="android:textColor">@color/chip_color_text</item>
         <item name="checkedIconTint">@color/chip_color_text</item>
+        <item name="fontFamily">@font/google_sans</item>
+        <item name="android:fontFamily">@font/google_sans</item>
     </style>
 
     <style name="AmoledMode">

From 3d3c85a1aded2540104e811a3f4c9a68dbb1515f Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Tue, 1 Nov 2022 23:16:56 +0100
Subject: [PATCH 052/273] Revert "Revert "Bumped the exoplayer version and
 fixed the audio & video track selection""

This reverts commit 6b586388b9ff68469a3312c61a3c7ec96e904609.
---
 app/build.gradle.kts                          |   8 +-
 .../cloudstream3/ui/ControllerActivity.kt     |  14 +--
 .../cloudstream3/ui/player/CS3IPlayer.kt      | 100 ++++++++++++++----
 .../cloudstream3/ui/player/GeneratorPlayer.kt |   5 +-
 .../cloudstream3/ui/player/IPlayer.kt         |   8 +-
 .../ui/player/NonFinalTextRenderer.kt         |   5 +-
 .../ui/subtitles/SubtitlesFragment.kt         |   2 +-
 .../cloudstream3/utils/CastOptionsProvider.kt |   9 +-
 8 files changed, 108 insertions(+), 43 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 42ca93fd..b3318675 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -155,10 +155,10 @@ dependencies {
     // implementation("androidx.leanback:leanback-paging:1.1.0-alpha09")
 
     // Exoplayer
-    implementation("com.google.android.exoplayer:exoplayer:2.16.1")
-    implementation("com.google.android.exoplayer:extension-cast:2.16.1")
-    implementation("com.google.android.exoplayer:extension-mediasession:2.16.1")
-    implementation("com.google.android.exoplayer:extension-okhttp:2.16.1")
+    implementation("com.google.android.exoplayer:exoplayer:2.18.1")
+    implementation("com.google.android.exoplayer:extension-cast:2.18.1")
+    implementation("com.google.android.exoplayer:extension-mediasession:2.18.1")
+    implementation("com.google.android.exoplayer:extension-okhttp:2.18.1")
 
     //implementation("com.google.android.exoplayer:extension-leanback:2.14.0")
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
index ad0b4399..46ddce09 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
@@ -150,7 +150,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                             } else {
                                 ChromecastSubtitlesFragment.getCurrentSavedStyle().apply {
                                     val font = TextTrackStyle()
-                                    font.fontFamily = fontFamily ?: "Google Sans"
+                                    font.setFontFamily(fontFamily ?: "Google Sans")
                                     fontGenericFamily?.let {
                                         font.fontGenericFamily = it
                                     }
@@ -183,7 +183,9 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                     val contentUrl = (remoteMediaClient?.currentItem?.media?.contentUrl
                         ?: remoteMediaClient?.currentItem?.media?.contentId)
 
-                    val sortingMethods = items.map { "${it.name} ${Qualities.getStringByInt(it.quality)}" }.toTypedArray()
+                    val sortingMethods =
+                        items.map { "${it.name} ${Qualities.getStringByInt(it.quality)}" }
+                            .toTypedArray()
                     val sotringIndex = items.indexOfFirst { it.url == contentUrl }
 
                     val arrayAdapter =
@@ -279,7 +281,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                     val currentPosition = remoteMediaClient?.approximateStreamPosition
                     if (currentDuration != null && currentPosition != null)
                         DataStoreHelper.setViewPos(epData.id, currentPosition, currentDuration)
-                } catch (t : Throwable) {
+                } catch (t: Throwable) {
                     logError(t)
                 }
 
@@ -358,10 +360,8 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
         }
     }
 
-    override fun onSessionConnected(castSession: CastSession?) {
-        castSession?.let {
-            super.onSessionConnected(it)
-        }
+    override fun onSessionConnected(castSession: CastSession) {
+        super.onSessionConnected(castSession)
         remoteMediaClient?.queueSetRepeatMode(REPEAT_MODE_REPEAT_OFF, JSONObject())
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index a838c85c..f60d8c78 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -15,6 +15,7 @@ import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource
 import com.google.android.exoplayer2.source.*
 import com.google.android.exoplayer2.text.TextRenderer
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
+import com.google.android.exoplayer2.trackselection.TrackSelectionOverride
 import com.google.android.exoplayer2.trackselection.TrackSelector
 import com.google.android.exoplayer2.ui.SubtitleView
 import com.google.android.exoplayer2.upstream.*
@@ -218,7 +219,43 @@ class CS3IPlayer : IPlayer {
 
     var currentSubtitles: SubtitleData? = null
 
-    override fun setMaxVideoSize(width: Int, height: Int) {
+    private fun List<Tracks.Group>.getTrack(id: String?): Pair<TrackGroup, Int>? {
+        if (id == null) return null
+        // This beast of an expression does:
+        // 1. Filter all audio tracks
+        // 2. Get all formats in said audio tacks
+        // 3. Gets all ids of the formats
+        // 4. Filters to find the first audio track with the same id as the audio track we are looking for
+        // 5. Returns the media group and the index of the audio track in the group
+        return this.firstNotNullOfOrNull { group ->
+            (0 until group.mediaTrackGroup.length).map {
+                group.getTrackFormat(it) to it
+            }.firstOrNull { it.first.id == id }
+                ?.let { group.mediaTrackGroup to it.second }
+        }
+    }
+
+    override fun setMaxVideoSize(width: Int, height: Int, id: String?) {
+        if (id != null) {
+            val videoTrack =
+                exoPlayer?.currentTracks?.groups?.filter { it.type == TRACK_TYPE_VIDEO }
+                    ?.getTrack(id)
+
+            if (videoTrack != null) {
+                exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
+                    ?.buildUpon()
+                    ?.setOverrideForType(
+                        TrackSelectionOverride(
+                            videoTrack.first,
+                            videoTrack.second
+                        )
+                    )
+                    ?.build()
+                    ?: return
+                return
+            }
+        }
+
         exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
             ?.buildUpon()
             ?.setMaxVideoSize(width, height)
@@ -226,8 +263,29 @@ class CS3IPlayer : IPlayer {
             ?: return
     }
 
-    override fun setPreferredAudioTrack(trackLanguage: String?) {
+    override fun setPreferredAudioTrack(trackLanguage: String?, id: String?) {
         preferredAudioTrackLanguage = trackLanguage
+
+        if (id != null) {
+            val audioTrack =
+                exoPlayer?.currentTracks?.groups?.filter { it.type == TRACK_TYPE_AUDIO }
+                    ?.getTrack(id)
+
+            if (audioTrack != null) {
+                exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
+                    ?.buildUpon()
+                    ?.setOverrideForType(
+                        TrackSelectionOverride(
+                            audioTrack.first,
+                            audioTrack.second
+                        )
+                    )
+                    ?.build()
+                    ?: return
+                return
+            }
+        }
+
         exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
             ?.buildUpon()
             ?.setPreferredAudioLanguage(trackLanguage)
@@ -239,11 +297,11 @@ class CS3IPlayer : IPlayer {
     /**
      * Gets all supported formats in a list
      * */
-    private fun List<TracksInfo.TrackGroupInfo>.getFormats(): List<Format> {
+    private fun List<Tracks.Group>.getFormats(): List<Pair<Format, Int>> {
         return this.map {
-            (0 until it.trackGroup.length).mapNotNull { i ->
+            (0 until it.mediaTrackGroup.length).mapNotNull { i ->
                 if (it.isSupported)
-                    it.trackGroup.getFormat(i) // to it.isSelected
+                    it.mediaTrackGroup.getFormat(i) to i
                 else null
             }
         }.flatten()
@@ -270,11 +328,12 @@ class CS3IPlayer : IPlayer {
     }
 
     override fun getVideoTracks(): CurrentTracks {
-        val allTracks = exoPlayer?.currentTracksInfo?.trackGroupInfos ?: emptyList()
-        val videoTracks = allTracks.filter { it.trackType == TRACK_TYPE_VIDEO }.getFormats()
-            .map { it.toVideoTrack() }
-        val audioTracks = allTracks.filter { it.trackType == TRACK_TYPE_AUDIO }.getFormats()
-            .map { it.toAudioTrack() }
+        val allTracks = exoPlayer?.currentTracks?.groups ?: emptyList()
+        val videoTracks = allTracks.filter { it.type == TRACK_TYPE_VIDEO }
+            .getFormats()
+            .map { it.first.toVideoTrack() }
+        val audioTracks = allTracks.filter { it.type == TRACK_TYPE_AUDIO }.getFormats()
+            .map { it.first.toAudioTrack() }
 
         return CurrentTracks(
             exoPlayer?.videoFormat?.toVideoTrack(),
@@ -611,7 +670,12 @@ class CS3IPlayer : IPlayer {
                             } else it
                         }.toTypedArray()
                     }
-                    .setTrackSelector(trackSelector ?: getTrackSelector(context, maxVideoHeight))
+                    .setTrackSelector(
+                        trackSelector ?: getTrackSelector(
+                            context,
+                            maxVideoHeight
+                        )
+                    )
                     .setLoadControl(
                         DefaultLoadControl.Builder()
                             .setTargetBufferBytes(
@@ -781,10 +845,7 @@ class CS3IPlayer : IPlayer {
                 isPlaying = exo.isPlaying
             }
             exoPlayer?.addListener(object : Player.Listener {
-                /**
-                 * Records the current used subtitle/track. Needed as exoplayer seems to have loose track language selection.
-                 * */
-                override fun onTracksInfoChanged(tracksInfo: TracksInfo) {
+                override fun onTracksChanged(tracks: Tracks) {
                     fun Format.isSubtitle(): Boolean {
                         return this.sampleMimeType?.contains("video/") == false &&
                                 this.sampleMimeType?.contains("audio/") == false
@@ -792,17 +853,17 @@ class CS3IPlayer : IPlayer {
 
                     normalSafeApiCall {
                         exoPlayerSelectedTracks =
-                            tracksInfo.trackGroupInfos.mapNotNull {
-                                val format = it.trackGroup.getFormat(0)
+                            tracks.groups.mapNotNull {
+                                val format = it.mediaTrackGroup.getFormat(0)
                                 if (format.isSubtitle())
                                     format.language?.let { lang -> lang to it.isSelected }
                                 else null
                             }
 
-                        val exoPlayerReportedTracks = tracksInfo.trackGroupInfos.mapNotNull {
+                        val exoPlayerReportedTracks = tracks.groups.mapNotNull {
                             // Filter out unsupported tracks
                             if (it.isSupported)
-                                it.trackGroup.getFormat(0)
+                                it.mediaTrackGroup.getFormat(0)
                             else
                                 null
                         }.mapNotNull {
@@ -827,7 +888,6 @@ class CS3IPlayer : IPlayer {
                         onTracksInfoChanged?.invoke()
                         subtitlesUpdates?.invoke()
                     }
-                    super.onTracksInfoChanged(tracksInfo)
                 }
 
                 override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 816b1298..f466dd7e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -796,15 +796,16 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 tracksDialog.apply_btt?.setOnClickListener {
+                    val currentTrack = currentAudioTracks.getOrNull(audioIndexStart)
                     player.setPreferredAudioTrack(
-                        currentAudioTracks.getOrNull(audioIndexStart)?.language
+                        currentTrack?.language, currentTrack?.id
                     )
 
                     val currentVideo = currentVideoTracks.getOrNull(videoIndex)
                     val width = currentVideo?.width ?: NO_VALUE
                     val height = currentVideo?.height ?: NO_VALUE
                     if (width != NO_VALUE && height != NO_VALUE) {
-                        player.setMaxVideoSize(width, height)
+                        player.setMaxVideoSize(width, height, currentVideo?.id)
                     }
 
                     tracksDialog.dismissSafe(activity)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
index e8934250..473b3e65 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
@@ -161,9 +161,9 @@ interface IPlayer {
 
     fun getVideoTracks(): CurrentTracks
 
-    /** If no parameters are set it'll default to no set size */
-    fun setMaxVideoSize(width: Int = Int.MAX_VALUE, height: Int = Int.MAX_VALUE)
+    /** If no parameters are set it'll default to no set size, Specifying the id allows for track overrides to force the player to pick the quality. */
+    fun setMaxVideoSize(width: Int = Int.MAX_VALUE, height: Int = Int.MAX_VALUE, id: String? = null)
 
-    /** If no trackLanguage is set it'll default to first track */
-    fun setPreferredAudioTrack(trackLanguage: String?)
+    /** If no trackLanguage is set it'll default to first track. Specifying the id allows for track overrides as the language can be identical. */
+    fun setPreferredAudioTrack(trackLanguage: String?, id: String? = null)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt
index f7fb3139..7acb7c34 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt
@@ -75,7 +75,7 @@ open class NonFinalTextRenderer @JvmOverloads constructor(
         return TAG
     }
 
-    @RendererCapabilities.Capabilities
+//    @RendererCapabilities.Capabilities
     override fun supportsFormat(format: Format): Int {
         return if (decoderFactory.supportsFormat(format)) {
             RendererCapabilities.create(
@@ -202,7 +202,8 @@ open class NonFinalTextRenderer @JvmOverloads constructor(
                     return
                 }
                 // Try and read the next subtitle from the source.
-                @ReadDataResult val result =
+//                @ReadDataResult
+                val result =
                     readSource(formatHold, nextInputBuffer,  /* readFlags= */0)
                 if (result == C.RESULT_BUFFER_READ) {
                     if (nextInputBuffer.isEndOfStream) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
index b97468e7..05a9416d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
@@ -49,7 +49,7 @@ data class SaveCaptionStyle(
     @JsonProperty("foregroundColor") var foregroundColor: Int,
     @JsonProperty("backgroundColor") var backgroundColor: Int,
     @JsonProperty("windowColor") var windowColor: Int,
-    @CaptionStyleCompat.EdgeType
+//    @CaptionStyleCompat.EdgeType
     @JsonProperty("edgeType") var edgeType: Int,
     @JsonProperty("edgeColor") var edgeColor: Int,
     @FontRes
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/CastOptionsProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/CastOptionsProvider.kt
index 17ec775b..ece9a4c0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/CastOptionsProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/CastOptionsProvider.kt
@@ -20,10 +20,13 @@ class CastOptionsProvider : OptionsProvider {
             MediaIntentReceiver.ACTION_FORWARD,
             MediaIntentReceiver.ACTION_STOP_CASTING
         )
+
+        val name = ControllerActivity::class.qualifiedName!!
+
         val compatButtonAction = intArrayOf(1, 3)
         val notificationOptions =
             NotificationOptions.Builder()
-                .setTargetActivityClassName(ControllerActivity::class.qualifiedName)
+                .setTargetActivityClassName(name)
                 .setActions(buttonActions, compatButtonAction)
                 .setForward30DrawableResId(R.drawable.go_forward_30)
                 .setRewind30DrawableResId(R.drawable.go_back_30)
@@ -32,7 +35,7 @@ class CastOptionsProvider : OptionsProvider {
 
         val mediaOptions = CastMediaOptions.Builder()
             .setNotificationOptions(notificationOptions)
-            .setExpandedControllerActivityClassName(ControllerActivity::class.qualifiedName)
+            .setExpandedControllerActivityClassName(name)
             .build()
 
         return CastOptions.Builder()
@@ -44,7 +47,7 @@ class CastOptionsProvider : OptionsProvider {
             .build()
     }
 
-    override fun getAdditionalSessionProviders(p0: Context?): MutableList<SessionProvider> {
+    override fun getAdditionalSessionProviders(p0: Context): MutableList<SessionProvider> {
         return Collections.emptyList()
     }
 }
\ No newline at end of file

From 6308fd0fec126831702b9e3309b6990b71ebefed Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Tue, 1 Nov 2022 23:27:42 +0100
Subject: [PATCH 053/273] Fixed subtitles on new exoplayer version

---
 .../ui/player/NonFinalTextRenderer.java       | 423 ++++++++++++++++++
 .../ui/player/NonFinalTextRenderer.kt         | 383 ----------------
 2 files changed, 423 insertions(+), 383 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
 delete mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
new file mode 100644
index 00000000..8602ce25
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
@@ -0,0 +1,423 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lagradost.cloudstream3.ui.player;
+
+import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
+import static com.google.android.exoplayer2.util.Assertions.checkState;
+import static java.lang.annotation.ElementType.TYPE_USE;
+
+import android.os.Handler;
+import android.os.Handler.Callback;
+import android.os.Looper;
+import android.os.Message;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.BaseRenderer;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.FormatHolder;
+import com.google.android.exoplayer2.RendererCapabilities;
+import com.google.android.exoplayer2.source.SampleStream.ReadDataResult;
+import com.google.android.exoplayer2.text.Cue;
+import com.google.android.exoplayer2.text.CueGroup;
+import com.google.android.exoplayer2.text.Subtitle;
+import com.google.android.exoplayer2.text.SubtitleDecoder;
+import com.google.android.exoplayer2.text.SubtitleDecoderException;
+import com.google.android.exoplayer2.text.SubtitleDecoderFactory;
+import com.google.android.exoplayer2.text.SubtitleInputBuffer;
+import com.google.android.exoplayer2.text.SubtitleOutputBuffer;
+import com.google.android.exoplayer2.text.TextOutput;
+import com.google.android.exoplayer2.util.Log;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Collections;
+import java.util.List;
+// DO NOT CONVERT TO KOTLIN AUTOMATICALLY, IT FUCKS UP AND DOES NOT DISPLAY SUBS FOR SOME REASON
+/**
+ * A renderer for text.
+ *
+ * <p>{@link Subtitle}s are decoded from sample data using {@link SubtitleDecoder} instances
+ * obtained from a {@link SubtitleDecoderFactory}. The actual rendering of the subtitle {@link Cue}s
+ * is delegated to a {@link TextOutput}.
+ */
+public class NonFinalTextRenderer extends BaseRenderer implements Callback {
+
+  private static final String TAG = "TextRenderer";
+
+  /**
+   * @param trackType The track type that the renderer handles. One of the {@link C} {@code
+   *                  TRACK_TYPE_*} constants.
+   * @param outputHandler
+   */
+  public NonFinalTextRenderer(int trackType, @Nullable Handler outputHandler) {
+    super(trackType);
+    this.outputHandler = outputHandler;
+  }
+
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @Target(TYPE_USE)
+  @IntDef({
+    REPLACEMENT_STATE_NONE,
+    REPLACEMENT_STATE_SIGNAL_END_OF_STREAM,
+    REPLACEMENT_STATE_WAIT_END_OF_STREAM
+  })
+  private @interface ReplacementState {}
+  /** The decoder does not need to be replaced. */
+  private static final int REPLACEMENT_STATE_NONE = 0;
+  /**
+   * The decoder needs to be replaced, but we haven't yet signaled an end of stream to the existing
+   * decoder. We need to do so in order to ensure that it outputs any remaining buffers before we
+   * release it.
+   */
+  private static final int REPLACEMENT_STATE_SIGNAL_END_OF_STREAM = 1;
+  /**
+   * The decoder needs to be replaced, and we've signaled an end of stream to the existing decoder.
+   * We're waiting for the decoder to output an end of stream signal to indicate that it has output
+   * any remaining buffers before we release it.
+   */
+  private static final int REPLACEMENT_STATE_WAIT_END_OF_STREAM = 2;
+
+  private static final int MSG_UPDATE_OUTPUT = 0;
+
+  @Nullable private final Handler outputHandler;
+  private TextOutput output = null;
+  private SubtitleDecoderFactory decoderFactory = null;
+  private FormatHolder formatHolder = null;
+
+  private boolean inputStreamEnded;
+  private boolean outputStreamEnded;
+  private boolean waitingForKeyFrame;
+  private @ReplacementState int decoderReplacementState;
+  @Nullable private Format streamFormat;
+  @Nullable private SubtitleDecoder decoder;
+  @Nullable private SubtitleInputBuffer nextInputBuffer;
+  @Nullable private SubtitleOutputBuffer subtitle;
+  @Nullable private SubtitleOutputBuffer nextSubtitle;
+  private int nextSubtitleEventIndex;
+  private long finalStreamEndPositionUs;
+
+  /**
+   * @param output The output.
+   * @param outputLooper The looper associated with the thread on which the output should be called.
+   *     If the output makes use of standard Android UI components, then this should normally be the
+   *     looper associated with the application's main thread, which can be obtained using {@link
+   *     android.app.Activity#getMainLooper()}. Null may be passed if the output should be called
+   *     directly on the player's internal rendering thread.
+   */
+  public NonFinalTextRenderer(TextOutput output, @Nullable Looper outputLooper) {
+    this(output, outputLooper, SubtitleDecoderFactory.DEFAULT);
+  }
+
+  /**
+   * @param output The output.
+   * @param outputLooper The looper associated with the thread on which the output should be called.
+   *     If the output makes use of standard Android UI components, then this should normally be the
+   *     looper associated with the application's main thread, which can be obtained using {@link
+   *     android.app.Activity#getMainLooper()}. Null may be passed if the output should be called
+   *     directly on the player's internal rendering thread.
+   * @param decoderFactory A factory from which to obtain {@link SubtitleDecoder} instances.
+   */
+  public NonFinalTextRenderer(
+      TextOutput output, @Nullable Looper outputLooper, SubtitleDecoderFactory decoderFactory) {
+    super(C.TRACK_TYPE_TEXT);
+    this.output = checkNotNull(output);
+    this.outputHandler =
+        outputLooper == null ? null : Util.createHandler(outputLooper, /* callback= */ this);
+    this.decoderFactory = decoderFactory;
+    formatHolder = new FormatHolder();
+    finalStreamEndPositionUs = C.TIME_UNSET;
+  }
+
+  @Override
+  public String getName() {
+    return TAG;
+  }
+
+  @Override
+  public @Capabilities int supportsFormat(Format format) {
+    if (decoderFactory.supportsFormat(format)) {
+      return RendererCapabilities.create(
+          format.cryptoType == C.CRYPTO_TYPE_NONE ? C.FORMAT_HANDLED : C.FORMAT_UNSUPPORTED_DRM);
+    } else if (MimeTypes.isText(format.sampleMimeType)) {
+      return RendererCapabilities.create(C.FORMAT_UNSUPPORTED_SUBTYPE);
+    } else {
+      return RendererCapabilities.create(C.FORMAT_UNSUPPORTED_TYPE);
+    }
+  }
+
+  /**
+   * Sets the position at which to stop rendering the current stream.
+   *
+   * <p>Must be called after {@link #setCurrentStreamFinal()}.
+   *
+   * @param streamEndPositionUs The position to stop rendering at or {@link C#LENGTH_UNSET} to
+   *     render until the end of the current stream.
+   */
+  // TODO(internal b/181312195): Remove this when it's no longer needed once subtitles are decoded
+  // on the loading side of SampleQueue.
+  public void setFinalStreamEndPositionUs(long streamEndPositionUs) {
+    checkState(isCurrentStreamFinal());
+    this.finalStreamEndPositionUs = streamEndPositionUs;
+  }
+
+  @Override
+  protected void onStreamChanged(Format[] formats, long startPositionUs, long offsetUs) {
+    streamFormat = formats[0];
+    if (decoder != null) {
+      decoderReplacementState = REPLACEMENT_STATE_SIGNAL_END_OF_STREAM;
+    } else {
+      initDecoder();
+    }
+  }
+
+  @Override
+  protected void onPositionReset(long positionUs, boolean joining) {
+    clearOutput();
+    inputStreamEnded = false;
+    outputStreamEnded = false;
+    finalStreamEndPositionUs = C.TIME_UNSET;
+    if (decoderReplacementState != REPLACEMENT_STATE_NONE) {
+      replaceDecoder();
+    } else {
+      releaseBuffers();
+      checkNotNull(decoder).flush();
+    }
+  }
+
+  @Override
+  public void render(long positionUs, long elapsedRealtimeUs) {
+    if (isCurrentStreamFinal()
+        && finalStreamEndPositionUs != C.TIME_UNSET
+        && positionUs >= finalStreamEndPositionUs) {
+      releaseBuffers();
+      outputStreamEnded = true;
+    }
+
+    if (outputStreamEnded) {
+      return;
+    }
+
+    if (nextSubtitle == null) {
+      checkNotNull(decoder).setPositionUs(positionUs);
+      try {
+        nextSubtitle = checkNotNull(decoder).dequeueOutputBuffer();
+      } catch (SubtitleDecoderException e) {
+        handleDecoderError(e);
+        return;
+      }
+    }
+
+    if (getState() != STATE_STARTED) {
+      return;
+    }
+
+    boolean textRendererNeedsUpdate = false;
+    if (subtitle != null) {
+      // We're iterating through the events in a subtitle. Set textRendererNeedsUpdate if we
+      // advance to the next event.
+      long subtitleNextEventTimeUs = getNextEventTime();
+      while (subtitleNextEventTimeUs <= positionUs) {
+        nextSubtitleEventIndex++;
+        subtitleNextEventTimeUs = getNextEventTime();
+        textRendererNeedsUpdate = true;
+      }
+    }
+    if (nextSubtitle != null) {
+      SubtitleOutputBuffer nextSubtitle = this.nextSubtitle;
+      if (nextSubtitle.isEndOfStream()) {
+        if (!textRendererNeedsUpdate && getNextEventTime() == Long.MAX_VALUE) {
+          if (decoderReplacementState == REPLACEMENT_STATE_WAIT_END_OF_STREAM) {
+            replaceDecoder();
+          } else {
+            releaseBuffers();
+            outputStreamEnded = true;
+          }
+        }
+      } else if (nextSubtitle.timeUs <= positionUs) {
+        // Advance to the next subtitle. Sync the next event index and trigger an update.
+        if (subtitle != null) {
+          subtitle.release();
+        }
+        nextSubtitleEventIndex = nextSubtitle.getNextEventTimeIndex(positionUs);
+        subtitle = nextSubtitle;
+        this.nextSubtitle = null;
+        textRendererNeedsUpdate = true;
+      }
+    }
+
+    if (textRendererNeedsUpdate) {
+      // If textRendererNeedsUpdate then subtitle must be non-null.
+      checkNotNull(subtitle);
+      // textRendererNeedsUpdate is set and we're playing. Update the renderer.
+      updateOutput(subtitle.getCues(positionUs));
+    }
+
+    if (decoderReplacementState == REPLACEMENT_STATE_WAIT_END_OF_STREAM) {
+      return;
+    }
+
+    try {
+      while (!inputStreamEnded) {
+        @Nullable SubtitleInputBuffer nextInputBuffer = this.nextInputBuffer;
+        if (nextInputBuffer == null) {
+          nextInputBuffer = checkNotNull(decoder).dequeueInputBuffer();
+          if (nextInputBuffer == null) {
+            return;
+          }
+          this.nextInputBuffer = nextInputBuffer;
+        }
+        if (decoderReplacementState == REPLACEMENT_STATE_SIGNAL_END_OF_STREAM) {
+          nextInputBuffer.setFlags(C.BUFFER_FLAG_END_OF_STREAM);
+          checkNotNull(decoder).queueInputBuffer(nextInputBuffer);
+          this.nextInputBuffer = null;
+          decoderReplacementState = REPLACEMENT_STATE_WAIT_END_OF_STREAM;
+          return;
+        }
+        // Try and read the next subtitle from the source.
+        @ReadDataResult int result = readSource(formatHolder, nextInputBuffer, /* readFlags= */ 0);
+        if (result == C.RESULT_BUFFER_READ) {
+          if (nextInputBuffer.isEndOfStream()) {
+            inputStreamEnded = true;
+            waitingForKeyFrame = false;
+          } else {
+            @Nullable Format format = formatHolder.format;
+            if (format == null) {
+              // We haven't received a format yet.
+              return;
+            }
+            nextInputBuffer.subsampleOffsetUs = format.subsampleOffsetUs;
+            nextInputBuffer.flip();
+            waitingForKeyFrame &= !nextInputBuffer.isKeyFrame();
+          }
+          if (!waitingForKeyFrame) {
+            checkNotNull(decoder).queueInputBuffer(nextInputBuffer);
+            this.nextInputBuffer = null;
+          }
+        } else if (result == C.RESULT_NOTHING_READ) {
+          return;
+        }
+      }
+    } catch (SubtitleDecoderException e) {
+      handleDecoderError(e);
+    }
+  }
+
+  @Override
+  protected void onDisabled() {
+    streamFormat = null;
+    finalStreamEndPositionUs = C.TIME_UNSET;
+    clearOutput();
+    releaseDecoder();
+  }
+
+  @Override
+  public boolean isEnded() {
+    return outputStreamEnded;
+  }
+
+  @Override
+  public boolean isReady() {
+    // Don't block playback whilst subtitles are loading.
+    // Note: To change this behavior, it will be necessary to consider [Internal: b/12949941].
+    return true;
+  }
+
+  private void releaseBuffers() {
+    nextInputBuffer = null;
+    nextSubtitleEventIndex = C.INDEX_UNSET;
+    if (subtitle != null) {
+      subtitle.release();
+      subtitle = null;
+    }
+    if (nextSubtitle != null) {
+      nextSubtitle.release();
+      nextSubtitle = null;
+    }
+  }
+
+  private void releaseDecoder() {
+    releaseBuffers();
+    checkNotNull(decoder).release();
+    decoder = null;
+    decoderReplacementState = REPLACEMENT_STATE_NONE;
+  }
+
+  private void initDecoder() {
+    waitingForKeyFrame = true;
+    decoder = decoderFactory.createDecoder(checkNotNull(streamFormat));
+  }
+
+  private void replaceDecoder() {
+    releaseDecoder();
+    initDecoder();
+  }
+
+  private long getNextEventTime() {
+    if (nextSubtitleEventIndex == C.INDEX_UNSET) {
+      return Long.MAX_VALUE;
+    }
+    checkNotNull(subtitle);
+    return nextSubtitleEventIndex >= subtitle.getEventTimeCount()
+        ? Long.MAX_VALUE
+        : subtitle.getEventTime(nextSubtitleEventIndex);
+  }
+
+  private void updateOutput(List<Cue> cues) {
+    if (outputHandler != null) {
+      outputHandler.obtainMessage(MSG_UPDATE_OUTPUT, cues).sendToTarget();
+    } else {
+      invokeUpdateOutputInternal(cues);
+    }
+  }
+
+  private void clearOutput() {
+    updateOutput(Collections.emptyList());
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public boolean handleMessage(Message msg) {
+    switch (msg.what) {
+      case MSG_UPDATE_OUTPUT:
+        invokeUpdateOutputInternal((List<Cue>) msg.obj);
+        return true;
+      default:
+        throw new IllegalStateException();
+    }
+  }
+
+  private void invokeUpdateOutputInternal(List<Cue> cues) {
+    output.onCues(cues);
+    output.onCues(new CueGroup(cues));
+  }
+
+  /**
+   * Called when {@link #decoder} throws an exception, so it can be logged and playback can
+   * continue.
+   *
+   * <p>Logs {@code e} and resets state to allow decoding the next sample.
+   */
+  private void handleDecoderError(SubtitleDecoderException e) {
+    Log.e(TAG, "Subtitle decoding failed. streamFormat=" + streamFormat, e);
+    clearOutput();
+    replaceDecoder();
+  }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt
deleted file mode 100644
index 7acb7c34..00000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.kt
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.lagradost.cloudstream3.ui.player
-
-import android.os.Handler
-import android.os.Looper
-import android.os.Message
-import androidx.annotation.IntDef
-import com.google.android.exoplayer2.*
-import com.google.android.exoplayer2.source.SampleStream.ReadDataResult
-import com.google.android.exoplayer2.text.*
-import com.google.android.exoplayer2.text.Cue.DIMEN_UNSET
-import com.google.android.exoplayer2.text.Cue.LINE_TYPE_NUMBER
-import com.google.android.exoplayer2.util.Assertions
-import com.google.android.exoplayer2.util.Log
-import com.google.android.exoplayer2.util.MimeTypes
-import com.google.android.exoplayer2.util.Util
-
-/**
- * A renderer for text.
- *
- *
- * [Subtitle]s are decoded from sample data using [SubtitleDecoder] instances
- * obtained from a [SubtitleDecoderFactory]. The actual rendering of the subtitle [Cue]s
- * is delegated to a [TextOutput].
- */
-open class NonFinalTextRenderer @JvmOverloads constructor(
-    output: TextOutput?,
-    outputLooper: Looper?,
-    private val decoderFactory: SubtitleDecoderFactory = SubtitleDecoderFactory.DEFAULT
-) :
-    BaseRenderer(C.TRACK_TYPE_TEXT), Handler.Callback {
-    @MustBeDocumented
-    @kotlin.annotation.Retention(AnnotationRetention.SOURCE)
-    @IntDef(
-        REPLACEMENT_STATE_NONE,
-        REPLACEMENT_STATE_SIGNAL_END_OF_STREAM,
-        REPLACEMENT_STATE_WAIT_END_OF_STREAM
-    )
-    private annotation class ReplacementState
-
-    private val outputHandler: Handler? = if (outputLooper == null) null else Util.createHandler(
-        outputLooper,  /* callback= */
-        this
-    )
-    private val output: TextOutput = Assertions.checkNotNull(output)
-    private val formatHold: FormatHolder = FormatHolder()
-    private var inputStreamEnded = false
-    private var outputStreamEnded = false
-    private var waitingForKeyFrame = false
-
-    @ReplacementState
-    private var decoderReplacementState = 0
-    private var streamFormat: Format? = null
-    private var decoder: SubtitleDecoder? = null
-    private var nextInputBuffer: SubtitleInputBuffer? = null
-    private var subtitle: SubtitleOutputBuffer? = null
-    private var nextSubtitle: SubtitleOutputBuffer? = null
-    private var nextSubtitleEventIndex = 0
-    private var finalStreamEndPositionUs: Long
-    override fun getName(): String {
-        return TAG
-    }
-
-//    @RendererCapabilities.Capabilities
-    override fun supportsFormat(format: Format): Int {
-        return if (decoderFactory.supportsFormat(format)) {
-            RendererCapabilities.create(
-                if (format.cryptoType == C.CRYPTO_TYPE_NONE) C.FORMAT_HANDLED else C.FORMAT_UNSUPPORTED_DRM
-            )
-        } else if (MimeTypes.isText(format.sampleMimeType)) {
-            RendererCapabilities.create(C.FORMAT_UNSUPPORTED_SUBTYPE)
-        } else {
-            RendererCapabilities.create(C.FORMAT_UNSUPPORTED_TYPE)
-        }
-    }
-
-    /**
-     * Sets the position at which to stop rendering the current stream.
-     *
-     *
-     * Must be called after [.setCurrentStreamFinal].
-     *
-     * @param streamEndPositionUs The position to stop rendering at or [C.LENGTH_UNSET] to
-     * render until the end of the current stream.
-     */
-
-    override fun onStreamChanged(formats: Array<Format>, startPositionUs: Long, offsetUs: Long) {
-        streamFormat = formats[0]
-        if (decoder != null) {
-            decoderReplacementState = REPLACEMENT_STATE_SIGNAL_END_OF_STREAM
-        } else {
-            initDecoder()
-        }
-    }
-
-    override fun onPositionReset(positionUs: Long, joining: Boolean) {
-        clearOutput()
-        inputStreamEnded = false
-        outputStreamEnded = false
-        finalStreamEndPositionUs = C.TIME_UNSET
-        if (decoderReplacementState != REPLACEMENT_STATE_NONE) {
-            replaceDecoder()
-        } else {
-            releaseBuffers()
-            Assertions.checkNotNull(decoder).flush()
-        }
-    }
-
-    override fun render(positionUs: Long, elapsedRealtimeUs: Long) {
-        if (isCurrentStreamFinal
-            && finalStreamEndPositionUs != C.TIME_UNSET && positionUs >= finalStreamEndPositionUs
-        ) {
-            releaseBuffers()
-            outputStreamEnded = true
-        }
-        if (outputStreamEnded) {
-            return
-        }
-        if (nextSubtitle == null) {
-            Assertions.checkNotNull(decoder).setPositionUs(positionUs)
-            nextSubtitle = try {
-                Assertions.checkNotNull(decoder).dequeueOutputBuffer()
-            } catch (e: SubtitleDecoderException) {
-                handleDecoderError(e)
-                return
-            }
-        }
-        if (state != STATE_STARTED) {
-            return
-        }
-        var textRendererNeedsUpdate = false
-        if (subtitle != null) {
-            // We're iterating through the events in a subtitle. Set textRendererNeedsUpdate if we
-            // advance to the next event.
-            var subtitleNextEventTimeUs = nextEventTime
-            while (subtitleNextEventTimeUs <= positionUs) {
-                nextSubtitleEventIndex++
-                subtitleNextEventTimeUs = nextEventTime
-                textRendererNeedsUpdate = true
-            }
-        }
-        if (nextSubtitle != null) {
-            val nextSubtitle = nextSubtitle
-            if (nextSubtitle!!.isEndOfStream) {
-                if (!textRendererNeedsUpdate && nextEventTime == Long.MAX_VALUE) {
-                    if (decoderReplacementState == REPLACEMENT_STATE_WAIT_END_OF_STREAM) {
-                        replaceDecoder()
-                    } else {
-                        releaseBuffers()
-                        outputStreamEnded = true
-                    }
-                }
-            } else if (nextSubtitle.timeUs <= positionUs) {
-                // Advance to the next subtitle. Sync the next event index and trigger an update.
-                if (subtitle != null) {
-                    subtitle!!.release()
-                }
-                nextSubtitleEventIndex = nextSubtitle.getNextEventTimeIndex(positionUs)
-                subtitle = nextSubtitle
-                this.nextSubtitle = null
-                textRendererNeedsUpdate = true
-            }
-        }
-        if (textRendererNeedsUpdate) {
-            // If textRendererNeedsUpdate then subtitle must be non-null.
-            Assertions.checkNotNull(subtitle)
-            // textRendererNeedsUpdate is set and we're playing. Update the renderer.
-            updateOutput(subtitle!!.getCues(positionUs))
-        }
-        if (decoderReplacementState == REPLACEMENT_STATE_WAIT_END_OF_STREAM) {
-            return
-        }
-        try {
-            while (!inputStreamEnded) {
-                var nextInputBuffer = nextInputBuffer
-                if (nextInputBuffer == null) {
-                    nextInputBuffer = Assertions.checkNotNull(decoder).dequeueInputBuffer()
-                    if (nextInputBuffer == null) {
-                        return
-                    }
-                    this.nextInputBuffer = nextInputBuffer
-                }
-                if (decoderReplacementState == REPLACEMENT_STATE_SIGNAL_END_OF_STREAM) {
-                    nextInputBuffer.setFlags(C.BUFFER_FLAG_END_OF_STREAM)
-                    Assertions.checkNotNull(decoder).queueInputBuffer(nextInputBuffer)
-                    this.nextInputBuffer = null
-                    decoderReplacementState = REPLACEMENT_STATE_WAIT_END_OF_STREAM
-                    return
-                }
-                // Try and read the next subtitle from the source.
-//                @ReadDataResult
-                val result =
-                    readSource(formatHold, nextInputBuffer,  /* readFlags= */0)
-                if (result == C.RESULT_BUFFER_READ) {
-                    if (nextInputBuffer.isEndOfStream) {
-                        inputStreamEnded = true
-                        waitingForKeyFrame = false
-                    } else {
-                        val format = formatHold.format
-                            ?: // We haven't received a format yet.
-                            return
-                        nextInputBuffer.subsampleOffsetUs = format.subsampleOffsetUs
-                        nextInputBuffer.flip()
-                        waitingForKeyFrame = waitingForKeyFrame and !nextInputBuffer.isKeyFrame
-                    }
-                    if (!waitingForKeyFrame) {
-                        Assertions.checkNotNull(decoder).queueInputBuffer(nextInputBuffer)
-                        this.nextInputBuffer = null
-                    }
-                } else if (result == C.RESULT_NOTHING_READ) {
-                    return
-                }
-            }
-        } catch (e: SubtitleDecoderException) {
-            handleDecoderError(e)
-        }
-    }
-
-    override fun onDisabled() {
-        streamFormat = null
-        finalStreamEndPositionUs = C.TIME_UNSET
-        clearOutput()
-        releaseDecoder()
-    }
-
-    override fun isEnded(): Boolean {
-        return outputStreamEnded
-    }
-
-    override fun isReady(): Boolean {
-        // Don't block playback whilst subtitles are loading.
-        // Note: To change this behavior, it will be necessary to consider [Internal: b/12949941].
-        return true
-    }
-
-    private fun releaseBuffers() {
-        nextInputBuffer = null
-        nextSubtitleEventIndex = C.INDEX_UNSET
-        if (subtitle != null) {
-            subtitle!!.release()
-            subtitle = null
-        }
-        if (nextSubtitle != null) {
-            nextSubtitle!!.release()
-            nextSubtitle = null
-        }
-    }
-
-    private fun releaseDecoder() {
-        releaseBuffers()
-        Assertions.checkNotNull(decoder).release()
-        decoder = null
-        decoderReplacementState = REPLACEMENT_STATE_NONE
-    }
-
-    private fun initDecoder() {
-        waitingForKeyFrame = true
-        decoder = decoderFactory.createDecoder(Assertions.checkNotNull(streamFormat))
-    }
-
-    private fun replaceDecoder() {
-        releaseDecoder()
-        initDecoder()
-    }
-
-    private val nextEventTime: Long
-        get() {
-            if (nextSubtitleEventIndex == C.INDEX_UNSET) {
-                return Long.MAX_VALUE
-            }
-            Assertions.checkNotNull(subtitle)
-            return if (nextSubtitleEventIndex >= subtitle!!.eventTimeCount) Long.MAX_VALUE else subtitle!!.getEventTime(
-                nextSubtitleEventIndex
-            )
-        }
-
-    private fun updateOutput(cues: List<Cue>) {
-        if (outputHandler != null) {
-            outputHandler.obtainMessage(MSG_UPDATE_OUTPUT, cues).sendToTarget()
-        } else {
-            invokeUpdateOutputInternal(cues)
-        }
-    }
-
-    private fun clearOutput() {
-        updateOutput(emptyList())
-    }
-
-    override fun handleMessage(msg: Message): Boolean {
-        return when (msg.what) {
-            MSG_UPDATE_OUTPUT -> {
-                invokeUpdateOutputInternal(msg.obj as List<Cue>)
-                true
-            }
-            else -> throw IllegalStateException()
-        }
-    }
-
-    private fun invokeUpdateOutputInternal(cues: List<Cue>) {
-        output.onCues(cues.map { cue ->
-            val builder = cue.buildUpon()
-
-            // See https://github.com/google/ExoPlayer/issues/7934
-            // SubripDecoder texts tend to be DIMEN_UNSET which pushes up the
-            // subs unlike WEBVTT which creates an inconsistency
-            if (cue.line == DIMEN_UNSET)
-                builder.setLine(-1f, LINE_TYPE_NUMBER)
-
-            // this fixes https://github.com/LagradOst/CloudStream-3/issues/717
-            builder.setSize(DIMEN_UNSET).build()
-        })
-    }
-
-    /**
-     * Called when [.decoder] throws an exception, so it can be logged and playback can
-     * continue.
-     *
-     *
-     * Logs `e` and resets state to allow decoding the next sample.
-     */
-    private fun handleDecoderError(e: SubtitleDecoderException) {
-        Log.e(
-            TAG,
-            "Subtitle decoding failed. streamFormat=$streamFormat", e
-        )
-        clearOutput()
-        replaceDecoder()
-    }
-
-    companion object {
-        private const val TAG = "TextRenderer"
-
-        /** The decoder does not need to be replaced.  */
-        private const val REPLACEMENT_STATE_NONE = 0
-
-        /**
-         * The decoder needs to be replaced, but we haven't yet signaled an end of stream to the existing
-         * decoder. We need to do so in order to ensure that it outputs any remaining buffers before we
-         * release it.
-         */
-        private const val REPLACEMENT_STATE_SIGNAL_END_OF_STREAM = 1
-
-        /**
-         * The decoder needs to be replaced, and we've signaled an end of stream to the existing decoder.
-         * We're waiting for the decoder to output an end of stream signal to indicate that it has output
-         * any remaining buffers before we release it.
-         */
-        private const val REPLACEMENT_STATE_WAIT_END_OF_STREAM = 2
-        private const val MSG_UPDATE_OUTPUT = 0
-    }
-    /**
-     * @param output The output.
-     * @param outputLooper The looper associated with the thread on which the output should be called.
-     * If the output makes use of standard Android UI components, then this should normally be the
-     * looper associated with the application's main thread, which can be obtained using [     ][android.app.Activity.getMainLooper]. Null may be passed if the output should be called
-     * directly on the player's internal rendering thread.
-     * @param decoderFactory A factory from which to obtain [SubtitleDecoder] instances.
-     */
-    /**
-     * @param output The output.
-     * @param outputLooper The looper associated with the thread on which the output should be called.
-     * If the output makes use of standard Android UI components, then this should normally be the
-     * looper associated with the application's main thread, which can be obtained using [     ][android.app.Activity.getMainLooper]. Null may be passed if the output should be called
-     * directly on the player's internal rendering thread.
-     */
-    init {
-        finalStreamEndPositionUs = C.TIME_UNSET
-    }
-}
\ No newline at end of file

From e5be703a473cee9f14f283e012d762d70058116e Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Tue, 1 Nov 2022 23:29:32 +0100
Subject: [PATCH 054/273] Small code fix

---
 .../lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
index 05a9416d..ff0e0e82 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
@@ -49,8 +49,7 @@ data class SaveCaptionStyle(
     @JsonProperty("foregroundColor") var foregroundColor: Int,
     @JsonProperty("backgroundColor") var backgroundColor: Int,
     @JsonProperty("windowColor") var windowColor: Int,
-//    @CaptionStyleCompat.EdgeType
-    @JsonProperty("edgeType") var edgeType: Int,
+    @JsonProperty("edgeType") var edgeType: @CaptionStyleCompat.EdgeType Int,
     @JsonProperty("edgeColor") var edgeColor: Int,
     @FontRes
     @JsonProperty("typeface") var typeface: Int?,

From 4a193d5d27449e232387e929d2645104aa1e8dc8 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Wed, 2 Nov 2022 21:41:39 +0100
Subject: [PATCH 055/273] small fix

---
 .../cloudstream3/extractors/BullStream.kt     |  2 +-
 .../extractors/YoutubeExtractor.kt            |  1 -
 .../cloudstream3/ui/home/HomeFragment.kt      |  5 ++
 .../ui/player/FullScreenPlayer.kt             |  8 +--
 .../ui/result/ResultTrailerPlayer.kt          | 49 ++++++++++++++++++-
 app/src/main/res/layout/fragment_result.xml   | 25 +++++-----
 app/src/main/res/layout/fragment_trailer.xml  |  2 +-
 .../main/res/layout/trailer_custom_layout.xml |  2 +-
 app/src/main/res/values/styles.xml            |  1 +
 9 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/BullStream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/BullStream.kt
index d4f87f4c..e5368bc3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/BullStream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/BullStream.kt
@@ -18,7 +18,7 @@ class BullStream : ExtractorApi() {
             ?: return null
 
         val m3u8 = "$mainUrl/m3u8/${data[1]}/${data[2]}/master.txt?s=1&cache=${data[4]}"
-        println("shiv : $m3u8")
+        //println("shiv : $m3u8")
         return M3u8Helper.generateM3u8(
             name,
             m3u8,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
index 572d93a3..23704e90 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
@@ -46,7 +46,6 @@ open class YoutubeExtractor : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        println("TRYING TO ExTRACT: $url")
         if (ytVideos[url].isNullOrEmpty()) {
             val link =
                 YoutubeStreamLinkHandlerFactory.getInstance().fromUrl(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 4b9dd5be..a73fc873 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -585,6 +585,11 @@ class HomeFragment : Fragment() {
             setPageTransformer(HomeScrollTransformer())
             val callback: OnPageChangeCallback = object : OnPageChangeCallback() {
                 override fun onPageSelected(position: Int) {
+
+                   // home_search?.isIconified = true
+                    //home_search?.isVisible = true
+                    //home_search?.clearFocus()
+
                     (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.apply {
                         if (position >= itemCount - 1 && hasMoreItems) {
                             hasMoreItems = false // dont make two requests
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 1ddd752f..52125c68 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -587,7 +587,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         updateLockUI()
     }
 
-    private fun updateUIVisibility() {
+    fun updateUIVisibility() {
         val isGone = isLocked || !isShowing
         var togglePlayerTitleGone = isGone
         context?.let {
@@ -1306,12 +1306,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             showTracksDialogue()
         }
 
-        player_intro_play?.setOnClickListener {
-            player_intro_play?.isGone = true
-            player.handleEvent(CSPlayerEvent.Play)
-            updateUIVisibility()
-        }
-
         // it is !not! a bug that you cant touch the right side, it does not register inputs on navbar or status bar
         player_holder?.setOnTouchListener { callView, event ->
             return@setOnTouchListener handleMotionEvent(callView, event)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
index 8a6e5b37..bf47209a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.result
 
+import android.animation.ValueAnimator
 import android.content.Context
 import android.content.res.Configuration
 import android.graphics.Rect
@@ -7,9 +8,11 @@ import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.discord.panels.PanelsChildGestureRegionObserver
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.utils.IOnBackPressed
 import kotlinx.android.synthetic.main.fragment_result.*
@@ -19,6 +22,7 @@ import kotlinx.android.synthetic.main.fragment_result_tv.*
 import kotlinx.android.synthetic.main.fragment_trailer.*
 import kotlinx.android.synthetic.main.trailer_custom_layout.*
 
+
 open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreenPlayer(),
     PanelsChildGestureRegionObserver.GestureRegionsListener, IOnBackPressed {
 
@@ -60,14 +64,43 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
             result_smallscreen_holder?.isVisible = !isFullScreenPlayer
             result_fullscreen_holder?.isVisible = isFullScreenPlayer
 
+            val to = sw * h / w
+
             player_background?.apply {
                 isVisible = true
                 layoutParams =
                     FrameLayout.LayoutParams(
                         FrameLayout.LayoutParams.MATCH_PARENT,
-                        if (isFullScreenPlayer) FrameLayout.LayoutParams.MATCH_PARENT else sw * h / w
+                        if (isFullScreenPlayer) FrameLayout.LayoutParams.MATCH_PARENT else to
                     )
             }
+
+            player_intro_play?.apply {
+                layoutParams =
+                    FrameLayout.LayoutParams(
+                        FrameLayout.LayoutParams.MATCH_PARENT,
+                        result_top_holder?.measuredHeight ?: FrameLayout.LayoutParams.MATCH_PARENT
+                    )
+            }
+
+            if (player_intro_play?.isGone == true) {
+                result_top_holder?.apply {
+
+                    val anim = ValueAnimator.ofInt(
+                        measuredHeight,
+                        if (isFullScreenPlayer) ViewGroup.LayoutParams.MATCH_PARENT else to
+                    )
+                    anim.addUpdateListener { valueAnimator ->
+                        val `val` = valueAnimator.animatedValue as Int
+                        val layoutParams: ViewGroup.LayoutParams =
+                            layoutParams
+                        layoutParams.height = `val`
+                        setLayoutParams(layoutParams)
+                    }
+                    anim.duration = 200
+                    anim.start()
+                }
+            }
         }
     }
 
@@ -79,7 +112,12 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
     override fun showMirrorsDialogue() {}
     override fun showTracksDialogue() {}
 
-    override fun openOnlineSubPicker(context: Context, imdbId: Long?, dismissCallback: () -> Unit) {}
+    override fun openOnlineSubPicker(
+        context: Context,
+        imdbId: Long?,
+        dismissCallback: () -> Unit
+    ) {
+    }
 
     override fun subtitlesChanged() {}
 
@@ -124,6 +162,13 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
         }
         updateFullscreen(isFullScreenPlayer)
         uiReset()
+
+        player_intro_play?.setOnClickListener {
+            player_intro_play?.isGone = true
+            player.handleEvent(CSPlayerEvent.Play)
+            updateUIVisibility()
+            fixPlayerSize()
+        }
     }
 
     override fun onBackPressed(): Boolean {
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index ed2ec6bd..f88fc173 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -267,10 +267,10 @@
                     </LinearLayout>
                 </FrameLayout>-->
                 <FrameLayout
+                    android:id="@+id/result_top_holder"
                     android:layout_width="match_parent"
                     android:layout_height="200dp">
 
-
                     <FrameLayout
                         android:id="@+id/result_smallscreen_holder"
                         android:layout_width="wrap_content"
@@ -279,21 +279,23 @@
 
                         <include layout="@layout/fragment_trailer" />
                     </FrameLayout>
+
                     <FrameLayout
                         android:id="@+id/result_poster_background_holder"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent">
-                    <ImageView
-                        android:id="@+id/result_poster_background"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:scaleType="centerCrop" />
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="60dp"
-                        android:layout_gravity="bottom"
-                        android:background="@drawable/background_shadow" />
+                        <ImageView
+                            android:id="@+id/result_poster_background"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:scaleType="centerCrop" />
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="60dp"
+                            android:layout_gravity="bottom"
+                            android:background="@drawable/background_shadow" />
                     </FrameLayout>
                 </FrameLayout>
 
@@ -330,6 +332,7 @@
                                 android:contentDescription="@string/result_poster_img_des"
                                 android:foreground="@drawable/outline_drawable"
                                 android:scaleType="centerCrop"
+                                android:layout_gravity="bottom"
                                 tools:src="@drawable/example_poster" />
                         </androidx.cardview.widget.CardView>
 
diff --git a/app/src/main/res/layout/fragment_trailer.xml b/app/src/main/res/layout/fragment_trailer.xml
index fd348760..ff477118 100644
--- a/app/src/main/res/layout/fragment_trailer.xml
+++ b/app/src/main/res/layout/fragment_trailer.xml
@@ -3,7 +3,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="match_parent"
         android:visibility="visible"
         android:orientation="horizontal"
         android:id="@+id/player_background"
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index 854855ef..0dd19a5b 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -62,7 +62,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="start|bottom"
-            android:padding="10dp"
+            android:padding="15dp"
             android:text="@string/trailer"
             android:textColor="@android:color/white"
             android:textSize="20sp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 13089cc2..9c2f62fc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -83,6 +83,7 @@
         <item name="android:textColor">@color/chip_color_text</item>
         <item name="checkedIconTint">@color/chip_color_text</item>
         <item name="fontFamily">@font/google_sans</item>
+        <item name="chipIconTint">@color/chip_color_text</item>
         <item name="android:fontFamily">@font/google_sans</item>
     </style>
 

From c09b6881e5ac00fc7b2b9a4b096cd96e6076bde6 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Wed, 2 Nov 2022 22:56:03 +0100
Subject: [PATCH 056/273] bump

---
 app/build.gradle.kts                                 |  4 ++--
 .../lagradost/cloudstream3/ui/home/HomeFragment.kt   | 12 ++++++++++--
 app/src/main/res/layout/fragment_home.xml            |  6 +++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 99eec423..a2c31d0b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -47,8 +47,8 @@ android {
         minSdk = 21
         targetSdk = 30
 
-        versionCode = 52
-        versionName = "3.1.6"
+        versionCode = 53
+        versionName = "3.2.0"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index a73fc873..ac6daa53 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -74,8 +74,10 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectSt
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
 import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
+import com.lagradost.cloudstream3.utils.UIHelper.getStatusBarHeight
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
 import com.lagradost.cloudstream3.utils.UIHelper.setImageBlur
@@ -548,7 +550,13 @@ class HomeFragment : Fragment() {
 
         observe(homeViewModel.preview) { preview ->
             // Always reset the padding, otherwise the will move lower and lower
-            home_watch_holder?.setPadding(0, 0, 0, 0)
+           // home_fix_padding?.setPadding(0, 0, 0, 0)
+            home_fix_padding?.let { v ->
+                val params = v.layoutParams
+                params.height = 0
+                v.layoutParams = params
+            }
+
             when (preview) {
                 is Resource.Success -> {
                     home_preview?.isVisible = true
@@ -569,7 +577,7 @@ class HomeFragment : Fragment() {
                         false
                     )
                     home_preview?.isVisible = false
-                    context?.fixPaddingStatusbar(home_watch_holder)
+                    context?.fixPaddingStatusbarView(home_fix_padding)
                 }
             }
         }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4eb7b9ee..e6270a77 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -405,7 +405,11 @@
                     </LinearLayout>
                 </LinearLayout>
             </FrameLayout>
-
+            <View
+                android:id="@+id/home_fix_padding"
+                android:layout_width="match_parent"
+                android:layout_height="0dp">
+            </View>
             <!--
             All padding in home_watch_holder is determined in runtime
             This is because the home poster can be invisible which forces

From 344f974af2c4e22678ed1cf093e23772af46fe25 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Wed, 2 Nov 2022 23:55:41 +0100
Subject: [PATCH 057/273] FIX CRASHING!

---
 .../main/java/com/lagradost/cloudstream3/utils/UIHelper.kt    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
index 20d6d03e..553860ba 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
@@ -328,7 +328,9 @@ object UIHelper {
         )
     }
 
-    fun Context.fixPaddingStatusbarView(v: View) {
+    fun Context.fixPaddingStatusbarView(v: View?) {
+        if (v == null) return
+
         val params = v.layoutParams
         params.height = getStatusBarHeight()
         v.layoutParams = params

From bc03f6ebb5510815b396b1e3113869095983e06d Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Wed, 2 Nov 2022 23:59:14 +0100
Subject: [PATCH 058/273] version bump

---
 app/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a2c31d0b..7c77de39 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -47,8 +47,8 @@ android {
         minSdk = 21
         targetSdk = 30
 
-        versionCode = 53
-        versionName = "3.2.0"
+        versionCode = 54
+        versionName = "3.2.1"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
 

From 8810d5abd6fa37d3bd128a21afc3c44be5f45109 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Thu, 3 Nov 2022 11:56:45 +0100
Subject: [PATCH 059/273] Trying to the dumbest crash ever

---
 .../main/java/com/lagradost/cloudstream3/MainAPI.kt   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 190c0cf5..4b271192 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -165,7 +165,8 @@ object APIHolder {
         val hashSet = HashSet<String>()
         val activeLangs = getApiProviderLangSettings()
         val hasUniversal = activeLangs.contains(AllLanguagesName)
-        hashSet.addAll(apis.filter { hasUniversal || activeLangs.contains(it.lang) }.map { it.name })
+        hashSet.addAll(apis.filter { hasUniversal || activeLangs.contains(it.lang) }
+            .map { it.name })
 
         /*val set = settingsManager.getStringSet(
             this.getString(R.string.search_providers_list_key),
@@ -241,7 +242,13 @@ object APIHolder {
     }
 
     fun Context.filterProviderByPreferredMedia(hasHomePageIsRequired: Boolean = true): List<MainAPI> {
-        val default = enumValues<TvType>().sorted().filter { it != TvType.NSFW }.map { it.ordinal }
+        // We are getting the weirdest crash ever done:
+        // java.lang.ClassCastException: com.lagradost.cloudstream3.TvType cannot be cast to com.lagradost.cloudstream3.TvType
+        // enumValues<TvType>() might be the cause, hence I am trying TvType.values()
+        val default = TvType.values()
+            .sorted()
+            .filter { it != TvType.NSFW }
+            .map { it.ordinal }
         val defaultSet = default.map { it.toString() }.toSet()
         val currentPrefMedia = try {
             PreferenceManager.getDefaultSharedPreferences(this)

From c10ec34ab8ccac2fd34874d83422c4860029525e Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Fri, 4 Nov 2022 23:36:27 +0000
Subject: [PATCH 060/273] Aniskip (#195)

* aniskip groundwork

* working

* removed prints

* bump nicehttp

* small fix

* small fixes

* bump

Co-authored-by: reduplicated <110570621+reduplicated@users.noreply.github.com>
---
 app/build.gradle.kts                          |   4 +-
 .../lagradost/cloudstream3/CommonActivity.kt  |   3 +
 .../lagradost/cloudstream3/MainActivity.kt    |   3 +
 .../cloudstream3/network/RequestsHelper.kt    |   1 -
 .../ui/player/AbstractPlayerFragment.kt       |  13 +-
 .../cloudstream3/ui/player/CS3IPlayer.kt      |  67 ++++-
 .../ui/player/FullScreenPlayer.kt             |   7 +
 .../cloudstream3/ui/player/GeneratorPlayer.kt | 238 ++++++++++--------
 .../cloudstream3/ui/player/IPlayer.kt         |  14 +-
 .../ui/player/PlayerGeneratorViewModel.kt     |  29 ++-
 .../ui/player/RepoLinkGenerator.kt            |   4 +-
 .../ui/result/ResultViewModel2.kt             |   8 +-
 .../lagradost/cloudstream3/utils/AniSkip.kt   | 140 +++++++++++
 app/src/main/res/layout/fragment_player.xml   | 204 +++++++--------
 .../main/res/layout/player_custom_layout.xml  |  19 ++
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/strings.xml           |   9 +
 17 files changed, 543 insertions(+), 221 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7c77de39..4a1fcada 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -48,7 +48,7 @@ android {
         targetSdk = 30
 
         versionCode = 54
-        versionName = "3.2.1"
+        versionName = "3.2.2"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
 
@@ -190,7 +190,7 @@ dependencies {
     // Networking
 //    implementation("com.squareup.okhttp3:okhttp:4.9.2")
 //    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1")
-    implementation("com.github.Blatzar:NiceHttp:0.3.3")
+    implementation("com.github.Blatzar:NiceHttp:0.3.4")
 
     // Util to skip the URI file fuckery 🙏
     implementation("com.github.tachiyomiorg:unifile:17bec43")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index 32df314f..af04a1a2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -337,6 +337,9 @@ object CommonActivity {
             KeyEvent.KEYCODE_C, KeyEvent.KEYCODE_NUMPAD_4, KeyEvent.KEYCODE_4 -> {
                 PlayerEventType.SkipOp
             }
+            KeyEvent.KEYCODE_V, KeyEvent.KEYCODE_NUMPAD_5, KeyEvent.KEYCODE_5 -> {
+                PlayerEventType.SkipCurrentChapter
+            }
             KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_NUMPAD_ENTER, KeyEvent.KEYCODE_ENTER -> { // space is not captured due to navigation
                 PlayerEventType.PlayPauseToggle
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index eb83b08a..ff74d6cc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -88,6 +88,9 @@ import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.fragment_result_swipe.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import okhttp3.ConnectionSpec
+import okhttp3.OkHttpClient
+import okhttp3.internal.applyConnectionSpec
 import java.io.File
 import java.net.URI
 import java.nio.charset.Charset
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
index 13299002..8bf1f91b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
@@ -12,7 +12,6 @@ import okhttp3.Headers.Companion.toHeaders
 import okhttp3.OkHttpClient
 import java.io.File
 
-
 fun Requests.initClient(context: Context): OkHttpClient {
     val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
     val dns = settingsManager.getInt(context.getString(R.string.dns_pref), 0)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
index 9a0debcf..21047db3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
@@ -38,6 +38,7 @@ import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.AppUtils.requestLocalAudioFocus
+import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.UIHelper
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
@@ -103,6 +104,14 @@ abstract class AbstractPlayerFragment(
         throw NotImplementedError()
     }
 
+    open fun onTimestamp(timestamp: EpisodeSkip.SkipStamp?) {
+
+    }
+
+    open fun onTimestampSkipped(timestamp: EpisodeSkip.SkipStamp) {
+
+    }
+
     open fun exitedPipMode() {
         throw NotImplementedError()
     }
@@ -373,7 +382,9 @@ abstract class AbstractPlayerFragment(
             ),
             subtitlesUpdates = ::subtitlesChanged,
             embeddedSubtitlesFetched = ::embeddedSubtitlesFetched,
-            onTracksInfoChanged = ::onTracksInfoChanged
+            onTracksInfoChanged = ::onTracksInfoChanged,
+            onTimestampInvoked = ::onTimestamp,
+            onTimestampSkipped = ::onTimestampSkipped
         )
 
         if (player is CS3IPlayer) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index f60d8c78..8eda6e30 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -18,7 +18,10 @@ import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
 import com.google.android.exoplayer2.trackselection.TrackSelectionOverride
 import com.google.android.exoplayer2.trackselection.TrackSelector
 import com.google.android.exoplayer2.ui.SubtitleView
-import com.google.android.exoplayer2.upstream.*
+import com.google.android.exoplayer2.upstream.DataSource
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
+import com.google.android.exoplayer2.upstream.HttpDataSource
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource
 import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
 import com.google.android.exoplayer2.upstream.cache.SimpleCache
@@ -32,6 +35,7 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
+import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkPlayList
 import com.lagradost.cloudstream3.utils.ExtractorUri
@@ -113,6 +117,8 @@ class CS3IPlayer : IPlayer {
     private var playerUpdated: ((Any?) -> Unit)? = null
     private var embeddedSubtitlesFetched: ((List<SubtitleData>) -> Unit)? = null
     private var onTracksInfoChanged: (() -> Unit)? = null
+    private var onTimestampInvoked: ((EpisodeSkip.SkipStamp?) -> Unit)? = null
+    private var onTimestampSkipped: ((EpisodeSkip.SkipStamp) -> Unit)? = null
 
     override fun releaseCallbacks() {
         playerUpdated = null
@@ -126,7 +132,9 @@ class CS3IPlayer : IPlayer {
         prevEpisode = null
         subtitlesUpdates = null
         onTracksInfoChanged = null
+        onTimestampInvoked = null
         requestSubtitleUpdate = null
+        onTimestampSkipped = null
     }
 
     override fun initCallbacks(
@@ -142,6 +150,8 @@ class CS3IPlayer : IPlayer {
         subtitlesUpdates: (() -> Unit)?,
         embeddedSubtitlesFetched: ((List<SubtitleData>) -> Unit)?,
         onTracksInfoChanged: (() -> Unit)?,
+        onTimestampInvoked: ((EpisodeSkip.SkipStamp?) -> Unit)?,
+        onTimestampSkipped: ((EpisodeSkip.SkipStamp) -> Unit)?,
     ) {
         this.playerUpdated = playerUpdated
         this.updateIsPlaying = updateIsPlaying
@@ -155,6 +165,8 @@ class CS3IPlayer : IPlayer {
         this.subtitlesUpdates = subtitlesUpdates
         this.embeddedSubtitlesFetched = embeddedSubtitlesFetched
         this.onTracksInfoChanged = onTracksInfoChanged
+        this.onTimestampInvoked = onTimestampInvoked
+        this.onTimestampSkipped = onTimestampSkipped
     }
 
     // I know, this is not a perfect solution, however it works for fixing subs
@@ -719,7 +731,7 @@ class CS3IPlayer : IPlayer {
                 source
             }
 
-            println("PLAYBACK POS $playbackPosition")
+            //println("PLAYBACK POS $playbackPosition")
             return exoPlayerBuilder.build().apply {
                 setPlayWhenReady(playWhenReady)
                 seekTo(currentWindow, playbackPosition)
@@ -735,8 +747,22 @@ class CS3IPlayer : IPlayer {
         }
     }
 
-    fun updatedTime() {
-        val position = exoPlayer?.currentPosition
+    private fun getCurrentTimestamp(writePosition : Long? = null): EpisodeSkip.SkipStamp? {
+        val position = writePosition ?: this@CS3IPlayer.getPosition() ?: return null
+        for (lastTimeStamp in lastTimeStamps) {
+            if (lastTimeStamp.startMs <= position && position < lastTimeStamp.endMs) {
+                return lastTimeStamp
+            }
+        }
+        return null
+    }
+
+    fun updatedTime(writePosition : Long? = null) {
+        getCurrentTimestamp(writePosition)?.let { timestamp ->
+            onTimestampInvoked?.invoke(timestamp)
+        }
+
+        val position = writePosition ?: exoPlayer?.currentPosition
         val duration = exoPlayer?.contentDuration
         if (duration != null && position != null) {
             playerPositionChanged?.invoke(Pair(position, duration))
@@ -748,12 +774,12 @@ class CS3IPlayer : IPlayer {
     }
 
     override fun seekTo(time: Long) {
-        updatedTime()
+        updatedTime(time)
         exoPlayer?.seekTo(time)
     }
 
     private fun ExoPlayer.seekTime(time: Long) {
-        updatedTime()
+        updatedTime(currentPosition + time)
         seekTo(currentPosition + time)
     }
 
@@ -789,6 +815,17 @@ class CS3IPlayer : IPlayer {
                     CSPlayerEvent.SeekBack -> seekTime(-seekActionTime)
                     CSPlayerEvent.NextEpisode -> nextEpisode?.invoke()
                     CSPlayerEvent.PrevEpisode -> prevEpisode?.invoke()
+                    CSPlayerEvent.SkipCurrentChapter -> {
+                        //val dur = this@CS3IPlayer.getDuration() ?: return@apply
+                        getCurrentTimestamp()?.let { lastTimeStamp ->
+                            if (lastTimeStamp.skipToNextEpisode) {
+                                handleEvent(CSPlayerEvent.NextEpisode)
+                            } else {
+                                seekTo(lastTimeStamp.endMs + 1L)
+                            }
+                            onTimestampSkipped?.invoke(lastTimeStamp)
+                        }
+                    }
                 }
             }
         } catch (e: Exception) {
@@ -1007,6 +1044,24 @@ class CS3IPlayer : IPlayer {
         }
     }
 
+    private var lastTimeStamps: List<EpisodeSkip.SkipStamp> = emptyList()
+    override fun addTimeStamps(timeStamps: List<EpisodeSkip.SkipStamp>) {
+        lastTimeStamps = timeStamps
+        timeStamps.forEach { timestamp ->
+            exoPlayer?.createMessage { _, _ ->
+                updatedTime()
+                //if (payload is EpisodeSkip.SkipStamp) // this should always be true
+                //    onTimestampInvoked?.invoke(payload)
+            }
+                ?.setLooper(Looper.getMainLooper())
+                ?.setPosition(timestamp.startMs)
+                //?.setPayload(timestamp)
+                ?.setDeleteAfterDelivery(false)
+                ?.send()
+        }
+        updatedTime()
+    }
+
     fun onRenderFirst() {
         if (!hasUsedFirstRender) { // this insures that we only call this once per player load
             Log.i(TAG, "Rendered first frame")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 52125c68..0f9a6548 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -1141,6 +1141,9 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 PlayerEventType.Play -> {
                     player.handleEvent(CSPlayerEvent.Play)
                 }
+                PlayerEventType.SkipCurrentChapter -> {
+                    player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
+                }
                 PlayerEventType.Resize -> {
                     nextResize()
                 }
@@ -1254,6 +1257,10 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             player.handleEvent(CSPlayerEvent.PlayPauseToggle)
         }
 
+        skip_chapter_button?.setOnClickListener {
+            player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
+        }
+
         // init clicks
         player_resize_btt?.setOnClickListener {
             autoHide()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index f466dd7e..e1f1d99d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.player
 
+import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Context
@@ -13,6 +14,7 @@ import android.view.ViewGroup
 import android.widget.*
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
+import androidx.core.animation.addListener
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
@@ -36,8 +38,8 @@ import com.lagradost.cloudstream3.ui.player.PlayerSubtitleHelper.Companion.toSub
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.ui.result.ResultFragment
 import com.lagradost.cloudstream3.ui.result.SyncViewModel
+import com.lagradost.cloudstream3.ui.result.setText
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.getAutoSelectLanguageISO639_1
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
@@ -49,6 +51,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
+import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import kotlinx.android.synthetic.main.dialog_online_subtitles.*
 import kotlinx.android.synthetic.main.dialog_online_subtitles.apply_btt
 import kotlinx.android.synthetic.main.dialog_online_subtitles.cancel_btt
@@ -58,7 +61,6 @@ import kotlinx.android.synthetic.main.player_select_source_and_subs.*
 import kotlinx.android.synthetic.main.player_select_source_and_subs.subtitles_click_settings
 import kotlinx.android.synthetic.main.player_select_tracks.*
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
 
 class GeneratorPlayer : FullScreenPlayer() {
     companion object {
@@ -67,8 +69,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             Log.i(TAG, "newInstance = $syncData")
             lastUsedGenerator = generator
             return Bundle().apply {
-                if (syncData != null)
-                    putSerializable("syncData", syncData)
+                if (syncData != null) putSerializable("syncData", syncData)
             }
         }
 
@@ -165,6 +166,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         isActive = true
         setPlayerDimen(null)
         setTitle()
+        hasRequestedStamps = false
 
         loadExtractorJob(link.first)
         // load player
@@ -180,12 +182,11 @@ class GeneratorPlayer : FullScreenPlayer() {
                 },
                 currentSubs,
                 (if (sameEpisode) currentSelectedSubtitles else null) ?: getAutoSelectSubtitle(
-                    currentSubs,
-                    settings = true,
-                    downloads = true
+                    currentSubs, settings = true, downloads = true
                 ),
             )
         }
+        player.addTimeStamps(listOf()) // clear stamps
     }
 
     private fun sortLinks(useQualitySettings: Boolean = true): List<Pair<ExtractorLink?, ExtractorUri?>> {
@@ -231,9 +232,7 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     override fun openOnlineSubPicker(
-        context: Context,
-        imdbId: Long?,
-        dismissCallback: (() -> Unit)
+        context: Context, imdbId: Long?, dismissCallback: (() -> Unit)
     ) {
         val providers = subsProviders
         val isSingleProvider = subsProviders.size == 1
@@ -256,8 +255,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         val arrayAdapter =
             object : ArrayAdapter<AbstractSubtitleEntities.SubtitleEntity>(dialog.context, layout) {
                 fun setHearingImpairedIcon(
-                    imageViewEnd: ImageView?,
-                    position: Int
+                    imageViewEnd: ImageView?, position: Int
                 ) {
                     if (imageViewEnd == null) return
                     val isHearingImpaired =
@@ -265,13 +263,11 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                     val drawableEnd = if (isHearingImpaired) {
                         ContextCompat.getDrawable(
-                            context,
-                            R.drawable.ic_baseline_hearing_24
+                            context, R.drawable.ic_baseline_hearing_24
                         )?.apply {
                             setTint(
                                 ContextCompat.getColor(
-                                    context,
-                                    R.color.textColor
+                                    context, R.color.textColor
                                 )
                             )
                         }
@@ -281,8 +277,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-                    val view = convertView ?: LayoutInflater.from(context)
-                        .inflate(layout, null)
+                    val view = convertView ?: LayoutInflater.from(context).inflate(layout, null)
 
                     val item = getItem(position)
 
@@ -337,13 +332,12 @@ class GeneratorPlayer : FullScreenPlayer() {
             override fun onQueryTextSubmit(query: String?): Boolean {
                 dialog.search_loading_bar?.show()
                 ioSafe {
-                    val search = AbstractSubtitleEntities.SubtitleSearch(
-                        query = query ?: return@ioSafe,
-                        imdb = imdbId,
-                        epNumber = currentTempMeta.episode,
-                        seasonNumber = currentTempMeta.season,
-                        lang = currentLanguageTwoLetters.ifBlank { null }
-                    )
+                    val search =
+                        AbstractSubtitleEntities.SubtitleSearch(query = query ?: return@ioSafe,
+                            imdb = imdbId,
+                            epNumber = currentTempMeta.episode,
+                            seasonNumber = currentTempMeta.season,
+                            lang = currentLanguageTwoLetters.ifBlank { null })
                     val results = providers.amap {
                         try {
                             it.search(search)
@@ -379,14 +373,12 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         dialog.search_filter.setOnClickListener { view ->
             val lang639_1 = languages.map { it.ISO_639_1 }
-            activity?.showDialog(
-                languages.map { it.languageName },
+            activity?.showDialog(languages.map { it.languageName },
                 lang639_1.indexOf(currentLanguageTwoLetters),
                 view?.context?.getString(R.string.subs_subtitle_languages)
                     ?: return@setOnClickListener,
                 true,
-                { }
-            ) { index ->
+                { }) { index ->
                 currentLanguageTwoLetters = lang639_1[index]
                 dialog.subtitles_search.setQuery(dialog.subtitles_search.query, true)
             }
@@ -472,8 +464,8 @@ class GeneratorPlayer : FullScreenPlayer() {
                 if (uri == null) return@normalSafeApiCall
                 val ctx = context ?: AcraApplication.context ?: return@normalSafeApiCall
                 // RW perms for the path
-                val flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
-                        Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                val flags =
+                    Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
 
                 ctx.contentResolver.takePersistableUriPermission(uri, flags)
 
@@ -536,11 +528,9 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 if (subsProvidersIsActive) {
-                    val loadFromOpenSubsFooter: TextView =
-                        layoutInflater.inflate(
-                            R.layout.sort_bottom_footer_add_choice,
-                            null
-                        ) as TextView
+                    val loadFromOpenSubsFooter: TextView = layoutInflater.inflate(
+                        R.layout.sort_bottom_footer_add_choice, null
+                    ) as TextView
 
                     loadFromOpenSubsFooter.text =
                         ctx.getString(R.string.player_load_subtitles_online)
@@ -592,8 +582,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 val subtitleIndexStart = currentSubtitles.indexOf(currentSelectedSubtitles) + 1
                 var subtitleIndex = subtitleIndexStart
 
-                val subsArrayAdapter =
-                    ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
+                val subsArrayAdapter = ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
                 subsArrayAdapter.add(ctx.getString(R.string.no_subtitles))
                 subsArrayAdapter.addAll(currentSubtitles.map { it.name })
 
@@ -631,8 +620,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     val prefValues = ctx.resources.getStringArray(R.array.subtitles_encoding_values)
 
                     val value = settingsManager.getString(
-                        ctx.getString(R.string.subtitles_encoding_key),
-                        null
+                        ctx.getString(R.string.subtitles_encoding_key), null
                     )
                     val index = prefValues.indexOf(value)
                     text = prefNames[if (index == -1) 0 else index]
@@ -644,28 +632,22 @@ class GeneratorPlayer : FullScreenPlayer() {
                     val prefNames = ctx.resources.getStringArray(R.array.subtitles_encoding_list)
                     val prefValues = ctx.resources.getStringArray(R.array.subtitles_encoding_values)
 
-                    val currentPrefMedia =
-                        settingsManager.getString(
-                            ctx.getString(R.string.subtitles_encoding_key),
-                            null
-                        )
+                    val currentPrefMedia = settingsManager.getString(
+                        ctx.getString(R.string.subtitles_encoding_key), null
+                    )
 
                     shouldDismiss = false
                     sourceDialog.dismissSafe(activity)
 
                     val index = prefValues.indexOf(currentPrefMedia)
-                    activity?.showDialog(
-                        prefNames.toList(),
+                    activity?.showDialog(prefNames.toList(),
                         if (index == -1) 0 else index,
                         ctx.getString(R.string.subtitles_encoding),
                         true,
                         {}) {
-                        settingsManager.edit()
-                            .putString(
-                                ctx.getString(R.string.subtitles_encoding_key),
-                                prefValues[it]
-                            )
-                            .apply()
+                        settingsManager.edit().putString(
+                            ctx.getString(R.string.subtitles_encoding_key), prefValues[it]
+                        ).apply()
 
                         updateForcedEncoding(ctx)
                         dismiss()
@@ -878,7 +860,7 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     var maxEpisodeSet: Int? = null
-
+    var hasRequestedStamps: Boolean = false
     override fun playerPositionChanged(posDur: Pair<Long, Long>) {
         // Don't save livestream data
         if ((currentMeta as? ResultEpisode)?.tvType?.isLiveStream() == true) return
@@ -887,11 +869,16 @@ class GeneratorPlayer : FullScreenPlayer() {
         if ((currentMeta as? ResultEpisode)?.tvType == TvType.NSFW) return
 
         val (position, duration) = posDur
-        if (duration == 0L) return // idk how you achieved this, but div by zero crash
+        if (duration <= 0L) return // idk how you achieved this, but div by zero crash
+        if (!hasRequestedStamps) {
+            hasRequestedStamps = true
+            viewModel.loadStamps(duration)
+        }
 
         viewModel.getId()?.let {
             DataStoreHelper.setViewPos(it, position, duration)
         }
+
         val percentage = position * 100L / duration
 
         val nextEp = percentage >= NEXT_WATCH_EPISODE_PERCENTAGE
@@ -939,17 +926,14 @@ class GeneratorPlayer : FullScreenPlayer() {
                     context?.let { ctx ->
                         val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
                         if (settingsManager.getBoolean(
-                                ctx.getString(R.string.episode_sync_enabled_key),
-                                true
+                                ctx.getString(R.string.episode_sync_enabled_key), true
                             )
-                        )
-                            maxEpisodeSet = meta.episode
+                        ) maxEpisodeSet = meta.episode
                         sync.modifyMaxEpisode(meta.episode)
                     }
                 }
 
-                if (meta.tvType.isAnimeOp())
-                    isOpVisible = percentage < SKIP_OP_VIDEO_PERCENTAGE
+                if (meta.tvType.isAnimeOp()) isOpVisible = percentage < SKIP_OP_VIDEO_PERCENTAGE
             }
         }
         player_skip_op?.isVisible = isOpVisible
@@ -961,9 +945,7 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     private fun getAutoSelectSubtitle(
-        subtitles: Set<SubtitleData>,
-        settings: Boolean,
-        downloads: Boolean
+        subtitles: Set<SubtitleData>, settings: Boolean, downloads: Boolean
     ): SubtitleData? {
         val langCode = preferredAutoSelectSubtitles ?: return null
         val lang = SubtitleHelper.fromTwoLettersToLanguage(langCode) ?: return null
@@ -1009,23 +991,20 @@ class GeneratorPlayer : FullScreenPlayer() {
                     player.handleEvent(CSPlayerEvent.Play)
                     return true
                 }
-            } else
-                if (!langCode.isNullOrEmpty()) {
-                    getAutoSelectSubtitle(
-                        currentSubs,
-                        settings = true,
-                        downloads = false
-                    )?.let { sub ->
-
-                        if (setSubtitles(sub)) {
-                            player.saveData()
-                            player.reloadPlayer(ctx)
-                            player.handleEvent(CSPlayerEvent.Play)
-                            return true
-                        }
+            } else if (!langCode.isNullOrEmpty()) {
+                getAutoSelectSubtitle(
+                    currentSubs, settings = true, downloads = false
+                )?.let { sub ->
 
+                    if (setSubtitles(sub)) {
+                        player.saveData()
+                        player.reloadPlayer(ctx)
+                        player.handleEvent(CSPlayerEvent.Play)
+                        return true
                     }
+
                 }
+            }
         }
         return false
     }
@@ -1081,17 +1060,17 @@ class GeneratorPlayer : FullScreenPlayer() {
         context?.let { ctx ->
             //Generate video title
             val playerVideoTitle = if (headerName != null) {
-                (headerName +
-                        if (tvType.isEpisodeBased() && episode != null)
-                            if (season == null)
-                                " - ${ctx.getString(R.string.episode)} $episode"
-                            else
-                                " \"${ctx.getString(R.string.season_short)}${season}:${
-                                    ctx.getString(
-                                        R.string.episode_short
-                                    )
-                                }${episode}\""
-                        else "") + if (subName.isNullOrBlank() || subName == headerName) "" else " - $subName"
+                (headerName + if (tvType.isEpisodeBased() && episode != null) if (season == null) " - ${
+                    ctx.getString(
+                        R.string.episode
+                    )
+                } $episode"
+                else " \"${ctx.getString(R.string.season_short)}${season}:${
+                    ctx.getString(
+                        R.string.episode_short
+                    )
+                }${episode}\""
+                else "") + if (subName.isNullOrBlank() || subName == headerName) "" else " - $subName"
             } else {
                 ""
             }
@@ -1131,8 +1110,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             ""
         }
 
-        val source = currentSelectedLink?.first?.name ?: currentSelectedLink?.second?.name
-        ?: "NULL"
+        val source = currentSelectedLink?.first?.name ?: currentSelectedLink?.second?.name ?: "NULL"
 
         player_video_title_rez?.text = when (titleRez) {
             0 -> ""
@@ -1155,14 +1133,11 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View? {
         // this is used instead of layout-television to follow the settings and some TV devices are not classified as TV for some reason
         isTv = isTvSettings()
-        layout =
-            if (isTv) R.layout.fragment_player_tv else R.layout.fragment_player
+        layout = if (isTv) R.layout.fragment_player_tv else R.layout.fragment_player
 
         viewModel = ViewModelProvider(this)[PlayerGeneratorViewModel::class.java]
         sync = ViewModelProvider(this)[SyncViewModel::class.java]
@@ -1174,6 +1149,68 @@ class GeneratorPlayer : FullScreenPlayer() {
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
+    var timestampShowState = false
+
+    var skipAnimator: ValueAnimator? = null
+    var skipIndex = 0
+
+    private fun displayTimeStamp(show: Boolean) {
+        if (timestampShowState == show) return
+        skipIndex++
+        println("displayTimeStamp = $show")
+        timestampShowState = show
+        skip_chapter_button?.apply {
+            val showWidth = 170.toPx
+            val noShowWidth = 10.toPx
+            //if((show && width == showWidth) || (!show && width == noShowWidth)) {
+            //    return
+            //}
+            val to = if (show) showWidth else noShowWidth
+            val from = if (!show) showWidth else noShowWidth
+
+            skipAnimator?.cancel()
+            isVisible = true
+
+            // just in case
+            val lay = layoutParams
+            lay.width = from
+            layoutParams = lay
+            skipAnimator = ValueAnimator.ofInt(
+                from, to
+            ).apply {
+                addListener(onEnd = {
+                    if (!show) skip_chapter_button?.isVisible = false
+                })
+                addUpdateListener { valueAnimator ->
+                    val value = valueAnimator.animatedValue as Int
+                    val layoutParams: ViewGroup.LayoutParams = layoutParams
+                    layoutParams.width = value
+                    setLayoutParams(layoutParams)
+                }
+                duration = 500
+                start()
+            }
+        }
+    }
+
+    override fun onTimestampSkipped(timestamp: EpisodeSkip.SkipStamp) {
+        displayTimeStamp(false)
+    }
+
+    override fun onTimestamp(timestamp: EpisodeSkip.SkipStamp?) {
+        if (timestamp != null) {
+            skip_chapter_button.setText(timestamp.uiText)
+            displayTimeStamp(true)
+            val currentIndex = skipIndex
+            skip_chapter_button?.handler?.postDelayed({
+                if (skipIndex == currentIndex)
+                    displayTimeStamp(false)
+            }, 6000)
+        } else {
+            displayTimeStamp(false)
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         var langFilterList = listOf<String>()
@@ -1189,8 +1226,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 settingsManager.getBoolean(getString(R.string.filter_sub_lang_key), false)
             if (filterSubByLang) {
                 val langFromPrefMedia = settingsManager.getStringSet(
-                    this.getString(R.string.provider_lang_key),
-                    mutableSetOf("en")
+                    this.getString(R.string.provider_lang_key), mutableSetOf("en")
                 )
                 langFilterList = langFromPrefMedia?.mapNotNull {
                     fromTwoLettersToLanguage(it)?.lowercase() ?: return@mapNotNull null
@@ -1203,7 +1239,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         sync.updateUserData()
 
-        preferredAutoSelectSubtitles = SubtitlesFragment.getAutoSelectLanguageISO639_1()
+        preferredAutoSelectSubtitles = getAutoSelectLanguageISO639_1()
 
         if (currentSelectedLink == null) {
             viewModel.loadLinks()
@@ -1218,6 +1254,10 @@ class GeneratorPlayer : FullScreenPlayer() {
             activity?.popCurrentPage()
         }
 
+        observe(viewModel.currentStamps) { stamps ->
+            player.addTimeStamps(stamps)
+        }
+
         observe(viewModel.loadingLinks) {
             when (it) {
                 is Resource.Loading -> {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
index 473b3e65..ba5a4a85 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.ui.player
 
 import android.content.Context
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
+import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorUri
 
@@ -12,9 +13,9 @@ enum class PlayerEventType(val value: Int) {
     SeekForward(2),
     SeekBack(3),
 
-    //SkipCurrentChapter(4),
+    SkipCurrentChapter(4),
     NextEpisode(5),
-    PrevEpisode(5),
+    PrevEpisode(6),
     PlayPauseToggle(7),
     ToggleMute(8),
     Lock(9),
@@ -32,7 +33,7 @@ enum class CSPlayerEvent(val value: Int) {
     SeekForward(2),
     SeekBack(3),
 
-    //SkipCurrentChapter(4),
+    SkipCurrentChapter(4),
     NextEpisode(5),
     PrevEpisode(6),
     PlayPauseToggle(7),
@@ -54,7 +55,8 @@ interface Track {
      **/
     val id: String?
     val label: String?
-//    val isCurrentlyPlaying: Boolean
+
+    //    val isCurrentlyPlaying: Boolean
     val language: String?
 }
 
@@ -124,6 +126,8 @@ interface IPlayer {
         subtitlesUpdates: (() -> Unit)? = null,                     // callback from player to inform that subtitles have updated in some way
         embeddedSubtitlesFetched: ((List<SubtitleData>) -> Unit)? = null, // callback from player to give all embedded subtitles
         onTracksInfoChanged: (() -> Unit)? = null,                  // Callback when tracks are changed, used for UI changes
+        onTimestampInvoked: ((EpisodeSkip.SkipStamp?) -> Unit)? = null, // Callback when timestamps appear, null when it should disappear
+        onTimestampSkipped: ((EpisodeSkip.SkipStamp) -> Unit)? = null, // callback for when a chapter is skipped, aka when event is handled (or for future use when skip automatically ads/sponsor)
     )
 
     fun releaseCallbacks()
@@ -131,6 +135,8 @@ interface IPlayer {
     fun updateSubtitleStyle(style: SaveCaptionStyle)
     fun saveData()
 
+    fun addTimeStamps(timeStamps: List<EpisodeSkip.SkipStamp>)
+
     fun loadPlayer(
         context: Context,
         sameEpisode: Boolean,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
index 0ed26b71..4f16e9f6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
@@ -9,10 +9,12 @@ import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.safeApiCall
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorUri
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
 
 class PlayerGeneratorViewModel : ViewModel() {
     companion object {
@@ -30,6 +32,9 @@ class PlayerGeneratorViewModel : ViewModel() {
     private val _loadingLinks = MutableLiveData<Resource<Boolean?>>()
     val loadingLinks: LiveData<Resource<Boolean?>> = _loadingLinks
 
+    private val _currentStamps = MutableLiveData<List<EpisodeSkip.SkipStamp>>(emptyList())
+    val currentStamps: LiveData<List<EpisodeSkip.SkipStamp>> = _currentStamps
+
     fun getId(): Int? {
         return generator?.getCurrentId()
     }
@@ -113,10 +118,31 @@ class PlayerGeneratorViewModel : ViewModel() {
     }
 
     private var currentJob: Job? = null
+    private var currentStampJob: Job? = null
+
+    fun loadStamps(duration: Long) {
+        //currentStampJob?.cancel()
+        currentStampJob = ioSafe {
+            val meta = generator?.getCurrent()
+            val page = (generator as? RepoLinkGenerator?)?.page
+            if (page != null && meta is ResultEpisode) {
+                _currentStamps.postValue(listOf())
+                _currentStamps.postValue(
+                    EpisodeSkip.getStamps(
+                        page,
+                        meta,
+                        duration,
+                        hasNextEpisode() ?: false
+                    )
+                )
+            }
+        }
+    }
 
     fun loadLinks(clearCache: Boolean = false, isCasting: Boolean = false) {
         Log.i(TAG, "loadLinks")
         currentJob?.cancel()
+
         currentJob = viewModelScope.launchSafe {
             val currentLinks = mutableSetOf<Pair<ExtractorLink?, ExtractorUri?>>()
             val currentSubs = mutableSetOf<SubtitleData>()
@@ -142,5 +168,6 @@ class PlayerGeneratorViewModel : ViewModel() {
             _currentLinks.postValue(currentLinks)
             _currentSubs.postValue(currentSubs)
         }
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt
index d0ab245d..2ce53ea5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.ui.player
 
 import android.util.Log
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
+import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -11,7 +12,8 @@ import kotlin.math.min
 
 class RepoLinkGenerator(
     private val episodes: List<ResultEpisode>,
-    private var currentIndex: Int = 0
+    private var currentIndex: Int = 0,
+    val page: LoadResponse? = null,
 ) : IGenerator {
     companion object {
         const val TAG = "RepoLink"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 6b04ebf9..0c26f69c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -416,7 +416,7 @@ class ResultViewModel2 : ViewModel() {
             return this?.firstOrNull { it.season == season }
         }
 
-        fun updateWatchStatus(currentResponse : LoadResponse, status: WatchType) {
+        fun updateWatchStatus(currentResponse: LoadResponse, status: WatchType) {
             val currentId = currentResponse.getId()
             val resultPage = currentResponse
 
@@ -793,7 +793,7 @@ class ResultViewModel2 : ViewModel() {
 
 
     fun updateWatchStatus(status: WatchType) {
-        updateWatchStatus(currentResponse ?: return,status)
+        updateWatchStatus(currentResponse ?: return, status)
         _watchStatus.postValue(status)
     }
 
@@ -1681,10 +1681,10 @@ class ResultViewModel2 : ViewModel() {
         preferDubStatus = indexer.dubStatus
 
         generator = if (isMovie) {
-            getMovie()?.let { RepoLinkGenerator(listOf(it)) }
+            getMovie()?.let { RepoLinkGenerator(listOf(it), page = currentResponse) }
         } else {
             episodes?.let { list ->
-                RepoLinkGenerator(list)
+                RepoLinkGenerator(list, page = currentResponse)
             }
         }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt
new file mode 100644
index 00000000..e9b69c5b
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt
@@ -0,0 +1,140 @@
+package com.lagradost.cloudstream3.utils
+
+import android.util.Log
+import androidx.annotation.StringRes
+import com.fasterxml.jackson.databind.annotation.JsonSerialize
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.ui.result.txt
+import java.lang.Long.min
+
+object EpisodeSkip {
+    private const val TAG = "EpisodeSkip"
+
+    enum class SkipType(@StringRes name: Int) {
+        Opening(R.string.skip_type_op),
+        Ending(R.string.skip_type_ed),
+        Recap(R.string.skip_type_recap),
+        MixedOpening(R.string.skip_type_mixed_op),
+        MixedEnding(R.string.skip_type_mixed_ed),
+        Credits(R.string.skip_type_creddits),
+        Intro(R.string.skip_type_creddits),
+    }
+
+    data class SkipStamp(
+        val type: SkipType,
+        val skipToNextEpisode: Boolean,
+        val startMs: Long,
+        val endMs: Long,
+    ) {
+        val uiText = if (skipToNextEpisode) txt(R.string.next_episode) else txt(
+            R.string.skip_type_format,
+            txt(type.name)
+        )
+    }
+
+    private val cachedStamps = HashMap<Int, List<SkipStamp>>()
+
+    private fun shouldSkipToNextEpisode(endMs: Long, episodeDurationMs: Long): Boolean {
+        return episodeDurationMs - endMs < 20_000L // some might have outro that we don't care about tbh
+    }
+
+    suspend fun getStamps(
+        data: LoadResponse,
+        episode: ResultEpisode,
+        episodeDurationMs: Long,
+        hasNextEpisode: Boolean,
+    ): List<SkipStamp> {
+        cachedStamps[episode.id]?.let { list ->
+            return list
+        }
+
+        val out = mutableListOf<SkipStamp>()
+        Log.i(TAG, "Requesting SkipStamp from ${data.syncData}")
+
+        if (data is AnimeLoadResponse && (data.type == TvType.Anime || data.type == TvType.OVA)) {
+            data.getMalId()?.toIntOrNull()?.let { malId ->
+                val (resultLength, stamps) = AniSkip.getResult(
+                    malId,
+                    episode.episode,
+                    episodeDurationMs
+                ) ?: return@let null
+                // because it also returns an expected episode length we use that just in case it is mismatched with like 2s next episode will still work
+                val dur = min(episodeDurationMs, resultLength)
+                stamps.mapNotNull { stamp ->
+                    val skipType = when (stamp.skipType) {
+                        "op" -> SkipType.Opening
+                        "ed" -> SkipType.Ending
+                        "recap" -> SkipType.Recap
+                        "mixed-ed" -> SkipType.MixedEnding
+                        "mixed-op" -> SkipType.MixedOpening
+                        else -> null
+                    } ?: return@mapNotNull null
+                    val end = (stamp.interval.endTime * 1000.0).toLong()
+                    val start = (stamp.interval.startTime * 1000.0).toLong()
+                    SkipStamp(
+                        type = skipType,
+                        skipToNextEpisode = hasNextEpisode && shouldSkipToNextEpisode(
+                            end,
+                            dur
+                        ),
+                        startMs = start,
+                        endMs = end
+                    )
+                }?.let { list ->
+                    out.addAll(list)
+                }
+            }
+        }
+        if (out.isNotEmpty())
+            cachedStamps[episode.id] = out
+        return out
+    }
+}
+
+// taken from https://github.com/saikou-app/saikou/blob/3803f8a7a59b826ca193664d46af3a22bbc989f7/app/src/main/java/ani/saikou/others/AniSkip.kt
+// the following is GPLv3 code https://github.com/saikou-app/saikou/blob/main/LICENSE.md
+object AniSkip {
+    private const val TAG = "AniSkip"
+    suspend fun getResult(
+        malId: Int,
+        episodeNumber: Int,
+        episodeLength: Long
+    ): Pair<Long, List<Stamp>>? {
+        return try {
+            val url =
+                "https://api.aniskip.com/v2/skip-times/$malId/$episodeNumber?types[]=ed&types[]=mixed-ed&types[]=mixed-op&types[]=op&types[]=recap&episodeLength=${episodeLength / 1000L}"
+            Log.i(TAG, "Requesting $url")
+
+            val a = app.get(url)
+            val res = a.parsed<AniSkipResponse>()
+            Log.i(TAG, "Found ${res.found} with ${res.results?.size} results")
+            if (res.found && !res.results.isNullOrEmpty()) (res.results[0].episodeLength * 1000).toLong() to res.results else null
+        } catch (t: Throwable) {
+            Log.i(TAG, "error = ${t.message}")
+            logError(t)
+            null
+        }
+    }
+
+    data class AniSkipResponse(
+        @JsonSerialize val found: Boolean,
+        @JsonSerialize val results: List<Stamp>?,
+        @JsonSerialize val message: String?,
+        @JsonSerialize val statusCode: Int
+    )
+
+    data class Stamp(
+        @JsonSerialize val interval: AniSkipInterval,
+        @JsonSerialize val skipType: String,
+        @JsonSerialize val skipId: String,
+        @JsonSerialize val episodeLength: Double
+    )
+
+    data class AniSkipInterval(
+        @JsonSerialize val startTime: Double,
+        @JsonSerialize val endTime: Double
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 232dcaa0..412f7b5b 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -1,130 +1,130 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:id="@+id/player_background"
-        app:backgroundTint="@android:color/black"
-        android:background="@android:color/black"
-        android:screenOrientation="sensorLandscape"
-        app:surface_type="texture_view">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/player_background"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/black"
+    android:orientation="horizontal"
+    android:screenOrientation="sensorLandscape"
+    app:backgroundTint="@android:color/black"
+    app:surface_type="texture_view">
     <!--
           app:fastforward_increment="10000"
             app:rewind_increment="10000"-->
     <com.google.android.exoplayer2.ui.PlayerView
-            android:id="@+id/player_view"
-            app:show_timeout="0"
-            app:hide_on_touch="false"
-            app:auto_show="true"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:backgroundTint="@android:color/black"
-            android:background="@android:color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:controller_layout_id="@layout/player_custom_layout" />
+        android:id="@+id/player_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/black"
+        app:auto_show="true"
+        app:backgroundTint="@android:color/black"
+        app:controller_layout_id="@layout/player_custom_layout"
+        app:hide_on_touch="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:show_timeout="0" />
 
     <FrameLayout
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/player_loading_overlay"
-            android:background="@android:color/black"
-            android:backgroundTint="@android:color/black">
+        android:id="@+id/player_loading_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/black"
+        android:backgroundTint="@android:color/black"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.button.MaterialButton
-                tools:visibility="visible"
-                android:visibility="gone"
-                android:layout_marginTop="70dp"
-                android:layout_gravity="center"
-                app:cornerRadius="4dp"
-                android:id="@+id/overlay_loading_skip_button"
-                android:text="@string/skip_loading"
+            android:id="@+id/overlay_loading_skip_button"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="70dp"
+            android:backgroundTint="@color/transparent"
 
-                app:rippleColor="?attr/colorPrimary"
-                android:textColor="?attr/textColor"
-                app:iconTint="?attr/textColor"
-                android:textAllCaps="false"
-                app:icon="@drawable/ic_baseline_skip_next_24"
-                android:backgroundTint="@color/transparent"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="45dp" />
+            android:text="@string/skip_loading"
+            android:textAllCaps="false"
+            android:textColor="?attr/textColor"
+            android:visibility="gone"
+            app:cornerRadius="4dp"
+            app:icon="@drawable/ic_baseline_skip_next_24"
+            app:iconTint="?attr/textColor"
+            app:rippleColor="?attr/colorPrimary"
+            tools:visibility="visible" />
 
         <ProgressBar
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_gravity="center"
-                android:id="@+id/main_load" />
+            android:id="@+id/main_load"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center" />
 
         <FrameLayout
-                android:id="@+id/video_go_back_holder_holder"
-                android:layout_margin="5dp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+            android:id="@+id/video_go_back_holder_holder"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_baseline_arrow_back_24"
-                    app:tint="@android:color/white"
-                    android:contentDescription="@string/go_back_img_des" />
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center"
+                android:contentDescription="@string/go_back_img_des"
+                android:src="@drawable/ic_baseline_arrow_back_24"
+                app:tint="@android:color/white" />
 
             <ImageView
-                    android:id="@+id/player_loading_go_back"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_gravity="center"
-                    android:focusable="true"
-                    android:clickable="true"
-                    android:background="@drawable/video_tap_button_always_white"
-                    android:contentDescription="@string/go_back_img_des" />
+                android:id="@+id/player_loading_go_back"
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                android:layout_gravity="center"
+                android:background="@drawable/video_tap_button_always_white"
+                android:clickable="true"
+                android:contentDescription="@string/go_back_img_des"
+                android:focusable="true" />
         </FrameLayout>
     </FrameLayout>
 
     <FrameLayout
-            android:visibility="gone"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:id="@+id/player_torrent_info"
+        android:id="@+id/player_torrent_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/video_torrent_progress"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:gravity="start"
+            android:textColor="@color/white"
+            android:textStyle="bold"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="78% at 18kb/s" />
 
         <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                android:gravity="start"
-                android:layout_marginTop="15dp"
-                android:textStyle="bold"
-                android:textColor="@color/white"
-                android:id="@+id/video_torrent_progress"
-                tools:text="78% at 18kb/s" />
-
-        <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_constraintLeft_toLeftOf="parent"
-                android:gravity="start"
-                android:layout_marginTop="0dp"
-                android:textColor="@color/white"
-                android:id="@+id/video_torrent_seeders"
-                tools:text="17 seeders"
-                app:layout_constraintTop_toBottomOf="@+id/player_video_title" />
+            android:id="@+id/video_torrent_seeders"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="0dp"
+            android:gravity="start"
+            android:textColor="@color/white"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/player_video_title"
+            tools:text="17 seeders" />
     </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 9bbded4e..2cdcbf22 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -318,6 +318,25 @@
             </FrameLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <com.google.android.material.button.MaterialButton
+            tools:visibility="visible"
+            android:id="@+id/skip_chapter_button"
+            style="@style/NiceButton"
+            android:layout_width="150dp"
+            android:layout_height="40dp"
+            android:layout_marginEnd="100dp"
+            android:visibility="gone"
+            android:maxLines="1"
+            android:backgroundTint="@color/skipOpTransparent"
+            android:padding="10dp"
+            android:textColor="@color/white"
+            app:cornerRadius="@dimen/rounded_button_radius"
+            app:layout_constraintBottom_toTopOf="@+id/bottom_player_bar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:strokeColor="@color/white"
+            app:strokeWidth="1dp"
+            tools:text="Skip Opening" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8b3d0fbf..c3e51ab5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -41,6 +41,7 @@
 
     <color name="black_overlay">#66000000</color>
     <color name="darkBarTransparent">#C0121212</color>
+    <color name="skipOpTransparent">#4D121212</color>
     <color name="darkBar">#121212</color>
     <color name="videoProgress">#66B5B5B5</color> <!--66B5B5B5-->
     <!--<color name="videoCache">#663D50FA</color>--> <!--66B5B5B5-->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5665ea5c..144d2477 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -638,4 +638,13 @@
     <string name="player_settings_play_in_browser">Browser</string>
     <string name="app_not_found_error">App not found</string>
     <string name="all_languages_preference">All Languages</string>
+
+    <string name="skip_type_format" formatted="true">Skip %s</string>
+    <string name="skip_type_op">Opening</string>
+    <string name="skip_type_ed">Ending</string>
+    <string name="skip_type_recap">Recap</string>
+    <string name="skip_type_mixed_ed">Mixed ending</string>
+    <string name="skip_type_mixed_op">Mixed opening</string>
+    <string name="skip_type_creddits">Credits</string>
+    <string name="skip_type_intro">Intro</string>
 </resources>

From 9e67e856a0d12d326bcab23edc5925c881f9a496 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Sat, 5 Nov 2022 00:40:31 +0100
Subject: [PATCH 061/273] small fix for multi request

---
 .../com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index e1f1d99d..f4d2cd2f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -166,7 +166,8 @@ class GeneratorPlayer : FullScreenPlayer() {
         isActive = true
         setPlayerDimen(null)
         setTitle()
-        hasRequestedStamps = false
+        if (!sameEpisode)
+            hasRequestedStamps = false
 
         loadExtractorJob(link.first)
         // load player
@@ -186,7 +187,8 @@ class GeneratorPlayer : FullScreenPlayer() {
                 ),
             )
         }
-        player.addTimeStamps(listOf()) // clear stamps
+        if (!sameEpisode)
+            player.addTimeStamps(listOf()) // clear stamps
     }
 
     private fun sortLinks(useQualitySettings: Boolean = true): List<Pair<ExtractorLink?, ExtractorUri?>> {

From 60a2f7c1c51456d025f92c191b51cf38e411ae21 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Sat, 5 Nov 2022 01:27:35 +0100
Subject: [PATCH 062/273] clear history

---
 .../cloudstream3/ui/search/SearchFragment.kt  | 39 ++++++++++++++++++-
 app/src/main/res/drawable/delete_all.xml      |  9 +++++
 app/src/main/res/layout/fragment_search.xml   | 19 +++++++++
 app/src/main/res/values/strings.xml           |  3 ++
 4 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/delete_all.xml

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index bcb36f7e..e6e290c1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.search
 
+import android.content.DialogInterface
 import android.content.res.Configuration
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,6 +11,7 @@ import android.widget.AbsListView
 import android.widget.ArrayAdapter
 import android.widget.ImageView
 import android.widget.ListView
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
@@ -28,6 +30,7 @@ import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
 import com.lagradost.cloudstream3.APIHolder.getApiSettings
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
+import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.mvvm.Resource
@@ -343,7 +346,7 @@ class SearchFragment : Fragment() {
                     searchViewModel.updateHistory()
                 }
 
-                search_history_recycler?.isVisible = showHistory
+                search_history_holder?.isVisible = showHistory
 
                 search_master_recycler?.isVisible = !showHistory && isAdvancedSearch
                 search_autofit_results?.isVisible = !showHistory && !isAdvancedSearch
@@ -352,7 +355,41 @@ class SearchFragment : Fragment() {
             }
         })
 
+        search_clear_call_history?.setOnClickListener {
+            activity?.let { ctx ->
+                val builder: AlertDialog.Builder = AlertDialog.Builder(ctx)
+                val dialogClickListener =
+                    DialogInterface.OnClickListener { _, which ->
+                        when (which) {
+                            DialogInterface.BUTTON_POSITIVE -> {
+                                removeKeys(SEARCH_HISTORY_KEY)
+                                searchViewModel.updateHistory()
+                            }
+                            DialogInterface.BUTTON_NEGATIVE -> {
+                            }
+                        }
+                    }
+
+                try {
+                    builder.setTitle(R.string.clear_history).setMessage(
+                        ctx.getString(R.string.delete_message).format(
+                            ctx.getString(R.string.history)
+                        )
+                    )
+                        .setPositiveButton(R.string.sort_clear, dialogClickListener)
+                        .setNegativeButton(R.string.cancel, dialogClickListener)
+                        .show()
+                } catch (e: Exception) {
+                    logError(e)
+                    // ye you somehow fucked up formatting did you?
+                }
+            }
+
+
+        }
+
         observe(searchViewModel.currentHistory) { list ->
+            search_clear_call_history?.isVisible = list.isNotEmpty()
             (search_history_recycler.adapter as? SearchHistoryAdaptor?)?.updateList(list)
         }
 
diff --git a/app/src/main/res/drawable/delete_all.xml b/app/src/main/res/drawable/delete_all.xml
new file mode 100644
index 00000000..a5e8775c
--- /dev/null
+++ b/app/src/main/res/drawable/delete_all.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?attr/white"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M30,36.5V33.5H37.25V36.5ZM30,18.1V15.1H44V18.1ZM30,27.3V24.3H41.75V27.3ZM6.25,14.25H4V11.25H12.5V9H19.25V11.25H27.75V14.25H25.5V35Q25.5,36.2 24.6,37.1Q23.7,38 22.5,38H9.25Q8.05,38 7.15,37.1Q6.25,36.2 6.25,35ZM9.25,14.25V35Q9.25,35 9.25,35Q9.25,35 9.25,35H22.5Q22.5,35 22.5,35Q22.5,35 22.5,35V14.25ZM9.25,14.25V35Q9.25,35 9.25,35Q9.25,35 9.25,35Q9.25,35 9.25,35Q9.25,35 9.25,35Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 083cd64e..6df5837f 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -112,6 +112,11 @@
         android:nextFocusLeft="@id/nav_rail_view"
         android:visibility="gone"
         tools:listitem="@layout/homepage_parent" />
+    <FrameLayout
+        android:id="@+id/search_history_holder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/search_history_recycler"
@@ -122,5 +127,19 @@
         android:descendantFocusability="afterDescendants"
         android:nextFocusLeft="@id/nav_rail_view"
         android:visibility="visible"
+        android:paddingBottom="50dp"
         tools:listitem="@layout/search_history_item" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/search_clear_call_history"
+        style="@style/BlackButton"
+        android:layout_gravity="bottom"
+        android:padding="0dp"
+        app:cornerRadius="0dp"
+        android:layout_margin="0dp"
+        android:text="@string/clear_history"
+        app:icon="@drawable/delete_all"
+        android:layout_width="match_parent"
+        android:layout_height="50dp" />
+    </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 144d2477..e3ef9f6b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -647,4 +647,7 @@
     <string name="skip_type_mixed_op">Mixed opening</string>
     <string name="skip_type_creddits">Credits</string>
     <string name="skip_type_intro">Intro</string>
+
+    <string name="clear_history">Clear history</string>
+    <string name="history">History</string>
 </resources>

From 60bcbf0060750f661f5ae53f197b29b71eae365c Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sat, 5 Nov 2022 19:54:04 +0100
Subject: [PATCH 063/273] A lil cache fixing & search fixes

---
 app/build.gradle.kts                                        | 6 +++---
 .../main/java/com/lagradost/cloudstream3/CommonActivity.kt  | 2 ++
 .../com/lagradost/cloudstream3/ui/search/SearchFragment.kt  | 6 +++---
 .../ui/settings/extensions/ExtensionsFragment.kt            | 4 +++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4a1fcada..f72eb321 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -47,8 +47,8 @@ android {
         minSdk = 21
         targetSdk = 30
 
-        versionCode = 54
-        versionName = "3.2.2"
+        versionCode = 55
+        versionName = "3.2.3"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
 
@@ -190,7 +190,7 @@ dependencies {
     // Networking
 //    implementation("com.squareup.okhttp3:okhttp:4.9.2")
 //    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1")
-    implementation("com.github.Blatzar:NiceHttp:0.3.4")
+    implementation("com.github.Blatzar:NiceHttp:0.3.5")
 
     // Util to skip the URI file fuckery 🙏
     implementation("com.github.tachiyomiorg:unifile:17bec43")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index af04a1a2..342dc6f7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -61,6 +61,7 @@ object CommonActivity {
         }
     }
 
+    @MainThread
     fun showToast(act: Activity?, @StringRes message: Int, duration: Int) {
         if (act == null) return
         showToast(act, act.getString(message), duration)
@@ -69,6 +70,7 @@ object CommonActivity {
     const val TAG = "COMPACT"
 
     /** duration is Toast.LENGTH_SHORT if null*/
+    @MainThread
     fun showToast(act: Activity?, message: String?, duration: Int? = null) {
         if (act == null || message == null) {
             Log.w(TAG, "invalid showToast act = $act message = $message")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index e6e290c1..4da88af7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -131,9 +131,9 @@ class SearchFragment : Fragment() {
         context?.let { ctx ->
             val default = enumValues<TvType>().sorted().filter { it != TvType.NSFW }
                 .map { it.ordinal.toString() }.toSet()
-            val preferredTypes = PreferenceManager.getDefaultSharedPreferences(ctx)
-                .getStringSet(this.getString(R.string.prefer_media_type_key), default)
-                ?.mapNotNull { it.toIntOrNull() ?: return@mapNotNull null } ?: default
+            val preferredTypes = (PreferenceManager.getDefaultSharedPreferences(ctx)
+                .getStringSet(this.getString(R.string.prefer_media_type_key), default)?.ifEmpty { default } ?: default)
+                .mapNotNull { it.toIntOrNull() ?: return@mapNotNull null }
 
             val settings = ctx.getApiSettings()
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
index 49f40879..fbf10499 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
@@ -200,7 +200,9 @@ class ExtensionsFragment : Fragment() {
                     val url = dialog.repo_url_input?.text?.toString()
                         ?.let { it1 -> RepositoryManager.parseRepoUrl(it1) }
                     if (url.isNullOrBlank()) {
-                        showToast(activity, R.string.error_invalid_data, Toast.LENGTH_SHORT)
+                        main {
+                            showToast(activity, R.string.error_invalid_data, Toast.LENGTH_SHORT)
+                        }
                     } else {
                         val fixedName = if (!name.isNullOrBlank()) name
                         else RepositoryManager.parseRepository(url)?.name ?: "No name"

From 4fb65e724290a5a130f10c665e45acf0c8f20a99 Mon Sep 17 00:00:00 2001
From: Sdarfeesh <50188628+Sdarfeesh@users.noreply.github.com>
Date: Sun, 6 Nov 2022 04:55:41 +0800
Subject: [PATCH 064/273] Update Simplified Chinese Translation (#198)

---
 app/src/main/res/values-zh/strings.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 8f436fe9..a9cc91b7 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -577,4 +577,17 @@
     <string name="player_settings_play_in_web">投屏</string>
     <string name="player_settings_play_in_browser">浏览器</string>
     <string name="app_not_found_error">未找到应用</string>
+    <string name="all_languages_preference">所有语言</string>
+
+    <string name="skip_type_format" formatted="true">跳过 %s</string>
+    <string name="skip_type_op">片头</string>
+    <string name="skip_type_ed">片尾</string>
+    <string name="skip_type_recap">前情回顾</string>
+    <string name="skip_type_mixed_ed">混合片尾</string>
+    <string name="skip_type_mixed_op">混合片头</string>
+    <string name="skip_type_creddits">致谢名单</string>
+    <string name="skip_type_intro">介绍</string>
+
+    <string name="clear_history">清除历史记录</string>
+    <string name="history">历史记录</string>
 </resources>

From 8fa00f4ca902683430d1f12f128edb645a09e78d Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Sat, 5 Nov 2022 22:15:34 +0100
Subject: [PATCH 065/273] added setting for skip op and changed key for player
 seek amount

---
 .../cloudstream3/ui/player/GeneratorPlayer.kt |  11 +-
 app/src/main/res/values/strings.xml           |   5 +-
 app/src/main/res/xml/settings_player.xml      | 190 +++++++++---------
 3 files changed, 112 insertions(+), 94 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index f4d2cd2f..95a9393f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -187,6 +187,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 ),
             )
         }
+
         if (!sameEpisode)
             player.addTimeStamps(listOf()) // clear stamps
     }
@@ -874,7 +875,15 @@ class GeneratorPlayer : FullScreenPlayer() {
         if (duration <= 0L) return // idk how you achieved this, but div by zero crash
         if (!hasRequestedStamps) {
             hasRequestedStamps = true
-            viewModel.loadStamps(duration)
+            val fetchStamps = context?.let { ctx ->
+                val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
+                settingsManager.getBoolean(
+                    ctx.getString(R.string.enable_skip_op_from_database),
+                    true
+                )
+            } ?: true
+            if (fetchStamps)
+                viewModel.loadStamps(duration)
         }
 
         viewModel.getId()?.let {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e3ef9f6b..e2ebf0ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,7 +28,7 @@
     <string name="pip_enabled_key" translatable="false">pip_enabled_key</string>
     <string name="double_tap_enabled_key" translatable="false">double_tap_enabled_key</string>
     <string name="double_tap_pause_enabled_key" translatable="false">double_tap_pause_enabled_key</string>
-    <string name="double_tap_seek_time_key" translatable="false">double_tap_seek_time_key</string>
+    <string name="double_tap_seek_time_key" translatable="false">double_tap_seek_time_key2</string>
     <string name="swipe_vertical_enabled_key" translatable="false">swipe_vertical_enabled_key</string>
     <string name="autoplay_next_key" translatable="false">autoplay_next_key</string>
     <string name="display_sub_key" translatable="false">display_sub_key</string>
@@ -57,6 +57,7 @@
     <string name="filter_sub_lang_key" translatable="false">filter_sub_lang_key</string>
     <string name="pref_filter_search_quality_key" translatable="false">pref_filter_search_quality_key</string>
     <string name="enable_nsfw_on_providers_key" translatable="false">enable_nsfw_on_providers_key</string>
+    <string name="enable_skip_op_from_database" translatable="false">enable_skip_op_from_database</string>
 
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
@@ -650,4 +651,6 @@
 
     <string name="clear_history">Clear history</string>
     <string name="history">History</string>
+    <string name="enable_skip_op_from_database_des">Show skip popups for opening/ending</string>
+
 </resources>
diff --git a/app/src/main/res/xml/settings_player.xml b/app/src/main/res/xml/settings_player.xml
index 6946a5c9..0be6313f 100644
--- a/app/src/main/res/xml/settings_player.xml
+++ b/app/src/main/res/xml/settings_player.xml
@@ -1,126 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <Preference
-            android:key="@string/subtitle_settings_key"
-            android:title="@string/player_subtitles_settings"
-            android:icon="@drawable/ic_outline_subtitles_24"
-            app:summary="@string/player_subtitles_settings_des" />
+        android:icon="@drawable/ic_outline_subtitles_24"
+        android:key="@string/subtitle_settings_key"
+        android:title="@string/player_subtitles_settings"
+        app:summary="@string/player_subtitles_settings_des" />
     <Preference
-            android:key="@string/subtitle_settings_chromecast_key"
-            android:title="@string/chromecast_subtitles_settings"
-            android:icon="@drawable/ic_outline_subtitles_24"
-            app:summary="@string/chromecast_subtitles_settings_des" />
+        android:icon="@drawable/ic_outline_subtitles_24"
+        android:key="@string/subtitle_settings_chromecast_key"
+        android:title="@string/chromecast_subtitles_settings"
+        app:summary="@string/chromecast_subtitles_settings_des" />
 
 
     <Preference
-            android:key="@string/quality_pref_key"
-            android:title="@string/watch_quality_pref"
-            android:icon="@drawable/ic_baseline_hd_24" />
+        android:icon="@drawable/ic_baseline_hd_24"
+        android:key="@string/quality_pref_key"
+        android:title="@string/watch_quality_pref" />
 
     <Preference
-            android:key="@string/player_pref_key"
-            android:title="@string/player_pref"
-            android:icon="@drawable/netflix_play" />
+        android:icon="@drawable/netflix_play"
+        android:key="@string/player_pref_key"
+        android:title="@string/player_pref" />
 
     <Preference
-            android:key="@string/prefer_limit_title_key"
-            android:title="@string/limit_title"
-            android:icon="@drawable/ic_baseline_text_format_24" />
+        android:icon="@drawable/ic_baseline_text_format_24"
+        android:key="@string/prefer_limit_title_key"
+        android:title="@string/limit_title" />
 
     <Preference
-            android:key="@string/prefer_limit_title_rez_key"
-            android:title="@string/limit_title_rez"
-            android:icon="@drawable/ic_baseline_text_format_24" />
+        android:icon="@drawable/ic_baseline_text_format_24"
+        android:key="@string/prefer_limit_title_rez_key"
+        android:title="@string/limit_title_rez" />
 
     <SwitchPreference
-            android:icon="@drawable/ic_baseline_picture_in_picture_alt_24"
-            app:key="@string/pip_enabled_key"
-            android:title="@string/picture_in_picture"
-            android:summary="@string/picture_in_picture_des"
-            app:defaultValue="true" />
+        android:icon="@drawable/ic_baseline_picture_in_picture_alt_24"
+        android:summary="@string/picture_in_picture_des"
+        android:title="@string/picture_in_picture"
+        app:defaultValue="true"
+        app:key="@string/pip_enabled_key" />
     <SwitchPreference
-            android:icon="@drawable/ic_baseline_aspect_ratio_24"
-            app:key="@string/player_resize_enabled_key"
-            android:title="@string/player_size_settings"
-            android:summary="@string/player_size_settings_des"
-            app:defaultValue="true" />
+        android:icon="@drawable/ic_baseline_aspect_ratio_24"
+        android:summary="@string/player_size_settings_des"
+        android:title="@string/player_size_settings"
+        app:defaultValue="true"
+        app:key="@string/player_resize_enabled_key" />
     <SwitchPreference
-            android:icon="@drawable/ic_baseline_speed_24"
-            app:key="@string/playback_speed_enabled_key"
-            android:title="@string/eigengraumode_settings"
-            android:summary="@string/eigengraumode_settings_des"
-            app:defaultValue="false" />
+        android:icon="@drawable/ic_baseline_speed_24"
+        android:summary="@string/eigengraumode_settings_des"
+        android:title="@string/eigengraumode_settings"
+        app:defaultValue="false"
+        app:key="@string/playback_speed_enabled_key" />
     <SwitchPreference
-            android:icon="@drawable/ic_baseline_ondemand_video_24"
-            app:key="@string/swipe_enabled_key"
-            android:title="@string/swipe_to_seek_settings"
-            android:summary="@string/swipe_to_seek_settings_des"
-            app:defaultValue="true" />
+        android:icon="@drawable/ic_baseline_ondemand_video_24"
+        android:summary="@string/swipe_to_seek_settings_des"
+        android:title="@string/swipe_to_seek_settings"
+        app:defaultValue="true"
+        app:key="@string/swipe_enabled_key" />
     <SwitchPreference
-            android:icon="@drawable/ic_baseline_ondemand_video_24"
-            app:key="@string/swipe_vertical_enabled_key"
-            android:title="@string/swipe_to_change_settings"
-            android:summary="@string/swipe_to_change_settings_des"
-            app:defaultValue="true" />
-        <SwitchPreference
-            android:icon="@drawable/ic_baseline_skip_next_24"
-            app:key="@string/autoplay_next_key"
-            android:title="@string/autoplay_next_settings"
-            android:summary="@string/autoplay_next_settings_des"
-            app:defaultValue="true" />
+        android:icon="@drawable/ic_baseline_ondemand_video_24"
+        android:summary="@string/swipe_to_change_settings_des"
+        android:title="@string/swipe_to_change_settings"
+        app:defaultValue="true"
+        app:key="@string/swipe_vertical_enabled_key" />
     <SwitchPreference
-            android:icon="@drawable/ic_baseline_touch_app_24"
-            app:key="@string/double_tap_enabled_key"
-            android:title="@string/double_tap_to_seek_settings"
-            android:summary="@string/double_tap_to_seek_settings_des"
-            app:defaultValue="false" />
+        android:icon="@drawable/ic_baseline_skip_next_24"
+        android:summary="@string/autoplay_next_settings_des"
+        android:title="@string/autoplay_next_settings"
+        app:defaultValue="true"
+        app:key="@string/autoplay_next_key" />
     <SwitchPreference
-            android:icon="@drawable/netflix_pause"
-            app:key="@string/double_tap_pause_enabled_key"
-            android:title="@string/double_tap_to_pause_settings"
-            android:summary="@string/double_tap_to_pause_settings_des"
-            app:defaultValue="false" />
+        android:icon="@drawable/ic_baseline_skip_next_24"
+        android:title="@string/video_skip_op"
+        app:defaultValue="true"
+        android:summary="@string/enable_skip_op_from_database_des"
+        app:key="@string/enable_skip_op_from_database" />
+    <SwitchPreference
+        android:icon="@drawable/ic_baseline_touch_app_24"
+        android:summary="@string/double_tap_to_seek_settings_des"
+        android:title="@string/double_tap_to_seek_settings"
+        app:defaultValue="false"
+        app:key="@string/double_tap_enabled_key" />
+    <SwitchPreference
+        android:icon="@drawable/netflix_pause"
+        android:summary="@string/double_tap_to_pause_settings_des"
+        android:title="@string/double_tap_to_pause_settings"
+        app:defaultValue="false"
+        app:key="@string/double_tap_pause_enabled_key" />
 
     <SeekBarPreference
-            app:icon="@drawable/go_forward_30"
-            app:adjustable="true"
-            android:defaultValue="10"
-            app:min="5"
-            app:seekBarIncrement="5"
-            app:showSeekBarValue="true"
-            android:max="60"
-            app:key="@string/double_tap_seek_time_key"
-            android:title="@string/double_tap_to_seek_amount_settings"
-            app:defaultValue="false" />
+        android:defaultValue="10"
+        android:max="60"
+        android:title="@string/double_tap_to_seek_amount_settings"
+        app:adjustable="true"
+        app:defaultValue="10"
+        app:icon="@drawable/go_forward_30"
+        app:key="@string/double_tap_seek_time_key"
+        app:min="5"
+        app:seekBarIncrement="5"
+        app:showSeekBarValue="true" />
 
     <SwitchPreference
-            android:icon="@drawable/baseline_sync_24"
-            app:key="@string/episode_sync_enabled_key"
-            android:title="@string/episode_sync_settings"
-            android:summary="@string/episode_sync_settings_des"
-            app:defaultValue="true" />
+        android:icon="@drawable/baseline_sync_24"
+        android:summary="@string/episode_sync_settings_des"
+        android:title="@string/episode_sync_settings"
+        app:defaultValue="true"
+        app:key="@string/episode_sync_enabled_key" />
 
     <Preference
-            android:key="@string/video_buffer_disk_key"
-            android:title="@string/video_buffer_disk_settings"
-            android:summary="@string/video_disk_description"
-            android:icon="@drawable/ic_baseline_storage_24" />
+        android:icon="@drawable/ic_baseline_storage_24"
+        android:key="@string/video_buffer_disk_key"
+        android:summary="@string/video_disk_description"
+        android:title="@string/video_buffer_disk_settings" />
 
     <Preference
-            android:key="@string/video_buffer_size_key"
-            android:title="@string/video_buffer_size_settings"
-            android:summary="@string/video_ram_description"
-            android:icon="@drawable/ic_baseline_storage_24" />
+        android:icon="@drawable/ic_baseline_storage_24"
+        android:key="@string/video_buffer_size_key"
+        android:summary="@string/video_ram_description"
+        android:title="@string/video_buffer_size_settings" />
 
     <Preference
-            android:key="@string/video_buffer_length_key"
-            android:title="@string/video_buffer_length_settings"
-            android:summary="@string/video_ram_description"
-            android:icon="@drawable/ic_baseline_storage_24" />
+        android:icon="@drawable/ic_baseline_storage_24"
+        android:key="@string/video_buffer_length_key"
+        android:summary="@string/video_ram_description"
+        android:title="@string/video_buffer_length_settings" />
 
     <Preference
-            android:key="@string/video_buffer_clear_key"
-            android:title="@string/video_buffer_clear_settings"
-            android:icon="@drawable/ic_baseline_delete_outline_24" />
+        android:icon="@drawable/ic_baseline_delete_outline_24"
+        android:key="@string/video_buffer_clear_key"
+        android:title="@string/video_buffer_clear_settings" />
 </PreferenceScreen>
\ No newline at end of file

From aef6f93efe212837e0009035c082c6ea3f2bcb08 Mon Sep 17 00:00:00 2001
From: darkdemon <dspatil11599@gmail.com>
Date: Sun, 6 Nov 2022 16:43:45 +0530
Subject: [PATCH 066/273] - Open all extractor classes - Add StreamTape
 clones[Streamtape.net, ShaveTape.cash] - optimize imports for AstreamHub,
 GMplayer

---
 .../lagradost/cloudstream3/extractors/AStreamHub.kt |  7 ++++---
 .../lagradost/cloudstream3/extractors/Acefile.kt    |  2 +-
 .../lagradost/cloudstream3/extractors/AsianLoad.kt  |  2 +-
 .../lagradost/cloudstream3/extractors/Blogger.kt    |  2 +-
 .../lagradost/cloudstream3/extractors/BullStream.kt |  2 +-
 .../lagradost/cloudstream3/extractors/Embedgram.kt  |  2 +-
 .../lagradost/cloudstream3/extractors/Fastream.kt   |  2 +-
 .../lagradost/cloudstream3/extractors/Filesim.kt    |  2 +-
 .../lagradost/cloudstream3/extractors/GMPlayer.kt   |  3 +--
 .../lagradost/cloudstream3/extractors/Linkbox.kt    |  2 +-
 .../com/lagradost/cloudstream3/extractors/Mcloud.kt |  7 -------
 .../lagradost/cloudstream3/extractors/Mp4Upload.kt  |  2 +-
 .../cloudstream3/extractors/MultiQuality.kt         |  2 +-
 .../com/lagradost/cloudstream3/extractors/Mvidoo.kt |  2 +-
 .../lagradost/cloudstream3/extractors/Pelisplus.kt  |  2 +-
 .../lagradost/cloudstream3/extractors/PlayLtXyz.kt  |  2 +-
 .../lagradost/cloudstream3/extractors/Solidfiles.kt |  2 +-
 .../lagradost/cloudstream3/extractors/StreamTape.kt | 13 +++++++++++--
 .../lagradost/cloudstream3/extractors/Streamhub.kt  |  2 +-
 .../lagradost/cloudstream3/extractors/Streamplay.kt |  2 +-
 .../lagradost/cloudstream3/extractors/Supervideo.kt | 11 ++++++-----
 .../cloudstream3/extractors/UpstreamExtractor.kt    |  2 +-
 .../lagradost/cloudstream3/extractors/VideoVard.kt  |  2 +-
 .../lagradost/cloudstream3/extractors/WcoStream.kt  |  6 ++++++
 .../lagradost/cloudstream3/extractors/YourUpload.kt |  2 +-
 .../lagradost/cloudstream3/extractors/Zorofile.kt   |  2 +-
 .../lagradost/cloudstream3/utils/ExtractorApi.kt    |  2 ++
 27 files changed, 50 insertions(+), 39 deletions(-)
 delete mode 100644 app/src/main/java/com/lagradost/cloudstream3/extractors/Mcloud.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/AStreamHub.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/AStreamHub.kt
index 18602664..b0051ba7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/AStreamHub.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/AStreamHub.kt
@@ -2,10 +2,11 @@ package com.lagradost.cloudstream3.extractors
 
 import android.util.Log
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.base64Decode
-import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
 
-class AStreamHub : ExtractorApi() {
+open class AStreamHub : ExtractorApi() {
     override val name = "AStreamHub"
     override val mainUrl = "https://astreamhub.com"
     override val requiresReferer = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt
index fe46791b..18198f44 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt
@@ -4,7 +4,7 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64Decode
 import com.lagradost.cloudstream3.utils.*
 
-class Acefile : ExtractorApi() {
+open class Acefile : ExtractorApi() {
     override val name = "Acefile"
     override val mainUrl = "https://acefile.co"
     override val requiresReferer = false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt
index cf16f200..7a62fb52 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.M3u8Helper
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import java.net.URI
 
-class AsianLoad : ExtractorApi() {
+open class AsianLoad : ExtractorApi() {
     override var name = "AsianLoad"
     override var mainUrl = "https://asianembed.io"
     override val requiresReferer = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Blogger.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Blogger.kt
index cae77322..44e700b1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Blogger.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Blogger.kt
@@ -5,7 +5,7 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 
-class Blogger : ExtractorApi() {
+open class Blogger : ExtractorApi() {
     override val name = "Blogger"
     override val mainUrl = "https://www.blogger.com"
     override val requiresReferer = false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/BullStream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/BullStream.kt
index e5368bc3..71fa7066 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/BullStream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/BullStream.kt
@@ -5,7 +5,7 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 
-class BullStream : ExtractorApi() {
+open class BullStream : ExtractorApi() {
     override val name = "BullStream"
     override val mainUrl = "https://bullstream.xyz"
     override val requiresReferer = false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Embedgram.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Embedgram.kt
index 35569663..45a06dcc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Embedgram.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Embedgram.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.httpsify
 
-class Embedgram : ExtractorApi() {
+open class Embedgram : ExtractorApi() {
     override val name = "Embedgram"
     override val mainUrl = "https://embedgram.com"
     override val requiresReferer = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Fastream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Fastream.kt
index 0d5a5c78..f813d7ea 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Fastream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Fastream.kt
@@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
 
-class Fastream: ExtractorApi() {
+open class Fastream: ExtractorApi() {
     override var mainUrl = "https://fastream.to"
     override var name = "Fastream"
     override val requiresReferer = false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
index 5c8af1c5..8e3dc730 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
@@ -5,7 +5,7 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 
-class Filesim : ExtractorApi() {
+open class Filesim : ExtractorApi() {
     override val name = "Filesim"
     override val mainUrl = "https://files.im"
     override val requiresReferer = false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/GMPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/GMPlayer.kt
index af02ee8a..52c45096 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/GMPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/GMPlayer.kt
@@ -3,10 +3,9 @@ package com.lagradost.cloudstream3.extractors
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper
 import com.lagradost.cloudstream3.utils.Qualities
 
-class GMPlayer : ExtractorApi() {
+open class GMPlayer : ExtractorApi() {
     override val name = "GM Player"
     override val mainUrl = "https://gmplayer.xyz"
     override val requiresReferer = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt
index 52fc5532..73734e2a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt
@@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 
-class Linkbox : ExtractorApi() {
+open class Linkbox : ExtractorApi() {
     override val name = "Linkbox"
     override val mainUrl = "https://www.linkbox.to"
     override val requiresReferer = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Mcloud.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Mcloud.kt
deleted file mode 100644
index 29d98557..00000000
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Mcloud.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-open class Mcloud : WcoStream() {
-    override var name = "Mcloud"
-    override var mainUrl = "https://mcloud.to"
-    override val requiresReferer = true
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Mp4Upload.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Mp4Upload.kt
index 68a4a103..93a280ed 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Mp4Upload.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Mp4Upload.kt
@@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.getAndUnpack
 
-class Mp4Upload : ExtractorApi() {
+open class Mp4Upload : ExtractorApi() {
     override var name = "Mp4Upload"
     override var mainUrl = "https://www.mp4upload.com"
     private val srcRegex = Regex("""player\.src\("(.*?)"""")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt
index 0c0b5c68..44657196 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import java.net.URI
 
-class MultiQuality : ExtractorApi() {
+open class MultiQuality : ExtractorApi() {
     override var name = "MultiQuality"
     override var mainUrl = "https://gogo-play.net"
     private val sourceRegex = Regex("""file:\s*['"](.*?)['"],label:\s*['"](.*?)['"]""")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Mvidoo.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Mvidoo.kt
index c00df942..9e5f5e74 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Mvidoo.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Mvidoo.kt
@@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 
-class Mvidoo : ExtractorApi() {
+open class Mvidoo : ExtractorApi() {
     override val name = "Mvidoo"
     override val mainUrl = "https://mvidoo.com"
     override val requiresReferer = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt
index de469b22..45ec4c2f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt
@@ -14,7 +14,7 @@ import org.jsoup.Jsoup
  * overrideMainUrl is necessary for for other vidstream clones like vidembed.cc
  * If they diverge it'd be better to make them separate.
  * */
-class Pelisplus(val mainUrl: String) {
+open class Pelisplus(val mainUrl: String) {
     val name: String = "Vidstream"
 
     private fun getExtractorUrl(id: String): String {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt
index 9a031556..2b286abb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt
@@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 
-class PlayLtXyz: ExtractorApi() {
+open class PlayLtXyz: ExtractorApi() {
     override val name: String = "PlayLt"
     override val mainUrl: String = "https://play.playlt.xyz"
     override val requiresReferer = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Solidfiles.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Solidfiles.kt
index 849f5fc8..cc34781c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Solidfiles.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Solidfiles.kt
@@ -8,7 +8,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 
 
-class Solidfiles : ExtractorApi() {
+open class Solidfiles : ExtractorApi() {
     override val name = "Solidfiles"
     override val mainUrl = "https://www.solidfiles.com"
     override val requiresReferer = false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamTape.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamTape.kt
index af436ff3..ece8dc4b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamTape.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamTape.kt
@@ -5,7 +5,15 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 
-class StreamTape : ExtractorApi() {
+class StreamTapeNet : StreamTape() {
+    override var mainUrl = "https://streamtape.net"
+}
+
+class ShaveTape : StreamTape(){
+    override var mainUrl = "https://shavetape.cash"
+}
+
+open class StreamTape : ExtractorApi() {
     override var name = "StreamTape"
     override var mainUrl = "https://streamtape.com"
     override val requiresReferer = false
@@ -16,7 +24,8 @@ class StreamTape : ExtractorApi() {
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
         with(app.get(url)) {
             linkRegex.find(this.text)?.let {
-                val extractedUrl = "https:${it.groups[1]!!.value + it.groups[2]!!.value.substring(3,)}"
+                val extractedUrl =
+                    "https:${it.groups[1]!!.value + it.groups[2]!!.value.substring(3)}"
                 return listOf(
                     ExtractorLink(
                         name,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Streamhub.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Streamhub.kt
index 2765ae17..c7689c58 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Streamhub.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Streamhub.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.JsUnpacker
 import com.lagradost.cloudstream3.utils.Qualities
 import java.net.URI
 
-class Streamhub : ExtractorApi() {
+open class Streamhub : ExtractorApi() {
     override var mainUrl = "https://streamhub.to"
     override var name = "Streamhub"
     override val requiresReferer = false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Streamplay.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Streamplay.kt
index 3f5e5bd6..e6bbfeba 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Streamplay.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Streamplay.kt
@@ -9,7 +9,7 @@ import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import java.net.URI
 
-class Streamplay : ExtractorApi() {
+open class Streamplay : ExtractorApi() {
     override val name = "Streamplay"
     override val mainUrl = "https://streamplay.to"
     override val requiresReferer = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Supervideo.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Supervideo.kt
index 955345aa..dd49d994 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Supervideo.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Supervideo.kt
@@ -11,7 +11,7 @@ data class Files(
     @JsonProperty("label") val label: String? = null,
 )
 
-    open class Supervideo : ExtractorApi() {
+open class Supervideo : ExtractorApi() {
     override var name = "Supervideo"
     override var mainUrl = "https://supervideo.tv"
     override val requiresReferer = false
@@ -20,10 +20,13 @@ data class Files(
         val response = app.get(url).text
         val jstounpack = Regex("eval((.|\\n)*?)</script>").find(response)?.groups?.get(1)?.value
         val unpacjed = JsUnpacker(jstounpack).unpack()
-        val extractedUrl = unpacjed?.let { Regex("""sources:((.|\n)*?)image""").find(it) }?.groups?.get(1)?.value.toString().replace("file",""""file"""").replace("label",""""label"""").substringBeforeLast(",")
+        val extractedUrl =
+            unpacjed?.let { Regex("""sources:((.|\n)*?)image""").find(it) }?.groups?.get(1)?.value.toString()
+                .replace("file", """"file"""").replace("label", """"label"""")
+                .substringBeforeLast(",")
         val parsedlinks = parseJson<List<Files>>(extractedUrl)
         parsedlinks.forEach { data ->
-            if (data.label.isNullOrBlank()){ // mp4 links (with labels) are slow. Use only m3u8 link.
+            if (data.label.isNullOrBlank()) { // mp4 links (with labels) are slow. Use only m3u8 link.
                 M3u8Helper.generateM3u8(
                     name,
                     data.id,
@@ -34,8 +37,6 @@ data class Files(
                 }
             }
         }
-
-
         return extractedLinksList
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/UpstreamExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/UpstreamExtractor.kt
index 1eb384c4..09e47d03 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/UpstreamExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/UpstreamExtractor.kt
@@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 
-class UpstreamExtractor : ExtractorApi() {
+open class UpstreamExtractor : ExtractorApi() {
     override val name: String = "Upstream"
     override val mainUrl: String = "https://upstream.to"
     override val requiresReferer = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/VideoVard.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/VideoVard.kt
index 41e77967..30a1d8fe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/VideoVard.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/VideoVard.kt
@@ -11,7 +11,7 @@ class VideovardSX : WcoStream() {
     override var mainUrl = "https://videovard.sx"
 }
 
-class VideoVard : ExtractorApi() {
+open class VideoVard : ExtractorApi() {
     override var name = "Videovard" // Cause works for animekisa and wco
     override var mainUrl = "https://videovard.to"
     override val requiresReferer = false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt
index d99485ea..6cc486cd 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt
@@ -53,6 +53,12 @@ class VizcloudSite : WcoStream() {
     override var mainUrl = "https://vizcloud.site"
 }
 
+class Mcloud : WcoStream() {
+    override var name = "Mcloud"
+    override var mainUrl = "https://mcloud.to"
+    override val requiresReferer = true
+}
+
 open class WcoStream : ExtractorApi() {
     override var name = "VidStream" // Cause works for animekisa and wco
     override var mainUrl = "https://vidstream.pro"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/YourUpload.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/YourUpload.kt
index 3c564f67..c7aa989d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/YourUpload.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/YourUpload.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 
-class YourUpload: ExtractorApi() {
+open class YourUpload: ExtractorApi() {
     override val name = "Yourupload"
     override val mainUrl = "https://www.yourupload.com"
     override val requiresReferer = false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Zorofile.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Zorofile.kt
index 84785b6c..43c4eefb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Zorofile.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Zorofile.kt
@@ -10,7 +10,7 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 
-class Zorofile : ExtractorApi() {
+open class Zorofile : ExtractorApi() {
     override val name = "Zorofile"
     override val mainUrl = "https://zorofile.com"
     override val requiresReferer = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 1a1afb68..24708e99 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -205,6 +205,8 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     VideovardSX(),
     Mp4Upload(),
     StreamTape(),
+    StreamTapeNet(),
+    ShaveTape(),
 
     //mixdrop extractors
     MixDropBz(),

From 1226426389ac327514f3189826b8712516dd9270 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sun, 6 Nov 2022 20:16:48 +0100
Subject: [PATCH 067/273] More crash fixes

---
 .../lagradost/cloudstream3/CommonActivity.kt  |  3 ++-
 .../com/lagradost/cloudstream3/MainAPI.kt     | 11 +++++++++--
 .../ui/settings/SettingsUpdates.kt            | 19 +++++++++++++------
 app/src/main/res/values/strings.xml           |  2 +-
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index 342dc6f7..47a195d1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -61,8 +61,9 @@ object CommonActivity {
         }
     }
 
+    /** duration is Toast.LENGTH_SHORT if null*/
     @MainThread
-    fun showToast(act: Activity?, @StringRes message: Int, duration: Int) {
+    fun showToast(act: Activity?, @StringRes message: Int, duration: Int? = null) {
         if (act == null) return
         showToast(act, act.getString(message), duration)
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 4b271192..5c9f3071 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -81,7 +81,8 @@ object APIHolder {
         synchronized(allProviders) {
             initMap()
             return apiMap?.get(apiName)?.let { apis.getOrNull(it) }
-                ?: allProviders.firstOrNull { it.name == apiName }
+                // Leave the ?. null check, it can crash regardless
+                ?: allProviders.firstOrNull { it?.name == apiName }
         }
     }
 
@@ -244,11 +245,17 @@ object APIHolder {
     fun Context.filterProviderByPreferredMedia(hasHomePageIsRequired: Boolean = true): List<MainAPI> {
         // We are getting the weirdest crash ever done:
         // java.lang.ClassCastException: com.lagradost.cloudstream3.TvType cannot be cast to com.lagradost.cloudstream3.TvType
-        // enumValues<TvType>() might be the cause, hence I am trying TvType.values()
+        // Trying fixing using classloader fuckery
+        val oldLoader = Thread.currentThread().contextClassLoader
+        Thread.currentThread().contextClassLoader = TvType::class.java.classLoader
+
         val default = TvType.values()
             .sorted()
             .filter { it != TvType.NSFW }
             .map { it.ordinal }
+
+        Thread.currentThread().contextClassLoader = oldLoader
+
         val defaultSet = default.map { it.toString() }.toSet()
         val currentPrefMedia = try {
             PreferenceManager.getDefaultSharedPreferences(this)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
index 6b19042a..78f6d628 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
@@ -4,12 +4,14 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.os.Bundle
+import android.os.TransactionTooLargeException
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceFragmentCompat
 import com.lagradost.cloudstream3.CommonActivity
+import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
@@ -81,12 +83,17 @@ class SettingsUpdates : PreferenceFragmentCompat() {
             dialog.text1?.text = text
 
             dialog.copy_btt?.setOnClickListener {
-                val serviceClipboard =
-                    (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?)
-                        ?: return@setOnClickListener
-                val clip = ClipData.newPlainText("logcat", text)
-                serviceClipboard.setPrimaryClip(clip)
-                dialog.dismissSafe(activity)
+                // Can crash on too much text
+                try {
+                    val serviceClipboard =
+                        (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?)
+                            ?: return@setOnClickListener
+                    val clip = ClipData.newPlainText("logcat", text)
+                    serviceClipboard.setPrimaryClip(clip)
+                    dialog.dismissSafe(activity)
+                } catch (e: TransactionTooLargeException) {
+                    showToast(activity, R.string.clipboard_too_large)
+                }
             }
             dialog.clear_btt?.setOnClickListener {
                 Runtime.getRuntime().exec("logcat -c")
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e2ebf0ab..9381372c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -652,5 +652,5 @@
     <string name="clear_history">Clear history</string>
     <string name="history">History</string>
     <string name="enable_skip_op_from_database_des">Show skip popups for opening/ending</string>
-
+    <string name="clipboard_too_large">Too much text. Unable to save to clipboard.</string>
 </resources>

From e95d117ebcb5f6821d53be9f4cad6bd997be23f1 Mon Sep 17 00:00:00 2001
From: Sdarfeesh <50188628+Sdarfeesh@users.noreply.github.com>
Date: Mon, 7 Nov 2022 18:49:53 +0800
Subject: [PATCH 068/273] Update Simplified Chinese Translation (#199)

---
 app/src/main/res/values-zh/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index a9cc91b7..19d9bd43 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -590,4 +590,6 @@
 
     <string name="clear_history">清除历史记录</string>
     <string name="history">历史记录</string>
+    <string name="enable_skip_op_from_database_des">显示跳过片头/片尾弹窗</string>
+    <string name="clipboard_too_large">文本过多，无法保存到剪贴板。</string>
 </resources>

From 2e7823034bc99768e119abd44131e55ba1240cc5 Mon Sep 17 00:00:00 2001
From: Davide <49226282+pizidavi@users.noreply.github.com>
Date: Fri, 11 Nov 2022 16:21:56 +0100
Subject: [PATCH 069/273] Updated Italian translation (#206)

---
 app/src/main/res/values-it/strings.xml | 61 +++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 86206213..fa1653c6 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -153,6 +153,10 @@
     <string name="swipe_to_seek_settings_des">Scorri a sinistra o a destra per controllare il tempo del video</string>
     <string name="swipe_to_change_settings">Scorri per cambiare le impostazioni</string>
     <string name="swipe_to_change_settings_des">Passa il dito sul lato sinistro o destro per cambiare la luminosità o il volume</string>
+
+    <string name="autoplay_next_settings">Riproduci automaticamente l\'episodio successivo</string>
+    <string name="autoplay_next_settings_des">Avvia l\'episodio successivo al termine di quello in corso</string>
+
     <string name="double_tap_to_seek_settings">Doppio tocco per andare avanti/indietro</string>
     <string name="double_tap_to_pause_settings">Doppio tocco per mettere in pausa</string>
     <string name="double_tap_to_seek_settings_des">Tocca due volte il lato destro o sinistro dello schermo per mandare avanti o indietro il video</string>
@@ -176,7 +180,7 @@
     <string name="search">Cerca</string>
     <string name="category_account">Accounts</string>
     <string name="category_updates">Aggiornamenti e Backup</string>
-    
+
     <string name="settings_info">Info</string>
     <string name="advanced_search">Ricerca avanzata</string>
     <string name="advanced_search_des">Dividi i risultati della ricerca per provider</string>
@@ -185,7 +189,9 @@
     <string name="show_fillers_settings">Mostra tag [filler] per anime</string>
     <string name="show_trailers_settings">Mostra trailer</string>
     <string name="kitsu_settings">Mostra poster da Kitsu</string>
+    <string name="pref_filter_search_quality">Nascondi la qualità video selezionata dai risultati di ricerca</string>
 
+    <string name="automatic_plugin_updates">Aggiorna automaticamente i plugin</string>
     <string name="updates_settings">Mostra gli aggiornamenti dell\'app</string>
     <string name="updates_settings_des">Cerca automaticamente nuovi aggiornamenti all\'avvio</string>
     <string name="uprereleases_settings">Aggiorna alle prerelease</string>
@@ -207,9 +213,12 @@
     <string name="acra_report_toast">Spiacente, l\'applicazione è andata in crash. Una segnalazione anonima di bug sarà inviata agli sviluppatori</string>
 
     <string name="season">Stagione</string>
+    <string name="season_format">%s %d%s</string>
     <string name="no_season">Nessuna stagione</string>
     <string name="episode">Episodio</string>
     <string name="episodes">Episodi</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Nessun episodio trovato</string>
@@ -250,6 +259,8 @@
     <string name="documentaries">Documentari</string>
     <string name="asian_drama">Drama Asiatici</string>
     <string name="livestreams">Livestreams</string>
+    <string name="nsfw">NSFW</string>
+    <string name="others">Altri</string>
 
     <!--singular-->
     <string name="movies_singular">Film</string>
@@ -261,6 +272,8 @@
     <string name="documentaries_singular">Documentario</string>
     <string name="asian_drama_singular">Drama Asiatico</string>
     <string name="live_singular">Livestream</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="other_singular">Altro</string>
 
     <string name="source_error">Source error</string>
     <string name="remote_error">Remote error</string>
@@ -332,7 +345,9 @@
     <string name="provider_lang_settings">Lingua provider</string>
     <string name="app_layout">Layout app</string>
     <string name="preferred_media_settings">Media preferito</string>
+    <string name="enable_nsfw_on_providers">Abilita NSFW sui provider supportati</string>
     <string name="subtitles_encoding">Encoding Sottotitoli</string>
+    <string name="category_providers">Provider</string>
     <string name="category_ui">Interfaccia utente</string>
 
     <string name="automatic">Auto</string>
@@ -437,11 +452,11 @@
     <string name="error">Errore</string>
     <!--<string name="subtitles_remove_captions">Remove closed captions from subtitles</string>-->
     <!--<string name="subtitles_remove_bloat">Remove bloat from subtitles</string>-->
-    <!--<string name="extras">Extra</string>-->
+    <string name="subtitles_filter_lang">Filtra in base alla lingua preferita</string>
+    <string name="extras">Extra</string>
     <string name="trailer">Trailer</string>
     <string name="network_adress_example">Link allo stream</string>
-    
-    
+
     <string name="referer">Referer</string>
     <string name="next">Prossimo</string>
     <string name="provider_languages_tip">Guarda video in queste lingue</string>
@@ -471,6 +486,7 @@
     <string name="plugins_downloaded" formatted="true">Scaricato: %d</string>
     <string name="plugins_disabled" formatted="true">Disabilitato: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Non scaricato: %d</string>
+    <string name="plugins_updated" formatted="true">Aggiornati %d plugin</string>
     <string name="blank_repo_message">Aggiungi una repository per installare l\'estensione dei siti</string>
     <string name="view_public_repositories_button">Vedi le repository della community</string>
     <string name="view_public_repositories_button_short">Lista pubblica</string>
@@ -484,10 +500,41 @@
     <string name="apply_on_restart">Applica al riavvio</string>
 
     <string name="safe_mode_title">Safe Mode abilitata</string>
-    <string name="safe_mode_description">Si è verificato un crash irrecuperabile e abbiamo disabilitato automaticamente tutte le estensioni, in modo che possiate trovare e rimuovere l\'estensione che causa il problema.</string>
+    <string name="safe_mode_description">Si è verificato un crash irrecuperabile. Tutte le estensioni sono state disabilitate, in modo da trovare e rimuovere l\'estensione che causa il problema.</string>
     <string name="safe_mode_crash_info">Vedi informazioni del crash</string>
+
+    <string name="extension_rating" formatted="true">Voto: %s</string>
+    <string name="extension_description">Descrizione</string>
+    <string name="extension_version">Versione</string>
+    <string name="extension_status">Stato</string>
+    <string name="extension_size">Dimensione</string>
+    <string name="extension_authors">Autori</string>
+    <string name="extension_types">Supportati</string>
+    <string name="extension_language">Lingua</string>
+    <string name="extension_install_first">Prima installa l\'estensione</string>
+
     <string name="hls_playlist">HLS Playlist</string>
 
-    <!--<string name="refer
-    er">Referer</string>-->
+    <string name="player_pref">Video player preferito</string>
+    <string name="player_settings_play_in_app">Player interno</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="player_settings_play_in_browser">Browser</string>
+    <string name="app_not_found_error">App non trovata</string>
+    <string name="all_languages_preference">Tutte le lingue</string>
+
+    <string name="skip_type_format" formatted="true">Salta %s</string>
+    <!--<string name="skip_type_op">Opening</string>-->
+    <!--<string name="skip_type_ed">Ending</string>-->
+    <string name="skip_type_recap">Riassunto</string>
+    <!--<string name="skip_type_mixed_ed">Mixed ending</string>-->
+    <!--<string name="skip_type_mixed_op">Mixed opening</string>-->
+    <string name="skip_type_creddits">Crediti</string>
+    <!--<string name="skip_type_intro">Intro</string>-->
+
+    <string name="clear_history">Cancella cronologia</string>
+    <string name="history">Cronologia</string>
+    <string name="enable_skip_op_from_database_des">Mostra popup per salta sigla iniziale/finale</string>
+    <string name="clipboard_too_large">Testo troppo lungo. Impossibile salvare negli appunti.</string>
 </resources>

From 639de891c6009e5b04650907cd0fccc268fbda8f Mon Sep 17 00:00:00 2001
From: SANCTI-afk <63229113+SANCTI-afk@users.noreply.github.com>
Date: Fri, 11 Nov 2022 17:22:13 +0200
Subject: [PATCH 070/273] Arabic language minor update (#204)

---
 app/src/main/res/values-ar/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index edac2760..bda3cf2a 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -20,7 +20,7 @@
 
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">تشغيل بواسطة CloudStream</string>
-    <string name="title_home">الصفحة الرئيسية</string>
+    <string name="title_home">الرئيسية</string>
     <string name="title_search">البحث</string>
     <string name="title_downloads">التنزيلات</string>
     <string name="title_settings">الإعدادات</string>
@@ -31,8 +31,8 @@
     <string name="no_data">لايوجد بيانات</string>
     <string name="episode_more_options_des">المزيد من الخيارات</string>
     <string name="next_episode">الحلقة التالية</string>
-    <string name="result_tags">أنواع</string>
-    <string name="result_share">شارك</string>
+    <string name="result_tags">النوع</string>
+    <string name="result_share">مشاركة</string>
     <string name="result_open_in_browser">فتح في الويب</string>
     <string name="skip_loading">تخطي التحميل</string>
     <string name="loading">…تحميل</string>
@@ -230,7 +230,7 @@
     <string name="rating">تقييم</string>
     <string name="duration">المدة الزمنية</string>
     <string name="site">موقع</string>
-    <string name="synopsis">ملخص</string>
+    <string name="synopsis">القصة</string>
 
     <string name="queued">في قائمة الانتظار</string>
     <string name="no_subtitles">الترجمة ليست موجودة</string>

From 81adb10c1f4111c51819b1f3d0f716d1f84d72b1 Mon Sep 17 00:00:00 2001
From: TubaApollo <86665265+TubaApollo@users.noreply.github.com>
Date: Fri, 11 Nov 2022 16:22:26 +0100
Subject: [PATCH 071/273] german translation update (#210)

---
 app/src/main/res/values-de/strings-de.xml | 53 +++++++++++++++++++----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/values-de/strings-de.xml b/app/src/main/res/values-de/strings-de.xml
index e1d657c7..065990c5 100644
--- a/app/src/main/res/values-de/strings-de.xml
+++ b/app/src/main/res/values-de/strings-de.xml
@@ -19,11 +19,11 @@
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Mit CloudStream abspielen</string>
     <string name="title_home">Startseite</string>
-    <string name="title_search">Suche</string>
+    <string name="title_search">Suchen</string>
     <string name="title_downloads">Downloads</string>
     <string name="title_settings">Einstellungen</string>
 
-    <string name="search_hint">Suche…</string>
+    <string name="search_hint">Suchen…</string>
     <string name="search_hint_site" formatted="true">Suche %s…</string>
 
     <string name="no_data">Keine Daten vorhanden</string>
@@ -32,15 +32,15 @@
     <string name="result_tags">Genres</string>
     <string name="result_share">Teilen</string>
     <string name="result_open_in_browser">In Browser öffnen</string>
-    <string name="skip_loading">Buffern überspringen</string>
+    <string name="skip_loading">Puffern überspringen</string>
     <string name="loading">Lädt…</string>
 
     <string name="type_watching">Am schauen</string>
     <string name="type_on_hold">Pausiert</string>
     <string name="type_completed">Abgeschlossen</string>
     <string name="type_dropped">Abgebrochen</string>
-    <string name="type_plan_to_watch">Möchte schauen</string>
-    <string name="type_none">None</string>
+    <string name="type_plan_to_watch">Geplant</string>
+    <string name="type_none">Nichts</string>
     <string name="type_re_watching">Erneut anschauen</string>
 
     <string name="play_movie_button">Film abspielen</string>
@@ -90,7 +90,7 @@
     <string name="sort_clear">Löschen</string>
     <string name="sort_save">Speichern</string>
 
-    <string name="player_speed">Players Geschwindigkeit</string>
+    <string name="player_speed">Player Geschwindigkeit</string>
 
     <string name="subtitles_settings">Untertiteleinstellungen</string>
     <string name="subs_text_color">Textfarbe</string>
@@ -275,8 +275,8 @@
     <string name="source_error">Quellenfehler</string>
     <string name="remote_error">Remotefehler</string>
     <string name="render_error">Renderfehler</string>
-    <string name="unexpected_error">Unerwarteter Player-Fehler</string>
-    <string name="storage_error">Download-Fehler, Speicherberechtigungen prüfen</string>
+    <string name="unexpected_error">Unerwarteter Playerfehler</string>
+    <string name="storage_error">Downloadfehler, Speicherberechtigungen prüfen</string>
 
     <string name="episode_action_chromecast_episode">Chromecast-Episode</string>
     <string name="episode_action_chromecast_mirror">Chromecastmirror</string>
@@ -453,7 +453,7 @@
     <string name="trailer">Trailer</string>
     <string name="network_adress_example">Link zum Stream</string>
     <string name="referer">Referent</string>
-    <string name="next">Nächste</string>
+    <string name="next">Weiter</string>
     <string name="provider_languages_tip">Videos in diesen Sprachen ansehen</string>
     <string name="previous">Vorherige</string>
     <string name="skip_setup">Einrichtung überspringen</string>
@@ -497,4 +497,39 @@
     <string name="tracks">Spuren</string>
     <string name="enable_nsfw_on_providers">Aktivieren der NSFW auf unterstützten Anbietern</string>
     <string name="category_providers">Anbieter</string>
+	
+    <string name="extension_rating" formatted="true">Bewertung: %s</string>
+    <string name="extension_description">Beschreibung</string>
+    <string name="extension_version">Version</string>
+    <string name="extension_status">Status</string>
+    <string name="extension_size">Größe</string>
+    <string name="extension_authors">Autoren</string>
+    <string name="extension_types">Unterstützt</string>
+    <string name="extension_language">Sprache</string>
+    <string name="extension_install_first">Zuerst muss die Erweiterung installiert werden</string>
+
+    <string name="hls_playlist">HLS Playlist</string>
+
+    <string name="player_pref">Bevorzugter Videoplayer</string>
+    <string name="player_settings_play_in_app">Interner Player</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="player_settings_play_in_browser">Browser</string>
+    <string name="app_not_found_error">App nicht gefunden</string>
+    <string name="all_languages_preference">Alle Sprachen</string>
+
+    <string name="skip_type_format" formatted="true">Überspringen %s</string>
+    <string name="skip_type_op">Opening</string>
+    <string name="skip_type_ed">Ending</string>
+    <string name="skip_type_recap">Zusammenfassung</string>
+    <string name="skip_type_mixed_ed">Vermischte Endings</string>
+    <string name="skip_type_mixed_op">Vermischte Openings</string>
+    <string name="skip_type_creddits">Abspann</string>
+    <string name="skip_type_intro">Intro</string>
+
+    <string name="clear_history">Verlauf löschen</string>
+    <string name="history">Verlauf</string>
+    <string name="enable_skip_op_from_database_des">Überspringen Button für Openings/Endings anzeigen</string>
+    <string name="clipboard_too_large">Zu viel Text. Kann nicht in der Zwischenablage gespeichert werden.</string>
 </resources>

From 456cd2e6e2e3cd15a74b5fcb37188365df3125bf Mon Sep 17 00:00:00 2001
From: Kylianalex <66625058+Kylianalex@users.noreply.github.com>
Date: Fri, 11 Nov 2022 16:22:35 +0100
Subject: [PATCH 072/273] Updated French translation (#207)

Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
---
 app/src/main/res/values-fr/strings.xml | 68 +++++++++++++-------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c98173ce..e3673393 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -10,18 +10,18 @@
     <string name="no_data">Aucune Donnée</string>
     <string name="episode_more_options_des">Plus d\'options</string>
     <string name="go_back_img_des">Retour</string>
-    <string name="next_episode">Episode suivant</string>
+    <string name="next_episode">Épisode suivant</string>
     <string name="result_poster_img_des">Miniature</string>
     <string name="result_tags">Genres</string>
     <string name="result_share">Partager</string>
-    <string name="result_open_in_browser">Ouvrir dans le naviguateur</string>
+    <string name="result_open_in_browser">Ouvrir dans le navigateur</string>
     <string name="skip_loading">Passer le chargement</string>
     <string name="loading">Chargement…</string>
     <string name="type_watching">En visionnage</string>
-    <string name="type_on_hold">En pose</string>
+    <string name="type_on_hold">En pause</string>
     <string name="type_completed">Terminé</string>
     <string name="type_dropped">Abandonné</string>
-    <string name="type_plan_to_watch">A regarder</string>
+    <string name="type_plan_to_watch">À regarder</string>
     <string name="type_none">Aucun</string>
     <string name="play_movie_button">Lire</string>
     <string name="play_torrent_button">Streamer le Torrent</string>
@@ -29,15 +29,15 @@
     <string name="pick_subtitle">Sous-titres</string>
     <string name="reload_error">Réessayer la connection…</string>
     <string name="go_back">Retour</string>
-    <string name="episode_poster_img_des">Miniature de l\'Episode</string>
-    <string name="play_episode">Lire l\'Episode</string>
+    <string name="episode_poster_img_des">Miniature de l\'Épisode</string>
+    <string name="play_episode">Lire l\'Épisode</string>
     <!--<string name="need_storage">Permet de télécharger les épisodes</string>-->
     <string name="download">Télécharger</string>
     <string name="downloaded">Téléchargé</string>
     <string name="downloading">Téléchargement</string>
     <string name="download_paused">Téléchargement en pause</string>
     <string name="download_started">Téléchargement commencé</string>
-    <string name="download_failed">Echec du Téléchargement</string>
+    <string name="download_failed">Échec du Téléchargement</string>
     <string name="download_canceled">Téléchargement Annulé</string>
     <string name="download_done">Téléchargement Terminé</string>
     <string name="error_loading_links_toast">Erreur lors du téléchargement des liens</string>
@@ -68,34 +68,34 @@
     <string name="subs_background_color">Couleur de fond</string>
     <string name="subs_window_color">Couleur de la fenètre</string>
     <string name="subs_edge_type">Type de bordure</string>
-    <string name="subs_subtitle_elevation">Elevation des sous-titres</string>
+    <string name="subs_subtitle_elevation">Élévation des sous-titres</string>
     <string name="preview_background_img_des">Aperçu de l\'arrière-plan</string>
     <string name="subs_font">Police</string>
     <string name="search_provider_text_providers">Rechercher en utilisant les fournisseurs</string>
     <string name="search_provider_text_types">Rechercher en utilisant les types</string>
     <string name="benene_count_text">%d Benenes données au dev</string>
     <string name="benene_count_text_none">Aucune Benenes donnée</string>
-    <string name="subs_auto_select_language">Séléction automatique de la langue</string>
+    <string name="subs_auto_select_language">Sélection automatique de la langue</string>
     <string name="subs_download_languages">Télécharger les langues</string>
-    <string name="subs_hold_to_reset_to_default">Maintenir pour réinitialliser les valeurs par défault</string>
-    <string name="continue_watching">Continer à regarder</string>
+    <string name="subs_hold_to_reset_to_default">Maintenir pour réinitialiser les valeurs par défaut</string>
+    <string name="continue_watching">Continuer à regarder</string>
     <string name="action_remove_watching">Supprimer</string>
     <string name="action_open_watching">Plus d\'info</string>
     <string name="vpn_might_be_needed">Un VPN peut être requit pour que ce fournisseur fonctionne</string>
-    <string name="vpn_torrent">Ce fournisseur est un torrent, un VPN est recommendé</string>
+    <string name="vpn_torrent">Ce fournisseur est un torrent, un VPN est recommandé</string>
     <string name="torrent_plot">Description</string>
     <string name="normal_no_plot">Aucune description trouvée</string>
     <string name="torrent_no_plot">Aucune description trouvée</string>
     <string name="picture_in_picture">Lecteur en mode Picture-in-Picture</string>
     <string name="picture_in_picture_des">Continuer la lecture dans une fenêtre miniature en superposition sur d\'autres applis</string>
-    <string name="player_size_settings">Boutton de redimentionnement du lecteur</string>
+    <string name="player_size_settings">Bouton de redimensionnement du lecteur</string>
     <string name="player_size_settings_des">Supprimer les bordures noires</string>
     <string name="player_subtitles_settings">Sous-titres</string>
     <string name="player_subtitles_settings_des">Paramètres des sous-titres du lecteur</string>
     <string name="eigengraumode_settings">Vitesse de lecture</string>
     <string name="eigengraumode_settings_des">Ajouter l\'option de vitesse sur le lecteur</string>
     <string name="swipe_to_seek_settings">Balayer pour avancer rapidement</string>
-    <string name="swipe_to_seek_settings_des">Balayer vers la gauche ou la droite pour controler le temps du lecteur vidéo</string>
+    <string name="swipe_to_seek_settings_des">Balayer vers la gauche ou la droite pour contrôler le temps du lecteur vidéo</string>
     <string name="swipe_to_change_settings">Balayer pour changer les paramètres</string>
     <string name="swipe_to_change_settings_des">Balayer sur le coté droit ou gauche pour changer le niveau de luminosité ou de volume</string>
     <string name="double_tap_to_seek_settings">Taper deux fois pour rechercher</string>
@@ -106,13 +106,13 @@
     <string name="search">Rechercher</string>
     <string name="settings_info">Informations</string>
     <string name="advanced_search">Recherche Avancée</string>
-    <string name="advanced_search_des">Donne les résultats séparé par les fournisseur</string>
+    <string name="advanced_search_des">Donne les résultats séparés par les fournisseurs</string>
     <string name="bug_report_settings_off">N\'envoyer les données que lors d\'un crash</string>
     <string name="bug_report_settings_on">N\'envoyer aucune données</string>
     <string name="updates_settings">Afficher les mises-à-jour de l\'application</string>
     <string name="updates_settings_des">Chercher des mises-à-jour automatiquement au démarage</string>
-    <string name="uprereleases_settings">Mettre à jour vers une version béta</string>
-    <string name="uprereleases_settings_des">Rechercher pour une mise à jour vers une version béta au lieu des version complètes seulement</string>
+    <string name="uprereleases_settings">Mettre à jour vers une version bêta</string>
+    <string name="uprereleases_settings_des">Rechercher pour une mise à jour vers une version bêta au lieu des version complètes seulement</string>
     <string name="github">Github</string>
     <string name="lightnovel">L\'application Light Novel par les mêmes devs</string>
     <string name="anim">Application d\'animés par les mêmes devs</string>
@@ -122,24 +122,24 @@
     <string name="app_language">Language de l\'application</string>
     <string name="no_chromecast_support_toast">Ce fournisseur ne supporte pas le Chromecast</string>
     <string name="no_links_found_toast">Aucun lien trouvé</string>
-    <string name="copy_link_toast">Lien copié dans le presse-papiers</string>
+    <string name="copy_link_toast">Lien copié dans le presse-papier</string>
     <string name="play_episode_toast">Lecture de l\'episode</string>
     <string name="subs_default_reset_toast">Réinitialiser aux valeurs par défault</string>
-    <string name="acra_report_toast">Désolé, l\'application à crashé. Un rapport de bug anonyme va être envoyé aux devloppeurs</string>
+    <string name="acra_report_toast">Désolé, l\'application à crashé. Un rapport de bug anonyme va être envoyé aux développeurs</string>
     <string name="season">Saison</string>
     <string name="no_season">Pas de Saison</string>
-    <string name="episode">Episode</string>
-    <string name="episodes">Episodes</string>
+    <string name="episode">Épisode</string>
+    <string name="episodes">Épisodes</string>
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="delete_file">Supprimer le Fichier</string>
     <string name="delete">Supprimer</string>
     <string name="pause">Pause</string>
     <string name="resume">Reprendre</string>
-    <string name="delete_message">Cela va supprimer définitivement %s\nÊtes vous sûr ?</string>
+    <string name="delete_message">Cela va supprimer définitivement %s\nÊtes-vous sûr ?</string>
     <string name="status_ongoing">En cours</string>
     <string name="status_completed">Terminé</string>
-    <string name="status">Status</string>
+    <string name="status">Statut</string>
     <string name="year">Année</string>
     <string name="rating">Note</string>
     <string name="duration">Durée</string>
@@ -159,9 +159,9 @@
     <string name="source_error">Erreur de la source</string>
     <string name="remote_error">Erreur distante</string>
     <string name="render_error">Erreur d\'affichage</string>
-    <string name="unexpected_error">Erreur innatendue du lecteur</string>
+    <string name="unexpected_error">Erreur inattendue du lecteur</string>
     <string name="storage_error">Erreur du téléchargement, vérifier l\'autorisation du stockage</string>
-    <string name="episode_action_chromecast_episode">Episode Chromecast</string>
+    <string name="episode_action_chromecast_episode">Épisode Chromecast</string>
     <string name="episode_action_chromecast_mirror">Miroir Chromecast</string>
     <string name="episode_action_play_in_app">Lecture dans l\'application</string>
     <string name="episode_action_play_in_format">Lecture dans %s</string>
@@ -207,18 +207,18 @@
     <string name="app_layout">Disposition de l\'application</string>
     <string name="tv_layout">Disposition TV</string>
     <string name="provider_lang_settings">Language des fournisseurs</string>
-    <string name="preferred_media_settings">Médias préfères</string>
+    <string name="preferred_media_settings">Médias préférées</string>
     <string name="automatic">Auto</string>
     <string name="cast_format">Acteurs: %s</string>
     <string name="duration_format">%d min</string>
     <string name="search_hint_site">Rechercher sur %s...</string>
-    <string name="type_re_watching">A re-regarder</string>
+    <string name="type_re_watching">À re-regarder</string>
     <string name="sort_copy">Copier</string>
     <string name="sort_close">Coller</string>
     <string name="sort_clear">Effacer</string>
     <string name="sort_save">Enregister</string>
     <string name="subs_import_text">Importer des polices en les plaçants dans %s</string>
-    <string name="provider_info_meta">Les metadonnées ne sont pas fournies par le site, le chargement de la vidéo va échoué si elle n\'existe pas sur le site.</string>
+    <string name="provider_info_meta">Les metadonnées ne sont pas fournies par le site, le chargement de la vidéo va échouer si elle n\'existe pas sur le site.</string>
     <string name="show_log_cat">Afficher les logs 🐈</string>
     <string name="chromecast_subtitles_settings">Sous-titres Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Paramètres des sous-titres Chromecast</string>
@@ -228,7 +228,7 @@
     <string name="restore_settings">Restaurer les données sauvegardées</string>
     <string name="backup_settings">Sauvegarder les données</string>
     <string name="restore_success">Fichier de sauvegarde chargé</string>
-    <string name="restore_failed_format">Echec de la restauration des données depuis le fichier</string>
+    <string name="restore_failed_format">Échec de la restauration des données depuis le fichier</string>
     <string name="backup_success">Restauration des données réussie</string>
     <string name="backup_failed">Permission d\'accès au stockage manquante</string>
     <string name="backup_failed_error_format">Erreur pendant la sauvegarde %s</string>
@@ -250,7 +250,7 @@
     <string name="video_ram_description">Causera des crashs aléatoire si mit trop haut. Ne le changez pas si vous avez un appareil avec peu de ram comme une télévision android ou un vieux téléphone.</string>
     <string name="video_disk_description">Causera des problèmes si mit trop haut et si vous avez un appareil avec peu de stockage comme une télévision android ou un vieux téléphone.</string>
     <string name="random_button_settings">Bouton aléatoire</string>
-    <string name="random_button_settings_desc">Afficher le boutton aléatoire</string>
+    <string name="random_button_settings_desc">Afficher le bouton aléatoire</string>
     <string name="emulator_layout">Disposition émulateur</string>
     <string name="bottom_title_settings">Position du titre du poster</string>
     <string name="bottom_title_settings_des">Mettre le titre sous le poster</string>
@@ -272,15 +272,15 @@
     <string name="subtitles_outline">Contour</string>
     <string name="subtitles_depressed">Déprimé</string>
     <string name="subtitles_shadow">Ombre</string>
-    <string name="subtitles_raised">Elevation</string>
+    <string name="subtitles_raised">Élévation</string>
     <string name="subtitle_offset">Synchroniser les sous-titres</string>
     <string name="subtitle_offset_hint">1000ms</string>
     <string name="subtitle_offset_title">Délai des sous-titres</string>
     <string name="subtitle_offset_extra_hint_later_format">Utilisez si les sous-titres sont affichés %dms trop tôt</string>
     <string name="subtitle_offset_extra_hint_before_format">Utilisez si les sous-titres sont affichés %dms trop tard</string>
     <string name="subtitle_offset_extra_hint_none_format">Aucun délai de sous-titre</string>
-    <string name="subtitles_example_text">Le rapide rendard brun saute au-dessus du chien paresseux</string>
-    <string name="recommended">Recommendé</string>
+    <string name="subtitles_example_text">Portez ce vieux whisky au juge blond qui fume</string>
+    <string name="recommended">Recommandé</string>
     <string name="player_loaded_subtitles">%s chargé</string>
     <string name="player_load_subtitles">Charger depuis le fichier</string>
     <string name="downloaded_file">Fichier téléchargé</string>
@@ -289,7 +289,7 @@
     <string name="actor_background">Arrière plan</string>
     <string name="home_source">Source</string>
     <string name="home_random">Aléatoire</string>
-    <string name="coming_soon">A venir ...</string>
+    <string name="coming_soon">À venir ...</string>
     <string name="poster_image">Image de l\'affiche</string>
     <string name="authenticated_user">Connecté %s</string>
     <string name="action_add_to_bookmarks">Définir le statut de visionage</string>

From cf22ada266191a3421dc8a213cdcd6f9fd3833b8 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sat, 12 Nov 2022 20:07:08 +0100
Subject: [PATCH 073/273] Fix VoeExtractor

---
 .../cloudstream3/extractors/VoeExtractor.kt   | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/VoeExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/VoeExtractor.kt
index d2f3f832..ad3f0150 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/VoeExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/VoeExtractor.kt
@@ -13,39 +13,42 @@ open class VoeExtractor : ExtractorApi() {
     override val requiresReferer = false
 
     private data class ResponseLinks(
-        @JsonProperty("hls") val url: String?,
+        @JsonProperty("hls") val hls: String?,
+        @JsonProperty("mp4") val mp4: String?,
         @JsonProperty("video_height") val label: Int?
         //val type: String // Mp4
     )
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
-        val doc = app.get(url).text
-        if (doc.isNotBlank()) {
-            val start = "const sources ="
-            var src = doc.substring(doc.indexOf(start))
-            src = src.substring(start.length, src.indexOf(";"))
+        val html = app.get(url).text
+        if (html.isNotBlank()) {
+            val src = html.substringAfter("const sources =").substringBefore(";")
+                // Remove last comma, it is not proper json otherwise
                 .replace("0,", "0")
-                .trim()
+                // Make json use the proper quotes
+                .replace("'", "\"")
+
             //Log.i(this.name, "Result => (src) ${src}")
-            parseJson<ResponseLinks?>(src)?.let { voelink ->
-                //Log.i(this.name, "Result => (voelink) ${voelink}")
-                val linkUrl = voelink.url
-                val linkLabel = voelink.label?.toString() ?: ""
+            parseJson<ResponseLinks?>(src)?.let { voeLink ->
+                //Log.i(this.name, "Result => (voeLink) ${voeLink}")
+
+                // Always defaults to the hls link, but returns the mp4 if null
+                val linkUrl = voeLink.hls ?: voeLink.mp4
+                val linkLabel = voeLink.label?.toString() ?: ""
                 if (!linkUrl.isNullOrEmpty()) {
-                    extractedLinksList.add(
+                    return listOf(
                         ExtractorLink(
                             name = this.name,
                             source = this.name,
                             url = linkUrl,
                             quality = getQualityFromName(linkLabel),
                             referer = url,
-                            isM3u8 = true
+                            isM3u8 = voeLink.hls != null
                         )
                     )
                 }
             }
         }
-        return extractedLinksList
+        return emptyList()
     }
 }
\ No newline at end of file

From 9a93b375f37bdec866b21965438712e312ef30f8 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sat, 12 Nov 2022 22:29:22 +0100
Subject: [PATCH 074/273] Fixed: Lock when switching episodes Lock on RTL
 layouts Skipping to the next season

---
 .../cloudstream3/ui/player/FullScreenPlayer.kt       |  2 +-
 .../cloudstream3/ui/result/ResultViewModel2.kt       | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 0f9a6548..509c2187 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -612,6 +612,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         //player_media_route_button?.isClickable = !isGone
         player_go_back_holder?.isGone = isGone
         player_sources_btt?.isGone = isGone
+        player_skip_episode?.isGone = isGone
     }
 
     private fun updateLockUI() {
@@ -1101,7 +1102,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     }
 
     protected fun uiReset() {
-        isLocked = false
         isShowing = false
 
         // if nothing has loaded these buttons should not be visible
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 0c26f69c..da900b0a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -1582,7 +1582,6 @@ class ResultViewModel2 : ViewModel() {
             return
         }
 
-        val episodes = currentEpisodes[indexer]
         val ranges = currentRanges[indexer]
 
         if (ranges?.contains(range) != true) {
@@ -1594,7 +1593,6 @@ class ResultViewModel2 : ViewModel() {
             }
         }
 
-        val size = episodes?.size
         val isMovie = currentResponse?.isMovie() == true
         currentIndex = indexer
         currentRange = range
@@ -1604,6 +1602,7 @@ class ResultViewModel2 : ViewModel() {
             text to r
         } ?: emptyList())
 
+        val size = currentEpisodes[indexer]?.size
         _episodesCountText.postValue(
             some(
                 if (isMovie) null else
@@ -1683,9 +1682,12 @@ class ResultViewModel2 : ViewModel() {
         generator = if (isMovie) {
             getMovie()?.let { RepoLinkGenerator(listOf(it), page = currentResponse) }
         } else {
-            episodes?.let { list ->
-                RepoLinkGenerator(list, page = currentResponse)
-            }
+            val episodes = currentEpisodes.filter { it.key.dubStatus == indexer.dubStatus }
+                .toList()
+                .sortedBy { it.first.season }
+                .flatMap { it.second }
+
+            RepoLinkGenerator(episodes, page = currentResponse)
         }
 
         if (isMovie) {

From 2b29e8078fe540a91ccaf6b9f91b9263a80acb6f Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sun, 13 Nov 2022 01:40:49 +0100
Subject: [PATCH 075/273] Added intent to start searching

---
 app/src/main/AndroidManifest.xml              | 11 +++++
 .../lagradost/cloudstream3/MainActivity.kt    | 42 +++++++++++++++----
 .../syncproviders/AccountManager.kt           |  3 ++
 .../cloudstream3/ui/search/SearchFragment.kt  | 19 ++++++++-
 .../main/res/navigation/mobile_navigation.xml |  7 +++-
 5 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 47676059..ae8479fe 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -110,6 +110,17 @@
 
                 <data android:scheme="cloudstreamrepo" />
             </intent-filter>
+
+            <!-- Allow searching with intents: cloudstreamsearch://Your%20Name -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="cloudstreamsearch" />
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index ff74d6cc..b999199f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -16,11 +16,9 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
-import androidx.navigation.NavController
-import androidx.navigation.NavDestination
+import androidx.navigation.*
 import androidx.navigation.NavDestination.Companion.hierarchy
 import androidx.navigation.NavGraph.Companion.findStartDestination
-import androidx.navigation.NavOptions
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.setupWithNavController
 import androidx.preference.PreferenceManager
@@ -44,6 +42,7 @@ import com.lagradost.cloudstream3.CommonActivity.onUserLeaveHint
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.CommonActivity.updateLocale
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.network.initClient
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.PluginManager.loadSinglePlugin
@@ -52,9 +51,11 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.OAuth2A
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.accountManagers
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appString
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringRepo
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringSearch
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.inAppAuths
 import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_NAVIGATE_TO
+import com.lagradost.cloudstream3.ui.search.SearchFragment
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isEmulatorSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
@@ -88,11 +89,9 @@ import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.fragment_result_swipe.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import okhttp3.ConnectionSpec
-import okhttp3.OkHttpClient
-import okhttp3.internal.applyConnectionSpec
 import java.io.File
 import java.net.URI
+import java.net.URLDecoder
 import java.nio.charset.Charset
 import kotlin.reflect.KClass
 
@@ -147,7 +146,7 @@ val VLC = ResultResume(
 val MPV = ResultResume(
     MPV_PACKAGE,
     //"is.xyz.mpv.MPVActivity.result", // resume not working :pensive:
-     position = "position",
+    position = "position",
     duration = "duration",
 )
 
@@ -188,6 +187,15 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
     companion object {
         const val TAG = "MAINACT"
 
+        /**
+         * Setting this will automatically enter the query in the search
+         * next time the search fragment is opened.
+         * This variable will clear itself after one use. Null does nothing.
+         *
+         * This is a very bad solution but I was unable to find a better one.
+         **/
+        private var nextSearchQuery: String? = null
+
         /**
          * Fires every time a new batch of plugins have been loaded, no guarantee about how often this is run and on which thread
          * */
@@ -206,6 +214,9 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             isWebview: Boolean
         ): Boolean =
             with(activity) {
+                // Invalid URIs can crash
+                fun safeURI(uri: String) = normalSafeApiCall { URI(uri) }
+
                 if (str != null && this != null) {
                     if (str.startsWith("https://cs.repo")) {
                         val realUrl = "https://" + str.substringAfter("?")
@@ -241,10 +252,14 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                                 return true
                             }
                         }
-                    } else if (URI(str).scheme == appStringRepo) {
+                    } else if (safeURI(str)?.scheme == appStringRepo) {
                         val url = str.replaceFirst(appStringRepo, "https")
                         loadRepository(url)
                         return true
+                    } else if (safeURI(str)?.scheme == appStringSearch) {
+                        nextSearchQuery =
+                            URLDecoder.decode(str.substringAfter("$appStringSearch://"), "UTF-8")
+                        nav_view.selectedItemId = R.id.navigation_search
                     } else if (!isWebview) {
                         if (str.startsWith(DOWNLOAD_NAVIGATE_TO)) {
                             this.navigate(R.id.navigation_downloads)
@@ -619,6 +634,17 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         val navHostFragment =
             supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
         val navController = navHostFragment.navController
+
+        navController.addOnDestinationChangedListener { _: NavController, navDestination: NavDestination, bundle: Bundle? ->
+            // Intercept search and add a query
+            if (navDestination.matchDestination(R.id.navigation_search) && !nextSearchQuery.isNullOrBlank()) {
+                bundle?.apply {
+                    this.putString(SearchFragment.SEARCH_QUERY, nextSearchQuery)
+                    nextSearchQuery = null
+                }
+            }
+        }
+
         //val navController = findNavController(R.id.nav_host_fragment)
 
         /*navOptions = NavOptions.Builder()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
index 825ff673..388e1774 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
@@ -43,6 +43,9 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI {
         const val appString = "cloudstreamapp"
         const val appStringRepo = "cloudstreamrepo"
 
+        // Instantly start the search given a query
+        const val appStringSearch = "cloudstreamsearch"
+
         val unixTime: Long
             get() = System.currentTimeMillis() / 1000L
         val unixTimeMs: Long
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 4da88af7..4e59e6a0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -73,6 +73,14 @@ class SearchFragment : Fragment() {
                 }
             }
         }
+
+        const val SEARCH_QUERY = "search_query"
+
+        fun newInstance(query: String): Bundle {
+            return Bundle().apply {
+                putString(SEARCH_QUERY, query)
+            }
+        }
     }
 
     private val searchViewModel: SearchViewModel by activityViewModels()
@@ -132,7 +140,8 @@ class SearchFragment : Fragment() {
             val default = enumValues<TvType>().sorted().filter { it != TvType.NSFW }
                 .map { it.ordinal.toString() }.toSet()
             val preferredTypes = (PreferenceManager.getDefaultSharedPreferences(ctx)
-                .getStringSet(this.getString(R.string.prefer_media_type_key), default)?.ifEmpty { default } ?: default)
+                .getStringSet(this.getString(R.string.prefer_media_type_key), default)
+                ?.ifEmpty { default } ?: default)
                 .mapNotNull { it.toIntOrNull() ?: return@mapNotNull null }
 
             val settings = ctx.getApiSettings()
@@ -487,6 +496,14 @@ class SearchFragment : Fragment() {
         search_master_recycler?.adapter = masterAdapter
         search_master_recycler?.layoutManager = GridLayoutManager(context, 1)
 
+        // Automatically search the specified query, this allows the app search to launch from intent
+        arguments?.getString(SEARCH_QUERY)?.let { query ->
+            if (query.isBlank()) return@let
+            main_search?.setQuery(query, true)
+            // Clear the query as to not make it request the same query every time the page is opened
+            arguments?.putString(SEARCH_QUERY, null)
+        }
+
         // SubtitlesFragment.push(activity)
         //searchViewModel.search("iron man")
         //(activity as AppCompatActivity).loadResult("https://shiro.is/overlord-dubbed", "overlord-dubbed", "Shiro")
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 6ae2fa04..14d750a0 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -274,7 +274,12 @@
         app:exitAnim="@anim/exit_anim"
         app:popEnterAnim="@anim/enter_anim"
         app:popExitAnim="@anim/exit_anim"
-        tools:layout="@layout/fragment_search" />
+        tools:layout="@layout/fragment_search">
+        <argument
+            android:name="search_query"
+            android:defaultValue=""
+            app:argType="string" />
+    </fragment>
 
     <fragment
         android:id="@+id/navigation_downloads"

From 924d797e07afc5ff53428a8499a54ec19a7380a7 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Tue, 15 Nov 2022 16:32:31 +0100
Subject: [PATCH 076/273] Fix next episode button showing up erroneously

---
 .../com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 509c2187..c79cdd76 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -612,7 +612,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         //player_media_route_button?.isClickable = !isGone
         player_go_back_holder?.isGone = isGone
         player_sources_btt?.isGone = isGone
-        player_skip_episode?.isGone = isGone
+        player_skip_episode?.isClickable = !isGone
     }
 
     private fun updateLockUI() {

From c9fe7c79dc7823bfa54adf29dc33c4cb7f50ed93 Mon Sep 17 00:00:00 2001
From: MXC48 <82712837+MXC48@users.noreply.github.com>
Date: Fri, 18 Nov 2022 15:11:47 +0100
Subject: [PATCH 077/273] update the strings.xml in french (#211)

* update the strings.xml in french

* fix build error

* Update and rename app/src/main/res/values-fr/strings.xml to application/src/principal/res/valeurs-fr/strings.xml

Removal of "sort_copy" "sort_close" "sort_clear" "sort_save" in duplicate

Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
---
 .../src/principal/res/valeurs-fr}/strings.xml | 115 +++++++++++++++++-
 1 file changed, 111 insertions(+), 4 deletions(-)
 rename {app/src/main/res/values-fr => application/src/principal/res/valeurs-fr}/strings.xml (73%)

diff --git a/app/src/main/res/values-fr/strings.xml b/application/src/principal/res/valeurs-fr/strings.xml
similarity index 73%
rename from app/src/main/res/values-fr/strings.xml
rename to application/src/principal/res/valeurs-fr/strings.xml
index e3673393..6398d7ab 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/application/src/principal/res/valeurs-fr/strings.xml
@@ -213,10 +213,6 @@
     <string name="duration_format">%d min</string>
     <string name="search_hint_site">Rechercher sur %s...</string>
     <string name="type_re_watching">À re-regarder</string>
-    <string name="sort_copy">Copier</string>
-    <string name="sort_close">Coller</string>
-    <string name="sort_clear">Effacer</string>
-    <string name="sort_save">Enregister</string>
     <string name="subs_import_text">Importer des polices en les plaçants dans %s</string>
     <string name="provider_info_meta">Les metadonnées ne sont pas fournies par le site, le chargement de la vidéo va échouer si elle n\'existe pas sur le site.</string>
     <string name="show_log_cat">Afficher les logs 🐈</string>
@@ -293,4 +289,115 @@
     <string name="poster_image">Image de l\'affiche</string>
     <string name="authenticated_user">Connecté %s</string>
     <string name="action_add_to_bookmarks">Définir le statut de visionage</string>
+    <string name="sort_cancel">Annuler</string>
+    <string name="sort_copy">Copier</string>
+    <string name="sort_close">Fermer</string>
+    <string name="sort_clear">Vider</string>
+    <string name="sort_save">Enregistrer</string>
+
+    <string name="player_speed">Vitesse du lecteur</string>
+
+    <string name="subtitles_settings">Paramètres des sous-titres</string>
+    <string name="subs_text_color">Couleur du texte</string>
+    <string name="subs_outline_color">Couleur des contours</string>
+    <string name="subs_background_color">Couleur d'arrière-plan</string>
+    <string name="subs_window_color">Couleur de la fenêtre</string>
+    <string name="subs_edge_type">Type de bordure</string>
+    <string name="subs_subtitle_elevation">Elevation des sous-titres</string>
+    <string name="subs_font">Police</string>
+    <string name="subs_font_size">Taille de la police</string>
+
+    <string name="search_provider_text_providers">Recherche par fournisseur</string>
+    <string name="search_provider_text_types">Recherche par types</string>
+
+    <string name="benene_count_text">%d Donner une banane aux devs</string>
+    <string name="benene_count_text_none">Aucun Bananes donné</string>
+
+    <string name="subs_auto_select_language">Sélection automatique de la langue</string>
+    <string name="subs_download_languages">Télécharger les langues</string>
+    <string name="subs_subtitle_languages">Langue des sous-titres</string>
+    <string name="subs_hold_to_reset_to_default">Maintenir pour rétablir les valeurs par défaut</string>
+    <string name="subs_import_text" formatted="true">Importez des polices en les plaçant dans %s</string>
+    <string name="continue_watching">Continuer à regarder</string>
+
+    <string name="action_remove_watching">Retirer</string>
+    <string name="action_open_watching">Plus d'informations</string>
+    <string name="action_open_play">@string/home_play </string>
+
+    <string name="vpn_might_be_needed">Un VPN peut être nécessaire pour que ce fournisseur fonctionne correctement</string>
+    <string name="vpn_torrent">Ce fournisseur est un torrent, un VPN est recommandé</string>
+
+    <string name="provider_info_meta">Les métadonnées ne sont pas fournies par le site, le chargement de la vidéo échouera si elles n'existent pas sur le site.</string>
+
+    <string name="torrent_plot">Description</string>
+    <string name="normal_no_plot">Aucune trace trouvée</string>
+    <string name="torrent_no_plot">Aucune description trouvée</string>
+
+    <string name="show_log_cat">Afficher le logcat 🐈</string>
+    
+    <string name="picture_in_picture">Picture-in-picture</string>
+    <string name="picture_in_picture_des">Poursuite de la lecture dans un lecteur miniature au-dessus d'autres applications</string>
+    <string name="player_size_settings">Bouton de redimensionnement du lecteur</string>
+    <string name="player_size_settings_des">Supprimer les bordures noires</string>
+    <string name="player_subtitles_settings">Sous-titres</string>
+    <string name="player_subtitles_settings_des">Paramètres des sous-titres du lecteur</string>
+    <string name="chromecast_subtitles_settings">Sous-titres Chromecast</string>
+    <string name="chromecast_subtitles_settings_des">Paramètres des sous-titres Chromecast</string>
+
+    <string name="eigengraumode_settings">Mode Eigengravy</string>
+    <string name="eigengraumode_settings_des">Ajout d'une option de vitesse dans le lecteur</string>
+    <string name="swipe_to_seek_settings">Balayez pour chercher</string>
+    <string name="swipe_to_seek_settings_des">Balayez vers la gauche ou la droite pour contrôler le temps dans le lecteur vidéo.</string>
+    <string name="swipe_to_change_settings">Balayez pour modifier les paramètres</string>
+    <string name="swipe_to_change_settings_des">Glissez sur le côté gauche ou droit pour modifier la luminosité ou le volume.</string>
+
+    <string name="autoplay_next_settings">Lecture automatique du prochain épisode</string>
+    <string name="autoplay_next_settings_des">Démarrer l'épisode suivant lorsque l'épisode en cours se termine</string>
+
+    <string name="double_tap_to_seek_settings">Double tape pour chercher</string>
+    <string name="double_tap_to_pause_settings">Double tape pour mettre en pause</string>
+    <string name="double_tap_to_seek_amount_settings">Player seek amount</string>
+    <string name="double_tap_to_seek_settings_des">Tapez deux fois sur le côté droit ou gauche pour aller en avant ou en arrière.
+    </string>
+    <string name="double_tap_to_pause_settings_des">Tapez au milieu pour mettre en pause</string>
+    <string name="use_system_brightness_settings">Utiliser la luminosité du système</string>
+    <string name="use_system_brightness_settings_des">Utiliser la luminosité du système dans le lecteur d'applications au lieu du
+        sombre
+    </string>
+
+    <string name="episode_sync_settings">Mise à jour de la progression de la veille</string>
+    <string name="episode_sync_settings_des">Synchronisation automatique de la progression de votre épisode en cours</string>
+
+    <string name="restore_settings">Restaurer des données à partir d'une sauvegarde</string>
+
+    <string name="backup_settings">Sauvegarde des données</string>
+    <string name="restore_success">Fichier de sauvegarde chargé</string>
+    <string name="restore_failed_format" formatted="true">Échec de la restauration des données du fichier %s</string>
+    <string name="backup_success">Données stockées avec succès</string>
+    <string name="backup_failed">Permissions de stockage manquantes, veuillez réessayer</string>
+    <string name="backup_failed_error_format">Erreur de sauvegarde %s</string>
+
+    <string name="search">Recherche</string>
+    <string name="category_account">Comptes</string>
+    <string name="category_updates">Mises à jour et sauvegarde</string>
+
+    <string name="settings_info">Info</string>
+    <string name="advanced_search">Recherche avancée</string>
+    <string name="advanced_search_des">Vous donne les résultats de la recherche séparés par fournisseur</string>
+    <string name="bug_report_settings_off">Envoi de données uniquement en cas d'accident</string>
+    <string name="bug_report_settings_on">N'envoie aucune donnée</string>
+    <string name="show_fillers_settings">Afficher les épisodes spéciaux pour les animés</string>
+    <string name="show_trailers_settings">Montrer les bandes-annonces</string>
+    <string name="kitsu_settings">Montrer les affiches de kitsu</string>
+    <string name="pref_filter_search_quality">Masquer la qualité vidéo sélectionnée dans les résultats de recherche</string>
+
+    <string name="automatic_plugin_updates">Mises à jour automatiques des plugins</string>
+    <string name="updates_settings">Afficher les mises à jour de l'application</string>
+    <string name="updates_settings_des">Recherche automatique de nouvelles mises à jour au démarrage</string>
+    <string name="uprereleases_settings">Mettre à jour vers une version bêta</string>
+    <string name="uprereleases_settings_des">Recherche pour une mise à jour vers une version bêta au lieu des version complètes seulement</string>
+    <string name="github">Github</string>
+    <string name="lightnovel">Application Light Novel par les mêmes devs</string>
+    <string name="anim">Anime app by the same devs</string>
+    <string name="discord">Rejoignez le Discord</string>
 </resources>

From dbd91d788c773a58d4a78f4d2d700584720b252d Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Fri, 18 Nov 2022 18:11:25 +0100
Subject: [PATCH 078/273] ??

---
 .../res/valeurs-fr => app/src/main/res/values-fr}/strings.xml     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {application/src/principal/res/valeurs-fr => app/src/main/res/values-fr}/strings.xml (100%)

diff --git a/application/src/principal/res/valeurs-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
similarity index 100%
rename from application/src/principal/res/valeurs-fr/strings.xml
rename to app/src/main/res/values-fr/strings.xml

From 263f74fb9cf6cca91e327b0e7e7e12fc9f27e9e8 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 18 Nov 2022 20:24:24 +0100
Subject: [PATCH 079/273] Removed a million duplicates in values-fr to make it
 compile

---
 app/src/main/res/values-fr/strings.xml | 101 ++++---------------------
 1 file changed, 13 insertions(+), 88 deletions(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6398d7ab..f3c6a4c3 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -62,61 +62,7 @@
     <string name="sort_apply">Appliquer</string>
     <string name="sort_cancel">Annuler</string>
     <string name="player_speed">Vitesse de lecture</string>
-    <string name="subtitles_settings">Paramètres de sous-titres</string>
-    <string name="subs_text_color">Couleur du texte</string>
-    <string name="subs_outline_color">Couleur de la bordure exterieur</string>
-    <string name="subs_background_color">Couleur de fond</string>
-    <string name="subs_window_color">Couleur de la fenètre</string>
-    <string name="subs_edge_type">Type de bordure</string>
-    <string name="subs_subtitle_elevation">Élévation des sous-titres</string>
     <string name="preview_background_img_des">Aperçu de l\'arrière-plan</string>
-    <string name="subs_font">Police</string>
-    <string name="search_provider_text_providers">Rechercher en utilisant les fournisseurs</string>
-    <string name="search_provider_text_types">Rechercher en utilisant les types</string>
-    <string name="benene_count_text">%d Benenes données au dev</string>
-    <string name="benene_count_text_none">Aucune Benenes donnée</string>
-    <string name="subs_auto_select_language">Sélection automatique de la langue</string>
-    <string name="subs_download_languages">Télécharger les langues</string>
-    <string name="subs_hold_to_reset_to_default">Maintenir pour réinitialiser les valeurs par défaut</string>
-    <string name="continue_watching">Continuer à regarder</string>
-    <string name="action_remove_watching">Supprimer</string>
-    <string name="action_open_watching">Plus d\'info</string>
-    <string name="vpn_might_be_needed">Un VPN peut être requit pour que ce fournisseur fonctionne</string>
-    <string name="vpn_torrent">Ce fournisseur est un torrent, un VPN est recommandé</string>
-    <string name="torrent_plot">Description</string>
-    <string name="normal_no_plot">Aucune description trouvée</string>
-    <string name="torrent_no_plot">Aucune description trouvée</string>
-    <string name="picture_in_picture">Lecteur en mode Picture-in-Picture</string>
-    <string name="picture_in_picture_des">Continuer la lecture dans une fenêtre miniature en superposition sur d\'autres applis</string>
-    <string name="player_size_settings">Bouton de redimensionnement du lecteur</string>
-    <string name="player_size_settings_des">Supprimer les bordures noires</string>
-    <string name="player_subtitles_settings">Sous-titres</string>
-    <string name="player_subtitles_settings_des">Paramètres des sous-titres du lecteur</string>
-    <string name="eigengraumode_settings">Vitesse de lecture</string>
-    <string name="eigengraumode_settings_des">Ajouter l\'option de vitesse sur le lecteur</string>
-    <string name="swipe_to_seek_settings">Balayer pour avancer rapidement</string>
-    <string name="swipe_to_seek_settings_des">Balayer vers la gauche ou la droite pour contrôler le temps du lecteur vidéo</string>
-    <string name="swipe_to_change_settings">Balayer pour changer les paramètres</string>
-    <string name="swipe_to_change_settings_des">Balayer sur le coté droit ou gauche pour changer le niveau de luminosité ou de volume</string>
-    <string name="double_tap_to_seek_settings">Taper deux fois pour rechercher</string>
-
-    <string name="double_tap_to_pause_settings">Taper deux fois pour mettre en pause</string>
-
-    <string name="double_tap_to_seek_settings_des">Taper deux fois sur le coté droit ou gauche pour avancer ou reculer</string>
-    <string name="search">Rechercher</string>
-    <string name="settings_info">Informations</string>
-    <string name="advanced_search">Recherche Avancée</string>
-    <string name="advanced_search_des">Donne les résultats séparés par les fournisseurs</string>
-    <string name="bug_report_settings_off">N\'envoyer les données que lors d\'un crash</string>
-    <string name="bug_report_settings_on">N\'envoyer aucune données</string>
-    <string name="updates_settings">Afficher les mises-à-jour de l\'application</string>
-    <string name="updates_settings_des">Chercher des mises-à-jour automatiquement au démarage</string>
-    <string name="uprereleases_settings">Mettre à jour vers une version bêta</string>
-    <string name="uprereleases_settings_des">Rechercher pour une mise à jour vers une version bêta au lieu des version complètes seulement</string>
-    <string name="github">Github</string>
-    <string name="lightnovel">L\'application Light Novel par les mêmes devs</string>
-    <string name="anim">Application d\'animés par les mêmes devs</string>
-    <string name="discord">Rejoindre le serveur Discord</string>
     <string name="benene">Donner une benene aux devs</string>
     <string name="benene_des">benenes données</string>
     <string name="app_language">Language de l\'application</string>
@@ -192,16 +138,12 @@
     <string name="primary_color_settings">Couleur principale</string>
     <string name="app_theme_settings">Thème de l\'application</string>
     <string name="player_speed_text_format" formatted="true">Vitesse (%.2fx)</string>
-    <string name="use_system_brightness_settings">Utiliser la luminosité du système</string>
     <string name="category_general">Général</string>
     <string name="dns_pref">DNS avec HTTPS</string>
     <string name="display_subbed_dubbed_settings">Afficher les animés en Anglais (Dub) / sous-titrés</string>
     <string name="phone_layout">Disposition en mode téléphone</string>
     <string name="app_dub_sub_episode_text_format">%s Ep %d</string>
     <string name="rated_format" formatted="true">Note : %.1f</string>
-    <string name="subs_font_size">Taille de la police</string>
-    <string name="use_system_brightness_settings_des">Utiliser la luminosité du système dans le lecteur de l\'application au lieu d\'un écran noir</string>
-    <string name="show_fillers_settings">Afficher les épisodes spéciaux pour les animés</string>
     <string name="resize_zoom">Zoom</string>
     <string name="resize_fit">Adapter à l\'écran</string>
     <string name="app_layout">Disposition de l\'application</string>
@@ -211,23 +153,8 @@
     <string name="automatic">Auto</string>
     <string name="cast_format">Acteurs: %s</string>
     <string name="duration_format">%d min</string>
-    <string name="search_hint_site">Rechercher sur %s...</string>
+    <string name="search_hint_site">Rechercher sur %s…</string>
     <string name="type_re_watching">À re-regarder</string>
-    <string name="subs_import_text">Importer des polices en les plaçants dans %s</string>
-    <string name="provider_info_meta">Les metadonnées ne sont pas fournies par le site, le chargement de la vidéo va échouer si elle n\'existe pas sur le site.</string>
-    <string name="show_log_cat">Afficher les logs 🐈</string>
-    <string name="chromecast_subtitles_settings">Sous-titres Chromecast</string>
-    <string name="chromecast_subtitles_settings_des">Paramètres des sous-titres Chromecast</string>
-    <string name="double_tap_to_pause_settings_des">Taper au milieu pour mettre en pause</string>
-    <string name="episode_sync_settings">Mettre à jour la progression de visionnage</string>
-    <string name="episode_sync_settings_des">Synchroniser automatiquement votre progression de l\'épisode actuel</string>
-    <string name="restore_settings">Restaurer les données sauvegardées</string>
-    <string name="backup_settings">Sauvegarder les données</string>
-    <string name="restore_success">Fichier de sauvegarde chargé</string>
-    <string name="restore_failed_format">Échec de la restauration des données depuis le fichier</string>
-    <string name="backup_success">Restauration des données réussie</string>
-    <string name="backup_failed">Permission d\'accès au stockage manquante</string>
-    <string name="backup_failed_error_format">Erreur pendant la sauvegarde %s</string>
     <string name="no_episodes_found">Aucun épisode trouvé</string>
     <string name="documentaries">Documentaires</string>
     <string name="ova">OVA</string>
@@ -285,22 +212,20 @@
     <string name="actor_background">Arrière plan</string>
     <string name="home_source">Source</string>
     <string name="home_random">Aléatoire</string>
-    <string name="coming_soon">À venir ...</string>
+    <string name="coming_soon">À venir …</string>
     <string name="poster_image">Image de l\'affiche</string>
     <string name="authenticated_user">Connecté %s</string>
     <string name="action_add_to_bookmarks">Définir le statut de visionage</string>
-    <string name="sort_cancel">Annuler</string>
     <string name="sort_copy">Copier</string>
     <string name="sort_close">Fermer</string>
     <string name="sort_clear">Vider</string>
     <string name="sort_save">Enregistrer</string>
 
-    <string name="player_speed">Vitesse du lecteur</string>
 
     <string name="subtitles_settings">Paramètres des sous-titres</string>
     <string name="subs_text_color">Couleur du texte</string>
     <string name="subs_outline_color">Couleur des contours</string>
-    <string name="subs_background_color">Couleur d'arrière-plan</string>
+    <string name="subs_background_color">Couleur d\'arrière-plan</string>
     <string name="subs_window_color">Couleur de la fenêtre</string>
     <string name="subs_edge_type">Type de bordure</string>
     <string name="subs_subtitle_elevation">Elevation des sous-titres</string>
@@ -321,13 +246,13 @@
     <string name="continue_watching">Continuer à regarder</string>
 
     <string name="action_remove_watching">Retirer</string>
-    <string name="action_open_watching">Plus d'informations</string>
+    <string name="action_open_watching">Plus d\'informations</string>
     <string name="action_open_play">@string/home_play </string>
 
     <string name="vpn_might_be_needed">Un VPN peut être nécessaire pour que ce fournisseur fonctionne correctement</string>
     <string name="vpn_torrent">Ce fournisseur est un torrent, un VPN est recommandé</string>
 
-    <string name="provider_info_meta">Les métadonnées ne sont pas fournies par le site, le chargement de la vidéo échouera si elles n'existent pas sur le site.</string>
+    <string name="provider_info_meta">Les métadonnées ne sont pas fournies par le site, le chargement de la vidéo échouera si elles n\'existent pas sur le site.</string>
 
     <string name="torrent_plot">Description</string>
     <string name="normal_no_plot">Aucune trace trouvée</string>
@@ -336,7 +261,7 @@
     <string name="show_log_cat">Afficher le logcat 🐈</string>
     
     <string name="picture_in_picture">Picture-in-picture</string>
-    <string name="picture_in_picture_des">Poursuite de la lecture dans un lecteur miniature au-dessus d'autres applications</string>
+    <string name="picture_in_picture_des">Poursuite de la lecture dans un lecteur miniature au-dessus d\'autres applications</string>
     <string name="player_size_settings">Bouton de redimensionnement du lecteur</string>
     <string name="player_size_settings_des">Supprimer les bordures noires</string>
     <string name="player_subtitles_settings">Sous-titres</string>
@@ -345,14 +270,14 @@
     <string name="chromecast_subtitles_settings_des">Paramètres des sous-titres Chromecast</string>
 
     <string name="eigengraumode_settings">Mode Eigengravy</string>
-    <string name="eigengraumode_settings_des">Ajout d'une option de vitesse dans le lecteur</string>
+    <string name="eigengraumode_settings_des">Ajout d\'une option de vitesse dans le lecteur</string>
     <string name="swipe_to_seek_settings">Balayez pour chercher</string>
     <string name="swipe_to_seek_settings_des">Balayez vers la gauche ou la droite pour contrôler le temps dans le lecteur vidéo.</string>
     <string name="swipe_to_change_settings">Balayez pour modifier les paramètres</string>
     <string name="swipe_to_change_settings_des">Glissez sur le côté gauche ou droit pour modifier la luminosité ou le volume.</string>
 
     <string name="autoplay_next_settings">Lecture automatique du prochain épisode</string>
-    <string name="autoplay_next_settings_des">Démarrer l'épisode suivant lorsque l'épisode en cours se termine</string>
+    <string name="autoplay_next_settings_des">Démarrer l\'épisode suivant lorsque l\'épisode en cours se termine</string>
 
     <string name="double_tap_to_seek_settings">Double tape pour chercher</string>
     <string name="double_tap_to_pause_settings">Double tape pour mettre en pause</string>
@@ -361,14 +286,14 @@
     </string>
     <string name="double_tap_to_pause_settings_des">Tapez au milieu pour mettre en pause</string>
     <string name="use_system_brightness_settings">Utiliser la luminosité du système</string>
-    <string name="use_system_brightness_settings_des">Utiliser la luminosité du système dans le lecteur d'applications au lieu du
+    <string name="use_system_brightness_settings_des">Utiliser la luminosité du système dans le lecteur d\'applications au lieu du
         sombre
     </string>
 
     <string name="episode_sync_settings">Mise à jour de la progression de la veille</string>
     <string name="episode_sync_settings_des">Synchronisation automatique de la progression de votre épisode en cours</string>
 
-    <string name="restore_settings">Restaurer des données à partir d'une sauvegarde</string>
+    <string name="restore_settings">Restaurer des données à partir d\'une sauvegarde</string>
 
     <string name="backup_settings">Sauvegarde des données</string>
     <string name="restore_success">Fichier de sauvegarde chargé</string>
@@ -384,15 +309,15 @@
     <string name="settings_info">Info</string>
     <string name="advanced_search">Recherche avancée</string>
     <string name="advanced_search_des">Vous donne les résultats de la recherche séparés par fournisseur</string>
-    <string name="bug_report_settings_off">Envoi de données uniquement en cas d'accident</string>
-    <string name="bug_report_settings_on">N'envoie aucune donnée</string>
+    <string name="bug_report_settings_off">Envoi de données uniquement en cas d\'accident</string>
+    <string name="bug_report_settings_on">N\'envoie aucune donnée</string>
     <string name="show_fillers_settings">Afficher les épisodes spéciaux pour les animés</string>
     <string name="show_trailers_settings">Montrer les bandes-annonces</string>
     <string name="kitsu_settings">Montrer les affiches de kitsu</string>
     <string name="pref_filter_search_quality">Masquer la qualité vidéo sélectionnée dans les résultats de recherche</string>
 
     <string name="automatic_plugin_updates">Mises à jour automatiques des plugins</string>
-    <string name="updates_settings">Afficher les mises à jour de l'application</string>
+    <string name="updates_settings">Afficher les mises à jour de l\'application</string>
     <string name="updates_settings_des">Recherche automatique de nouvelles mises à jour au démarrage</string>
     <string name="uprereleases_settings">Mettre à jour vers une version bêta</string>
     <string name="uprereleases_settings_des">Recherche pour une mise à jour vers une version bêta au lieu des version complètes seulement</string>

From a8f3d18c2eca4e284a2c00b4d4558fc7760f23c9 Mon Sep 17 00:00:00 2001
From: Jace <54625750+Jacekun@users.noreply.github.com>
Date: Sat, 19 Nov 2022 18:53:34 +0800
Subject: [PATCH 080/273] [Feature] Get duration from string in format of  '00
 hr 00 min 00 sec', in any combination (#215)

---
 .../com/lagradost/cloudstream3/MainAPI.kt     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 5c9f3071..95d1faaa 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -1153,6 +1153,27 @@ fun getDurationFromString(input: String?): Int? {
             return values[1].toIntOrNull()
         }
     }
+    Regex("(\\s\\d+\\shr)|(\\s\\d+\\shour)|(\\s\\d+\\smin)|(\\s\\d+\\ssec)").findAll(input).let { values ->
+        var seconds = 0
+        values.forEach {
+            val time_text = it.value
+            if (time_text.isNotBlank()) {
+                val time = time_text.filter { s -> s.isDigit() }.trim().toInt()
+                val scale = time_text.filter { s -> !s.isDigit() }.trim()
+                //println("Scale: $scale")
+                val timeval = when (scale) {
+                    "hr", "hour" -> time * 60 * 60
+                    "min" -> time * 60
+                    "sec" -> time
+                    else -> 0
+                }
+                seconds += timeval
+            }
+        }
+        if (seconds > 0) {
+            return seconds / 60
+        }
+    }
     return null
 }
 

From 9bca7a0780e69f1065ffb723de934c1f470cdf1c Mon Sep 17 00:00:00 2001
From: Jace <54625750+Jacekun@users.noreply.github.com>
Date: Mon, 21 Nov 2022 15:32:32 +0800
Subject: [PATCH 081/273] Fix duration regex, returning null on first checker
 (#218)

---
 app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 95d1faaa..e8ad476a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -1143,9 +1143,9 @@ fun getDurationFromString(input: String?): Int? {
         if (values.size == 3) {
             val hours = values[1].toIntOrNull()
             val minutes = values[2].toIntOrNull()
-            return if (minutes != null && hours != null) {
-                hours * 60 + minutes
-            } else null
+            if (minutes != null && hours != null) {
+                return hours * 60 + minutes
+            }
         }
     }
     Regex("([0-9]*)m").find(cleanInput)?.groupValues?.let { values ->

From e21c8f8038fcf9c2f5e04388c6a2766ef8330658 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Wed, 23 Nov 2022 15:57:56 +0100
Subject: [PATCH 082/273] Fixed DdosGuardKiller, SSL on android 9 and some
 OpenSubtitles fixes

---
 app/build.gradle.kts                                       | 3 ++-
 .../com/lagradost/cloudstream3/network/DdosGuardKiller.kt  | 7 ++++---
 .../com/lagradost/cloudstream3/network/RequestsHelper.kt   | 4 ++++
 .../syncproviders/providers/OpenSubtitlesApi.kt            | 4 +++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f72eb321..26e7d3a5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -191,7 +191,8 @@ dependencies {
 //    implementation("com.squareup.okhttp3:okhttp:4.9.2")
 //    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1")
     implementation("com.github.Blatzar:NiceHttp:0.3.5")
-
+    // To fix SSL fuckery on android 9
+    implementation("org.conscrypt:conscrypt-android:2.2.1")
     // Util to skip the URI file fuckery 🙏
     implementation("com.github.tachiyomiorg:unifile:17bec43")
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/DdosGuardKiller.kt b/app/src/main/java/com/lagradost/cloudstream3/network/DdosGuardKiller.kt
index dca3ee00..b5783f78 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/DdosGuardKiller.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/DdosGuardKiller.kt
@@ -2,7 +2,7 @@ package com.lagradost.cloudstream3.network
 
 import androidx.annotation.AnyThread
 import com.lagradost.cloudstream3.app
-import com.lagradost.nicehttp.Requests.Companion.await
+import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.cookies
 import kotlinx.coroutines.runBlocking
 import okhttp3.Interceptor
@@ -41,7 +41,8 @@ class DdosGuardKiller(private val alwaysBypass: Boolean) : Interceptor {
             savedCookiesMap[request.url.host]
             // If no cookies are found fetch and save em.
                 ?: (request.url.scheme + "://" + request.url.host + (ddosBypassPath ?: "")).let {
-                    app.get(it, cacheTime = 0).cookies.also { cookies ->
+                    // Somehow app.get fails
+                    Requests().get(it).cookies.also { cookies ->
                         savedCookiesMap[request.url.host] = cookies
                     }
                 }
@@ -51,6 +52,6 @@ class DdosGuardKiller(private val alwaysBypass: Boolean) : Interceptor {
             request.newBuilder()
                 .headers(headers)
                 .build()
-        ).await()
+        ).execute()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
index 8bf1f91b..a1d84f6c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
@@ -4,15 +4,19 @@ import android.content.Context
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.ignoreAllSSLErrors
 import okhttp3.Cache
 import okhttp3.Headers
 import okhttp3.Headers.Companion.toHeaders
 import okhttp3.OkHttpClient
+import org.conscrypt.Conscrypt
 import java.io.File
+import java.security.Security
 
 fun Requests.initClient(context: Context): OkHttpClient {
+    normalSafeApiCall { Security.insertProviderAt(Conscrypt.newProvider(), 1) }
     val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
     val dns = settingsManager.getInt(context.getString(R.string.dns_pref), 0)
     baseClient = OkHttpClient.Builder()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
index bfa65f62..f22fdd8b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
@@ -15,6 +15,8 @@ import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI
 import com.lagradost.cloudstream3.syncproviders.InAppAuthAPIManager
 import com.lagradost.cloudstream3.utils.AppUtils
+import java.net.URLEncoder
+import java.nio.charset.StandardCharsets
 
 class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
     override val idPrefix = "opensubtitles"
@@ -175,7 +177,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         val searchQueryUrl = when (imdbId > 0) {
             //Use imdb_id to search if its valid
             true -> "$host/subtitles?imdb_id=$imdbId&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
-            false -> "$host/subtitles?query=$queryText&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
+            false -> "$host/subtitles?query=${URLEncoder.encode(queryText.lowercase(), StandardCharsets.UTF_8.toString())}&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
         }
 
         val req = app.get(

From 9be50eb28b861f90fc6a350fb9aea715a28390ff Mon Sep 17 00:00:00 2001
From: Jace <54625750+Jacekun@users.noreply.github.com>
Date: Sun, 27 Nov 2022 12:57:40 +0800
Subject: [PATCH 083/273] [Feature] Filter extension list automatically by
 preferred media language.

---
 .../ui/settings/extensions/PluginsFragment.kt    | 16 ++++++++++++++++
 app/src/main/res/values/strings.xml              |  2 ++
 app/src/main/res/xml/settings_providers.xml      |  5 +++++
 3 files changed, 23 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
index bacd26c8..aa49c0e9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
@@ -8,6 +8,9 @@ import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.preference.PreferenceManager
+import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
+import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.mvvm.observe
@@ -45,6 +48,19 @@ class PluginsFragment : Fragment() {
         pluginViewModel.languages = listOf()
         pluginViewModel.search(null)
 
+        // Filter by language set on preferred media
+        activity?.let {
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(it)
+            val filter = settingsManager.getBoolean(getString(R.string.pref_filter_ext_by_lang_key), false)
+            if (filter) {
+                val providerLangs = it.getApiProviderLangSettings().toList()
+                if (!providerLangs.contains(AllLanguagesName)) {
+                    pluginViewModel.languages = providerLangs
+                    //Log.i("DevDebug", "providerLang => ${pluginViewModel.languages.toJson()}")
+                }
+            }
+        }
+
         val name = arguments?.getString(PLUGINS_BUNDLE_NAME)
         val url = arguments?.getString(PLUGINS_BUNDLE_URL)
         val isLocal = arguments?.getBoolean(PLUGINS_BUNDLE_LOCAL) == true
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9381372c..b4485c26 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,6 +58,7 @@
     <string name="pref_filter_search_quality_key" translatable="false">pref_filter_search_quality_key</string>
     <string name="enable_nsfw_on_providers_key" translatable="false">enable_nsfw_on_providers_key</string>
     <string name="enable_skip_op_from_database" translatable="false">enable_skip_op_from_database</string>
+    <string name="pref_filter_ext_by_lang_key" translatable="false">pref_filter_ext_by_lang_key</string>
 
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
@@ -448,6 +449,7 @@
     <string name="app_layout">App Layout</string>
     <string name="preferred_media_settings">Preferred media</string>
     <string name="enable_nsfw_on_providers">Enable NSFW on supported providers</string>
+    <string name="filter_ext_by_preferred_lang">Filter Extension list by Preferred Language</string>
     <string name="subtitles_encoding">Subtitle encoding</string>
     <string name="category_providers">Providers</string>
     <string name="category_ui">Layout</string>
diff --git a/app/src/main/res/xml/settings_providers.xml b/app/src/main/res/xml/settings_providers.xml
index a177865b..ffcd3511 100644
--- a/app/src/main/res/xml/settings_providers.xml
+++ b/app/src/main/res/xml/settings_providers.xml
@@ -21,4 +21,9 @@
             android:icon="@drawable/ic_baseline_extension_24"
             android:summary="@string/apply_on_restart"
             app:defaultValue="false"/>
+    <SwitchPreference
+        android:key="@string/pref_filter_ext_by_lang_key"
+        android:title="@string/filter_ext_by_preferred_lang"
+        android:icon="@drawable/ic_baseline_extension_24"
+        app:defaultValue="false"/>
 </PreferenceScreen>
\ No newline at end of file

From c513708d7432a1df0113796d413822cf5654b9f3 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sun, 27 Nov 2022 10:37:36 +0100
Subject: [PATCH 084/273] smol tweaks to the previous commit

---
 .../ui/settings/extensions/PluginsFragment.kt       | 13 ++++---------
 app/src/main/res/values/strings.xml                 |  2 --
 app/src/main/res/xml/settings_providers.xml         |  5 -----
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
index aa49c0e9..bd44a058 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
@@ -8,7 +8,6 @@ import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
 import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.R
@@ -50,14 +49,10 @@ class PluginsFragment : Fragment() {
 
         // Filter by language set on preferred media
         activity?.let {
-            val settingsManager = PreferenceManager.getDefaultSharedPreferences(it)
-            val filter = settingsManager.getBoolean(getString(R.string.pref_filter_ext_by_lang_key), false)
-            if (filter) {
-                val providerLangs = it.getApiProviderLangSettings().toList()
-                if (!providerLangs.contains(AllLanguagesName)) {
-                    pluginViewModel.languages = providerLangs
-                    //Log.i("DevDebug", "providerLang => ${pluginViewModel.languages.toJson()}")
-                }
+            val providerLangs = it.getApiProviderLangSettings().toList()
+            if (!providerLangs.contains(AllLanguagesName)) {
+                pluginViewModel.languages = mutableListOf("none") + providerLangs
+                //Log.i("DevDebug", "providerLang => ${pluginViewModel.languages.toJson()}")
             }
         }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b4485c26..9381372c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,7 +58,6 @@
     <string name="pref_filter_search_quality_key" translatable="false">pref_filter_search_quality_key</string>
     <string name="enable_nsfw_on_providers_key" translatable="false">enable_nsfw_on_providers_key</string>
     <string name="enable_skip_op_from_database" translatable="false">enable_skip_op_from_database</string>
-    <string name="pref_filter_ext_by_lang_key" translatable="false">pref_filter_ext_by_lang_key</string>
 
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
@@ -449,7 +448,6 @@
     <string name="app_layout">App Layout</string>
     <string name="preferred_media_settings">Preferred media</string>
     <string name="enable_nsfw_on_providers">Enable NSFW on supported providers</string>
-    <string name="filter_ext_by_preferred_lang">Filter Extension list by Preferred Language</string>
     <string name="subtitles_encoding">Subtitle encoding</string>
     <string name="category_providers">Providers</string>
     <string name="category_ui">Layout</string>
diff --git a/app/src/main/res/xml/settings_providers.xml b/app/src/main/res/xml/settings_providers.xml
index ffcd3511..a177865b 100644
--- a/app/src/main/res/xml/settings_providers.xml
+++ b/app/src/main/res/xml/settings_providers.xml
@@ -21,9 +21,4 @@
             android:icon="@drawable/ic_baseline_extension_24"
             android:summary="@string/apply_on_restart"
             app:defaultValue="false"/>
-    <SwitchPreference
-        android:key="@string/pref_filter_ext_by_lang_key"
-        android:title="@string/filter_ext_by_preferred_lang"
-        android:icon="@drawable/ic_baseline_extension_24"
-        app:defaultValue="false"/>
 </PreferenceScreen>
\ No newline at end of file

From 58593ac8daabc829aab3618f18272c5518242ee7 Mon Sep 17 00:00:00 2001
From: jhih_yu <thomas.JY.Lin@gmail.com>
Date: Wed, 30 Nov 2022 04:45:00 +0900
Subject: [PATCH 085/273] Add zh_TW (#202)

* Add zh_TW
---
 README.md                                     |   2 +
 .../lagradost/cloudstream3/CommonActivity.kt  |  13 +-
 .../ui/settings/SettingsGeneral.kt            |   7 +-
 app/src/main/res/values-zh-rTW/strings.xml    | 591 ++++++++++++++++++
 4 files changed, 608 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/values-zh-rTW/strings.xml

diff --git a/README.md b/README.md
index 5e961c61..dcd4c5ed 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,8 @@
 ***The list of supported languages:***
 * 🇱🇧 Arabic
 * 🇧🇬 Bulgarian
+* 🇨🇳 Chinese Simplified
+* 🇹🇼 Chinese Traditional
 * 🇭🇷 Croatian
 * 🇨🇿 Czech
 * 🇳🇱 Dutch
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index 47a195d1..5f02661d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -108,9 +108,18 @@ object CommonActivity {
         }
     }
 
+    /**
+     * Not all languages can be fetched from locale with a code.
+     * This map allows sidestepping the default Locale(languageCode)
+     * when setting the app language.
+     **/
+    val appLanguageExceptions = hashMapOf(
+        "zh_TW" to Locale.TRADITIONAL_CHINESE
+    )
+
     fun setLocale(context: Context?, languageCode: String?) {
         if (context == null || languageCode == null) return
-        val locale = Locale(languageCode)
+        val locale = appLanguageExceptions[languageCode] ?: Locale(languageCode)
         val resources: Resources = context.resources
         val config = resources.configuration
         Locale.setDefault(locale)
@@ -421,4 +430,4 @@ object CommonActivity {
         }
         return null
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 8ea76cda..551a80ab 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -47,7 +47,7 @@ fun getCurrentLocale(context: Context): String {
     // Change locale settings in the app.
     // val dm = res.displayMetrics
     val conf = res.configuration
-    return conf?.locale?.language ?: "en"
+    return conf?.locale?.toString() ?: "en"
 }
 
 // idk, if you find a way of automating this it would be great
@@ -75,7 +75,8 @@ val appLanguages = arrayListOf(
     Triple("\uD83C\uDDE7\uD83C\uDDF7", "Brazilian Portuguese", "bp"),
     Triple("", "Romanian", "ro"),
     Triple("", "Italian", "it"),
-    Triple("", "Chinese", "zh"),
+    Triple("", "Chinese Simplified", "zh"),
+    Triple("\uD83C\uDDF9\uD83C\uDDFC", "Chinese Traditional", "zh_TW"),
     Triple("\uD83C\uDDEE\uD83C\uDDE9", "Indonesian", "in"),
     Triple("", "Czech", "cs"),
     Triple("", "Croatian", "hr"),
@@ -368,4 +369,4 @@ class SettingsGeneral : PreferenceFragmentCompat() {
             e.printStackTrace()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000..5b71a3f9
--- /dev/null
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,591 @@
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
+    <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
+    <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
+    <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
+    <string name="download_size_format" formatted="true" translatable="false">%s / %s</string>
+    <string name="episode_name_format" formatted="true" translatable="false">%s %s</string>
+    <string name="ffw_text_format" formatted="true" translatable="false">+%d</string>
+    <string name="rew_text_format" formatted="true" translatable="false">-%d</string>
+    <string name="ffw_text_regular_format" formatted="true" translatable="false">%d</string>
+    <string name="rew_text_regular_format" formatted="true" translatable="false">%d</string>
+    <string name="rating_format" formatted="true" translatable="false">%.1f/10.0</string>
+    <string name="year_format" formatted="true" translatable="false">%d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s 共 %d 集</string>
+    <string name="cast_format" formatted="true">演員：%s</string>
+    <string name="next_episode_format" formatted="true">第 %d 集即將發佈於</string>
+    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+
+    <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
+    <string name="result_poster_img_des">封面</string>
+    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="episode_poster_img_des">劇集封面</string>
+    <string name="home_main_poster_img_des">主封面</string>
+    <string name="home_next_random_img_des">隨機下一個</string>
+    <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
+    <string name="go_back_img_des">返回</string>
+    <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
+    <string name="home_change_provider_img_des">更改片源</string>
+    <string name="preview_background_img_des">預覽背景</string>
+
+    <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
+    <string name="player_speed_text_format" formatted="true">速度（%.2fx）</string>
+    <string name="rated_format" formatted="true">評分：%.1f</string>
+    <string name="new_update_format" formatted="true">發現新版本！\n%s -> %s</string>
+    <string name="filler" formatted="true">填充</string>
+    <string name="duration_format" formatted="true">%d 分鐘</string>
+
+    <string name="app_name">CloudStream</string>
+    <string name="play_with_app_name">使用 CloudStream 播放</string>
+    <string name="title_home">主頁</string>
+    <string name="title_search">搜尋</string>
+    <string name="title_downloads">下載</string>
+    <string name="title_settings">設定</string>
+
+    <string name="search_hint">搜尋…</string>
+    <string name="search_hint_site" formatted="true">搜尋 %s…</string>
+
+    <string name="no_data">無資料</string>
+    <string name="episode_more_options_des">更多選項</string>
+    <string name="next_episode">下一集</string>
+    <string name="result_plot" translatable="false">@string/synopsis</string>
+    <string name="result_tags">類型</string>
+    <string name="result_share">分享</string>
+    <string name="result_open_in_browser">在瀏覽器中打開</string>
+    <string name="skip_loading">跳過載入</string>
+    <string name="loading">載入中…</string>
+
+    <string name="type_watching">正在觀看</string>
+    <string name="type_on_hold">暫時擱置</string>
+    <string name="type_completed">觀看完畢</string>
+    <string name="type_dropped">放棄觀看</string>
+    <string name="type_plan_to_watch">計畫觀看</string>
+    <string name="type_none">無</string>
+    <string name="type_re_watching">重新觀看</string>
+
+    <string name="play_movie_button">播放電影</string>
+    <string name="play_livestream_button">播放直播</string>
+    <string name="play_torrent_button">播放種子</string>
+    <string name="pick_source">來源</string>
+    <string name="pick_subtitle">字幕</string>
+    <string name="reload_error">重試連接…</string>
+    <string name="go_back">返回</string>
+    <string name="play_episode">播放劇集</string>
+    <!--<string name="need_storage">允許下載劇集</string>-->
+
+    <string name="download">下載</string>
+    <string name="downloaded">已下載</string>
+    <string name="downloading">下載中</string>
+    <string name="download_paused">下載暫停</string>
+    <string name="download_started">下載開始</string>
+    <string name="download_failed">下載失敗</string>
+    <string name="download_canceled">下載取消</string>
+    <string name="download_done">下載完畢</string>
+    <string name="download_format" translatable="false">%s - %s</string>
+    <string name="stream">播放</string>
+
+    <string name="error_loading_links_toast">載入連結錯誤</string>
+    <string name="download_storage_text">內部存儲</string>
+
+    <string name="app_dubbed_text">配音</string>
+    <string name="app_subbed_text">字幕</string>
+
+    <string name="popup_delete_file">刪除檔案</string>
+    <string name="popup_play_file">播放檔案</string>
+    <string name="popup_resume_download">繼續下載</string>
+    <string name="popup_pause_download">暫停下載</string>
+
+    <string name="pref_disable_acra">禁用自動錯誤報告</string>
+    <string name="home_more_info">更多資訊</string>
+    <string name="home_expanded_hide">隱藏</string>
+    <string name="home_play">播放</string>
+    <string name="home_info">資訊</string>
+    <string name="filter_bookmarks">篩選書籤</string>
+    <string name="error_bookmarks_text">書籤</string>
+    <string name="action_remove_from_bookmarks">移除</string>
+    <string name="action_add_to_bookmarks">設定觀看狀態</string>
+    <string name="sort_apply">套用</string>
+    <string name="sort_cancel">取消</string>
+    <string name="sort_copy">複製</string>
+    <string name="sort_close">關閉</string>
+    <string name="sort_clear">清除</string>
+    <string name="sort_save">保存</string>
+
+    <string name="player_speed">播放速度</string>
+
+    <string name="subtitles_settings">字幕設定</string>
+    <string name="subs_text_color">字體顏色</string>
+    <string name="subs_outline_color">輪廓顏色</string>
+    <string name="subs_background_color">背景顏色</string>
+    <string name="subs_window_color">視窗顏色</string>
+    <string name="subs_edge_type">邊緣類型</string>
+    <string name="subs_subtitle_elevation">字幕高度</string>
+    <string name="subs_font">字體</string>
+    <string name="subs_font_size">字體大小</string>
+
+    <string name="search_provider_text_providers">按片源搜尋</string>
+    <string name="search_provider_text_types">按類型搜尋</string>
+
+    <string name="benene_count_text">送開發者 %d 根香蕉</string>
+    <string name="benene_count_text_none">不送香蕉</string>
+
+    <string name="subs_auto_select_language">自動選擇語言</string>
+    <string name="subs_download_languages">下載語言</string>
+    <string name="subs_subtitle_languages">字幕語言</string>
+    <string name="subs_hold_to_reset_to_default">按住重設為預設值</string>
+    <string name="subs_import_text" formatted="true">將字體導入到 %s</string>
+    <string name="continue_watching">繼續觀看</string>
+
+    <string name="action_remove_watching">移除</string>
+    <string name="action_open_watching">更多資訊</string>
+    <string name="action_open_play">@string/home_play </string>
+
+    <string name="vpn_might_be_needed">此片源可能需要 VPN 才能正常使用</string>
+    <string name="vpn_torrent">此片源是種子，建議使用 VPN</string>
+
+    <string name="provider_info_meta">站點不提供元數據，如果站點上不存在元數據，影片載入將失敗。</string>
+
+    <string name="torrent_plot">簡介</string>
+    <string name="normal_no_plot">未找到簡介</string>
+    <string name="torrent_no_plot">未找到簡介</string>
+
+    <string name="show_log_cat">顯示 logcat 🐈</string>
+
+    <string name="picture_in_picture">字母畫面</string>
+    <string name="picture_in_picture_des">在其他應用程式上的子母畫面中繼續播放</string>
+    <string name="player_size_settings">播放器調整大小按鈕</string>
+    <string name="player_size_settings_des">移除黑色邊框</string>
+    <string name="player_subtitles_settings">字幕</string>
+    <string name="player_subtitles_settings_des">播放器字幕設定</string>
+    <string name="chromecast_subtitles_settings">Chromecast 字幕</string>
+    <string name="chromecast_subtitles_settings_des">Chromecast 字幕設定</string>
+
+    <string name="eigengraumode_settings">播放速度</string>
+    <string name="eigengraumode_settings_des">在播放器中添加播放速度選項</string>
+    <string name="swipe_to_seek_settings">活動控制進度</string>
+    <string name="swipe_to_seek_settings_des">左右滑動控制播放進度</string>
+    <string name="swipe_to_change_settings">滑動更改設定</string>
+    <string name="swipe_to_change_settings_des">上下滑動更改亮度或音量</string>
+
+    <string name="autoplay_next_settings">自動播放下一集</string>
+    <string name="autoplay_next_settings_des">播放完畢後播放下一集</string>
+
+    <string name="double_tap_to_seek_settings">輕按兩下以控制進度</string>
+    <string name="double_tap_to_pause_settings">輕按兩下以暫停</string>
+    <string name="double_tap_to_seek_amount_settings">輕按兩下以控制進度時間</string>
+    <string name="double_tap_to_seek_settings_des">在右側或左側輕按兩次以向前或向後快轉
+    </string>
+    <string name="double_tap_to_pause_settings_des">輕按兩下中間以暫停</string>
+    <string name="use_system_brightness_settings">使用系統亮度</string>
+    <string name="use_system_brightness_settings_des">在應用程序播放器中使用系統亮度替代黑色遮罩</string>
+
+    <string name="episode_sync_settings">更新觀看進度</string>
+    <string name="episode_sync_settings_des">自動同步當前劇集進度</string>
+
+    <string name="restore_settings">從備份中恢復資料</string>
+
+    <string name="backup_settings">備份資料</string>
+    <string name="restore_success">已載入備份資料</string>
+    <string name="restore_failed_format" formatted="true">無法從 %s 檔案中還原資料</string>
+    <string name="backup_success">成功儲存資料</string>
+    <string name="backup_failed">缺少儲存權限，請重試</string>
+    <string name="backup_failed_error_format">備份 %s 錯誤</string>
+
+    <string name="search">搜尋</string>
+    <string name="category_account">帳號</string>
+    <string name="category_updates">更新與備份</string>
+
+    <string name="settings_info">資訊</string>
+    <string name="advanced_search">進階搜尋</string>
+    <string name="advanced_search_des">為您提供按片源分開的搜尋結果</string>
+    <string name="bug_report_settings_off">僅在崩潰時傳送資料</string>
+    <string name="bug_report_settings_on">不傳送資料</string>
+    <string name="show_fillers_settings">顯示動畫外傳</string>
+    <string name="show_trailers_settings">顯示預告片</string>
+    <string name="kitsu_settings">顯示來自 Kitsu 的封面</string>
+    <string name="pref_filter_search_quality">在搜尋結果中隱藏選中的影片畫質</string>
+
+    <string name="automatic_plugin_updates">自動更新外掛程式</string>
+    <string name="updates_settings">顯示應用更新</string>
+    <string name="updates_settings_des">啟動時自動搜尋更新</string>
+    <string name="uprereleases_settings">更新至預覽版</string>
+    <string name="uprereleases_settings_des">搜尋預覽版更新而不是僅搜尋正式版</string>
+    <string name="github">Github</string>
+    <string name="lightnovel">由相同開發者開發的輕小說應用程式</string>
+    <string name="anim">由相同開發者開發的動漫應用程式</string>
+    <string name="discord">加入 Discord</string>
+    <string name="benene">送開發者一根香蕉</string>
+    <string name="benene_des">送香蕉</string>
+
+    <string name="app_language">應用程式語言</string>
+
+    <string name="no_chromecast_support_toast">此片源不支援 Chromecast</string>
+    <string name="no_links_found_toast">未找到連結</string>
+    <string name="copy_link_toast">連結已複製到剪貼簿</string>
+    <string name="play_episode_toast">播放劇集</string>
+    <string name="subs_default_reset_toast">重設為預設值</string>
+    <string name="acra_report_toast">很抱歉，應用崩潰了，將傳送一份匿名錯誤報告給開發者</string>
+
+    <string name="season">季</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="no_season">無季</string>
+    <string name="episode">集</string>
+    <string name="episodes">集</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="season_short">S</string>
+    <string name="episode_short">E</string>
+    <string name="no_episodes_found">未找到劇集</string>
+
+    <string name="delete_file">刪除文件</string>
+    <string name="delete">刪除</string>
+    <string name="cancel" translatable="false">@string/sort_cancel</string>
+    <string name="pause">暫停</string>
+    <string name="resume">繼續</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="delete_message" formatted="true">這將永遠刪除 %s\n你確定嗎?</string>
+    <string name="resume_time_left" formatted="true">剩餘 %d 分鐘</string>
+
+
+    <string name="status_ongoing">連載中</string>
+    <string name="status_completed">已完結</string>
+    <string name="status">狀態</string>
+    <string name="year">年份</string>
+    <string name="rating">評分</string>
+    <string name="duration">時間</string>
+    <string name="site">網站</string>
+    <string name="synopsis">簡介</string>
+
+    <string name="queued">已加入佇列</string>
+    <string name="no_subtitles">無字幕</string>
+    <string name="default_subtitles">預設</string>
+
+    <string name="free_storage">空閒</string>
+    <string name="used_storage">已使用</string>
+    <string name="app_storage">應用程式</string>
+
+    <!--plural-->
+    <string name="movies">電影</string>
+    <string name="tv_series">電視劇</string>
+    <string name="cartoons">卡通</string>
+    <string name="anime">動漫</string>
+    <string name="torrent">種子</string>
+    <string name="documentaries">紀錄片</string>
+    <string name="ova">原創動畫錄影帶</string>
+    <string name="asian_drama">亞洲劇</string>
+    <string name="livestreams">直播</string>
+    <string name="nsfw">NSFW</string>
+    <string name="others">其他</string>
+
+    <!--singular-->
+    <string name="movies_singular">電影</string>
+    <string name="tv_series_singular">電視劇</string>
+    <string name="cartoons_singular">卡通</string>
+    <string name="anime_singular">@string/anime</string>
+    <string name="ova_singular">@string/ova</string>
+    <string name="torrent_singular">種子</string>
+    <string name="documentaries_singular">紀錄片</string>
+    <string name="asian_drama_singular">亞洲劇</string>
+    <string name="live_singular">直播</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="other_singular">其他</string>
+
+    <string name="source_error">來源錯誤</string>
+    <string name="remote_error">遠端錯誤</string>
+    <string name="render_error">渲染器錯誤</string>
+    <string name="unexpected_error">意料之外的播放器錯誤</string>
+    <string name="storage_error">下載錯誤，請檢查儲存權限</string>
+
+    <string name="episode_action_chromecast_episode">Chromecast 劇集</string>
+    <string name="episode_action_chromecast_mirror">Chromecast 鏡像</string>
+    <string name="episode_action_play_in_app">在應用程式中播放</string>
+    <string name="episode_action_play_in_format">在 %s 中播放</string>
+    <string name="episode_action_play_in_browser">在瀏覽器中播放</string>
+    <string name="episode_action_copy_link">複製連結</string>
+    <string name="episode_action_auto_download">自動下載</string>
+    <string name="episode_action_download_mirror">下載鏡像</string>
+    <string name="episode_action_reload_links">重新載入連結</string>
+    <string name="episode_action_download_subtitle">下載字幕</string>
+
+    <string name="show_hd">畫質標籤</string>
+    <string name="show_dub">配音標籤</string>
+    <string name="show_sub">字幕標籤</string>
+    <string name="show_title">標題</string>
+    <string name="show_hd_key" translatable="false">show_hd_key</string>
+    <string name="show_dub_key" translatable="false">show_dub_key</string>
+    <string name="show_sub_key" translatable="false">show_sub_key</string>
+    <string name="show_title_key" translatable="false">show_title_key</string>
+    <string name="poster_ui_settings">封面內容</string>
+
+    <string name="no_update_found">未找到更新</string>
+    <string name="check_for_update">检查更新</string>
+
+    <string name="video_lock">鎖定</string>
+    <string name="video_aspect_ratio_resize">調整大小</string>
+    <string name="video_source">來源</string>
+    <string name="video_skip_op">跳過片頭</string>
+
+    <string name="dont_show_again">不再顯示</string>
+    <string name="skip_update">跳過此更新</string>
+    <string name="update">更新</string>
+    <string name="watch_quality_pref">偏好播放畫質</string>
+    <string name="limit_title">影片播放器標題最大字數</string>
+    <string name="limit_title_rez">影片播放器標題</string>
+
+    <string name="video_buffer_size_settings">影片緩衝大小</string>
+    <string name="video_buffer_length_settings">影片緩衝長度</string>
+    <string name="video_buffer_disk_settings">影片快取存儲</string>
+    <string name="video_buffer_clear_settings">清除影片和圖片快取</string>
+
+    <string name="video_ram_description">如果設定得太高會導致隨機崩潰。 如果您的記憶體不足（例如 Android TV 或舊手機），請不要更改</string>
+    <string name="video_disk_description">如果您將其設定得太高，可能會導致儲存空間不足的系統（例如 Android TV 設備）出現問題</string>
+
+    <string name="dns_pref">DNS over HTTPS</string>
+    <string name="dns_pref_summary">用於繞過網路服務供應商的封鎖</string>
+
+    <string name="add_site_pref">複製片源</string>
+    <string name="remove_site_pref">移除片源</string>
+    <string name="add_site_summary">添加具有不同URL的現有站點複製</string>
+
+    <string name="download_path_pref">下載路徑</string>
+
+    <string name="nginx_url_pref">Nginx 伺服器連結</string>
+
+    <string name="display_subbed_dubbed_settings">顯示有配音/字幕的動漫</string>
+
+    <string name="resize_fit">適應螢幕</string>
+    <string name="resize_fill">拉伸</string>
+    <string name="resize_zoom">縮放</string>
+
+    <string name="legal_notice">免責聲明</string>
+    <string name="legal_notice_key" translatable="false">legal_notice_key</string>
+    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
+        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
+
+        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
+
+        The app is purely for educational and personal use.
+
+        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down.
+        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or
+        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
+        user-friendly interface.
+
+        It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the
+        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
+        CloudStream 3 at your own risk.
+    </string>
+    <string name="category_general">通用</string>
+    <string name="random_button_settings">隨機按鈕</string>
+    <string name="random_button_settings_desc">在主頁中顯示隨機按鈕</string>
+    <string name="provider_lang_settings">片源語言</string>
+    <string name="app_layout">應用佈局</string>
+    <string name="preferred_media_settings">偏好類型</string>
+    <string name="enable_nsfw_on_providers">在支援的片源中啟用 NSFW 內容</string>
+    <string name="subtitles_encoding">字幕編碼</string>
+    <string name="category_providers">片源</string>
+    <string name="category_ui">佈局</string>
+
+    <string name="automatic">自動</string>
+    <string name="tv_layout">電視佈局</string>
+    <string name="phone_layout">手機佈局</string>
+    <string name="emulator_layout">模擬器佈局</string>
+
+    <string name="primary_color_settings">主題色</string>
+    <string name="app_theme_settings">應用程式主題</string>
+    <string name="bottom_title_settings">封面標題位置</string>
+    <string name="bottom_title_settings_des">將標題移到封面下方</string>
+
+
+    <!-- account stuff -->
+    <string name="anilist_key" translatable="false">anilist_key</string>
+    <string name="mal_key" translatable="false">mal_key</string>
+    <string name="opensubtitles_key" translatable="false">opensubtitles_key</string>
+    <string name="nginx_key" translatable="false">nginx_key</string>
+    <string name="example_password">密碼</string>
+    <string name="example_username">用戶名</string>
+    <string name="example_email">電子郵件</string>
+    <string name="example_ip">IP</string>
+    <string name="example_site_name">網站名稱</string>
+    <string name="example_site_url">網站連結</string>
+    <string name="example_lang_name">語言代號 (zh_TW)</string>
+
+    <!--
+    <string name="mal_account_settings" translatable="false">MAL</string>
+    <string name="anilist_account_settings" translatable="false">AniList</string>
+    <string name="tmdb_account_settings" translatable="false">TMDB</string>
+    <string name="imdb_account_settings" translatable="false">IMDB</string>
+    <string name="kitsu_account_settings" translatable="false">Kitsu</string>
+    <string name="trakt_account_settings" translatable="false">Trakt</string>
+    -->
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="account">帳號</string>
+    <string name="logout">登出</string>
+    <string name="login">登入</string>
+    <string name="switch_account">切換帳號</string>
+    <string name="add_account">添加帳號</string>
+    <string name="create_account">創建帳號</string>
+    <string name="add_sync">添加同步</string>
+    <string name="added_sync_format" formatted="true">已添加 %s</string>
+    <string name="upload_sync">同步</string>
+    <string name="sync_score">評分</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="authenticated_user" formatted="true">已驗證 %s</string>
+    <string name="authenticated_user_fail" formatted="true">驗證 %s 失敗</string>
+
+    <!-- ============ -->
+    <string name="none">無</string>
+    <string name="normal">普通</string>
+    <string name="all">全部</string>
+    <string name="max">最大</string>
+    <string name="min">最小</string>
+    <string name="subtitles_none" translatable="false">@string/none</string>
+    <string name="subtitles_outline">輪廓</string>
+    <string name="subtitles_depressed">凹陷</string>
+    <string name="subtitles_shadow">陰影</string>
+    <string name="subtitles_raised">凸出</string>
+    <string name="subtitle_offset">同步字幕</string>
+    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_title">字幕延遲</string>
+    <string name="subtitle_offset_extra_hint_later_format">如果字幕過早顯示 %dms ，請使用此選項</string>
+    <string name="subtitle_offset_extra_hint_before_format">如果字幕過晚顯示 %dms ，請使用此選項</string>
+    <string name="subtitle_offset_extra_hint_none_format">無字幕延遲</string>
+
+    <!--
+    Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
+    see: 
+	https://en.wikipedia.org/w/index.php?title=Pangram&oldid=225849300
+	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
+    -->
+    <string name="subtitles_example_text">The quick brown fox jumps over the lazy dog</string>
+
+    <string name="recommended">推薦</string>
+    <string name="player_loaded_subtitles" formatted="true">已載入 %s</string>
+    <string name="player_load_subtitles">從檔案載入</string>
+    <string name="player_load_subtitles_online">從網路載入</string>
+    <string name="downloaded_file">下載的檔案</string>
+    <string name="actor_main">主角</string>
+    <string name="actor_supporting">配角</string>
+    <string name="actor_background">群演</string>
+
+    <string name="home_source">來源</string>
+    <string name="home_random">隨機</string>
+
+    <string name="coming_soon">即將到來…</string>
+
+    <string name="quality_cam">Cam</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
+    <string name="quality_hq">HQ</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_tc">TC</string>
+    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="quality_4k">4K</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="quality_webrip">Web</string>
+
+    <string name="poster_image">封面圖片</string>
+    <string name="category_player">播放器</string>
+    <string name="resolution_and_title">解析度與標題</string>
+    <string name="title">標題</string>
+    <string name="resolution">解析度</string>
+    <string name="error_invalid_id">無效 ID</string>
+    <string name="error_invalid_data">無效資料</string>
+    <string name="error_invalid_url">無效連結</string>
+    <string name="error">錯誤</string>
+    <string name="subtitles_remove_captions">移除隱藏式字幕</string>
+    <string name="subtitles_remove_bloat">移除字幕廣告</string>
+    <string name="subtitles_filter_lang">按偏好片源語言過濾</string>
+    <string name="extras">附加</string>
+    <string name="trailer">預告片</string>
+    <string name="network_adress_example">播放連結</string>
+    <string name="referer">推薦</string>
+    <string name="next">下一個</string>
+    <string name="provider_languages_tip">觀看這些語言的影片</string>
+    <string name="previous">上一個</string>
+    <string name="skip_setup">跳過設定</string>
+    <string name="app_layout_subtext">更改應用程式的外觀以適應你的設備</string>
+    <string name="crash_reporting_title">崩潰報告</string>
+    <string name="preferred_media_subtext">你想要看什麼</string>
+    <string name="setup_done">完成</string>
+    <string name="extensions">擴充功能</string>
+    <string name="add_repository">添加資源庫</string>
+    <string name="repository_name_hint">資源庫名稱</string>
+    <string name="repository_url_hint">資源庫連結</string>
+    <string name="plugin_loaded">外掛程式已載入</string>
+    <string name="plugin_deleted">外掛程式已刪除</string>
+    <string name="plugin_load_fail" formatted="true">載入 %s 失敗</string>
+    <string name="is_adult">18+</string>
+    <string name="batch_download_start_format" formatted="true">開始下載 %d %s</string>
+    <string name="batch_download_finish_format" formatted="true">下載 %d %s 成功</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">全部 %s 已經下載</string>
+    <string name="batch_download">批次下載</string>
+    <string name="plugin_singular">外掛程式</string>
+    <string name="plugin">外掛程式</string>
+    <string name="delete_repository_plugins">這也將刪除所有資源庫外掛程式</string>
+    <string name="delete_repository">刪除資源庫</string>
+    <string name="setup_extensions_subtext">下載你所需的片源</string>
+    <string name="plugins_downloaded" formatted="true">已下載：%d</string>
+    <string name="plugins_disabled" formatted="true">已禁用：%d</string>
+    <string name="plugins_not_downloaded" formatted="true">未下載：%d</string>
+    <string name="plugins_updated" formatted="true">已更新 %d 外掛程式</string>
+    <string name="blank_repo_message">CloudStream 預設沒有安裝任何片源。您需要從資源庫安裝站點。\n\n由於 Sky Uk Limited 的無腦 DMCA 刪除🤮，我們無法在應用程式中連結資源庫站點。\n\n加入我們的 Discord 獲得連結或自己在網路上搜尋</string>
+    <string name="view_public_repositories_button">查看</string>
+    <string name="view_public_repositories_button_short">公開列表</string>
+    <string name="uppercase_all_subtitles">字幕全大寫</string>
+
+    <string name="download_all_plugins_from_repo">從此資源庫下載所有外掛程式？</string>
+    <string name="single_plugin_disabled" formatted="true">%s （禁用）</string>
+    <string name="tracks">軌道</string>
+    <string name="audio_tracks">音頻軌道</string>
+    <string name="video_tracks">影片軌道</string>
+    <string name="apply_on_restart">重新啟動時生效</string>
+
+    <string name="safe_mode_title">安全模式已啟用</string>
+    <string name="safe_mode_description">發生了不可恢復的崩潰，我們已自動禁用所有外掛程式，因此您可以找到並刪除導致問題的應用程式。</string>
+    <string name="safe_mode_crash_info">查看崩潰資訊</string>
+
+    <string name="extension_rating" formatted="true">評分：%s</string>
+    <string name="extension_description">簡介</string>
+    <string name="extension_version">版本</string>
+    <string name="extension_status">狀態</string>
+    <string name="extension_size">大小</string>
+    <string name="extension_authors">作者</string>
+    <string name="extension_types">類型</string>
+    <string name="extension_language">語言</string>
+    <string name="extension_install_first">請先安裝外掛程式</string>
+
+    <string name="hls_playlist">HLS 播放清單</string>
+
+    <string name="player_pref">偏好影片播放器</string>
+    <string name="player_settings_play_in_app">內部播放器</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">網路影片播放</string>
+    <string name="player_settings_play_in_browser">瀏覽器</string>
+    <string name="app_not_found_error">未找到應用</string>
+    <string name="all_languages_preference">所有語言</string>
+
+    <string name="skip_type_format" formatted="true">跳過 %s</string>
+    <string name="skip_type_op">片頭</string>
+    <string name="skip_type_ed">片尾</string>
+    <string name="skip_type_recap">前情回顧</string>
+    <string name="skip_type_mixed_ed">混合片尾</string>
+    <string name="skip_type_mixed_op">混合片頭</string>
+    <string name="skip_type_creddits">致謝名單</string>
+    <string name="skip_type_intro">介紹</string>
+
+    <string name="clear_history">清除歷史紀錄</string>
+    <string name="history">歷史紀錄</string>
+</resources>

From 723c554bc86c3d6f45fa6d9abd05f0ef2874297b Mon Sep 17 00:00:00 2001
From: Jace <54625750+Jacekun@users.noreply.github.com>
Date: Wed, 30 Nov 2022 03:46:31 +0800
Subject: [PATCH 086/273] [Feature] Automatically download plugin, based on
 language setting (#172)

---
 .../lagradost/cloudstream3/MainActivity.kt    |  12 +-
 .../cloudstream3/plugins/PluginManager.kt     | 107 ++++++++++++++++--
 app/src/main/res/values/strings.xml           |   2 +
 app/src/main/res/xml/settings_updates.xml     |   5 +
 4 files changed, 115 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index b999199f..d7351dc7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -45,6 +45,7 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.network.initClient
 import com.lagradost.cloudstream3.plugins.PluginManager
+import com.lagradost.cloudstream3.plugins.PluginManager.loadAllOnlinePlugins
 import com.lagradost.cloudstream3.plugins.PluginManager.loadSinglePlugin
 import com.lagradost.cloudstream3.receivers.VideoDownloadRestartReceiver
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.OAuth2Apis
@@ -568,7 +569,16 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                     ) {
                         PluginManager.updateAllOnlinePluginsAndLoadThem(this@MainActivity)
                     } else {
-                        PluginManager.loadAllOnlinePlugins(this@MainActivity)
+                        loadAllOnlinePlugins(this@MainActivity)
+                    }
+
+                    //Automatically download not existing plugins
+                    if (settingsManager.getBoolean(
+                            getString(R.string.auto_download_plugins_key),
+                            false
+                        )
+                    ) {
+                        PluginManager.downloadNotExistingPluginsAndLoad(this@MainActivity)
                     }
                 }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index b9c775c0..f2dbb02f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -13,11 +13,13 @@ import androidx.core.app.NotificationManagerCompat
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.google.gson.Gson
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
 import com.lagradost.cloudstream3.APIHolder.removePluginMapping
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.MainAPI.Companion.settingsForProvider
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.mvvm.debugPrint
 import com.lagradost.cloudstream3.mvvm.logError
@@ -26,6 +28,8 @@ import com.lagradost.cloudstream3.plugins.RepositoryManager.ONLINE_PLUGINS_FOLDE
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
 import com.lagradost.cloudstream3.plugins.RepositoryManager.downloadPluginToFile
 import com.lagradost.cloudstream3.plugins.RepositoryManager.getRepoPlugins
+import com.lagradost.cloudstream3.ui.result.UiText
+import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.ui.settings.extensions.REPOSITORIES_KEY
 import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
 import com.lagradost.cloudstream3.utils.Coroutines.main
@@ -219,9 +223,7 @@ object PluginManager {
     fun updateAllOnlinePluginsAndLoadThem(activity: Activity) {
         // Load all plugins as fast as possible!
         loadAllOnlinePlugins(activity)
-
-            afterPluginsLoadedEvent.invoke(true)
-
+        afterPluginsLoadedEvent.invoke(true)
 
         val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
             ?: emptyArray()) + PREBUILT_REPOSITORIES
@@ -265,16 +267,98 @@ object PluginManager {
         }
 
         main {
-            createNotification(activity, updatedPlugins)
+            val uitext = txt(R.string.plugins_updated, updatedPlugins.size)
+            createNotification(activity, uitext, updatedPlugins)
         }
 
-       // ioSafe {
+        // ioSafe {
             afterPluginsLoadedEvent.invoke(true)
-       // }
+        // }
 
         Log.i(TAG, "Plugin update done!")
     }
 
+    /**
+     * Automatically download plugins not yet existing on local
+     * 1. Gets all online data from online plugins repo
+     * 2. Fetch all not downloaded plugins
+     * 3. Download them and reload plugins
+     **/
+    fun downloadNotExistingPluginsAndLoad(activity: Activity) {
+        val newDownloadPlugins = mutableListOf<String>()
+        val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
+            ?: emptyArray()) + PREBUILT_REPOSITORIES
+        val onlinePlugins = urls.toList().apmap {
+            getRepoPlugins(it.url)?.toList() ?: emptyList()
+        }.flatten().distinctBy { it.second.url }
+
+        val providerLang = activity.getApiProviderLangSettings()
+        //Log.i(TAG, "providerLang => ${providerLang.toJson()}")
+
+        // Iterate online repos and returns not downloaded plugins
+        val notDownloadedPlugins = onlinePlugins.mapNotNull { onlineData ->
+            val sitePlugin = onlineData.second
+            //Don't include empty urls
+            if (sitePlugin.url.isBlank()) { return@mapNotNull null }
+            if (sitePlugin.repositoryUrl.isNullOrBlank()) { return@mapNotNull null }
+
+            //Omit already existing plugins
+            if (getPluginPath(activity, sitePlugin.internalName, onlineData.first).exists()) {
+                Log.i(TAG, "Skip > ${sitePlugin.internalName}")
+                return@mapNotNull null
+            }
+
+            //Omit lang not selected on language setting
+            val lang = sitePlugin.language ?: return@mapNotNull null
+            //If set to 'universal', don't skip any language
+            if (!providerLang.contains(AllLanguagesName) && !providerLang.contains(lang)) {
+                return@mapNotNull null
+            }
+            //Log.i(TAG, "sitePlugin lang => $lang")
+
+            //Omit NSFW, if disabled
+            sitePlugin.tvTypes?.let { tvtypes ->
+                if (!settingsForProvider.enableAdult) {
+                    if (tvtypes.contains(TvType.NSFW.name)) {
+                        return@mapNotNull null
+                    }
+                }
+            }
+            val savedData = PluginData(
+                url = sitePlugin.url,
+                internalName = sitePlugin.internalName,
+                isOnline = true,
+                filePath = "",
+                version = sitePlugin.version
+            )
+            OnlinePluginData(savedData, onlineData)
+        }
+        //Log.i(TAG, "notDownloadedPlugins => ${notDownloadedPlugins.toJson()}")
+
+        notDownloadedPlugins.apmap { pluginData ->
+            downloadAndLoadPlugin(
+                activity,
+                pluginData.onlineData.second.url,
+                pluginData.savedData.internalName,
+                pluginData.onlineData.first
+            ).let { success ->
+                if (success)
+                    newDownloadPlugins.add(pluginData.onlineData.second.name)
+            }
+        }
+
+        main {
+            val uitext = txt(R.string.plugins_downloaded, newDownloadPlugins.size)
+            createNotification(activity, uitext, newDownloadPlugins)
+        }
+
+        // ioSafe {
+            afterPluginsLoadedEvent.invoke(true)
+        // }
+
+        Log.i(TAG, "Plugin download done!")
+    }
+
     /**
      * Use updateAllOnlinePluginsAndLoadThem
      * */
@@ -527,12 +611,14 @@ object PluginManager {
 
     private fun createNotification(
         context: Context,
-        extensionNames: List<String>
+        uitext: UiText,
+        extensions: List<String>
     ): Notification? {
         try {
-            if (extensionNames.isEmpty()) return null
 
-            val content = extensionNames.joinToString(", ")
+            if (extensions.isEmpty()) return null
+
+            val content = extensions.joinToString(", ")
 //        main { // DON'T WANT TO SLOW IT DOWN
             val builder = NotificationCompat.Builder(context, EXTENSIONS_CHANNEL_ID)
                 .setAutoCancel(false)
@@ -541,7 +627,8 @@ object PluginManager {
                 .setSilent(true)
                 .setPriority(NotificationCompat.PRIORITY_LOW)
                 .setColor(context.colorFromAttribute(R.attr.colorPrimary))
-                .setContentTitle(context.getString(R.string.plugins_updated, extensionNames.size))
+                .setContentTitle(uitext.asString(context))
+                //.setContentTitle(context.getString(title, extensionNames.size))
                 .setSmallIcon(R.drawable.ic_baseline_extension_24)
                 .setStyle(
                     NotificationCompat.BigTextStyle()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9381372c..db042b95 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <string name="search_types_list_key" translatable="false">search_type_list</string>
     <string name="auto_update_key" translatable="false">auto_update</string>
     <string name="auto_update_plugins_key" translatable="false">auto_update_plugins</string>
+    <string name="auto_download_plugins_key" translatable="false">auto_download_plugins_key</string>
     <string name="skip_update_key" translatable="false">skip_update_key</string>
     <string name="prerelease_update_key" translatable="false">prerelease_update</string>
     <string name="manual_check_update_key" translatable="false">manual_check_update</string>
@@ -269,6 +270,7 @@
     <string name="pref_filter_search_quality">Hide selected video quality on Search results</string>
 
     <string name="automatic_plugin_updates">Automatic plugin updates</string>
+    <string name="automatic_plugin_download">Automatically download plugins</string>
     <string name="updates_settings">Show app updates</string>
     <string name="updates_settings_des">Automatically search for new updates on start</string>
     <string name="uprereleases_settings">Update to prereleases</string>
diff --git a/app/src/main/res/xml/settings_updates.xml b/app/src/main/res/xml/settings_updates.xml
index eaceb785..3a17f393 100644
--- a/app/src/main/res/xml/settings_updates.xml
+++ b/app/src/main/res/xml/settings_updates.xml
@@ -33,6 +33,11 @@
         android:icon="@drawable/ic_baseline_extension_24"
         android:key="@string/auto_update_plugins_key"
         android:title="@string/automatic_plugin_updates" />
+    <SwitchPreference
+        android:defaultValue="false"
+        android:icon="@drawable/ic_baseline_extension_24"
+        android:key="@string/auto_download_plugins_key"
+        android:title="@string/automatic_plugin_download" />
     <SwitchPreference
         android:icon="@drawable/ic_baseline_notifications_active_24"
         android:summary="@string/updates_settings_des"

From 3f658a375ed6018fc1d9171c20d4f53d9fe6ba0c Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Wed, 30 Nov 2022 21:23:19 +0100
Subject: [PATCH 087/273] Fixed MPV return intent

---
 .../lagradost/cloudstream3/CommonActivity.kt  |  4 +--
 .../lagradost/cloudstream3/MainActivity.kt    | 36 ++++++++++++++++---
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index 5f02661d..ef55eff0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -155,8 +155,8 @@ object CommonActivity {
                     val resultCode = result.resultCode
                     val data = result.data
                     if (resultCode == AppCompatActivity.RESULT_OK && data != null && resumeApp.position != null && resumeApp.duration != null) {
-                        val pos = data.getLongExtra(resumeApp.position, -1L)
-                        val dur = data.getLongExtra(resumeApp.duration, -1L)
+                        val pos = resumeApp.getPosition(data)
+                        val dur = resumeApp.getDuration(data)
                         if (dur > 0L && pos > 0L)
                             DataStoreHelper.setViewPos(getKey(resumeApp.lastId), pos, dur)
                         removeKey(resumeApp.lastId)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index d7351dc7..c038d23a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -115,13 +115,15 @@ val VLC_COMPONENT = ComponentName(VLC_PACKAGE, "$VLC_PACKAGE.gui.video.VideoPlay
 val MPV_COMPONENT = ComponentName(MPV_PACKAGE, "$MPV_PACKAGE.MPVActivity")
 
 //TODO REFACTOR AF
-data class ResultResume(
+open class ResultResume(
     val packageString: String,
     val action: String = Intent.ACTION_VIEW,
     val position: String? = null,
     val duration: String? = null,
     var launcher: ActivityResultLauncher<Intent>? = null,
 ) {
+    val defaultTime = -1L
+
     val lastId get() = "${packageString}_last_open_id"
     suspend fun launch(id: Int?, callback: suspend Intent.() -> Unit) {
         val intent = Intent(action)
@@ -135,21 +137,45 @@ data class ResultResume(
         callback.invoke(intent)
         launcher?.launch(intent)
     }
+
+    open fun getPosition(intent: Intent?): Long {
+        return defaultTime
+    }
+
+    open fun getDuration(intent: Intent?): Long {
+        return defaultTime
+    }
 }
 
-val VLC = ResultResume(
+val VLC = object : ResultResume(
     VLC_PACKAGE,
     "org.videolan.vlc.player.result",
     "extra_position",
     "extra_duration",
-)
+) {
+    override fun getPosition(intent: Intent?): Long {
+        return intent?.getLongExtra(this.position, defaultTime) ?: defaultTime
+    }
 
-val MPV = ResultResume(
+    override fun getDuration(intent: Intent?): Long {
+        return intent?.getLongExtra(this.duration, defaultTime) ?: defaultTime
+    }
+}
+
+val MPV = object : ResultResume(
     MPV_PACKAGE,
     //"is.xyz.mpv.MPVActivity.result", // resume not working :pensive:
     position = "position",
     duration = "duration",
-)
+) {
+    override fun getPosition(intent: Intent?): Long {
+        return intent?.getIntExtra(this.position, defaultTime.toInt())?.toLong() ?: defaultTime
+    }
+
+    override fun getDuration(intent: Intent?): Long {
+        return intent?.getIntExtra(this.duration, defaultTime.toInt())?.toLong() ?: defaultTime
+    }
+}
 
 val WEB_VIDEO = ResultResume(WEB_VIDEO_CAST_PACKAGE)
 

From e21574774911a4228116ad2203e54a1c9196a77f Mon Sep 17 00:00:00 2001
From: Sdarfeesh <50188628+Sdarfeesh@users.noreply.github.com>
Date: Fri, 2 Dec 2022 05:07:47 +0800
Subject: [PATCH 088/273] Update Simplified Chinese Translation (#229)

---
 app/src/main/res/values-zh/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 19d9bd43..d609b9af 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -209,6 +209,7 @@
     <string name="pref_filter_search_quality">在搜索结果中隐藏选中视频画质</string>
 
     <string name="automatic_plugin_updates">自动更新插件</string>
+    <string name="automatic_plugin_download">自动下载插件</string>
     <string name="updates_settings">显示应用更新</string>
     <string name="updates_settings_des">启动时自动搜索更新</string>
     <string name="uprereleases_settings">更新至预览版</string>

From b79e2d768f4bdb39aaa3406b499b3edb5bfec8e2 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sat, 3 Dec 2022 02:42:16 +0100
Subject: [PATCH 089/273] Fixed subtitle elevation again

---
 .../ui/player/NonFinalTextRenderer.java       | 699 +++++++++---------
 1 file changed, 366 insertions(+), 333 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
index 8602ce25..ce39a841 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
@@ -15,6 +15,8 @@
  */
 package com.lagradost.cloudstream3.ui.player;
 
+import static com.google.android.exoplayer2.text.Cue.DIMEN_UNSET;
+import static com.google.android.exoplayer2.text.Cue.LINE_TYPE_NUMBER;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.Assertions.checkState;
 import static java.lang.annotation.ElementType.TYPE_USE;
@@ -23,8 +25,10 @@ import android.os.Handler;
 import android.os.Handler.Callback;
 import android.os.Looper;
 import android.os.Message;
+
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
+
 import com.google.android.exoplayer2.BaseRenderer;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
@@ -43,13 +47,17 @@ import com.google.android.exoplayer2.text.TextOutput;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 // DO NOT CONVERT TO KOTLIN AUTOMATICALLY, IT FUCKS UP AND DOES NOT DISPLAY SUBS FOR SOME REASON
+// IF YOU CHANGE THE CODE MAKE SURE YOU GET THE CUES CORRECT!
+
 /**
  * A renderer for text.
  *
@@ -59,365 +67,390 @@ import java.util.List;
  */
 public class NonFinalTextRenderer extends BaseRenderer implements Callback {
 
-  private static final String TAG = "TextRenderer";
+    private static final String TAG = "TextRenderer";
 
-  /**
-   * @param trackType The track type that the renderer handles. One of the {@link C} {@code
-   *                  TRACK_TYPE_*} constants.
-   * @param outputHandler
-   */
-  public NonFinalTextRenderer(int trackType, @Nullable Handler outputHandler) {
-    super(trackType);
-    this.outputHandler = outputHandler;
-  }
-
-  @Documented
-  @Retention(RetentionPolicy.SOURCE)
-  @Target(TYPE_USE)
-  @IntDef({
-    REPLACEMENT_STATE_NONE,
-    REPLACEMENT_STATE_SIGNAL_END_OF_STREAM,
-    REPLACEMENT_STATE_WAIT_END_OF_STREAM
-  })
-  private @interface ReplacementState {}
-  /** The decoder does not need to be replaced. */
-  private static final int REPLACEMENT_STATE_NONE = 0;
-  /**
-   * The decoder needs to be replaced, but we haven't yet signaled an end of stream to the existing
-   * decoder. We need to do so in order to ensure that it outputs any remaining buffers before we
-   * release it.
-   */
-  private static final int REPLACEMENT_STATE_SIGNAL_END_OF_STREAM = 1;
-  /**
-   * The decoder needs to be replaced, and we've signaled an end of stream to the existing decoder.
-   * We're waiting for the decoder to output an end of stream signal to indicate that it has output
-   * any remaining buffers before we release it.
-   */
-  private static final int REPLACEMENT_STATE_WAIT_END_OF_STREAM = 2;
-
-  private static final int MSG_UPDATE_OUTPUT = 0;
-
-  @Nullable private final Handler outputHandler;
-  private TextOutput output = null;
-  private SubtitleDecoderFactory decoderFactory = null;
-  private FormatHolder formatHolder = null;
-
-  private boolean inputStreamEnded;
-  private boolean outputStreamEnded;
-  private boolean waitingForKeyFrame;
-  private @ReplacementState int decoderReplacementState;
-  @Nullable private Format streamFormat;
-  @Nullable private SubtitleDecoder decoder;
-  @Nullable private SubtitleInputBuffer nextInputBuffer;
-  @Nullable private SubtitleOutputBuffer subtitle;
-  @Nullable private SubtitleOutputBuffer nextSubtitle;
-  private int nextSubtitleEventIndex;
-  private long finalStreamEndPositionUs;
-
-  /**
-   * @param output The output.
-   * @param outputLooper The looper associated with the thread on which the output should be called.
-   *     If the output makes use of standard Android UI components, then this should normally be the
-   *     looper associated with the application's main thread, which can be obtained using {@link
-   *     android.app.Activity#getMainLooper()}. Null may be passed if the output should be called
-   *     directly on the player's internal rendering thread.
-   */
-  public NonFinalTextRenderer(TextOutput output, @Nullable Looper outputLooper) {
-    this(output, outputLooper, SubtitleDecoderFactory.DEFAULT);
-  }
-
-  /**
-   * @param output The output.
-   * @param outputLooper The looper associated with the thread on which the output should be called.
-   *     If the output makes use of standard Android UI components, then this should normally be the
-   *     looper associated with the application's main thread, which can be obtained using {@link
-   *     android.app.Activity#getMainLooper()}. Null may be passed if the output should be called
-   *     directly on the player's internal rendering thread.
-   * @param decoderFactory A factory from which to obtain {@link SubtitleDecoder} instances.
-   */
-  public NonFinalTextRenderer(
-      TextOutput output, @Nullable Looper outputLooper, SubtitleDecoderFactory decoderFactory) {
-    super(C.TRACK_TYPE_TEXT);
-    this.output = checkNotNull(output);
-    this.outputHandler =
-        outputLooper == null ? null : Util.createHandler(outputLooper, /* callback= */ this);
-    this.decoderFactory = decoderFactory;
-    formatHolder = new FormatHolder();
-    finalStreamEndPositionUs = C.TIME_UNSET;
-  }
-
-  @Override
-  public String getName() {
-    return TAG;
-  }
-
-  @Override
-  public @Capabilities int supportsFormat(Format format) {
-    if (decoderFactory.supportsFormat(format)) {
-      return RendererCapabilities.create(
-          format.cryptoType == C.CRYPTO_TYPE_NONE ? C.FORMAT_HANDLED : C.FORMAT_UNSUPPORTED_DRM);
-    } else if (MimeTypes.isText(format.sampleMimeType)) {
-      return RendererCapabilities.create(C.FORMAT_UNSUPPORTED_SUBTYPE);
-    } else {
-      return RendererCapabilities.create(C.FORMAT_UNSUPPORTED_TYPE);
-    }
-  }
-
-  /**
-   * Sets the position at which to stop rendering the current stream.
-   *
-   * <p>Must be called after {@link #setCurrentStreamFinal()}.
-   *
-   * @param streamEndPositionUs The position to stop rendering at or {@link C#LENGTH_UNSET} to
-   *     render until the end of the current stream.
-   */
-  // TODO(internal b/181312195): Remove this when it's no longer needed once subtitles are decoded
-  // on the loading side of SampleQueue.
-  public void setFinalStreamEndPositionUs(long streamEndPositionUs) {
-    checkState(isCurrentStreamFinal());
-    this.finalStreamEndPositionUs = streamEndPositionUs;
-  }
-
-  @Override
-  protected void onStreamChanged(Format[] formats, long startPositionUs, long offsetUs) {
-    streamFormat = formats[0];
-    if (decoder != null) {
-      decoderReplacementState = REPLACEMENT_STATE_SIGNAL_END_OF_STREAM;
-    } else {
-      initDecoder();
-    }
-  }
-
-  @Override
-  protected void onPositionReset(long positionUs, boolean joining) {
-    clearOutput();
-    inputStreamEnded = false;
-    outputStreamEnded = false;
-    finalStreamEndPositionUs = C.TIME_UNSET;
-    if (decoderReplacementState != REPLACEMENT_STATE_NONE) {
-      replaceDecoder();
-    } else {
-      releaseBuffers();
-      checkNotNull(decoder).flush();
-    }
-  }
-
-  @Override
-  public void render(long positionUs, long elapsedRealtimeUs) {
-    if (isCurrentStreamFinal()
-        && finalStreamEndPositionUs != C.TIME_UNSET
-        && positionUs >= finalStreamEndPositionUs) {
-      releaseBuffers();
-      outputStreamEnded = true;
+    /**
+     * @param trackType     The track type that the renderer handles. One of the {@link C} {@code
+     *                      TRACK_TYPE_*} constants.
+     * @param outputHandler
+     */
+    public NonFinalTextRenderer(int trackType, @Nullable Handler outputHandler) {
+        super(trackType);
+        this.outputHandler = outputHandler;
     }
 
-    if (outputStreamEnded) {
-      return;
+    @Documented
+    @Retention(RetentionPolicy.SOURCE)
+    @Target(TYPE_USE)
+    @IntDef({
+            REPLACEMENT_STATE_NONE,
+            REPLACEMENT_STATE_SIGNAL_END_OF_STREAM,
+            REPLACEMENT_STATE_WAIT_END_OF_STREAM
+    })
+    private @interface ReplacementState {
     }
 
-    if (nextSubtitle == null) {
-      checkNotNull(decoder).setPositionUs(positionUs);
-      try {
-        nextSubtitle = checkNotNull(decoder).dequeueOutputBuffer();
-      } catch (SubtitleDecoderException e) {
-        handleDecoderError(e);
-        return;
-      }
+    /**
+     * The decoder does not need to be replaced.
+     */
+    private static final int REPLACEMENT_STATE_NONE = 0;
+    /**
+     * The decoder needs to be replaced, but we haven't yet signaled an end of stream to the existing
+     * decoder. We need to do so in order to ensure that it outputs any remaining buffers before we
+     * release it.
+     */
+    private static final int REPLACEMENT_STATE_SIGNAL_END_OF_STREAM = 1;
+    /**
+     * The decoder needs to be replaced, and we've signaled an end of stream to the existing decoder.
+     * We're waiting for the decoder to output an end of stream signal to indicate that it has output
+     * any remaining buffers before we release it.
+     */
+    private static final int REPLACEMENT_STATE_WAIT_END_OF_STREAM = 2;
+
+    private static final int MSG_UPDATE_OUTPUT = 0;
+
+    @Nullable
+    private final Handler outputHandler;
+    private TextOutput output = null;
+    private SubtitleDecoderFactory decoderFactory = null;
+    private FormatHolder formatHolder = null;
+
+    private boolean inputStreamEnded;
+    private boolean outputStreamEnded;
+    private boolean waitingForKeyFrame;
+    private @ReplacementState int decoderReplacementState;
+    @Nullable
+    private Format streamFormat;
+    @Nullable
+    private SubtitleDecoder decoder;
+    @Nullable
+    private SubtitleInputBuffer nextInputBuffer;
+    @Nullable
+    private SubtitleOutputBuffer subtitle;
+    @Nullable
+    private SubtitleOutputBuffer nextSubtitle;
+    private int nextSubtitleEventIndex;
+    private long finalStreamEndPositionUs;
+
+    /**
+     * @param output       The output.
+     * @param outputLooper The looper associated with the thread on which the output should be called.
+     *                     If the output makes use of standard Android UI components, then this should normally be the
+     *                     looper associated with the application's main thread, which can be obtained using {@link
+     *                     android.app.Activity#getMainLooper()}. Null may be passed if the output should be called
+     *                     directly on the player's internal rendering thread.
+     */
+    public NonFinalTextRenderer(TextOutput output, @Nullable Looper outputLooper) {
+        this(output, outputLooper, SubtitleDecoderFactory.DEFAULT);
     }
 
-    if (getState() != STATE_STARTED) {
-      return;
+    /**
+     * @param output         The output.
+     * @param outputLooper   The looper associated with the thread on which the output should be called.
+     *                       If the output makes use of standard Android UI components, then this should normally be the
+     *                       looper associated with the application's main thread, which can be obtained using {@link
+     *                       android.app.Activity#getMainLooper()}. Null may be passed if the output should be called
+     *                       directly on the player's internal rendering thread.
+     * @param decoderFactory A factory from which to obtain {@link SubtitleDecoder} instances.
+     */
+    public NonFinalTextRenderer(
+            TextOutput output, @Nullable Looper outputLooper, SubtitleDecoderFactory decoderFactory) {
+        super(C.TRACK_TYPE_TEXT);
+        this.output = checkNotNull(output);
+        this.outputHandler =
+                outputLooper == null ? null : Util.createHandler(outputLooper, /* callback= */ this);
+        this.decoderFactory = decoderFactory;
+        formatHolder = new FormatHolder();
+        finalStreamEndPositionUs = C.TIME_UNSET;
     }
 
-    boolean textRendererNeedsUpdate = false;
-    if (subtitle != null) {
-      // We're iterating through the events in a subtitle. Set textRendererNeedsUpdate if we
-      // advance to the next event.
-      long subtitleNextEventTimeUs = getNextEventTime();
-      while (subtitleNextEventTimeUs <= positionUs) {
-        nextSubtitleEventIndex++;
-        subtitleNextEventTimeUs = getNextEventTime();
-        textRendererNeedsUpdate = true;
-      }
+    @Override
+    public String getName() {
+        return TAG;
     }
-    if (nextSubtitle != null) {
-      SubtitleOutputBuffer nextSubtitle = this.nextSubtitle;
-      if (nextSubtitle.isEndOfStream()) {
-        if (!textRendererNeedsUpdate && getNextEventTime() == Long.MAX_VALUE) {
-          if (decoderReplacementState == REPLACEMENT_STATE_WAIT_END_OF_STREAM) {
+
+    @Override
+    public @Capabilities int supportsFormat(Format format) {
+        if (decoderFactory.supportsFormat(format)) {
+            return RendererCapabilities.create(
+                    format.cryptoType == C.CRYPTO_TYPE_NONE ? C.FORMAT_HANDLED : C.FORMAT_UNSUPPORTED_DRM);
+        } else if (MimeTypes.isText(format.sampleMimeType)) {
+            return RendererCapabilities.create(C.FORMAT_UNSUPPORTED_SUBTYPE);
+        } else {
+            return RendererCapabilities.create(C.FORMAT_UNSUPPORTED_TYPE);
+        }
+    }
+
+    /**
+     * Sets the position at which to stop rendering the current stream.
+     *
+     * <p>Must be called after {@link #setCurrentStreamFinal()}.
+     *
+     * @param streamEndPositionUs The position to stop rendering at or {@link C#LENGTH_UNSET} to
+     *                            render until the end of the current stream.
+     */
+    // TODO(internal b/181312195): Remove this when it's no longer needed once subtitles are decoded
+    // on the loading side of SampleQueue.
+    public void setFinalStreamEndPositionUs(long streamEndPositionUs) {
+        checkState(isCurrentStreamFinal());
+        this.finalStreamEndPositionUs = streamEndPositionUs;
+    }
+
+    @Override
+    protected void onStreamChanged(Format[] formats, long startPositionUs, long offsetUs) {
+        streamFormat = formats[0];
+        if (decoder != null) {
+            decoderReplacementState = REPLACEMENT_STATE_SIGNAL_END_OF_STREAM;
+        } else {
+            initDecoder();
+        }
+    }
+
+    @Override
+    protected void onPositionReset(long positionUs, boolean joining) {
+        clearOutput();
+        inputStreamEnded = false;
+        outputStreamEnded = false;
+        finalStreamEndPositionUs = C.TIME_UNSET;
+        if (decoderReplacementState != REPLACEMENT_STATE_NONE) {
             replaceDecoder();
-          } else {
+        } else {
+            releaseBuffers();
+            checkNotNull(decoder).flush();
+        }
+    }
+
+    @Override
+    public void render(long positionUs, long elapsedRealtimeUs) {
+        if (isCurrentStreamFinal()
+                && finalStreamEndPositionUs != C.TIME_UNSET
+                && positionUs >= finalStreamEndPositionUs) {
             releaseBuffers();
             outputStreamEnded = true;
-          }
         }
-      } else if (nextSubtitle.timeUs <= positionUs) {
-        // Advance to the next subtitle. Sync the next event index and trigger an update.
-        if (subtitle != null) {
-          subtitle.release();
-        }
-        nextSubtitleEventIndex = nextSubtitle.getNextEventTimeIndex(positionUs);
-        subtitle = nextSubtitle;
-        this.nextSubtitle = null;
-        textRendererNeedsUpdate = true;
-      }
-    }
 
-    if (textRendererNeedsUpdate) {
-      // If textRendererNeedsUpdate then subtitle must be non-null.
-      checkNotNull(subtitle);
-      // textRendererNeedsUpdate is set and we're playing. Update the renderer.
-      updateOutput(subtitle.getCues(positionUs));
-    }
-
-    if (decoderReplacementState == REPLACEMENT_STATE_WAIT_END_OF_STREAM) {
-      return;
-    }
-
-    try {
-      while (!inputStreamEnded) {
-        @Nullable SubtitleInputBuffer nextInputBuffer = this.nextInputBuffer;
-        if (nextInputBuffer == null) {
-          nextInputBuffer = checkNotNull(decoder).dequeueInputBuffer();
-          if (nextInputBuffer == null) {
+        if (outputStreamEnded) {
             return;
-          }
-          this.nextInputBuffer = nextInputBuffer;
         }
-        if (decoderReplacementState == REPLACEMENT_STATE_SIGNAL_END_OF_STREAM) {
-          nextInputBuffer.setFlags(C.BUFFER_FLAG_END_OF_STREAM);
-          checkNotNull(decoder).queueInputBuffer(nextInputBuffer);
-          this.nextInputBuffer = null;
-          decoderReplacementState = REPLACEMENT_STATE_WAIT_END_OF_STREAM;
-          return;
-        }
-        // Try and read the next subtitle from the source.
-        @ReadDataResult int result = readSource(formatHolder, nextInputBuffer, /* readFlags= */ 0);
-        if (result == C.RESULT_BUFFER_READ) {
-          if (nextInputBuffer.isEndOfStream()) {
-            inputStreamEnded = true;
-            waitingForKeyFrame = false;
-          } else {
-            @Nullable Format format = formatHolder.format;
-            if (format == null) {
-              // We haven't received a format yet.
-              return;
+
+        if (nextSubtitle == null) {
+            checkNotNull(decoder).setPositionUs(positionUs);
+            try {
+                nextSubtitle = checkNotNull(decoder).dequeueOutputBuffer();
+            } catch (SubtitleDecoderException e) {
+                handleDecoderError(e);
+                return;
             }
-            nextInputBuffer.subsampleOffsetUs = format.subsampleOffsetUs;
-            nextInputBuffer.flip();
-            waitingForKeyFrame &= !nextInputBuffer.isKeyFrame();
-          }
-          if (!waitingForKeyFrame) {
-            checkNotNull(decoder).queueInputBuffer(nextInputBuffer);
-            this.nextInputBuffer = null;
-          }
-        } else if (result == C.RESULT_NOTHING_READ) {
-          return;
         }
-      }
-    } catch (SubtitleDecoderException e) {
-      handleDecoderError(e);
+
+        if (getState() != STATE_STARTED) {
+            return;
+        }
+
+        boolean textRendererNeedsUpdate = false;
+        if (subtitle != null) {
+            // We're iterating through the events in a subtitle. Set textRendererNeedsUpdate if we
+            // advance to the next event.
+            long subtitleNextEventTimeUs = getNextEventTime();
+            while (subtitleNextEventTimeUs <= positionUs) {
+                nextSubtitleEventIndex++;
+                subtitleNextEventTimeUs = getNextEventTime();
+                textRendererNeedsUpdate = true;
+            }
+        }
+        if (nextSubtitle != null) {
+            SubtitleOutputBuffer nextSubtitle = this.nextSubtitle;
+            if (nextSubtitle.isEndOfStream()) {
+                if (!textRendererNeedsUpdate && getNextEventTime() == Long.MAX_VALUE) {
+                    if (decoderReplacementState == REPLACEMENT_STATE_WAIT_END_OF_STREAM) {
+                        replaceDecoder();
+                    } else {
+                        releaseBuffers();
+                        outputStreamEnded = true;
+                    }
+                }
+            } else if (nextSubtitle.timeUs <= positionUs) {
+                // Advance to the next subtitle. Sync the next event index and trigger an update.
+                if (subtitle != null) {
+                    subtitle.release();
+                }
+                nextSubtitleEventIndex = nextSubtitle.getNextEventTimeIndex(positionUs);
+                subtitle = nextSubtitle;
+                this.nextSubtitle = null;
+                textRendererNeedsUpdate = true;
+            }
+        }
+
+        if (textRendererNeedsUpdate) {
+            // If textRendererNeedsUpdate then subtitle must be non-null.
+            checkNotNull(subtitle);
+            // textRendererNeedsUpdate is set and we're playing. Update the renderer.
+            updateOutput(subtitle.getCues(positionUs));
+        }
+
+        if (decoderReplacementState == REPLACEMENT_STATE_WAIT_END_OF_STREAM) {
+            return;
+        }
+
+        try {
+            while (!inputStreamEnded) {
+                @Nullable SubtitleInputBuffer nextInputBuffer = this.nextInputBuffer;
+                if (nextInputBuffer == null) {
+                    nextInputBuffer = checkNotNull(decoder).dequeueInputBuffer();
+                    if (nextInputBuffer == null) {
+                        return;
+                    }
+                    this.nextInputBuffer = nextInputBuffer;
+                }
+                if (decoderReplacementState == REPLACEMENT_STATE_SIGNAL_END_OF_STREAM) {
+                    nextInputBuffer.setFlags(C.BUFFER_FLAG_END_OF_STREAM);
+                    checkNotNull(decoder).queueInputBuffer(nextInputBuffer);
+                    this.nextInputBuffer = null;
+                    decoderReplacementState = REPLACEMENT_STATE_WAIT_END_OF_STREAM;
+                    return;
+                }
+                // Try and read the next subtitle from the source.
+                @ReadDataResult int result = readSource(formatHolder, nextInputBuffer, /* readFlags= */ 0);
+                if (result == C.RESULT_BUFFER_READ) {
+                    if (nextInputBuffer.isEndOfStream()) {
+                        inputStreamEnded = true;
+                        waitingForKeyFrame = false;
+                    } else {
+                        @Nullable Format format = formatHolder.format;
+                        if (format == null) {
+                            // We haven't received a format yet.
+                            return;
+                        }
+                        nextInputBuffer.subsampleOffsetUs = format.subsampleOffsetUs;
+                        nextInputBuffer.flip();
+                        waitingForKeyFrame &= !nextInputBuffer.isKeyFrame();
+                    }
+                    if (!waitingForKeyFrame) {
+                        checkNotNull(decoder).queueInputBuffer(nextInputBuffer);
+                        this.nextInputBuffer = null;
+                    }
+                } else if (result == C.RESULT_NOTHING_READ) {
+                    return;
+                }
+            }
+        } catch (SubtitleDecoderException e) {
+            handleDecoderError(e);
+        }
     }
-  }
 
-  @Override
-  protected void onDisabled() {
-    streamFormat = null;
-    finalStreamEndPositionUs = C.TIME_UNSET;
-    clearOutput();
-    releaseDecoder();
-  }
-
-  @Override
-  public boolean isEnded() {
-    return outputStreamEnded;
-  }
-
-  @Override
-  public boolean isReady() {
-    // Don't block playback whilst subtitles are loading.
-    // Note: To change this behavior, it will be necessary to consider [Internal: b/12949941].
-    return true;
-  }
-
-  private void releaseBuffers() {
-    nextInputBuffer = null;
-    nextSubtitleEventIndex = C.INDEX_UNSET;
-    if (subtitle != null) {
-      subtitle.release();
-      subtitle = null;
+    @Override
+    protected void onDisabled() {
+        streamFormat = null;
+        finalStreamEndPositionUs = C.TIME_UNSET;
+        clearOutput();
+        releaseDecoder();
     }
-    if (nextSubtitle != null) {
-      nextSubtitle.release();
-      nextSubtitle = null;
+
+    @Override
+    public boolean isEnded() {
+        return outputStreamEnded;
     }
-  }
 
-  private void releaseDecoder() {
-    releaseBuffers();
-    checkNotNull(decoder).release();
-    decoder = null;
-    decoderReplacementState = REPLACEMENT_STATE_NONE;
-  }
-
-  private void initDecoder() {
-    waitingForKeyFrame = true;
-    decoder = decoderFactory.createDecoder(checkNotNull(streamFormat));
-  }
-
-  private void replaceDecoder() {
-    releaseDecoder();
-    initDecoder();
-  }
-
-  private long getNextEventTime() {
-    if (nextSubtitleEventIndex == C.INDEX_UNSET) {
-      return Long.MAX_VALUE;
-    }
-    checkNotNull(subtitle);
-    return nextSubtitleEventIndex >= subtitle.getEventTimeCount()
-        ? Long.MAX_VALUE
-        : subtitle.getEventTime(nextSubtitleEventIndex);
-  }
-
-  private void updateOutput(List<Cue> cues) {
-    if (outputHandler != null) {
-      outputHandler.obtainMessage(MSG_UPDATE_OUTPUT, cues).sendToTarget();
-    } else {
-      invokeUpdateOutputInternal(cues);
-    }
-  }
-
-  private void clearOutput() {
-    updateOutput(Collections.emptyList());
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public boolean handleMessage(Message msg) {
-    switch (msg.what) {
-      case MSG_UPDATE_OUTPUT:
-        invokeUpdateOutputInternal((List<Cue>) msg.obj);
+    @Override
+    public boolean isReady() {
+        // Don't block playback whilst subtitles are loading.
+        // Note: To change this behavior, it will be necessary to consider [Internal: b/12949941].
         return true;
-      default:
-        throw new IllegalStateException();
     }
-  }
 
-  private void invokeUpdateOutputInternal(List<Cue> cues) {
-    output.onCues(cues);
-    output.onCues(new CueGroup(cues));
-  }
+    private void releaseBuffers() {
+        nextInputBuffer = null;
+        nextSubtitleEventIndex = C.INDEX_UNSET;
+        if (subtitle != null) {
+            subtitle.release();
+            subtitle = null;
+        }
+        if (nextSubtitle != null) {
+            nextSubtitle.release();
+            nextSubtitle = null;
+        }
+    }
 
-  /**
-   * Called when {@link #decoder} throws an exception, so it can be logged and playback can
-   * continue.
-   *
-   * <p>Logs {@code e} and resets state to allow decoding the next sample.
-   */
-  private void handleDecoderError(SubtitleDecoderException e) {
-    Log.e(TAG, "Subtitle decoding failed. streamFormat=" + streamFormat, e);
-    clearOutput();
-    replaceDecoder();
-  }
+    private void releaseDecoder() {
+        releaseBuffers();
+        checkNotNull(decoder).release();
+        decoder = null;
+        decoderReplacementState = REPLACEMENT_STATE_NONE;
+    }
+
+    private void initDecoder() {
+        waitingForKeyFrame = true;
+        decoder = decoderFactory.createDecoder(checkNotNull(streamFormat));
+    }
+
+    private void replaceDecoder() {
+        releaseDecoder();
+        initDecoder();
+    }
+
+    private long getNextEventTime() {
+        if (nextSubtitleEventIndex == C.INDEX_UNSET) {
+            return Long.MAX_VALUE;
+        }
+        checkNotNull(subtitle);
+        return nextSubtitleEventIndex >= subtitle.getEventTimeCount()
+                ? Long.MAX_VALUE
+                : subtitle.getEventTime(nextSubtitleEventIndex);
+    }
+
+    private void updateOutput(List<Cue> cues) {
+        if (outputHandler != null) {
+            outputHandler.obtainMessage(MSG_UPDATE_OUTPUT, cues).sendToTarget();
+        } else {
+            invokeUpdateOutputInternal(cues);
+        }
+    }
+
+    private void clearOutput() {
+        updateOutput(Collections.emptyList());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public boolean handleMessage(Message msg) {
+        switch (msg.what) {
+            case MSG_UPDATE_OUTPUT:
+                invokeUpdateOutputInternal((List<Cue>) msg.obj);
+                return true;
+            default:
+                throw new IllegalStateException();
+        }
+    }
+
+    private void invokeUpdateOutputInternal(List<Cue> cues) {
+        // See https://github.com/google/ExoPlayer/issues/7934
+        // SubripDecoder texts tend to be DIMEN_UNSET which pushes up the
+        // subs unlike WEBVTT which creates an inconsistency
+
+        List<Cue> fixedCues = cues.stream().map(
+                cue -> {
+                    Cue.Builder builder = cue.buildUpon();
+
+                    if (cue.line == DIMEN_UNSET)
+                        builder.setLine(-1f, LINE_TYPE_NUMBER);
+
+                    return builder.setSize(DIMEN_UNSET).build();
+                }
+        ).collect(Collectors.toList());
+
+        output.onCues(fixedCues);
+        output.onCues(new CueGroup(fixedCues));
+    }
+
+    /**
+     * Called when {@link #decoder} throws an exception, so it can be logged and playback can
+     * continue.
+     *
+     * <p>Logs {@code e} and resets state to allow decoding the next sample.
+     */
+    private void handleDecoderError(SubtitleDecoderException e) {
+        Log.e(TAG, "Subtitle decoding failed. streamFormat=" + streamFormat, e);
+        clearOutput();
+        replaceDecoder();
+    }
 }

From eb90b79bf9abfceedc9b9967e5d5260f84344745 Mon Sep 17 00:00:00 2001
From: SANCTI-afk <63229113+SANCTI-afk@users.noreply.github.com>
Date: Sat, 3 Dec 2022 15:17:33 +0200
Subject: [PATCH 090/273] Arabic language update for latest keys  (#231)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* arabicLanguage100%

* Update strings.xml

* Arabic Full

* translated(preffVplayerBtn)

* renamed homeBtn for arabic layout

* Arabic language update

No more typical ×
Common language instead ✓

* Arabic translation minor update

Last commit ready to be merged

* arabic language update for latest keys

* ready to merge

* last minor edit and ready to merge
---
 app/src/main/res/values-ar/strings.xml | 34 ++++++++++++++------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index bda3cf2a..b3676fa6 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -6,7 +6,7 @@
     <string name="home_main_poster_img_des">الملصق الرئيسي</string>
     <string name="home_next_random_img_des">التالي عشوائي</string>
 
-    <string name="go_back_img_des">ارجع للخلف</string>
+    <string name="go_back_img_des">رجوع</string>
 
     <string name="home_change_provider_img_des">تغيير المصدر</string>
     <string name="preview_background_img_des">معاينة الخلفية</string>
@@ -38,7 +38,7 @@
     <string name="loading">…تحميل</string>
 
     <string name="type_watching">أشاهده</string>
-    <string name="type_on_hold">في الانتظار</string>
+    <string name="type_on_hold">في الإنتظار</string>
     <string name="type_completed">مكتمل</string>
     <string name="type_dropped">مهمل</string>
     <string name="type_plan_to_watch">أخطط لمشاهدته</string>
@@ -100,7 +100,7 @@
     <string name="subs_background_color">لون الخلفية</string>
     <string name="subs_window_color">لون النافذة</string>
     <string name="subs_edge_type">نوع الحافة</string>
-    <string name="subs_subtitle_elevation">ارتفاع الترجمة</string>
+    <string name="subs_subtitle_elevation">إرتفاع الترجمة</string>
     <string name="subs_font">الخط</string>
     <string name="subs_font_size">حجم الخط</string>
 
@@ -111,7 +111,7 @@
     <string name="benene_count_text_none">لم يتم إعطاء موز</string>
 
     <string name="subs_auto_select_language">تحديد اللغة تلقائيًا</string>
-    <string name="subs_download_languages">تحميل اللغات</string>
+    <string name="subs_download_languages">لغات التحميل</string>
     <string name="subs_subtitle_languages">لغة الترجمة</string>
     <string name="subs_hold_to_reset_to_default">إضغط بإستمرار لإعادة التعيين للإعدادات الافتراضية</string>
     <string name="subs_import_text" formatted="true">إستيراد خطوط بوضعها هنا %s</string>
@@ -185,9 +185,10 @@
     <string name="pref_filter_search_quality">إخفاء جودة الفيديو المختارة من نتائج البحث</string>
 
     <string name="automatic_plugin_updates">تحديث الإضافات تلقائيًا</string>
+    <string name="automatic_plugin_download">تنزيل الإضافات تلقائيًا</string>
     <string name="updates_settings">التحديث التلقائي</string>
     <string name="updates_settings_des">البحث تلقائيًا عن التحديثات الجديدة عند البداية</string>
-    <string name="uprereleases_settings">التحديث إلى الاصدارات التجريبيه (بيتا)</string>
+    <string name="uprereleases_settings">التحديث إلى الاصدارات التجريبية (بيتا)</string>
     <string name="uprereleases_settings_des">البحث عن التحديثات التجريبية بدلاً من الإصدارات الكاملة فقط</string>
     <string name="github">Github</string>
     <string name="lightnovel">تطبيق روايات خفيف من نفس المطورين</string>
@@ -255,7 +256,7 @@
     <!--singular-->
     <string name="movies_singular">فيلم</string>
     <string name="tv_series_singular">مسلسل</string>
-    <string name="cartoons_singular">كارتون</string>
+    <string name="cartoons_singular">كرتون</string>
     <string name="anime_singular">@string/anime</string>
     <string name="ova_singular">@string/ova</string>
     <string name="torrent_singular">تورنت</string>
@@ -353,7 +354,7 @@
     <string name="category_general">عام</string>
     <string name="random_button_settings">زر العشوائي</string>
     <string name="random_button_settings_desc">إظهار زر العشوائي علي الشاشة الرئيسية</string>
-    <string name="provider_lang_settings">لغات الموفر</string>
+    <string name="provider_lang_settings">لغات المزود</string>
     <string name="app_layout">واجهة التطبيق</string>
     <string name="preferred_media_settings">المحتوي المفضل</string>
     <string name="enable_nsfw_on_providers">تفعيل محتوي البالغين داخل المزودين المدعومين</string>
@@ -378,13 +379,13 @@
     <string name="mal_key" translatable="false">mal_key</string>
     <string name="opensubtitles_key" translatable="false">opensubtitles_key</string>
     <string name="nginx_key" translatable="false">nginx_key</string>
-    <string name="example_password">password123</string>
-    <string name="example_username">MyCoolUsername</string>
-    <string name="example_email">hello@world.com</string>
+    <string name="example_password">كلمة المرور</string>
+    <string name="example_username">إسم المستخدم</string>
+    <string name="example_email">البريد الإلكتروني</string>
     <string name="example_ip">127.0.0.1</string>
-    <string name="example_site_name">MyCoolSite</string>
-    <string name="example_site_url">example.com</string>
-    <string name="example_lang_name">Language code (en)</string>
+    <string name="example_site_name">إسم الموقع</string>
+    <string name="example_site_url">رابط الموقع</string>
+    <string name="example_lang_name">اللغة (الإنجليزية)</string>
 
     <!--
     <string name="mal_account_settings" translatable="false">MAL</string>
@@ -489,7 +490,7 @@
     <string name="previous">السابق</string>
     <string name="skip_setup">تخطي الإعداد</string>
     <string name="app_layout_subtext">تغيير شكل البرنامح حتي يلائم جهازك</string>
-    <string name="crash_reporting_title">ابلاغ الاعطال</string>
+    <string name="crash_reporting_title">إبلاغ الأعطال</string>
     <string name="preferred_media_subtext">ماذا تريد ان تري</string>
     <string name="setup_done">تم</string>
     <string name="extensions">الإضافات</string>
@@ -522,7 +523,7 @@
     <string name="tracks">المسارات</string>
     <string name="audio_tracks">مسار الصوت</string>
     <string name="video_tracks">مسار الفيديو</string>
-    <string name="apply_on_restart">تطبيق بعد إعادة الفتح</string>
+    <string name="apply_on_restart">تطبيق بعد إعادة التشغيل</string>
 
     <string name="safe_mode_title">وضع الامان مفعل</string>
     <string name="safe_mode_description">An unrecoverable crash occurred and we\'ve automatically disabled all extensions, so you can find and remove the extension which is causing trouble.</string>
@@ -539,4 +540,7 @@
 
     <string name="hls_playlist">قائمة HLS</string>
     <string name="player_pref">مُشغل الفيديو المفضل</string>
+    <string name="clear_history">مسح السجل</string>
+    <string name="history">السجل</string>
+    <string name="enable_skip_op_from_database_des">عرض زر تخطي المقدمة/الخاتمة</string>
 </resources>

From 42d1dd9f7d2e81a2688f98b249a5b0a291662a7a Mon Sep 17 00:00:00 2001
From: Jace <54625750+Jacekun@users.noreply.github.com>
Date: Sat, 3 Dec 2022 22:48:56 +0800
Subject: [PATCH 091/273] [Feature] Use subtitle filename, instead of movie
 title for Opensubtitles search. (#223)

* [Feature] Use subtitle filename, instead of movie title for Opensubtitles search.

* Optimize iteration for first not null value
---
 .../syncproviders/providers/OpenSubtitlesApi.kt           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
index f22fdd8b..d5d6400c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
@@ -200,8 +200,12 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
             it.data?.forEach { item ->
                 val attr = item.attributes ?: return@forEach
                 val featureDetails = attr.featDetails
+                //Use filename as name, if its valid
+                val filename = attr.files?.firstNotNullOfOrNull { subfile ->
+                    subfile.fileName
+                }
                 //Use any valid name/title in hierarchy
-                val name = featureDetails?.movieName ?: featureDetails?.title
+                val name = filename ?: featureDetails?.movieName ?: featureDetails?.title
                 ?: featureDetails?.parentTitle ?: attr.release ?: ""
                 val lang = fixLanguageReverse(attr.language)?: ""
                 val resEpNum = featureDetails?.episodeNumber ?: query.epNumber
@@ -330,4 +334,4 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         @JsonProperty("parent_tmdb_id") var parentTmdbId: Int? = null,
         @JsonProperty("parent_feature_id") var parentFeatureId: Int? = null
     )
-}
\ No newline at end of file
+}

From 2222a1b07b45bef01f95f4b347b7320f615e667a Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Sat, 3 Dec 2022 22:55:53 +0100
Subject: [PATCH 092/273] fixed rolling cache + update UI text color

---
 .../cloudstream3/ui/APIRepository.kt          |  36 +++-
 .../cloudstream3/ui/home/HomeFragment.kt      |   2 +
 .../cloudstream3/ui/home/HomeScrollAdapter.kt |   7 +-
 .../ui/settings/SettingsProviders.kt          |   2 -
 app/src/main/res/layout/fragment_home.xml     |   5 +-
 .../main/res/layout/home_result_big_grid.xml  |   5 +-
 app/src/main/res/layout/home_result_grid.xml  | 156 ++++++++---------
 .../res/layout/home_result_grid_expanded.xml  | 158 +++++++++---------
 .../main/res/layout/search_result_grid.xml    | 149 ++++++++---------
 .../layout/search_result_grid_expanded.xml    | 137 +++++++--------
 app/src/main/res/values/colors.xml            |   6 +-
 app/src/main/res/values/dimens.xml            |   1 -
 app/src/main/res/values/styles.xml            |  26 ++-
 13 files changed, 349 insertions(+), 341 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
index ef50019c..2c50a6c6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.ui
 
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
@@ -31,26 +32,47 @@ class APIRepository(val api: MainAPI) {
             return data.isEmpty() || data == "[]" || data == "about:blank"
         }
 
-        private val cacheHash: HashMap<Pair<String, String>, LoadResponse> = hashMapOf()
+        data class SavedLoadResponse(
+            val unixTime: Long,
+            val response: LoadResponse,
+            val hash: Pair<String, String>
+        )
+
+
+        private val cache: ArrayList<SavedLoadResponse> = arrayListOf()
+        private var cacheIndex: Int = 0
+        const val cacheSize = 20
     }
 
     val hasMainPage = api.hasMainPage
+    val providerType = api.providerType
     val name = api.name
     val mainUrl = api.mainUrl
     val mainPage = api.mainPage
     val hasQuickSearch = api.hasQuickSearch
     val vpnStatus = api.vpnStatus
-    val providerType = api.providerType
 
     suspend fun load(url: String): Resource<LoadResponse> {
         return safeApiCall {
             if (isInvalidData(url)) throw ErrorLoadingException()
             val fixedUrl = api.fixUrl(url)
-            val key = Pair(api.name, url)
-            cacheHash[key] ?: api.load(fixedUrl)?.also {
-                // we cache 20 responses because ppl often go back to the same shit + 20 because I dont want to cause too much memory leak
-                if (cacheHash.size > 20) cacheHash.remove(cacheHash.keys.random())
-                cacheHash[key] = it
+            val lookingForHash = Pair(api.name, fixedUrl)
+
+            for (item in cache) {
+                // 10 min save
+                if (item.hash == lookingForHash && (unixTime - item.unixTime) < 60 * 10) {
+                    return@safeApiCall item.response
+                }
+            }
+
+            api.load(fixedUrl)?.also { response ->
+                val add = SavedLoadResponse(unixTime, response, lookingForHash)
+                if (cache.size > cacheSize) {
+                    cache[cacheIndex] = add // rolling cache
+                    cacheIndex = (cacheIndex + 1) % cacheSize
+                } else {
+                    cache.add(add)
+                }
             } ?: throw ErrorLoadingException()
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index ac6daa53..00b53fa7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -443,6 +443,7 @@ class HomeFragment : Fragment() {
         home_main_poster_recyclerview?.isVisible = visible
     }
 
+    @SuppressLint("NotifyDataSetChanged") // we need to notify to change poster
     private fun fixGrid() {
         activity?.getSpanCount()?.let {
             currentSpan = it
@@ -465,6 +466,7 @@ class HomeFragment : Fragment() {
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
+        (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.notifyDataSetChanged()
         fixGrid()
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
index a3eaf7c7..7ed074dc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.home
 
+import android.content.res.Configuration
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -16,7 +17,7 @@ class HomeScrollAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private var items: MutableList<LoadResponse> = mutableListOf()
     var hasMoreItems: Boolean = false
 
-    fun getItem(position: Int) : LoadResponse? {
+    fun getItem(position: Int): LoadResponse? {
         return items.getOrNull(position)
     }
 
@@ -59,6 +60,10 @@ class HomeScrollAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
         fun bind(card: LoadResponse) {
             card.apply {
+                val isHorizontal =
+                    itemView.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                val posterUrl = if (isHorizontal) backgroundPosterUrl ?: posterUrl else posterUrl
+                    ?: backgroundPosterUrl
                 itemView.home_scroll_preview_tags?.text = tags?.joinToString(" • ") ?: ""
                 itemView.home_scroll_preview_tags?.isGone = tags.isNullOrEmpty()
                 itemView.home_scroll_preview?.setImage(posterUrl, posterHeaders)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
index 4371fc39..3b01508d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
@@ -16,8 +16,6 @@ import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
-import kotlin.reflect.jvm.internal.impl.descriptors.deserialization.PlatformDependentDeclarationFilter.All
-
 
 class SettingsProviders : PreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e6270a77..7f8e2c01 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -323,6 +323,7 @@
                         app:iconifiedByDefault="true"
                         app:queryBackground="@color/transparent"
                         app:queryHint="@string/search"
+                        app:closeIcon="@drawable/ic_baseline_close_24"
 
                         app:searchIcon="@drawable/search_icon"
                         tools:ignore="RtlSymmetry" />
@@ -405,11 +406,11 @@
                     </LinearLayout>
                 </LinearLayout>
             </FrameLayout>
+
             <View
                 android:id="@+id/home_fix_padding"
                 android:layout_width="match_parent"
-                android:layout_height="0dp">
-            </View>
+                android:layout_height="0dp"></View>
             <!--
             All padding in home_watch_holder is determined in runtime
             This is because the home poster can be invisible which forces
diff --git a/app/src/main/res/layout/home_result_big_grid.xml b/app/src/main/res/layout/home_result_big_grid.xml
index 0482a97c..1b37e654 100644
--- a/app/src/main/res/layout/home_result_big_grid.xml
+++ b/app/src/main/res/layout/home_result_big_grid.xml
@@ -26,10 +26,7 @@
             android:contentDescription="@string/search_poster_img_des" />
 
     <TextView
-            tools:text="@string/quality_hd"
-            android:id="@+id/text_quality"
-            style="@style/SearchBox"
-            android:background="@drawable/type_bg_color" />
+            style="@style/TypeButton" />
     <!--
     <LinearLayout
             android:orientation="vertical"
diff --git a/app/src/main/res/layout/home_result_grid.xml b/app/src/main/res/layout/home_result_grid.xml
index eea81a2e..9a69e962 100644
--- a/app/src/main/res/layout/home_result_grid.xml
+++ b/app/src/main/res/layout/home_result_grid.xml
@@ -3,71 +3,71 @@
 <!--  android:layout_width="114dp"
         android:layout_height="180dp"-->
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:foreground="@drawable/outline_drawable"
-        android:layout_margin="2dp"
-        android:layout_width="114dp"
-        android:layout_height="180dp"
-        android:layout_marginBottom="2dp"
-        android:elevation="10dp"
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        android:id="@+id/background_card"
-        app:cardBackgroundColor="?attr/primaryGrayBackground">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/background_card"
+    android:layout_width="114dp"
+    android:layout_height="180dp"
+    android:layout_margin="2dp"
+    android:layout_marginBottom="2dp"
+    android:elevation="10dp"
+    android:foreground="@drawable/outline_drawable"
+    app:cardBackgroundColor="?attr/primaryGrayBackground"
+    app:cardCornerRadius="@dimen/rounded_image_radius">
 
     <ImageView
-            android:duplicateParentState="true"
-            android:id="@+id/imageView"
-            tools:src="@drawable/example_poster"
-            android:scaleType="centerCrop"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/search_poster_img_des" />
+        android:id="@+id/imageView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:contentDescription="@string/search_poster_img_des"
+        android:duplicateParentState="true"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+        android:scaleType="centerCrop"
+        tools:src="@drawable/example_poster" />
 
     <ImageView
-            android:focusable="false"
-            android:clickable="false"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:id="@+id/title_shadow"
-            android:src="@drawable/title_shadow"
-            android:layout_gravity="bottom"
-            tools:ignore="ContentDescription" />
+        android:id="@+id/title_shadow"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_gravity="bottom"
+        android:clickable="false"
+        android:focusable="false"
+        android:src="@drawable/title_shadow"
+        tools:ignore="ContentDescription" />
 
     <TextView
-            tools:text="The Perfect Run"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_gravity="bottom"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            android:textColor="@color/textColor"
-            android:id="@+id/imageText"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:paddingStart="5dp"
-            android:paddingEnd="5dp"
-            android:ellipsize="end" />
+        android:id="@+id/imageText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="2"
+        android:paddingStart="5dp"
+        android:paddingTop="5dp"
+        android:paddingEnd="5dp"
+        android:paddingBottom="5dp"
+        android:textColor="@color/textColor"
+        android:textStyle="bold"
+        tools:text="The Perfect Run" />
 
     <ImageView
-            android:id="@+id/search_item_download_play"
-            android:layout_gravity="center"
-            android:src="@drawable/play_button"
-            android:layout_width="60dp"
-            android:layout_height="60dp" />
+        android:id="@+id/search_item_download_play"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_gravity="center"
+        android:src="@drawable/play_button" />
 
     <androidx.core.widget.ContentLoadingProgressBar
-            android:layout_marginBottom="-1.5dp"
-            android:id="@+id/watchProgress"
-            android:progressTint="?attr/colorPrimary"
-            android:progressBackgroundTint="?attr/colorPrimary"
-            style="@android:style/Widget.Material.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            tools:progress="50"
-            android:layout_gravity="bottom"
-            android:layout_height="5dp" />
+        android:id="@+id/watchProgress"
+        style="@android:style/Widget.Material.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="-1.5dp"
+        android:progressBackgroundTint="?attr/colorPrimary"
+        android:progressTint="?attr/colorPrimary"
+        tools:progress="50" />
 
     <!--<View
             android:id="@+id/search_result_lang"
@@ -86,17 +86,13 @@
             android:layout_width="30dp"
             android:layout_height="30dp">
     </ImageView>-->
-    <TextView
-            tools:text="@string/quality_hd"
-            android:id="@+id/text_quality"
-            style="@style/SearchBox"
-            android:background="@drawable/type_bg_color" />
+    <TextView android:id="@+id/text_quality" style="@style/TypeButton" />
 
     <LinearLayout
-            android:orientation="vertical"
-            android:layout_gravity="end"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="end"
+        android:orientation="vertical">
 
         <!--
                     <ImageView android:id="@+id/text_is_dub" android:tint="?attr/colorPrimary"
@@ -105,27 +101,23 @@
 
                     </ImageView>-->
         <TextView
-                android:text="@string/app_dubbed_text"
-                android:id="@+id/text_is_dub"
-                style="@style/SearchBox"
-                android:layout_gravity="end"
-                android:background="@drawable/dub_bg_color" />
+            android:id="@+id/text_is_dub"
+            style="@style/DubButton"
+            android:layout_gravity="end" />
 
         <TextView
-                android:id="@+id/text_is_sub"
-                android:text="@string/app_subbed_text"
-                style="@style/SearchBox"
-                android:layout_gravity="end"
-                android:background="@drawable/sub_bg_color" />
+            android:id="@+id/text_is_sub"
+            style="@style/SubButton"
+            android:layout_gravity="end" />
 
         <TextView
-                tools:visibility="visible"
-                android:visibility="gone"
-                android:textSize="20sp"
-                android:id="@+id/text_flag"
-                tools:text="🇸🇪"
-                style="@style/SearchBox"
-                android:layout_gravity="end"
-                android:background="@color/transparent" />
+            android:id="@+id/text_flag"
+            style="@style/SearchBox"
+            android:layout_gravity="end"
+            android:background="@color/transparent"
+            android:textSize="20sp"
+            android:visibility="gone"
+            tools:text="🇸🇪"
+            tools:visibility="visible" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/home_result_grid_expanded.xml b/app/src/main/res/layout/home_result_grid_expanded.xml
index 3cf4e7f9..b697c1de 100644
--- a/app/src/main/res/layout/home_result_grid_expanded.xml
+++ b/app/src/main/res/layout/home_result_grid_expanded.xml
@@ -5,58 +5,58 @@
 
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:backgroundTint="@color/transparent"
-        android:foreground="@drawable/outline_drawable"
-        app:cardElevation="0dp"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        android:layout_margin="2dp"
-        android:id="@+id/background_card"
-        android:layout_width="wrap_content">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/background_card"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="2dp"
+    android:backgroundTint="@color/transparent"
+    android:foreground="@drawable/outline_drawable"
+    app:cardCornerRadius="@dimen/rounded_image_radius"
+    app:cardElevation="0dp">
 
     <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
         <androidx.cardview.widget.CardView
-                android:id="@+id/image_holder"
-                android:layout_width="114dp"
-                android:layout_height="180dp"
-                android:elevation="10dp"
-                app:cardCornerRadius="@dimen/rounded_image_radius"
-                app:cardBackgroundColor="?attr/primaryGrayBackground">
+            android:id="@+id/image_holder"
+            android:layout_width="114dp"
+            android:layout_height="180dp"
+            android:elevation="10dp"
+            app:cardBackgroundColor="?attr/primaryGrayBackground"
+            app:cardCornerRadius="@dimen/rounded_image_radius">
 
             <ImageView
-                    android:duplicateParentState="true"
-                    android:id="@+id/imageView"
-                    tools:src="@drawable/example_poster"
-                    android:scaleType="centerCrop"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                    android:contentDescription="@string/search_poster_img_des" />
+                android:id="@+id/imageView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/search_poster_img_des"
+                android:duplicateParentState="true"
+                android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                android:scaleType="centerCrop"
+                tools:src="@drawable/example_poster" />
 
 
             <ImageView
-                    android:id="@+id/search_item_download_play"
-                    android:layout_gravity="center"
-                    android:src="@drawable/play_button"
-                    android:layout_width="60dp"
-                    android:layout_height="60dp" />
+                android:id="@+id/search_item_download_play"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_gravity="center"
+                android:src="@drawable/play_button" />
 
             <androidx.core.widget.ContentLoadingProgressBar
-                    android:layout_marginBottom="-1.5dp"
-                    android:id="@+id/watchProgress"
-                    android:progressTint="?attr/colorPrimary"
-                    android:progressBackgroundTint="?attr/colorPrimary"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                    android:layout_width="match_parent"
-                    tools:progress="50"
-                    android:layout_gravity="bottom"
-                    android:layout_height="5dp" />
+                android:id="@+id/watchProgress"
+                style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="5dp"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="-1.5dp"
+                android:progressBackgroundTint="?attr/colorPrimary"
+                android:progressTint="?attr/colorPrimary"
+                tools:progress="50" />
 
             <!--<View
                     android:id="@+id/search_result_lang"
@@ -75,17 +75,13 @@
                     android:layout_width="30dp"
                     android:layout_height="30dp">
             </ImageView>-->
-            <TextView
-                    tools:text="@string/quality_hd"
-                    android:id="@+id/text_quality"
-                    style="@style/SearchBox"
-                    android:background="@drawable/type_bg_color" />
+            <TextView android:id="@+id/text_quality" style="@style/TypeButton" />
 
             <LinearLayout
-                    android:orientation="vertical"
-                    android:layout_gravity="end"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="end"
+                android:orientation="vertical">
 
                 <!--
                             <ImageView android:id="@+id/text_is_dub" android:tint="?attr/colorPrimary"
@@ -94,46 +90,42 @@
 
                             </ImageView>-->
                 <TextView
-                        android:text="@string/app_dubbed_text"
-                        android:id="@+id/text_is_dub"
-                        style="@style/SearchBox"
-                        android:layout_gravity="end"
-                        android:background="@drawable/dub_bg_color" />
+                    android:id="@+id/text_is_dub"
+                    style="@style/DubButton"
+                    android:layout_gravity="end" />
 
                 <TextView
-                        android:id="@+id/text_is_sub"
-                        android:text="@string/app_subbed_text"
-                        style="@style/SearchBox"
-                        android:layout_gravity="end"
-                        android:background="@drawable/sub_bg_color" />
+                    android:id="@+id/text_is_sub"
+                    style="@style/SubButton"
+                    android:layout_gravity="end" />
 
                 <TextView
-                        tools:visibility="visible"
-                        android:visibility="gone"
-                        android:textSize="20sp"
-                        android:id="@+id/text_flag"
-                        tools:text="🇸🇪"
-                        style="@style/SearchBox"
-                        android:layout_gravity="end"
-                        android:background="@color/transparent" />
+                    android:id="@+id/text_flag"
+                    style="@style/SearchBox"
+                    android:layout_gravity="end"
+                    android:background="@color/transparent"
+                    android:textSize="20sp"
+                    android:visibility="gone"
+                    tools:text="🇸🇪"
+                    tools:visibility="visible" />
             </LinearLayout>
         </androidx.cardview.widget.CardView>
 
         <TextView
-                tools:text="The Perfect Run\nThe Perfect Run\nhello"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="13sp"
-                android:gravity="center"
-                android:layout_gravity="bottom"
-                android:paddingBottom="5dp"
-                android:paddingTop="5dp"
-                android:textColor="?attr/textColor"
-                android:id="@+id/imageText"
-                android:minLines="2"
-                android:maxLines="2"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:ellipsize="end" />
+            android:id="@+id/imageText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="2"
+            android:minLines="2"
+            android:paddingStart="5dp"
+            android:paddingTop="5dp"
+            android:paddingEnd="5dp"
+            android:paddingBottom="5dp"
+            android:textColor="?attr/textColor"
+            android:textSize="13sp"
+            tools:text="The Perfect Run\nThe Perfect Run\nhello" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/search_result_grid.xml b/app/src/main/res/layout/search_result_grid.xml
index 98fe5812..f3c35ca4 100644
--- a/app/src/main/res/layout/search_result_grid.xml
+++ b/app/src/main/res/layout/search_result_grid.xml
@@ -1,98 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/search_result_root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
 
-        android:foreground="@drawable/outline_drawable"
-        android:focusable="true"
-        android:clickable="true"
-        android:id="@+id/search_result_root">
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="@drawable/outline_drawable"
+    android:orientation="vertical">
 
     <androidx.cardview.widget.CardView
-            android:layout_margin="2dp"
+        android:id="@+id/background_card"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="2dp"
+        android:layout_marginBottom="2dp"
+        android:elevation="10dp"
+        app:cardBackgroundColor="?attr/primaryGrayBackground"
+        app:cardCornerRadius="@dimen/rounded_image_radius">
+
+        <ImageView
+            android:id="@+id/imageView"
+
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginBottom="2dp"
-            android:elevation="10dp"
-            app:cardCornerRadius="@dimen/rounded_image_radius"
-            android:id="@+id/background_card"
-            app:cardBackgroundColor="?attr/primaryGrayBackground">
+            android:contentDescription="@string/search_poster_img_des"
+            android:duplicateParentState="true"
+            android:foreground="?android:attr/selectableItemBackgroundBorderless"
+            android:scaleType="centerCrop" />
 
         <ImageView
-                android:id="@+id/imageView"
-
-                android:duplicateParentState="true"
-                android:scaleType="centerCrop"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/search_poster_img_des" />
-
-        <ImageView
-                android:focusable="false"
-                android:clickable="false"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:id="@+id/title_shadow"
-                android:src="@drawable/title_shadow"
-                android:layout_gravity="bottom"
-                tools:ignore="ContentDescription" />
+            android:id="@+id/title_shadow"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_gravity="bottom"
+            android:clickable="false"
+            android:focusable="false"
+            android:src="@drawable/title_shadow"
+            tools:ignore="ContentDescription" />
 
         <TextView
-                android:id="@+id/imageText"
+            android:id="@+id/imageText"
 
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:layout_gravity="bottom"
-                android:paddingBottom="5dp"
-                android:paddingTop="5dp"
-                android:textColor="@color/textColor"
-                android:textStyle="bold"
-                android:maxLines="2"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:ellipsize="end" />
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="2"
+            android:paddingStart="5dp"
+            android:paddingTop="5dp"
+            android:paddingEnd="5dp"
+            android:paddingBottom="5dp"
+            android:textColor="@color/textColor"
+            android:textStyle="bold" />
 
-        <TextView
-                tools:text="@string/quality_hd"
-                android:id="@+id/text_quality"
-                android:textColor="@color/textColor"
-                style="@style/SearchBox"
-                android:background="@drawable/type_bg_color" />
+        <TextView android:id="@+id/text_quality" style="@style/TypeButton" />
 
         <LinearLayout
-                android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="end"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/text_is_dub"
+                style="@style/DubButton"
+                android:layout_gravity="end" />
+
+            <TextView
+                android:id="@+id/text_is_sub"
+                style="@style/SubButton"
+                android:layout_gravity="end" />
+
+            <TextView
+                android:id="@+id/text_flag"
+                style="@style/SearchBox"
                 android:layout_gravity="end"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-            <TextView
-                    android:text="@string/app_dubbed_text"
-                    android:id="@+id/text_is_dub"
-                    android:layout_gravity="end"
-                    style="@style/SearchBox"
-                    android:background="@drawable/dub_bg_color" />
-
-            <TextView
-                    android:id="@+id/text_is_sub"
-                    android:text="@string/app_subbed_text"
-                    android:layout_gravity="end"
-                    style="@style/SearchBox"
-                    android:background="@drawable/sub_bg_color" />
-
-            <TextView
-                    tools:visibility="visible"
-                    android:visibility="gone"
-                    android:textSize="20sp"
-                    android:id="@+id/text_flag"
-                    tools:text="🇸🇪"
-                    style="@style/SearchBox"
-                    android:layout_gravity="end"
-                    android:background="@color/transparent" />
+                android:background="@color/transparent"
+                android:textSize="20sp"
+                android:visibility="gone"
+                tools:text="🇸🇪"
+                tools:visibility="visible" />
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 
diff --git a/app/src/main/res/layout/search_result_grid_expanded.xml b/app/src/main/res/layout/search_result_grid_expanded.xml
index 710c6cf8..eb859af5 100644
--- a/app/src/main/res/layout/search_result_grid_expanded.xml
+++ b/app/src/main/res/layout/search_result_grid_expanded.xml
@@ -1,90 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/search_result_root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
 
-        android:foreground="@drawable/outline_drawable"
-        android:focusable="true"
-        android:clickable="true"
-        android:id="@+id/search_result_root">
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="@drawable/outline_drawable"
+    android:orientation="vertical">
 
     <androidx.cardview.widget.CardView
-            android:layout_margin="2dp"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="2dp"
-            android:elevation="10dp"
-            app:cardCornerRadius="@dimen/rounded_image_radius"
-            android:id="@+id/background_card"
-            app:cardBackgroundColor="?attr/primaryGrayBackground">
+        android:id="@+id/background_card"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="2dp"
+        android:layout_marginBottom="2dp"
+        android:elevation="10dp"
+        app:cardBackgroundColor="?attr/primaryGrayBackground"
+        app:cardCornerRadius="@dimen/rounded_image_radius">
 
         <ImageView
-                android:id="@+id/imageView"
-                tools:src="@drawable/example_poster"
+            android:id="@+id/imageView"
+            android:layout_width="match_parent"
 
-                android:duplicateParentState="true"
-                android:scaleType="centerCrop"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/search_poster_img_des" />
+            android:layout_height="match_parent"
+            android:contentDescription="@string/search_poster_img_des"
+            android:duplicateParentState="true"
+            android:foreground="?android:attr/selectableItemBackgroundBorderless"
+            android:scaleType="centerCrop"
+            tools:src="@drawable/example_poster" />
 
-        <TextView
-                tools:text="@string/quality_hd"
-                android:id="@+id/text_quality"
-                android:textColor="@color/textColor"
-                style="@style/SearchBox"
-                android:background="@drawable/type_bg_color" />
+        <TextView android:id="@+id/text_quality" style="@style/TypeButton" />
 
         <LinearLayout
-                android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="end"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/text_is_dub"
+                style="@style/DubButton"
+                android:layout_gravity="end" />
+
+            <TextView
+                android:id="@+id/text_is_sub"
+                style="@style/SubButton"
+                android:layout_gravity="end" />
+
+            <TextView
+                android:id="@+id/text_flag"
+                style="@style/SearchBox"
                 android:layout_gravity="end"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-            <TextView
-                    android:text="@string/app_dubbed_text"
-                    android:id="@+id/text_is_dub"
-                    android:layout_gravity="end"
-                    style="@style/SearchBox"
-                    android:background="@drawable/dub_bg_color" />
-
-            <TextView
-                    android:id="@+id/text_is_sub"
-                    android:text="@string/app_subbed_text"
-                    android:layout_gravity="end"
-                    style="@style/SearchBox"
-                    android:background="@drawable/sub_bg_color" />
-
-            <TextView
-                    tools:visibility="visible"
-                    android:visibility="gone"
-                    android:textSize="20sp"
-                    android:id="@+id/text_flag"
-                    tools:text="🇸🇪"
-                    style="@style/SearchBox"
-                    android:layout_gravity="end"
-                    android:background="@color/transparent" />
+                android:background="@color/transparent"
+                android:textSize="20sp"
+                android:visibility="gone"
+                tools:text="🇸🇪"
+                tools:visibility="visible" />
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 
     <TextView
-            tools:text="The Perfect Run\nThe Perfect Run"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="13sp"
-            android:gravity="center"
-            android:layout_gravity="bottom"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            android:textColor="?attr/textColor"
-            android:id="@+id/imageText"
-            android:minLines="2"
-            android:maxLines="2"
-            android:paddingStart="5dp"
-            android:paddingEnd="5dp"
-            android:ellipsize="end" />
+        android:id="@+id/imageText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="2"
+        android:minLines="2"
+        android:paddingStart="5dp"
+        android:paddingTop="5dp"
+        android:paddingEnd="5dp"
+        android:paddingBottom="5dp"
+        android:textColor="?attr/textColor"
+        android:textSize="13sp"
+        tools:text="The Perfect Run\nThe Perfect Run" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c3e51ab5..7c2e798b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -25,13 +25,13 @@
     <color name="whiteText">#FFF</color>
     <color name="blackText">#000</color>
 
-    <color name="dubColor">#3d50fa</color> <!--3b65f5 f18c82 8294F1-->
+    <color name="dubColorText">#121950</color> <!--3b65f5 f18c82 8294F1-->
     <color name="amoledModeLight">#121213</color>
 
     <color name="dubColorBg">#3B65F5</color>
-    <color name="subColor">#F54A3B</color> <!--F53B66 FA3D79-->
+    <color name="subColorText">#571711</color> <!--F53B66 FA3D79-->
     <color name="subColorBg">#F53B66</color>
-    <color name="typeColor">#3BF585</color>
+    <color name="typeColorText">#BEC8FF</color>
     <color name="typeColorBg">?attr/colorPrimaryDark</color>
 
     <color name="adultColor">#FF6F63</color> <!-- same as sub color -->
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e748868b..dac8b9cd 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -16,5 +16,4 @@
     <integer name="loading_time">2000</integer>
 
     <dimen name="storage_radius">3dp</dimen>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9c2f62fc..4fde7ae8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -97,6 +97,24 @@
         <item name="white">@color/white</item>
         <item name="colorOnPrimary">@color/whiteText</item>
     </style>
+    
+    <style name="DubButton" parent="@style/SearchBox">
+        <item name="android:background">@drawable/dub_bg_color</item>
+        <item name="android:text">@string/app_dubbed_text</item>
+        <item name="android:textColor">@color/dubColorText</item>
+    </style>
+
+    <style name="SubButton" parent="@style/SearchBox">
+        <item name="android:background">@drawable/sub_bg_color</item>
+        <item name="android:text">@string/app_subbed_text</item>
+        <item name="android:textColor">@color/subColorText</item>
+    </style>
+
+    <style name="TypeButton" parent="@style/SearchBox">
+        <item name="android:background">@drawable/type_bg_color</item>
+        <item name="android:text">@string/quality_hd</item>
+        <item name="android:textColor">@color/typeColorText</item>
+    </style>
 
     <style name="LightMode">
         <item name="primaryGrayBackground">@color/lightPrimaryGrayBackground</item>
@@ -461,10 +479,10 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginBottom">5dp</item>
-        <item name="android:paddingLeft">10dp</item>
-        <item name="android:paddingRight">10dp</item>
-        <item name="android:paddingTop">5dp</item>
-        <item name="android:paddingBottom">5dp</item>
+        <item name="android:paddingLeft">7dp</item>
+        <item name="android:paddingRight">7dp</item>
+        <item name="android:paddingTop">3dp</item>
+        <item name="android:paddingBottom">3dp</item>
         <item name="android:textSize">12sp</item>
         <item name="textColor">@color/textColor</item>
         <item name="android:textColor">@color/textColor</item>

From 5c3652d1e94c46861445562da9365ddc25807afd Mon Sep 17 00:00:00 2001
From: nvticzek <111082120+nvticzek@users.noreply.github.com>
Date: Sun, 4 Dec 2022 16:39:04 +0100
Subject: [PATCH 093/273] Polish translation update (#235)

---
 app/src/main/res/values-pl/strings.xml | 147 ++++++++++++++++---------
 1 file changed, 97 insertions(+), 50 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 6da1cc8f..1046c936 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -7,7 +7,6 @@
     <string name="duration_format" formatted="true">%d min</string>
 
     <string name="app_dub_sub_episode_text_format">%s Odc. %d</string>
-    <string name="next_episode_format">Odcinek %d będzie udostępniony</string>
     <string name="result_poster_img_des">Plakat</string>
     <string name="episode_poster_img_des">Plakat odcinka</string>
     <string name="home_main_poster_img_des">Główny plakat</string>
@@ -23,10 +22,12 @@
     <string name="title_settings">Ustawienia</string>
 
     <string name="search_hint">Szukaj…</string>
-    <string name="search_hint_site">Szukaj %s…</string>
+    <string name="search_hint_site" formatted="true">Szukaj %s…</string>
+
     <string name="no_data">Brak danych</string>
     <string name="episode_more_options_des">Więcej opcji</string>
     <string name="next_episode">Następny odcinek</string>
+    <string name="next_episode_format">Odcinek %d będzie udostępniony</string>
     <string name="result_tags">Gatunki</string>
     <string name="result_share">Udostępnij</string>
     <string name="result_open_in_browser">Otwórz w przeglądarce</string>
@@ -49,7 +50,6 @@
     <string name="reload_error">Połącz ponownie…</string>
     <string name="go_back">Wstecz</string>
     <string name="play_episode">Odtwórz odcinek</string>
-    <!--<string name="need_storage">Allow to download episodes</string>-->
 
     <string name="download">Pobierz</string>
     <string name="downloaded">Pobrane</string>
@@ -61,6 +61,7 @@
     <string name="download_done">Zakończono pobieranie</string>
 
     <string name="stream">Stream</string>
+
     <string name="error_loading_links_toast">Błąd przy ładowaniu linków</string>
     <string name="download_storage_text">Pamięć wewnętrzna</string>
 
@@ -87,6 +88,7 @@
     <string name="sort_close">Zamknij</string>
     <string name="sort_clear">Wyczyść</string>
     <string name="sort_save">Zapisz</string>
+
     <string name="player_speed">Prędkość odtwarzania</string>
 
     <string name="subtitles_settings">Ustawienia napisów</string>
@@ -108,8 +110,8 @@
     <string name="subs_auto_select_language">Wybierz język automatycznie</string>
     <string name="subs_download_languages">Pobieranie języków</string>
     <string name="subs_subtitle_languages">Język napisów</string>
-    <string name="subs_hold_to_reset_to_default">Przytrzymaj aby zresetować</string>
-    <string name="subs_import_text">Importuj czcionki umieszczając je w %s</string>
+    <string name="subs_hold_to_reset_to_default">Przytrzymaj, aby zresetować</string>
+    <string name="subs_import_text" formatted="true">Importuj czcionki umieszczając je w %s</string>
     <string name="continue_watching">Kontyntynuj oglądanie</string>
 
     <string name="action_remove_watching">Usuń</string>
@@ -117,14 +119,15 @@
 
     <string name="vpn_might_be_needed">Połączenie przez VPN może być wymagane</string>
     <string name="vpn_torrent">Ten dostawca jest torrentem, wskazane jest użycie połączenia VPN</string>
-    
+
     <string name="provider_info_meta">Metadane nie są dostarczane przez witrynę, ładowanie filmu nie powiedzie się, jeśli nie ma ich w witrynie.</string>
-    
+
     <string name="torrent_plot">Opis</string>
     <string name="normal_no_plot">Nie znaleziono opisu</string>
     <string name="torrent_no_plot">Nie znaleziono opisu</string>
 
     <string name="show_log_cat">Pokaż logcat 🐈</string>
+
     <string name="picture_in_picture">Obraz-w-obrazie</string>
     <string name="picture_in_picture_des">Oglądaj w małym, pływającym okienku</string>
     <string name="player_size_settings">Przycisk zmiany rozmiaru</string>
@@ -140,17 +143,23 @@
     <string name="swipe_to_seek_settings_des">Przesuwaj w lewo lub prawo aby kontrolować czas</string>
     <string name="swipe_to_change_settings">Przesuwaj aby zmienić ustawienia</string>
     <string name="swipe_to_change_settings_des">Przesuwaj po lewej lub prawej stronie aby zmienić jasność i głośność</string>
-    <string name="double_tap_to_seek_settings">Podwójne stuknięcie aby przeglądać</string>
-    <string name="double_tap_to_pause_settings">Stuknij dwukrotnie, aby wstrzymać</string>
+
+    <string name="autoplay_next_settings">Autoodtwarzanie następnego odcinka</string>
+    <string name="autoplay_next_settings_des">Rozpocznij następny odcinek po zakończeniu bieżącego</string>
+
     <string name="double_tap_to_seek_amount_settings">Wielkość skoku przy podwójnym stuknięciu</string>
+    <string name="double_tap_to_seek_settings">Podwójne stuknięcie aby przeglądać</string>
     <string name="double_tap_to_seek_settings_des">Stuknij 2 razy z prawej lub lewej strony aby przeglądać</string>
+
+    <string name="double_tap_to_pause_settings">Stuknij dwukrotnie, aby wstrzymać</string>
     <string name="double_tap_to_pause_settings_des">Stuknij na środku, aby wstrzymać</string>
+
     <string name="use_system_brightness_settings">Użyj jasności systemowej</string>
-    <string name="use_system_brightness_settings_des">Użyj jasności systemowej w odtwarzaczu aplikacji zamiast ciemnej nakładki
-    </string>
+    <string name="use_system_brightness_settings_des">Użyj jasności systemowej w odtwarzaczu aplikacji zamiast ciemnej nakładki</string>
 
     <string name="episode_sync_settings">Aktualizuj postęp oglądania</string>
     <string name="episode_sync_settings_des">Automatycznie synchronizuj postęp aktualnego odcinka</string>
+
     <string name="restore_settings">Przywracanie danych z kopii zapasowej</string>
 
     <string name="backup_settings">Kopia zapasowa danych</string>
@@ -163,7 +172,7 @@
     <string name="search">Szukaj</string>
     <string name="category_account">Konta</string>
     <string name="category_updates">Aktualizacje i kopia zapasowa</string>
-    
+
     <string name="settings_info">Informacje</string>
     <string name="advanced_search">Zaawansowane wyszukiwanie</string>
     <string name="advanced_search_des">Szukaj z podziałem na dostawców</string>
@@ -172,6 +181,10 @@
     <string name="show_fillers_settings">Pokaż odcinek wypełniający dla anime</string>
     <string name="show_trailers_settings">Pokaż zwiastuny</string>
     <string name="kitsu_settings">Pokaż plakaty z Kitsu</string>
+    <string name="pref_filter_search_quality">Ukryj wybraną jakość wideo w wynikach wyszukiwania</string>
+
+    <string name="automatic_plugin_updates">Automatyczne aktualizacje rozszerzeń</string>
+    <string name="automatic_plugin_download">Automatyczne pobieranie rozszerzeń</string>
     <string name="updates_settings">Pokazuj aktualizacje</string>
     <string name="updates_settings_des">Automatycznie wyszukuj aktualizacji przy starcie</string>
     <string name="uprereleases_settings">Aktualizuj do wersji beta</string>
@@ -193,13 +206,16 @@
     <string name="acra_report_toast">Awaria aplikacji. Anonimowe zgłoszenie błedu zostanie wysłane programistom</string>
 
     <string name="season">Sezon</string>
+    <string name="season_format">%s %d%s</string>
     <string name="no_season">Brak sezonu</string>
     <string name="episode">Odcinek</string>
     <string name="episodes">Odcinki</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
     <string name="season_short">S</string>
     <string name="episode_short">O</string>
-
     <string name="no_episodes_found">Nie znaleziono odcinków</string>
+
     <string name="delete_file">Usuń plik</string>
     <string name="delete">Usuń</string>
     <string name="pause">Wstrzymaj</string>
@@ -226,6 +242,7 @@
     <string name="used_storage">W użyciu</string>
     <string name="app_storage">Aplikacja</string>
 
+    <!--plural-->
     <string name="movies">Filmy</string>
     <string name="tv_series">Serial telewizyjny</string>
     <string name="cartoons">Kreskówki</string>
@@ -234,14 +251,20 @@
     <string name="documentaries">Filmy dokumentalne</string>
     <string name="ova">OVA</string>
     <string name="asian_drama">Filmy azjatyckie</string>
-
     <string name="livestreams">Transmisje na żywo</string>
+    <string name="nsfw">NSFW</string>
+    <string name="others">Inne</string>
+
+    <!--singular-->
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Serial telewizyjny</string>
     <string name="cartoons_singular">Kreskówka</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Film dokumentalny</string>
     <string name="asian_drama_singular">Film azjatycki</string>
+    <string name="live_singular">Transmisja na żywo</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="other_singular">Inne</string>
 
     <string name="source_error">Błąd żródła</string>
     <string name="remote_error">Zdalny błąd</string>
@@ -258,13 +281,14 @@
     <string name="episode_action_auto_download">Automatyczne pobieranie</string>
     <string name="episode_action_download_mirror">Pobierz mirror</string>
     <string name="episode_action_reload_links">Odświerz linki</string>
-
     <string name="episode_action_download_subtitle">Pobierz napisy</string>
+
     <string name="show_hd">Etykieta jakości</string>
     <string name="show_dub">Etykieta dubbingu</string>
     <string name="show_sub">Etykieta napisów</string>
     <string name="show_title">Tytuł</string>
     <string name="poster_ui_settings">Włącz elementy interfejsu na plakatach</string>
+
     <string name="no_update_found">Nie znaleziono aktualizacji</string>
     <string name="check_for_update">Sprawdź czy jest aktualizacja</string>
 
@@ -279,6 +303,7 @@
     <string name="watch_quality_pref">Domyślna jakość</string>
     <string name="limit_title">Maksymalna ilość znaków tytułu w odtwarzaczu</string>
     <string name="limit_title_rez">Zawartość tytułu w odtwarzaczu</string>
+
     <string name="video_buffer_size_settings">Rozmiar bufora wideo</string>
     <string name="video_buffer_length_settings">Długość bufora wideo</string>
     <string name="video_buffer_disk_settings">Pamięć podręczna wideo na dysku</string>
@@ -293,8 +318,11 @@
     <string name="add_site_pref">Sklonuj stronę</string>
     <string name="remove_site_pref">Usuń stronę</string>
     <string name="add_site_summary">Dodaj klona istniejącej strony z innym adresem url</string>
+
     <string name="download_path_pref">Ścieżka pobierania</string>
+
     <string name="nginx_url_pref">Url serwera Nginx</string>
+
     <string name="display_subbed_dubbed_settings">Wyświetlanie Anime z dubbingiem/subbingiem</string>
 
     <string name="resize_fit">Dopasuj do ekranu</string>
@@ -303,15 +331,17 @@
 
     <string name="legal_notice">Zastrzeżenie</string>
 
+    <string name="category_general">Ogólne</string>
     <string name="random_button_settings">Przycisk do losowania</string>
     <string name="random_button_settings_desc">Pokaż przycisk do losowania na stronie głównej</string>
     <string name="provider_lang_settings">Języki dostawców</string>
-    <string name="category_general">Ogólne</string>
     <string name="app_layout">Układ aplikacji</string>
     <string name="preferred_media_settings">Preferowane media</string>
-
+    <string name="enable_nsfw_on_providers">Włącz NSFW u obsługiwanych dostawców</string>
     <string name="subtitles_encoding">Kodowanie napisów</string>
+    <string name="category_providers">Dostawcy</string>
     <string name="category_ui">Układ interfejsu</string>
+
     <string name="automatic">Automatyczny</string>
     <string name="tv_layout">Układ dla telewizorów</string>
     <string name="phone_layout">Układ dla telefonów</string>
@@ -319,10 +349,12 @@
 
     <string name="primary_color_settings">Kolor podstawowy</string>
     <string name="app_theme_settings">Motyw aplikacji</string>
-
-
     <string name="bottom_title_settings">Pozycja tytułu względem plakatu</string>
     <string name="bottom_title_settings_des">Ustaw tytuł pod plakatem</string>
+
+    <string name="example_lang_name">Kod języka (pl)</string>
+
+    <string name="login_format" formatted="true">%s %s</string>
     <string name="account">konto</string>
     <string name="logout">Wyloguj się</string>
     <string name="login">Logowanie</string>
@@ -332,9 +364,12 @@
     <string name="add_sync">Dodaj synchronizację</string>
     <string name="added_sync_format" formatted="true">Dodano %s</string>
     <string name="upload_sync">Synchronizacja</string>
+    <string name="sync_score">Ocenione</string>
+    <string name="sync_score_format" formatted="true">%d na 10</string>
+    <string name="authenticated_user" formatted="true">Uwierzytelniono %s</string>
+    <string name="authenticated_user_fail" formatted="true">Nie udało się uwierzytelnić w %s</string>
 
-    <string name="authenticated_user">Uwierzytelniono %s</string>
-    <string name="authenticated_user_fail">Nie udało się uwierzytelnić w %s</string>
+    <!-- ============ -->
     <string name="none">Brak</string>
     <string name="normal">Normalne</string>
     <string name="all">Wszystkie</string>
@@ -364,8 +399,9 @@
 
     <string name="home_source">Źródło</string>
     <string name="home_random">Losowy</string>
-    
+
     <string name="coming_soon">Już wkrótce…</string>
+
     <string name="quality_cam">Cam</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
@@ -376,6 +412,13 @@
     <string name="quality_blueray">BlueRay</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
+    <string name="quality_4k">4K</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="quality_webrip">Web</string>
+
     <string name="poster_image">Obraz plakatu</string>
     <string name="category_player">Odtwarzacz</string>
     <string name="resolution_and_title">Rozdzielczość i tytuł</string>
@@ -387,30 +430,27 @@
     <string name="error">Błąd</string>
     <string name="subtitles_remove_captions">Usuń informacje dla niesłyszących z napisów</string>
     <string name="subtitles_remove_bloat">Usuń nadmiarowe informacje z napisów</string>
+    <string name="subtitles_filter_lang">Filtrowanie wg preferowanego języka mediów</string>
+    <string name="extras">Dodatki</string>
+    <string name="trailer">Zwiastun</string>
+    <string name="referer">Odsyłacz</string>
     <string name="next">Dalej</string>
     <string name="provider_languages_tip">Wyświetlaj filmy w wybranych językach</string>
     <string name="previous">Cofnij</string>
     <string name="skip_setup">Pomiń</string>
     <string name="app_layout_subtext">Dostosuj wygląd aplikacji do urządzenia</string>
+    <string name="crash_reporting_title">Przekazywanie błędów</string>
     <string name="preferred_media_subtext">Preferowany rodzaj filmów</string>
     <string name="setup_done">Gotowe</string>
-    <string name="extras">Dodatki</string>
-    <string name="trailer">Zwiastun</string>
-    <string name="play_with_app_name">Odtwórz w CloudStream</string>
-    <string name="live_singular">Transmisja na żywo</string>
-    <string name="network_adress_example">Link to streamu</string>
-    <string name="referer">Odsyłacz</string>
-    <string name="crash_reporting_title">Przekazywanie błędów</string>
-    <string name="automatic_plugin_updates">Automatyczne aktualizacje rozszerzeń</string>
-    <string name="extensions">Rozszerzenia</string>
+    <string name="extensions">Dodatki</string>
     <string name="add_repository">Dodaj repozytorium</string>
     <string name="repository_name_hint">Nazwa repozytorium</string>
     <string name="repository_url_hint">Adres url repozytorium</string>
     <string name="plugin_loaded">Rozszerzenie załadowane</string>
     <string name="plugin_deleted">Rozszerzenie usunięte</string>
     <string name="plugin_load_fail" formatted="true">Błąd ładowania %s</string>
-    <string name="is_adult">+18</string>
-    <string name="batch_download_start_format" formatted="true">Zaczęto pobieranie %d %s</string>
+    <string name="is_adult">18+</string>
+    <string name="batch_download_start_format" formatted="true">Rozpoczęto pobieranie %d %s</string>
     <string name="batch_download_finish_format" formatted="true">Pobrano %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Wszystkie %s już pobrane</string>
     <string name="batch_download">Pobierz wszystko</string>
@@ -418,34 +458,27 @@
     <string name="plugin">rozszerzenia</string>
     <string name="delete_repository_plugins">Ta akcja usunie także wszystkie rozszerzenia z repozytorium</string>
     <string name="delete_repository">Usuń repozytorium</string>
-    <string name="setup_extensions_subtext">Pobierz strony które Cię interesują</string>
+    <string name="setup_extensions_subtext">Pobierz strony, które Cię interesują</string>
     <string name="plugins_downloaded" formatted="true">Pobrano: %d</string>
     <string name="plugins_disabled" formatted="true">Wyłączono: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Nie pobrano: %d</string>
+    <string name="plugins_updated">Zaaktualizowano %d rozszerzeń</string>
     <string name="blank_repo_message">Dodaj repozytorium aby zainstalować rozszerzenia</string>
-    <string name="sync_score">Ocenione</string>
-    <string name="sync_score_format" formatted="true">%d na 10</string>
-    <string name="others">Inne</string>
-    <string name="other_singular">Wideo</string>
     <string name="view_public_repositories_button">Zobacz repozytoria społeczności</string>
     <string name="view_public_repositories_button_short">Publiczna lista</string>
-    <string name="example_lang_name">Kod języka (en)</string>
-    <string name="subtitles_filter_lang">Filtrowanie wg preferowanego języka mediów</string>
     <string name="uppercase_all_subtitles">Wszystkie napisy wielką literą</string>
+
     <string name="download_all_plugins_from_repo">Pobrać wszystkie rozszerzenia z tego repozytorium?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Wyłączone)</string>
-    <string name="pref_filter_search_quality">Ukryj wybraną jakość wideo w wynikach wyszukiwania</string>
-    <string name="enable_nsfw_on_providers">Włącz NSFW u obsługiwanych dostawców</string>
-    <string name="category_providers">Dostawcy</string>
+    <string name="tracks">Ścieżki</string>
+    <string name="audio_tracks">Ścieżki audio</string>
+    <string name="video_tracks">Ścieżki wideo</string>
+    <string name="apply_on_restart">Zastosuj po ponownym uruchomieniu</string>
+
     <string name="safe_mode_title">Tryb bezpieczny włączony</string>
     <string name="safe_mode_description">Wystąpiła nieoczekiwana awaria i automatycznie wyłączyliśmy wszystkie rozszerzenia, abyś mógł znaleźć i usunąć rozszerzenie, które powoduje problemy.</string>
     <string name="safe_mode_crash_info">Wyświetl informacje o awarii</string>
-    <string name="audio_tracks">Ścieżki audio</string>
-    <string name="video_tracks">Ścieżki wideo</string>
-    <string name="tracks">Ścieżki</string>
-    <string name="apply_on_restart">Zastosuj po ponownym uruchomieniu</string>
-    <string name="autoplay_next_settings_des">Rozpocznij następny odcinek po zakończeniu bieżącego</string>
-    <string name="autoplay_next_settings">Autoodtwarzanie następnego odcinka</string>
+
     <string name="extension_rating" formatted="true">Ocena: %s</string>
     <string name="extension_description">Opis</string>
     <string name="extension_version">Versja</string>
@@ -455,5 +488,19 @@
     <string name="extension_types">Wspierane</string>
     <string name="extension_language">Język</string>
     <string name="extension_install_first">Najpierw zainstaluj rozszerzenie</string>
-    <string name="plugins_updated">Zaaktualizowano %d rozszerzeń</string>
+
+    <string name="hls_playlist">Playlista HLS</string>
+
+    <string name="player_pref">Preferowany odtwarzacz wideo</string>
+    <string name="player_settings_play_in_app">Odtwarzacz wewnętrzny</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="player_settings_play_in_browser">Przeglądarka</string>
+    <string name="app_not_found_error">Aplikacja nie została znaleziona</string>
+    <string name="all_languages_preference">Wszystkie języki</string>
+
+    <string name="clear_history">Wyczyść historię</string>
+    <string name="history">Historia</string>
+    <string name="clipboard_too_large">Za dużo tekstu. Nie można skopiować do schowka.</string>
 </resources>

From 514e250d6888a33ae4271f750d0d25836b734c58 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Mon, 5 Dec 2022 12:39:34 +0100
Subject: [PATCH 094/273] Update dependencies, lets hope it does not fuck up
 anything

---
 app/build.gradle.kts                               | 14 +++++++-------
 .../com/lagradost/cloudstream3/MainActivity.kt     |  4 +++-
 .../lagradost/cloudstream3/ui/EasterEggMonke.kt    |  2 +-
 .../ui/player/NonFinalTextRenderer.java            |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 26e7d3a5..b50cb62a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -39,13 +39,13 @@ android {
         }
     }
 
-    compileSdk = 31
+    compileSdk = 33
     buildToolsVersion = "30.0.3"
 
     defaultConfig {
         applicationId = "com.lagradost.cloudstream3"
         minSdk = 21
-        targetSdk = 30
+        targetSdk = 33
 
         versionCode = 55
         versionName = "3.2.3"
@@ -155,10 +155,10 @@ dependencies {
     // implementation("androidx.leanback:leanback-paging:1.1.0-alpha09")
 
     // Exoplayer
-    implementation("com.google.android.exoplayer:exoplayer:2.18.1")
-    implementation("com.google.android.exoplayer:extension-cast:2.18.1")
-    implementation("com.google.android.exoplayer:extension-mediasession:2.18.1")
-    implementation("com.google.android.exoplayer:extension-okhttp:2.18.1")
+    implementation("com.google.android.exoplayer:exoplayer:2.18.2")
+    implementation("com.google.android.exoplayer:extension-cast:2.18.2")
+    implementation("com.google.android.exoplayer:extension-mediasession:2.18.2")
+    implementation("com.google.android.exoplayer:extension-okhttp:2.18.2")
 
     //implementation("com.google.android.exoplayer:extension-leanback:2.14.0")
 
@@ -190,7 +190,7 @@ dependencies {
     // Networking
 //    implementation("com.squareup.okhttp3:okhttp:4.9.2")
 //    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1")
-    implementation("com.github.Blatzar:NiceHttp:0.3.5")
+    implementation("com.github.Blatzar:NiceHttp:0.4.0")
     // To fix SSL fuckery on android 9
     implementation("org.conscrypt:conscrypt-android:2.2.1")
     // Util to skip the URI file fuckery 🙏
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index c038d23a..1f208502 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -16,9 +16,11 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
-import androidx.navigation.*
+import androidx.navigation.NavController
+import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy
 import androidx.navigation.NavGraph.Companion.findStartDestination
+import androidx.navigation.NavOptions
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.setupWithNavController
 import androidx.preference.PreferenceManager
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt
index 3d28ca94..556ebd34 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt
@@ -69,7 +69,7 @@ class EasterEggMonke : AppCompatActivity() {
         set.duration = (Math.random() * 1500 + 2500).toLong()
 
         set.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator?) {
+            override fun onAnimationEnd(animation: Animator) {
                 frame.removeView(newStar)
             }
         })
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
index ce39a841..3b47b27a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
@@ -439,7 +439,7 @@ public class NonFinalTextRenderer extends BaseRenderer implements Callback {
         ).collect(Collectors.toList());
 
         output.onCues(fixedCues);
-        output.onCues(new CueGroup(fixedCues));
+        output.onCues(new CueGroup(fixedCues, 0L));
     }
 
     /**

From 3fa82cdba758a4ab9ed13237266ad2246e52e45d Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Mon, 5 Dec 2022 16:09:51 +0100
Subject: [PATCH 095/273] Probably fixed a very weird exception

---
 .../java/com/lagradost/cloudstream3/ui/APIRepository.kt    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
index 2c50a6c6..227c2f25 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
@@ -38,8 +38,9 @@ class APIRepository(val api: MainAPI) {
             val hash: Pair<String, String>
         )
 
-
-        private val cache: ArrayList<SavedLoadResponse> = arrayListOf()
+        // This really does not need to be Nullable but it can crash otherwise, probably caused by replacing items while looping over them.
+        // "Attempt to invoke .... getHash() on a null object reference"
+        private val cache: ArrayList<SavedLoadResponse?> = arrayListOf()
         private var cacheIndex: Int = 0
         const val cacheSize = 20
     }
@@ -60,7 +61,7 @@ class APIRepository(val api: MainAPI) {
 
             for (item in cache) {
                 // 10 min save
-                if (item.hash == lookingForHash && (unixTime - item.unixTime) < 60 * 10) {
+                if (item?.hash == lookingForHash && (unixTime - item.unixTime) < 60 * 10) {
                     return@safeApiCall item.response
                 }
             }

From 70dcc960263c65e7a51f4925c36a7e5d268e033b Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Tue, 6 Dec 2022 11:52:58 +0100
Subject: [PATCH 096/273] Fixed AniList api

---
 .../syncproviders/providers/AniListApi.kt     | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
index 3140abbc..d4742d94 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
@@ -2,15 +2,13 @@ package com.lagradost.cloudstream3.syncproviders.providers
 
 import androidx.fragment.app.FragmentActivity
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.databind.json.JsonMapper
-import com.fasterxml.jackson.module.kotlin.KotlinModule
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys
 import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
 import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
@@ -21,6 +19,7 @@ import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DataStore.toKotlinObject
 import java.net.URL
+import java.net.URLEncoder
 import java.util.*
 
 class AniListApi(index: Int) : AccountManager(index), SyncAPI {
@@ -522,19 +521,26 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     }
 
     private suspend fun postApi(q: String, cache: Boolean = false): String? {
-        return if (!checkToken()) {
-            app.post(
-                "https://graphql.anilist.co/",
-                headers = mapOf(
-                    "Authorization" to "Bearer " + (getAuth() ?: return null),
-                    if (cache) "Cache-Control" to "max-stale=$maxStale" else "Cache-Control" to "no-cache"
-                ),
-                cacheTime = 0,
-                data = mapOf("query" to q),//(if (vars == null) mapOf("query" to q) else mapOf("query" to q, "variables" to vars))
-                timeout = 5 // REASONABLE TIMEOUT
-            ).text.replace("\\/", "/")
-        } else {
-            null
+        return suspendSafeApiCall {
+            if (!checkToken()) {
+                app.post(
+                    "https://graphql.anilist.co/",
+                    headers = mapOf(
+                        "Authorization" to "Bearer " + (getAuth() ?: return@suspendSafeApiCall null),
+                        if (cache) "Cache-Control" to "max-stale=$maxStale" else "Cache-Control" to "no-cache"
+                    ),
+                    cacheTime = 0,
+                    data = mapOf(
+                        "query" to URLEncoder.encode(
+                            q,
+                            "UTF-8"
+                        )
+                    ), //(if (vars == null) mapOf("query" to q) else mapOf("query" to q, "variables" to vars))
+                    timeout = 5 // REASONABLE TIMEOUT
+                ).text.replace("\\/", "/")
+            } else {
+                null
+            }
         }
     }
 

From 6d13cf0b01d189b86213a4410e4979f1f5c8f8d0 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Tue, 6 Dec 2022 19:41:09 +0100
Subject: [PATCH 097/273] Fixed Android 13 notifications (bruh)

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../lagradost/cloudstream3/CommonActivity.kt  | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ae8479fe..d827a3e8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <!-- some dependency needs this -->
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <!-- Used for player vertical slide -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <!-- Used for app update -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <!-- Used for app notifications on Android 13+ -->
     <!-- <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" /> not used atm, but code exist that requires it that are not run -->
     <!-- <permission android:name="android.permission.QUERY_ALL_PACKAGES" /> &lt;!&ndash; Used for getting if vlc is installed &ndash;&gt; -->
     <!-- Fixes android tv fuckery -->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index ef55eff0..b7415811 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3
 
+import android.Manifest
 import android.app.Activity
 import android.app.PictureInPictureParams
 import android.content.Context
@@ -16,6 +17,7 @@ import androidx.annotation.MainThread
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
+import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
 import com.google.android.gms.cast.framework.CastSession
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
@@ -164,6 +166,23 @@ object CommonActivity {
                     }
                 }
         }
+
+        // Ask for notification permissions on Android 13
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
+            ContextCompat.checkSelfPermission(
+                act,
+                Manifest.permission.POST_NOTIFICATIONS
+            ) != PackageManager.PERMISSION_GRANTED
+        ) {
+            val requestPermissionLauncher = act.registerForActivityResult(
+                ActivityResultContracts.RequestPermission()
+            ) { isGranted: Boolean ->
+                Log.d(TAG, "Notification permission: $isGranted")
+            }
+            requestPermissionLauncher.launch(
+                Manifest.permission.POST_NOTIFICATIONS
+            )
+        }
     }
 
     private fun Activity.enterPIPMode() {

From 56c79e3b6a8e7f4214f0d5bc5a39baf87bc28813 Mon Sep 17 00:00:00 2001
From: Jace <54625750+Jacekun@users.noreply.github.com>
Date: Thu, 8 Dec 2022 02:39:59 +0800
Subject: [PATCH 098/273] [Bugfix] Re arrange Regex for Duration, fixing issue
 if inaccurate results. (#239)

---
 .../com/lagradost/cloudstream3/MainAPI.kt     | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index e8ad476a..1bcdf422 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -1139,21 +1139,8 @@ interface LoadResponse {
 
 fun getDurationFromString(input: String?): Int? {
     val cleanInput = input?.trim()?.replace(" ", "") ?: return null
-    Regex("([0-9]*)h.*?([0-9]*)m").find(cleanInput)?.groupValues?.let { values ->
-        if (values.size == 3) {
-            val hours = values[1].toIntOrNull()
-            val minutes = values[2].toIntOrNull()
-            if (minutes != null && hours != null) {
-                return hours * 60 + minutes
-            }
-        }
-    }
-    Regex("([0-9]*)m").find(cleanInput)?.groupValues?.let { values ->
-        if (values.size == 2) {
-            return values[1].toIntOrNull()
-        }
-    }
-    Regex("(\\s\\d+\\shr)|(\\s\\d+\\shour)|(\\s\\d+\\smin)|(\\s\\d+\\ssec)").findAll(input).let { values ->
+    //Use first as sometimes the text passes on the 2 other Regex, but failed to provide accurate return value
+    Regex("(\\d+\\shr)|(\\d+\\shour)|(\\d+\\smin)|(\\d+\\ssec)").findAll(input).let { values ->
         var seconds = 0
         values.forEach {
             val time_text = it.value
@@ -1174,6 +1161,23 @@ fun getDurationFromString(input: String?): Int? {
             return seconds / 60
         }
     }
+    Regex("([0-9]*)h.*?([0-9]*)m").find(cleanInput)?.groupValues?.let { values ->
+        if (values.size == 3) {
+            val hours = values[1].toIntOrNull()
+            val minutes = values[2].toIntOrNull()
+            if (minutes != null && hours != null) {
+                return hours * 60 + minutes
+            }
+        }
+    }
+    Regex("([0-9]*)m").find(cleanInput)?.groupValues?.let { values ->
+        if (values.size == 2) {
+            val return_value = values[1].toIntOrNull()
+            if (return_value != null) {
+                return return_value
+            }
+        }
+    }
     return null
 }
 

From 0b17862049c388249711948e60007d0cfb92e6bd Mon Sep 17 00:00:00 2001
From: Deepak Patil <dspatil11599@gmail.com>
Date: Thu, 8 Dec 2022 00:40:19 +0530
Subject: [PATCH 099/273] feat(subtitle): add addic7ed.com (#221)

---
 .../syncproviders/AccountManager.kt           |   4 +-
 .../syncproviders/providers/Addic7ed.kt       | 108 ++++++++++++++++++
 2 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Addic7ed.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
index 388e1774..be915baf 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
@@ -12,6 +12,7 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI {
         val aniListApi = AniListApi(0)
         val openSubtitlesApi = OpenSubtitlesApi(0)
         val indexSubtitlesApi = IndexSubtitleApi()
+        val addic7ed = Addic7ed()
 
         // used to login via app intent
         val OAuth2Apis
@@ -37,7 +38,8 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI {
         val subtitleProviders
             get() = listOf(
                 openSubtitlesApi,
-                indexSubtitlesApi // they got anti scraping measures in place :(
+                indexSubtitlesApi, // they got anti scraping measures in place :(
+                addic7ed
             )
 
         const val appString = "cloudstreamapp"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Addic7ed.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Addic7ed.kt
new file mode 100644
index 00000000..507c5e2a
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Addic7ed.kt
@@ -0,0 +1,108 @@
+package com.lagradost.cloudstream3.syncproviders.providers
+
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.subtitles.AbstractSubApi
+import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
+import com.lagradost.cloudstream3.utils.SubtitleHelper
+
+class Addic7ed : AbstractSubApi {
+    override val name = "Addic7ed"
+    override val idPrefix = "addic7ed"
+    override val requiresLogin = false
+    override val icon: Nothing? = null
+    override val createAccountUrl: Nothing? = null
+
+    override fun loginInfo(): Nothing? = null
+
+    override fun logOut() {}
+
+    companion object {
+        const val host = "https://www.addic7ed.com"
+        const val TAG = "ADDIC7ED"
+    }
+
+    private fun fixUrl(url: String): String {
+        return if (url.startsWith("/")) host + url
+        else if (!url.startsWith("http")) "$host/$url"
+        else url
+
+    }
+
+    override suspend fun search(query: AbstractSubtitleEntities.SubtitleSearch): List<AbstractSubtitleEntities.SubtitleEntity> {
+        val lang = query.lang
+        val queryLang = SubtitleHelper.fromTwoLettersToLanguage(lang.toString())
+        val queryText = query.query.trim()
+        val epNum = query.epNumber ?: 0
+        val seasonNum = query.seasonNumber ?: 0
+        val yearNum = query.year ?: 0
+
+        fun cleanResources(
+            results: MutableList<AbstractSubtitleEntities.SubtitleEntity>,
+            name: String,
+            link: String,
+            headers: Map<String, String>,
+            isHearingImpaired: Boolean
+        ) {
+            results.add(
+                AbstractSubtitleEntities.SubtitleEntity(
+                    idPrefix = idPrefix,
+                    name = name,
+                    lang = queryLang.toString(),
+                    data = link,
+                    source = this.name,
+                    type = if (seasonNum > 0) TvType.TvSeries else TvType.Movie,
+                    epNumber = epNum,
+                    seasonNumber = seasonNum,
+                    year = yearNum,
+                    headers = headers,
+                    isHearingImpaired = isHearingImpaired
+                )
+            )
+        }
+
+        val title = queryText.substringBefore("(").trim()
+        val url = "$host/search.php?search=${title}&Submit=Search"
+        val hostDocument = app.get(url).document
+        var searchResult = ""
+        if (!hostDocument.select("span:contains($title)").isNullOrEmpty()) searchResult = url
+        else if (!hostDocument.select("table.tabel")
+                .isNullOrEmpty()
+        ) searchResult = hostDocument.select("a:contains($title)").attr("href").toString()
+        else {
+            val show =
+                hostDocument.selectFirst("#sl button")?.attr("onmouseup")?.substringAfter("(")
+                    ?.substringBefore(",")
+            val doc = app.get(
+                "$host/ajax_loadShow.php?show=$show&season=$seasonNum&langs=&hd=undefined&hi=undefined",
+                referer = "$host/"
+            ).document
+            doc.select("#season tr:contains($queryLang)").mapNotNull { node ->
+                if (node.selectFirst("td")?.text()
+                        ?.toIntOrNull() == seasonNum && node.select("td:eq(1)")
+                        .text()
+                        .toIntOrNull() == epNum
+                ) searchResult = fixUrl(node.select("a").attr("href"))
+            }
+        }
+        val results = mutableListOf<AbstractSubtitleEntities.SubtitleEntity>()
+        val document = app.get(
+            url = fixUrl(searchResult),
+        ).document
+
+        document.select(".tabel95 .tabel95 tr:contains($queryLang)").mapNotNull { node ->
+            val name = if (seasonNum > 0) "${document.select(".titulo").text().replace("Subtitle","").trim()}${
+                node.parent()!!.select(".NewsTitle").text().substringAfter("Version").substringBefore(", Duration")
+            }" else "${document.select(".titulo").text().replace("Subtitle","").trim()}${node.parent()!!.select(".NewsTitle").text().substringAfter("Version").substringBefore(", Duration")}"
+            val link = fixUrl(node.select("a.buttonDownload").attr("href"))
+            val isHearingImpaired =
+                !node.parent()!!.select("tr:last-child [title=\"Hearing Impaired\"]").isNullOrEmpty()
+            cleanResources(results, name, link, mapOf("referer" to "$host/"), isHearingImpaired)
+        }
+        return results
+    }
+
+    override suspend fun load(data: AbstractSubtitleEntities.SubtitleEntity): String {
+        return data.data
+    }
+}
\ No newline at end of file

From 4b0b6f6f20d252203990424a78d89a77d7d5fbd7 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Thu, 8 Dec 2022 16:18:03 +0100
Subject: [PATCH 100/273] Reworked the internal subtitle API to fix edge-cases
 when importing subtitles

---
 app/build.gradle.kts                          |   4 +-
 .../cloudstream3/ui/player/CS3IPlayer.kt      | 136 +++++++++---------
 .../cloudstream3/ui/player/GeneratorPlayer.kt |  38 +++--
 .../ui/player/PlayerGeneratorViewModel.kt     |   8 +-
 .../ui/player/PlayerSubtitleHelper.kt         |  18 ++-
 5 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b50cb62a..306d2c77 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -48,7 +48,7 @@ android {
         targetSdk = 33
 
         versionCode = 55
-        versionName = "3.2.3"
+        versionName = "3.2.5"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
 
@@ -190,7 +190,7 @@ dependencies {
     // Networking
 //    implementation("com.squareup.okhttp3:okhttp:4.9.2")
 //    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1")
-    implementation("com.github.Blatzar:NiceHttp:0.4.0")
+    implementation("com.github.Blatzar:NiceHttp:0.4.1")
     // To fix SSL fuckery on android 9
     implementation("org.conscrypt:conscrypt-android:2.2.1")
     // Util to skip the URI file fuckery 🙏
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 8eda6e30..8f7e06f9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -8,8 +8,7 @@ import android.util.Log
 import android.widget.FrameLayout
 import androidx.preference.PreferenceManager
 import com.google.android.exoplayer2.*
-import com.google.android.exoplayer2.C.TRACK_TYPE_AUDIO
-import com.google.android.exoplayer2.C.TRACK_TYPE_VIDEO
+import com.google.android.exoplayer2.C.*
 import com.google.android.exoplayer2.database.StandaloneDatabaseProvider
 import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource
 import com.google.android.exoplayer2.source.*
@@ -89,10 +88,10 @@ class CS3IPlayer : IPlayer {
 
     /**
      * Tracks reported to be used by exoplayer, since sometimes it has a mind of it's own when selecting subs.
-     * String = lowercase language as set by .setLanguage("_$langId")
+     * String = id
      * Boolean = if it's active
      * */
-    private var exoPlayerSelectedTracks = listOf<Pair<String, Boolean>>()
+    private var playerSelectedSubtitleTracks = listOf<Pair<String, Boolean>>()
 
     /** isPlaying */
     private var updateIsPlaying: ((Pair<CSPlayerLoading, CSPlayerLoading>) -> Unit)? = null
@@ -311,14 +310,18 @@ class CS3IPlayer : IPlayer {
      * */
     private fun List<Tracks.Group>.getFormats(): List<Pair<Format, Int>> {
         return this.map {
-            (0 until it.mediaTrackGroup.length).mapNotNull { i ->
-                if (it.isSupported)
-                    it.mediaTrackGroup.getFormat(i) to i
-                else null
-            }
+            it.getFormats()
         }.flatten()
     }
 
+    private fun Tracks.Group.getFormats(): List<Pair<Format, Int>> {
+        return (0 until this.mediaTrackGroup.length).mapNotNull { i ->
+            if (this.isSupported)
+                this.mediaTrackGroup.getFormat(i) to i
+            else null
+        }
+    }
+
     private fun Format.toAudioTrack(): AudioTrack {
         return AudioTrack(
             this.id,
@@ -361,12 +364,17 @@ class CS3IPlayer : IPlayer {
     override fun setPreferredSubtitles(subtitle: SubtitleData?): Boolean {
         Log.i(TAG, "setPreferredSubtitles init $subtitle")
         currentSubtitles = subtitle
+
+        fun getTextTrack(id: String) =
+            exoPlayer?.currentTracks?.groups?.filter { it.type == TRACK_TYPE_TEXT }
+                ?.getTrack(id)
+
         return (exoPlayer?.trackSelector as? DefaultTrackSelector?)?.let { trackSelector ->
-            val name = subtitle?.name
-            if (name.isNullOrBlank()) {
+            if (subtitle == null) {
                 trackSelector.setParameters(
                     trackSelector.buildUponParameters()
                         .setPreferredTextLanguage(null)
+                        .clearOverridesOfType(TRACK_TYPE_TEXT)
                 )
             } else {
                 when (subtitleHelper.subtitleStatus(subtitle)) {
@@ -380,12 +388,15 @@ class CS3IPlayer : IPlayer {
                         trackSelector.setParameters(
                             trackSelector.buildUponParameters()
                                 .apply {
-                                    if (subtitle.origin == SubtitleOrigin.EMBEDDED_IN_VIDEO)
-                                    // The real Language (two letter) is in the url
-                                    // No underscore as the .url is the actual exoplayer designated language
-                                        setPreferredTextLanguage(subtitle.url)
-                                    else
-                                        setPreferredTextLanguage("_$name")
+                                    val track = getTextTrack(subtitle.getId())
+                                    if (track != null) {
+                                        setOverrideForType(
+                                            TrackSelectionOverride(
+                                                track.first,
+                                                track.second
+                                            )
+                                        )
+                                    }
                                 }
                         )
 
@@ -419,17 +430,8 @@ class CS3IPlayer : IPlayer {
 
     override fun getCurrentPreferredSubtitle(): SubtitleData? {
         return subtitleHelper.getAllSubtitles().firstOrNull { sub ->
-            exoPlayerSelectedTracks.any {
-                // When embedded the real language is in .url as the real name is a two letter code
-                val realName =
-                    if (sub.origin == SubtitleOrigin.EMBEDDED_IN_VIDEO) sub.url else sub.name
-
-                // The replace is needed as exoplayer translates _ to -
-                // Also we prefix the languages with _
-                it.second && it.first.replace("-", "").equals(
-                    realName.replace("-", ""),
-                    ignoreCase = true
-                )
+            playerSelectedSubtitleTracks.any { (id, isSelected) ->
+                isSelected && sub.getId() == id
             }
         }
     }
@@ -747,7 +749,7 @@ class CS3IPlayer : IPlayer {
         }
     }
 
-    private fun getCurrentTimestamp(writePosition : Long? = null): EpisodeSkip.SkipStamp? {
+    private fun getCurrentTimestamp(writePosition: Long? = null): EpisodeSkip.SkipStamp? {
         val position = writePosition ?: this@CS3IPlayer.getPosition() ?: return null
         for (lastTimeStamp in lastTimeStamps) {
             if (lastTimeStamp.startMs <= position && position < lastTimeStamp.endMs) {
@@ -757,7 +759,7 @@ class CS3IPlayer : IPlayer {
         return null
     }
 
-    fun updatedTime(writePosition : Long? = null) {
+    fun updatedTime(writePosition: Long? = null) {
         getCurrentTimestamp(writePosition)?.let { timestamp ->
             onTimestampInvoked?.invoke(timestamp)
         }
@@ -883,43 +885,36 @@ class CS3IPlayer : IPlayer {
             }
             exoPlayer?.addListener(object : Player.Listener {
                 override fun onTracksChanged(tracks: Tracks) {
-                    fun Format.isSubtitle(): Boolean {
-                        return this.sampleMimeType?.contains("video/") == false &&
-                                this.sampleMimeType?.contains("audio/") == false
-                    }
-
                     normalSafeApiCall {
-                        exoPlayerSelectedTracks =
-                            tracks.groups.mapNotNull {
-                                val format = it.mediaTrackGroup.getFormat(0)
-                                if (format.isSubtitle())
-                                    format.language?.let { lang -> lang to it.isSelected }
-                                else null
-                            }
+                        val textTracks = tracks.groups.filter { it.type == TRACK_TYPE_TEXT }
 
-                        val exoPlayerReportedTracks = tracks.groups.mapNotNull {
-                            // Filter out unsupported tracks
-                            if (it.isSupported)
-                                it.mediaTrackGroup.getFormat(0)
-                            else
-                                null
-                        }.mapNotNull {
-                            // Filter out non subs, already used subs and subs without languages
-                            if (!it.isSubtitle() ||
-                                // Anything starting with - is not embedded
-                                it.language?.startsWith("-") == true ||
-                                it.language == null
-                            ) return@mapNotNull null
-                            return@mapNotNull SubtitleData(
-                                // Nicer looking displayed names
-                                fromTwoLettersToLanguage(it.language!!) ?: it.language!!,
-                                // See setPreferredTextLanguage
-                                it.language!!,
-                                SubtitleOrigin.EMBEDDED_IN_VIDEO,
-                                it.sampleMimeType ?: MimeTypes.APPLICATION_SUBRIP,
-                                emptyMap()
-                            )
-                        }
+                        playerSelectedSubtitleTracks =
+                            textTracks.map { group ->
+                                group.getFormats().mapNotNull { (format, _) ->
+                                    (format.id ?: return@mapNotNull null) to group.isSelected
+                                }
+                            }.flatten()
+
+                        val exoPlayerReportedTracks =
+                            tracks.groups.filter { it.type == TRACK_TYPE_TEXT }.getFormats()
+                                .mapNotNull { (format, _) ->
+                                    // Filter out non subs, already used subs and subs without languages
+                                    if (format.id == null ||
+                                        format.language == null ||
+                                        format.language?.startsWith("-") == true
+                                    ) return@mapNotNull null
+
+                                    return@mapNotNull SubtitleData(
+                                        // Nicer looking displayed names
+                                        fromTwoLettersToLanguage(format.language!!)
+                                            ?: format.language!!,
+                                        // See setPreferredTextLanguage
+                                        format.id!!,
+                                        SubtitleOrigin.EMBEDDED_IN_VIDEO,
+                                        format.sampleMimeType ?: MimeTypes.APPLICATION_SUBRIP,
+                                        emptyMap()
+                                    )
+                                }
 
                         embeddedSubtitlesFetched?.invoke(exoPlayerReportedTracks)
                         onTracksInfoChanged?.invoke()
@@ -978,7 +973,7 @@ class CS3IPlayer : IPlayer {
                     // This is to switch mirrors automatically if the stream has not been fetched, but
                     // allow playing the buffer without internet as then the duration is fetched.
                     if (error.errorCode == PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED
-                        && exoPlayer?.duration != C.TIME_UNSET
+                        && exoPlayer?.duration != TIME_UNSET
                     ) {
                         exoPlayer?.prepare()
                     } else {
@@ -1137,14 +1132,15 @@ class CS3IPlayer : IPlayer {
             val subConfig = MediaItem.SubtitleConfiguration.Builder(Uri.parse(sub.url))
                 .setMimeType(sub.mimeType)
                 .setLanguage("_${sub.name}")
-                .setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
+                .setId(sub.getId())
+                .setSelectionFlags(SELECTION_FLAG_DEFAULT)
                 .build()
             when (sub.origin) {
                 SubtitleOrigin.DOWNLOADED_FILE -> {
                     if (offlineSourceFactory != null) {
                         activeSubtitles.add(sub)
                         SingleSampleMediaSource.Factory(offlineSourceFactory)
-                            .createMediaSource(subConfig, C.TIME_UNSET)
+                            .createMediaSource(subConfig, TIME_UNSET)
                     } else {
                         null
                     }
@@ -1156,7 +1152,7 @@ class CS3IPlayer : IPlayer {
                             if (sub.headers.isNotEmpty())
                                 this.setDefaultRequestProperties(sub.headers)
                         })
-                            .createMediaSource(subConfig, C.TIME_UNSET)
+                            .createMediaSource(subConfig, TIME_UNSET)
                     } else {
                         null
                     }
@@ -1165,7 +1161,7 @@ class CS3IPlayer : IPlayer {
                     if (offlineSourceFactory != null) {
                         activeSubtitles.add(sub)
                         SingleSampleMediaSource.Factory(offlineSourceFactory)
-                            .createMediaSource(subConfig, C.TIME_UNSET)
+                            .createMediaSource(subConfig, TIME_UNSET)
                     } else {
                         null
                     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 95a9393f..fa0a2a7f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -438,16 +438,17 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     private fun addAndSelectSubtitles(subtitleData: SubtitleData) {
         val ctx = context ?: return
-        setSubtitles(subtitleData)
 
-        // this is used instead of observe, because observe is too slow
         val subs = currentSubs + subtitleData
 
+        // this is used instead of observe(viewModel._currentSubs), because observe is too slow
+        player.setActiveSubtitles(subs)
+
         // Save current time as to not reset player to 00:00
         player.saveData()
-        player.setActiveSubtitles(subs)
         player.reloadPlayer(ctx)
 
+        setSubtitles(subtitleData)
         viewModel.addSubtitles(setOf(subtitleData))
 
         selectSourceDialog?.dismissSafe()
@@ -959,7 +960,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         subtitles: Set<SubtitleData>, settings: Boolean, downloads: Boolean
     ): SubtitleData? {
         val langCode = preferredAutoSelectSubtitles ?: return null
-        val lang = SubtitleHelper.fromTwoLettersToLanguage(langCode) ?: return null
+        val lang = fromTwoLettersToLanguage(langCode) ?: return null
         if (downloads) {
             return subtitles.firstOrNull { sub ->
                 (sub.origin == SubtitleOrigin.DOWNLOADED_FILE && sub.name == context?.getString(
@@ -970,22 +971,11 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         sortSubs(subtitles).firstOrNull { sub ->
             val t = sub.name.replace(Regex("[^A-Za-z]"), " ").trim()
-            (settings || (downloads && sub.origin == SubtitleOrigin.DOWNLOADED_FILE)) && t == lang || t.startsWith(
-                "$lang "
-            ) || t == langCode
+            (settings) && t == lang || t.startsWith(lang) || t == langCode
         }?.let { sub ->
             return sub
         }
 
-        // post check in case both did not catch anything
-        if (downloads) {
-            return subtitles.firstOrNull { sub ->
-                (sub.origin == SubtitleOrigin.DOWNLOADED_FILE || sub.name == context?.getString(
-                    R.string.default_subtitles
-                ))
-            }
-        }
-
         return null
     }
 
@@ -1006,14 +996,12 @@ class GeneratorPlayer : FullScreenPlayer() {
                 getAutoSelectSubtitle(
                     currentSubs, settings = true, downloads = false
                 )?.let { sub ->
-
                     if (setSubtitles(sub)) {
                         player.saveData()
                         player.reloadPlayer(ctx)
                         player.handleEvent(CSPlayerEvent.Play)
                         return true
                     }
-
                 }
             }
         }
@@ -1304,8 +1292,10 @@ class GeneratorPlayer : FullScreenPlayer() {
                 Log.i("subfilter", "Filtering subtitle")
                 langFilterList.forEach { lang ->
                     Log.i("subfilter", "Lang: $lang")
-                    setOfSub += set.filter { it.name.contains(lang, ignoreCase = true) }
-                        .toMutableSet()
+                    setOfSub += set.filter {
+                        it.name.contains(lang, ignoreCase = true) ||
+                                it.origin != SubtitleOrigin.URL
+                    }
                 }
                 currentSubs = setOfSub
             } else {
@@ -1313,7 +1303,13 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
             player.setActiveSubtitles(set)
 
-            autoSelectSubtitles()
+            // If the file is downloaded then do not select auto select the subtitles
+            // Downloaded subtitles cannot be selected immediately after loading since
+            // player.getCurrentPreferredSubtitle() cannot fetch data from non-loaded subtitles
+            // Resulting in unselecting the downloaded subtitle
+            if (set.lastOrNull()?.origin != SubtitleOrigin.DOWNLOADED_FILE) {
+                autoSelectSubtitles()
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
index 4f16e9f6..dc33f67c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
@@ -113,8 +113,9 @@ class PlayerGeneratorViewModel : ViewModel() {
         // Do not post if there's nothing new
         // Posting will refresh subtitles which will in turn
         // make the subs to english if previously unselected
-        if (allSubs != currentSubs)
+        if (allSubs != currentSubs) {
             _currentSubs.postValue(allSubs)
+        }
     }
 
     private var currentJob: Job? = null
@@ -164,9 +165,10 @@ class PlayerGeneratorViewModel : ViewModel() {
             }
 
             _loadingLinks.postValue(loadingState)
-
             _currentLinks.postValue(currentLinks)
-            _currentSubs.postValue(currentSubs)
+            _currentSubs.postValue(
+                currentSubs.union(_currentSubs.value ?: emptySet())
+            )
         }
 
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt
index b06812c4..8d85f176 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt
@@ -28,7 +28,7 @@ enum class SubtitleOrigin {
 
 /**
  * @param name To be displayed in the player
- * @param url Url for the subtitle, when EMBEDDED_IN_VIDEO this variable is used as the real backend language
+ * @param url Url for the subtitle, when EMBEDDED_IN_VIDEO this variable is used as the real backend id
  * @param headers if empty it will use the base onlineDataSource headers else only the specified headers
  * */
 data class SubtitleData(
@@ -37,7 +37,13 @@ data class SubtitleData(
     val origin: SubtitleOrigin,
     val mimeType: String,
     val headers: Map<String, String>
-)
+) {
+    /** Internal ID for exoplayer, unique for each link*/
+    fun getId(): String {
+        return if (origin == SubtitleOrigin.EMBEDDED_IN_VIDEO) url
+        else "$url|$name"
+    }
+}
 
 class PlayerSubtitleHelper {
     private var activeSubtitles: Set<SubtitleData> = emptySet()
@@ -79,11 +85,11 @@ class PlayerSubtitleHelper {
         }
     }
 
-    fun subtitleStatus(sub : SubtitleData?): SubtitleStatus {
-        if(activeSubtitles.contains(sub)) {
+    fun subtitleStatus(sub: SubtitleData?): SubtitleStatus {
+        if (activeSubtitles.contains(sub)) {
             return SubtitleStatus.IS_ACTIVE
         }
-        if(allSubtitles.contains(sub)) {
+        if (allSubtitles.contains(sub)) {
             return SubtitleStatus.REQUIRES_RELOAD
         }
         return SubtitleStatus.NOT_FOUND
@@ -95,7 +101,7 @@ class PlayerSubtitleHelper {
         regexSubtitlesToRemoveCaptions = style.removeCaptions
         subtitleView?.context?.let { ctx ->
             subStyle = style
-            Log.i(TAG,"SET STYLE = $style")
+            Log.i(TAG, "SET STYLE = $style")
             subtitleView?.setStyle(ctx.fromSaveToStyle(style))
             subtitleView?.translationY = -style.elevation.toPx.toFloat()
             val size = style.fixedTextSize

From 4f54bf3ae47b4946e506521c241870785b110501 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 9 Dec 2022 00:37:59 +0100
Subject: [PATCH 101/273] Added outlines to more things to increase
 accessibility on Android TV

---
 .../res/color/white_transparent_toggle.xml    |   5 +
 .../layout/player_select_source_and_subs.xml  | 215 +++++++++---------
 .../main/res/layout/search_history_item.xml   |  65 +++---
 .../res/layout/sort_bottom_single_choice.xml  |   8 +-
 app/src/main/res/values/styles.xml            |   9 +-
 5 files changed, 157 insertions(+), 145 deletions(-)
 create mode 100644 app/src/main/res/color/white_transparent_toggle.xml

diff --git a/app/src/main/res/color/white_transparent_toggle.xml b/app/src/main/res/color/white_transparent_toggle.xml
new file mode 100644
index 00000000..a94501bd
--- /dev/null
+++ b/app/src/main/res/color/white_transparent_toggle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:color="?attr/white"/>
+    <item android:color="@color/transparent"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_select_source_and_subs.xml b/app/src/main/res/layout/player_select_source_and_subs.xml
index 1efa00be..369f6776 100644
--- a/app/src/main/res/layout/player_select_source_and_subs.xml
+++ b/app/src/main/res/layout/player_select_source_and_subs.xml
@@ -1,148 +1,149 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@null"
-        android:orientation="vertical">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@null"
+    android:orientation="vertical">
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="60dp"
-            android:baselineAligned="false"
-            android:orientation="horizontal">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="60dp"
+        android:baselineAligned="false"
+        android:orientation="horizontal">
 
         <LinearLayout
-                android:id="@+id/sort_sources_holder"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="50"
-                android:orientation="vertical">
+            android:id="@+id/sort_sources_holder"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="50"
+            android:orientation="vertical">
 
             <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_rowWeight="1"
-                    android:layout_marginTop="10dp"
-                    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                    android:paddingTop="10dp"
-                    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                    android:paddingBottom="10dp"
-                    android:text="@string/pick_source"
-                    android:textColor="?attr/textColor"
-                    android:textSize="20sp"
-                    android:textStyle="bold" />
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_rowWeight="1"
+                android:layout_marginTop="10dp"
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingTop="10dp"
+                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                android:paddingBottom="10dp"
+                android:text="@string/pick_source"
+                android:textColor="?attr/textColor"
+                android:textSize="20sp"
+                android:textStyle="bold" />
 
             <ListView
-                    android:requiresFadingEdge="vertical"
-                    android:id="@+id/sort_providers"
-                    android:layout_width="match_parent"
-
-                    android:layout_height="match_parent"
-                    android:layout_rowWeight="1"
-                    android:background="?attr/primaryBlackBackground"
-                    android:nextFocusLeft="@id/sort_subtitles"
-                    android:nextFocusRight="@id/apply_btt"
-                    tools:listitem="@layout/sort_bottom_single_choice" />
+                android:id="@+id/sort_providers"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_rowWeight="1"
+                android:background="?attr/primaryBlackBackground"
+                android:listSelector="@drawable/outline_drawable_less"
+                android:nextFocusLeft="@id/sort_subtitles"
+                android:nextFocusRight="@id/apply_btt"
+                android:requiresFadingEdge="vertical"
+                tools:listitem="@layout/sort_bottom_single_choice" />
         </LinearLayout>
 
         <LinearLayout
-                android:id="@+id/sort_subtitles_holder"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="50"
-                android:orientation="vertical">
+            android:id="@+id/sort_subtitles_holder"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="50"
+            android:orientation="vertical">
 
             <!--   android:id="@+id/subs_settings"                 android:foreground="?android:attr/selectableItemBackgroundBorderless"
 -->
             <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    tools:ignore="UseCompoundDrawables">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                tools:ignore="UseCompoundDrawables">
 
                 <LinearLayout
-                        android:foreground="?attr/selectableItemBackgroundBorderless"
-                        android:id="@+id/subtitles_click_settings"
-                        android:layout_rowWeight="1"
-                        android:paddingTop="10dp"
-                        android:paddingBottom="10dp"
-                        android:layout_marginTop="10dp"
-                        android:orientation="horizontal"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:id="@+id/subtitles_click_settings"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_rowWeight="1"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/outline_drawable_less"
+                    android:foreground="?attr/selectableItemBackgroundBorderless"
+                    android:orientation="horizontal"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp">
 
                     <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                            android:text="@string/pick_subtitle"
-                            android:textColor="?attr/textColor"
-                            android:textSize="20sp"
-                            android:textStyle="bold" />
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                        android:text="@string/pick_subtitle"
+                        android:textColor="?attr/textColor"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
 
                     <TextView
-                            android:textSize="15sp"
-                            android:id="@+id/subtitles_encoding_format"
-                            android:textColor="?attr/textColor"
-                            android:layout_gravity="center"
-                            android:gravity="center"
-                            tools:text="Thai (TIS 620-2533/ISO 8859-11)"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
+                        android:id="@+id/subtitles_encoding_format"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:textColor="?attr/textColor"
+                        android:textSize="15sp"
+                        tools:text="Thai (TIS 620-2533/ISO 8859-11)" />
                 </LinearLayout>
 
                 <ImageView
-                        android:layout_width="25dp"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end|center_vertical"
-                        android:layout_marginTop="0dp"
-                        android:layout_marginEnd="10dp"
+                    android:layout_width="25dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end|center_vertical"
+                    android:layout_marginTop="0dp"
+                    android:layout_marginEnd="10dp"
 
-                        android:contentDescription="@string/home_change_provider_img_des"
-                        android:src="@drawable/ic_outline_settings_24"
-                        android:visibility="gone" />
+                    android:contentDescription="@string/home_change_provider_img_des"
+                    android:src="@drawable/ic_outline_settings_24"
+                    android:visibility="gone" />
             </LinearLayout>
 
             <ListView
-                    android:requiresFadingEdge="vertical"
-                    android:id="@+id/sort_subtitles"
-                    android:layout_width="match_parent"
-
-                    android:layout_height="match_parent"
-                    android:layout_rowWeight="1"
-                    android:background="?attr/primaryBlackBackground"
-                    android:nextFocusLeft="@id/sort_providers"
-                    android:nextFocusRight="@id/cancel_btt"
-                    tools:listfooter="@layout/sort_bottom_footer_add_choice"
-                    tools:listitem="@layout/sort_bottom_single_choice" />
+                android:id="@+id/sort_subtitles"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_rowWeight="1"
+                android:background="?attr/primaryBlackBackground"
+                android:listSelector="@drawable/outline_drawable_less"
+                android:nextFocusLeft="@id/sort_providers"
+                android:nextFocusRight="@id/cancel_btt"
+                android:requiresFadingEdge="vertical"
+                tools:listfooter="@layout/sort_bottom_footer_add_choice"
+                tools:listitem="@layout/sort_bottom_single_choice" />
         </LinearLayout>
     </LinearLayout>
 
     <LinearLayout
-            android:id="@+id/apply_btt_holder"
-            android:orientation="horizontal"
-            android:layout_gravity="bottom"
-            android:gravity="bottom|end"
-            android:layout_marginTop="-60dp"
-            android:layout_width="match_parent"
-            android:layout_height="60dp">
+        android:id="@+id/apply_btt_holder"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_gravity="bottom"
+        android:layout_marginTop="-60dp"
+        android:gravity="bottom|end"
+        android:orientation="horizontal">
 
 
         <com.google.android.material.button.MaterialButton
-                style="@style/WhiteButton"
-                android:layout_gravity="center_vertical|end"
-                android:text="@string/sort_apply"
-                android:id="@+id/apply_btt"
-                android:layout_width="wrap_content" />
+            android:id="@+id/apply_btt"
+            style="@style/WhiteButton"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:text="@string/sort_apply" />
 
         <com.google.android.material.button.MaterialButton
-                style="@style/BlackButton"
-                android:layout_gravity="center_vertical|end"
-                android:text="@string/sort_cancel"
-                android:id="@+id/cancel_btt"
-                android:layout_width="wrap_content" />
+            android:id="@+id/cancel_btt"
+            style="@style/BlackButton"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:text="@string/sort_cancel" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/search_history_item.xml b/app/src/main/res/layout/search_history_item.xml
index 34cd59bc..ef441234 100644
--- a/app/src/main/res/layout/search_history_item.xml
+++ b/app/src/main/res/layout/search_history_item.xml
@@ -1,39 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:id="@+id/home_history_tab"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-        android:nextFocusRight="@id/home_history_remove">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/home_history_tab"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/outline_drawable_less"
+    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+    android:nextFocusRight="@id/home_history_remove"
+    android:orientation="horizontal">
 
     <TextView
-            android:id="@+id/home_history_title"
-            android:textColor="?attr/textColor"
-            android:textSize="18sp"
-            tools:text="Hello World"
-            android:padding="10dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
+        android:id="@+id/home_history_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:textColor="?attr/textColor"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Hello World" />
 
     <ImageView
-            android:padding="10dp"
-            android:id="@+id/home_history_remove"
-            android:nextFocusLeft="@id/home_history_tab"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:id="@+id/home_history_remove"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical|end"
 
-            android:src="@drawable/ic_baseline_close_24"
-            android:layout_width="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:layout_height="match_parent"
-            app:tint="?attr/white"
-            tools:ignore="ContentDescription"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+        android:background="@drawable/outline_drawable_less"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+
+        android:nextFocusLeft="@id/home_history_tab"
+        android:padding="10dp"
+        android:src="@drawable/ic_baseline_close_24"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?attr/white"
+        tools:ignore="ContentDescription" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/sort_bottom_single_choice.xml b/app/src/main/res/layout/sort_bottom_single_choice.xml
index 6e81cf2e..3d0a70ff 100644
--- a/app/src/main/res/layout/sort_bottom_single_choice.xml
+++ b/app/src/main/res/layout/sort_bottom_single_choice.xml
@@ -14,7 +14,7 @@
 -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        style="@style/CheckLabel"
-        tools:text="hello"
-        android:id="@android:id/text1" />
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@android:id/text1"
+    style="@style/CheckLabel"
+    tools:text="hello" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4fde7ae8..12da27de 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -70,6 +70,8 @@
 
     <style name="ListViewStyle" parent="Widget.AppCompat.ListView">
         <item name="android:divider">@null</item>
+        <item name="android:listSelector">@drawable/outline_drawable_less</item>
+        <item name="android:drawSelectorOnTop">false</item>
     </style>
 
     <style name="AmoledModeLight" parent="AmoledMode">
@@ -78,7 +80,8 @@
 
     <style name="ChipFilled" parent="@style/Widget.Material3.Chip.Filter">
         <item name="chipBackgroundColor">@color/chip_color</item>
-        <item name="chipStrokeColor">@color/transparent</item>
+        <item name="chipStrokeColor">@color/white_transparent_toggle</item>
+        <item name="chipStrokeWidth">2dp</item>
         <item name="textColor">@color/chip_color_text</item>
         <item name="android:textColor">@color/chip_color_text</item>
         <item name="checkedIconTint">@color/chip_color_text</item>
@@ -97,7 +100,7 @@
         <item name="white">@color/white</item>
         <item name="colorOnPrimary">@color/whiteText</item>
     </style>
-    
+
     <style name="DubButton" parent="@style/SearchBox">
         <item name="android:background">@drawable/dub_bg_color</item>
         <item name="android:text">@string/app_dubbed_text</item>
@@ -455,7 +458,7 @@
         <item name="android:paddingStart">20dp</item>
         <item name="android:paddingEnd">20dp</item>
         <item name="android:selectAllOnFocus">true</item>
-        <item name="android:background">@color/transparent</item>
+        <item name="android:background">@drawable/outline_drawable_less</item>
         <item name="android:textColor">?attr/textColor</item>
         <item name="android:foreground">?attr/selectableItemBackgroundBorderless</item>
         <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>

From 20ac21c25f14adfe646571192c2a9f64369b0c4d Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Fri, 9 Dec 2022 18:12:51 +0100
Subject: [PATCH 102/273] small UI change

---
 app/src/main/res/drawable/progress_drawable_vertical.xml | 4 ++--
 app/src/main/res/layout/player_custom_layout.xml         | 4 ++--
 app/src/main/res/values/colors.xml                       | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/drawable/progress_drawable_vertical.xml b/app/src/main/res/drawable/progress_drawable_vertical.xml
index 207196f5..a9535131 100644
--- a/app/src/main/res/drawable/progress_drawable_vertical.xml
+++ b/app/src/main/res/drawable/progress_drawable_vertical.xml
@@ -3,14 +3,14 @@
     <item android:id="@android:id/background">
         <shape>
             <corners android:radius="8dp"/>
-            <solid android:color="@color/darkBarTransparent"/>
+            <solid android:color="@color/progressBackgroundColor"/>
         </shape>
     </item>
 
     <item android:id="@android:id/progress">
         <scale android:scaleGravity="bottom" android:scaleWidth="0%" android:scaleHeight="100%">
             <shape>
-                <solid android:color="?attr/colorPrimary"/>
+                <solid android:color="@color/white"/>
                 <corners android:radius="3dp"/>
             </shape>
         </scale>
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 2cdcbf22..691795d3 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -597,7 +597,7 @@
             <ProgressBar
                 android:id="@+id/player_progressbar_left"
                 style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                android:layout_width="4dp"
+                android:layout_width="5dp"
                 android:layout_height="150dp"
                 android:layout_centerInParent="true"
                 android:layout_gravity="end|center_vertical"
@@ -639,7 +639,7 @@
             <ProgressBar
                 android:id="@+id/player_progressbar_right"
                 style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                android:layout_width="4dp"
+                android:layout_width="5dp"
                 android:layout_height="150dp"
                 android:layout_centerInParent="true"
                 android:layout_gravity="end|center_vertical"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7c2e798b..ff8e3db4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -25,6 +25,8 @@
     <color name="whiteText">#FFF</color>
     <color name="blackText">#000</color>
 
+    <color name="progressBackgroundColor">#1AFFFFFF</color>
+
     <color name="dubColorText">#121950</color> <!--3b65f5 f18c82 8294F1-->
     <color name="amoledModeLight">#121213</color>
 

From 95f4a158649239ac460e121bf3c693a3ca8e0550 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 9 Dec 2022 18:20:10 +0100
Subject: [PATCH 103/273] + Added Confirm exit on Android TV + Added support
 for Play Next on Android TV

---
 app/build.gradle.kts                          |  2 +-
 app/src/main/AndroidManifest.xml              | 15 +++-
 .../lagradost/cloudstream3/MainActivity.kt    | 42 ++++++++-
 .../syncproviders/AccountManager.kt           |  3 +
 .../cloudstream3/ui/home/HomeFragment.kt      | 18 ++--
 .../cloudstream3/ui/home/HomeViewModel.kt     | 67 +++++++-------
 .../lagradost/cloudstream3/utils/AppUtils.kt  | 90 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  4 +
 8 files changed, 182 insertions(+), 59 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 306d2c77..e389f7b0 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -48,7 +48,7 @@ android {
         targetSdk = 33
 
         versionCode = 55
-        versionName = "3.2.5"
+        versionName = "3.2.6"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d827a3e8..11b82afb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <!-- Used for player vertical slide -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <!-- Used for app update -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <!-- Used for app notifications on Android 13+ -->
-    <!-- <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" /> not used atm, but code exist that requires it that are not run -->
+    <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" /> <!-- not used atm, but code exist that requires it that are not run -->
     <!-- <permission android:name="android.permission.QUERY_ALL_PACKAGES" /> &lt;!&ndash; Used for getting if vlc is installed &ndash;&gt; -->
     <!-- Fixes android tv fuckery -->
     <uses-feature
@@ -122,6 +122,19 @@
                 <data android:scheme="cloudstreamsearch" />
             </intent-filter>
 
+            <!--
+            Allow opening from continue watching with intents: cloudstreamsearch://1234
+            Used on Android TV Watch Next
+             -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="cloudstreamcontinuewatching" />
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 1f208502..a1bd0177 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -54,13 +54,17 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.OAuth2A
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.accountManagers
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appString
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringRepo
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringResumeWatching
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringSearch
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.inAppAuths
 import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_NAVIGATE_TO
+import com.lagradost.cloudstream3.ui.home.HomeViewModel
+import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
 import com.lagradost.cloudstream3.ui.search.SearchFragment
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isEmulatorSettings
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsGeneral
 import com.lagradost.cloudstream3.ui.setup.HAS_DONE_SETUP_KEY
@@ -69,6 +73,7 @@ import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
 import com.lagradost.cloudstream3.utils.AppUtils.loadCache
 import com.lagradost.cloudstream3.utils.AppUtils.loadRepository
 import com.lagradost.cloudstream3.utils.AppUtils.loadResult
+import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.BackupUtils.setUpBackup
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DataStore.getKey
@@ -83,6 +88,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
+import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
 import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
 import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
@@ -289,6 +295,19 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                         nextSearchQuery =
                             URLDecoder.decode(str.substringAfter("$appStringSearch://"), "UTF-8")
                         nav_view.selectedItemId = R.id.navigation_search
+                    } else if (safeURI(str)?.scheme == appStringResumeWatching) {
+                        val id =
+                            str.substringAfter("$appStringResumeWatching://").toIntOrNull()
+                                ?: return false
+                        ioSafe {
+                            val resumeWatchingCard =
+                                HomeViewModel.getResumeWatching()?.firstOrNull { it.id == id }
+                                    ?: return@ioSafe
+                            activity.loadSearchResult(
+                                resumeWatchingCard,
+                                START_ACTION_RESUME_LATEST
+                            )
+                        }
                     } else if (!isWebview) {
                         if (str.startsWith(DOWNLOAD_NAVIGATE_TO)) {
                             this.navigate(R.id.navigation_downloads)
@@ -449,12 +468,33 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         onUserLeaveHint(this)
     }
 
+    private fun showConfirmExitDialog() {
+        val builder: AlertDialog.Builder = AlertDialog.Builder(this, R.style.AlertDialogCustom)
+        builder.setTitle(R.string.confirm_exit_dialog)
+        builder.apply {
+            setPositiveButton(R.string.yes) { _, _ -> super.onBackPressed() }
+            setNegativeButton(R.string.no) { _, _ -> }
+        }
+        builder.show()
+    }
+
     private fun backPressed() {
         this.window?.navigationBarColor =
             this.colorFromAttribute(R.attr.primaryGrayBackground)
         this.updateLocale()
-        super.onBackPressed()
         this.updateLocale()
+
+        val navHostFragment =
+            supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment
+        val navController = navHostFragment?.navController
+        val isAtHome =
+            navController?.currentDestination?.matchDestination(R.id.navigation_home) == true
+
+        if (isAtHome && isTrueTvSettings()) {
+            showConfirmExitDialog()
+        } else {
+            super.onBackPressed()
+        }
     }
 
     override fun onBackPressed() {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
index be915baf..f09bf8fe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
@@ -48,6 +48,9 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI {
         // Instantly start the search given a query
         const val appStringSearch = "cloudstreamsearch"
 
+        // Instantly resume watching a show
+        const val appStringResumeWatching = "cloudstreamcontinuewatching"
+
         val unixTime: Long
             get() = System.currentTimeMillis() / 1000L
         val unixTimeMs: Long
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 00b53fa7..b7803e6c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -7,6 +7,7 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.content.res.Configuration
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -56,6 +57,7 @@ import com.lagradost.cloudstream3.ui.search.*
 import com.lagradost.cloudstream3.ui.search.SearchHelper.handleSearchClickCallback
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
+import com.lagradost.cloudstream3.utils.AppUtils.addProgramsToContinueWatching
 import com.lagradost.cloudstream3.utils.AppUtils.isRecyclerScrollable
 import com.lagradost.cloudstream3.utils.AppUtils.loadResult
 import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
@@ -552,7 +554,7 @@ class HomeFragment : Fragment() {
 
         observe(homeViewModel.preview) { preview ->
             // Always reset the padding, otherwise the will move lower and lower
-           // home_fix_padding?.setPadding(0, 0, 0, 0)
+            // home_fix_padding?.setPadding(0, 0, 0, 0)
             home_fix_padding?.let { v ->
                 val params = v.layoutParams
                 params.height = 0
@@ -596,7 +598,7 @@ class HomeFragment : Fragment() {
             val callback: OnPageChangeCallback = object : OnPageChangeCallback() {
                 override fun onPageSelected(position: Int) {
 
-                   // home_search?.isIconified = true
+                    // home_search?.isIconified = true
                     //home_search?.isVisible = true
                     //home_search?.clearFocus()
 
@@ -927,11 +929,13 @@ class HomeFragment : Fragment() {
                 resumeWatching
             )
 
-            //if (context?.isTvSettings() == true) {
-            //    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            //        context?.addProgramsToContinueWatching(resumeWatching.mapNotNull { it as? DataStoreHelper.ResumeWatchingResult })
-            //    }
-            //}
+            if (isTrueTvSettings()) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    ioSafe {
+                        activity?.addProgramsToContinueWatching(resumeWatching.mapNotNull { it as? DataStoreHelper.ResumeWatchingResult })
+                    }
+                }
+            }
 
             home_watch_child_more_info?.setOnClickListener {
                 activity?.loadHomepageList(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index 9d75b0f0..3bb196e2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -36,6 +36,42 @@ import java.util.*
 import kotlin.collections.set
 
 class HomeViewModel : ViewModel() {
+    companion object {
+        suspend fun getResumeWatching(): List<DataStoreHelper.ResumeWatchingResult>? {
+            val resumeWatching = withContext(Dispatchers.IO) {
+                getAllResumeStateIds()?.mapNotNull { id ->
+                    getLastWatched(id)
+                }?.sortedBy { -it.updateTime }
+            }
+            val resumeWatchingResult = withContext(Dispatchers.IO) {
+                resumeWatching?.mapNotNull { resume ->
+
+                    val data = getKey<VideoDownloadHelper.DownloadHeaderCached>(
+                        DOWNLOAD_HEADER_CACHE,
+                        resume.parentId.toString()
+                    ) ?: return@mapNotNull null
+
+                    val watchPos = getViewPos(resume.episodeId)
+
+                    DataStoreHelper.ResumeWatchingResult(
+                        data.name,
+                        data.url,
+                        data.apiName,
+                        data.type,
+                        data.poster,
+                        watchPos,
+                        resume.episodeId,
+                        resume.parentId,
+                        resume.episode,
+                        resume.season,
+                        resume.isFromDownload
+                    )
+                }
+            }
+            return resumeWatchingResult
+        }
+    }
+
     private var repo: APIRepository? = null
 
     private val _apiName = MutableLiveData<String>()
@@ -66,36 +102,7 @@ class HomeViewModel : ViewModel() {
     val preview: LiveData<Resource<Pair<Boolean, List<LoadResponse>>>> = _preview
 
     fun loadResumeWatching() = viewModelScope.launchSafe {
-        val resumeWatching = withContext(Dispatchers.IO) {
-            getAllResumeStateIds()?.mapNotNull { id ->
-                getLastWatched(id)
-            }?.sortedBy { -it.updateTime }
-        }
-
-        // val resumeWatchingResult = ArrayList<DataStoreHelper.ResumeWatchingResult>()
-
-        val resumeWatchingResult = withContext(Dispatchers.IO) {
-            resumeWatching?.map { resume ->
-                val data = getKey<VideoDownloadHelper.DownloadHeaderCached>(
-                    DOWNLOAD_HEADER_CACHE,
-                    resume.parentId.toString()
-                ) ?: return@map null
-                val watchPos = getViewPos(resume.episodeId)
-                DataStoreHelper.ResumeWatchingResult(
-                    data.name,
-                    data.url,
-                    data.apiName,
-                    data.type,
-                    data.poster,
-                    watchPos,
-                    resume.episodeId,
-                    resume.parentId,
-                    resume.episode,
-                    resume.season,
-                    resume.isFromDownload
-                )
-            }?.filterNotNull()
-        }
+        val resumeWatchingResult = getResumeWatching()
         resumeWatchingResult?.let {
             _resumeWatching.postValue(it)
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
index cf3fbfde..597316c3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -3,9 +3,7 @@ package com.lagradost.cloudstream3.utils
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Activity.RESULT_CANCELED
-import android.content.ContentValues
-import android.content.Context
-import android.content.Intent
+import android.content.*
 import android.content.pm.PackageManager
 import android.database.Cursor
 import android.media.AudioAttributes
@@ -26,7 +24,6 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.annotation.WorkerThread
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.text.HtmlCompat
 import androidx.core.text.toSpanned
@@ -35,9 +32,7 @@ import androidx.fragment.app.FragmentActivity
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import androidx.tvprovider.media.tv.PreviewChannelHelper
-import androidx.tvprovider.media.tv.TvContractCompat
-import androidx.tvprovider.media.tv.WatchNextProgram
+import androidx.tvprovider.media.tv.*
 import androidx.tvprovider.media.tv.WatchNextProgram.fromCursor
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.google.android.gms.cast.framework.CastContext
@@ -51,6 +46,7 @@ import com.lagradost.cloudstream3.MainActivity.Companion.afterRepositoryLoadedEv
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.plugins.RepositoryManager
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringResumeWatching
 import com.lagradost.cloudstream3.ui.WebviewFragment
 import com.lagradost.cloudstream3.ui.result.ResultFragment
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
@@ -58,9 +54,13 @@ import com.lagradost.cloudstream3.ui.settings.extensions.PluginsViewModel.Compan
 import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllResumeStateIds
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getLastWatched
 import com.lagradost.cloudstream3.utils.FillerEpisodeCheck.toClassDir
 import com.lagradost.cloudstream3.utils.JsUnpacker.Companion.load
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import okhttp3.Cache
 import java.io.*
 import java.net.URL
@@ -110,7 +110,8 @@ object AppUtils {
     @SuppressLint("RestrictedApi")
     private fun buildWatchNextProgramUri(
         context: Context,
-        card: DataStoreHelper.ResumeWatchingResult
+        card: DataStoreHelper.ResumeWatchingResult,
+        resumeWatching: VideoDownloadHelper.ResumeWatching?
     ): WatchNextProgram {
         val isSeries = card.type?.isMovieType() == false
         val title = if (isSeries) {
@@ -129,15 +130,18 @@ object AppUtils {
             .setWatchNextType(TvContractCompat.WatchNextPrograms.WATCH_NEXT_TYPE_CONTINUE)
             .setTitle(title)
             .setPosterArtUri(Uri.parse(card.posterUrl))
-            .setIntentUri(Uri.parse(card.url)) //TODO FIX intent
+            .setIntentUri(Uri.parse(card.id?.let {
+                "$appStringResumeWatching://$it"
+            } ?: card.url))
             .setInternalProviderId(card.url)
-        //.setLastEngagementTimeUtcMillis(System.currentTimeMillis())
+            .setLastEngagementTimeUtcMillis(
+                resumeWatching?.updateTime ?: System.currentTimeMillis()
+            )
 
         card.watchPos?.let {
             builder.setDurationMillis(it.duration.toInt())
             builder.setLastPlaybackPositionMillis(it.position.toInt())
         }
-        // .setLastEngagementTimeUtcMillis() //TODO
 
         if (isSeries)
             card.episode?.let {
@@ -147,6 +151,27 @@ object AppUtils {
         return builder.build()
     }
 
+    @SuppressLint("RestrictedApi")
+    fun getAllWatchNextPrograms(context: Context): Set<Long> {
+        val COLUMN_WATCH_NEXT_ID_INDEX = 0
+        val cursor = context.contentResolver.query(
+            TvContractCompat.WatchNextPrograms.CONTENT_URI,
+            WatchNextProgram.PROJECTION,
+            /* selection = */ null,
+            /* selectionArgs = */ null,
+            /* sortOrder = */ null
+        )
+        val set = mutableSetOf<Long>()
+        cursor?.use {
+            if (it.moveToFirst()) {
+                do {
+                    set.add(cursor.getLong(COLUMN_WATCH_NEXT_ID_INDEX))
+                } while (it.moveToNext())
+            }
+        }
+        return set
+    }
+
     /**
      * Find the Watch Next program for given id.
      * Returns the first instance available.
@@ -164,7 +189,7 @@ object AppUtils {
             WatchNextProgram.PROJECTION,
             /* selection = */ null,
             /* selectionArgs = */ null,
-            /* sortOrder= */ null
+            /* sortOrder = */ null
         )
         cursor?.use {
             if (it.moveToFirst()) {
@@ -195,17 +220,32 @@ object AppUtils {
         }
     }
 
+    /** Prevents losing data when removing and adding simultaneously */
+    private val continueWatchingLock = Mutex()
+
     // https://github.com/googlearchive/leanback-homescreen-channels/blob/master/app/src/main/java/com/google/android/tvhomescreenchannels/SampleTvProvider.java
     @SuppressLint("RestrictedApi")
     @WorkerThread
-    fun Context.addProgramsToContinueWatching(data: List<DataStoreHelper.ResumeWatchingResult>) {
+    suspend fun Context.addProgramsToContinueWatching(data: List<DataStoreHelper.ResumeWatchingResult>) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
         val context = this
-        ioSafe {
-            data.forEach { episodeInfo ->
+        continueWatchingLock.withLock {
+            // A way to get all last watched timestamps
+            val timeStampHashMap = HashMap<Int, VideoDownloadHelper.ResumeWatching>()
+            getAllResumeStateIds()?.forEach { id ->
+                val lastWatched = getLastWatched(id) ?: return@forEach
+                timeStampHashMap[lastWatched.parentId] = lastWatched
+            }
+
+            val currentProgramIds = data.mapNotNull { episodeInfo ->
                 try {
-                    val (program, id) = getWatchNextProgramByVideoId(episodeInfo.url, context)
-                    val nextProgram = buildWatchNextProgramUri(context, episodeInfo)
+                    val customId = "${episodeInfo.id}|${episodeInfo.apiName}|${episodeInfo.url}"
+                    val (program, id) = getWatchNextProgramByVideoId(customId, context)
+                    val nextProgram = buildWatchNextProgramUri(
+                        context,
+                        episodeInfo,
+                        timeStampHashMap[episodeInfo.id]
+                    )
 
                     // If the program is already in the Watch Next row, update it
                     if (program != null && id != null) {
@@ -213,13 +253,25 @@ object AppUtils {
                             nextProgram,
                             id,
                         )
+                        id
                     } else {
                         PreviewChannelHelper(context)
                             .publishWatchNextProgram(nextProgram)
                     }
                 } catch (e: Exception) {
                     logError(e)
+                    null
                 }
+            }.toSet()
+
+            val allOldPrograms = getAllWatchNextPrograms(context) - currentProgramIds
+
+            // Ensures synced watch next progress by deleting all old programs.
+            allOldPrograms.forEach {
+                context.contentResolver.delete(
+                    TvContractCompat.buildWatchNextProgramUri(it),
+                    null, null
+                )
             }
         }
     }
@@ -267,7 +319,7 @@ object AppUtils {
     fun Activity.downloadAllPluginsDialog(repositoryUrl: String, repositoryName: String) {
         runOnUiThread {
             val context = this
-            val builder: AlertDialog.Builder = AlertDialog.Builder(this)
+            val builder: AlertDialog.Builder = AlertDialog.Builder(this, R.style.AlertDialogCustom)
             builder.setTitle(
                 repositoryName
             )
@@ -279,7 +331,7 @@ object AppUtils {
                     downloadAll(context, repositoryUrl, null)
                 }
 
-                setNegativeButton(R.string.cancel) { _, _ -> }
+                setNegativeButton(R.string.no) { _, _ -> }
             }
             builder.show()
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db042b95..4a4e6505 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -655,4 +655,8 @@
     <string name="history">History</string>
     <string name="enable_skip_op_from_database_des">Show skip popups for opening/ending</string>
     <string name="clipboard_too_large">Too much text. Unable to save to clipboard.</string>
+    <string name="action_mark_as_watched">Mark as watched</string>
+    <string name="confirm_exit_dialog">Are you sure you want to exit?</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
 </resources>

From 7c4f177e4785ac2c1f7cef00c86c1ac84281edb6 Mon Sep 17 00:00:00 2001
From: Sdarfeesh <50188628+Sdarfeesh@users.noreply.github.com>
Date: Sat, 10 Dec 2022 01:35:16 +0800
Subject: [PATCH 104/273] Update Simplified Chinese (Correction) (#240)

---
 app/src/main/res/values-zh/strings.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index d609b9af..29b1af89 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -143,7 +143,7 @@
     <string name="action_open_play">@string/home_play </string>
 
     <string name="vpn_might_be_needed">此片源可能需要 VPN 才能正常使用</string>
-    <string name="vpn_torrent">此片源是种子，建议使用 VPN</string>
+    <string name="vpn_torrent">此片源为种子文件，建议使用 VPN</string>
 
     <string name="provider_info_meta">站点不提供元数据，如果站点上不存在元数据，视频加载将失败。</string>
 
@@ -154,13 +154,13 @@
     <string name="show_log_cat">显示日志 🐈</string>
 
     <string name="picture_in_picture">画中画</string>
-    <string name="picture_in_picture_des">在其他应用之上的迷你播放器中继续播放</string>
+    <string name="picture_in_picture_des">在其他应用上层的迷你播放器中继续播放</string>
     <string name="player_size_settings">播放器画面调整按钮</string>
     <string name="player_size_settings_des">移除黑色边框</string>
     <string name="player_subtitles_settings">字幕</string>
     <string name="player_subtitles_settings_des">播放器字幕设置</string>
-    <string name="chromecast_subtitles_settings">投屏字幕</string>
-    <string name="chromecast_subtitles_settings_des">投屏字幕设置</string>
+    <string name="chromecast_subtitles_settings">Chromecast 字幕</string>
+    <string name="chromecast_subtitles_settings_des">Chromecast 字幕设置</string>
 
     <string name="eigengraumode_settings">倍速模式</string>
     <string name="eigengraumode_settings_des">在播放器中添加播放速度选项</string>
@@ -223,9 +223,9 @@
 
     <string name="app_language">应用语言</string>
 
-    <string name="no_chromecast_support_toast">此片源不支持投屏</string>
+    <string name="no_chromecast_support_toast">此片源不支持 Chromecast</string>
     <string name="no_links_found_toast">未找到链接</string>
-    <string name="copy_link_toast">连接已复制到剪贴板</string>
+    <string name="copy_link_toast">链接已复制到剪贴板</string>
     <string name="play_episode_toast">播放剧集</string>
     <string name="subs_default_reset_toast">重置为默认值</string>
     <string name="acra_report_toast">抱歉，应用崩溃了，将发送一份匿名错误报告给开发者
@@ -302,8 +302,8 @@
     <string name="unexpected_error">意外的播放器错误</string>
     <string name="storage_error">下载错误，请检查存储权限</string>
 
-    <string name="episode_action_chromecast_episode">投屏剧集</string>
-    <string name="episode_action_chromecast_mirror">投屏镜像</string>
+    <string name="episode_action_chromecast_episode">Chromecast 剧集</string>
+    <string name="episode_action_chromecast_mirror">Chromecast 镜像</string>
     <string name="episode_action_play_in_app">在应用中播放</string>
     <string name="episode_action_play_in_format">在 %s 中播放</string>
     <string name="episode_action_play_in_browser">在浏览器中播放</string>
@@ -347,7 +347,7 @@
     <string name="video_disk_description">设置过高可能导致如 Android TV 此类低存储空间设备出现系统问题</string>
 
     <string name="dns_pref">DNS over HTTPS</string>
-    <string name="dns_pref_summary">防止 DNS 劫持</string>
+    <string name="dns_pref_summary">用于绕过 ISP 的封锁</string>
 
     <string name="add_site_pref">复制片源</string>
     <string name="remove_site_pref">移除片源</string>
@@ -357,7 +357,7 @@
 
     <string name="nginx_url_pref">Nginx 服务器链接</string>
 
-    <string name="display_subbed_dubbed_settings">显示有配音/字幕的动漫</string>
+    <string name="display_subbed_dubbed_settings">显示带配音/字幕的动漫</string>
 
     <string name="resize_fit">适应</string>
     <string name="resize_fill">拉伸</string>
@@ -543,7 +543,7 @@
     <string name="plugins_disabled" formatted="true">已禁用：%d</string>
     <string name="plugins_not_downloaded" formatted="true">未下载：%d</string>
     <string name="plugins_updated" formatted="true">已更新 %d 插件</string>
-    <string name="blank_repo_message">CloudStream 默认不安装片源。您需要从仓库中安装片源。\n\nBecause of a brainless DMCA takedown by Sky Uk Limited 🤮 we cannot link the repository sites in app.\n\n加入我们的 Discord 获得链接或在网上搜索。</string>
+    <string name="blank_repo_message">CloudStream 默认不安装片源。您需要从仓库中安装片源。\n\n由于 Sky Uk Limited 的无脑 DMCA 下架 🤮 我们不能在应用内提供仓库链接。\n\n加入我们的 Discord 获得链接或在网上搜索。</string>
     <string name="view_public_repositories_button">查看社区仓库</string>
     <string name="view_public_repositories_button_short">公开列表</string>
     <string name="uppercase_all_subtitles">字幕全大写</string>

From c11f0c101b936e7f430d7fd15ec979bd5b431a74 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Fri, 9 Dec 2022 20:06:23 +0100
Subject: [PATCH 105/273] small trailer fix

---
 .../ui/result/ResultViewModel2.kt             | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index da900b0a..18e54d14 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -1977,42 +1977,42 @@ class ResultViewModel2 : ViewModel() {
         limit: Int = 0
     ): List<ExtractedTrailerData> =
         coroutineScope {
-            var currentCount = 0
-            return@coroutineScope loadResponse.trailers.amap { trailerData ->
-                try {
-                    val links = arrayListOf<ExtractorLink>()
-                    val subs = arrayListOf<SubtitleFile>()
-                    if (!loadExtractor(
-                            trailerData.extractorUrl,
-                            trailerData.referer,
-                            { subs.add(it) },
-                            { links.add(it) }) && trailerData.raw
-                    ) {
-                        arrayListOf(
-                            ExtractorLink(
-                                "",
-                                "Trailer",
+            val returnlist = ArrayList<ExtractedTrailerData>()
+            loadResponse.trailers.windowed(limit, limit, true).takeWhile { list ->
+                list.amap { trailerData ->
+                    try {
+                        val links = arrayListOf<ExtractorLink>()
+                        val subs = arrayListOf<SubtitleFile>()
+                        if (!loadExtractor(
                                 trailerData.extractorUrl,
-                                trailerData.referer ?: "",
-                                Qualities.Unknown.value,
-                                trailerData.extractorUrl.contains(".m3u8")
-                            )
-                        ) to arrayListOf()
-                    } else {
-                        links to subs
-                    }.also { (extractor, _) ->
-                        if (extractor.isNotEmpty() && limit != 0) {
-                            currentCount++
-                            if (currentCount >= limit) {
-                                cancel()
-                            }
+                                trailerData.referer,
+                                { subs.add(it) },
+                                { links.add(it) }) && trailerData.raw
+                        ) {
+                            arrayListOf(
+                                ExtractorLink(
+                                    "",
+                                    "Trailer",
+                                    trailerData.extractorUrl,
+                                    trailerData.referer ?: "",
+                                    Qualities.Unknown.value,
+                                    trailerData.extractorUrl.contains(".m3u8")
+                                )
+                            ) to arrayListOf()
+                        } else {
+                            links to subs
                         }
+                    } catch (e: Throwable) {
+                        logError(e)
+                        null
                     }
-                } catch (e: Throwable) {
-                    logError(e)
-                    null
+                }.filterNotNull().map { (links, subs) -> ExtractedTrailerData(links, subs) }.let {
+                    returnlist.addAll(it)
                 }
-            }.filterNotNull().map { (links, subs) -> ExtractedTrailerData(links, subs) }
+
+                returnlist.size < limit
+            }
+            return@coroutineScope returnlist
         }
 
 

From 751175b3f91abeef12d1504381ef0b1d4601f83e Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sun, 11 Dec 2022 18:14:09 +0100
Subject: [PATCH 106/273] Updated the in app updater to include notifications
 and updates without user action on Android 12+

---
 app/build.gradle.kts                          |   2 +-
 app/src/main/AndroidManifest.xml              |   9 +-
 .../lagradost/cloudstream3/MainActivity.kt    |   1 -
 .../ui/settings/SettingsUpdates.kt            |   2 +-
 .../cloudstream3/utils/InAppUpdater.kt        |  53 +++--
 .../cloudstream3/utils/PackageInstaller.kt    | 106 ++++++++++
 .../utils/PackageInstallerService.kt          | 200 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   4 +
 8 files changed, 354 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e389f7b0..fa1cabaa 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -48,7 +48,7 @@ android {
         targetSdk = 33
 
         versionCode = 55
-        versionName = "3.2.6"
+        versionName = "3.3.0"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 11b82afb..871c4f69 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,10 @@
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <!-- Used for player vertical slide -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <!-- Used for app update -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <!-- Used for app notifications on Android 13+ -->
-    <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" /> <!-- not used atm, but code exist that requires it that are not run -->
+    <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" /> <!-- Used for Android TV watch next -->
+    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" /> <!-- Used for updates without prompt -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- Used for update service -->
+
     <!-- <permission android:name="android.permission.QUERY_ALL_PACKAGES" /> &lt;!&ndash; Used for getting if vlc is installed &ndash;&gt; -->
     <!-- Fixes android tv fuckery -->
     <uses-feature
@@ -170,6 +173,10 @@
             android:name=".ui.ControllerActivity"
             android:exported="false" />
 
+        <service
+            android:name=".utils.PackageInstallerService"
+            android:exported="false" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index a1bd0177..08695ce7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -88,7 +88,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
 import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
 import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
index 78f6d628..d6a8be78 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
@@ -128,7 +128,7 @@ class SettingsUpdates : PreferenceFragmentCompat() {
             ioSafe {
                 if (activity?.runAutoUpdate(false) == false) {
                     activity?.runOnUiThread {
-                        CommonActivity.showToast(
+                        showToast(
                             activity,
                             R.string.no_update_found,
                             Toast.LENGTH_SHORT
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
index 54492e6d..30981ba4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -7,16 +7,14 @@ import android.net.Uri
 import android.util.Log
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.BuildConfig
+import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okio.BufferedSink
@@ -116,6 +114,7 @@ class InAppUpdater {
                             )?.groupValues?.get(2)
                         }
                 }).toList().lastOrNull()
+
             val foundAsset = found?.assets?.getOrNull(0)
             val currentVersion = packageName?.let {
                 packageManager.getPackageInfo(
@@ -245,6 +244,9 @@ class InAppUpdater {
             }
         }
 
+        /**
+         * @param checkAutoUpdate if the update check was launched automatically
+         **/
         suspend fun Activity.runAutoUpdate(checkAutoUpdate: Boolean = true): Boolean {
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
 
@@ -254,13 +256,20 @@ class InAppUpdater {
                 )
             ) {
                 val update = getAppUpdate()
-                if (update.shouldUpdate && update.updateURL != null) {
-                    //Check if update should be skipped
+                if (
+                    update.shouldUpdate &&
+                        update.updateURL != null) {
+
+                    // Check if update should be skipped
                     val updateNodeId =
                         settingsManager.getString(getString(R.string.skip_update_key), "")
-                    if (update.updateNodeId.equals(updateNodeId)) {
+
+                    // Skips the update if its an automatic update and the update is skipped
+                    // This allows updating manually
+                    if (update.updateNodeId.equals(updateNodeId) && checkAutoUpdate) {
                         return false
                     }
+
                     runOnUiThread {
                         try {
                             val currentVersion = packageName?.let {
@@ -283,16 +292,23 @@ class InAppUpdater {
                             builder.apply {
                                 setPositiveButton(R.string.update) { _, _ ->
                                     showToast(context, R.string.download_started, Toast.LENGTH_LONG)
-                                    ioSafe {
-                                        if (!downloadUpdate(update.updateURL))
-                                            runOnUiThread {
-                                                showToast(
-                                                    context,
-                                                    R.string.download_failed,
-                                                    Toast.LENGTH_LONG
-                                                )
-                                            }
-                                    }
+                                    val intent = PackageInstallerService.getIntent(
+                                        context,
+                                        update.updateURL
+                                    )
+                                    ContextCompat.startForegroundService(context, intent)
+//                                    ioSafe {
+//                                        if (
+//                                        !downloadUpdate(update.updateURL)
+//                                        )
+//                                            runOnUiThread {
+//                                                showToast(
+//                                                    context,
+//                                                    R.string.download_failed,
+//                                                    Toast.LENGTH_LONG
+//                                                )
+//                                            }
+//                                    }
                                 }
 
                                 setNegativeButton(R.string.cancel) { _, _ -> }
@@ -302,8 +318,7 @@ class InAppUpdater {
                                         settingsManager.edit().putString(
                                             getString(R.string.skip_update_key),
                                             update.updateNodeId ?: ""
-                                        )
-                                            .apply()
+                                        ).apply()
                                     }
                                 }
                             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt
new file mode 100644
index 00000000..5cf6c359
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt
@@ -0,0 +1,106 @@
+package com.lagradost.cloudstream3.utils
+
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.PackageInstaller
+import android.os.Build
+import com.lagradost.cloudstream3.mvvm.logError
+import java.io.InputStream
+
+const val INSTALL_ACTION = "ApkInstaller.INSTALL_ACTION"
+
+
+class ApkInstaller(private val service: PackageInstallerService) {
+    private val packageInstaller = service.packageManager.packageInstaller
+
+    enum class InstallProgressStatus {
+        Preparing,
+        Downloading,
+        Installing,
+        Failed,
+    }
+
+    private val installActionReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            when (intent.getIntExtra(
+                PackageInstaller.EXTRA_STATUS,
+                PackageInstaller.STATUS_FAILURE
+            )) {
+                PackageInstaller.STATUS_PENDING_USER_ACTION -> {
+                    val userAction = intent.getParcelableExtra<Intent>(Intent.EXTRA_INTENT)
+                    userAction?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    context.startActivity(userAction)
+                }
+            }
+        }
+    }
+
+    fun installApk(
+        context: Context,
+        inputStream: InputStream,
+        size: Long,
+        installProgress: (bytesRead: Int) -> Unit,
+        installProgressStatus: (InstallProgressStatus) -> Unit
+    ) {
+        installProgressStatus.invoke(InstallProgressStatus.Preparing)
+        var activeSession: Int? = null
+
+        try {
+            val installParams =
+                PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL)
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                installParams.setRequireUserAction(PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED)
+            }
+
+            activeSession = packageInstaller.createSession(installParams)
+            installParams.setSize(size)
+
+            val session = packageInstaller.openSession(activeSession)
+            installProgressStatus.invoke(InstallProgressStatus.Downloading)
+
+            session.openWrite(context.packageName, 0, size)
+                .use { outputStream ->
+                    val buffer = ByteArray(1024)
+                    var bytesRead = inputStream.read(buffer)
+
+                    while (bytesRead >= 0) {
+                        outputStream.write(buffer, 0, bytesRead)
+                        bytesRead = inputStream.read(buffer)
+                        installProgress.invoke(bytesRead)
+                    }
+
+                    inputStream.close()
+                }
+
+            installProgressStatus.invoke(InstallProgressStatus.Installing)
+
+            val intentSender = PendingIntent.getBroadcast(
+                service,
+                activeSession,
+                Intent(INSTALL_ACTION),
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0,
+            ).intentSender
+
+            session.commit(intentSender)
+        } catch (e: Exception) {
+            logError(e)
+
+            service.unregisterReceiver(installActionReceiver)
+            installProgressStatus.invoke(InstallProgressStatus.Failed)
+
+            activeSession?.let { sessionId ->
+                packageInstaller.abandonSession(sessionId)
+            }
+        }
+    }
+
+    init {
+        service.registerReceiver(installActionReceiver, IntentFilter(INSTALL_ACTION))
+        service.receivers.add(installActionReceiver)
+    }
+}
+
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt
new file mode 100644
index 00000000..fc50bed5
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt
@@ -0,0 +1,200 @@
+package com.lagradost.cloudstream3.utils
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.app.Service
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.IBinder
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import com.lagradost.cloudstream3.MainActivity
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlin.math.roundToInt
+
+
+class PackageInstallerService : Service() {
+    val receivers = mutableListOf<BroadcastReceiver>()
+
+    private val baseNotification by lazy {
+        val flag = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            PendingIntent.FLAG_MUTABLE
+        } else 0
+
+        val intent = Intent(this, MainActivity::class.java)
+        val pendingIntent =
+            PendingIntent.getActivity(this, 0, intent, flag)
+
+        NotificationCompat.Builder(this, UPDATE_CHANNEL_ID)
+            .setAutoCancel(false)
+            .setColorized(true)
+            .setOnlyAlertOnce(true)
+            .setSilent(true)
+            // If low priority then the notification might not show :(
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setColor(this.colorFromAttribute(R.attr.colorPrimary))
+            .setContentTitle(getString(R.string.update_notification_downloading))
+            .setContentIntent(pendingIntent)
+            .setSmallIcon(R.drawable.rdload)
+    }
+
+    private fun createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val importance = NotificationManager.IMPORTANCE_DEFAULT
+            val channel =
+                NotificationChannel(UPDATE_CHANNEL_ID, UPDATE_CHANNEL_NAME, importance).apply {
+                    description = UPDATE_CHANNEL_DESCRIPTION
+                }
+
+            // Register the channel with the system
+            val notificationManager: NotificationManager =
+                this.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+            notificationManager.createNotificationChannel(channel)
+        }
+    }
+
+    override fun onCreate() {
+        createNotificationChannel()
+        startForeground(UPDATE_NOTIFICATION_ID, baseNotification.build())
+    }
+
+    private val updateLock = Mutex()
+
+    private suspend fun downloadUpdate(url: String): Boolean {
+        try {
+            Log.d(LOG_TAG, "Downloading update: $url")
+
+            // Delete all old updates
+            ioSafe {
+                val appUpdateName = "CloudStream"
+                val appUpdateSuffix = "apk"
+
+                this@PackageInstallerService.cacheDir.listFiles()?.filter {
+                    it.name.startsWith(appUpdateName) && it.extension == appUpdateSuffix
+                }?.forEach {
+                    it.deleteOnExit()
+                }
+            }
+
+            updateLock.withLock {
+                updateNotificationProgress(
+                    0f,
+                    ApkInstaller.InstallProgressStatus.Downloading
+                )
+
+                val body = app.get(url).body
+                val inputStream = body.byteStream()
+                val installer = ApkInstaller(this)
+                val totalSize = body.contentLength()
+                var currentSize = 0
+
+                installer.installApk(this, inputStream, totalSize, {
+                    currentSize += it
+                    // Prevent div 0
+                    if (totalSize == 0L) return@installApk
+
+                    val percentage = currentSize / totalSize.toFloat()
+                    updateNotificationProgress(
+                        percentage,
+                        ApkInstaller.InstallProgressStatus.Downloading
+                    )
+                }) { status ->
+                    updateNotificationProgress(0f, status)
+                }
+            }
+            return true
+        } catch (e: Exception) {
+            updateNotificationProgress(0f, ApkInstaller.InstallProgressStatus.Failed)
+            return false
+        }
+    }
+
+    private fun updateNotificationProgress(
+        percentage: Float,
+        state: ApkInstaller.InstallProgressStatus
+    ) {
+//        Log.d(LOG_TAG, "Downloading app update progress $percentage | $state")
+        val text = when (state) {
+            ApkInstaller.InstallProgressStatus.Installing -> R.string.update_notification_installing
+            ApkInstaller.InstallProgressStatus.Preparing, ApkInstaller.InstallProgressStatus.Downloading -> R.string.update_notification_downloading
+            ApkInstaller.InstallProgressStatus.Failed -> R.string.update_notification_failed
+        }
+
+        val newNotification = baseNotification
+            .setContentTitle(getString(text))
+            .apply {
+                if (state == ApkInstaller.InstallProgressStatus.Failed) {
+                    setSmallIcon(R.drawable.rderror)
+                    setAutoCancel(true)
+                } else {
+                    setProgress(
+                        10000, (10000 * percentage).roundToInt(),
+                        state != ApkInstaller.InstallProgressStatus.Downloading
+                    )
+                }
+            }
+            .build()
+
+        val notificationManager =
+            getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+        // Persistent notification on failure
+        val id =
+            if (state == ApkInstaller.InstallProgressStatus.Failed) UPDATE_NOTIFICATION_ID + 1 else UPDATE_NOTIFICATION_ID
+        notificationManager.notify(id, newNotification)
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        val url = intent?.getStringExtra(EXTRA_URL) ?: return START_NOT_STICKY
+        ioSafe {
+            downloadUpdate(url)
+            // Close the service after the update is done
+            // If no sleep then the install prompt may not appear and the notification
+            // will disappear instantly
+            delay(10_000)
+            this@PackageInstallerService.stopSelf()
+        }
+        return START_NOT_STICKY
+    }
+
+    override fun onDestroy() {
+        receivers.forEach {
+            try {
+                this.unregisterReceiver(it)
+            } catch (_: IllegalArgumentException) {
+                // Receiver not registered
+            }
+        }
+        super.onDestroy()
+    }
+
+    override fun onBind(i: Intent?): IBinder? = null
+
+    companion object {
+        private const val EXTRA_URL = "EXTRA_URL"
+        private const val LOG_TAG = "PackageInstallerService"
+
+        const val UPDATE_CHANNEL_ID = "cloudstream3.updates"
+        const val UPDATE_CHANNEL_NAME = "App Updates"
+        const val UPDATE_CHANNEL_DESCRIPTION = "App updates notification channel"
+        const val UPDATE_NOTIFICATION_ID = -68454136
+
+        fun getIntent(
+            context: Context,
+            url: String,
+        ): Intent {
+            return Intent(context, PackageInstallerService::class.java)
+                .putExtra(EXTRA_URL, url)
+        }
+    }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a4e6505..5be5ab3f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -659,4 +659,8 @@
     <string name="confirm_exit_dialog">Are you sure you want to exit?</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
+
+    <string name="update_notification_downloading">Downloading app update</string>
+    <string name="update_notification_installing">Installing app update</string>
+    <string name="update_notification_failed">App update failed</string>
 </resources>

From 7362ac9f64528c4168898a85080dcc8da1c7f8ad Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Tue, 13 Dec 2022 22:20:43 +0700
Subject: [PATCH 107/273] fixed StreamSB (#244)

---
 .../main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
index 913b410b..3b6c5496 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
@@ -130,7 +130,7 @@ open class StreamSB : ExtractorApi() {
             it.value.replace(Regex("(embed-|/e/)"), "")
         }.first()
 //        val master = "$mainUrl/sources48/6d6144797752744a454267617c7c${bytesToHex.lowercase()}7c7c4e61755a56456f34385243727c7c73747265616d7362/6b4a33767968506e4e71374f7c7c343837323439333133333462353935333633373836643638376337633462333634663539343137373761333635313533333835333763376333393636363133393635366136323733343435323332376137633763373337343732363536313664373336327c7c504d754478413835306633797c7c73747265616d7362"
-        val master = "$mainUrl/sources48/" + bytesToHex("||$id||||streamsb".toByteArray()) + "/"
+        val master = "$mainUrl/sources49/" + bytesToHex("||$id||||streamsb".toByteArray()) + "/"
         val headers = mapOf(
             "watchsb" to "sbstream",
         )

From 3fdf41869ef42e3fe1ee7da21725f42178345a76 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Tue, 13 Dec 2022 23:28:31 +0100
Subject: [PATCH 108/273] Added hot reloading for plugins when using
 deployWithAdb

---
 .../lagradost/cloudstream3/MainActivity.kt    | 10 ++++-
 .../cloudstream3/plugins/PluginManager.kt     | 38 +++++++++++++----
 .../cloudstream3/ui/APIRepository.kt          | 41 +++++++++++++------
 .../cloudstream3/ui/home/HomeFragment.kt      | 22 +++++-----
 .../cloudstream3/ui/result/EpisodeAdapter.kt  |  1 +
 .../cloudstream3/ui/result/ResultFragment.kt  |  5 +--
 .../ui/result/ResultViewModel2.kt             |  7 +++-
 7 files changed, 89 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 08695ce7..d7963c43 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -232,6 +232,9 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
         /**
          * Fires every time a new batch of plugins have been loaded, no guarantee about how often this is run and on which thread
+         * Boolean signifies if stuff should be force reloaded (true if force reload, false if reload when necessary).
+         *
+         * The force reloading are used for plugin development to instantly reload the page on deployWithAdb
          * */
         val afterPluginsLoadedEvent = Event<Boolean>()
         val mainPluginsLoadedEvent =
@@ -286,6 +289,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                                 return true
                             }
                         }
+                        // This specific intent is used for the gradle deployWithAdb
+                        // https://github.com/recloudstream/gradle/blob/master/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/DeployWithAdbTask.kt#L46
+                        if (str == "$appString:") {
+                            PluginManager.hotReloadAllLocalPlugins(activity)
+                        }
                     } else if (safeURI(str)?.scheme == appStringRepo) {
                         val url = str.replaceFirst(appStringRepo, "https")
                         loadRepository(url)
@@ -650,7 +658,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                 }
 
                 ioSafe {
-                    PluginManager.loadAllLocalPlugins(this@MainActivity)
+                    PluginManager.loadAllLocalPlugins(this@MainActivity, false)
                 }
             }
         } else {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index f2dbb02f..c0bc4f1f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -10,6 +10,7 @@ import android.util.Log
 import android.widget.Toast
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.fragment.app.FragmentActivity
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.google.gson.Gson
 import com.lagradost.cloudstream3.*
@@ -223,7 +224,7 @@ object PluginManager {
     fun updateAllOnlinePluginsAndLoadThem(activity: Activity) {
         // Load all plugins as fast as possible!
         loadAllOnlinePlugins(activity)
-        afterPluginsLoadedEvent.invoke(true)
+        afterPluginsLoadedEvent.invoke(false)
 
         val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
             ?: emptyArray()) + PREBUILT_REPOSITORIES
@@ -272,7 +273,7 @@ object PluginManager {
         }
 
         // ioSafe {
-            afterPluginsLoadedEvent.invoke(true)
+        afterPluginsLoadedEvent.invoke(false)
         // }
 
         Log.i(TAG, "Plugin update done!")
@@ -299,8 +300,12 @@ object PluginManager {
         val notDownloadedPlugins = onlinePlugins.mapNotNull { onlineData ->
             val sitePlugin = onlineData.second
             //Don't include empty urls
-            if (sitePlugin.url.isBlank()) { return@mapNotNull null }
-            if (sitePlugin.repositoryUrl.isNullOrBlank()) { return@mapNotNull null }
+            if (sitePlugin.url.isBlank()) {
+                return@mapNotNull null
+            }
+            if (sitePlugin.repositoryUrl.isNullOrBlank()) {
+                return@mapNotNull null
+            }
 
             //Omit already existing plugins
             if (getPluginPath(activity, sitePlugin.internalName, onlineData.first).exists()) {
@@ -353,7 +358,7 @@ object PluginManager {
         }
 
         // ioSafe {
-            afterPluginsLoadedEvent.invoke(true)
+        afterPluginsLoadedEvent.invoke(false)
         // }
 
         Log.i(TAG, "Plugin download done!")
@@ -373,7 +378,23 @@ object PluginManager {
         }
     }
 
-    fun loadAllLocalPlugins(activity: Activity) {
+    /**
+     * Reloads all local plugins and forces a page update, used for hot reloading with deployWithAdb
+     **/
+    fun hotReloadAllLocalPlugins(activity: FragmentActivity?) {
+        Log.d(TAG, "Reloading all local plugins!")
+        if (activity == null) return
+        getPluginsLocal().forEach {
+            unloadPlugin(it.filePath)
+        }
+        loadAllLocalPlugins(activity, true)
+    }
+
+    /**
+     * @param forceReload see afterPluginsLoadedEvent, basically a way to load all local plugins
+     * and reload all pages even if they are previously valid
+     **/
+    fun loadAllLocalPlugins(activity: Activity, forceReload: Boolean) {
         val dir = File(LOCAL_PLUGINS_PATH)
         removeKey(PLUGINS_KEY_LOCAL)
 
@@ -395,7 +416,7 @@ object PluginManager {
         }
 
         loadedLocalPlugins = true
-        afterPluginsLoadedEvent.invoke(true)
+        afterPluginsLoadedEvent.invoke(forceReload)
     }
 
     /**
@@ -576,7 +597,8 @@ object PluginManager {
     }
 
     suspend fun deletePlugin(file: File): Boolean {
-        val list = (getPluginsLocal() + getPluginsOnline()).filter { it.filePath == file.absolutePath }
+        val list =
+            (getPluginsLocal() + getPluginsOnline()).filter { it.filePath == file.absolutePath }
 
         return try {
             if (File(file.absolutePath).delete()) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
index 227c2f25..645cd573 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
@@ -3,9 +3,11 @@ package com.lagradost.cloudstream3.ui
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
+import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
+import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -38,13 +40,23 @@ class APIRepository(val api: MainAPI) {
             val hash: Pair<String, String>
         )
 
-        // This really does not need to be Nullable but it can crash otherwise, probably caused by replacing items while looping over them.
-        // "Attempt to invoke .... getHash() on a null object reference"
-        private val cache: ArrayList<SavedLoadResponse?> = arrayListOf()
+        private val cache = threadSafeListOf<SavedLoadResponse>()
         private var cacheIndex: Int = 0
         const val cacheSize = 20
     }
 
+    private fun afterPluginsLoaded(forceReload: Boolean) {
+        if (forceReload) {
+            synchronized(cache) {
+                cache.clear()
+            }
+        }
+    }
+
+    init {
+        afterPluginsLoadedEvent += ::afterPluginsLoaded
+    }
+
     val hasMainPage = api.hasMainPage
     val providerType = api.providerType
     val name = api.name
@@ -59,20 +71,25 @@ class APIRepository(val api: MainAPI) {
             val fixedUrl = api.fixUrl(url)
             val lookingForHash = Pair(api.name, fixedUrl)
 
-            for (item in cache) {
-                // 10 min save
-                if (item?.hash == lookingForHash && (unixTime - item.unixTime) < 60 * 10) {
-                    return@safeApiCall item.response
+            synchronized(cache) {
+                for (item in cache) {
+                    // 10 min save
+                    if (item.hash == lookingForHash && (unixTime - item.unixTime) < 60 * 10) {
+                        return@safeApiCall item.response
+                    }
                 }
             }
 
             api.load(fixedUrl)?.also { response ->
                 val add = SavedLoadResponse(unixTime, response, lookingForHash)
-                if (cache.size > cacheSize) {
-                    cache[cacheIndex] = add // rolling cache
-                    cacheIndex = (cacheIndex + 1) % cacheSize
-                } else {
-                    cache.add(add)
+
+                synchronized(cache) {
+                    if (cache.size > cacheSize) {
+                        cache[cacheIndex] = add // rolling cache
+                        cacheIndex = (cacheIndex + 1) % cacheSize
+                    } else {
+                        cache.add(add)
+                    }
                 }
             } ?: throw ErrorLoadingException()
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index b7803e6c..8e2ca6af 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -79,7 +79,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
 import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
-import com.lagradost.cloudstream3.utils.UIHelper.getStatusBarHeight
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
 import com.lagradost.cloudstream3.utils.UIHelper.setImageBlur
@@ -475,13 +474,13 @@ class HomeFragment : Fragment() {
     override fun onResume() {
         super.onResume()
         reloadStored()
-        afterPluginsLoadedEvent += ::firstLoadHomePage
-        mainPluginsLoadedEvent += ::firstLoadHomePage
+        afterPluginsLoadedEvent += ::afterPluginsLoaded
+        mainPluginsLoadedEvent += ::afterMainPluginsLoaded
     }
 
     override fun onStop() {
-        afterPluginsLoadedEvent -= ::firstLoadHomePage
-        mainPluginsLoadedEvent -= ::firstLoadHomePage
+        afterPluginsLoadedEvent -= ::afterPluginsLoaded
+        mainPluginsLoadedEvent -= ::afterMainPluginsLoaded
         super.onStop()
     }
 
@@ -494,15 +493,18 @@ class HomeFragment : Fragment() {
         homeViewModel.loadStoredData(list)
     }
 
-    private fun firstLoadHomePage(successful: Boolean = false) {
-        // dirty hack to make it only load once
+    private fun afterMainPluginsLoaded(unused: Boolean = false) {
         loadHomePage(false)
     }
 
-    private fun loadHomePage(forceReload: Boolean = true) {
+    private fun afterPluginsLoaded(forceReload: Boolean) {
+        loadHomePage(forceReload)
+    }
+
+    private fun loadHomePage(forceReload: Boolean) {
         val apiName = context?.getKey<String>(USER_SELECTED_HOMEPAGE_API)
 
-        if (homeViewModel.apiName.value != apiName || apiName == null) {
+        if (homeViewModel.apiName.value != apiName || apiName == null || forceReload) {
             //println("Caught home: " + homeViewModel.apiName.value + " at " + apiName)
             homeViewModel.loadAndCancel(apiName, forceReload)
         }
@@ -1120,7 +1122,7 @@ class HomeFragment : Fragment() {
         } // GridLayoutManager(context, 1).also { it.supportsPredictiveItemAnimations() }
 
         reloadStored()
-        loadHomePage()
+        loadHomePage(false)
 
         home_loaded.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { v, _, scrollY, _, oldScrollY ->
             val dy = scrollY - oldScrollY
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
index e9fbd5f9..e5b839a8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
@@ -58,6 +58,7 @@ const val ACTION_DOWNLOAD_EPISODE_SUBTITLE_MIRROR = 14
 const val ACTION_PLAY_EPISODE_IN_WEB_VIDEO = 16
 const val ACTION_PLAY_EPISODE_IN_MPV = 17
 
+const val ACTION_MARK_AS_WATCHED = 18
 
 data class EpisodeClickEvent(val action: Int, val data: ResultEpisode)
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 26dbb03e..30ea889e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -491,11 +491,10 @@ open class ResultFragment : ResultTrailerPlayer() {
         return StoredData(url, apiName, showFillers, dubStatus, start, playerAction)
     }
 
-    private fun reloadViewModel(success: Boolean = false) {
-        if (!viewModel.hasLoaded()) {
+    private fun reloadViewModel(forceReload: Boolean) {
+        if (!viewModel.hasLoaded() || forceReload) {
             val storedData = getStoredData(activity ?: context ?: return) ?: return
 
-            //viewModel.clear()
             viewModel.load(
                 activity,
                 storedData.url ?: return,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 18e54d14..f5aae7fc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -1146,6 +1146,7 @@ class ResultViewModel2 : ViewModel() {
                         txt(R.string.episode_action_download_mirror) to ACTION_DOWNLOAD_MIRROR,
                         txt(R.string.episode_action_download_subtitle) to ACTION_DOWNLOAD_EPISODE_SUBTITLE_MIRROR,
                         txt(R.string.episode_action_reload_links) to ACTION_RELOAD_EPISODE,
+//                        txt(R.string.action_mark_as_watched) to ACTION_MARK_AS_WATCHED,
                     )
                 )
 
@@ -1365,7 +1366,7 @@ class ResultViewModel2 : ViewModel() {
                     R.id.global_to_navigation_player,
                     GeneratorPlayer.newInstance(
                         generator?.also {
-                            it.getAll() // I know kinda shit to itterate all, but it is 100% sure to work
+                            it.getAll() // I know kinda shit to iterate all, but it is 100% sure to work
                                 ?.indexOfFirst { value -> value is ResultEpisode && value.id == click.data.id }
                                 ?.let { index ->
                                     if (index >= 0)
@@ -1376,6 +1377,10 @@ class ResultViewModel2 : ViewModel() {
                     )
                 )
             }
+            ACTION_MARK_AS_WATCHED -> {
+                // TODO FIX
+//                DataStoreHelper.setViewPos(click.data.id, 1, 1)
+            }
         }
     }
 

From 5af1a0e433affc237b2a177157fa559ed58db723 Mon Sep 17 00:00:00 2001
From: Sdarfeesh <50188628+Sdarfeesh@users.noreply.github.com>
Date: Thu, 15 Dec 2022 06:10:44 +0800
Subject: [PATCH 109/273] Update Simplified Chinese (#243)

---
 app/src/main/res/values-zh/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 29b1af89..ac00c8f4 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -593,4 +593,12 @@
     <string name="history">历史记录</string>
     <string name="enable_skip_op_from_database_des">显示跳过片头/片尾弹窗</string>
     <string name="clipboard_too_large">文本过多，无法保存到剪贴板。</string>
+    <string name="action_mark_as_watched">标记为已观看</string>
+    <string name="confirm_exit_dialog">您确定要离开吗？</string>
+    <string name="yes">是</string>
+    <string name="no">否</string>
+
+    <string name="update_notification_downloading">正在下载应用更新</string>
+    <string name="update_notification_installing">正在安装应用更新</string>
+    <string name="update_notification_failed">应用更新失败</string>
 </resources>

From 304b103e329c3d7af9e900f2e8640acc4a288d4c Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Thu, 15 Dec 2022 21:00:09 +0100
Subject: [PATCH 110/273] Removed theme from some dialogs as the button text
 became invisible

---
 app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt   | 2 +-
 app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index d7963c43..9a591580 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -476,7 +476,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
     }
 
     private fun showConfirmExitDialog() {
-        val builder: AlertDialog.Builder = AlertDialog.Builder(this, R.style.AlertDialogCustom)
+        val builder: AlertDialog.Builder = AlertDialog.Builder(this)
         builder.setTitle(R.string.confirm_exit_dialog)
         builder.apply {
             setPositiveButton(R.string.yes) { _, _ -> super.onBackPressed() }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
index 597316c3..847b3328 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -319,7 +319,7 @@ object AppUtils {
     fun Activity.downloadAllPluginsDialog(repositoryUrl: String, repositoryName: String) {
         runOnUiThread {
             val context = this
-            val builder: AlertDialog.Builder = AlertDialog.Builder(this, R.style.AlertDialogCustom)
+            val builder: AlertDialog.Builder = AlertDialog.Builder(this)
             builder.setTitle(
                 repositoryName
             )

From 6246d984a10d37d295a770614458a65abe6326cd Mon Sep 17 00:00:00 2001
From: contusionglory <102427829+contusionglory@users.noreply.github.com>
Date: Fri, 16 Dec 2022 23:45:23 +0000
Subject: [PATCH 111/273] Fix uprot.net (#251)

Fix regex for upront.net it was giving the wrong url.
---
 .../java/com/lagradost/cloudstream3/utils/UnshortenUrl.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/UnshortenUrl.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
index a2e50762..46b232f6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
@@ -176,7 +176,7 @@ object ShortLink {
 
     suspend fun unshortenUprot(uri: String): String {
         val page = app.get(uri).text
-        Regex("""<a[^>]+href="([^"]+)""").findAll(page)
+        Regex("""<a[^>]+href="([^"]+)".*Continue""").findAll(page)
             .map { it.value.replace("""<a href="""", "") }
             .toList().forEach { link ->
                 if (link.contains("https://maxstream.video") || link.contains("https://uprot.net") && link != uri) {
@@ -193,4 +193,4 @@ object ShortLink {
         val doc = app.get(uri).document
         return doc.selectFirst("iframe")?.attr("src")?.trim()?: uri
     }
-}
\ No newline at end of file
+}

From 956c693d1be6059fbd3ef61013f2b5073db5dfd8 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sun, 18 Dec 2022 12:59:04 +0100
Subject: [PATCH 112/273] [skip ci] Update README.md

---
 README.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index dcd4c5ed..0fef9758 100644
--- a/README.md
+++ b/README.md
@@ -5,18 +5,24 @@
 
 [![Discord](https://invidget.switchblade.xyz/5Hus6fM)](https://discord.gg/5Hus6fM)
 
-***Features:***
+### Features:
 + **AdFree**, No ads whatsoever
 + No tracking/analytics
 + Bookmarks
 + Download and stream movies, tv-shows and anime
 + Chromecast
 
-***Screenshots:***
+### Screenshots:
 
 <img src="./.github/home.jpg" height="400"/><img src="./.github/search.jpg" height="400"/><img src="./.github/downloads.jpg" height="400"/><img src="./.github/results.jpg" height="400"/>
 <img src="./.github/player.jpg" height="200"/>
 
+### Supported languages:
+<a href="https://hosted.weblate.org/engage/cloudstream/">
+  <img src="https://hosted.weblate.org/widgets/cloudstream/-/app/multi-auto.svg" alt="Translation status" />
+</a>
+
+<!--
 ***The list of supported languages:***
 * 🇱🇧 Arabic
 * 🇧🇬 Bulgarian
@@ -43,4 +49,4 @@
 * 🇵🇭 Tagalog
 * 🇹🇷 Turkish
 * 🇻🇳 Vietnamese
-
+-->

From 4d13494a9348fea0e263429d332100e830168fcb Mon Sep 17 00:00:00 2001
From: "Weblate (bot)" <hosted@weblate.org>
Date: Sun, 18 Dec 2022 13:26:42 +0100
Subject: [PATCH 113/273] Translations update from Hosted Weblate (#254)

Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: sfaresee <salmanfc.bd@gmail.com>
Co-authored-by: Radoslav Vasilev Vasilev <fifata@gmail.com>
---
 app/src/main/res/values-bg/strings.xml | 123 +++++++------------------
 app/src/main/res/values-pl/strings.xml | 107 +++++----------------
 app/src/main/res/values/strings.xml    |  92 ++----------------
 3 files changed, 65 insertions(+), 257 deletions(-)

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index e32d3d93..c782785a 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -1,41 +1,33 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string formatted="true" name="app_dub_sub_episode_text_format">%s еп. %d</string>
     <string formatted="true" name="cast_format">Актьори: %s</string>
     <string formatted="true" name="next_episode_format">Епизод %d ще бъде пуснат след</string>
-    <string formatted="true" name="next_episode_time_day_format">%DD %dh %dm</string>
+    <string formatted="true" name="next_episode_time_day_format">%dd %dh %dm</string>
     <string formatted="true" name="next_episode_time_hour_format">%dh %dm</string>
     <string formatted="true" name="next_episode_time_min_format">%dm</string>
-
-    
-    <string name="result_poster_img_des">Плакат</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
-    <string name="episode_poster_img_des">Плакат на епизод</string>
-    <string name="home_main_poster_img_des">Основен плакат</string>
+    <string name="result_poster_img_des">Poster</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="episode_poster_img_des">Episode Poster</string>
+    <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Следващ произволен</string>
     <string name="go_back_img_des">Върни се</string>
     <string name="home_change_provider_img_des">Смяна на доставчика</string>
     <string name="preview_background_img_des">Визуализация на фона</string>
-
-    
     <string formatted="true" name="player_speed_text_format">Скорост (%.2fx)</string>
     <string formatted="true" name="rated_format">Оценка: %.1f</string>
     <string formatted="true" name="new_update_format">Намерена е нова актуализация!\n%s -&gt; %s</string>
     <string formatted="true" name="filler">Шаблон</string>
     <string formatted="true" name="duration_format">%d мин</string>
-
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Пусни с CloudStream</string>
     <string name="title_home">Начало</string>
     <string name="title_search">Търсене</string>
     <string name="title_downloads">Изтегляния</string>
     <string name="title_settings">Настройки</string>
-
     <string name="search_hint">Търсене…</string>
-    <string formatted="true" name="search_hint_site">Търсете %s...</string>
-
+    <string formatted="true" name="search_hint_site">Търси %s…</string>
     <string name="no_data">Няма данни</string>
     <string name="episode_more_options_des">Още опций</string>
     <string name="next_episode">Следващ епизод</string>
@@ -44,7 +36,6 @@
     <string name="result_open_in_browser">Отвори в браузъра</string>
     <string name="skip_loading">Пропусни зареждането</string>
     <string name="loading">Зареждане…</string>
-
     <string name="type_watching">Гледане</string>
     <string name="type_on_hold">На изчакване</string>
     <string name="type_completed">Завършено</string>
@@ -52,17 +43,14 @@
     <string name="type_plan_to_watch">План за гледане</string>
     <string name="type_none">Нито един</string>
     <string name="type_re_watching">Повторно гледане</string>
-
     <string name="play_movie_button">Пускане на филм</string>
     <string name="play_livestream_button">Възпроизвеждане на живо</string>
     <string name="play_torrent_button">Поточно предаване на торент</string>
     <string name="pick_source">Източници</string>
     <string name="pick_subtitle">субтитри</string>
-    <string name="reload_error">Повторен опит за свързване...</string>
+    <string name="reload_error">Повторен опит за свързване…</string>
     <string name="go_back">Върни се</string>
     <string name="play_episode">Пусни епизод</string>
-    
-
     <string name="download">Изтегли</string>
     <string name="downloaded">Изтеглено</string>
     <string name="downloading">Изтегля се</string>
@@ -72,18 +60,14 @@
     <string name="download_canceled">Изтеглянето е отменено</string>
     <string name="download_done">Изтеглянето е завършено</string>
     <string name="stream">Поток</string>
-
     <string name="error_loading_links_toast">Грешка при зареждане на връзки</string>
     <string name="download_storage_text">Вътрешна памет</string>
-
     <string name="app_dubbed_text">Дублаж</string>
     <string name="app_subbed_text">Субтитри</string>
-
     <string name="popup_delete_file">Изтрий файла</string>
     <string name="popup_play_file">Възпроизвеждане на файл</string>
     <string name="popup_resume_download">Възобновете изтеглянето</string>
     <string name="popup_pause_download">Пауза на изтеглянето</string>
-
     <string name="pref_disable_acra">Деактивирайте автоматичното докладване на грешки</string>
     <string name="home_more_info">Повече информация</string>
     <string name="home_expanded_hide">Скрий</string>
@@ -99,9 +83,7 @@
     <string name="sort_close">Затвори</string>
     <string name="sort_clear">Изчисти</string>
     <string name="sort_save">Запазване</string>
-
     <string name="player_speed">Скорост на възпроизвеждане</string>
-
     <string name="subtitles_settings">Настройки на субтитрите</string>
     <string name="subs_text_color">Цвят на текста</string>
     <string name="subs_outline_color">Цвят на контура</string>
@@ -111,35 +93,26 @@
     <string name="subs_subtitle_elevation">Височина на субтитрите</string>
     <string name="subs_font">Шрифт</string>
     <string name="subs_font_size">Размер на шрифта</string>
-
     <string name="search_provider_text_providers">Търсене чрез доставчици</string>
     <string name="search_provider_text_types">Търсене с помощта на типове</string>
-
     <string name="benene_count_text">%d Банан/а даден/и на разработчиците</string>
     <string name="benene_count_text_none">Не е/са даден/и Банан/и</string>
-
     <string name="subs_auto_select_language">Автоматичен избор на език</string>
     <string name="subs_download_languages">Изтегляне на езици</string>
     <string name="subs_subtitle_languages">Език на субтитрите</string>
     <string name="subs_hold_to_reset_to_default">Задръжте, за да нулирате по подразбиране</string>
     <string formatted="true" name="subs_import_text">Импортирайте шрифтове, като ги поставите в %s</string>
     <string name="continue_watching">Продължете да гледате</string>
-
     <string name="action_remove_watching">Премахване</string>
     <string name="action_open_watching">Повече информация</string>
     <string name="action_open_play">@string/home_play</string>
-
     <string name="vpn_might_be_needed">Може да е необходим VPN, за да работи правилно този доставчик</string>
     <string name="vpn_torrent">Този доставчик е торент, препоръчва се VPN</string>
-
     <string name="provider_info_meta">Метаданните не се предоставят от сайта, зареждането на видео ще бъде неуспешно, ако не съществува на сайта.</string>
-
     <string name="torrent_plot">Описание</string>
     <string name="normal_no_plot">Няма намерен съдържание</string>
     <string name="torrent_no_plot">Няма намерено описание</string>
-
     <string name="show_log_cat">Покажи logcat 🐈</string>
-
     <string name="picture_in_picture">Картина в картина</string>
     <string name="picture_in_picture_des">Продължава възпроизвеждането в миниатюрен плейър върху други приложения</string>
     <string name="player_size_settings">Бутон за преоразмеряване на плейъра</string>
@@ -148,17 +121,14 @@
     <string name="player_subtitles_settings_des">Настройки на субтитрите на плейъра</string>
     <string name="chromecast_subtitles_settings">Chromecast субтитри</string>
     <string name="chromecast_subtitles_settings_des">Настройки за субтитри на Chromecast</string>
-
     <string name="eigengraumode_settings">Режим Eigengravy (промяна скорост на възпроизвеждане)</string>
     <string name="eigengraumode_settings_des">Добавя опция за скорост в плейъра</string>
     <string name="swipe_to_seek_settings">Плъзнете за преместване</string>
     <string name="swipe_to_seek_settings_des">Плъзнете наляво или надясно, за да контролирате времето във видеоплейъра</string>
     <string name="swipe_to_change_settings">Плъзнете, за да промените настройките</string>
     <string name="swipe_to_change_settings_des">Плъзнете наляво или надясно, за да промените яркостта или силата на звука</string>
-
     <string name="autoplay_next_settings">Автоматично пускане на следващ епизод</string>
     <string name="autoplay_next_settings_des">Започнете следващия епизод, когато текущият приключи</string>
-
     <string name="double_tap_to_seek_settings">Докоснете двукратно за превъртане</string>
     <string name="double_tap_to_pause_settings">Докоснете два пъти за пауза</string>
     <string name="double_tap_to_seek_amount_settings">Размер на превъртане</string>
@@ -167,23 +137,18 @@
     <string name="use_system_brightness_settings">Използвайте яркостта на системата</string>
     <string name="use_system_brightness_settings_des">Използвайте системна яркост в плейъра на приложението вместо тъмно
         наслагване</string>
-
     <string name="episode_sync_settings">Актуализирайте прогреса на гледане</string>
     <string name="episode_sync_settings_des">Автоматично синхронизирайте прогреса на текущия си епизод</string>
-
     <string name="restore_settings">Възстановете данните от архив</string>
-
     <string name="backup_settings">Архивиране на данни</string>
     <string name="restore_success">Зареден архивен файл</string>
     <string formatted="true" name="restore_failed_format">Неуспешно възстановяване на данни от файл %s</string>
     <string name="backup_success">Успешно съхранени данни</string>
     <string name="backup_failed">Липсват разрешения за съхранение, моля, опитайте отново</string>
     <string name="backup_failed_error_format">Грешка при архивирането на %s</string>
-
     <string name="search">Търсене</string>
     <string name="category_account">Акаунти</string>
     <string name="category_updates">Актуализации и архивиране</string>
-
     <string name="settings_info">Информация</string>
     <string name="advanced_search">Подробно търсене</string>
     <string name="advanced_search_des">Дава ви резултатите от търсенето, разделени по доставчик</string>
@@ -193,7 +158,6 @@
     <string name="show_trailers_settings">Показване на трейлъри</string>
     <string name="kitsu_settings">Покажете плакати от kitsu</string>
     <string name="pref_filter_search_quality">Скриване на избраното видео качество в резултатите от търсенето</string>
-
     <string name="automatic_plugin_updates">Автоматични актуализации на плъгини</string>
     <string name="updates_settings">Показвай актуализации на приложението</string>
     <string name="updates_settings_des">Автоматично търси нови актуализации при стартиране</string>
@@ -205,9 +169,7 @@
     <string name="discord">Присъединете се към Discord</string>
     <string name="benene">Дайте банан/и разработчиците</string>
     <string name="benene_des">Даден/и банан/и</string>
-
     <string name="app_language">Език на приложението</string>
-
     <string name="no_chromecast_support_toast">Този доставчик няма поддръжка за Chromecast</string>
     <string name="no_links_found_toast">Няма намерени връзки</string>
     <string name="copy_link_toast">Връзката е копирана в клипборда</string>
@@ -215,7 +177,6 @@
     <string name="subs_default_reset_toast">Възстановяване на стойността по подразбиране</string>
     <string name="acra_report_toast">За съжаление приложението се срина. Анонимен доклад за грешка ще бъде изпратен до
         разработчиците</string>
-
     <string name="season">Сезон</string>
     <string name="season_format">%s %d%s</string>
     <string name="no_season">Без сезон</string>
@@ -226,7 +187,6 @@
     <string name="season_short">С</string>
     <string name="episode_short">Е</string>
     <string name="no_episodes_found">Няма намерени епизоди</string>
-
     <string name="delete_file">Изтрий файла</string>
     <string name="delete">Изтрий</string>
     <string name="pause">Пауза</string>
@@ -235,8 +195,6 @@
     <string name="go_forward_30">30</string>
     <string formatted="true" name="delete_message">Това ще изтрие за постоянно %s\nСигурни ли сте?</string>
     <string formatted="true" name="resume_time_left">%dm\nостава</string>
-
-
     <string name="status_ongoing">Продължава</string>
     <string name="status_completed">Завършен</string>
     <string name="status">Статус</string>
@@ -245,16 +203,12 @@
     <string name="duration">Продължителност</string>
     <string name="site">Уебсайт</string>
     <string name="synopsis">Синопсис</string>
-
     <string name="queued">На опашката</string>
     <string name="no_subtitles">Без субтитри</string>
     <string name="default_subtitles">По подразбиране</string>
-
     <string name="free_storage">Безплатно</string>
     <string name="used_storage">Използвано</string>
     <string name="app_storage">Приложения</string>
-
-    
     <string name="movies">Филми</string>
     <string name="tv_series">Телевизионен сериал</string>
     <string name="cartoons">Анимационни филми</string>
@@ -266,8 +220,6 @@
     <string name="livestreams">На живо</string>
     <string name="nsfw">Разпоретини</string>
     <string name="others">други</string>
-
-    
     <string name="movies_singular">Филм</string>
     <string name="tv_series_singular">Серия</string>
     <string name="cartoons_singular">Анимационен филм</string>
@@ -279,13 +231,11 @@
     <string name="live_singular">Поток на живо</string>
     <string name="nsfw_singular">Разпоретинa</string>
     <string name="other_singular">Видео</string>
-
     <string name="source_error">Грешка в източника</string>
     <string name="remote_error">Дистанционна грешка</string>
     <string name="render_error">Грешка в рендъра</string>
     <string name="unexpected_error">Неочаквана грешка на плеъра</string>
     <string name="storage_error">Грешка при изтегляне, проверете разрешенията за съхранение</string>
-
     <string name="episode_action_chromecast_episode">Епизод за Chromecast</string>
     <string name="episode_action_chromecast_mirror">Chromecast огледало</string>
     <string name="episode_action_play_in_app">Пусни в приложението</string>
@@ -296,55 +246,41 @@
     <string name="episode_action_download_mirror">Изтегляне на огледало</string>
     <string name="episode_action_reload_links">Презареждане на връзки</string>
     <string name="episode_action_download_subtitle">Изтегляне на субтитри</string>
-
     <string name="show_hd">покажи качество</string>
     <string name="show_dub">Покажи дублаж</string>
     <string name="show_sub">Покажи субтитри</string>
     <string name="show_title">Заглавие</string>
     <string name="poster_ui_settings">Превключване на елементите на потребителския интерфейс на плаката</string>
-
     <string name="no_update_found">Няма намерена актуализация</string>
     <string name="check_for_update">Проверка за актуализация</string>
-
     <string name="video_lock">Заключен</string>
     <string name="video_aspect_ratio_resize">Преоразмеряване</string>
     <string name="video_source">Източник</string>
     <string name="video_skip_op">Пропусни</string>
-
     <string name="dont_show_again">Не показвай отново</string>
     <string name="skip_update">Пропуснете тази актуализация</string>
     <string name="update">Актуализация</string>
     <string name="watch_quality_pref">Предпочитано качество за гледане</string>
     <string name="limit_title">Максимален брой знаци за заглавие във видеоплейъра</string>
     <string name="limit_title_rez">Разделителна способност на видео плейъра</string>
-
     <string name="video_buffer_size_settings">Размер на видео буфера</string>
     <string name="video_buffer_length_settings">Дължина на видео буфера</string>
     <string name="video_buffer_disk_settings">Видео кеш на диск</string>
     <string name="video_buffer_clear_settings">Изчистете кеша за видео и изображения</string>
-
     <string name="video_ram_description">Ще предизвика случайни сривове, ако е зададено твърде високо. Не променяйте, ако имате малко количество RAM, като Android TV или стар телефон</string>
     <string name="video_disk_description">Може да причини проблеми на системи с малко място за съхранение, като устройства с Android TV, ако го зададете твърде високо</string>
-
     <string name="dns_pref">DNS през HTTPS</string>
     <string name="dns_pref_summary">Полезно за заобикаляне на блокирания от ISP доставчик</string>
-
     <string name="add_site_pref">Сайт за клониране</string>
     <string name="remove_site_pref">Премахване на сайта</string>
     <string name="add_site_summary">Добавяне на клонинг на съществуващ сайт с различен URL адрес</string>
-
     <string name="download_path_pref">Път за изтегляне</string>
-
     <string name="nginx_url_pref">URL адрес на сървъра на Nginx</string>
-
     <string name="display_subbed_dubbed_settings">Показване на дублирани/субирани аниме</string>
-
     <string name="resize_fit">Побиране в екрана</string>
     <string name="resize_fill">Разтягане</string>
     <string name="resize_zoom">Мащабиране</string>
-
     <string name="legal_notice">Опровержение</string>
-
     <string name="category_general">Общ</string>
     <string name="random_button_settings">Случаен бутон</string>
     <string name="random_button_settings_desc">Показване на произволен бутон на началната страница</string>
@@ -355,17 +291,14 @@
     <string name="subtitles_encoding">Кодиране на субтитрите</string>
     <string name="category_providers">Доставчици</string>
     <string name="category_ui">Оформление</string>
-
     <string name="automatic">Автоматично</string>
     <string name="tv_layout">ТВ оформление</string>
     <string name="phone_layout">Оформление като телефон</string>
     <string name="emulator_layout">Оформление като емулатор</string>
-
     <string name="primary_color_settings">Основен цвят</string>
     <string name="app_theme_settings">Тема на приложението</string>
     <string name="bottom_title_settings">Местоположение на заглавието на плаката</string>
     <string name="bottom_title_settings_des">Поставете заглавието под плаката</string>
-
     <string name="example_password">парола123</string>
     <string name="example_username">MyCoolUsername</string>
     <string name="example_email">hello@world.com</string>
@@ -373,7 +306,6 @@
     <string name="example_site_name">MyCoolSite</string>
     <string name="example_site_url">example.com</string>
     <string name="example_lang_name">Езиков код (en)</string>
-
     <!--
     -->
     <string name="login_format" formatted="true">%s %s</string>
@@ -392,8 +324,6 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string formatted="true" name="authenticated_user">Удостоверен %s</string>
     <string formatted="true" name="authenticated_user_fail">Неуспешно удостоверяване на %s</string>
-
-    
     <string name="none">Нито един</string>
     <string name="normal">Нормално</string>
     <string name="all">Всичко</string>
@@ -409,8 +339,6 @@
     <string name="subtitle_offset_extra_hint_later_format">Използвайте това, ако субтитрите се показват %dms твърде рано</string>
     <string name="subtitle_offset_extra_hint_before_format">Използвайте това, ако субтитрите се показват %dms твърде късно</string>
     <string name="subtitle_offset_extra_hint_none_format">Без забавяне на субтитрите</string>
-
-    
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
     see: 
@@ -418,7 +346,6 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">Бързата кафява лисица прескача мързеливото куче</string>
-
     <string name="recommended">Препоръчва се</string>
     <string formatted="true" name="player_loaded_subtitles">Заредено %s</string>
     <string name="player_load_subtitles">Зареди от файл</string>
@@ -427,12 +354,9 @@
     <string name="actor_main">Главен</string>
     <string name="actor_supporting">Поддържащ</string>
     <string name="actor_background">Заден план</string>
-
     <string name="home_source">Източник</string>
     <string name="home_random">Случаен</string>
-
     <string name="coming_soon">Очаквайте скоро…</string>
-
     <string name="quality_cam">Cam</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
@@ -449,7 +373,6 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">Снимка на плакат</string>
     <string name="category_player">Плеър</string>
     <string name="resolution_and_title">Резолюция и заглавие</string>
@@ -499,18 +422,15 @@
     <string name="view_public_repositories_button">Вижте хранилищата на общността</string>
     <string name="view_public_repositories_button_short">Публичен списък</string>
     <string name="uppercase_all_subtitles">Всички субтитри с главни букви</string>
-
     <string name="download_all_plugins_from_repo">Изтегляне на всички добавки от това хранилище?</string>
-    <string name="single_plugin_disabled" formatted="true">%s (Disabled)</string>
+    <string name="single_plugin_disabled" formatted="true">%s (Деактивиран)</string>
     <string name="tracks">Потоци</string>
     <string name="audio_tracks">Аудио потоци</string>
     <string name="video_tracks">Видео потоци</string>
     <string name="apply_on_restart">Приложете при рестартиране</string>
-
     <string name="safe_mode_title">Безопасният режим е активиран</string>
     <string name="safe_mode_description">Възникна непоправим срив и ние автоматично деактивирахме всички разширения, така че можете да намерите и премахнете разширението, което причинява проблеми.</string>
     <string name="safe_mode_crash_info">Вижте информация за срива</string>
-
     <string formatted="true" name="extension_rating">Оценка: %s</string>
     <string name="extension_description">Описание</string>
     <string name="extension_version">Версия</string>
@@ -520,9 +440,7 @@
     <string name="extension_types">Поддържани</string>
     <string name="extension_language">език</string>
     <string name="extension_install_first">Първо инсталирайте разширението</string>
-
     <string name="hls_playlist">HLS плейлист</string>
-
     <string name="player_pref">Предпочитан видео плеър</string>
     <string name="player_settings_play_in_app">Вътрешен плеър</string>
     <string name="player_settings_play_in_vlc">VLC</string>
@@ -530,4 +448,25 @@
     <string name="player_settings_play_in_web">Уеб видео предаване</string>
     <string name="player_settings_play_in_browser">Браузър</string>
     <string name="app_not_found_error">Приложението не е намерено</string>
+    <string name="automatic_plugin_download">Автоматично изтегли добавки</string>
+    <string name="all_languages_preference">Всички езици</string>
+    <string name="skip_type_format" formatted="true">Пропусни %s</string>
+    <string name="skip_type_op">Отваряне</string>
+    <string name="skip_type_ed">Затваряне</string>
+    <string name="skip_type_recap">Резюме</string>
+    <string name="history">История</string>
+    <string name="clipboard_too_large">Твърде много текст. Не може да се запази в клипборда.</string>
+    <string name="action_mark_as_watched">Маркирай като гледано</string>
+    <string name="confirm_exit_dialog">Сигурни ли сте, че искате да излезете\?</string>
+    <string name="yes">Да</string>
+    <string name="no">Не</string>
+    <string name="update_notification_installing">Инсталиране на актуализация на приложението</string>
+    <string name="update_notification_failed">Неуспешна актуализация на приложението</string>
+    <string name="enable_skip_op_from_database_des">Покажи изскачащи прозорци при отваряне/затваряне</string>
+    <string name="update_notification_downloading">Изтегля се актуализация на приложението</string>
+    <string name="skip_type_mixed_op">Смесено отваряне</string>
+    <string name="skip_type_mixed_ed">Смесено затваряне</string>
+    <string name="skip_type_creddits">Кредити</string>
+    <string name="skip_type_intro">въведение</string>
+    <string name="clear_history">Изчистване на историята</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 1046c936..d01f30ec 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,11 +1,10 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <string name="player_speed_text_format" formatted="true">Prędkość (%.2fx)</string>
     <string name="rated_format" formatted="true">Ocena: %.1f</string>
-    <string name="new_update_format" formatted="true">Znaleziono nową aktualizację!\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">Znaleziono nową aktualizację!\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
-
     <string name="app_dub_sub_episode_text_format">%s Odc. %d</string>
     <string name="result_poster_img_des">Plakat</string>
     <string name="episode_poster_img_des">Plakat odcinka</string>
@@ -14,16 +13,13 @@
     <string name="go_back_img_des">Wstecz</string>
     <string name="home_change_provider_img_des">Zmień dostawcę</string>
     <string name="preview_background_img_des">Pogląd tła</string>
-
     <string name="app_name">CloudStream</string>
     <string name="title_home">Główna</string>
     <string name="title_search">Szukaj</string>
     <string name="title_downloads">Pobrane</string>
     <string name="title_settings">Ustawienia</string>
-
     <string name="search_hint">Szukaj…</string>
     <string name="search_hint_site" formatted="true">Szukaj %s…</string>
-
     <string name="no_data">Brak danych</string>
     <string name="episode_more_options_des">Więcej opcji</string>
     <string name="next_episode">Następny odcinek</string>
@@ -33,7 +29,6 @@
     <string name="result_open_in_browser">Otwórz w przeglądarce</string>
     <string name="skip_loading">Pomiń ładowanie</string>
     <string name="loading">Ładowanie…</string>
-
     <string name="type_watching">W trakcie</string>
     <string name="type_on_hold">Zawieszone</string>
     <string name="type_completed">Zakończone</string>
@@ -41,7 +36,6 @@
     <string name="type_plan_to_watch">Planowane</string>
     <string name="type_none">Brak</string>
     <string name="type_re_watching">Ponowne oglądanie</string>
-
     <string name="play_movie_button">Odtwórz film</string>
     <string name="play_livestream_button">Odtwórz transmisję na żywo</string>
     <string name="play_torrent_button">Otwórz torrent</string>
@@ -50,7 +44,6 @@
     <string name="reload_error">Połącz ponownie…</string>
     <string name="go_back">Wstecz</string>
     <string name="play_episode">Odtwórz odcinek</string>
-
     <string name="download">Pobierz</string>
     <string name="downloaded">Pobrane</string>
     <string name="downloading">Pobieranie</string>
@@ -59,20 +52,15 @@
     <string name="download_failed">Błąd przy pobieraniu</string>
     <string name="download_canceled">Anulowano pobieranie</string>
     <string name="download_done">Zakończono pobieranie</string>
-
     <string name="stream">Stream</string>
-
     <string name="error_loading_links_toast">Błąd przy ładowaniu linków</string>
     <string name="download_storage_text">Pamięć wewnętrzna</string>
-
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Sub</string>
-
     <string name="popup_delete_file">Usuń plik</string>
     <string name="popup_play_file">Odtwórz plik</string>
     <string name="popup_resume_download">Wznów pobieranie</string>
     <string name="popup_pause_download">Wstrzymaj pobieranie</string>
-
     <string name="pref_disable_acra">Wyłącz przekazywanie błędów</string>
     <string name="home_more_info">Więcej informacji</string>
     <string name="home_expanded_hide">Ukryj</string>
@@ -88,9 +76,7 @@
     <string name="sort_close">Zamknij</string>
     <string name="sort_clear">Wyczyść</string>
     <string name="sort_save">Zapisz</string>
-
     <string name="player_speed">Prędkość odtwarzania</string>
-
     <string name="subtitles_settings">Ustawienia napisów</string>
     <string name="subs_text_color">Kolor tekstu</string>
     <string name="subs_outline_color">Kolor konturu</string>
@@ -100,34 +86,25 @@
     <string name="subs_subtitle_elevation">Wzniesienie napisów</string>
     <string name="subs_font">Czcionka</string>
     <string name="subs_font_size">Rozmiar czcionki</string>
-
     <string name="search_provider_text_providers">Szukaj według dostawców</string>
     <string name="search_provider_text_types">Szukaj według typów</string>
-
     <string name="benene_count_text">Dano %d bananów</string>
     <string name="benene_count_text_none">Brak bananów</string>
-
     <string name="subs_auto_select_language">Wybierz język automatycznie</string>
     <string name="subs_download_languages">Pobieranie języków</string>
     <string name="subs_subtitle_languages">Język napisów</string>
     <string name="subs_hold_to_reset_to_default">Przytrzymaj, aby zresetować</string>
     <string name="subs_import_text" formatted="true">Importuj czcionki umieszczając je w %s</string>
     <string name="continue_watching">Kontyntynuj oglądanie</string>
-
     <string name="action_remove_watching">Usuń</string>
     <string name="action_open_watching">Więcej informacji</string>
-
     <string name="vpn_might_be_needed">Połączenie przez VPN może być wymagane</string>
     <string name="vpn_torrent">Ten dostawca jest torrentem, wskazane jest użycie połączenia VPN</string>
-
     <string name="provider_info_meta">Metadane nie są dostarczane przez witrynę, ładowanie filmu nie powiedzie się, jeśli nie ma ich w witrynie.</string>
-
     <string name="torrent_plot">Opis</string>
     <string name="normal_no_plot">Nie znaleziono opisu</string>
     <string name="torrent_no_plot">Nie znaleziono opisu</string>
-
     <string name="show_log_cat">Pokaż logcat 🐈</string>
-
     <string name="picture_in_picture">Obraz-w-obrazie</string>
     <string name="picture_in_picture_des">Oglądaj w małym, pływającym okienku</string>
     <string name="player_size_settings">Przycisk zmiany rozmiaru</string>
@@ -136,43 +113,33 @@
     <string name="player_subtitles_settings_des">Ustawienia napisów</string>
     <string name="chromecast_subtitles_settings">Napisy Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Ustawienia napisów Chromecast</string>
-
     <string name="eigengraumode_settings">Tryb Eigengrau</string>
     <string name="eigengraumode_settings_des">Ustawienia prędkości</string>
     <string name="swipe_to_seek_settings">Przesuwaj aby przeglądać</string>
     <string name="swipe_to_seek_settings_des">Przesuwaj w lewo lub prawo aby kontrolować czas</string>
     <string name="swipe_to_change_settings">Przesuwaj aby zmienić ustawienia</string>
     <string name="swipe_to_change_settings_des">Przesuwaj po lewej lub prawej stronie aby zmienić jasność i głośność</string>
-
     <string name="autoplay_next_settings">Autoodtwarzanie następnego odcinka</string>
     <string name="autoplay_next_settings_des">Rozpocznij następny odcinek po zakończeniu bieżącego</string>
-
     <string name="double_tap_to_seek_amount_settings">Wielkość skoku przy podwójnym stuknięciu</string>
     <string name="double_tap_to_seek_settings">Podwójne stuknięcie aby przeglądać</string>
     <string name="double_tap_to_seek_settings_des">Stuknij 2 razy z prawej lub lewej strony aby przeglądać</string>
-
     <string name="double_tap_to_pause_settings">Stuknij dwukrotnie, aby wstrzymać</string>
     <string name="double_tap_to_pause_settings_des">Stuknij na środku, aby wstrzymać</string>
-
     <string name="use_system_brightness_settings">Użyj jasności systemowej</string>
     <string name="use_system_brightness_settings_des">Użyj jasności systemowej w odtwarzaczu aplikacji zamiast ciemnej nakładki</string>
-
     <string name="episode_sync_settings">Aktualizuj postęp oglądania</string>
     <string name="episode_sync_settings_des">Automatycznie synchronizuj postęp aktualnego odcinka</string>
-
     <string name="restore_settings">Przywracanie danych z kopii zapasowej</string>
-
     <string name="backup_settings">Kopia zapasowa danych</string>
     <string name="restore_success">Wczytano plik kopii zapasowej</string>
     <string name="restore_failed_format" formatted="true">Nie udało się przywrócić danych z pliku %s</string>
     <string name="backup_success">Dane zapisane z powodzeniem</string>
     <string name="backup_failed">Brak uprawnień do przechowywania, spróbuj ponownien</string>
     <string name="backup_failed_error_format">Błąd tworzenia kopii zapasowej %s</string>
-
     <string name="search">Szukaj</string>
     <string name="category_account">Konta</string>
     <string name="category_updates">Aktualizacje i kopia zapasowa</string>
-
     <string name="settings_info">Informacje</string>
     <string name="advanced_search">Zaawansowane wyszukiwanie</string>
     <string name="advanced_search_des">Szukaj z podziałem na dostawców</string>
@@ -182,7 +149,6 @@
     <string name="show_trailers_settings">Pokaż zwiastuny</string>
     <string name="kitsu_settings">Pokaż plakaty z Kitsu</string>
     <string name="pref_filter_search_quality">Ukryj wybraną jakość wideo w wynikach wyszukiwania</string>
-
     <string name="automatic_plugin_updates">Automatyczne aktualizacje rozszerzeń</string>
     <string name="automatic_plugin_download">Automatyczne pobieranie rozszerzeń</string>
     <string name="updates_settings">Pokazuj aktualizacje</string>
@@ -195,16 +161,13 @@
     <string name="discord">Discord</string>
     <string name="benene">Daj banana programistom</string>
     <string name="benene_des">Dano banana</string>
-
     <string name="app_language">Język aplikacji</string>
-
     <string name="no_chromecast_support_toast">Ten dostawca nie wspiera Chromecast</string>
     <string name="no_links_found_toast">Nie znaleziono linków</string>
     <string name="copy_link_toast">Skopiowano do schowka</string>
     <string name="play_episode_toast">Odtwórz odcinek</string>
     <string name="subs_default_reset_toast">Zresetowano</string>
     <string name="acra_report_toast">Awaria aplikacji. Anonimowe zgłoszenie błedu zostanie wysłane programistom</string>
-
     <string name="season">Sezon</string>
     <string name="season_format">%s %d%s</string>
     <string name="no_season">Brak sezonu</string>
@@ -215,7 +178,6 @@
     <string name="season_short">S</string>
     <string name="episode_short">O</string>
     <string name="no_episodes_found">Nie znaleziono odcinków</string>
-
     <string name="delete_file">Usuń plik</string>
     <string name="delete">Usuń</string>
     <string name="pause">Wstrzymaj</string>
@@ -224,7 +186,6 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">Spowoduje to trwałe usunięcie %s\nCzy jesteś pewien?</string>
     <string name="resume_time_left" formatted="true">%dm\npozostało</string>
-
     <string name="status_ongoing">Bierzący</string>
     <string name="status_completed">Zakończone</string>
     <string name="status">Status</string>
@@ -233,15 +194,12 @@
     <string name="duration">Czas trwania</string>
     <string name="site">Strona</string>
     <string name="synopsis">Streszczenie</string>
-
     <string name="queued">W kolejce</string>
     <string name="no_subtitles">Brak napisów</string>
     <string name="default_subtitles">Domyślne</string>
-
     <string name="free_storage">Wolne</string>
     <string name="used_storage">W użyciu</string>
     <string name="app_storage">Aplikacja</string>
-
     <!--plural-->
     <string name="movies">Filmy</string>
     <string name="tv_series">Serial telewizyjny</string>
@@ -254,7 +212,6 @@
     <string name="livestreams">Transmisje na żywo</string>
     <string name="nsfw">NSFW</string>
     <string name="others">Inne</string>
-
     <!--singular-->
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Serial telewizyjny</string>
@@ -265,13 +222,11 @@
     <string name="live_singular">Transmisja na żywo</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Inne</string>
-
     <string name="source_error">Błąd żródła</string>
     <string name="remote_error">Zdalny błąd</string>
     <string name="render_error">Błąd renderowania</string>
     <string name="unexpected_error">Nieoczekiwany błąd odtwarzacza</string>
     <string name="storage_error">Błąd pobierania, sprawdź uprawnienia</string>
-
     <string name="episode_action_chromecast_episode">Chromecast odcinka</string>
     <string name="episode_action_chromecast_mirror">Chromecast mirroru</string>
     <string name="episode_action_play_in_app">Odtwórz w aplikacji</string>
@@ -282,55 +237,41 @@
     <string name="episode_action_download_mirror">Pobierz mirror</string>
     <string name="episode_action_reload_links">Odświerz linki</string>
     <string name="episode_action_download_subtitle">Pobierz napisy</string>
-
     <string name="show_hd">Etykieta jakości</string>
     <string name="show_dub">Etykieta dubbingu</string>
     <string name="show_sub">Etykieta napisów</string>
     <string name="show_title">Tytuł</string>
     <string name="poster_ui_settings">Włącz elementy interfejsu na plakatach</string>
-
     <string name="no_update_found">Nie znaleziono aktualizacji</string>
     <string name="check_for_update">Sprawdź czy jest aktualizacja</string>
-
     <string name="video_lock">Zablokuj</string>
     <string name="video_aspect_ratio_resize">Rozmiar</string>
     <string name="video_source">Źródlo</string>
     <string name="video_skip_op">Pomiń OP</string>
-
     <string name="dont_show_again">Nie pokazuj ponownie</string>
     <string name="skip_update">Pomiń tę aktualizację</string>
     <string name="update">Aktualizacja</string>
     <string name="watch_quality_pref">Domyślna jakość</string>
     <string name="limit_title">Maksymalna ilość znaków tytułu w odtwarzaczu</string>
     <string name="limit_title_rez">Zawartość tytułu w odtwarzaczu</string>
-
     <string name="video_buffer_size_settings">Rozmiar bufora wideo</string>
     <string name="video_buffer_length_settings">Długość bufora wideo</string>
     <string name="video_buffer_disk_settings">Pamięć podręczna wideo na dysku</string>
     <string name="video_buffer_clear_settings">Wyczyść pamięć podręczną wideo i obrazów</string>
-
     <string name="video_ram_description">Ustawienie zbyt wysokiej wartości może powodować problemy w systemach z małą ilością pamięci RAM, takich jak urządzenia Android TV lub stare telefony.</string>
     <string name="video_disk_description">Zbyt wysokie ustawienie może powodować problemy w systemach z małą ilością miejsca w pamięci, takich jak urządzenia Android TV</string>
-
-    <string name="dns_pref">DNS over HTTPS</string>
+    <string name="dns_pref">DNS przez HTTPS</string>
     <string name="dns_pref_summary">Przydatne w pomijaniu blokad dostawców internetu</string>
-
     <string name="add_site_pref">Sklonuj stronę</string>
     <string name="remove_site_pref">Usuń stronę</string>
     <string name="add_site_summary">Dodaj klona istniejącej strony z innym adresem url</string>
-
     <string name="download_path_pref">Ścieżka pobierania</string>
-
     <string name="nginx_url_pref">Url serwera Nginx</string>
-
     <string name="display_subbed_dubbed_settings">Wyświetlanie Anime z dubbingiem/subbingiem</string>
-
     <string name="resize_fit">Dopasuj do ekranu</string>
     <string name="resize_fill">Rozciągnij</string>
     <string name="resize_zoom">Powiększ</string>
-
     <string name="legal_notice">Zastrzeżenie</string>
-
     <string name="category_general">Ogólne</string>
     <string name="random_button_settings">Przycisk do losowania</string>
     <string name="random_button_settings_desc">Pokaż przycisk do losowania na stronie głównej</string>
@@ -341,19 +282,15 @@
     <string name="subtitles_encoding">Kodowanie napisów</string>
     <string name="category_providers">Dostawcy</string>
     <string name="category_ui">Układ interfejsu</string>
-
     <string name="automatic">Automatyczny</string>
     <string name="tv_layout">Układ dla telewizorów</string>
     <string name="phone_layout">Układ dla telefonów</string>
     <string name="emulator_layout">Układ dla emulatorów</string>
-
     <string name="primary_color_settings">Kolor podstawowy</string>
     <string name="app_theme_settings">Motyw aplikacji</string>
     <string name="bottom_title_settings">Pozycja tytułu względem plakatu</string>
     <string name="bottom_title_settings_des">Ustaw tytuł pod plakatem</string>
-
     <string name="example_lang_name">Kod języka (pl)</string>
-
     <string name="login_format" formatted="true">%s %s</string>
     <string name="account">konto</string>
     <string name="logout">Wyloguj się</string>
@@ -368,7 +305,6 @@
     <string name="sync_score_format" formatted="true">%d na 10</string>
     <string name="authenticated_user" formatted="true">Uwierzytelniono %s</string>
     <string name="authenticated_user_fail" formatted="true">Nie udało się uwierzytelnić w %s</string>
-
     <!-- ============ -->
     <string name="none">Brak</string>
     <string name="normal">Normalne</string>
@@ -385,9 +321,7 @@
     <string name="subtitle_offset_extra_hint_later_format">Użyj tego, jeśli napisy są wyświetlane %dms za wcześnie</string>
     <string name="subtitle_offset_extra_hint_before_format">Użyj tego, jeśli napisy są wyświetlane %dms za późno</string>
     <string name="subtitle_offset_extra_hint_none_format">Brak opóźnienia napisów</string>
-
     <string name="subtitles_example_text">Pchnąć w tę łódź jeża lub ośm skrzyń fig.</string>
-
     <string name="recommended">Polecane</string>
     <string name="player_loaded_subtitles" formatted="true">Załadowano %s</string>
     <string name="player_load_subtitles">Wczytaj z pliku</string>
@@ -396,12 +330,9 @@
     <string name="actor_main">Główna</string>
     <string name="actor_supporting">Drugoplanowy</string>
     <string name="actor_background">Pomocniczy</string>
-
     <string name="home_source">Źródło</string>
     <string name="home_random">Losowy</string>
-
     <string name="coming_soon">Już wkrótce…</string>
-
     <string name="quality_cam">Cam</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
@@ -418,7 +349,6 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">Obraz plakatu</string>
     <string name="category_player">Odtwarzacz</string>
     <string name="resolution_and_title">Rozdzielczość i tytuł</string>
@@ -463,22 +393,23 @@
     <string name="plugins_disabled" formatted="true">Wyłączono: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Nie pobrano: %d</string>
     <string name="plugins_updated">Zaaktualizowano %d rozszerzeń</string>
-    <string name="blank_repo_message">Dodaj repozytorium aby zainstalować rozszerzenia</string>
+    <string name="blank_repo_message">CloudStream nie ma domyślnie zainstalowanych żadnych witryn. Musisz zainstalować witryny z repozytoriów.
+\n
+\nZ powodu bezmyślnego usunięcia DMCA przez Sky Uk Limited 🤮 nie możemy zamieścić linku dowitryny z repozytoriami.
+\n
+\nDołącz do naszego Discorda lub szukaj online.</string>
     <string name="view_public_repositories_button">Zobacz repozytoria społeczności</string>
     <string name="view_public_repositories_button_short">Publiczna lista</string>
     <string name="uppercase_all_subtitles">Wszystkie napisy wielką literą</string>
-
     <string name="download_all_plugins_from_repo">Pobrać wszystkie rozszerzenia z tego repozytorium?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Wyłączone)</string>
     <string name="tracks">Ścieżki</string>
     <string name="audio_tracks">Ścieżki audio</string>
     <string name="video_tracks">Ścieżki wideo</string>
     <string name="apply_on_restart">Zastosuj po ponownym uruchomieniu</string>
-
     <string name="safe_mode_title">Tryb bezpieczny włączony</string>
     <string name="safe_mode_description">Wystąpiła nieoczekiwana awaria i automatycznie wyłączyliśmy wszystkie rozszerzenia, abyś mógł znaleźć i usunąć rozszerzenie, które powoduje problemy.</string>
     <string name="safe_mode_crash_info">Wyświetl informacje o awarii</string>
-
     <string name="extension_rating" formatted="true">Ocena: %s</string>
     <string name="extension_description">Opis</string>
     <string name="extension_version">Versja</string>
@@ -488,9 +419,7 @@
     <string name="extension_types">Wspierane</string>
     <string name="extension_language">Język</string>
     <string name="extension_install_first">Najpierw zainstaluj rozszerzenie</string>
-
     <string name="hls_playlist">Playlista HLS</string>
-
     <string name="player_pref">Preferowany odtwarzacz wideo</string>
     <string name="player_settings_play_in_app">Odtwarzacz wewnętrzny</string>
     <string name="player_settings_play_in_vlc">VLC</string>
@@ -499,8 +428,22 @@
     <string name="player_settings_play_in_browser">Przeglądarka</string>
     <string name="app_not_found_error">Aplikacja nie została znaleziona</string>
     <string name="all_languages_preference">Wszystkie języki</string>
-
     <string name="clear_history">Wyczyść historię</string>
     <string name="history">Historia</string>
     <string name="clipboard_too_large">Za dużo tekstu. Nie można skopiować do schowka.</string>
-</resources>
+    <string name="network_adress_example">Link do transmisji</string>
+    <string name="play_with_app_name">Odtwórz w CloudStream</string>
+    <string name="skip_type_format" formatted="true">Pomiń %s</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="yes">Tak</string>
+    <string name="no">Nie</string>
+    <string name="update_notification_failed">Aktualizacja aplikacji nie powiodła się</string>
+    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="update_notification_installing">Instalowanie aktualizacji aplikacji</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="action_mark_as_watched">Oznacz jako obejrzane</string>
+    <string name="confirm_exit_dialog">Czy na pewno chcesz wyjść\?</string>
+    <string name="update_notification_downloading">Pobieranie aktualizacji aplikacji</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="cast_format" formatted="true">Obsada: %s</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5be5ab3f..f7f197cf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- KEYS DON'T TRANSLATE -->
     <string name="search_providers_list_key" translatable="false">search_providers_list</string>
     <string name="locale_key" translatable="false">app_locale</string>
@@ -59,7 +59,6 @@
     <string name="pref_filter_search_quality_key" translatable="false">pref_filter_search_quality_key</string>
     <string name="enable_nsfw_on_providers_key" translatable="false">enable_nsfw_on_providers_key</string>
     <string name="enable_skip_op_from_database" translatable="false">enable_skip_op_from_database</string>
-
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
     <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
@@ -77,7 +76,6 @@
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
@@ -89,24 +87,20 @@
     <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">Change Provider</string>
     <string name="preview_background_img_des">Preview Background</string>
-
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Speed (%.2fx)</string>
     <string name="rated_format" formatted="true">Rated: %.1f</string>
-    <string name="new_update_format" formatted="true">New update found!\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">New update found!\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
-
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Play with CloudStream</string>
     <string name="title_home">Home</string>
     <string name="title_search">Search</string>
     <string name="title_downloads">Downloads</string>
     <string name="title_settings">Settings</string>
-
     <string name="search_hint">Search…</string>
     <string name="search_hint_site" formatted="true">Search %s…</string>
-
     <string name="no_data">No Data</string>
     <string name="episode_more_options_des">More Options</string>
     <string name="next_episode">Next episode</string>
@@ -116,7 +110,6 @@
     <string name="result_open_in_browser">Open In Browser</string>
     <string name="skip_loading">Skip Loading</string>
     <string name="loading">Loading…</string>
-
     <string name="type_watching">Watching</string>
     <string name="type_on_hold">On-Hold</string>
     <string name="type_completed">Completed</string>
@@ -124,7 +117,6 @@
     <string name="type_plan_to_watch">Plan to Watch</string>
     <string name="type_none">None</string>
     <string name="type_re_watching">Rewatching</string>
-
     <string name="play_movie_button">Play Movie</string>
     <string name="play_livestream_button">Play Livestream</string>
     <string name="play_torrent_button">Stream Torrent</string>
@@ -134,7 +126,6 @@
     <string name="go_back">Go Back</string>
     <string name="play_episode">Play Episode</string>
     <!--<string name="need_storage">Allow to download episodes</string>-->
-
     <string name="download">Download</string>
     <string name="downloaded">Downloaded</string>
     <string name="downloading">Downloading</string>
@@ -145,18 +136,14 @@
     <string name="download_done">Download Done</string>
     <string name="download_format" translatable="false">%s - %s</string>
     <string name="stream">Stream</string>
-
     <string name="error_loading_links_toast">Error Loading Links</string>
     <string name="download_storage_text">Internal Storage</string>
-
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Sub</string>
-
     <string name="popup_delete_file">Delete File</string>
     <string name="popup_play_file">Play File</string>
     <string name="popup_resume_download">Resume Download</string>
     <string name="popup_pause_download">Pause Download</string>
-
     <string name="pref_disable_acra">Disable automatic bug reporting</string>
     <string name="home_more_info">More info</string>
     <string name="home_expanded_hide">Hide</string>
@@ -172,9 +159,7 @@
     <string name="sort_close">Close</string>
     <string name="sort_clear">Clear</string>
     <string name="sort_save">Save</string>
-
     <string name="player_speed">Player Speed</string>
-
     <string name="subtitles_settings">Subtitle Settings</string>
     <string name="subs_text_color">Text Color</string>
     <string name="subs_outline_color">Outline Color</string>
@@ -184,35 +169,26 @@
     <string name="subs_subtitle_elevation">Subtitle Elevation</string>
     <string name="subs_font">Font</string>
     <string name="subs_font_size">Font Size</string>
-
     <string name="search_provider_text_providers">Search using providers</string>
     <string name="search_provider_text_types">Search using types</string>
-
     <string name="benene_count_text">%d Benenes given to devs</string>
     <string name="benene_count_text_none">No Benenes given</string>
-
     <string name="subs_auto_select_language">Auto-Select Language</string>
     <string name="subs_download_languages">Download Languages</string>
     <string name="subs_subtitle_languages">Subtitle Language</string>
     <string name="subs_hold_to_reset_to_default">Hold to reset to default</string>
     <string name="subs_import_text" formatted="true">Import fonts by placing them in %s</string>
     <string name="continue_watching">Continue Watching</string>
-
     <string name="action_remove_watching">Remove</string>
     <string name="action_open_watching">More Info</string>
     <string name="action_open_play">@string/home_play </string>
-
     <string name="vpn_might_be_needed">A VPN might be needed for this provider to work correctly</string>
     <string name="vpn_torrent">This provider is a torrent, a VPN is recommended</string>
-
     <string name="provider_info_meta">Metadata is not provided by site, video loading will fail if it does not exist on site.</string>
-
     <string name="torrent_plot">Description</string>
     <string name="normal_no_plot">No Plot Found</string>
     <string name="torrent_no_plot">No Description Found</string>
-
     <string name="show_log_cat">Show logcat 🐈</string>
-
     <string name="picture_in_picture">Picture-in-picture</string>
     <string name="picture_in_picture_des">Continues playback in a miniature player on top of other apps</string>
     <string name="player_size_settings">Player resize button</string>
@@ -221,17 +197,14 @@
     <string name="player_subtitles_settings_des">Player subtitles settings</string>
     <string name="chromecast_subtitles_settings">Chromecast Subtitles</string>
     <string name="chromecast_subtitles_settings_des">Chromecast subtitles settings</string>
-
     <string name="eigengraumode_settings">Eigengravy Mode</string>
     <string name="eigengraumode_settings_des">Adds a speed option in the player</string>
     <string name="swipe_to_seek_settings">Swipe to seek</string>
     <string name="swipe_to_seek_settings_des">Swipe left or right to control time in the videoplayer</string>
     <string name="swipe_to_change_settings">Swipe to change settings</string>
     <string name="swipe_to_change_settings_des">Swipe on the left or right side to change brightness or volume</string>
-
     <string name="autoplay_next_settings">Autoplay next episode</string>
     <string name="autoplay_next_settings_des">Start the next episode when the current one ends</string>
-
     <string name="double_tap_to_seek_settings">Double tap to seek</string>
     <string name="double_tap_to_pause_settings">Double tap to pause</string>
     <string name="double_tap_to_seek_amount_settings">Player seek amount</string>
@@ -242,23 +215,18 @@
     <string name="use_system_brightness_settings_des">Use system brightness in the app player instead of a dark
         overlay
     </string>
-
     <string name="episode_sync_settings">Update watch progress</string>
     <string name="episode_sync_settings_des">Automatically sync your current episode progress</string>
-
     <string name="restore_settings">Restore data from backup</string>
-
     <string name="backup_settings">Backup data</string>
     <string name="restore_success">Loaded backup file</string>
     <string name="restore_failed_format" formatted="true">Failed to restore data from file %s</string>
     <string name="backup_success">Successfully stored data</string>
     <string name="backup_failed">Storage permissions missing, please try again</string>
     <string name="backup_failed_error_format">Error backing up %s</string>
-
     <string name="search">Search</string>
     <string name="category_account">Accounts</string>
     <string name="category_updates">Updates and backup</string>
-
     <string name="settings_info">Info</string>
     <string name="advanced_search">Advanced Search</string>
     <string name="advanced_search_des">Gives you the search results separated by provider</string>
@@ -268,7 +236,6 @@
     <string name="show_trailers_settings">Show trailers</string>
     <string name="kitsu_settings">Show posters from kitsu</string>
     <string name="pref_filter_search_quality">Hide selected video quality on Search results</string>
-
     <string name="automatic_plugin_updates">Automatic plugin updates</string>
     <string name="automatic_plugin_download">Automatically download plugins</string>
     <string name="updates_settings">Show app updates</string>
@@ -281,9 +248,7 @@
     <string name="discord">Join Discord</string>
     <string name="benene">Give a benene to the devs</string>
     <string name="benene_des">Given benene</string>
-
     <string name="app_language">App Language</string>
-
     <string name="no_chromecast_support_toast">This provider has no Chromecast support</string>
     <string name="no_links_found_toast">No Links Found</string>
     <string name="copy_link_toast">Link copied to clipboard</string>
@@ -292,7 +257,6 @@
     <string name="acra_report_toast">Sorry, the application crashed. An anonymous bug report will be sent to the
         developers
     </string>
-
     <string name="season">Season</string>
     <string name="season_format">%s %d%s</string>
     <string name="no_season">No Season</string>
@@ -303,7 +267,6 @@
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">No Episodes found</string>
-
     <string name="delete_file">Delete File</string>
     <string name="delete">Delete</string>
     <string name="cancel" translatable="false">@string/sort_cancel</string>
@@ -313,8 +276,6 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">This will permanently delete %s\nAre you sure?</string>
     <string name="resume_time_left" formatted="true">%dm\nremaining</string>
-
-
     <string name="status_ongoing">Ongoing</string>
     <string name="status_completed">Completed</string>
     <string name="status">Status</string>
@@ -323,15 +284,12 @@
     <string name="duration">Duration</string>
     <string name="site">Site</string>
     <string name="synopsis">Synopsis</string>
-
     <string name="queued">queued</string>
     <string name="no_subtitles">No Subtitles</string>
     <string name="default_subtitles">Default</string>
-
     <string name="free_storage">Free</string>
     <string name="used_storage">Used</string>
     <string name="app_storage">App</string>
-
     <!--plural-->
     <string name="movies">Movies</string>
     <string name="tv_series">TV Series</string>
@@ -344,7 +302,6 @@
     <string name="livestreams">Livestreams</string>
     <string name="nsfw">NSFW</string>
     <string name="others">Others</string>
-
     <!--singular-->
     <string name="movies_singular">Movie</string>
     <string name="tv_series_singular">Series</string>
@@ -357,13 +314,11 @@
     <string name="live_singular">Livestream</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Video</string>
-
     <string name="source_error">Source error</string>
     <string name="remote_error">Remote error</string>
     <string name="render_error">Renderer error</string>
     <string name="unexpected_error">Unexpected player error</string>
     <string name="storage_error">Download error, check storage permissions</string>
-
     <string name="episode_action_chromecast_episode">Chromecast episode</string>
     <string name="episode_action_chromecast_mirror">Chromecast mirror</string>
     <string name="episode_action_play_in_app">Play in app</string>
@@ -374,7 +329,6 @@
     <string name="episode_action_download_mirror">Download mirror</string>
     <string name="episode_action_reload_links">Reload links</string>
     <string name="episode_action_download_subtitle">Download subtitles</string>
-
     <string name="show_hd">Quality label</string>
     <string name="show_dub">Dub label</string>
     <string name="show_sub">Sub label</string>
@@ -384,47 +338,35 @@
     <string name="show_sub_key" translatable="false">show_sub_key</string>
     <string name="show_title_key" translatable="false">show_title_key</string>
     <string name="poster_ui_settings">Toggle UI elements on poster</string>
-
     <string name="no_update_found">No Update Found</string>
     <string name="check_for_update">Check for Update</string>
-
     <string name="video_lock">Lock</string>
     <string name="video_aspect_ratio_resize">Resize</string>
     <string name="video_source">Source</string>
     <string name="video_skip_op">Skip OP</string>
-
     <string name="dont_show_again">Don\'t show again</string>
     <string name="skip_update">Skip this Update</string>
     <string name="update">Update</string>
     <string name="watch_quality_pref">Preferred watch quality</string>
     <string name="limit_title">Video player title max chars</string>
     <string name="limit_title_rez">Video player resolution</string>
-
     <string name="video_buffer_size_settings">Video buffer size</string>
     <string name="video_buffer_length_settings">Video buffer length</string>
     <string name="video_buffer_disk_settings">Video cache on disk</string>
     <string name="video_buffer_clear_settings">Clear video and image cache</string>
-
     <string name="video_ram_description">Will cause random crashes if set too high. Don\'t change if you have a low amount of ram such as an Android TV or old phone</string>
     <string name="video_disk_description">May cause problems on systems with low storage space such as Android TV devices if you set it too high</string>
-
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Useful for bypassing ISP blocks</string>
-
     <string name="add_site_pref">Clone site</string>
     <string name="remove_site_pref">Remove site</string>
     <string name="add_site_summary">Add a clone of an existing site, with a different url</string>
-
     <string name="download_path_pref">Download path</string>
-
     <string name="nginx_url_pref">Nginx server url</string>
-
     <string name="display_subbed_dubbed_settings">Display Dubbed/Subbed Anime</string>
-
     <string name="resize_fit">Fit to screen</string>
     <string name="resize_fill">Stretch</string>
     <string name="resize_zoom">Zoom</string>
-
     <string name="legal_notice">Disclaimer</string>
     <string name="legal_notice_key" translatable="false">legal_notice_key</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
@@ -453,18 +395,14 @@
     <string name="subtitles_encoding">Subtitle encoding</string>
     <string name="category_providers">Providers</string>
     <string name="category_ui">Layout</string>
-
     <string name="automatic">Auto</string>
     <string name="tv_layout">TV layout</string>
     <string name="phone_layout">Phone layout</string>
     <string name="emulator_layout">Emulator layout</string>
-
     <string name="primary_color_settings">Primary color</string>
     <string name="app_theme_settings">App theme</string>
     <string name="bottom_title_settings">Poster title location</string>
     <string name="bottom_title_settings_des">Put the title under the poster</string>
-
-
     <!-- account stuff -->
     <string name="anilist_key" translatable="false">anilist_key</string>
     <string name="mal_key" translatable="false">mal_key</string>
@@ -477,7 +415,6 @@
     <string name="example_site_name">MyCoolSite</string>
     <string name="example_site_url">example.com</string>
     <string name="example_lang_name">Language code (en)</string>
-
     <!--
     <string name="mal_account_settings" translatable="false">MAL</string>
     <string name="anilist_account_settings" translatable="false">AniList</string>
@@ -502,7 +439,6 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">Authenticated %s</string>
     <string name="authenticated_user_fail" formatted="true">Failed to authenticate to %s</string>
-
     <!-- ============ -->
     <string name="none">None</string>
     <string name="normal">Normal</string>
@@ -520,7 +456,6 @@
     <string name="subtitle_offset_extra_hint_later_format">Use this if the subtitles are shown %dms too early</string>
     <string name="subtitle_offset_extra_hint_before_format">Use this if subtitles are shown %dms too late</string>
     <string name="subtitle_offset_extra_hint_none_format">No subtitle delay</string>
-
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
     see: 
@@ -528,7 +463,6 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">The quick brown fox jumps over the lazy dog</string>
-
     <string name="recommended">Recommended</string>
     <string name="player_loaded_subtitles" formatted="true">Loaded %s</string>
     <string name="player_load_subtitles">Load from file</string>
@@ -537,12 +471,9 @@
     <string name="actor_main">Main</string>
     <string name="actor_supporting">Supporting</string>
     <string name="actor_background">Background</string>
-
     <string name="home_source">Source</string>
     <string name="home_random">Random</string>
-
     <string name="coming_soon">Coming soon…</string>
-
     <string name="quality_cam">Cam</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
@@ -559,7 +490,6 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">Poster Image</string>
     <string name="category_player">Player</string>
     <string name="resolution_and_title">Resolution and title</string>
@@ -605,22 +535,23 @@
     <string name="plugins_disabled" formatted="true">Disabled: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Not downloaded: %d</string>
     <string name="plugins_updated" formatted="true">Updated %d plugins</string>
-    <string name="blank_repo_message">CloudStream has no sites installed by default. You need to install the sites from repositories.\n\nBecause of a brainless DMCA takedown by Sky Uk Limited 🤮 we cannot link the repository sites in app.\n\nJoin our discord for links or search online.</string>
+    <string name="blank_repo_message">CloudStream has no sites installed by default. You need to install the sites from repositories.
+\n
+\nBecause of a brainless DMCA takedown by Sky Uk Limited 🤮 we cannot link the repository site in app.
+\n
+\nJoin our Discord or search online.</string>
     <string name="view_public_repositories_button">View community repositories</string>
     <string name="view_public_repositories_button_short">Public list</string>
     <string name="uppercase_all_subtitles">Uppercase all subtitles</string>
-
     <string name="download_all_plugins_from_repo">Download all plugins from this repository?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Disabled)</string>
     <string name="tracks">Tracks</string>
     <string name="audio_tracks">Audio tracks</string>
     <string name="video_tracks">Video tracks</string>
     <string name="apply_on_restart">Apply on Restart</string>
-
     <string name="safe_mode_title">Safe Mode enabled</string>
     <string name="safe_mode_description">An unrecoverable crash occurred and we\'ve automatically disabled all extensions, so you can find and remove the extension which is causing trouble.</string>
     <string name="safe_mode_crash_info">View crash info</string>
-
     <string name="extension_rating" formatted="true">Rating: %s</string>
     <string name="extension_description">Description</string>
     <string name="extension_version">Version</string>
@@ -630,9 +561,7 @@
     <string name="extension_types">Supported</string>
     <string name="extension_language">Language</string>
     <string name="extension_install_first">Install the extension first</string>
-
     <string name="hls_playlist">HLS Playlist</string>
-
     <string name="player_pref">Preferred video player</string>
     <string name="player_settings_play_in_app">Internal player</string>
     <string name="player_settings_play_in_vlc">VLC</string>
@@ -641,7 +570,6 @@
     <string name="player_settings_play_in_browser">Browser</string>
     <string name="app_not_found_error">App not found</string>
     <string name="all_languages_preference">All Languages</string>
-
     <string name="skip_type_format" formatted="true">Skip %s</string>
     <string name="skip_type_op">Opening</string>
     <string name="skip_type_ed">Ending</string>
@@ -650,7 +578,6 @@
     <string name="skip_type_mixed_op">Mixed opening</string>
     <string name="skip_type_creddits">Credits</string>
     <string name="skip_type_intro">Intro</string>
-
     <string name="clear_history">Clear history</string>
     <string name="history">History</string>
     <string name="enable_skip_op_from_database_des">Show skip popups for opening/ending</string>
@@ -659,8 +586,7 @@
     <string name="confirm_exit_dialog">Are you sure you want to exit?</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-
     <string name="update_notification_downloading">Downloading app update</string>
     <string name="update_notification_installing">Installing app update</string>
     <string name="update_notification_failed">App update failed</string>
-</resources>
+</resources>
\ No newline at end of file

From 492c950b7aab837853b85161962293ed7c28754b Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Sun, 18 Dec 2022 14:27:52 +0100
Subject: [PATCH 114/273] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 68.4% (371 of 542 strings)

Translated using Weblate (English)

Currently translated at 100.0% (542 of 542 strings)

Added translation using Weblate (Bengali)

Translated using Weblate (Chinese (Traditional))

Currently translated at 97.9% (531 of 542 strings)

Translated using Weblate (Vietnamese)

Currently translated at 92.4% (501 of 542 strings)

Translated using Weblate (Polish)

Currently translated at 95.9% (520 of 542 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 54.6% (296 of 542 strings)

Translated using Weblate (Dutch)

Currently translated at 84.5% (458 of 542 strings)

Translated using Weblate (Indonesian)

Currently translated at 76.1% (413 of 542 strings)

Translated using Weblate (French)

Currently translated at 70.4% (382 of 542 strings)

Translated using Weblate (Greek)

Currently translated at 81.5% (442 of 542 strings)

Translated using Weblate (Czech)

Currently translated at 78.4% (425 of 542 strings)

Translated using Weblate (bp (generated) (bp))

Currently translated at 89.2% (484 of 542 strings)

Translated using Weblate (Bulgarian)

Currently translated at 99.8% (541 of 542 strings)

Translated using Weblate (English)

Currently translated at 100.0% (542 of 542 strings)

Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bg/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bp/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/el/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/en/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hant/
Translation: Cloudstream/App
---
 app/src/main/res/values-bg/strings.xml     |   2 +-
 app/src/main/res/values-bn/strings.xml     |   2 +
 app/src/main/res/values-bp/strings.xml     | 107 +++--------------
 app/src/main/res/values-cs/strings.xml     |  76 +-----------
 app/src/main/res/values-el/strings.xml     |  68 +----------
 app/src/main/res/values-fr/strings.xml     |  30 +----
 app/src/main/res/values-in/strings.xml     |  75 +-----------
 app/src/main/res/values-nl/strings.xml     |  76 +-----------
 app/src/main/res/values-no/strings.xml     | 131 +++++++++++++++------
 app/src/main/res/values-pl/strings.xml     |   2 +-
 app/src/main/res/values-vi/strings.xml     |  90 +-------------
 app/src/main/res/values-zh-rTW/strings.xml |  86 +-------------
 app/src/main/res/values/strings.xml        |  10 +-
 13 files changed, 158 insertions(+), 597 deletions(-)
 create mode 100644 app/src/main/res/values-bn/strings.xml

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index c782785a..793e4509 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -112,7 +112,7 @@
     <string name="torrent_plot">Описание</string>
     <string name="normal_no_plot">Няма намерен съдържание</string>
     <string name="torrent_no_plot">Няма намерено описание</string>
-    <string name="show_log_cat">Покажи logcat 🐈</string>
+    <string name="show_log_cat">Покажи Logcat 🐈</string>
     <string name="picture_in_picture">Картина в картина</string>
     <string name="picture_in_picture_des">Продължава възпроизвеждането в миниатюрен плейър върху други приложения</string>
     <string name="player_size_settings">Бутон за преоразмеряване на плейъра</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
new file mode 100644
index 00000000..a6b3daec
--- /dev/null
+++ b/app/src/main/res/values-bn/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bp/strings.xml b/app/src/main/res/values-bp/strings.xml
index bffaf804..f9c29b30 100644
--- a/app/src/main/res/values-bp/strings.xml
+++ b/app/src/main/res/values-bp/strings.xml
@@ -1,7 +1,6 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- KEYS DON'T TRANSLATE -->
-
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Elenco: %s</string>
@@ -9,7 +8,6 @@
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
@@ -19,23 +17,19 @@
     <string name="go_back_img_des">Go back</string>
     <string name="home_change_provider_img_des">Change Provider</string>
     <string name="preview_background_img_des">Preview Background</string>
-
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Velocidade (%.2fx)</string>
     <string name="rated_format" formatted="true">Nota: %.1f</string>
-    <string name="new_update_format" formatted="true">Nova atualização encontrada!\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">Nova atualização encontrada!\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
-
     <string name="app_name">CloudStream</string>
     <string name="title_home">Início</string>
     <string name="title_search">Procurar</string>
     <string name="title_downloads">Downloads</string>
     <string name="title_settings">Configurações</string>
-
     <string name="search_hint">Procurar…</string>
     <string name="search_hint_site" formatted="true">Procurar no %s…</string>
-
     <string name="no_data">Sem dados</string>
     <string name="episode_more_options_des">Mais Opções</string>
     <string name="next_episode">Próximo episódio</string>
@@ -44,7 +38,6 @@
     <string name="result_open_in_browser">Abrir no Navegador</string>
     <string name="skip_loading">Pular Carregamento</string>
     <string name="loading">Carregando…</string>
-
     <string name="type_watching">Assistindo</string>
     <string name="type_on_hold">Em espera</string>
     <string name="type_completed">Completado</string>
@@ -52,7 +45,6 @@
     <string name="type_plan_to_watch">Planejando assistir</string>
     <string name="type_none">Nenhum</string>
     <string name="type_re_watching">Reassistindo</string>
-
     <string name="play_movie_button">Assistir Filme</string>
     <string name="play_torrent_button">Transmitir Torrent</string>
     <string name="pick_source">Fontes</string>
@@ -61,7 +53,6 @@
     <string name="go_back">Voltar</string>
     <string name="play_episode">Assistir Episódio</string>
     <!--<string name="need_storage">Permirtir baixar episódios</string>-->
-
     <string name="download">Baixar</string>
     <string name="downloaded">Baixado</string>
     <string name="downloading">Baixando</string>
@@ -71,18 +62,14 @@
     <string name="download_canceled">Download Cancelado</string>
     <string name="download_done">Download Finalizado</string>
     <string name="stream">Transmitir</string>
-
     <string name="error_loading_links_toast">Erro Carregando Links</string>
     <string name="download_storage_text">Armazenamento Interno</string>
-
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Leg</string>
-
     <string name="popup_delete_file">Deletar Arquivo</string>
     <string name="popup_play_file">Assistir Arquivo</string>
     <string name="popup_resume_download">Retomar Download</string>
     <string name="popup_pause_download">Pausar Download</string>
-
     <string name="pref_disable_acra">Desativar relatório automático de erros</string>
     <string name="home_more_info">Mais info</string>
     <string name="home_expanded_hide">Esconder</string>
@@ -98,9 +85,7 @@
     <string name="sort_close">Fechar</string>
     <string name="sort_clear">Limpar</string>
     <string name="sort_save">Salvar</string>
-
     <string name="player_speed">Velocidade do Reprodutor</string>
-
     <string name="subtitles_settings">Configurar Legendas</string>
     <string name="subs_text_color">Cor do Texto</string>
     <string name="subs_outline_color">Cor do Contorno</string>
@@ -110,35 +95,26 @@
     <string name="subs_subtitle_elevation">Elevação da Legenda</string>
     <string name="subs_font">Fonte</string>
     <string name="subs_font_size">Tamanho da Fonte</string>
-
     <string name="search_provider_text_providers">Pesquisar usando fornecedor</string>
     <string name="search_provider_text_types">Pesquisar usando genêros</string>
-
     <string name="benene_count_text">%d Benenes doados aos desenvolvedores</string>
     <string name="benene_count_text_none">Nenhuma Benenes doada</string>
-
     <string name="subs_auto_select_language">Autosseleção de Lingua</string>
     <string name="subs_download_languages">Baixar Linguas</string>
     <string name="subs_subtitle_languages">Lingua da legenda</string>
     <string name="subs_hold_to_reset_to_default">Segure para retornar a configuração padrão</string>
     <string name="subs_import_text" formatted="true">Importe fontes colocando elas em %s</string>
     <string name="continue_watching">Continue Assistindo</string>
-
     <string name="action_remove_watching">Remover</string>
     <string name="action_open_watching">Mais Info</string>
     <string name="action_open_play">@string/home_play </string>
-
     <string name="vpn_might_be_needed">Uma VPN pode ser necessária para esse fornecedor funcionar corretamente</string>
     <string name="vpn_torrent">Esse fornecedor é um torrent, uma VPN é recomendada</string>
-
     <string name="provider_info_meta">Metadados não são oferecidas pelo site, o carregamento do video pode falhar se ele não existir no site.</string>
-
     <string name="torrent_plot">Descrição</string>
     <string name="normal_no_plot">Sinopse não encontrada</string>
     <string name="torrent_no_plot">Descrição não encontrada</string>
-
-    <string name="show_log_cat">Mostrar logcat 🐈</string>
-
+    <string name="show_log_cat">Mostrar Logcat 🐈</string>
     <string name="picture_in_picture">Picture-in-picture</string>
     <string name="picture_in_picture_des">Continua a reprodução em um player miniatura que sobrepõe outros aplicativos</string>
     <string name="player_size_settings">Redimensionar player</string>
@@ -147,7 +123,6 @@
     <string name="player_subtitles_settings_des">Configurações de legendas do Player</string>
     <string name="chromecast_subtitles_settings">Legendas do Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Configurações de legendas do Chromecast</string>
-
     <string name="eigengraumode_settings">Modo Eigengravy</string>
     <string name="eigengraumode_settings_des">Adiciona um botão de velocidade no player</string>
     <string name="swipe_to_seek_settings">Deslize para avançar o vídeo</string>
@@ -161,23 +136,18 @@
     <string name="double_tap_to_pause_settings_des">Toque no meio para pausar</string>
     <string name="use_system_brightness_settings">Usar brilho do sistema</string>
     <string name="use_system_brightness_settings_des">Usar brilho do sistema no player ao invés da sobreposição escura</string>
-
     <string name="episode_sync_settings">Atualizar progresso assistido</string>
     <string name="episode_sync_settings_des">Sincronize automaticamente seu progresso do episódio</string>
-
     <string name="restore_settings">Restaurar dados de backup</string>
-
     <string name="backup_settings">Fazer Backup</string>
     <string name="restore_success">Arquivo de Backup carregado</string>
     <string name="restore_failed_format" formatted="true">Falha em restaurar dados do arquivo %s</string>
     <string name="backup_success">Dados salvos com sucesso</string>
     <string name="backup_failed">Permissões de armazenamento faltando, por favor tente de novo</string>
     <string name="backup_failed_error_format">Erro no backup de %s</string>
-
     <string name="search">Procurar</string>
     <string name="category_account">Contas</string>
     <string name="category_updates">Atualizações e backup</string>
-    
     <string name="settings_info">Info</string>
     <string name="advanced_search">Procura Avançada</string>
     <string name="advanced_search_des">Mostrar resultados separados por fornecedor</string>
@@ -186,10 +156,8 @@
     <string name="show_fillers_settings">Mostrar episódios de Filler em anime</string>
     <string name="show_trailers_settings">Mostrar trailers</string>
     <string name="kitsu_settings">Mostrar posters do kitsu</string>
-	
-	<string name="pref_filter_search_quality">Esconder qualidades de vídeo selecionadas nos resultados da Pesquisa</string>
-	<string name="automatic_plugin_updates">Atualizações de plugin automáticas</string>
-
+    <string name="pref_filter_search_quality">Esconder qualidades de vídeo selecionadas nos resultados da Pesquisa</string>
+    <string name="automatic_plugin_updates">Atualizações de plugin automáticas</string>
     <string name="updates_settings">Mostrar atualizações do app</string>
     <string name="updates_settings_des">Automaticamente procurar por novas atualizações ao abrir</string>
     <string name="uprereleases_settings">Atualizar para pré-lançamento</string>
@@ -200,9 +168,7 @@
     <string name="discord">Junte-se ao Discord</string>
     <string name="benene">Dar um benene para os desenvolvedores</string>
     <string name="benene_des">Benene dada</string>
-
     <string name="app_language">Linguagem do App</string>
-
     <string name="no_chromecast_support_toast">Esse fornecedor não possui suporte para Chromecast</string>
     <string name="no_links_found_toast">Nenhum link encontrado</string>
     <string name="copy_link_toast">Link copiado para área de transferência</string>
@@ -211,7 +177,6 @@
     <string name="acra_report_toast">Desculpe, a aplicação travou. Um relatório de erro anônimo será enviado para os
        desenvolvedores
     </string>
-
     <string name="season">Temporada</string>
     <string name="no_season">Nenhuma Temporada</string>
     <string name="episode">Episódio</string>
@@ -219,7 +184,6 @@
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Nenhum Episódio encontrado</string>
-
     <string name="delete_file">Deletar Arquivo</string>
     <string name="delete">Deletar</string>
     <string name="pause">Pausar</string>
@@ -228,8 +192,6 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">Isso apagará %s permanentemente\nVocê tem certeza?</string>
     <string name="resume_time_left" formatted="true">%dm\nsobrando</string>
-
-
     <string name="status_ongoing">Em andamento</string>
     <string name="status_completed">Concluído</string>
     <string name="status">Estado</string>
@@ -238,15 +200,12 @@
     <string name="duration">Duração</string>
     <string name="site">Site</string>
     <string name="synopsis">Sinopse</string>
-
     <string name="queued">Na fila</string>
     <string name="no_subtitles">Sem Legendas</string>
     <string name="default_subtitles">Padrão</string>
-
     <string name="free_storage">Livre</string>
     <string name="used_storage">Usado</string>
     <string name="app_storage">App</string>
-
     <!--plural-->
     <string name="movies">Filmes</string>
     <string name="tv_series">Séries</string>
@@ -256,9 +215,8 @@
     <string name="documentaries">Documentários</string>
     <string name="ova">OVA</string>
     <string name="asian_drama">Dramas Asiáticos</string>
-	<string name="livestreams">Transmissões em Direto</string>
-	<string name="others">Outros</string>
-
+    <string name="livestreams">Transmissões em Direto</string>
+    <string name="others">Outros</string>
     <!--singular-->
     <string name="movies_singular">Filme</string>
     <string name="tv_series_singular">Série</string>
@@ -268,14 +226,12 @@
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Documentário</string>
     <string name="asian_drama_singular">Drama Asiático</string>
-	<string name="live_singular">Transmissão em Direto</string>
-
+    <string name="live_singular">Transmissão em Direto</string>
     <string name="source_error">Erro de fornecimento</string>
     <string name="remote_error">Erro remoto</string>
     <string name="render_error">Erro de renderização</string>
     <string name="unexpected_error">Erro de player inesperado</string>
     <string name="storage_error">Erro ao baixar, verifique as permissões de armazenamento</string>
-
     <string name="episode_action_chromecast_episode">Episódio pelo Chromecast</string>
     <string name="episode_action_chromecast_mirror">Alternativa pelo Chromecast</string>
     <string name="episode_action_play_in_app">Assistir no App</string>
@@ -286,53 +242,40 @@
     <string name="episode_action_download_mirror">Baixar por servidor alternativo</string>
     <string name="episode_action_reload_links">Recarregar links</string>
     <string name="episode_action_download_subtitle">Baixar legendas</string>
-
     <string name="show_hd">Etiqueta de qualidade</string>
     <string name="show_dub">Etiqueta Dub</string>
     <string name="show_sub">Etiqueta Sub</string>
     <string name="show_title">Título</string>
     <string name="poster_ui_settings">Alternar elementos da interface no pôster</string>
-
     <string name="no_update_found">Nenhuma Atualização encontrada</string>
     <string name="check_for_update">Procurar nova Atualização</string>
-
     <string name="video_lock">Bloquear</string>
     <string name="video_aspect_ratio_resize">Mudar Tamanho</string>
     <string name="video_source">Fonte</string>
     <string name="video_skip_op">Pular OP</string>
-
     <string name="dont_show_again">Não mostrar de novo</string>
     <string name="skip_update">Pular essa Atualização</string>
     <string name="update">Atualizar</string>
     <string name="watch_quality_pref">Qualidade preferida</string>
     <string name="limit_title">Máximo de caracteres do título de vídeos</string>
     <string name="limit_title_rez">Resolução do player de vídeo</string>
-
     <string name="video_buffer_size_settings">Tamanho do buffer do vídeo</string>
     <string name="video_buffer_length_settings">Comprimento do buffer do vídeo</string>
     <string name="video_buffer_disk_settings">Cache do vídeo em disco</string>
     <string name="video_buffer_clear_settings">Limpar cache de vídeo e imagem</string>
-
     <string name="video_ram_description">Causará travamentos aleatórios se definido muito alto. Não mude caso tiver pouca memória RAM, como um Android TV ou um telefone antigo</string>
     <string name="video_disk_description">Pode causar problemas em sistemas com pouco espaço de armazenamento se definido muito alto, como em dispositivos Android TV</string>
-
     <string name="dns_pref">DNS sobre HTTPS</string>
     <string name="dns_pref_summary">Útil para burlar bloqueios de provedores de internet</string>
-
     <string name="add_site_pref">Clonar site</string>
     <string name="remove_site_pref">Remover site</string>
     <string name="add_site_summary">Adiciona um clone de um site existente, com uma url diferente</string>
-
     <string name="download_path_pref">Caminho para Download</string>
-
     <string name="nginx_url_pref">Url do servidor Nginx</string>
-
     <string name="display_subbed_dubbed_settings">Mostrar Anime Dublado/Legendado</string>
-
     <string name="resize_fit">Ajustar para a Tela</string>
     <string name="resize_fill">Esticar</string>
     <string name="resize_zoom">Zoom</string>
-
     <string name="legal_notice">Aviso Legal</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
         should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
@@ -358,18 +301,14 @@
     <string name="preferred_media_settings">Mídia preferida</string>
     <string name="subtitles_encoding">Codificação das legendas</string>
     <string name="category_ui">Layout</string>
-
     <string name="automatic">Auto</string>
     <string name="tv_layout">Layout de TV</string>
     <string name="phone_layout">Layout de celular</string>
     <string name="emulator_layout">Layout de emulador</string>
-
     <string name="primary_color_settings">Cor principal</string>
     <string name="app_theme_settings">Tema do App</string>
     <string name="bottom_title_settings">Local do título do poster</string>
     <string name="bottom_title_settings_des">Coloca o título debaixo do poster</string>
-
-
     <!-- account stuff -->
     <string name="example_password">senha123</string>
     <string name="example_username">MeuNomeLegal</string>
@@ -378,7 +317,6 @@
     <string name="example_site_name">MeuSiteLegal</string>
     <string name="example_site_url">examplo.com</string>
     <string name="example_lang_name">Codigo da Língua (bp)</string>
-
     <!--
     <string name="mal_account_settings" translatable="false">MAL</string>
     <string name="anilist_account_settings" translatable="false">AniList</string>
@@ -403,7 +341,6 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s autenticado</string>
     <string name="authenticated_user_fail" formatted="true">Falha em autenticar para %s</string>
-
     <!-- ============ -->
     <string name="none">Nenhum</string>
     <string name="normal">Normal</string>
@@ -420,7 +357,6 @@
     <string name="subtitle_offset_extra_hint_later_format">Use isto se as legendas forem mostradas %dms adiantadas</string>
     <string name="subtitle_offset_extra_hint_before_format">Use isto se as legendas forem mostradas %dms atrasadas</string>
     <string name="subtitle_offset_extra_hint_none_format">Sem atraso de legenda</string>
-
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
     see: 
@@ -428,7 +364,6 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">Já fiz vinho com toque de kiwi para belga sexy.</string>
-
     <string name="recommended">Recomendada</string>
     <string name="player_loaded_subtitles" formatted="true">%s carregada</string>
     <string name="player_load_subtitles">Carregar de arquivo</string>
@@ -437,12 +372,9 @@
     <string name="actor_main">Protagonista</string>
     <string name="actor_supporting">Coadjuvante</string>
     <string name="actor_background">Figurante</string>
-
     <string name="home_source">Fonte</string>
     <string name="home_random">Aleatório</string>
-
     <string name="coming_soon">Em breve…</string>
-
     <string name="quality_cam">Cam</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
@@ -459,7 +391,6 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">Imagem de Poster</string>
     <string name="category_player">Player</string>
     <string name="resolution_and_title">Resolução e título</string>
@@ -467,19 +398,17 @@
     <string name="resolution">Resolução</string>
     <string name="error_invalid_id">Id invalida</string>
     <string name="error_invalid_data">Dado invalido</string>
-<string name="error_invalid_url">URL invalido</string>
+    <string name="error_invalid_url">URL invalido</string>
     <string name="error">Erro</string>
     <string name="subtitles_remove_captions">Remover legendas ocultas(CC) das legendas</string>
     <string name="subtitles_remove_bloat">Remover bloat das legendas</string>
-<string name="subtitles_filter_lang">Filtrar por linguagem preferida</string>
+    <string name="subtitles_filter_lang">Filtrar por linguagem preferida</string>
     <string name="extras">Extras</string>
     <string name="trailer">Trailer</string>
-
-<string name="next">Próximo</string>
+    <string name="next">Próximo</string>
     <string name="provider_languages_tip">Ver vídeos nestas linguagens</string>
     <string name="previous">Anterior</string>
     <string name="skip_setup">Saltar setup</string>
-
     <string name="app_layout_subtext">Change the look of the app to suit your device</string>
     <string name="crash_reporting_title">Crash reporting</string>
     <string name="preferred_media_subtext">What do you want to see</string>
@@ -491,7 +420,6 @@
     <string name="plugin_loaded">Plugin Carregado</string>
     <string name="plugin_deleted">Plugin Apagado</string>
     <string name="plugin_load_fail" formatted="true">Falha ao carregar %s</string>
-
     <string name="batch_download_start_format" formatted="true">Iniciada a transferência %d %s</string>
     <string name="batch_download_finish_format" formatted="true">Transferido %d %s com sucesso</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Tudo %s já transferido</string>
@@ -508,13 +436,10 @@
     <string name="view_public_repositories_button">Ver repositórios da comunidade</string>
     <string name="view_public_repositories_button_short">Lista pública</string>
     <string name="uppercase_all_subtitles">Todas as legendas em maiúsculas</string>
-
     <string name="download_all_plugins_from_repo">Transferir todos os plugins deste repositório?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Desativado)</string>
-
-<string name="autoplay_next_settings">Reproduzir automaticamente próximo episódio</string>
+    <string name="autoplay_next_settings">Reproduzir automaticamente próximo episódio</string>
     <string name="autoplay_next_settings_des">Começa o próximo episódio quando o atual termina</string>
-
-<string name="enable_nsfw_on_providers">Ativar NSFW em fornecedores compatíveis</string>
-<string name="category_providers">Fornecedores</string>
-</resources>
+    <string name="enable_nsfw_on_providers">Ativar NSFW em fornecedores compatíveis</string>
+    <string name="category_providers">Fornecedores</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 9e00f17b..3970014b 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1,11 +1,9 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- KEYS DON'T TRANSLATE -->
-
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Hrají: %s</string>
-
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
@@ -15,23 +13,19 @@
     <string name="go_back_img_des">Go back</string>
     <string name="home_change_provider_img_des">Change Provider</string>
     <string name="preview_background_img_des">Preview Background</string>
-
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Rychlost (%.2fx)</string>
     <string name="rated_format" formatted="true">Hodnocení: %.1f</string>
-    <string name="new_update_format" formatted="true">Nalezena nová aktualizace!\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">Nalezena nová aktualizace!\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Výplň</string>
     <string name="duration_format" formatted="true">%d min</string>
-
     <string name="app_name">CloudStream</string>
     <string name="title_home">Domů</string>
     <string name="title_search">Hledat</string>
     <string name="title_downloads">Stahování</string>
     <string name="title_settings">Nastavení</string>
-
     <string name="search_hint">Hledat…</string>
     <string name="search_hint_site" formatted="true">Hledat %s…</string>
-
     <string name="no_data">Žádná data</string>
     <string name="episode_more_options_des">Další možnosti</string>
     <string name="next_episode">Další epizoda</string>
@@ -40,7 +34,6 @@
     <string name="result_open_in_browser">Otevřít v prohlížeči</string>
     <string name="skip_loading">Přeskočit načítání</string>
     <string name="loading">Načítání…</string>
-
     <string name="type_watching">Sledování</string>
     <string name="type_on_hold">Pozastaveno</string>
     <string name="type_completed">Dokončeno</string>
@@ -48,7 +41,6 @@
     <string name="type_plan_to_watch">Plánuji sledovat</string>
     <string name="type_none">Žádné</string>
     <string name="type_re_watching">Opětovné sledování</string>
-
     <string name="play_movie_button">Přehrát film</string>
     <string name="play_torrent_button">Streamovat torrent</string>
     <string name="pick_source">Zdroje</string>
@@ -57,7 +49,6 @@
     <string name="go_back">Návrat zpět</string>
     <string name="play_episode">Přehrát epizodu</string>
     <!--<string name="need_storage">Umožnit stahování epizod</string>-->
-
     <string name="download">Stáhnout</string>
     <string name="downloaded">Stáhnuto</string>
     <string name="downloading">Stahování</string>
@@ -66,18 +57,14 @@
     <string name="download_failed">Stahování selhalo</string>
     <string name="download_canceled">Stahování zrušeno</string>
     <string name="download_done">Stahování dokončeno</string>
-
     <string name="error_loading_links_toast">Chyba při načítání odkazů</string>
     <string name="download_storage_text">Interní úložiště</string>
-
     <string name="app_dubbed_text">Dab</string>
     <string name="app_subbed_text">Tit</string>
-
     <string name="popup_delete_file">Smazat soubor</string>
     <string name="popup_play_file">Přehrát soubor</string>
     <string name="popup_resume_download">Pokračovat ve stahování</string>
     <string name="popup_pause_download">Pozastavit stahování</string>
-
     <string name="pref_disable_acra">Zakázat automatické nahlašování chyb</string>
     <string name="home_more_info">Více informací</string>
     <string name="home_expanded_hide">Skrýt</string>
@@ -93,9 +80,7 @@
     <string name="sort_close">Zavřít</string>
     <string name="sort_clear">Vymazat</string>
     <string name="sort_save">Uložit</string>
-
     <string name="player_speed">Rychlost přehrávání</string>
-
     <string name="subtitles_settings">Nastavení titulků</string>
     <string name="subs_text_color">Barva texta</string>
     <string name="subs_outline_color">Barva ohraničení</string>
@@ -105,35 +90,26 @@
     <string name="subs_subtitle_elevation">Zvýšení titulků</string>
     <string name="subs_font">Písmo</string>
     <string name="subs_font_size">Velikost písma</string>
-
     <string name="search_provider_text_providers">Hledat pomocí poskytovatelů</string>
     <string name="search_provider_text_types">Hledat pomocí typů</string>
-
     <string name="benene_count_text">%d benénů darováno vývojářům</string>
     <string name="benene_count_text_none">Nedarovali jste žádné benény</string>
-
     <string name="subs_auto_select_language">Automaticky vybrat jazyk</string>
     <string name="subs_download_languages">Stáhnout jazyky</string>
     <string name="subs_subtitle_languages">Jazyk titulků</string>
     <string name="subs_hold_to_reset_to_default">Podržte pro obnovení na výchozí</string>
     <string name="subs_import_text" formatted="true">Importovat písma umístěním jich do %s</string>
     <string name="continue_watching">Pokračovat ve sledování</string>
-
     <string name="action_remove_watching">Odebrat</string>
     <string name="action_open_watching">Další informace</string>
     <string name="action_open_play">@string/home_play </string>
-
     <string name="vpn_might_be_needed">Aby tento poskytovatel fungoval správně, budete možná potřebovat VPN</string>
     <string name="vpn_torrent">Tento poskytovatel je torrent, je doporučená VPN</string>
-
     <string name="provider_info_meta">Web neposkytnul žádná metadata, načítání videa selže, pokud na webu neexistuje.</string>
-
     <string name="torrent_plot">Popis</string>
     <string name="normal_no_plot">Příběh nenalezen</string>
     <string name="torrent_no_plot">Popis nenalezen</string>
-
-    <string name="show_log_cat">Zobrazit logcat 🐈</string>
-
+    <string name="show_log_cat">Zobrazit Logcat 🐈</string>
     <string name="picture_in_picture">Obraz v obraze</string>
     <string name="picture_in_picture_des">Přehrávání bude pokračovat v miniaturním přehrávači na vrchu ostatních aplikací</string>
     <string name="player_size_settings">Tlačítko pro změnu velikosti přehrávače</string>
@@ -142,7 +118,6 @@
     <string name="player_subtitles_settings_des">Nastavení titulků přehrávače</string>
     <string name="chromecast_subtitles_settings">Titulky Chromecastu</string>
     <string name="chromecast_subtitles_settings_des">Natavení titulků Chromecastu</string>
-
     <string name="eigengraumode_settings">Rychlostní režim</string>
     <string name="eigengraumode_settings_des">Přidá do přehrávače možnost rychlosti</string>
     <string name="swipe_to_seek_settings">Přejet pro posun</string>
@@ -159,23 +134,18 @@
     <string name="use_system_brightness_settings_des">V přehrávači použít systémov
         překrytí
     </string>
-
     <string name="episode_sync_settings">Aktualizovat postup sledování</string>
     <string name="episode_sync_settings_des">Automaticky synchronizovat postup sledování současné epizody</string>
-
     <string name="restore_settings">Obnovit data ze zálohy</string>
-
     <string name="backup_settings">Zálohovat data</string>
     <string name="restore_success">Načten soubor zálohy</string>
     <string name="restore_failed_format" formatted="true">Nepodařilo se obnovit data ze soubory %s</string>
     <string name="backup_success">Data úspěšně uložena</string>
     <string name="backup_failed">Chybí oprávnění k úložišti, zkuste to prosím znovu</string>
     <string name="backup_failed_error_format">Chyba při zálohování %s</string>
-
     <string name="search">Search</string>
     <string name="category_account">Účty</string>
     <string name="category_updates">Aktualizace a záloha</string>
-    
     <string name="settings_info">Informace</string>
     <string name="advanced_search">Pokročilé hledání</string>
     <string name="advanced_search_des">Zobrazí vám výsledky hledání oddělené poskytovatelem</string>
@@ -192,9 +162,7 @@
     <string name="discord">Připojte se na Discord</string>
     <string name="benene">Darujte benén vývojářům</string>
     <string name="benene_des">Benén darován</string>
-
     <string name="app_language">Jazyk aplikace</string>
-
     <string name="no_chromecast_support_toast">Tento poskytovatel nemá podporu pro Chromecast</string>
     <string name="no_links_found_toast">Nenalezeny žádné odkazy</string>
     <string name="copy_link_toast">Odkaz zkopírován do schránky</string>
@@ -203,7 +171,6 @@
     <string name="acra_report_toast">Omlouváme se, aplikace spadla. Vývojářům bude odesláno anonymní hlášení
         o pádu
     </string>
-
     <string name="season">Sezóna</string>
     <string name="no_season">Žádná sezóna</string>
     <string name="episode">Epizoda</string>
@@ -211,7 +178,6 @@
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Nenalezeny žádné epizody</string>
-
     <string name="delete_file">Smazat soubor</string>
     <string name="delete">Smazat</string>
     <string name="pause">Pozastavit</string>
@@ -220,8 +186,6 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">Toto nevratně smaže %s\nJste si jisti?</string>
     <string name="resume_time_left" formatted="true">%dm\nzbývá</string>
-
-
     <string name="status_ongoing">Probíhající</string>
     <string name="status_completed">Dokončena</string>
     <string name="status">Stav</string>
@@ -230,15 +194,12 @@
     <string name="duration">Trvání</string>
     <string name="site">Místo</string>
     <string name="synopsis">Synopse</string>
-
     <string name="queued">ve frontě</string>
     <string name="no_subtitles">Žádné titulky</string>
     <string name="default_subtitles">Výchozí</string>
-
     <string name="free_storage">Volné</string>
     <string name="used_storage">Použito</string>
     <string name="app_storage">Aplikace</string>
-
     <!--plural-->
     <string name="movies">Filmy</string>
     <string name="tv_series">Seriály</string>
@@ -248,7 +209,6 @@
     <string name="documentaries">Dokumenty</string>
     <string name="ova">OVA</string>
     <string name="asian_drama">Asijská dramata</string>
-
     <!--singular-->
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Seriál</string>
@@ -258,13 +218,11 @@
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Dokument</string>
     <string name="asian_drama_singular">Asijské drama</string>
-
     <string name="source_error">Chyba zdroje</string>
     <string name="remote_error">Chyba vzdáleného zdroje</string>
     <string name="render_error">Chyba vykreslování</string>
     <string name="unexpected_error">Neočekávaná chyba přehrávače</string>
     <string name="storage_error">Chyba stahování, zkontrolujte oprávnění úložiště</string>
-
     <string name="episode_action_chromecast_episode">Chromecastovat epizodu</string>
     <string name="episode_action_chromecast_mirror">Chromecast jako zrcadlo</string>
     <string name="episode_action_play_in_app">Přehrát v aplikace</string>
@@ -275,49 +233,37 @@
     <string name="episode_action_download_mirror">Zrcadlo stahování</string>
     <string name="episode_action_reload_links">Obnovit odkazy</string>
     <string name="episode_action_download_subtitle">Stáhnout titulky</string>
-
     <string name="show_hd">Štítek s kvalitou</string>
     <string name="show_dub">Štítek dabingu</string>
     <string name="show_sub">Štítek titulků</string>
     <string name="show_title">Název</string>
     <string name="poster_ui_settings">Přepnout prvky UI na plakátu</string>
-
     <string name="no_update_found">Nenalezeny žádné aktualizace</string>
     <string name="check_for_update">Zkontrolovat aktualizace</string>
-
     <string name="video_lock">Uzamknout</string>
     <string name="video_aspect_ratio_resize">Změnit velikost</string>
     <string name="video_source">Zdroj</string>
     <string name="video_skip_op">Přeskočit OP</string>
-
     <string name="dont_show_again">Již nezobrazovat</string>
     <string name="skip_update">Přeskočit tuto aktualizace</string>
     <string name="update">Aktualizovat</string>
     <string name="watch_quality_pref">Upřednostněná kvalita sledování</string>
     <string name="limit_title">Maximální počet znaků v názvu přehrávače</string>
     <string name="limit_title_rez">Rozlišení přehrávače</string>
-
     <string name="video_buffer_size_settings">Velikost vyrovnávací paměti videa</string>
     <string name="video_buffer_length_settings">Délka vyrovnávací paměti videa</string>
     <string name="video_buffer_disk_settings">Mezipaměť videa na disku</string>
     <string name="video_buffer_clear_settings">Vymazat mezipamět videí a obrázků</string>
-
     <string name="video_ram_description">Při nastavení příliš vysoké hodnoty způsobí náhodné pády. Neměňte, pokud máte málo paměti RAM, například u televize s Androidem nebo starého telefonu.</string>
     <string name="video_disk_description">Pokud ji nastavíte příliš vysoko, může způsobit problémy v systémech s malým úložným prostorem, například v zařízeních Android TV.</string>
-
     <string name="dns_pref">DNS přes HTTPS</string>
     <string name="dns_pref_summary">Užitečné pro obcházení blokací ISP</string>
-
     <string name="download_path_pref">Cesta stahování</string>
-
     <string name="nginx_url_pref">URL serveru Nginx</string>
-
     <string name="display_subbed_dubbed_settings">Zobrazit dabované anime/anime s titulky</string>
-
     <string name="resize_fit">Vyplnit na obrazovku</string>
     <string name="resize_fill">Roztáhnout</string>
     <string name="resize_zoom">Přiblížit</string>
-
     <string name="legal_notice">Odmítnutí odpovědnosti</string>
     <string name="legal_notice_text" translatable="false">Jakékoli právní otázky týkající se obsahu této aplikace
         je třeba řešit se samotnými hostiteli a poskytovateli souborů, protože s nimi nejsme nijak spojeni.
@@ -343,24 +289,19 @@
     <string name="preferred_media_settings">Preferovaná média</string>
     <string name="subtitles_encoding">Kódování titulků</string>
     <string name="category_ui">Rozložení</string>
-
     <string name="automatic">Automaticky</string>
     <string name="tv_layout">TV rozložení</string>
     <string name="phone_layout">Mobilní rozložení</string>
     <string name="emulator_layout">Rozložení emulátoru</string>
-
     <string name="primary_color_settings">Primární barva</string>
     <string name="app_theme_settings">Motiv aplikace</string>
     <string name="bottom_title_settings">Umístění názvu plakátu</string>
     <string name="bottom_title_settings_des">Umístit název pod plakát</string>
-
-
     <!-- account stuff -->
     <string name="example_password">heslo123</string>
     <string name="example_username">MojeSuperJmeno</string>
     <string name="example_email">ahoj@svete.cz</string>
     <string name="example_ip">127.0.0.1</string>
-
     <!--
     <string name="mal_account_settings" translatable="false">MAL</string>
     <string name="anilist_account_settings" translatable="false">AniList</string>
@@ -385,7 +326,6 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">Přihlášeno k %s</string>
     <string name="authenticated_user_fail" formatted="true">Nepodařilo se přihlásit k %s</string>
-
     <!-- ============ -->
     <string name="none">Žádné</string>
     <string name="normal">Normální</string>
@@ -402,7 +342,6 @@
     <string name="subtitle_offset_extra_hint_later_format">Toto použijte, pokud jsou titulky zobrazeny o %dms dříve</string>
     <string name="subtitle_offset_extra_hint_before_format">Toto použijte, pokud jsou titulky zobrazeny o %dms později</string>
     <string name="subtitle_offset_extra_hint_none_format">Žádné zpoždění titulků</string>
-
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
     see: 
@@ -410,7 +349,6 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">Příliš žluťoučký kůň úpěl ďábelské ódy</string>
-
     <string name="recommended">Doporučeno</string>
     <string name="player_loaded_subtitles" formatted="true">Načteno %s</string>
     <string name="player_load_subtitles">Načíst ze souboru</string>
@@ -419,12 +357,9 @@
     <string name="actor_main">Hlavní</string>
     <string name="actor_supporting">Podpora</string>
     <string name="actor_background">Pozadí</string>
-
     <string name="home_source">Zdroj</string>
     <string name="home_random">Náhodný</string>
-
     <string name="coming_soon">Již brzy…</string>
-
     <string name="quality_cam">Kam</string>
     <string name="quality_cam_rip">Kam</string>
     <string name="quality_cam_hd">Kam</string>
@@ -441,7 +376,6 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">Obrázek plakátu</string>
     <string name="category_player">Přehrávač</string>
     <string name="resolution_and_title">Rozlišení a název</string>
@@ -451,4 +385,4 @@
     <string name="subtitles_remove_captions">Odstranit skryté titulky z titulků</string>
     <string name="subtitles_remove_bloat">Odstranit nadbytečné titulky</string>
     <string name="extras">Extra</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 11b74938..0604c109 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,5 +1,5 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Αρχική</string>
     <string name="title_search">Αναζήτηση</string>
@@ -18,14 +18,12 @@
     <string name="result_open_in_browser">Άνοιγμα στον περιηγητή</string>
     <string name="skip_loading">Παράλειψη φόρτωσης</string>
     <string name="loading">Φόρτωση…</string>
-
     <string name="type_watching">Παρακολούθηση</string>
     <string name="type_on_hold">Σε αναμονή</string>
     <string name="type_completed">Ολοκληρώθηκε</string>
     <string name="type_dropped">Διακόπηκε</string>
     <string name="type_plan_to_watch">Για παρακολούθηση</string>
     <string name="type_none">Τίποτα</string>
-
     <string name="play_movie_button">Αναπαραγωγή Ταινίας</string>
     <string name="play_torrent_button">Μετάδοση Torrent</string>
     <string name="pick_source">Πηγές</string>
@@ -39,18 +37,15 @@
     <string name="error_loading_links_toast">Σφάλμα φόρτωσης συνδέσμων</string>
     <string name="download_storage_text">Εσωτερικός χώρος αποθήκευσης</string>
     <!--<string name="options">Επιλογές</string>-->
-
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Sub</string>
-
     <string name="popup_delete_file">Διαγραφή Αρχείου</string>
     <string name="popup_play_file">Αναπαραγωγή Αρχείου</string>
     <string name="popup_resume_download">Συνέχιση Λήψης</string>
     <string name="popup_pause_download">Παύση Λήψης</string>
-
     <string name="acra_report_toast">Λυπούμαστε, η εφαρμογή κατέρρευσε. Μια ανώνυμη αναφορά σφαλμάτων θα σταλεί στους προγραμματιστές</string>
     <string name="pref_disable_acra">Απενεργοποιήστε την αυτόματη αναφορά σφαλμάτων</string>
-    <string name="show_log_cat">Εμφάνιση logcat 🐈</string>
+    <string name="show_log_cat">Εμφάνιση Logcat 🐈</string>
     <string name="home_more_info">Παραπάνω πληροφορίες</string>
     <string name="home_expanded_hide">Απόκρυψη</string>
     <string name="home_main_poster_img_des">Κύριο Πόστερ</string>
@@ -79,21 +74,17 @@
     <string name="search_provider_text_types">Αναζήτηση βάσει τύπων</string>
     <string name="benene_count_text">%d μπανάνες δόθηκαν στους προγραμματιστές</string>
     <string name="benene_count_text_none">Καμία μπανάνα δεν δόθηκε</string>
-
     <string name="subs_auto_select_language">Αυτόματη επιλογή γλώσσας</string>
     <string name="subs_download_languages">Λήψη γλωσσών</string>
     <string name="subs_hold_to_reset_to_default">Κρατήστε πατημένο για επαναφορά στις προεπιλεγμένες τιμές</string>
     <string name="continue_watching">Συνέχεια Παρακολούθησης</string>
-
     <string name="action_remove_watching">Αφαίρεση</string>
     <string name="action_open_watching">Επιπλέον Πληροφορίες</string>
-
     <string name="vpn_might_be_needed">Η χρήση ενός VPN ίσως χρειαστεί για την ομαλή λειτουργία του τρέχοντος παρόχου</string>
     <string name="vpn_torrent">Πρόκειται για torrent, η χρήση ενός VPN συνιστάται</string>
     <string name="torrent_plot">Περιγραφή</string>
     <string name="normal_no_plot">Δεν βρέθηκε περιγραφή</string>
     <string name="torrent_no_plot">Δεν βρέθηκε περιγραφή</string>
-    
     <string name="picture_in_picture">Εικόνα-σε-Εικόνα</string>
     <string name="picture_in_picture_des">Συνεχίζει την αναπαραγωγή σε ένα μίνι παράθυρο πάνω από άλλες εφαρμογές</string>
     <string name="player_size_settings">Αλλαγή μεγέθους παραθύρου</string>
@@ -126,42 +117,32 @@
     <string name="discord">Εγγραφείτε στο Discord</string>
     <string name="benene">Δώστε μπανάνα στους προγραμματιστές</string>
     <string name="benene_des">Μπανάνα δόθηκε δώθηκε</string>
-    
     <string name="player_speed_text_format" formatted="true">Ταχύτητα (%.2fx)</string>
     <string name="rated_format" formatted="true">Βαθμολογία: %.1f</string>
-    <string name="new_update_format" formatted="true">Νέα ενημέρωση διαθέσιμη!\n%s -> %s</string>
-    
+    <string name="new_update_format" formatted="true">Νέα ενημέρωση διαθέσιμη!\n%s -&gt; %s</string>
     <string name="double_tap_to_pause_settings_des">Πάτημα στη μέση για παύση</string>
     <string name="use_system_brightness_settings">Χρήση φωτεινότητας συστήματος</string>
     <string name="use_system_brightness_settings_des">Χρήση φωτεινότητας συστήματος στο ενσωματωμένο πρόγραμμα αναπαραγωγής αντί να εφαρμοστεί το προεπιλεγμένο σκούρο επικάλυμμα
     </string>
-
     <string name="episode_sync_settings">Ενημέρωση προόδου παρακολούθησης</string>
     <string name="episode_sync_settings_des">Αυτόματος συγχρονισμός της προόδου του τρέχοντος επεισοδίου</string>
-
     <string name="restore_settings">Επαναφορά δεδομένων από αντίγραφο ασφαλείας</string>
-
     <string name="backup_settings">Αντίγραφα ασφαλείας</string>
     <string name="restore_success">Τα αντίγραφα ασφαλείας φορτώθηκαν</string>
     <string name="restore_failed_format" formatted="true">Η επαναφορά αντιγράφων ασφαλαείας απέτυχε από το αρχείο %s</string>
     <string name="backup_success">Επιτυχής αποθήκευση δεδομένων</string>
     <string name="backup_failed">Δεν έχει δοθεί άδεια για πρόσβαση στον αποθηκευτικό χώρο, προσπαθήστε ξανά</string>
     <string name="backup_failed_error_format">Σφάλμα δημιουργίας αντιγράφων ασφαλείας %s</string>
-
     <string name="category_account">Λογαριασμοί</string>
     <string name="category_updates">Ενημερώσεις και αντίγραφα ασφαλείας</string>
-
     <string name="show_fillers_settings">Εμφάνιση filler επεισοδίου για anime</string>
     <string name="show_trailers_settings">Εμφάνιση trailers</string>
     <string name="kitsu_settings">Εμφάνιση posters από kitsu</string>
     <string name="pref_filter_search_quality">Απόκρυψη επιλεγμένης ποιότητας βίντεο στα αποτελέσματα αναζήτησης</string>
-    
     <string name="app_language">App Language</string>
-
     <string name="no_chromecast_support_toast">Αυτός ο πάροχος δεν έχει υποστήριξη Chromecast</string>
     <string name="no_links_found_toast">Δεν βρέθηκαν διαθέσιμοι σύνδεσμοι</string>
     <string name="copy_link_toast">Ο σύνδεσμος αντιγράφηκε στο πρόχειρο</string>
-    
     <string name="season">Season</string>
     <string name="season_format">%s %d%s</string>
     <string name="no_season">No Season</string>
@@ -172,29 +153,24 @@
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">No Episodes found</string>
-
     <string name="delete_file">Διαγραφή αρχείου</string>
     <string name="delete">Διαγραφή</string>
     <string name="pause">Πάυση</string>
     <string name="resume">Συνέχιση</string>
     <string name="delete_message" formatted="true">Αυτό θα διαγράψει μόνιμα το %s\nΕπιβεβαίωση;</string>
     <string name="resume_time_left" formatted="true">%dm\nαπομένουν</string>
-    
     <string name="status_ongoing">Σε εξέλιξη</string>
     <string name="status">Κατάσταση</string>
     <string name="year">Έτος</string>
     <string name="duration">Διάρκεια</string>
     <string name="site">Ιστότοπος</string>
     <string name="synopsis">Περίληψη</string>
-
     <string name="queued">προστέθηκε στην ουρά</string>
     <string name="no_subtitles">Δεν υπάρχουν διαθέσιμοι υπότιτλοι</string>
     <string name="default_subtitles">Προεπιλεγμένοι υπότιτλοι</string>
-    
     <string name="free_storage">Ελέυθερος</string>
     <string name="used_storage">Σε χρήση</string>
     <string name="app_storage">Εφαρμογή</string>
-
     <string name="movies">Ταινίες</string>
     <string name="tv_series">Τηλεοπτικές Σειρές</string>
     <string name="cartoons">Κινούμενα σχέδια</string>
@@ -203,7 +179,6 @@
     <string name="asian_drama">Ασιατικά Δράμα</string>
     <string name="livestreams">Ζωντανές ροές</string>
     <string name="others">Άλλα</string>
-    
     <string name="movies_singular">Ταινία</string>
     <string name="tv_series_singular">Σειρά</string>
     <string name="cartoons_singular">Cartoon</string>
@@ -211,13 +186,11 @@
     <string name="asian_drama_singular">Ασιατικό Δράμα</string>
     <string name="live_singular">Ζωντανή ροή</string>
     <string name="other_singular">Άλλο</string>
-    
     <string name="source_error">Σφάλμα πηγής</string>
     <string name="remote_error">Απομακρυσμένο σφάλμα</string>
     <string name="render_error">Σφάλμα απόδοσης</string>
     <string name="unexpected_error">Μη αναμενόμενο σφάλμα αναπαραγωγής</string>
     <string name="storage_error">Σφάλμα λήψης, επιβεβαιώστε ότι η άδεια αποθήκευσης είναι ενεργοποιημένη</string>
-
     <string name="episode_action_chromecast_episode">Chromecast επεισόδο</string>
     <string name="episode_action_play_in_app">Αναπαραγωγή εντός της εφαρμογής</string>
     <string name="episode_action_play_in_format">Αναπαραγωγή σε %s</string>
@@ -227,49 +200,37 @@
     <string name="episode_action_download_mirror">Λήψη mirror</string>
     <string name="episode_action_reload_links">Επαναφόρτωση συνδέσμων</string>
     <string name="episode_action_download_subtitle">Λήψη υποτίτλων</string>
-    
     <string name="show_hd">Ποιότητα</string>
     <string name="show_dub">Dub</string>
     <string name="show_sub">Sub</string>
     <string name="show_title">Τίτλος</string>
     <string name="poster_ui_settings">Εναλλαγή των στοιχείων UI στο poster</string>
-
     <string name="video_lock">Κλείδωμα</string>
     <string name="video_aspect_ratio_resize">Αλλαγή μεγέθους</string>
     <string name="video_source">Πηγή</string>
     <string name="video_skip_op">Παράλειψη OP</string>
-    
     <string name="dont_show_again">Να μην εμφανιστεί ξανά</string>
     <string name="skip_update">Παράλειψη της τρέχουσας ενημέρωσης</string>
     <string name="update">Ενημέρωση</string>
     <string name="watch_quality_pref">Προτίμηση ποιότητας παρακολούθησης</string>
     <string name="limit_title">Μέγιστοι χαρακτήρες για τίτλο</string>
     <string name="limit_title_rez">Ανάλυση αναπαραγωγής βίντεο</string>
-
     <string name="video_buffer_size_settings">Μέγεθος buffer βίντεο</string>
     <string name="video_buffer_length_settings">Μήκος buffer βίντεο</string>
     <string name="video_buffer_disk_settings">Προσωρινή μνήμη βίντεο στο δίσκο</string>
     <string name="video_buffer_clear_settings">Εκκαθάριση προσωρινής μνήμης βίντεο και εικόνων</string>
-
     <string name="video_ram_description">Θα προκαλέσει τυχαία σφάλματα εάν οριστεί πολύ ψηλά. Μην το αλλάξετε εάν έχετε χαμηλή ποσότητα μνήμης ram, όπως σε Android TV ή παλιό τηλέφωνο</string>
     <string name="video_disk_description">Μπορεί να προκαλέσει προβλήματα σε συστήματα με χαμηλό αποθηκευτικό χώρο, όπως σε συσκευές Android TV, εάν τον ρυθμίσετε πολύ ψηλά</string>
-
     <string name="dns_pref_summary">Χρήσιμο για παράκαμψη μπλοκ ISP</string>
-
     <string name="add_site_pref">Αντίγραφο ιστοτόπου</string>
     <string name="remove_site_pref">Αφαίρεση ιστοτόπου</string>
     <string name="add_site_summary">Προσθήκη αντιγράφου ενός υπάρχοντος ιστοτόπου, με έναν διαφορετικό σύνδεσμο</string>
-
     <string name="download_path_pref">Διαδρομή λήψης</string>
-
     <string name="display_subbed_dubbed_settings">Εμφάνιση Dubbed/Subbed Anime</string>
-
     <string name="resize_fit">Προσαρμογή στην οθόνη</string>
     <string name="resize_fill">Τέντωμα</string>
     <string name="resize_zoom">Μεγέθυνση</string>
-    
     <string name="legal_notice">Αποποίηση ευθυνών</string>
-    
     <string name="category_general">Γενικά</string>
     <string name="random_button_settings">Τυχαίο κουμπί</string>
     <string name="random_button_settings_desc">Εμφάνιση τυχαίου κουμπιού στην Αρχική οθόνη</string>
@@ -280,19 +241,15 @@
     <string name="subtitles_encoding">Κωδικοποίηση υποτίτλων</string>
     <string name="category_providers">Πάροχοι</string>
     <string name="category_ui">Διάταξη</string>
-    
     <string name="automatic">Αυτόματο</string>
     <string name="tv_layout">Διάταξη TV</string>
     <string name="phone_layout">Διάταξη τηλεφώνου</string>
     <string name="emulator_layout">Διάταξη emulator</string>
-
     <string name="primary_color_settings">Πρωτεύον χρώμα</string>
     <string name="app_theme_settings">Θέμα εφαρμογής</string>
     <string name="bottom_title_settings">Τοποθεσία τίτλου Poster</string>
     <string name="bottom_title_settings_des">Τοποθετήστε τον τίτλο κάτω από το poster</string>
-    
     <string name="example_lang_name">Κωδικός γλώσσας (el)</string>
-
     <string name="account">Λογαριασμός</string>
     <string name="logout">Αποσύνδεση</string>
     <string name="login">Σύνδεση</string>
@@ -305,7 +262,6 @@
     <string name="sync_score">Βαθμολογήθηκε</string>
     <string name="authenticated_user" formatted="true">Πιστοποιήθηκε %s</string>
     <string name="authenticated_user_fail" formatted="true">Αποτυχία πιστοποίησης σε %s</string>
-    
     <string name="none">Τίποτα</string>
     <string name="normal">Κανονικά</string>
     <string name="all">Όλα</string>
@@ -321,7 +277,6 @@
     <string name="subtitle_offset_extra_hint_later_format">Χρησιμοποιήστε αυτό αν οι υπότιτλοι εμφανίζονται %dms πολύ νωρίς</string>
     <string name="subtitle_offset_extra_hint_before_format">Χρησιμοποιήστε αυτό αν οι υπότιτλοι εμφανίζονται %dms πολύ αργά</string>
     <string name="subtitle_offset_extra_hint_none_format">Καμία καθυστέρηση υποτίτλων</string>
-
     <string name="recommended">Συνιστώμενο</string>
     <string name="player_loaded_subtitles" formatted="true">Φόρτωση %s</string>
     <string name="player_load_subtitles">Φόρτωση από αρχείο</string>
@@ -330,13 +285,9 @@
     <string name="actor_main">Κύριο</string>
     <string name="actor_supporting">Υποστηρίζεται</string>
     <string name="actor_background">Φόντο</string>
-
     <string name="home_source">Πηγή</string>
     <string name="home_random">Τυχαίο</string>
-
     <string name="coming_soon">Έρχεται σύντομα…</string>
-    
-    
     <string name="poster_image">Εικόνα Poster</string>
     <string name="category_player">Πρόγραμμα αναπαραγωγής</string>
     <string name="resolution_and_title">Ανάλυση και τίτλος</string>
@@ -369,7 +320,7 @@
     <string name="plugin_deleted">Το πρόσθετο διαγράφηκε</string>
     <string name="plugin_load_fail" formatted="true">Απέτυχε να φορτωθεί το %s</string>
     <string name="batch_download_start_format" formatted="true">Ξεκίνησε η λήψη %d %s</string>
-        <string name="batch_download_finish_format" formatted="true">Κατέβηκε το %d %s επιτυχώς</string>
+    <string name="batch_download_finish_format" formatted="true">Κατέβηκε το %d %s επιτυχώς</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Όλα τα %s έχουν ήδη κατέβει</string>
     <string name="batch_download">Μαζική λήψη</string>
     <string name="plugin_singular">Πρόσθετο</string>
@@ -385,18 +336,15 @@
     <string name="view_public_repositories_button">Προβολή αποθετηρίων κοινότητας</string>
     <string name="view_public_repositories_button_short">Δημόσια λίστα</string>
     <string name="uppercase_all_subtitles">Κεφαλοποίηση υποτίτλων</string>
-    
     <string name="download_all_plugins_from_repo">Λήψη όλων των προσθέτων από αυτό το αποθετήριο;</string>
     <string name="single_plugin_disabled" formatted="true">%s (Απενεργοποιήθηκε)</string>
     <string name="tracks">Κομμάτια</string>
     <string name="audio_tracks">Ηχητικά κομμάτια</string>
     <string name="video_tracks">Κομμάτια βίντεο</string>
     <string name="apply_on_restart">Εφαρμογή στην επανεκκίνηση</string>
-
     <string name="safe_mode_title">Η ασφαλής λειτουργία ενεργοποιήθηκε</string>
     <string name="safe_mode_description">Ένα μη αντιστρέψιμο σφάλμα συνέβη και απενεργοποιήσαμε όλα τα πρόσθετα, ώστε να μπορέσετε να διαπιστώσετε ποιο πρόσθετο προκάλεσε αυτή τη κατάρρευση.</string>
     <string name="safe_mode_crash_info">Προβολή πληροφορίας κατάρρευσης</string>
-
     <string name="extension_rating" formatted="true">Βαθμολογία: %s</string>
     <string name="extension_description">Περιγραφή</string>
     <string name="extension_version">Έκδοση</string>
@@ -406,9 +354,7 @@
     <string name="extension_types">Υποστηρίζονται</string>
     <string name="extension_language">Γλώσσα</string>
     <string name="extension_install_first">Εγκατάσταση προσθέτου πρώτα</string>
-
     <string name="hls_playlist">HLS Playlist</string>
-
     <string name="player_pref">Προτεινόμενο πρόγραμμα αναπαραγωγής</string>
     <string name="player_settings_play_in_app">Ενσωματωμένο πρόγραμμα αναπαραγωγής</string>
     <string name="player_settings_play_in_vlc">VLC</string>
@@ -416,6 +362,4 @@
     <string name="player_settings_play_in_web">Web Video Cast</string>
     <string name="player_settings_play_in_browser">Περιηγητής</string>
     <string name="app_not_found_error">Η εφαρμογή δεν βρέθηκε</string>
-    
-    
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f3c6a4c3..cd909dc8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,5 +1,5 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Accueil</string>
     <string name="title_search">Rechercher</string>
@@ -125,9 +125,7 @@
     <string name="dont_show_again">Ne pas afficher à nouveau</string>
     <string name="update">Mettre à jour</string>
     <string name="dns_pref_summary">Utile pour contourner les bloquages des FAI</string>
-
     <string name="download_path_pref">Emplacement de téléchargement</string>
-
     <string name="new_update_format" formatted="true">Nouvelle mise à jour trouvée !
 \n%s -&gt; %s</string>
     <string name="filler" formatted="true">Épisode spécial</string>
@@ -220,8 +218,6 @@
     <string name="sort_close">Fermer</string>
     <string name="sort_clear">Vider</string>
     <string name="sort_save">Enregistrer</string>
-
-
     <string name="subtitles_settings">Paramètres des sous-titres</string>
     <string name="subs_text_color">Couleur du texte</string>
     <string name="subs_outline_color">Couleur des contours</string>
@@ -231,35 +227,26 @@
     <string name="subs_subtitle_elevation">Elevation des sous-titres</string>
     <string name="subs_font">Police</string>
     <string name="subs_font_size">Taille de la police</string>
-
     <string name="search_provider_text_providers">Recherche par fournisseur</string>
     <string name="search_provider_text_types">Recherche par types</string>
-
     <string name="benene_count_text">%d Donner une banane aux devs</string>
     <string name="benene_count_text_none">Aucun Bananes donné</string>
-
     <string name="subs_auto_select_language">Sélection automatique de la langue</string>
     <string name="subs_download_languages">Télécharger les langues</string>
     <string name="subs_subtitle_languages">Langue des sous-titres</string>
     <string name="subs_hold_to_reset_to_default">Maintenir pour rétablir les valeurs par défaut</string>
     <string name="subs_import_text" formatted="true">Importez des polices en les plaçant dans %s</string>
     <string name="continue_watching">Continuer à regarder</string>
-
     <string name="action_remove_watching">Retirer</string>
     <string name="action_open_watching">Plus d\'informations</string>
     <string name="action_open_play">@string/home_play </string>
-
     <string name="vpn_might_be_needed">Un VPN peut être nécessaire pour que ce fournisseur fonctionne correctement</string>
     <string name="vpn_torrent">Ce fournisseur est un torrent, un VPN est recommandé</string>
-
     <string name="provider_info_meta">Les métadonnées ne sont pas fournies par le site, le chargement de la vidéo échouera si elles n\'existent pas sur le site.</string>
-
     <string name="torrent_plot">Description</string>
     <string name="normal_no_plot">Aucune trace trouvée</string>
     <string name="torrent_no_plot">Aucune description trouvée</string>
-
-    <string name="show_log_cat">Afficher le logcat 🐈</string>
-    
+    <string name="show_log_cat">Afficher le Logcat 🐈</string>
     <string name="picture_in_picture">Picture-in-picture</string>
     <string name="picture_in_picture_des">Poursuite de la lecture dans un lecteur miniature au-dessus d\'autres applications</string>
     <string name="player_size_settings">Bouton de redimensionnement du lecteur</string>
@@ -268,17 +255,14 @@
     <string name="player_subtitles_settings_des">Paramètres des sous-titres du lecteur</string>
     <string name="chromecast_subtitles_settings">Sous-titres Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Paramètres des sous-titres Chromecast</string>
-
     <string name="eigengraumode_settings">Mode Eigengravy</string>
     <string name="eigengraumode_settings_des">Ajout d\'une option de vitesse dans le lecteur</string>
     <string name="swipe_to_seek_settings">Balayez pour chercher</string>
     <string name="swipe_to_seek_settings_des">Balayez vers la gauche ou la droite pour contrôler le temps dans le lecteur vidéo.</string>
     <string name="swipe_to_change_settings">Balayez pour modifier les paramètres</string>
     <string name="swipe_to_change_settings_des">Glissez sur le côté gauche ou droit pour modifier la luminosité ou le volume.</string>
-
     <string name="autoplay_next_settings">Lecture automatique du prochain épisode</string>
     <string name="autoplay_next_settings_des">Démarrer l\'épisode suivant lorsque l\'épisode en cours se termine</string>
-
     <string name="double_tap_to_seek_settings">Double tape pour chercher</string>
     <string name="double_tap_to_pause_settings">Double tape pour mettre en pause</string>
     <string name="double_tap_to_seek_amount_settings">Player seek amount</string>
@@ -289,23 +273,18 @@
     <string name="use_system_brightness_settings_des">Utiliser la luminosité du système dans le lecteur d\'applications au lieu du
         sombre
     </string>
-
     <string name="episode_sync_settings">Mise à jour de la progression de la veille</string>
     <string name="episode_sync_settings_des">Synchronisation automatique de la progression de votre épisode en cours</string>
-
     <string name="restore_settings">Restaurer des données à partir d\'une sauvegarde</string>
-
     <string name="backup_settings">Sauvegarde des données</string>
     <string name="restore_success">Fichier de sauvegarde chargé</string>
     <string name="restore_failed_format" formatted="true">Échec de la restauration des données du fichier %s</string>
     <string name="backup_success">Données stockées avec succès</string>
     <string name="backup_failed">Permissions de stockage manquantes, veuillez réessayer</string>
     <string name="backup_failed_error_format">Erreur de sauvegarde %s</string>
-
     <string name="search">Recherche</string>
     <string name="category_account">Comptes</string>
     <string name="category_updates">Mises à jour et sauvegarde</string>
-
     <string name="settings_info">Info</string>
     <string name="advanced_search">Recherche avancée</string>
     <string name="advanced_search_des">Vous donne les résultats de la recherche séparés par fournisseur</string>
@@ -315,7 +294,6 @@
     <string name="show_trailers_settings">Montrer les bandes-annonces</string>
     <string name="kitsu_settings">Montrer les affiches de kitsu</string>
     <string name="pref_filter_search_quality">Masquer la qualité vidéo sélectionnée dans les résultats de recherche</string>
-
     <string name="automatic_plugin_updates">Mises à jour automatiques des plugins</string>
     <string name="updates_settings">Afficher les mises à jour de l\'application</string>
     <string name="updates_settings_des">Recherche automatique de nouvelles mises à jour au démarrage</string>
@@ -325,4 +303,4 @@
     <string name="lightnovel">Application Light Novel par les mêmes devs</string>
     <string name="anim">Anime app by the same devs</string>
     <string name="discord">Rejoignez le Discord</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 31b84bfd..dbe3a30e 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -1,10 +1,8 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Pemeran: %s</string>
-
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
@@ -14,23 +12,19 @@
     <string name="go_back_img_des">Go back</string>
     <string name="home_change_provider_img_des">Change Provider</string>
     <string name="preview_background_img_des">Preview Background</string>
-
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Kecepatan (%.2fx)</string>
     <string name="rated_format" formatted="true">Dinilai: %.1f</string>
-    <string name="new_update_format" formatted="true">Update baru ditemukan!\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">Update baru ditemukan!\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d mnt</string>
-
     <string name="app_name">CloudStream</string>
     <string name="title_home">Beranda</string>
     <string name="title_search">Cari</string>
     <string name="title_downloads">Download</string>
     <string name="title_settings">Pengaturan</string>
-
     <string name="search_hint">Cari…</string>
     <string name="search_hint_site" formatted="true">Cari %s…</string>
-
     <string name="no_data">Tidak Ada Data</string>
     <string name="episode_more_options_des">Opsi Lanjutan</string>
     <string name="next_episode">Episode selanjutnya</string>
@@ -39,7 +33,6 @@
     <string name="result_open_in_browser">Buka Di Browser</string>
     <string name="skip_loading">Skip Loading</string>
     <string name="loading">Loading…</string>
-
     <string name="type_watching">Sedang Menonton</string>
     <string name="type_on_hold">Tertahan</string>
     <string name="type_completed">Selesai</string>
@@ -47,7 +40,6 @@
     <string name="type_plan_to_watch">Rencana untuk Menonton</string>
     <string name="type_none">Tidak Ada</string>
     <string name="type_re_watching">Menonton Ulang</string>
-
     <string name="play_movie_button">Putar Movie</string>
     <string name="play_torrent_button">Streaming Torrent</string>
     <string name="pick_source">Sumber</string>
@@ -56,7 +48,6 @@
     <string name="go_back">Kembali</string>
     <string name="play_episode">Putar Episode</string>
     <!--<string name="need_storage">Allow to download episodes</string>-->
-
     <string name="download">Download</string>
     <string name="downloaded">Terdownload</string>
     <string name="downloading">Sedang Didownload</string>
@@ -65,18 +56,14 @@
     <string name="download_failed">Download Gagal</string>
     <string name="download_canceled">Download Dibatalkan</string>
     <string name="download_done">Download Selesai</string>
-
     <string name="error_loading_links_toast">Error Memuat Tautan</string>
     <string name="download_storage_text">Penyimpanan Internal</string>
-
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Sub</string>
-
     <string name="popup_delete_file">Hapus File</string>
     <string name="popup_play_file">Putar File</string>
     <string name="popup_resume_download">Lanjutkan Download</string>
     <string name="popup_pause_download">Jeda Download</string>
-
     <string name="pref_disable_acra">Matikan pelaporan bug otomatis</string>
     <string name="home_more_info">Lebih banyak info</string>
     <string name="home_expanded_hide">Sembunyikan</string>
@@ -92,9 +79,7 @@
     <string name="sort_close">Tutup</string>
     <string name="sort_clear">Bersihkan</string>
     <string name="sort_save">Simpan</string>
-
     <string name="player_speed">Kecepatan Pemutar</string>
-
     <string name="subtitles_settings">Pengaturan Subtitle</string>
     <string name="subs_text_color">Warna Teks</string>
     <string name="subs_outline_color">Warna Garis Luar</string>
@@ -104,34 +89,25 @@
     <string name="subs_subtitle_elevation">Ketinggian Subtitle</string>
     <string name="subs_font">Font</string>
     <string name="subs_font_size">Ukuran Font</string>
-
     <string name="search_provider_text_providers">Cari menggunakan provider</string>
     <string name="search_provider_text_types">Cari menggunakan jenis</string>
-
     <string name="benene_count_text">%d Piseng yang diberikan kepada developer</string>
     <string name="benene_count_text_none">Tidak ada piseng yang diberikan</string>
-
     <string name="subs_auto_select_language">Pilih Bahasa Otomatis</string>
     <string name="subs_download_languages">Download Bahasa</string>
     <string name="subs_hold_to_reset_to_default">Tahan untuk mengatur ulang ke default</string>
     <string name="subs_import_text" formatted="true">Impor font dengan meletakkan mereka di %s</string>
     <string name="continue_watching">Lanjutkan Menonton</string>
-
     <string name="action_remove_watching">Hapus</string>
     <string name="action_open_watching">Info lebih lanjut</string>
     <string name="action_open_play">@string/home_play </string>
-
     <string name="vpn_might_be_needed">Sebuah VPN mungkin diperlukan agar provider ini bisa bekerja dengan benar</string>
     <string name="vpn_torrent">Provider ini adalah sebuah torrent, VPN direkomendasikan</string>
-
     <string name="provider_info_meta">Metadata tidak disediakan oleh situs, loading video akan gagal jika tidak ada di situs.</string>
-
     <string name="torrent_plot">Deskripsi</string>
     <string name="normal_no_plot">Tidak Ada Plot Yang Ditemukan</string>
     <string name="torrent_no_plot">Tidak Ada Deskripsi Yang Ditemukan</string>
-
-    <string name="show_log_cat">Tampilkan logcat 🐈</string>
-
+    <string name="show_log_cat">Tampilkan Logcat 🐈</string>
     <string name="picture_in_picture">Picture-in-picture</string>
     <string name="picture_in_picture_des">Melanjutkan pemutaran di pemutar mini di atas aplikasi lain</string>
     <string name="player_size_settings">Tombol mengubah ukuran pemutar</string>
@@ -140,7 +116,6 @@
     <string name="player_subtitles_settings_des">Pengaturan subtitle pemutar</string>
     <string name="chromecast_subtitles_settings">Subtitle Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Pengaturan subtitle Chromecast</string>
-
     <string name="eigengraumode_settings">Mode Eigengravy</string>
     <string name="eigengraumode_settings_des">Menambahkan opsi kecepatan di pemutar</string>
     <string name="swipe_to_seek_settings">Geser untuk mengubah waktu</string>
@@ -156,23 +131,18 @@
     <string name="use_system_brightness_settings">Gunakan pencerahan sistem</string>
     <string name="use_system_brightness_settings_des">Gunakan pencerahan sistem di pemutar aplikasi dari pada hamparan gelap
     </string>
-
     <string name="episode_sync_settings">Update progres tontonan</string>
     <string name="episode_sync_settings_des">Sinkronisasikan progres episode saat ini secara otomatis</string>
-
     <string name="restore_settings">Pulihkan data dari cadangan</string>
-
     <string name="backup_settings">Cadangkan data</string>
     <string name="restore_success">File cadangan termuat</string>
     <string name="restore_failed_format" formatted="true">Gagal untuk memulihkan data dari file %s</string>
     <string name="backup_success">Data berhasil disimpan</string>
     <string name="backup_failed">Izin penyimpanan tidak ditemukan, mohon coba lagi</string>
     <string name="backup_failed_error_format">Error saat mencadang %s</string>
-
     <string name="search">Cari</string>
     <string name="category_account">Kredit dan akun</string>
     <string name="category_updates">Update dan cadangan</string>
-    
     <string name="settings_info">Info</string>
     <string name="advanced_search">Pencarian Lanjutan</string>
     <string name="advanced_search_des">Memberikan hasil pencarian yang dipisahkan berdasarkan provider</string>
@@ -189,9 +159,7 @@
     <string name="discord">Bergabung dengan Discord</string>
     <string name="benene">Berikan sebuah piseng kepada developer</string>
     <string name="benene_des">Piseng yang diberikan</string>
-
     <string name="app_language">Bahasa Aplikasi</string>
-
     <string name="no_chromecast_support_toast">Provider ini tidak memiliki dukungan Chromecast</string>
     <string name="no_links_found_toast">Tidak Ada Tautan Yang Ditemukan</string>
     <string name="copy_link_toast">Tautan disalin ke papan klip</string>
@@ -199,7 +167,6 @@
     <string name="subs_default_reset_toast">Ulang ke pengaturan default</string>
     <string name="acra_report_toast">Maaf, aplikasi ngecrash. Laporan bug anonim akan dikirim ke developer
     </string>
-
     <string name="season">Season</string>
     <string name="no_season">Tidak Ada Season</string>
     <string name="episode">Episode</string>
@@ -207,7 +174,6 @@
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Episode Tidak Ditemukan</string>
-
     <string name="delete_file">Hapus File</string>
     <string name="delete">Hapus</string>
     <string name="pause">Jeda</string>
@@ -216,8 +182,6 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">Ini akan secara permanen menghapus %s\nApakah anda yakin?</string>
     <string name="resume_time_left" formatted="true">%dm\ntersisa</string>
-
-
     <string name="status_ongoing">Masih Berlanjut</string>
     <string name="status_completed">Tamat</string>
     <string name="status">Status</string>
@@ -226,15 +190,12 @@
     <string name="duration">Durasi</string>
     <string name="site">Situs</string>
     <string name="synopsis">Sinopsis</string>
-
     <string name="queued">antri</string>
     <string name="no_subtitles">Tidak Ada Subtitle</string>
     <string name="default_subtitles">Default</string>
-
     <string name="free_storage">Bebas</string>
     <string name="used_storage">Terpakai</string>
     <string name="app_storage">Aplikasi</string>
-
     <!--plural-->
     <string name="movies">Movie</string>
     <string name="tv_series">Seri TV</string>
@@ -244,7 +205,6 @@
     <string name="documentaries">Film Dokumenter</string>
     <string name="ova">OVA</string>
     <string name="asian_drama">Drama Asia</string>
-
     <!--singular-->
     <string name="movies_singular">Movie</string>
     <string name="tv_series_singular">Seri</string>
@@ -254,13 +214,11 @@
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Film Dokumenter</string>
     <string name="asian_drama_singular">Drama Asia</string>
-
     <string name="source_error">Error sumber</string>
     <string name="remote_error">Error jarak jauh</string>
     <string name="render_error">Error perender</string>
     <string name="unexpected_error">Error pemutar yang tidak terduga</string>
     <string name="storage_error">Error mendownload, cek izin penyimpanan</string>
-
     <string name="episode_action_chromecast_episode">Episode Chromecast</string>
     <string name="episode_action_chromecast_mirror">Mirror Chromecast</string>
     <string name="episode_action_play_in_app">Putar di aplikasi</string>
@@ -271,49 +229,37 @@
     <string name="episode_action_download_mirror">Download mirror</string>
     <string name="episode_action_reload_links">Muat ulang tautan</string>
     <string name="episode_action_download_subtitle">Download subtitle</string>
-
     <string name="show_hd">Label kualitas</string>
     <string name="show_dub">Label dub</string>
     <string name="show_sub">Label sub</string>
     <string name="show_title">Judul</string>
     <string name="poster_ui_settings">Aktifkan atau nonaktifkan elemen UI pada poster</string>
-
     <string name="no_update_found">Tidak Ada Update Yang Ditemukan</string>
     <string name="check_for_update">Cek Untuk Update</string>
-
     <string name="video_lock">Kunci</string>
     <string name="video_aspect_ratio_resize">Ubah Ukuran</string>
     <string name="video_source">Sumber</string>
     <string name="video_skip_op">Skip OP</string>
-
     <string name="dont_show_again">Jangan tunjukkan lagi</string>
     <string name="skip_update">Skip Update ini</string>
     <string name="update">Update</string>
     <string name="watch_quality_pref">Kualitas tontonan yang lebih diinginkan</string>
     <string name="limit_title">Karakter maksimal judul pemutar video</string>
     <string name="limit_title_rez">Resolusi pemutar video</string>
-
     <string name="video_buffer_size_settings">Ukuran buffer video</string>
     <string name="video_buffer_length_settings">Panjang buffer video</string>
     <string name="video_buffer_disk_settings">Cache video di disk</string>
     <string name="video_buffer_clear_settings">Membersihkan cache video dan gambar</string>
-
     <string name="video_ram_description">Akan menyebabkan crash acak jika disetel terlalu tinggi. Jangan diubah jika anda memiliki jumlah ram yang rendah seperti TV Android atau ponsel lama</string>
     <string name="video_disk_description">Dapat menyebabkan masalah pada sistem dengan ruang penyimpanan yang rendah seperti perangkat Android TV jika anda menyetelnya terlalu tinggi</string>
-
     <string name="dns_pref">DNS melalui HTTPS</string>
     <string name="dns_pref_summary">Berguna untuk melewati blok ISP</string>
-
     <string name="download_path_pref">Jalur download</string>
-
     <string name="nginx_url_pref">Url server Nginx</string>
-
     <string name="display_subbed_dubbed_settings">Tampilkan Anime Dub/Sub</string>
-
     <string name="resize_fit">Paskan dengan layar</string>
     <string name="resize_fill">Regang</string>
     <string name="resize_zoom">Zoom</string>
-
     <string name="legal_notice">Peringatan</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
         should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
@@ -338,18 +284,14 @@
     <string name="app_layout">Tata Letak Aplikasi</string>
     <string name="preferred_media_settings">Media yang lebih diinginkan</string>
     <string name="category_ui">Antarmuka pengguna</string>
-
     <string name="automatic">Otomatis</string>
     <string name="tv_layout">Tata letak TV</string>
     <string name="phone_layout">Tata letak HP</string>
     <string name="emulator_layout">Tata letak emulator</string>
-
     <string name="primary_color_settings">Warna primer</string>
     <string name="app_theme_settings">Tema aplikasi</string>
     <string name="bottom_title_settings">Lokasi judul poster</string>
     <string name="bottom_title_settings_des">Meletakkan judul di bawah poster</string>
-
-
     <!-- account stuff -->
     <!--
     <string name="mal_account_settings" translatable="false">MAL</string>
@@ -374,7 +316,6 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s Diautentikasikan</string>
     <string name="authenticated_user_fail" formatted="true">Gagal untuk mengautentikasi ke %s</string>
-
     <!-- ============ -->
     <string name="none">Tidak Ada</string>
     <string name="normal">Normal</string>
@@ -391,7 +332,6 @@
     <string name="subtitle_offset_extra_hint_later_format">Gunakan ini jika subtitle ditampilkan %dms terlalu cepat</string>
     <string name="subtitle_offset_extra_hint_before_format">Gunakan ini jika subtitle ditampilkan %dms terlalu lambat</string>
     <string name="subtitle_offset_extra_hint_none_format">Tidak ada penundaan subtitle</string>
-
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
     see: 
@@ -399,7 +339,6 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">The quick brown fox jumps over the lazy dog</string>
-
     <string name="recommended">Direkomendasikan</string>
     <string name="player_loaded_subtitles" formatted="true">Memuat %s</string>
     <string name="player_load_subtitles">Muat dari file</string>
@@ -407,12 +346,9 @@
     <string name="actor_main">Utama</string>
     <string name="actor_supporting">Pendukung</string>
     <string name="actor_background">Latar Belakang</string>
-
     <string name="home_source">Sumber</string>
     <string name="home_random">Acak</string>
-
     <string name="coming_soon">Segera hadir…</string>
-
     <string name="quality_cam">Cam</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
@@ -429,10 +365,9 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">Gambar Poster</string>
     <string name="category_player">Pemutar</string>
     <string name="resolution_and_title">Resolusi dan judul</string>
     <string name="title">Judul</string>
     <string name="resolution">Resolusi</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 7daca143..a6aa283f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,5 +1,5 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
@@ -7,7 +7,6 @@
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
@@ -17,24 +16,20 @@
     <string name="go_back_img_des">Ga terug</string>
     <string name="home_change_provider_img_des">Wijzig provider</string>
     <string name="preview_background_img_des">Voorbeeld Achtergrond</string>
-
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Snelheid (%.2fx)</string>
     <string name="rated_format" formatted="true">Beoordeeld: %.1fAls</string>
-    <string name="new_update_format" formatted="true">Nieuwe update gevonden!\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">Nieuwe update gevonden!\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
-
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Afspelen met CloudStream</string>
     <string name="title_home">Home</string>
     <string name="title_search">Zoeken</string>
     <string name="title_downloads">Downloads</string>
     <string name="title_settings">Instellingen</string>
-
     <string name="search_hint">Zoeken…</string>
     <string name="search_hint_site" formatted="true">Zoeken %s…</string>
-
     <string name="no_data">Geen gegevens</string>
     <string name="episode_more_options_des">Meer Opties</string>
     <string name="next_episode">Volgende aflevering</string>
@@ -43,7 +38,6 @@
     <string name="result_open_in_browser">Openen in Browser</string>
     <string name="skip_loading">Laden overslaan</string>
     <string name="loading">Laden…</string>
-
     <string name="type_watching">Aan het kijken</string>
     <string name="type_on_hold">In de wacht</string>
     <string name="type_completed">Voltooid</string>
@@ -51,7 +45,6 @@
     <string name="type_plan_to_watch">Plan om te kijken</string>
     <string name="type_none">Geen</string>
     <string name="type_re_watching">Opnieuw kijken</string>
-
     <string name="play_movie_button">Film afspelen</string>
     <string name="play_livestream_button">Livestream afspelen</string>
     <string name="play_torrent_button">Stream Torrent</string>
@@ -61,7 +54,6 @@
     <string name="go_back">Ga terug</string>
     <string name="play_episode">Aflevering afspelen</string>
     <!--<string name="need_storage">Allow to download episodes</string>-->
-
     <string name="download">Download</string>
     <string name="downloaded">Gedownload</string>
     <string name="downloading">Downloaden</string>
@@ -71,18 +63,14 @@
     <string name="download_canceled">Download Geannuleerd</string>
     <string name="download_done">Download Gereed</string>
     <string name="stream">Stream</string>
-
     <string name="error_loading_links_toast">Fout bij laden links</string>
     <string name="download_storage_text">Interne opslag</string>
-
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Sub</string>
-
     <string name="popup_delete_file">Bestand verwijderen</string>
     <string name="popup_play_file">Bestand afspelen</string>
     <string name="popup_resume_download">Download hervatten</string>
     <string name="popup_pause_download">Download pauzeren</string>
-
     <string name="pref_disable_acra">Automatische bugrapportage uitschakelen</string>
     <string name="home_more_info">Meer info</string>
     <string name="home_expanded_hide">Verberg</string>
@@ -98,9 +86,7 @@
     <string name="sort_close">Sluit</string>
     <string name="sort_clear">Wissen</string>
     <string name="sort_save">Opslaan</string>
-
     <string name="player_speed">Afspelen Snelheid</string>
-
     <string name="subtitles_settings">Ondertiteling</string>
     <string name="subs_text_color">Tekst kleur</string>
     <string name="subs_outline_color">Omtrekkleur</string>
@@ -110,35 +96,26 @@
     <string name="subs_subtitle_elevation">Ondertitelhoogte</string>
     <string name="subs_font">Lettertype</string>
     <string name="subs_font_size">Lettergrootte</string>
-
     <string name="search_provider_text_providers">Zoeken met providers</string>
     <string name="search_provider_text_types">Zoeken met types</string>
-
     <string name="benene_count_text">%d Bananen gegeven aan ontwikkelaars</string>
     <string name="benene_count_text_none">Geen Bananen gegeven</string>
-
     <string name="subs_auto_select_language">Taal automatisch selecteren</string>
     <string name="subs_download_languages">Talen downloaden</string>
     <string name="subs_subtitle_languages">Ondertiteltaal</string>
     <string name="subs_hold_to_reset_to_default">Houd ingedrukt om naar standaard instellingen gaan</string>
     <string name="subs_import_text" formatted="true">Importeer lettertypes door ze in %s</string>
     <string name="continue_watching">Doorgaan met kijken</string>
-
     <string name="action_remove_watching">Verwijder</string>
     <string name="action_open_watching">Meer Info</string>
     <string name="action_open_play">@string/home_play </string>
-
     <string name="vpn_might_be_needed">Een VPN kan nodig zijn om deze provider correct te laten werken</string>
     <string name="vpn_torrent">Deze provider is een torrent, een VPN wordt aanbevolen</string>
-
     <string name="provider_info_meta">Metadata wordt niet geleverd door de site, het laden van video\'s zal mislukken als deze niet op de site bestaat.</string>
-
     <string name="torrent_plot">Beschrijving</string>
     <string name="normal_no_plot">Geen plot gevonde</string>
     <string name="torrent_no_plot">Geen Beschrijving Gevonden</string>
-
-    <string name="show_log_cat">Toon logcat 🐈</string>
-
+    <string name="show_log_cat">Toon Logcat 🐈</string>
     <string name="picture_in_picture">Beeld-in-beeld</string>
     <string name="picture_in_picture_des">Blijft afspelen in een miniatuurspeler bovenop andere apps</string>
     <string name="player_size_settings">Afspeel knop wijzig</string>
@@ -147,7 +124,6 @@
     <string name="player_subtitles_settings_des">Speler Ondertiteling instellingen</string>
     <string name="chromecast_subtitles_settings">Chromecast Ondertitels</string>
     <string name="chromecast_subtitles_settings_des">Chromecast ondertitels instellingen</string>
-
     <string name="eigengraumode_settings">Eigengravy Modus</string>
     <string name="eigengraumode_settings_des">Voegt een snelheidsoptie toe in de speler</string>
     <string name="swipe_to_seek_settings">Swipe to seek</string>
@@ -161,23 +137,18 @@
     <string name="double_tap_to_pause_settings_des">Tik in het midden om te pauzeren</string>
     <string name="use_system_brightness_settings">Systeemhelderheid gebruiken</string>
     <string name="use_system_brightness_settings_des">Gebruik systeemhelderheid in de app-speler in plaats van een donkere overlay</string>
-
     <string name="episode_sync_settings">Kijkvoortgang bijwerken</string>
     <string name="episode_sync_settings_des">Automatisch synchroniseren van je huidige episode vooruitgang</string>
-
     <string name="restore_settings">Gegevens herstellen vanaf back-up</string>
-
     <string name="backup_settings">Back-up gegevens</string>
     <string name="restore_success">Geladen back-up bestand</string>
     <string name="restore_failed_format" formatted="true">Kan gegevens uit bestand niet herstellen %s</string>
     <string name="backup_success">Gegevens succesvol opgeslagen</string>
     <string name="backup_failed">Opslagrechten ontbreken, probeer het opnieuw</string>
     <string name="backup_failed_error_format">Fout bij het maken van een back-up %s</string>
-
     <string name="search">Zoeken</string>
     <string name="category_account">Accounts</string>
     <string name="category_updates">Updates en back-up</string>
-   
     <string name="settings_info">Info</string>
     <string name="advanced_search">Geavanceerd zoeken</string>
     <string name="advanced_search_des">Geeft u de zoekresultaten gescheiden door provider</string>
@@ -186,7 +157,6 @@
     <string name="show_fillers_settings">Toon filler episode voor anime</string>
     <string name="show_trailers_settings">Toon trailers</string>
     <string name="kitsu_settings">Toon posters van kitsu</string>
-
     <string name="updates_settings">App-updates tonen</string>
     <string name="updates_settings_des">Automatisch zoeken naar nieuwe updates bij het opstarten</string>
     <string name="uprereleases_settings">Update naar pre-releases</string>
@@ -197,16 +167,13 @@
     <string name="discord">Word lid van ons Discord kanaal</string>
     <string name="benene">Geef een banaan aan de ontwikkelaars</string>
     <string name="benene_des">Gegeven banaan</string>
-
     <string name="app_language">App Taal</string>
-
     <string name="no_chromecast_support_toast">Deze provider heeft geen Chromecast-ondersteuning</string>
     <string name="no_links_found_toast">Geen links gevonden</string>
     <string name="copy_link_toast">Link gekopieerd naar klembord</string>
     <string name="play_episode_toast">Aflevering afspelen</string>
     <string name="subs_default_reset_toast">Reset naar standaardwaarde</string>
     <string name="acra_report_toast">Sorry, de applicatie is gecrasht. Er wordt een anoniem bugrapport naar de ontwikkelaars gestuurd </string>
-
     <string name="season">Seizoen</string>
     <string name="no_season">Geen seizoen</string>
     <string name="episode">Aflevering</string>
@@ -216,7 +183,6 @@
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Geen afleveringen gevonden</string>
-
     <string name="delete_file">Verwijder bestand</string>
     <string name="delete">Verwijder</string>
     <string name="pause">Pauze</string>
@@ -225,7 +191,6 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">Dit wordt zeker permanent verwijderd %s\nWeet u het zeker?</string>
     <string name="resume_time_left" formatted="true">%dm\nremaining</string>
-
     <string name="status_ongoing">Voortdurende</string>
     <string name="status_completed">Voltooid</string>
     <string name="status">Status</string>
@@ -234,15 +199,12 @@
     <string name="duration">Duur</string>
     <string name="site">Site</string>
     <string name="synopsis">Korte inhoud</string>
-
     <string name="queued">wachtrij</string>
     <string name="no_subtitles">Geen ondertiteling</string>
     <string name="default_subtitles">Standaard</string>
-
     <string name="free_storage">Vrij</string>
     <string name="used_storage">Gebruikt</string>
     <string name="app_storage">App</string>
-
     <!--plural-->
     <string name="movies">Films</string>
     <string name="tv_series">TV series</string>
@@ -253,7 +215,6 @@
     <string name="ova">OVA</string>
     <string name="asian_drama">Aziatische drama\'s</string>
     <string name="livestreams">Livestreams</string>
-
     <!--singular-->
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Serie</string>
@@ -264,13 +225,11 @@
     <string name="documentaries_singular">Documentaire</string>
     <string name="asian_drama_singular">Aziatisch drama</string>
     <string name="live_singular">Livestream</string>
-
     <string name="source_error">Bronfout</string>
     <string name="remote_error">Externe fout</string>
     <string name="render_error">Renderer fout</string>
     <string name="unexpected_error">Onverwachte speler fout</string>
     <string name="storage_error">Downloadfout, controleer opslagrechten</string>
-
     <string name="episode_action_chromecast_episode">Chromecast aflevering</string>
     <string name="episode_action_chromecast_mirror">Chromecast mirror</string>
     <string name="episode_action_play_in_app">Speel in app</string>
@@ -281,53 +240,40 @@
     <string name="episode_action_download_mirror">Download mirror</string>
     <string name="episode_action_reload_links">Herlaad Linkss</string>
     <string name="episode_action_download_subtitle">Ondertitels downloaden</string>
-
     <string name="show_hd">Kwaliteitslabel</string>
     <string name="show_dub">Dub label</string>
     <string name="show_sub">Sub label</string>
     <string name="show_title">Titel</string>
     <string name="poster_ui_settings">Schakel UI-elementen op poster</string>
-
     <string name="no_update_found">Geen update gevonden</string>
     <string name="check_for_update">Controleren op updates</string>
-
     <string name="video_lock">Slot</string>
     <string name="video_aspect_ratio_resize">Formaat wijzigen</string>
     <string name="video_source">Bron</string>
     <string name="video_skip_op">OP overslaan</string>
-
     <string name="dont_show_again">Niet meer weergeven</string>
     <string name="skip_update">Deze update overslaan</string>
     <string name="update">Update</string>
     <string name="watch_quality_pref">Gewenste kijkwaliteit</string>
     <string name="limit_title">Maximaal aantal tekens voor titel van videospeler</string>
     <string name="limit_title_rez">Videospeler Resolutie </string>
-
     <string name="video_buffer_size_settings">Grootte videobuffer</string>
     <string name="video_buffer_length_settings">Lengte videobuffer</string>
     <string name="video_buffer_disk_settings">Video cache op schijf</string>
     <string name="video_buffer_clear_settings">Wis video en beeld cache</string>
-
     <string name="video_ram_description">Zal willekeurige crashes veroorzaken als deze te hoog is ingesteld. Verander niet als je weinig RAM hebt, zoals een Android TV of een oude telefoon</string>
     <string name="video_disk_description">Kan problemen veroorzaken op systemen met weinig opslagruimte, zoals Android TV-apparaten als u deze te hoog instelt</string>
-
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Handig om ISP-blokkades te omzeilen</string>
-
     <string name="add_site_pref">Kloon site</string>
     <string name="remove_site_pref">Site verwijderen</string>
     <string name="add_site_summary">Voeg een kloon toe van een bestaande site, met een andere url</string>
-
     <string name="download_path_pref">Downloadpad</string>
-
     <string name="nginx_url_pref">Nginx server url</string>
-
     <string name="display_subbed_dubbed_settings">Weergave Dubbed/Subbed Anime</string>
-
     <string name="resize_fit">Pas aan het scherm</string>
     <string name="resize_fill">Uitgerekt</string>
     <string name="resize_zoom">Zoom</string>
-
     <string name="legal_notice">Disclaimer</string>
     <string name="category_general">Algemeen</string>
     <string name="random_button_settings">Willekeurige knop</string>
@@ -337,18 +283,14 @@
     <string name="preferred_media_settings">Preferred media</string>
     <string name="subtitles_encoding">Subtitle encoding</string>
     <string name="category_ui">Layout</string>
-
     <string name="automatic">Auto</string>
     <string name="tv_layout">TV layout</string>
     <string name="phone_layout">Telefoon layout</string>
     <string name="emulator_layout">emulator layout</string>
-
     <string name="primary_color_settings">Primaire kleur</string>
     <string name="app_theme_settings">App thema</string>
     <string name="bottom_title_settings">Locatie van de titel van de poster</string>
     <string name="bottom_title_settings_des">Zet de titel onder de poster</string>
-
-
     <!-- account stuff -->
     <string name="example_password">wachtwoord123</string>
     <string name="example_username">MijnCoolGebruikersnaam</string>
@@ -357,7 +299,6 @@
     <string name="example_site_name">MyCoolSite</string>
     <string name="example_site_url">voorbeeld.com</string>
     <string name="example_lang_name">Taalcode (nl)</string>
-
     <!--
     <string name="mal_account_settings" translatable="false">MAL</string>
     <string name="anilist_account_settings" translatable="false">AniList</string>
@@ -382,7 +323,6 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">Geauthenticeerd %s</string>
     <string name="authenticated_user_fail" formatted="true">Mislukt om te verifiëren aan %s</string>
-
     <!-- ============ -->
     <string name="none">Geen</string>
     <string name="normal">normaal</string>
@@ -399,7 +339,6 @@
     <string name="subtitle_offset_extra_hint_later_format">Gebruik dit als de ondertitels %dms te vroeg worden getoond</string>
     <string name="subtitle_offset_extra_hint_before_format">Gebruik dit als ondertitels %dms te laat worden getoond</string>
     <string name="subtitle_offset_extra_hint_none_format">Geen ondertitelvertragin</string>
-
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
     see: 
@@ -407,7 +346,6 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">De snelle bruine vos springt over de luie hond</string>
-
     <string name="recommended">Aanbevolen</string>
     <string name="player_loaded_subtitles" formatted="true">Geladen %s</string>
     <string name="player_load_subtitles">Laden uit bestand</string>
@@ -416,12 +354,9 @@
     <string name="actor_main">Hoofd</string>
     <string name="actor_supporting">Ondersteuning</string>
     <string name="actor_background">Achtergrond</string>
-
     <string name="home_source">Bron</string>
     <string name="home_random">Willekeurig</string>
-
     <string name="coming_soon">Binnenkort…</string>
-
     <string name="quality_cam">Cam</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
@@ -438,7 +373,6 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">Posterafbeelding</string>
     <string name="category_player">Player</string>
     <string name="resolution_and_title">Resolutie en titel</string>
@@ -462,4 +396,4 @@
     <string name="crash_reporting_title">Crashrapportage</string>
     <string name="preferred_media_subtext">Wat wil je zien?</string>
     <string name="setup_done">Klaar</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index ebd6ee49..728d405a 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Plakat</string>
@@ -8,18 +9,15 @@
     <string name="go_back_img_des">Gå tilbake</string>
     <string name="home_change_provider_img_des">Bytt leverandør</string>
     <string name="preview_background_img_des">Forhåndsvisning Bakgrunn</string>
-
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Avspillingshastighet (%.2fx)</string>
     <string name="rated_format" formatted="true">Vurdert: %.1f</string>
-    <string name="new_update_format" formatted="true">Ny oppdatering funnet!\n%s -> %s</string>
-
+    <string name="new_update_format" formatted="true">Ny oppdatering funnet!\n%s -&gt; %s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Hjem</string>
     <string name="title_search">Søk</string>
     <string name="title_downloads">Nedlastinger</string>
     <string name="title_settings">Innstillinger</string>
-
     <string name="search_hint">Søk…</string>
     <string name="no_data">Nei informasjon</string>
     <string name="episode_more_options_des">Flere valg</string>
@@ -29,14 +27,12 @@
     <string name="result_open_in_browser">Åpne i nettleseren</string>
     <string name="skip_loading">Hopp over</string>
     <string name="loading">Laster inn…</string>
-
     <string name="type_watching">Ser på</string>
     <string name="type_on_hold">På vent</string>
     <string name="type_completed">Fullført</string>
     <string name="type_dropped">Falt</string>
     <string name="type_plan_to_watch">Planlegg å se</string>
     <string name="type_none">Ingen</string>
-
     <string name="play_movie_button">Spill filmer</string>
     <string name="play_torrent_button">Strøm Torrent</string>
     <string name="pick_source">Kilder</string>
@@ -45,7 +41,6 @@
     <string name="go_back">Gå tilbake</string>
     <string name="play_episode">Spille Episode</string>
     <!--<string name="need_storage">Tillat å laste ned episoder</string>-->
-
     <string name="download">nedlasting</string>
     <string name="downloaded">Lastet ned</string>
     <string name="downloading">Nedlasting pågår</string>
@@ -54,18 +49,14 @@
     <string name="download_failed">Nedlasting mislyktes</string>
     <string name="download_canceled">Nedlasting avbrutt</string>
     <string name="download_done">Last ned Ferdig</string>
-
     <string name="error_loading_links_toast">feil ved lasting av lenker</string>
     <string name="download_storage_text">Intern lagring</string>
-
     <string name="app_dubbed_text">Dubbet</string>
     <string name="app_subbed_text">Subbed</string>
-
     <string name="popup_delete_file">Slett fil</string>
     <string name="popup_play_file">Spill av fil</string>
     <string name="popup_resume_download">Fortsett nedlasting</string>
     <string name="popup_pause_download">Stopp nedlastingen</string>
-
     <string name="pref_disable_acra">Deaktiver automatisk feilrapportering</string>
     <string name="home_more_info">Mer informasjon</string>
     <string name="home_expanded_hide">Gjemme seg</string>
@@ -77,7 +68,6 @@
     <string name="sort_apply">Søke om</string>
     <string name="sort_cancel">Avbryt</string>
     <string name="player_speed">Spillerhastighet</string>
-
     <string name="subtitles_settings">Innstillinger for teksting</string>
     <string name="subs_text_color">Tekstfarge</string>
     <string name="subs_outline_color">Konturfarge</string>
@@ -87,27 +77,21 @@
     <string name="subs_subtitle_elevation">Undertekst høyde</string>
     <string name="subs_font">Skrift</string>
     <string name="subs_font_size">Skriftstørrelse</string>
-
     <string name="search_provider_text_providers">Søk med leverandører</string>
     <string name="search_provider_text_types">Søk med typer</string>
-
     <string name="benene_count_text">%d Benenes gitt til utvikler</string>
     <string name="benene_count_text_none">Nei Benenes gitt</string>
-
     <string name="subs_auto_select_language">Velg språk automatisk</string>
     <string name="subs_download_languages">Last ned språk</string>
     <string name="subs_hold_to_reset_to_default">Hold inne for å tilbakestille</string>
     <string name="continue_watching">Fortsett å se</string>
-
     <string name="action_remove_watching">ta bort</string>
     <string name="action_open_watching">Mer informasjon</string>
-
     <string name="vpn_might_be_needed">En VPN kan være nødvendig for at denne leverandøren skal fungere</string>
     <string name="vpn_torrent">Denne leverandøren er en torrent, en VPN anbefales</string>
     <string name="torrent_plot">Beskrivelse</string>
     <string name="normal_no_plot">Fant ikke tomt</string>
     <string name="torrent_no_plot">Ingen beskrivelse funnet</string>
-
     <string name="picture_in_picture">Bilde-i-bilde</string>
     <string name="picture_in_picture_des">Fortsetter avspilling i en miniatyr spiller på toppen av andre apper</string>
     <string name="player_size_settings">Knapp for størrelse på spiller</string>
@@ -124,7 +108,6 @@
     <string name="double_tap_to_seek_settings_des">Trykk to ganger på høyre eller venstre for å søke fremover eller bakover</string>
     <string name="use_system_brightness_settings">Bruk systemets lysstyrke</string>
     <string name="use_system_brightness_settings_des">Bruk systemlysstyrke i appspilleren i stedet for et mørkt overlegg</string>
-
     <string name="search">Søk</string>
     <string name="settings_info">Informasjon</string>
     <string name="advanced_search">Avansert søk</string>
@@ -142,9 +125,7 @@
     <string name="discord">Bli med Discord</string>
     <string name="benene">Gi en benene til devs</string>
     <string name="benene_des">Gitt benene</string>
-
     <string name="app_language">appspråk</string>
-
     <string name="no_chromecast_support_toast">Denne leverandøren har ingen Chromecast-støtte</string>
     <string name="no_links_found_toast">Ingen lenker funnet</string>
     <string name="copy_link_toast">Linken er kopiert til utklippstavlen</string>
@@ -157,13 +138,11 @@
     <string name="episodes">Episoder</string>
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
-
     <string name="delete_file">Slett fil</string>
     <string name="delete">Slett</string>
     <string name="pause">Stopp</string>
     <string name="resume">Gjenoppta</string>
     <string name="delete_message">Dette vil slette %s\nEr du sikker?</string>
-
     <string name="status_ongoing">Pågående</string>
     <string name="status_completed">Fullført</string>
     <string name="status">Posisjon</string>
@@ -172,27 +151,22 @@
     <string name="duration">Varighet</string>
     <string name="site">Nettstedet</string>
     <string name="synopsis">Om</string>
-
     <string name="queued">I kø</string>
     <string name="no_subtitles">Ingen undertekster</string>
     <string name="default_subtitles">Misligholde</string>
-
     <string name="free_storage">Tilgjengelig</string>
     <string name="used_storage">Brukt</string>
     <string name="app_storage">applikasjon</string>
-
     <string name="movies">Filmer</string>
     <string name="tv_series">TV-serier</string>
     <string name="cartoons">Tegneserier</string>
     <string name="anime">Anime</string>
     <string name="torrent">Torrent</string>
-
     <string name="source_error">Kildefeil</string>
     <string name="remote_error">Fjernfeil</string>
     <string name="render_error">Gjengivelsesfeil</string>
     <string name="unexpected_error">Uventet spillerfeil</string>
     <string name="storage_error">Nedlastingsfeil, sjekk lagringstillatelser</string>
-
     <string name="episode_action_chromecast_episode">Støpt Episode</string>
     <string name="episode_action_chromecast_mirror">Støpt Speil</string>
     <string name="episode_action_play_in_app">Spill i appen</string>
@@ -202,22 +176,18 @@
     <string name="episode_action_auto_download">Automatisk nedlasting</string>
     <string name="episode_action_download_mirror">Last ned speil</string>
     <string name="episode_action_reload_links">Last inn lenker på nytt</string>
-
     <string name="no_update_found">Ingen oppdatering funnet</string>
     <string name="check_for_update">Se etter oppdatering</string>
-
     <string name="video_lock">Låse</string>
     <string name="video_aspect_ratio_resize">Endre størrelse</string>
     <string name="video_source">Kilde</string>
     <string name="video_skip_op">Hoppe OP</string>
-
     <string name="dont_show_again">Ikke vis igjen</string>
     <string name="update">Oppdater</string>
     <string name="watch_quality_pref">Foretrukket klokkekvalitet</string>
     <string name="dns_pref">DNS rundt HTTPS</string>
     <string name="dns_pref_summary">Nyttig til omgå Internettleverandør hinder</string>
     <string name="display_subbed_dubbed_settings">Vis dubbet/subbed Anime</string>
-
     <string name="resize_fit">Tilpass til skjermen</string>
     <string name="resize_fill">Tøye ut</string>
     <string name="resize_zoom">Zoome</string>
@@ -230,7 +200,6 @@
     <string name="primary_color_settings">Primær Farge</string>
     <string name="app_theme_settings">App Tema</string>
     <string name="preferred_media_settings">Foretrukket Videoinnhold</string>
-    
     <string name="legal_notice" translatable="false">Disclaimer</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
         should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
@@ -248,4 +217,98 @@
         responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
         CloudStream 3 at your own risk.
     </string>
-</resources>
+    <string name="cast_format" formatted="true">Besetning: %s</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="sort_clear">Tøm</string>
+    <string name="category_account">Kontoer</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %s</string>
+    <string name="play_with_app_name">Spill med CloudStream</string>
+    <string name="sort_copy">Kopier</string>
+    <string name="next_episode_format" formatted="true">Episode %d vil bli sluppet om</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dt %dm</string>
+    <string name="duration_format" formatted="true">%d min</string>
+    <string name="sort_close">Lukk</string>
+    <string name="subs_subtitle_languages">Undertekstspråk</string>
+    <string name="next_episode_time_day_format" formatted="true">%dd %dt %dm</string>
+    <string name="sort_save">Lagre</string>
+    <string name="show_log_cat">Vis Logcat 🐈</string>
+    <string name="chromecast_subtitles_settings_des">Innstillinger for Chromecast-innstillinger</string>
+    <string name="double_tap_to_seek_amount_settings">Blafringsmengde</string>
+    <string name="restore_settings">Gjenopprett data fra sikkerhetskopi</string>
+    <string name="go_back_30">-30</string>
+    <string name="documentaries_singular">Dokumentar</string>
+    <string name="documentaries">Dokumentarer</string>
+    <string name="asian_drama">Asiatiske drama</string>
+    <string name="livestreams">Direktestrømmer</string>
+    <string name="others">Andre</string>
+    <string name="asian_drama_singular">Asiatisk drama</string>
+    <string name="live_singular">Direktestrøm</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="switch_account">Bytt konto</string>
+    <string name="sync_score">Vurdert</string>
+    <string name="sync_score_format" formatted="true">%d/10</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="recommended">Anbefalt</string>
+    <string name="player_load_subtitles">Last inn fra fil</string>
+    <string name="player_load_subtitles_online">Last inn fra Internett</string>
+    <string name="downloaded_file">Nedlastet fil</string>
+    <string name="actor_background">Bakgrunn</string>
+    <string name="home_source">Kilde</string>
+    <string name="home_random">Tilfeldig</string>
+    <string name="extension_rating" formatted="true">Vurdering: %s</string>
+    <string name="safe_mode_crash_info">Vis krasjinfo</string>
+    <string name="extension_status">Status</string>
+    <string name="extension_size">Størrelse</string>
+    <string name="extension_types">Støttet</string>
+    <string name="extension_install_first">Installer utvidelsen først</string>
+    <string name="hls_playlist">HLS-spilleliste</string>
+    <string name="player_pref">Foretrukket videospiller</string>
+    <string name="player_settings_play_in_app">Intern spiller</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="all_languages_preference">Alle språk</string>
+    <string name="skip_type_format" formatted="true">Hopp over %s</string>
+    <string name="clear_history">Tøm historikk</string>
+    <string name="action_mark_as_watched">Marker som sett</string>
+    <string name="yes">Ja</string>
+    <string name="no">Nei</string>
+    <string name="remove_site_pref">Fjern siden</string>
+    <string name="max">Maks</string>
+    <string name="movies_singular">Film</string>
+    <string name="episode_action_download_subtitle">Last ned undertekster</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="add_site_pref">Klon siden</string>
+    <string name="random_button_settings_desc">Vis tilfeldig-knapp på hjemmesiden</string>
+    <string name="torrent_singular">Torrent</string>
+    <string name="min">Min</string>
+    <string name="tv_series_singular">Serie</string>
+    <string name="other_singular">Video</string>
+    <string name="category_providers">Tilbydere</string>
+    <string name="category_ui">Tilpasning</string>
+    <string name="random_button_settings">Tilfeldig-knapp</string>
+    <string name="emulator_layout">Emulator-tilpasning</string>
+    <string name="subtitles_raised">Opphøyd</string>
+    <string name="account">konto</string>
+    <string name="logout">Logg ut</string>
+    <string name="create_account">Opprett konto</string>
+    <string name="none">Ingen</string>
+    <string name="video_tracks">Videospor</string>
+    <string name="add_sync">Legg til sporing</string>
+    <string name="all">Alle</string>
+    <string name="extension_description">Beskrivelse</string>
+    <string name="add_account">Legg til konto</string>
+    <string name="normal">Normal</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="double_tap_to_pause_settings">Dobbelttrykk for å sette på pause</string>
+    <string name="go_forward_30">+30</string>
+    <string name="subtitles_shadow">Skygge</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
+    <string name="coming_soon">Kommer snart …</string>
+    <string name="extension_version">Versjon</string>
+    <string name="extension_language">Språk</string>
+    <string name="chromecast_subtitles_settings">Chromecast-undertekster</string>
+    <string name="autoplay_next_settings">Autospill neste episode</string>
+    <string name="history">Historikk</string>
+    <string name="double_tap_to_pause_settings_des">Trykk i midten for å sette på pause</string>
+    <string name="no_episodes_found">Fant ingen episoder</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d01f30ec..35683433 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -104,7 +104,7 @@
     <string name="torrent_plot">Opis</string>
     <string name="normal_no_plot">Nie znaleziono opisu</string>
     <string name="torrent_no_plot">Nie znaleziono opisu</string>
-    <string name="show_log_cat">Pokaż logcat 🐈</string>
+    <string name="show_log_cat">Pokaż Logcat 🐈</string>
     <string name="picture_in_picture">Obraz-w-obrazie</string>
     <string name="picture_in_picture_des">Oglądaj w małym, pływającym okienku</string>
     <string name="player_size_settings">Przycisk zmiany rozmiaru</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index ce8358cf..6b3db353 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,7 +1,6 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- KEYS DON'T TRANSLATE -->
-
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Tập %d</string>
     <string name="cast_format" formatted="true">Diễn viên: %s</string>
@@ -9,7 +8,6 @@
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-    
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
@@ -19,24 +17,20 @@
     <string name="go_back_img_des">Go back</string>
     <string name="home_change_provider_img_des">Change Provider</string>
     <string name="preview_background_img_des">Preview Background</string>
-
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Tốc độ (%.2fx)</string>
     <string name="rated_format" formatted="true">Đánh giá: %.1f</string>
-    <string name="new_update_format" formatted="true">Đã có bản cập nhật mới!\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">Đã có bản cập nhật mới!\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Bộ lọc</string>
     <string name="duration_format" formatted="true">%d phút</string>
-
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Mở với CloudStream</string>
     <string name="title_home">Trang Chủ</string>
     <string name="title_search">Tìm Kiếm</string>
     <string name="title_downloads">Tải Về</string>
     <string name="title_settings">Cài Đặt</string>
-
     <string name="search_hint">Tìm kiếm…</string>
     <string name="search_hint_site" formatted="true">Tìm kiếm %s…</string>
-
     <string name="no_data">Không có dữ liệu</string>
     <string name="episode_more_options_des">Thêm tuỳ chọn</string>
     <string name="next_episode">Tập tiếp theo</string>
@@ -45,7 +39,6 @@
     <string name="result_open_in_browser">Mở bằng trình duyệt</string>
     <string name="skip_loading">Bỏ qua</string>
     <string name="loading">Đang tải…</string>
-
     <string name="type_watching">Đang xem</string>
     <string name="type_on_hold">Đang chờ</string>
     <string name="type_completed">Đã xem</string>
@@ -53,7 +46,6 @@
     <string name="type_plan_to_watch">Xem sau</string>
     <string name="type_none">Mặc định</string>
     <string name="type_re_watching">Xem lại</string>
-
     <string name="play_movie_button">Xem Ngay</string>
     <string name="play_livestream_button">Phát trực tiếp</string>
     <string name="play_torrent_button">Xem Torrent</string>
@@ -63,7 +55,6 @@
     <string name="go_back">Quay lại</string>
     <string name="play_episode">Xem Tập Phim</string>
     <!--<string name="need_storage">Allow to download episodes</string>-->
-
     <string name="download">Tải xuống</string>
     <string name="downloaded">Đã tải</string>
     <string name="downloading">Đang tải</string>
@@ -73,18 +64,14 @@
     <string name="download_canceled">Đã hủy</string>
     <string name="download_done">Tải thành công</string>
     <string name="stream">Trực tiếp</string>
-
     <string name="error_loading_links_toast">Đã có lỗi xảy ra</string>
     <string name="download_storage_text">Bộ nhớ máy</string>
-
     <string name="app_dubbed_text">Lồng Tiếng</string>
     <string name="app_subbed_text">Phụ Đề</string>
-
     <string name="popup_delete_file">Xóa Tệp</string>
     <string name="popup_play_file">Xem Tệp</string>
     <string name="popup_resume_download">Tiếp tục tải</string>
     <string name="popup_pause_download">Tạm dừng tải</string>
-
     <string name="pref_disable_acra">Tắt tự động gửi dữ liệu khi xảy ra lỗi</string>
     <string name="home_more_info">Thông tin thêm</string>
     <string name="home_expanded_hide">Ẩn</string>
@@ -100,9 +87,7 @@
     <string name="sort_close">Đóng</string>
     <string name="sort_clear">Huỷ bỏ</string>
     <string name="sort_save">Lưu</string>
-	
     <string name="player_speed">Tốc độ phát</string>
-
     <string name="subtitles_settings">Cài đặt hiển thị phụ đề</string>
     <string name="subs_text_color">Màu chữ</string>
     <string name="subs_outline_color">Màu viền chữ</string>
@@ -112,35 +97,26 @@
     <string name="subs_subtitle_elevation">Độ nâng</string>
     <string name="subs_font">Kiểu chữ</string>
     <string name="subs_font_size">Kích thước chữ</string>
-
     <string name="search_provider_text_providers">Tìm kiếm theo nguồn phim</string>
     <string name="search_provider_text_types">Tìm kiếm theo thể loại</string>
-
     <string name="benene_count_text">%d lời cảm ơn đã được gửi tặng nhà phát triển</string>
     <string name="benene_count_text_none">Hãy tặng cho nhà phát triển một lời cảm ơn</string>
-
     <string name="subs_auto_select_language">Tự động chọn ngôn ngữ</string>
     <string name="subs_download_languages">Ngôn ngữ khi tải xuống</string>
     <string name="subs_subtitle_languages">Ngôn ngữ phụ đề</string>
     <string name="subs_hold_to_reset_to_default">Giữ để làm mới toàn bộ</string>
     <string name="subs_import_text" formatted="true">Thêm phông chữ tại %s</string>
     <string name="continue_watching">Tiếp tục xem</string>
-
     <string name="action_remove_watching">Loại bỏ</string>
     <string name="action_open_watching">Thông tin thêm</string>
     <string name="action_open_play">@string/home_play</string>
-
     <string name="vpn_might_be_needed">Bạn có thể sẽ cần sử dụng VPN để xem phim này</string>
     <string name="vpn_torrent">Phim này được chiếu dưới dạng Torrent. Hãy sử dụng VPN để xem</string>
-
-    <string name="provider_info_meta">Siêu dữ liệu không được cung cấp bởi trang web, quá trình tải video sẽ không thành công nếu nó không tồn tại trên trang web.</string>	
-
+    <string name="provider_info_meta">Siêu dữ liệu không được cung cấp bởi trang web, quá trình tải video sẽ không thành công nếu nó không tồn tại trên trang web.</string>
     <string name="torrent_plot">Thông tin phim</string>
     <string name="normal_no_plot">Đang cập nhật</string>
     <string name="torrent_no_plot">Không tìm thấy thông tin</string>
-
-    <string name="show_log_cat">Hiển thị logcat 🐈</string>
-
+    <string name="show_log_cat">Hiển thị Logcat 🐈</string>
     <string name="picture_in_picture">Chế độ cửa sổ nhỏ</string>
     <string name="picture_in_picture_des">Tiếp tục xem phim khi thoát app hoặc đang tìm kiếm</string>
     <string name="player_size_settings">Bật nút thu phóng khi xem</string>
@@ -149,44 +125,33 @@
     <string name="player_subtitles_settings_des">Cài đặt phụ đề</string>
     <string name="chromecast_subtitles_settings">Phụ đề Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Cài đặt phụ đề Chromecast</string>
-	
     <string name="eigengraumode_settings">Chỉnh tốc độ phim</string>
     <string name="eigengraumode_settings_des">Có thể điều chỉnh tốc độ phát phim</string>
     <string name="swipe_to_seek_settings">Vuốt để tua nhanh</string>
     <string name="swipe_to_seek_settings_des">Bạn có thể vuốt trái hoặc phải để tua nhanh khi xem phim</string>
     <string name="swipe_to_change_settings">Vuốt để chỉnh độ sáng và âm lượng</string>
     <string name="swipe_to_change_settings_des">Vuốt từ dưới lên trên ở bên trái hoặc phải đều điều chỉnh độ sáng và âm lượng</string>
-
     <string name="autoplay_next_settings">Tự động phát tập tiếp theo</string>
     <string name="autoplay_next_settings_des">Phát tập tiếp theo sau khi hết tập hiện tại</string>
-
     <string name="double_tap_to_seek_settings">Nhấn 2 lần để tua</string>
     <string name="double_tap_to_pause_settings">Nhấn 2 lần để tạm dừng</string>
     <string name="double_tap_to_seek_amount_settings">Thời lượng tua</string>
     <string name="double_tap_to_seek_settings_des">Nhấn 2 lần vào bên trái hoặc bên phải màn hình để tua trước hoặc sau</string>
-
     <string name="double_tap_to_pause_settings_des">Nhấn vào giữa để tạm dừng</string>
     <string name="use_system_brightness_settings">Sử dụng độ sáng hệ thống</string>
     <string name="use_system_brightness_settings_des">Sử dụng độ sáng hệ thống trong trình phát ứng dụng</string>
-
-
-
     <string name="episode_sync_settings">Cập nhật tiến trình xem</string>
     <string name="episode_sync_settings_des">Tự động đồng bộ tiến trình hiện tại của bạn</string>
-
     <string name="restore_settings">Khôi phục dữ liệu từ bản sao lưu</string>
-
     <string name="backup_settings">Sao lưu dữ liệu</string>
     <string name="restore_success">Đã tải dữ liệu sao lưu</string>
     <string name="restore_failed_format" formatted="true">Không thể khôi phục dữ liệu từ %s</string>
     <string name="backup_success">Khôi phục dữ liệu thành công</string>
     <string name="backup_failed">Thiếu quyền truy cập bộ nhớ, hãy thử lại</string>
     <string name="backup_failed_error_format">Lỗi khi sao lưu %s</string>
-
     <string name="search">Tìm kiếm</string>
     <string name="category_account">Tài khoản</string>
     <string name="category_updates">Cập nhật và sao lưu</string>
-    
     <string name="settings_info">Thông tin</string>
     <string name="advanced_search">Tìm kiếm nâng cao</string>
     <string name="advanced_search_des">Cho phép tìm kiếm theo bộ lọc từng nhà cung cấp</string>
@@ -196,7 +161,6 @@
     <string name="show_trailers_settings">Hiển thị trailer</string>
     <string name="kitsu_settings">Hiển thị poster từ kitsu</string>
     <string name="pref_filter_search_quality">Ẩn chất lượng Video khi tìm kiếm</string>
-
     <string name="automatic_plugin_updates">Tự động cập nhật plugin</string>
     <string name="updates_settings">Hiển thị thông báo cập nhật App</string>
     <string name="updates_settings_des">Tự động tìm kiếm và thông báo khi có bản cập nhật mới</string>
@@ -208,18 +172,13 @@
     <string name="discord">Tham gia cộng đồng trên Discord</string>
     <string name="benene">Gửi lời cảm ơn tới nhà phát triển</string>
     <string name="benene_des">Gửi lời cảm ơn</string>
-
     <string name="app_language">Ngôn ngữ ứng dụng</string>
-
     <string name="no_chromecast_support_toast">Nguồn phim này chưa hỗ trợ Chromecast</string>
     <string name="no_links_found_toast">Không tìm thấy link</string>
     <string name="copy_link_toast">Đã copy link vào bộ nhớ đệm</string>
     <string name="play_episode_toast">Xem Phim</string>
     <string name="subs_default_reset_toast">Làm mới toàn bộ cài đặt</string>
     <string name="acra_report_toast">Rất tiếc! Ứng dụng đã xảy ra lỗi. Chúng tôi đang tìm hiểu nguyên nhân và khắc phục nó</string>
-
-
-
     <string name="season">Mùa</string>
     <string name="no_season">Không có mùa nào</string>
     <string name="episode">Tập</string>
@@ -229,7 +188,6 @@
     <string name="season_short">M</string>
     <string name="episode_short">T</string>
     <string name="no_episodes_found">Không có tập nào</string>
-
     <string name="delete_file">Xóa Tệp</string>
     <string name="delete">Xóa</string>
     <string name="pause">Tạm Dừng</string>
@@ -238,8 +196,6 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message">%s sẽ bị xoá vĩnh viễn\nBạn có chắc chắn muốn xóa?</string>
     <string name="resume_time_left" formatted="true">%dm\ncòn lại</string>
-
-
     <string name="status_ongoing">Đang Chiếu</string>
     <string name="status_completed">Hoàn Thành</string>
     <string name="status">Trạng Thái</string>
@@ -248,15 +204,12 @@
     <string name="duration">Thời Lượng</string>
     <string name="site">Nguồn</string>
     <string name="synopsis">Thông tin</string>
-
     <string name="queued">Hàng chờ</string>
     <string name="no_subtitles">Không có phụ đề</string>
     <string name="default_subtitles">Mặc Định</string>
-
     <string name="free_storage">Còn trống</string>
     <string name="used_storage">Đã dùng</string>
     <string name="app_storage">App</string>
-
     <!--plural-->
     <string name="movies">Phim Lẻ</string>
     <string name="tv_series">Phim Bộ</string>
@@ -269,7 +222,6 @@
     <string name="livestreams">Trực tiếp</string>
     <string name="nsfw">NSFW</string>
     <string name="others">Khác</string>
-
     <!--singular-->
     <string name="movies_singular">Phim Lẻ</string>
     <string name="tv_series_singular">Phim Bộ</string>
@@ -282,13 +234,11 @@
     <string name="live_singular">Trực tiếp</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Video</string>
-
     <string name="source_error">Lỗi nguồn phim</string>
     <string name="remote_error">Lỗi kết nối tới máy chủ</string>
     <string name="render_error">Không thể render</string>
     <string name="unexpected_error">Đã có lỗi xảy ra. Vui lòng thử lại sau</string>
     <string name="storage_error">Lỗi tải xuống. Hãy kiểm tra quyền truy cập bộ nhớ của ứng dụng</string>
-
     <string name="episode_action_chromecast_episode">Tập Chromecast</string>
     <string name="episode_action_chromecast_mirror">Chiếu Chromecast</string>
     <string name="episode_action_play_in_app">Xem với trình phát mặc định</string>
@@ -299,55 +249,41 @@
     <string name="episode_action_download_mirror">Nguồn tải xuống</string>
     <string name="episode_action_reload_links">Lấy link mới nhất</string>
     <string name="episode_action_download_subtitle">Tải phụ đề</string>
-
     <string name="show_hd">Nhãn chất lượng phim</string>
     <string name="show_dub">Nhãn lồng tiếng</string>
     <string name="show_sub">Nhãn phụ đề</string>
     <string name="show_title">Tiêu đề</string>
     <string name="poster_ui_settings">Thay đổi giao diện trên poster</string>
-
     <string name="no_update_found">Bạn đang dùng phiên bản mới nhất</string>
     <string name="check_for_update">Kiểm tra cập nhật</string>
-
     <string name="video_lock">Khóa</string>
     <string name="video_aspect_ratio_resize">Thu Phóng</string>
     <string name="video_source">Tuỳ chọn</string>
     <string name="video_skip_op">Tập tiếp</string>
-
     <string name="dont_show_again">Không hiện lại</string>
     <string name="skip_update">Bỏ qua</string>
     <string name="update">Cập nhật</string>
     <string name="watch_quality_pref">Tự động chọn chất lượng phim</string>
     <string name="limit_title">Kí tự tối đa trên tiêu đề</string>
     <string name="limit_title_rez">Định dạng trình phát</string>
-
     <string name="video_buffer_size_settings">Dung lượng video cache</string>
     <string name="video_buffer_length_settings">Thời lượng bộ nhớ đệm</string>
     <string name="video_buffer_disk_settings">Dung lượng video cache</string>
     <string name="video_buffer_clear_settings">Xoá hình ảnh và video</string>
-
     <string name="video_ram_description">Sẽ gây lỗi nếu đặt quá cao. Không thay đổi nếu máy có dung lượng ram thấp, chẳng hạn như Android TV hoặc điện thoại cũ</string>
     <string name="video_disk_description">Sẽ thể gây lỗi trên các máy có dung lượng lưu trữ thấp, chẳng hạn như thiết bị Android TV nếu bạn đặt nó quá cao</string>
-
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Rất hữu ích để bỏ chặn ISP</string>
-
     <string name="add_site_pref">Sao chép trang web</string>
     <string name="remove_site_pref">Xoá trang web</string>
     <string name="add_site_summary">Thêm bản sao của một trang web, với một địa chỉ khác</string>
-
     <string name="download_path_pref">Đường dẫn tải xuống</string>
-
     <string name="nginx_url_pref">Địa chỉ máy chủ Nginx</string>
-
     <string name="display_subbed_dubbed_settings">Hiển thị nhãn Phụ đề hoặc Thuyết minh</string>
-	
     <string name="resize_fit">Vừa màn hình</string>
     <string name="resize_fill">Kéo dãn</string>
     <string name="resize_zoom">Phóng to</string>
-	
     <string name="legal_notice">Disclaimer</string>
-
     <string name="category_general">Tổng quan</string>
     <string name="random_button_settings">Nút ngẫu nhiên</string>
     <string name="random_button_settings_desc">Hiện nút ngẫu nhiên trên trang chủ</string>
@@ -358,18 +294,14 @@
     <string name="subtitles_encoding">Mã hoá phụ đề</string>
     <string name="category_providers">Nguồn phim</string>
     <string name="category_ui">Giao diện</string>
-
     <string name="automatic">Tự động</string>
     <string name="tv_layout">Giao diện TV</string>
     <string name="phone_layout">Giao diện điện thoại</string>
     <string name="emulator_layout">Giao diện giả lập</string>
-
     <string name="primary_color_settings">Màu chính</string>
     <string name="app_theme_settings">Chủ đề App</string>
     <string name="bottom_title_settings">Vị trí tiêu đề</string>
     <string name="bottom_title_settings_des">Đặt tiêu đề dưới poster</string>
-
-
     <!-- account stuff -->
     <string name="example_password">Mật khẩu</string>
     <string name="example_username">Tài khoản</string>
@@ -378,7 +310,6 @@
     <string name="example_site_name">Địa chỉ trang web</string>
     <string name="example_site_url">example.com</string>
     <string name="example_lang_name">Mã ngôn ngữ (vi)</string>
-
     <string name="login_format" formatted="true">%s %s</string>
     <string name="account">tài khoản</string>
     <string name="logout">Đăng xuất</string>
@@ -395,7 +326,6 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">Đã xác thực %s</string>
     <string name="authenticated_user_fail" formatted="true">Không thể xác thực %s</string>
-
     <!-- ============ -->
     <string name="none">Mặc định</string>
     <string name="normal">Bình thường</string>
@@ -412,7 +342,6 @@
     <string name="subtitle_offset_extra_hint_later_format">Dùng nếu phụ đề bị nhanh %dms</string>
     <string name="subtitle_offset_extra_hint_before_format">Dùng nếu phụ đề bị trễ %dms</string>
     <string name="subtitle_offset_extra_hint_none_format">Không chỉnh</string>
-
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
     see: 
@@ -420,7 +349,6 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">Xem trước mẫu phụ đề</string>
-
     <string name="recommended">Được đề xuất</string>
     <string name="player_loaded_subtitles" formatted="true">Đã tải %s</string>
     <string name="player_load_subtitles">Chọn từ máy</string>
@@ -429,12 +357,9 @@
     <string name="actor_main">Vai chính</string>
     <string name="actor_supporting">Vai phụ</string>
     <string name="actor_background">Lý lịch</string>
-
     <string name="home_source">Nguồn</string>
     <string name="home_random">Ngẫu nhiên</string>
-
     <string name="coming_soon">Sắp có…</string>
-
     <string name="quality_cam">Cam</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
@@ -451,7 +376,6 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">Áp phích</string>
     <string name="category_player">Trình phát</string>
     <string name="resolution_and_title">Độ phân giải và Tiêu đề</string>
@@ -500,15 +424,13 @@
     <string name="view_public_repositories_button">Xem kho lưu trữ của cộng đồng</string>
     <string name="view_public_repositories_button_short">Danh sách công khai</string>
     <string name="uppercase_all_subtitles">In hoa toàn bộ phụ đề</string>
-	
     <string name="download_all_plugins_from_repo">Tải toàn bộ plugin từ kho lưu trữ này?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Đã vô hiệu)</string>
     <string name="tracks">Thêm</string>
     <string name="audio_tracks">Âm thanh</string>
     <string name="video_tracks">Chất lượng Video</string>
     <string name="apply_on_restart">Áp dụng khi khởi động lại</string>
-
     <string name="safe_mode_title">Bật chế độ an toàn</string>
     <string name="safe_mode_description">Đã xảy ra sự cố và chúng tôi đã tự động tắt tất cả các tiện ích mở rộng, hãy tìm và xóa tiện ích mở rộng đang gây ra sự cố.</string>
     <string name="safe_mode_crash_info">Xem thông tin sự cố</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 5b71a3f9..8c58cbd5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,5 +1,5 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
     <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
@@ -17,7 +17,6 @@
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">封面</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
@@ -29,24 +28,20 @@
     <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">更改片源</string>
     <string name="preview_background_img_des">預覽背景</string>
-
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">速度（%.2fx）</string>
     <string name="rated_format" formatted="true">評分：%.1f</string>
-    <string name="new_update_format" formatted="true">發現新版本！\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">發現新版本！\n%s -&gt; %s</string>
     <string name="filler" formatted="true">填充</string>
     <string name="duration_format" formatted="true">%d 分鐘</string>
-
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">使用 CloudStream 播放</string>
     <string name="title_home">主頁</string>
     <string name="title_search">搜尋</string>
     <string name="title_downloads">下載</string>
     <string name="title_settings">設定</string>
-
     <string name="search_hint">搜尋…</string>
     <string name="search_hint_site" formatted="true">搜尋 %s…</string>
-
     <string name="no_data">無資料</string>
     <string name="episode_more_options_des">更多選項</string>
     <string name="next_episode">下一集</string>
@@ -56,7 +51,6 @@
     <string name="result_open_in_browser">在瀏覽器中打開</string>
     <string name="skip_loading">跳過載入</string>
     <string name="loading">載入中…</string>
-
     <string name="type_watching">正在觀看</string>
     <string name="type_on_hold">暫時擱置</string>
     <string name="type_completed">觀看完畢</string>
@@ -64,7 +58,6 @@
     <string name="type_plan_to_watch">計畫觀看</string>
     <string name="type_none">無</string>
     <string name="type_re_watching">重新觀看</string>
-
     <string name="play_movie_button">播放電影</string>
     <string name="play_livestream_button">播放直播</string>
     <string name="play_torrent_button">播放種子</string>
@@ -74,7 +67,6 @@
     <string name="go_back">返回</string>
     <string name="play_episode">播放劇集</string>
     <!--<string name="need_storage">允許下載劇集</string>-->
-
     <string name="download">下載</string>
     <string name="downloaded">已下載</string>
     <string name="downloading">下載中</string>
@@ -85,18 +77,14 @@
     <string name="download_done">下載完畢</string>
     <string name="download_format" translatable="false">%s - %s</string>
     <string name="stream">播放</string>
-
     <string name="error_loading_links_toast">載入連結錯誤</string>
     <string name="download_storage_text">內部存儲</string>
-
     <string name="app_dubbed_text">配音</string>
     <string name="app_subbed_text">字幕</string>
-
     <string name="popup_delete_file">刪除檔案</string>
     <string name="popup_play_file">播放檔案</string>
     <string name="popup_resume_download">繼續下載</string>
     <string name="popup_pause_download">暫停下載</string>
-
     <string name="pref_disable_acra">禁用自動錯誤報告</string>
     <string name="home_more_info">更多資訊</string>
     <string name="home_expanded_hide">隱藏</string>
@@ -112,9 +100,7 @@
     <string name="sort_close">關閉</string>
     <string name="sort_clear">清除</string>
     <string name="sort_save">保存</string>
-
     <string name="player_speed">播放速度</string>
-
     <string name="subtitles_settings">字幕設定</string>
     <string name="subs_text_color">字體顏色</string>
     <string name="subs_outline_color">輪廓顏色</string>
@@ -124,35 +110,26 @@
     <string name="subs_subtitle_elevation">字幕高度</string>
     <string name="subs_font">字體</string>
     <string name="subs_font_size">字體大小</string>
-
     <string name="search_provider_text_providers">按片源搜尋</string>
     <string name="search_provider_text_types">按類型搜尋</string>
-
     <string name="benene_count_text">送開發者 %d 根香蕉</string>
     <string name="benene_count_text_none">不送香蕉</string>
-
     <string name="subs_auto_select_language">自動選擇語言</string>
     <string name="subs_download_languages">下載語言</string>
     <string name="subs_subtitle_languages">字幕語言</string>
     <string name="subs_hold_to_reset_to_default">按住重設為預設值</string>
     <string name="subs_import_text" formatted="true">將字體導入到 %s</string>
     <string name="continue_watching">繼續觀看</string>
-
     <string name="action_remove_watching">移除</string>
     <string name="action_open_watching">更多資訊</string>
     <string name="action_open_play">@string/home_play </string>
-
     <string name="vpn_might_be_needed">此片源可能需要 VPN 才能正常使用</string>
     <string name="vpn_torrent">此片源是種子，建議使用 VPN</string>
-
     <string name="provider_info_meta">站點不提供元數據，如果站點上不存在元數據，影片載入將失敗。</string>
-
     <string name="torrent_plot">簡介</string>
     <string name="normal_no_plot">未找到簡介</string>
     <string name="torrent_no_plot">未找到簡介</string>
-
-    <string name="show_log_cat">顯示 logcat 🐈</string>
-
+    <string name="show_log_cat">顯示 Logcat 🐈</string>
     <string name="picture_in_picture">字母畫面</string>
     <string name="picture_in_picture_des">在其他應用程式上的子母畫面中繼續播放</string>
     <string name="player_size_settings">播放器調整大小按鈕</string>
@@ -161,17 +138,14 @@
     <string name="player_subtitles_settings_des">播放器字幕設定</string>
     <string name="chromecast_subtitles_settings">Chromecast 字幕</string>
     <string name="chromecast_subtitles_settings_des">Chromecast 字幕設定</string>
-
     <string name="eigengraumode_settings">播放速度</string>
     <string name="eigengraumode_settings_des">在播放器中添加播放速度選項</string>
     <string name="swipe_to_seek_settings">活動控制進度</string>
     <string name="swipe_to_seek_settings_des">左右滑動控制播放進度</string>
     <string name="swipe_to_change_settings">滑動更改設定</string>
     <string name="swipe_to_change_settings_des">上下滑動更改亮度或音量</string>
-
     <string name="autoplay_next_settings">自動播放下一集</string>
     <string name="autoplay_next_settings_des">播放完畢後播放下一集</string>
-
     <string name="double_tap_to_seek_settings">輕按兩下以控制進度</string>
     <string name="double_tap_to_pause_settings">輕按兩下以暫停</string>
     <string name="double_tap_to_seek_amount_settings">輕按兩下以控制進度時間</string>
@@ -180,23 +154,18 @@
     <string name="double_tap_to_pause_settings_des">輕按兩下中間以暫停</string>
     <string name="use_system_brightness_settings">使用系統亮度</string>
     <string name="use_system_brightness_settings_des">在應用程序播放器中使用系統亮度替代黑色遮罩</string>
-
     <string name="episode_sync_settings">更新觀看進度</string>
     <string name="episode_sync_settings_des">自動同步當前劇集進度</string>
-
     <string name="restore_settings">從備份中恢復資料</string>
-
     <string name="backup_settings">備份資料</string>
     <string name="restore_success">已載入備份資料</string>
     <string name="restore_failed_format" formatted="true">無法從 %s 檔案中還原資料</string>
     <string name="backup_success">成功儲存資料</string>
     <string name="backup_failed">缺少儲存權限，請重試</string>
     <string name="backup_failed_error_format">備份 %s 錯誤</string>
-
     <string name="search">搜尋</string>
     <string name="category_account">帳號</string>
     <string name="category_updates">更新與備份</string>
-
     <string name="settings_info">資訊</string>
     <string name="advanced_search">進階搜尋</string>
     <string name="advanced_search_des">為您提供按片源分開的搜尋結果</string>
@@ -206,7 +175,6 @@
     <string name="show_trailers_settings">顯示預告片</string>
     <string name="kitsu_settings">顯示來自 Kitsu 的封面</string>
     <string name="pref_filter_search_quality">在搜尋結果中隱藏選中的影片畫質</string>
-
     <string name="automatic_plugin_updates">自動更新外掛程式</string>
     <string name="updates_settings">顯示應用更新</string>
     <string name="updates_settings_des">啟動時自動搜尋更新</string>
@@ -218,16 +186,13 @@
     <string name="discord">加入 Discord</string>
     <string name="benene">送開發者一根香蕉</string>
     <string name="benene_des">送香蕉</string>
-
     <string name="app_language">應用程式語言</string>
-
     <string name="no_chromecast_support_toast">此片源不支援 Chromecast</string>
     <string name="no_links_found_toast">未找到連結</string>
     <string name="copy_link_toast">連結已複製到剪貼簿</string>
     <string name="play_episode_toast">播放劇集</string>
     <string name="subs_default_reset_toast">重設為預設值</string>
     <string name="acra_report_toast">很抱歉，應用崩潰了，將傳送一份匿名錯誤報告給開發者</string>
-
     <string name="season">季</string>
     <string name="season_format">%s %d%s</string>
     <string name="no_season">無季</string>
@@ -238,7 +203,6 @@
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">未找到劇集</string>
-
     <string name="delete_file">刪除文件</string>
     <string name="delete">刪除</string>
     <string name="cancel" translatable="false">@string/sort_cancel</string>
@@ -248,8 +212,6 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">這將永遠刪除 %s\n你確定嗎?</string>
     <string name="resume_time_left" formatted="true">剩餘 %d 分鐘</string>
-
-
     <string name="status_ongoing">連載中</string>
     <string name="status_completed">已完結</string>
     <string name="status">狀態</string>
@@ -258,15 +220,12 @@
     <string name="duration">時間</string>
     <string name="site">網站</string>
     <string name="synopsis">簡介</string>
-
     <string name="queued">已加入佇列</string>
     <string name="no_subtitles">無字幕</string>
     <string name="default_subtitles">預設</string>
-
     <string name="free_storage">空閒</string>
     <string name="used_storage">已使用</string>
     <string name="app_storage">應用程式</string>
-
     <!--plural-->
     <string name="movies">電影</string>
     <string name="tv_series">電視劇</string>
@@ -279,7 +238,6 @@
     <string name="livestreams">直播</string>
     <string name="nsfw">NSFW</string>
     <string name="others">其他</string>
-
     <!--singular-->
     <string name="movies_singular">電影</string>
     <string name="tv_series_singular">電視劇</string>
@@ -292,13 +250,11 @@
     <string name="live_singular">直播</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">其他</string>
-
     <string name="source_error">來源錯誤</string>
     <string name="remote_error">遠端錯誤</string>
     <string name="render_error">渲染器錯誤</string>
     <string name="unexpected_error">意料之外的播放器錯誤</string>
     <string name="storage_error">下載錯誤，請檢查儲存權限</string>
-
     <string name="episode_action_chromecast_episode">Chromecast 劇集</string>
     <string name="episode_action_chromecast_mirror">Chromecast 鏡像</string>
     <string name="episode_action_play_in_app">在應用程式中播放</string>
@@ -309,7 +265,6 @@
     <string name="episode_action_download_mirror">下載鏡像</string>
     <string name="episode_action_reload_links">重新載入連結</string>
     <string name="episode_action_download_subtitle">下載字幕</string>
-
     <string name="show_hd">畫質標籤</string>
     <string name="show_dub">配音標籤</string>
     <string name="show_sub">字幕標籤</string>
@@ -319,47 +274,35 @@
     <string name="show_sub_key" translatable="false">show_sub_key</string>
     <string name="show_title_key" translatable="false">show_title_key</string>
     <string name="poster_ui_settings">封面內容</string>
-
     <string name="no_update_found">未找到更新</string>
     <string name="check_for_update">检查更新</string>
-
     <string name="video_lock">鎖定</string>
     <string name="video_aspect_ratio_resize">調整大小</string>
     <string name="video_source">來源</string>
     <string name="video_skip_op">跳過片頭</string>
-
     <string name="dont_show_again">不再顯示</string>
     <string name="skip_update">跳過此更新</string>
     <string name="update">更新</string>
     <string name="watch_quality_pref">偏好播放畫質</string>
     <string name="limit_title">影片播放器標題最大字數</string>
     <string name="limit_title_rez">影片播放器標題</string>
-
     <string name="video_buffer_size_settings">影片緩衝大小</string>
     <string name="video_buffer_length_settings">影片緩衝長度</string>
     <string name="video_buffer_disk_settings">影片快取存儲</string>
     <string name="video_buffer_clear_settings">清除影片和圖片快取</string>
-
     <string name="video_ram_description">如果設定得太高會導致隨機崩潰。 如果您的記憶體不足（例如 Android TV 或舊手機），請不要更改</string>
     <string name="video_disk_description">如果您將其設定得太高，可能會導致儲存空間不足的系統（例如 Android TV 設備）出現問題</string>
-
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">用於繞過網路服務供應商的封鎖</string>
-
     <string name="add_site_pref">複製片源</string>
     <string name="remove_site_pref">移除片源</string>
     <string name="add_site_summary">添加具有不同URL的現有站點複製</string>
-
     <string name="download_path_pref">下載路徑</string>
-
     <string name="nginx_url_pref">Nginx 伺服器連結</string>
-
     <string name="display_subbed_dubbed_settings">顯示有配音/字幕的動漫</string>
-
     <string name="resize_fit">適應螢幕</string>
     <string name="resize_fill">拉伸</string>
     <string name="resize_zoom">縮放</string>
-
     <string name="legal_notice">免責聲明</string>
     <string name="legal_notice_key" translatable="false">legal_notice_key</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
@@ -388,18 +331,14 @@
     <string name="subtitles_encoding">字幕編碼</string>
     <string name="category_providers">片源</string>
     <string name="category_ui">佈局</string>
-
     <string name="automatic">自動</string>
     <string name="tv_layout">電視佈局</string>
     <string name="phone_layout">手機佈局</string>
     <string name="emulator_layout">模擬器佈局</string>
-
     <string name="primary_color_settings">主題色</string>
     <string name="app_theme_settings">應用程式主題</string>
     <string name="bottom_title_settings">封面標題位置</string>
     <string name="bottom_title_settings_des">將標題移到封面下方</string>
-
-
     <!-- account stuff -->
     <string name="anilist_key" translatable="false">anilist_key</string>
     <string name="mal_key" translatable="false">mal_key</string>
@@ -412,7 +351,6 @@
     <string name="example_site_name">網站名稱</string>
     <string name="example_site_url">網站連結</string>
     <string name="example_lang_name">語言代號 (zh_TW)</string>
-
     <!--
     <string name="mal_account_settings" translatable="false">MAL</string>
     <string name="anilist_account_settings" translatable="false">AniList</string>
@@ -437,7 +375,6 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">已驗證 %s</string>
     <string name="authenticated_user_fail" formatted="true">驗證 %s 失敗</string>
-
     <!-- ============ -->
     <string name="none">無</string>
     <string name="normal">普通</string>
@@ -455,7 +392,6 @@
     <string name="subtitle_offset_extra_hint_later_format">如果字幕過早顯示 %dms ，請使用此選項</string>
     <string name="subtitle_offset_extra_hint_before_format">如果字幕過晚顯示 %dms ，請使用此選項</string>
     <string name="subtitle_offset_extra_hint_none_format">無字幕延遲</string>
-
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
     see: 
@@ -463,7 +399,6 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">The quick brown fox jumps over the lazy dog</string>
-
     <string name="recommended">推薦</string>
     <string name="player_loaded_subtitles" formatted="true">已載入 %s</string>
     <string name="player_load_subtitles">從檔案載入</string>
@@ -472,12 +407,9 @@
     <string name="actor_main">主角</string>
     <string name="actor_supporting">配角</string>
     <string name="actor_background">群演</string>
-
     <string name="home_source">來源</string>
     <string name="home_random">隨機</string>
-
     <string name="coming_soon">即將到來…</string>
-
     <string name="quality_cam">Cam</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
@@ -494,7 +426,6 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">封面圖片</string>
     <string name="category_player">播放器</string>
     <string name="resolution_and_title">解析度與標題</string>
@@ -544,18 +475,15 @@
     <string name="view_public_repositories_button">查看</string>
     <string name="view_public_repositories_button_short">公開列表</string>
     <string name="uppercase_all_subtitles">字幕全大寫</string>
-
     <string name="download_all_plugins_from_repo">從此資源庫下載所有外掛程式？</string>
     <string name="single_plugin_disabled" formatted="true">%s （禁用）</string>
     <string name="tracks">軌道</string>
     <string name="audio_tracks">音頻軌道</string>
     <string name="video_tracks">影片軌道</string>
     <string name="apply_on_restart">重新啟動時生效</string>
-
     <string name="safe_mode_title">安全模式已啟用</string>
     <string name="safe_mode_description">發生了不可恢復的崩潰，我們已自動禁用所有外掛程式，因此您可以找到並刪除導致問題的應用程式。</string>
     <string name="safe_mode_crash_info">查看崩潰資訊</string>
-
     <string name="extension_rating" formatted="true">評分：%s</string>
     <string name="extension_description">簡介</string>
     <string name="extension_version">版本</string>
@@ -565,9 +493,7 @@
     <string name="extension_types">類型</string>
     <string name="extension_language">語言</string>
     <string name="extension_install_first">請先安裝外掛程式</string>
-
     <string name="hls_playlist">HLS 播放清單</string>
-
     <string name="player_pref">偏好影片播放器</string>
     <string name="player_settings_play_in_app">內部播放器</string>
     <string name="player_settings_play_in_vlc">VLC</string>
@@ -576,7 +502,6 @@
     <string name="player_settings_play_in_browser">瀏覽器</string>
     <string name="app_not_found_error">未找到應用</string>
     <string name="all_languages_preference">所有語言</string>
-
     <string name="skip_type_format" formatted="true">跳過 %s</string>
     <string name="skip_type_op">片頭</string>
     <string name="skip_type_ed">片尾</string>
@@ -585,7 +510,6 @@
     <string name="skip_type_mixed_op">混合片頭</string>
     <string name="skip_type_creddits">致謝名單</string>
     <string name="skip_type_intro">介紹</string>
-
     <string name="clear_history">清除歷史紀錄</string>
     <string name="history">歷史紀錄</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f7f197cf..d25e6739 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -188,7 +188,7 @@
     <string name="torrent_plot">Description</string>
     <string name="normal_no_plot">No Plot Found</string>
     <string name="torrent_no_plot">No Description Found</string>
-    <string name="show_log_cat">Show logcat 🐈</string>
+    <string name="show_log_cat">Show Logcat 🐈</string>
     <string name="picture_in_picture">Picture-in-picture</string>
     <string name="picture_in_picture_des">Continues playback in a miniature player on top of other apps</string>
     <string name="player_size_settings">Player resize button</string>
@@ -362,7 +362,7 @@
     <string name="remove_site_pref">Remove site</string>
     <string name="add_site_summary">Add a clone of an existing site, with a different url</string>
     <string name="download_path_pref">Download path</string>
-    <string name="nginx_url_pref">Nginx server url</string>
+    <string name="nginx_url_pref">NGINX server URL</string>
     <string name="display_subbed_dubbed_settings">Display Dubbed/Subbed Anime</string>
     <string name="resize_fit">Fit to screen</string>
     <string name="resize_fill">Stretch</string>
@@ -425,8 +425,8 @@
     -->
     <string name="login_format" formatted="true">%s %s</string>
     <string name="account">account</string>
-    <string name="logout">Logout</string>
-    <string name="login">Login</string>
+    <string name="logout">Log out</string>
+    <string name="login">Log in</string>
     <string name="switch_account">Switch account</string>
     <string name="add_account">Add account</string>
     <string name="create_account">Create account</string>
@@ -451,7 +451,7 @@
     <string name="subtitles_shadow">Shadow</string>
     <string name="subtitles_raised">Raised</string>
     <string name="subtitle_offset">Sync subs</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Subtitle delay</string>
     <string name="subtitle_offset_extra_hint_later_format">Use this if the subtitles are shown %dms too early</string>
     <string name="subtitle_offset_extra_hint_before_format">Use this if subtitles are shown %dms too late</string>

From 1e636c8b08a91b55606ef9242cc66758f609c6a4 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sun, 18 Dec 2022 14:31:44 +0100
Subject: [PATCH 115/273] add bengali

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 551a80ab..68b65820 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -81,6 +81,7 @@ val appLanguages = arrayListOf(
     Triple("", "Czech", "cs"),
     Triple("", "Croatian", "hr"),
     Triple("", "Bulgarian", "bg"),
+    Triple("", "Bengali", "bn"),
 ).sortedBy { it.second } //ye, we go alphabetical, so ppl don't put their lang on top
 
 class SettingsGeneral : PreferenceFragmentCompat() {

From 50fc8d0ffb85efa926c7b286fc7874a59bfe3605 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Sun, 18 Dec 2022 16:41:59 +0100
Subject: [PATCH 116/273] Translated using Weblate (Bengali)

Currently translated at 25.0% (136 of 542 strings)

Translated using Weblate (Bengali)

Currently translated at 25.0% (136 of 542 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (542 of 542 strings)

Translated using Weblate (Greek)

Currently translated at 82.4% (447 of 542 strings)

Translated using Weblate (Bengali)

Currently translated at 19.9% (108 of 542 strings)

Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Thanasis Trispiotis <sdi2000194@di.uoa.gr>
Co-authored-by: Translator-3000 <weblate.m1d0h@8shield.net>
Co-authored-by: duckling <salmanfc.bd@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/el/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translation: Cloudstream/App
---
 app/src/main/res/values-bn/strings.xml |  57 ++++++++-
 app/src/main/res/values-el/strings.xml |   8 ++
 app/src/main/res/values-it/strings.xml | 155 ++++++++-----------------
 3 files changed, 115 insertions(+), 105 deletions(-)

diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index a6b3daec..b37705b0 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -1,2 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="result_poster_img_des">পোস্টার</string>
+    <string name="play_with_app_name">ক্লাউডস্ট্রিম দিয়ে চালান</string>
+    <string name="title_home">হোম</string>
+    <string name="cast_format" formatted="true">অভিনয়েঃ %s</string>
+    <string name="next_episode_time_day_format" formatted="true">%dদিন %dঘন্টা %dমিনিট</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dঘন্টা %dমিনিট</string>
+    <string name="next_episode_time_min_format" formatted="true">%d মিনিট</string>
+    <string name="episode_poster_img_des">এপিসোড পোস্টার</string>
+    <string name="home_main_poster_img_des">মূল পোস্টার</string>
+    <string name="home_next_random_img_des">পরবর্তী র‍্যান্ডম</string>
+    <string name="go_back_img_des">ফিরে যান</string>
+    <string name="home_change_provider_img_des">প্রোভাইডার পরিবর্তন করুন</string>
+    <string name="preview_background_img_des">ব্যাকগ্রাউন্ড দেখান</string>
+    <string name="player_speed_text_format" formatted="true">গতি (%.2f গুণ)</string>
+    <string name="rated_format" formatted="true">মূল্যায়নঃ %.1f</string>
+    <string name="new_update_format" formatted="true">নতুন আপডেট এসেছে!
+\n%s -&gt; %s</string>
+    <string name="filler" formatted="true">ফিলার</string>
+    <string name="duration_format" formatted="true">%d মিনিট</string>
+    <string name="app_name">ক্লাউডস্ট্রিম</string>
+    <string name="title_search">খুঁজুন</string>
+    <string name="title_downloads">ডাউনলোডসমূহ</string>
+    <string name="title_settings">সেটিংস</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s এপি %d</string>
+    <string name="next_episode_format" formatted="true">এপিসোড %d রিলিজ হবে</string>
+    <string name="result_share">শেয়ার</string>
+    <string name="result_open_in_browser">ব্রাঊজারে খুলুন</string>
+    <string name="result_tags">জনরা</string>
+    <string name="search_hint">খুঁজুন…</string>
+    <string name="search_hint_site" formatted="true">খুঁজুন %s…</string>
+    <string name="play_movie_button">মুভি চালান</string>
+    <string name="play_livestream_button">স্ট্রিম চালান</string>
+    <string name="go_back">পিছনে যান</string>
+    <string name="no_data">কোন তথ্য নেই</string>
+    <string name="episode_more_options_des">আরো অপশন</string>
+    <string name="next_episode">পরবর্তি এপিসোড</string>
+    <string name="skip_loading">লোডিং বাদ দিন</string>
+    <string name="loading">লোডিং…</string>
+    <string name="type_watching">দেখা হচ্ছে</string>
+    <string name="type_on_hold">স্থগিত</string>
+    <string name="type_completed">শেষ</string>
+    <string name="type_dropped">বাদ</string>
+    <string name="type_plan_to_watch">দেখার ইচ্ছায়</string>
+    <string name="type_none">কোন কিছুই না</string>
+    <string name="type_re_watching">পুনরায় দেখা হচ্ছে</string>
+    <string name="play_torrent_button">টরেন্ট স্ট্রিম করুন</string>
+    <string name="pick_source">সোর্সসমূহ</string>
+    <string name="pick_subtitle">সাবটাইটেলসমূহ</string>
+    <string name="reload_error">আবার সংযোগ দেওয়ার চেষ্টা করুন…</string>
+    <string name="play_episode">এপিসোড চালান</string>
+    <string name="download">ডাউনলোড</string>
+    <string name="downloaded">ডাউনলোড করা</string>
+    <string name="downloading">ডাউনলোড চলছে</string>
+    <string name="download_paused">ডাউনলোড স্থগিত</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 0604c109..ab6609bb 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -362,4 +362,12 @@
     <string name="player_settings_play_in_web">Web Video Cast</string>
     <string name="player_settings_play_in_browser">Περιηγητής</string>
     <string name="app_not_found_error">Η εφαρμογή δεν βρέθηκε</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Επ %d</string>
+    <string name="next_episode_format" formatted="true">Το επεισόδιο %d θα κυκλοφορήσει σε</string>
+    <string name="filler" formatted="true">Φίλτρο</string>
+    <string name="duration_format" formatted="true">%d λεπτά</string>
+    <string name="cast_format" formatted="true">Ηθοποιοί: %s</string>
+    <string name="next_episode_time_day_format" formatted="true">%dμ %dω %dλ</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dω %dλ</string>
+    <string name="next_episode_time_min_format" formatted="true">%dλ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index fa1653c6..bbf14d28 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,5 +1,5 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
@@ -7,34 +7,29 @@
     <string name="next_episode_time_day_format" formatted="true">%dg %do %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%do %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
-    <string name="episode_poster_img_des">Episode Poster</string>
-    <string name="home_main_poster_img_des">Main Poster</string>
-    <string name="home_next_random_img_des">Next Random</string>
-    <string name="go_back_img_des">Go back</string>
-    <string name="home_change_provider_img_des">Change Provider</string>
-    <string name="preview_background_img_des">Preview Background</string>
-
+    <string name="episode_poster_img_des">Poster episodio</string>
+    <string name="home_main_poster_img_des">Poster principale</string>
+    <string name="home_next_random_img_des">Prossimo casuale</string>
+    <string name="go_back_img_des">Torna indietro</string>
+    <string name="home_change_provider_img_des">Cambia provider</string>
+    <string name="preview_background_img_des">Anteprima sfondo</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Velocità (%.2fx)</string>
     <string name="rated_format" formatted="true">Valutato: %.1f</string>
-    <string name="new_update_format" formatted="true">Nuovo aggiornamento trovato!\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">Nuovo aggiornamento trovato!\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
-
     <!-- <string name="app_name">CloudStream</string> -->
     <string name="play_with_app_name">Riproduci con CloudStream</string>
     <string name="title_home">Home</string>
     <string name="title_search">Cerca</string>
     <string name="title_downloads">Scaricati</string>
     <string name="title_settings">Impostazioni</string>
-
     <string name="search_hint">Cerca…</string>
     <string name="search_hint_site" formatted="true">Cerca in %s…</string>
-
     <string name="no_data">Nessun dato</string>
     <string name="episode_more_options_des">Più impostazioni</string>
     <string name="next_episode">Prossimo episodio</string>
@@ -43,7 +38,6 @@
     <string name="result_open_in_browser">Apri nel browser</string>
     <string name="skip_loading">Salta caricamento</string>
     <string name="loading">Caricamento…</string>
-
     <string name="type_watching">Guardando</string>
     <string name="type_on_hold">In attesa</string>
     <string name="type_completed">Completato</string>
@@ -51,7 +45,6 @@
     <string name="type_plan_to_watch">Da guardare</string>
     <string name="type_none">Nessuno</string>
     <string name="type_re_watching">Riguardando</string>
-
     <string name="play_movie_button">Riproduci film</string>
     <string name="play_livestream_button">Riproduci Livestream</string>
     <string name="play_torrent_button">Stream Torrent</string>
@@ -60,7 +53,6 @@
     <string name="reload_error">Riprova connesisone…</string>
     <string name="go_back">Indietro</string>
     <string name="play_episode">Riproduci episodio</string>
-
     <string name="download">Scarica</string>
     <string name="downloaded">Scaricato</string>
     <string name="downloading">Download in corso</string>
@@ -70,18 +62,14 @@
     <string name="download_canceled">Download cancellato</string>
     <string name="download_done">Download completato</string>
     <string name="stream">Stream</string>
-
     <string name="error_loading_links_toast">Errore durante il caricamento dei link</string>
     <string name="download_storage_text">Archiviazione interna</string>
-
-    <string name="app_dubbed_text">Dub</string>
-    <string name="app_subbed_text">Sub</string>
-
+    <string name="app_dubbed_text">Doppiato</string>
+    <string name="app_subbed_text">Sottotitolato</string>
     <string name="popup_delete_file">Elimina file</string>
     <string name="popup_play_file">Riproduci file</string>
     <string name="popup_resume_download">Riprendi download</string>
     <string name="popup_pause_download">Ferma download</string>
-
     <string name="pref_disable_acra">Disabilita segnalazione automatica di bug</string>
     <string name="home_more_info">Più info</string>
     <string name="home_expanded_hide">Nascondi</string>
@@ -97,9 +85,7 @@
     <string name="sort_close">Chiudi</string>
     <string name="sort_clear">Cancella</string>
     <string name="sort_save">Salva</string>
-
     <string name="player_speed">Velocità video</string>
-
     <string name="subtitles_settings">Impostazioni sottotitoli</string>
     <string name="subs_text_color">Colore testo</string>
     <string name="subs_outline_color">Colore contorno</string>
@@ -109,35 +95,26 @@
     <string name="subs_subtitle_elevation">Elevazione sottotitolo</string>
     <string name="subs_font">Carattere</string>
     <string name="subs_font_size">Dimensione</string>
-
     <string name="search_provider_text_providers">Cerca per provider</string>
     <string name="search_provider_text_types">Cerca per tipo</string>
-
     <string name="benene_count_text">%d banane date agli sviluppatori</string>
     <string name="benene_count_text_none">Nessuna banana data</string>
-
     <string name="subs_auto_select_language">Selezione automatica lingua</string>
     <string name="subs_download_languages">Lingue da scaricare</string>
     <string name="subs_subtitle_languages">Lingue sottotitoli</string>
     <string name="subs_hold_to_reset_to_default">Tenere premuto per ripristinare le impostazioni predefinite</string>
     <string name="subs_import_text" formatted="true">Importa font mettendoli in %s</string>
     <string name="continue_watching">Continua a guardare</string>
-
     <string name="action_remove_watching">Rimuovi</string>
     <string name="action_open_watching">Più info</string>
     <string name="action_open_play">@string/home_play</string>
-
     <string name="vpn_might_be_needed">Potrebbe essere necessaria una VPN per far funzionare correttamente questo provider</string>
     <string name="vpn_torrent">Questo provider è un torrent, si raccomanda una VPN</string>
-
     <string name="provider_info_meta">I metadati non sono forniti dal sito, il caricamento del video fallirà se non esiste sul sito.</string>
-
     <string name="torrent_plot">Descrizione</string>
     <string name="normal_no_plot">Nessuna trama trovata</string>
     <string name="torrent_no_plot">Nessuna descrizione trovata</string>
-
     <string name="show_log_cat">Mostra Logcat 🐈</string>
-
     <string name="picture_in_picture">Picture-in-Picture</string>
     <string name="picture_in_picture_des">Continua la riproduzione in un player in miniatura sopra altre applicazioni</string>
     <string name="player_size_settings">Pulsante di ridimensionamento del video</string>
@@ -146,17 +123,14 @@
     <string name="player_subtitles_settings_des">Impostazioni sottotitoli</string>
     <string name="chromecast_subtitles_settings">Sottotitoli Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Impostazioni sottotitoli Chromecast</string>
-
     <string name="eigengraumode_settings">Modalità Eigengravy</string>
     <string name="eigengraumode_settings_des">Aggiungi opzione velocità nel player</string>
     <string name="swipe_to_seek_settings">Scorri per mandare avanti/indietro</string>
     <string name="swipe_to_seek_settings_des">Scorri a sinistra o a destra per controllare il tempo del video</string>
     <string name="swipe_to_change_settings">Scorri per cambiare le impostazioni</string>
     <string name="swipe_to_change_settings_des">Passa il dito sul lato sinistro o destro per cambiare la luminosità o il volume</string>
-
     <string name="autoplay_next_settings">Riproduci automaticamente l\'episodio successivo</string>
     <string name="autoplay_next_settings_des">Avvia l\'episodio successivo al termine di quello in corso</string>
-
     <string name="double_tap_to_seek_settings">Doppio tocco per andare avanti/indietro</string>
     <string name="double_tap_to_pause_settings">Doppio tocco per mettere in pausa</string>
     <string name="double_tap_to_seek_settings_des">Tocca due volte il lato destro o sinistro dello schermo per mandare avanti o indietro il video</string>
@@ -164,23 +138,18 @@
     <string name="double_tap_to_seek_amount_settings">Player seek</string>
     <string name="use_system_brightness_settings">Utilizzare la luminosità del sistema</string>
     <string name="use_system_brightness_settings_des">Utilizzare la luminosità del sistema al posto di una sovrapposizione scura</string>
-
     <!--<string name="episode_sync_settings">Update watch progress</string>-->
     <string name="episode_sync_settings_des">Sincronizza automaticamente gli episodi guardati</string>
-
     <string name="restore_settings">Ripristinare i dati da backup</string>
-
     <string name="backup_settings">Backup data</string>
     <string name="restore_success">File di backup caricato</string>
     <string name="restore_failed_format" formatted="true">Impossibile ripristinare i dati dal file %s</string>
     <string name="backup_success">Dati salvati con successo</string>
     <string name="backup_failed">Permessi di archiviazione mancanti, riprova</string>
     <string name="backup_failed_error_format">Errore nel backup %s</string>
-
     <string name="search">Cerca</string>
     <string name="category_account">Accounts</string>
     <string name="category_updates">Aggiornamenti e Backup</string>
-
     <string name="settings_info">Info</string>
     <string name="advanced_search">Ricerca avanzata</string>
     <string name="advanced_search_des">Dividi i risultati della ricerca per provider</string>
@@ -190,7 +159,6 @@
     <string name="show_trailers_settings">Mostra trailer</string>
     <string name="kitsu_settings">Mostra poster da Kitsu</string>
     <string name="pref_filter_search_quality">Nascondi la qualità video selezionata dai risultati di ricerca</string>
-
     <string name="automatic_plugin_updates">Aggiorna automaticamente i plugin</string>
     <string name="updates_settings">Mostra gli aggiornamenti dell\'app</string>
     <string name="updates_settings_des">Cerca automaticamente nuovi aggiornamenti all\'avvio</string>
@@ -202,16 +170,13 @@
     <string name="discord">Entra in Discord</string>
     <string name="benene">Dai una banana agli sviluppatori</string>
     <string name="benene_des">Dai una banana</string>
-
     <string name="app_language">Lingua app</string>
-
     <string name="no_chromecast_support_toast">Questo provider non ha il supporto per Chromecast</string>
     <string name="no_links_found_toast">Nessun link trovato</string>
     <string name="copy_link_toast">Link copiato negli appunti</string>
     <string name="play_episode_toast">Riproduci episodio</string>
     <string name="subs_default_reset_toast">Ripristina il valore predefinito</string>
     <string name="acra_report_toast">Spiacente, l\'applicazione è andata in crash. Una segnalazione anonima di bug sarà inviata agli sviluppatori</string>
-
     <string name="season">Stagione</string>
     <string name="season_format">%s %d%s</string>
     <string name="no_season">Nessuna stagione</string>
@@ -222,7 +187,6 @@
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Nessun episodio trovato</string>
-
     <string name="delete_file">Elimina file</string>
     <string name="delete">Elimina</string>
     <string name="pause">Pausa</string>
@@ -231,7 +195,6 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">Stai per eliminare permanentemente %s\nSei sicuro?</string>
     <string name="resume_time_left" formatted="true">%dm\nrimanenti</string>
-
     <string name="status_ongoing">In corso</string>
     <string name="status_completed">Completato</string>
     <string name="status">Stato</string>
@@ -240,15 +203,12 @@
     <string name="duration">Durata</string>
     <string name="site">Sito</string>
     <string name="synopsis">Sinossi</string>
-
     <string name="queued">In coda</string>
     <string name="no_subtitles">Nessun sottotiolo</string>
     <string name="default_subtitles">Default</string>
-
     <string name="free_storage">Libero</string>
     <string name="used_storage">Usato</string>
     <string name="app_storage">App</string>
-
     <!--plural-->
     <string name="movies">Film</string>
     <string name="tv_series">Serie TV</string>
@@ -261,7 +221,6 @@
     <string name="livestreams">Livestreams</string>
     <string name="nsfw">NSFW</string>
     <string name="others">Altri</string>
-
     <!--singular-->
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Serie TV</string>
@@ -274,71 +233,56 @@
     <string name="live_singular">Livestream</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Altro</string>
-
     <string name="source_error">Source error</string>
-    <string name="remote_error">Remote error</string>
-    <string name="render_error">Renderer error</string>
+    <string name="remote_error">Errore remoto</string>
+    <string name="render_error">Errore del renderer</string>
     <string name="unexpected_error">Errore inaspettato nel player video</string>
     <string name="storage_error">Errore download, controlla i permessi di archiviazione</string>
-
     <string name="episode_action_chromecast_episode">Chromecast</string>
-    <string name="episode_action_chromecast_mirror">Chromecast mirror</string>
+    <string name="episode_action_chromecast_mirror">Mirror Chromecast</string>
     <string name="episode_action_play_in_app">Riproduci in app</string>
     <string name="episode_action_play_in_format">Riproduci in %s</string>
     <string name="episode_action_play_in_browser">Riproduci nel browser</string>
     <string name="episode_action_copy_link">Copia link</string>
     <string name="episode_action_auto_download">Download</string>
-    <string name="episode_action_download_mirror">Download mirror</string>
+    <string name="episode_action_download_mirror">Mirror download</string>
     <string name="episode_action_reload_links">Aggiorna link</string>
     <string name="episode_action_download_subtitle">Download sottotitoli</string>
-
     <string name="show_hd">Etichetta Qualità</string>
     <string name="show_dub">Etichetta Dub</string>
     <string name="show_sub">Etichetta Sub</string>
     <string name="show_title">Titolo</string>
     <string name="poster_ui_settings">Etichette sui Poster</string>
-
     <string name="no_update_found">Nessun aggiornamento trovato</string>
     <string name="check_for_update">Controlla aggiornamenti</string>
-
     <string name="video_lock">Blocca</string>
     <string name="video_aspect_ratio_resize">Ridimensiona</string>
     <string name="video_source">Sorgente</string>
     <string name="video_skip_op">Salta intro</string>
-
     <string name="dont_show_again">Non mostrare di nuovo</string>
     <string name="skip_update">Salta questo aggiornamento</string>
     <string name="update">Aggiorna</string>
     <string name="watch_quality_pref">Risoluzione preferita</string>
     <string name="limit_title">Limita i caratteri del titolo nel player</string>
     <string name="limit_title_rez">Risoluzione video player</string>
-
     <string name="video_buffer_size_settings">Dimensione cache video</string>
     <string name="video_buffer_length_settings">Lunghezza buffer video</string>
     <string name="video_buffer_disk_settings">Dimensione cache video su disco</string>
     <string name="video_buffer_clear_settings">Cancella cache immagini e video</string>
-
     <string name="video_ram_description">Se impostato troppo alto può causare problemi su sistemi con poca RAM. Come i dispositivi Android TV o vecchi telefoni</string>
     <string name="video_disk_description">Se impostato troppo alto può causare problemi su sistemi con poca Archiviazione interna. Come i dispositivi Android TV</string>
-
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Utile per bypassare i blocchi ISP</string>
-
     <string name="add_site_pref">Clona un sito</string>
     <string name="remove_site_pref">Rimuovi sito</string>
     <string name="add_site_summary">Aggiungi un clone di un sito esistente, con un url differente</string>
-
     <string name="download_path_pref">Posizione Download</string>
-
-    <string name="nginx_url_pref">URL Nginx server</string>
-
+    <string name="nginx_url_pref">URL server NGINX</string>
     <string name="display_subbed_dubbed_settings">Mostra anime doppiati/sottotitolati</string>
-
     <string name="resize_fit">Adatta allo schermo</string>
     <string name="resize_fill">Allunga</string>
     <string name="resize_zoom">Zoom</string>
-
-    <string name="legal_notice">Disclaimer</string>
+    <string name="legal_notice">Avvertenza</string>
     <string name="category_general">Generale</string>
     <string name="random_button_settings">Random</string>
     <string name="random_button_settings_desc">Mostra pulsante Random nella homepage</string>
@@ -349,43 +293,38 @@
     <string name="subtitles_encoding">Encoding Sottotitoli</string>
     <string name="category_providers">Provider</string>
     <string name="category_ui">Interfaccia utente</string>
-
     <string name="automatic">Auto</string>
     <string name="tv_layout">Layout TV</string>
     <string name="phone_layout">Layout Telefono</string>
     <string name="emulator_layout">Layout Emulatore</string>
-
     <string name="primary_color_settings">Colore primario</string>
     <string name="app_theme_settings">Tema</string>
     <string name="bottom_title_settings">Posizione Titolo sui Poster</string>
     <string name="bottom_title_settings_des">Titolo sotto il poster</string>
-
     <!-- account stuff -->
     <string name="example_password">password123</string>
-    <string name="example_username">MyCoolUsername</string>
+    <string name="example_username">IlMioUsername</string>
     <string name="example_email">hello@world.com</string>
     <string name="example_ip">127.0.0.1</string>
-    <string name="example_site_name">MyCoolSite</string>
+    <string name="example_site_name">IlMioSito</string>
     <string name="example_site_url">example.com</string>
     <string name="example_lang_name">Codice lingua (it)</string>
-
     <string name="login_format" formatted="true">%s %s</string>
     <string name="account">account</string>
-    <string name="logout">Logout</string>
+    <string name="logout">Disconnetti</string>
     <string name="login">Login</string>
     <string name="switch_account">Cambia account</string>
     <string name="add_account">Aggiungi account</string>
     <string name="create_account">Crea account</string>
     <string name="add_sync">Aggiungi tracking</string>
     <string name="added_sync_format" formatted="true">Aggiunto %s</string>
-    <string name="upload_sync">Sync</string>
+    <string name="upload_sync">Sincronizza</string>
     <string name="sync_score">Valutato</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s autenticato</string>
     <string name="authenticated_user_fail" formatted="true">Impossibile autenticarsi a %s</string>
-
     <!-- ============ -->
     <string name="none">Nessuno</string>
     <string name="normal">Normale</string>
@@ -397,7 +336,7 @@
     <string name="subtitles_shadow">Ombra</string>
     <string name="subtitles_raised">Rilievo</string>
     <string name="subtitle_offset">Sincronizza sottotitoli</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Ritardo sottotitoli</string>
     <string name="subtitle_offset_extra_hint_later_format">Usa se i sottotitoli sono mostrati %dms troppo presto</string>
     <string name="subtitle_offset_extra_hint_before_format">Usa se i sottotitoli vengono mostrati %dms troppo tardi</string>
@@ -409,7 +348,6 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">Ma che bel gufo spenzola da quei travi</string>
-
     <string name="recommended">Consigliato</string>
     <string name="player_loaded_subtitles" formatted="true">Caricato %s</string>
     <string name="player_load_subtitles">Carica da file</string>
@@ -418,12 +356,9 @@
     <string name="actor_main">Protagonista</string>
     <string name="actor_supporting">Supporto</string>
     <string name="actor_background">Secondario</string>
-
     <string name="home_source">Sorgente</string>
-    <string name="home_random">Random</string>
-
-    <string name="coming_soon">In Arrivo</string>
-
+    <string name="home_random">Casuale</string>
+    <string name="coming_soon">In Arrivo…</string>
     <string name="quality_cam">Cam</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
@@ -440,9 +375,8 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">Poster</string>
-    <string name="category_player">Player</string>
+    <string name="category_player">Lettore</string>
     <string name="resolution_and_title">Titolo e Risoluzione</string>
     <string name="title">Titolo</string>
     <string name="resolution">Risoluzione</string>
@@ -456,7 +390,6 @@
     <string name="extras">Extra</string>
     <string name="trailer">Trailer</string>
     <string name="network_adress_example">Link allo stream</string>
-
     <string name="referer">Referer</string>
     <string name="next">Prossimo</string>
     <string name="provider_languages_tip">Guarda video in queste lingue</string>
@@ -487,22 +420,23 @@
     <string name="plugins_disabled" formatted="true">Disabilitato: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Non scaricato: %d</string>
     <string name="plugins_updated" formatted="true">Aggiornati %d plugin</string>
-    <string name="blank_repo_message">Aggiungi una repository per installare l\'estensione dei siti</string>
+    <string name="blank_repo_message">CloudStream non ha siti installati per impostazione predefinita. È necessario installare i siti dai repository.
+\n
+\nA causa di una rimozione DMCA senza cervello da Sky Uk Limited 🤮 non possiamo collegare il sito repository nell\'app.
+\n
+\nUnisciti al nostro Discord o cerca online.</string>
     <string name="view_public_repositories_button">Vedi le repository della community</string>
     <string name="view_public_repositories_button_short">Lista pubblica</string>
     <string name="uppercase_all_subtitles">Tutti i sottotitoli in maiuscolo</string>
-
     <string name="download_all_plugins_from_repo">Scaricare tutti i plugin da questa repository?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Disabilitato)</string>
-    <string name="tracks">Tracks</string>
+    <string name="tracks">Tracce</string>
     <string name="audio_tracks">Traccia audio</string>
     <string name="video_tracks">Traccia video</string>
     <string name="apply_on_restart">Applica al riavvio</string>
-
     <string name="safe_mode_title">Safe Mode abilitata</string>
     <string name="safe_mode_description">Si è verificato un crash irrecuperabile. Tutte le estensioni sono state disabilitate, in modo da trovare e rimuovere l\'estensione che causa il problema.</string>
     <string name="safe_mode_crash_info">Vedi informazioni del crash</string>
-
     <string name="extension_rating" formatted="true">Voto: %s</string>
     <string name="extension_description">Descrizione</string>
     <string name="extension_version">Versione</string>
@@ -512,18 +446,15 @@
     <string name="extension_types">Supportati</string>
     <string name="extension_language">Lingua</string>
     <string name="extension_install_first">Prima installa l\'estensione</string>
-
-    <string name="hls_playlist">HLS Playlist</string>
-
+    <string name="hls_playlist">Playlist HLS</string>
     <string name="player_pref">Video player preferito</string>
     <string name="player_settings_play_in_app">Player interno</string>
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="player_settings_play_in_mpv">MPV</string>
-    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="player_settings_play_in_web">Cast Web Video</string>
     <string name="player_settings_play_in_browser">Browser</string>
     <string name="app_not_found_error">App non trovata</string>
     <string name="all_languages_preference">Tutte le lingue</string>
-
     <string name="skip_type_format" formatted="true">Salta %s</string>
     <!--<string name="skip_type_op">Opening</string>-->
     <!--<string name="skip_type_ed">Ending</string>-->
@@ -532,9 +463,25 @@
     <!--<string name="skip_type_mixed_op">Mixed opening</string>-->
     <string name="skip_type_creddits">Crediti</string>
     <!--<string name="skip_type_intro">Intro</string>-->
-
     <string name="clear_history">Cancella cronologia</string>
     <string name="history">Cronologia</string>
     <string name="enable_skip_op_from_database_des">Mostra popup per salta sigla iniziale/finale</string>
     <string name="clipboard_too_large">Testo troppo lungo. Impossibile salvare negli appunti.</string>
-</resources>
+    <string name="app_name">CloudStream</string>
+    <string name="automatic_plugin_download">Scarica automaticamente i plugins</string>
+    <string name="update_notification_failed">Aggiornamento dell\'app fallito</string>
+    <string name="episode_sync_settings">Aggiorna il progresso di avanzamento</string>
+    <string name="skip_type_mixed_op">Opening misto</string>
+    <string name="update_notification_installing">Installando l\'aggiornamento dell\'app</string>
+    <string name="subtitles_remove_captions">Rimuovi le didascalie chiuse dai sottotitoli</string>
+    <string name="subtitles_remove_bloat">Rimuovi il bloat dai sottotitoli</string>
+    <string name="skip_type_op">Opening</string>
+    <string name="skip_type_ed">Ending</string>
+    <string name="skip_type_mixed_ed">Ending misto</string>
+    <string name="skip_type_intro">Intro</string>
+    <string name="action_mark_as_watched">Segna come visto</string>
+    <string name="confirm_exit_dialog">Sei sicuro di voler uscire\?</string>
+    <string name="yes">Sì</string>
+    <string name="no">No</string>
+    <string name="update_notification_downloading">Scaricando l\'aggiornamento dell\'app</string>
+</resources>
\ No newline at end of file

From 363906cf3b153ee2090cd2fadd9366e961c2b381 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Mon, 19 Dec 2022 10:10:29 +0100
Subject: [PATCH 117/273] add summary to automatic_plugin_download

---
 app/src/main/res/values/strings.xml       | 1 +
 app/src/main/res/xml/settings_updates.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d25e6739..bffd1eed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -238,6 +238,7 @@
     <string name="pref_filter_search_quality">Hide selected video quality on Search results</string>
     <string name="automatic_plugin_updates">Automatic plugin updates</string>
     <string name="automatic_plugin_download">Automatically download plugins</string>
+    <string name="automatic_plugin_download_summary">Automatically install all not yet installed plugins from added repositories.</string>
     <string name="updates_settings">Show app updates</string>
     <string name="updates_settings_des">Automatically search for new updates on start</string>
     <string name="uprereleases_settings">Update to prereleases</string>
diff --git a/app/src/main/res/xml/settings_updates.xml b/app/src/main/res/xml/settings_updates.xml
index 3a17f393..cc743e4d 100644
--- a/app/src/main/res/xml/settings_updates.xml
+++ b/app/src/main/res/xml/settings_updates.xml
@@ -37,7 +37,8 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_baseline_extension_24"
         android:key="@string/auto_download_plugins_key"
-        android:title="@string/automatic_plugin_download" />
+        android:title="@string/automatic_plugin_download"
+        android:summary="@string/automatic_plugin_download_summary" />
     <SwitchPreference
         android:icon="@drawable/ic_baseline_notifications_active_24"
         android:summary="@string/updates_settings_des"

From a1f5786f027c98de0329a03108f7303cbd3903b6 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Mon, 19 Dec 2022 10:12:56 +0100
Subject: [PATCH 118/273] Translated using Weblate (Polish)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 95.0% (516 of 543 strings)

Translated using Weblate (English)

Currently translated at 100.0% (542 of 542 strings)

Translated using Weblate (Bengali)

Currently translated at 36.1% (196 of 542 strings)

Translated using Weblate (Vietnamese)

Currently translated at 90.5% (491 of 542 strings)

Translated using Weblate (Turkish)

Currently translated at 93.9% (509 of 542 strings)

Translated using Weblate (Tagalog)

Currently translated at 52.9% (287 of 542 strings)

Translated using Weblate (Romanian)

Currently translated at 78.9% (428 of 542 strings)

Translated using Weblate (Polish)

Currently translated at 94.6% (513 of 542 strings)

Translated using Weblate (Polish)

Currently translated at 94.6% (513 of 542 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 83.5% (453 of 542 strings)

Translated using Weblate (Dutch)

Currently translated at 83.2% (451 of 542 strings)

Translated using Weblate (Italian)

Currently translated at 99.2% (538 of 542 strings)

Translated using Weblate (Czech)

Currently translated at 77.4% (420 of 542 strings)

Translated using Weblate (bp (generated) (bp))

Currently translated at 87.6% (475 of 542 strings)

Translated using Weblate (Bulgarian)

Currently translated at 98.8% (536 of 542 strings)

Translated using Weblate (Bulgarian)

Currently translated at 98.8% (536 of 542 strings)

Translated using Weblate (Arabic)

Currently translated at 98.8% (536 of 542 strings)

Translated using Weblate (Arabic)

Currently translated at 98.8% (536 of 542 strings)

Translated using Weblate (English)

Currently translated at 100.0% (542 of 542 strings)

Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Jace Orwell <jaceorwell@gmail.com>
Co-authored-by: Radoslav Vasilev Vasilev <fifata@gmail.com>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: duckling <salmanfc.bd@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bg/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bp/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/en/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ro/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml | 178 ++++++++++---------------
 app/src/main/res/values-bg/strings.xml |  20 +--
 app/src/main/res/values-bn/strings.xml |  62 ++++++++-
 app/src/main/res/values-bp/strings.xml |   4 +-
 app/src/main/res/values-cs/strings.xml |   2 +-
 app/src/main/res/values-it/strings.xml |   8 +-
 app/src/main/res/values-nl/strings.xml |   4 +-
 app/src/main/res/values-no/strings.xml | 102 +++++++++++++-
 app/src/main/res/values-pl/strings.xml |  11 +-
 app/src/main/res/values-ro/strings.xml |  78 +----------
 app/src/main/res/values-tl/strings.xml |  58 ++------
 app/src/main/res/values-tr/strings.xml |  84 +-----------
 app/src/main/res/values-vi/strings.xml |   2 +-
 app/src/main/res/values/strings.xml    |  18 +--
 14 files changed, 295 insertions(+), 336 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index b3676fa6..0468d743 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,33 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">ملصق</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">الصورة الدعائية</string>
     <string name="episode_poster_img_des">ملصق الحلقة</string>
     <string name="home_main_poster_img_des">الملصق الرئيسي</string>
     <string name="home_next_random_img_des">التالي عشوائي</string>
-
     <string name="go_back_img_des">رجوع</string>
-
     <string name="home_change_provider_img_des">تغيير المصدر</string>
     <string name="preview_background_img_des">معاينة الخلفية</string>
-
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">سرعة (%.2fx)</string>
     <string name="rated_format" formatted="true">تقييم: %.1f</string>
-
-    <string name="new_update_format" formatted="true">!تم العثور علي تحديث جديد\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">!تم العثور علي تحديث جديد\n%s -&gt; %s</string>
     <string name="duration_format" formatted="true">%d دقيقة</string>
-
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">تشغيل بواسطة CloudStream</string>
     <string name="title_home">الرئيسية</string>
     <string name="title_search">البحث</string>
     <string name="title_downloads">التنزيلات</string>
     <string name="title_settings">الإعدادات</string>
-
-    <string name="search_hint">…بحث</string>
+    <string name="search_hint">بحث…</string>
     <string name="search_hint_site" formatted="true">بحث %s…</string>
-
     <string name="no_data">لايوجد بيانات</string>
     <string name="episode_more_options_des">المزيد من الخيارات</string>
     <string name="next_episode">الحلقة التالية</string>
@@ -35,8 +29,7 @@
     <string name="result_share">مشاركة</string>
     <string name="result_open_in_browser">فتح في الويب</string>
     <string name="skip_loading">تخطي التحميل</string>
-    <string name="loading">…تحميل</string>
-
+    <string name="loading">تحميل…</string>
     <string name="type_watching">أشاهده</string>
     <string name="type_on_hold">في الإنتظار</string>
     <string name="type_completed">مكتمل</string>
@@ -44,17 +37,15 @@
     <string name="type_plan_to_watch">أخطط لمشاهدته</string>
     <string name="type_none">لا شيء</string>
     <string name="type_re_watching">إعادة المشاهدة</string>
-
     <string name="play_movie_button">مشاهدة الفيلم</string>
     <string name="play_livestream_button">تشغيل بث حي</string>
     <string name="play_torrent_button">تشغيل تورنت</string>
     <string name="pick_source">المصادر</string>
     <string name="pick_subtitle">الترجمة</string>
-    <string name="reload_error">…إعادة محاولة الاتصال</string>
+    <string name="reload_error">إعادة محاولة الاتصال …</string>
     <string name="go_back">ارجع للخلف</string>
     <string name="play_episode">تشغيل الحلقة</string>
     <!--<string name="need_storage">السماح بتنزيل الحلقات</string>-->
-
     <string name="download">تحميل</string>
     <string name="downloaded">تم التنزيل</string>
     <string name="downloading">جاري التنزيل</string>
@@ -64,18 +55,14 @@
     <string name="download_canceled">تم إلغاء التنزيل</string>
     <string name="download_done">تم التنزيل</string>
     <string name="stream">تشغيل</string>
-
     <string name="error_loading_links_toast">خطأ في تحميل الرابط</string>
     <string name="download_storage_text">التخزين الداخلي</string>
-
     <string name="app_dubbed_text">مدبلج</string>
     <string name="app_subbed_text">مترجم</string>
-
     <string name="popup_delete_file">حذف ملف</string>
     <string name="popup_play_file">تشغيل الملف</string>
     <string name="popup_resume_download">متابعة التنزيل</string>
     <string name="popup_pause_download">إيقاف التنزيل مؤقتًا</string>
-
     <string name="pref_disable_acra">قم بتعطيل الإبلاغ عن الأخطاء تلقائيًا</string>
     <string name="home_more_info">مزيد من المعلومات</string>
     <string name="home_expanded_hide">إخفاء</string>
@@ -91,9 +78,7 @@
     <string name="sort_close">إغلاق</string>
     <string name="sort_clear">مسح</string>
     <string name="sort_save">حفظ</string>
-
     <string name="player_speed">سرعة المُشغل</string>
-
     <string name="subtitles_settings">إعدادات الترجمة</string>
     <string name="subs_text_color">لون الخط</string>
     <string name="subs_outline_color">لون المخطط التفصيلي</string>
@@ -103,34 +88,25 @@
     <string name="subs_subtitle_elevation">إرتفاع الترجمة</string>
     <string name="subs_font">الخط</string>
     <string name="subs_font_size">حجم الخط</string>
-
     <string name="search_provider_text_providers">البحث باستخدام المصادر</string>
     <string name="search_provider_text_types">البحث باستخدام الأنواع</string>
-
     <string name="benene_count_text">%d الموزات المعطاة الى المطورين</string>
     <string name="benene_count_text_none">لم يتم إعطاء موز</string>
-
     <string name="subs_auto_select_language">تحديد اللغة تلقائيًا</string>
     <string name="subs_download_languages">لغات التحميل</string>
     <string name="subs_subtitle_languages">لغة الترجمة</string>
     <string name="subs_hold_to_reset_to_default">إضغط بإستمرار لإعادة التعيين للإعدادات الافتراضية</string>
     <string name="subs_import_text" formatted="true">إستيراد خطوط بوضعها هنا %s</string>
     <string name="continue_watching">متابعة المشاهدة</string>
-
     <string name="action_remove_watching">حذف</string>
     <string name="action_open_watching">مزيد من المعلومات</string>
-
     <string name="vpn_might_be_needed">قد تكون هناك حاجة إلى VPN لكي يعمل هذا المزود بشكل صحيح</string>
     <string name="vpn_torrent">هذا المزود هو تورنت ، يوصى باستخدام  شبكة ظاهرية خاصة</string>
-
-    <string name="provider_info_meta">.سيظهر إعلان مدته خمسة عشر ثانية إذا لم يتم توفير الفيديو في الموقع</string>
-
+    <string name="provider_info_meta">لا يتم توفير البيانات الوصفية بواسطة الموقع ، وسيفشل تحميل الفيديو إذا لم يكن موجودًا في الموقع.</string>
     <string name="torrent_plot">الوصف</string>
     <string name="normal_no_plot">لم يتم العثور على وصف</string>
     <string name="torrent_no_plot">لم يتم العثور على وصف</string>
-
-    <string name="show_log_cat">🐈 logcat عرض</string>
-
+    <string name="show_log_cat">عرض سجل الاخطاء 🐈</string>
     <string name="picture_in_picture">نافذة منبثقة</string>
     <string name="picture_in_picture_des">يستمر في التشغيل في مُشغل مصغر فوق التطبيقات الأخرى</string>
     <string name="player_size_settings">زر تغيير حجم المُشغل</string>
@@ -139,41 +115,33 @@
     <string name="player_subtitles_settings_des">إعدادات ترجمة المُشغل</string>
     <string name="chromecast_subtitles_settings">ترجمة كروم كاست</string>
     <string name="chromecast_subtitles_settings_des">إعدادات ترجمة كروم كاست</string>
-
     <string name="eigengraumode_settings">وضع إيغنغرافي</string>
     <string name="eigengraumode_settings_des">يضيف خيار السرعة في المُشغل</string>
-    <string name="swipe_to_seek_settings">السحب للسعي</string>
+    <string name="swipe_to_seek_settings">السحب لتقديم</string>
     <string name="swipe_to_seek_settings_des">إسحب إلى اليسار أو اليمين للتحكم في الوقت في مُشغل الفيديو</string>
     <string name="swipe_to_change_settings">السحب لتغيير الإعدادات</string>
     <string name="swipe_to_change_settings_des">إسحب على الجانب الأيسر أو الأيمن لتغيير السطوع أو مستوى الصوت</string>
-
     <string name="autoplay_next_settings">تشغيل الحلقة التالية تلقائيًا</string>
     <string name="autoplay_next_settings_des">تبدأ الحلقة التالية عندما تنتهي الحالية</string>
-
-    <string name="double_tap_to_seek_settings">النقر مرتان  للسعي للأمام أو للخلف</string>
+    <string name="double_tap_to_seek_settings">النقر مرتان للتقديم للأمام أو للخلف</string>
     <string name="double_tap_to_pause_settings">الضغط مرتان لإيقاف مؤقت</string>
-    <string name="double_tap_to_seek_amount_settings">التحكم في سعي المُشغل</string>
-    <string name="double_tap_to_seek_settings_des">إضغط مرتين على الجانب الأيمن أو الأيسر للسعي للأمام أو للخلف	</string>
+    <string name="double_tap_to_seek_amount_settings">التحكم في مدى تقديم المُشغل</string>
+    <string name="double_tap_to_seek_settings_des">إضغط مرتين على الجانب الأيمن أو الأيسر للتقديم للأمام أو للخلف</string>
     <string name="double_tap_to_pause_settings_des">إضغط في الوسط لإيقاف مؤقت</string>
     <string name="use_system_brightness_settings">استخدم سطوع النظام</string>
     <string name="use_system_brightness_settings_des">استخدم سطوع النظام في مُشغل التطبيق بدلاً من التراكب الداكن</string>
-
     <string name="episode_sync_settings">تحديث تقدم المشاهدة</string>
     <string name="episode_sync_settings_des">مزامنة التقدم في الحلقة الحالية تلقائيًا</string>
-
     <string name="restore_settings">إسترجاع البيانات من نسخة إحتياطية</string>
-
     <string name="backup_settings">نسخ إحتياطي</string>
     <string name="restore_success">تم تحميل ملف النسخة الاحتياطية</string>
     <string name="restore_failed_format" formatted="true">فشل استيراد البيانات من الملف %s</string>
     <string name="backup_success">تم تخزين البيانات بنجاح</string>
     <string name="backup_failed">إذن الوصول الي ذاكرة التخزين مفقود, من فضلك حاول مجددا</string>
     <string name="backup_failed_error_format">فشل إنشاء نسخة احتياطية %s</string>
-
     <string name="search">بحث</string>
     <string name="category_account">الحسابات</string>
     <string name="category_updates">التحديثات والنسخ الاحتياطية</string>
-
     <string name="settings_info">معلومات</string>
     <string name="advanced_search">البحث المتقدم</string>
     <string name="advanced_search_des">يعطيك نتائج البحث مفصولة عن طريق المزود</string>
@@ -181,32 +149,27 @@
     <string name="bug_report_settings_on">لا ترسل أي بيانات</string>
     <string name="show_fillers_settings">عرض حلقات الفلر للأنمي</string>
     <string name="show_trailers_settings">عرض المقاطع الدعائية</string>
-    <string name="kitsu_settings">عرض ملصقات من kitsu</string>
+    <string name="kitsu_settings">عرض ملصقات من كيتسو</string>
     <string name="pref_filter_search_quality">إخفاء جودة الفيديو المختارة من نتائج البحث</string>
-
     <string name="automatic_plugin_updates">تحديث الإضافات تلقائيًا</string>
     <string name="automatic_plugin_download">تنزيل الإضافات تلقائيًا</string>
     <string name="updates_settings">التحديث التلقائي</string>
     <string name="updates_settings_des">البحث تلقائيًا عن التحديثات الجديدة عند البداية</string>
     <string name="uprereleases_settings">التحديث إلى الاصدارات التجريبية (بيتا)</string>
     <string name="uprereleases_settings_des">البحث عن التحديثات التجريبية بدلاً من الإصدارات الكاملة فقط</string>
-    <string name="github">Github</string>
+    <string name="github">غيت هاب</string>
     <string name="lightnovel">تطبيق روايات خفيف من نفس المطورين</string>
     <string name="anim">تطبيق أنمي من نفس المطورين</string>
     <string name="discord">انضم إلى الديسكورد</string>
     <string name="benene">إعط موزة للمطورين</string>
     <string name="benene_des">الموز المُعطي</string>
-
     <string name="app_language">لغة التطبيق</string>
-
     <string name="no_chromecast_support_toast">هذا المزود ليس لديه دعم كروم كاست</string>
     <string name="no_links_found_toast">لم يتم العثور على روابط</string>
     <string name="copy_link_toast">تم نسخ الرابط إلى الحافظة</string>
     <string name="play_episode_toast">تشغيل الحلقة</string>
     <string name="subs_default_reset_toast">إعادة التعيين إلى القيمة الافتراضية</string>
     <string name="acra_report_toast">عذرا ، تعطل التطبيق. سيتم إرسال تقرير خطأ مجهول إلى المطورين</string>
-
-
     <string name="season">موسم</string>
     <string name="no_season">لا موسم</string>
     <string name="episode">حلقة</string>
@@ -214,7 +177,6 @@
     <string name="season_short">م</string>
     <string name="episode_short">ح</string>
     <string name="no_episodes_found">لم يتم العثور على أي حلقات</string>
-
     <string name="delete_file">حذف الملف</string>
     <string name="delete">حذف</string>
     <string name="pause">إيقاف مؤقت</string>
@@ -223,7 +185,6 @@
     <string name="go_forward_30">+٣٠</string>
     <string name="delete_message">سوف يتم الحذف نهائيا %s\nهل أنت متأكد?</string>
     <string name="resume_time_left" formatted="true">%dm\nمتبقية</string>
-
     <string name="status_ongoing">جاري التنفيذ</string>
     <string name="status_completed">اكتمل</string>
     <string name="status">الحالة</string>
@@ -232,15 +193,12 @@
     <string name="duration">المدة الزمنية</string>
     <string name="site">موقع</string>
     <string name="synopsis">القصة</string>
-
     <string name="queued">في قائمة الانتظار</string>
     <string name="no_subtitles">الترجمة ليست موجودة</string>
     <string name="default_subtitles">الإفتراضي</string>
-
     <string name="free_storage">فارغ</string>
     <string name="used_storage">مستخدم</string>
     <string name="app_storage">التطبيق</string>
-
     <!--plural-->
     <string name="movies">أفلام</string>
     <string name="tv_series">مسلسلات</string>
@@ -257,21 +215,19 @@
     <string name="movies_singular">فيلم</string>
     <string name="tv_series_singular">مسلسل</string>
     <string name="cartoons_singular">كرتون</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">أنمي</string>
+    <string name="ova_singular">اوفا</string>
     <string name="torrent_singular">تورنت</string>
     <string name="documentaries_singular">وثائقي</string>
     <string name="asian_drama_singular">دراما آسيوية</string>
     <string name="live_singular">بث حي</string>
     <string name="nsfw_singular">+18</string>
     <string name="other_singular">فيديو</string>
-
     <string name="source_error">خطأ في المصدر</string>
     <string name="remote_error">خطأ بعيد</string>
     <string name="render_error">خطأ في جهاز العرض</string>
     <string name="unexpected_error">خطأ غير متوقع في المُشغل</string>
     <string name="storage_error">خطأ في التنزيل ، تحقق من أذونات التخزين</string>
-
     <string name="episode_action_chromecast_episode">حلقة كروم كاست</string>
     <string name="episode_action_chromecast_mirror">مرآة كروم كاست</string>
     <string name="episode_action_play_in_app">تشغيل في التطبيق</string>
@@ -282,7 +238,6 @@
     <string name="episode_action_download_mirror">تحميل بجودات مختلفة</string>
     <string name="episode_action_reload_links">إعادة تحميل الروابط</string>
     <string name="episode_action_download_subtitle">تحميل الترجمة</string>
-
     <string name="show_hd">ملصق الجودة</string>
     <string name="show_dub">ملصق مدبلج</string>
     <string name="show_sub">ملصق مترجم</string>
@@ -292,47 +247,35 @@
     <string name="show_sub_key" translatable="false">show_sub_key</string>
     <string name="show_title_key" translatable="false">show_title_key</string>
     <string name="poster_ui_settings">التحكم في عناصر الواجهة علي الملصق </string>
-
     <string name="no_update_found">لم يتم العثور على تحديثات</string>
     <string name="check_for_update">تحقق من التحديثات</string>
-
     <string name="video_lock">قفل</string>
     <string name="video_aspect_ratio_resize">تغيير الحجم</string>
     <string name="video_source">مصدر</string>
     <string name="video_skip_op">تخطي المقدمة</string>
-
     <string name="dont_show_again">لا تظهر مرة أخرى</string>
     <string name="skip_update">تخطي هذا التحديث</string>
     <string name="update">تحديث</string>
     <string name="watch_quality_pref">جودة المشاهدة المفضلة</string>
-    <string name="limit_title">أقصي عدد حروف لعنوان مُشغل الفيديو</string>
+    <string name="limit_title">أقصى عدد لحروف عنوان مُشغل الفيديو</string>
     <string name="limit_title_rez">أبعاد مُشغل الفيديو</string>
-
     <string name="video_buffer_size_settings">حجم ذاكرة التخزين المؤقت للفيديو</string>
     <string name="video_buffer_length_settings">طول التخزين المؤقت</string>
     <string name="video_buffer_disk_settings">التخزين المؤقت للفيديو علي القرص</string>
     <string name="video_buffer_clear_settings">مسح التخزين المؤقت للصورة والفيديو</string>
-
     <string name="video_ram_description">سوف يسبب بعض الأعطال إذا تم إعداد قيمة عالية جدًا. لا\تغير القيمة إذا كان لديك ذاكرة تخزين عشوائية منخفضة كتلفاز أندرويد أو هاتف قديم</string>
     <string name="video_disk_description">قد يسبب مشاكل مع حجم ذاكرة التخزين المنخفضة كأجهزة تلفاز الأندرويد إذا أعددت قيمة عالية جدًا</string>
-
-    <string name="dns_pref">DNS فوق HTTPS</string>
+    <string name="dns_pref">إستخدام DNS بدلا من HTTPS</string>
     <string name="dns_pref_summary">مفيد لتجاوز حجب مزود خدمة الإنترنت</string>
-
     <string name="add_site_pref">نسخ موقع</string>
     <string name="remove_site_pref">حذف موقع</string>
-    <string name="add_site_summary">إضافة نسخة من موقع موجود, بعنوان رابط مختلف</string>
-
+    <string name="add_site_summary">إضافة نسخة من موقع موجود، بعنوان URL مختلف</string>
     <string name="download_path_pref">مسار التنزيل</string>
-
-    <string name="nginx_url_pref">عنوان رابط سيرفر Nginx</string>
-
+    <string name="nginx_url_pref">عنوان URL لخادم NGINX</string>
     <string name="display_subbed_dubbed_settings">عرض أنمي مدبلج / مترجم</string>
-
     <string name="resize_fit">ملائمة الشاشة</string>
     <string name="resize_fill">امتداد</string>
     <string name="resize_zoom">تكبير</string>
-
     <string name="legal_notice">إخلاء مسؤولية</string>
     <string name="legal_notice_key" translatable="false">legal_notice_key</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
@@ -361,19 +304,14 @@
     <string name="subtitles_encoding">فك تشفير الترجمة</string>
     <string name="category_providers">المصادر</string>
     <string name="category_ui">الواجهة</string>
-
-
     <string name="automatic">أوتوماتيك</string>
     <string name="tv_layout">واجهة تلفاز</string>
     <string name="phone_layout">واجهة هاتف</string>
     <string name="emulator_layout">واجهة محاكي</string>
-
     <string name="primary_color_settings">اللون الأساسي</string>
     <string name="app_theme_settings">مظهر التطبيق</string>
     <string name="bottom_title_settings">موضع عنوان الملصق</string>
     <string name="bottom_title_settings_des">وضع العنوان تحت الملصق</string>
-
-
     <!-- account stuff -->
     <string name="anilist_key" translatable="false">anilist_key</string>
     <string name="mal_key" translatable="false">mal_key</string>
@@ -386,7 +324,6 @@
     <string name="example_site_name">إسم الموقع</string>
     <string name="example_site_url">رابط الموقع</string>
     <string name="example_lang_name">اللغة (الإنجليزية)</string>
-
     <!--
     <string name="mal_account_settings" translatable="false">MAL</string>
     <string name="anilist_account_settings" translatable="false">AniList</string>
@@ -397,7 +334,7 @@
     -->
     <string name="login_format" formatted="true">%s %s</string>
     <string name="account">حساب</string>
-    <string name="logout">تسجيل خروج</string>
+    <string name="logout">تسجيل الخروج</string>
     <string name="login">تسجيل الدخول</string>
     <string name="switch_account">تبديل الحساب</string>
     <string name="add_account">إضافة حساب</string>
@@ -411,7 +348,6 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">تم توثيق %s</string>
     <string name="authenticated_user_fail" formatted="true">فشل توثيق %s</string>
-
     <!-- ============ -->
     <string name="none">لا شيء</string>
     <string name="normal">عادي</string>
@@ -424,12 +360,11 @@
     <string name="subtitles_shadow">ظل</string>
     <string name="subtitles_raised">رفع</string>
     <string name="subtitle_offset">مزامنة الترجمة</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000 مللي ثانية</string>
     <string name="subtitle_offset_title">تأخير الترجمة</string>
     <string name="subtitle_offset_extra_hint_later_format">استخدم هذا إذا كانت الترجمة تُعرض %dms مبكرًا جدًا</string>
     <string name="subtitle_offset_extra_hint_before_format">استخدم هذا إذا كانت الترجمة تُعرض %dms متأخرًا جدًا</string>
     <string name="subtitle_offset_extra_hint_none_format">لا تأخير في الترجمة</string>
-
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
     see:
@@ -437,7 +372,6 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">نصٌّ حكيمٌ لهُ سِرٌّ قاطِعٌ وَذُو شَأنٍ عَظيمٍ مكتوبٌ على ثوبٍ أخضرَ ومُغلفٌ بجلدٍ أزرق</string>
-
     <string name="recommended">مُوصي به</string>
     <string name="player_loaded_subtitles" formatted="true">تم تحميل %s</string>
     <string name="player_load_subtitles">إختيار ملف</string>
@@ -446,20 +380,17 @@
     <string name="actor_main">رئيسي</string>
     <string name="actor_supporting">مساعد</string>
     <string name="actor_background">الخلفية</string>
-
     <string name="home_source">مصدر</string>
     <string name="home_random">عشوائي</string>
-
     <string name="coming_soon">قريبا…</string>
-
-    <string name="quality_cam">Cam</string>
-    <string name="quality_cam_rip">Cam</string>
-    <string name="quality_cam_hd">Cam</string>
+    <string name="quality_cam">تصوير كام</string>
+    <string name="quality_cam_rip">تصوير كام قطع</string>
+    <string name="quality_cam_hd">تصوير كام جودة عالية</string>
     <string name="quality_hq">HQ</string>
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">بلو راي</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
@@ -468,7 +399,6 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">صورة الملصق</string>
     <string name="category_player">المُشغل</string>
     <string name="resolution_and_title">الأبعاد والعنوان</string>
@@ -484,7 +414,7 @@
     <string name="extras">اكسترا</string>
     <string name="trailer">مقطع دعائي</string>
     <string name="network_adress_example">رابط الفيديو</string>
-    <string name="referer">Referer</string>
+    <string name="referer">المرجع</string>
     <string name="next">التالي</string>
     <string name="provider_languages_tip">شاهد الفيديوهات بهذه اللغات</string>
     <string name="previous">السابق</string>
@@ -496,7 +426,7 @@
     <string name="extensions">الإضافات</string>
     <string name="add_repository">إضافة مستودع</string>
     <string name="repository_name_hint">إسم المستودع</string>
-    <string name="repository_url_hint">عنوان رابط المستودع</string>
+    <string name="repository_url_hint">عنوان URL للمستودع</string>
     <string name="plugin_loaded">تم تحميل الإضافة</string>
     <string name="plugin_deleted">تم إزالة الإضافة</string>
     <string name="plugin_load_fail" formatted="true">فشل التحميل %s</string>
@@ -513,22 +443,23 @@
     <string name="plugins_downloaded" formatted="true">تم تحميل: %d</string>
     <string name="plugins_disabled" formatted="true">مُعطل %d</string>
     <string name="plugins_not_downloaded" formatted="true">غير مُحمل: %d</string>
-    <string name="blank_repo_message">قم بإضافة مستودع لكي يتم تثبيت إضافات المواقع</string>
+    <string name="blank_repo_message">لا يحتوي CloudStream على مواقع مثبتة بشكل افتراضي. تحتاج إلى تثبيت المواقع من المستودعات.
+\n
+\nبسبب إزالة قانون الألفية الجديدة لحقوق طبع ونشر المواد الرقمية بدون عقل بواسطة Sky Uk Limited 🤮 ، لا يمكننا ربط موقع المستودع في التطبيق.
+\n
+\nانضم إلى Discord أو ابحث عبر الإنترنت.</string>
     <string name="view_public_repositories_button">عرض مستودعات المجتمع</string>
     <string name="view_public_repositories_button_short">قائمة عامة</string>
     <string name="uppercase_all_subtitles">جميع الترجمات حروف كبيرة</string>
-
     <string name="download_all_plugins_from_repo">تحميل جميع الإضافات من هذا المستودع?</string>
-    <string name="single_plugin_disabled" formatted="true">%s (Disabled)</string>
+    <string name="single_plugin_disabled" formatted="true">%s (معطل)</string>
     <string name="tracks">المسارات</string>
     <string name="audio_tracks">مسار الصوت</string>
     <string name="video_tracks">مسار الفيديو</string>
     <string name="apply_on_restart">تطبيق بعد إعادة التشغيل</string>
-
     <string name="safe_mode_title">وضع الامان مفعل</string>
-    <string name="safe_mode_description">An unrecoverable crash occurred and we\'ve automatically disabled all extensions, so you can find and remove the extension which is causing trouble.</string>
+    <string name="safe_mode_description">حدث عطل غير قابل للاسترداد وقمنا تلقائيا بتعطيل جميع الإضافات ، حتى تتمكن من العثور على الإضافة التي تسبب مشكلة وإزالتها.</string>
     <string name="safe_mode_crash_info">عرض بيانات الاعطال</string>
-
     <string name="extension_rating" formatted="true">تقييم: %s</string>
     <string name="extension_description">الوصف</string>
     <string name="extension_version">إصدار</string>
@@ -537,10 +468,45 @@
     <string name="extension_authors">المؤلفون</string>
     <string name="extension_types">مدعوم</string>
     <string name="extension_language">اللغة</string>
-
     <string name="hls_playlist">قائمة HLS</string>
     <string name="player_pref">مُشغل الفيديو المفضل</string>
     <string name="clear_history">مسح السجل</string>
     <string name="history">السجل</string>
     <string name="enable_skip_op_from_database_des">عرض زر تخطي المقدمة/الخاتمة</string>
-</resources>
+    <string name="cast_format" formatted="true">طاقم العمل: %s</string>
+    <string name="next_episode_time_day_format" formatted="true">%d يوم %d ساعة %d دقيقة</string>
+    <string name="next_episode_time_hour_format" formatted="true">%d ساعة %d دقيقة</string>
+    <string name="filler" formatted="true">الفيلير</string>
+    <string name="action_open_play">فتح(تشغيل)</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="plugins_updated" formatted="true">المكونات الإضافية المحدثة %d</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">اسقاط فيديو الويب</string>
+    <string name="player_settings_play_in_browser">المتصفح</string>
+    <string name="skip_type_format" formatted="true">تخطي %s</string>
+    <string name="skip_type_op">الافتتاح</string>
+    <string name="skip_type_ed">النهاية</string>
+    <string name="skip_type_recap">الخلاصة</string>
+    <string name="skip_type_mixed_ed">نهاية مختلطة</string>
+    <string name="skip_type_mixed_op">افتتاح مختلط</string>
+    <string name="skip_type_intro">المقدمة</string>
+    <string name="clipboard_too_large">النص كثير جدا. تعذر الحفظ في الحافظة.</string>
+    <string name="action_mark_as_watched">علّمه كفيديو تمت مشاهدته</string>
+    <string name="yes">نعم</string>
+    <string name="no">ﻻ</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s الحلقة %d</string>
+    <string name="next_episode_format" formatted="true">سيتم إصدار الحلقة %d في</string>
+    <string name="update_notification_failed">فشل تحديث التطبيق</string>
+    <string name="extension_install_first">تثبيت الإضافة أولا</string>
+    <string name="player_settings_play_in_app">مشغل داخلي</string>
+    <string name="app_not_found_error">لم يتم العثور على التطبيق</string>
+    <string name="all_languages_preference">جميع اللغات</string>
+    <string name="skip_type_creddits">الإعتمادات</string>
+    <string name="update_notification_downloading">تنزيل تحديث التطبيق</string>
+    <string name="update_notification_installing">تثبيت تحديث التطبيق</string>
+    <string name="next_episode_time_min_format" formatted="true">%d دقيقة</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="confirm_exit_dialog">هل أنت متأكد أنك تريد الخروج؟</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 793e4509..cc5e129e 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -273,9 +273,9 @@
     <string name="dns_pref_summary">Полезно за заобикаляне на блокирания от ISP доставчик</string>
     <string name="add_site_pref">Сайт за клониране</string>
     <string name="remove_site_pref">Премахване на сайта</string>
-    <string name="add_site_summary">Добавяне на клонинг на съществуващ сайт с различен URL адрес</string>
+    <string name="add_site_summary">Добавяне на клонинг на съществуващ сайт с различен URL</string>
     <string name="download_path_pref">Път за изтегляне</string>
-    <string name="nginx_url_pref">URL адрес на сървъра на Nginx</string>
+    <string name="nginx_url_pref">URL адрес на сървър NGINX</string>
     <string name="display_subbed_dubbed_settings">Показване на дублирани/субирани аниме</string>
     <string name="resize_fit">Побиране в екрана</string>
     <string name="resize_fill">Разтягане</string>
@@ -300,10 +300,10 @@
     <string name="bottom_title_settings">Местоположение на заглавието на плаката</string>
     <string name="bottom_title_settings_des">Поставете заглавието под плаката</string>
     <string name="example_password">парола123</string>
-    <string name="example_username">MyCoolUsername</string>
+    <string name="example_username">Моето готино потребителско име</string>
     <string name="example_email">hello@world.com</string>
     <string name="example_ip">127.0.0.1</string>
-    <string name="example_site_name">MyCoolSite</string>
+    <string name="example_site_name">Моят готин сайт</string>
     <string name="example_site_url">example.com</string>
     <string name="example_lang_name">Езиков код (en)</string>
     <!--
@@ -334,7 +334,7 @@
     <string name="subtitles_shadow">Сянка</string>
     <string name="subtitles_raised">Повдигнати</string>
     <string name="subtitle_offset">Синхронизиране на суб</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000.ms</string>
     <string name="subtitle_offset_title">Забавяне на субтитрите</string>
     <string name="subtitle_offset_extra_hint_later_format">Използвайте това, ако субтитрите се показват %dms твърде рано</string>
     <string name="subtitle_offset_extra_hint_before_format">Използвайте това, ако субтитрите се показват %dms твърде късно</string>
@@ -364,7 +364,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blu-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
@@ -400,7 +400,7 @@
     <string name="extensions">Разширения</string>
     <string name="add_repository">Добавяне на хранилище</string>
     <string name="repository_name_hint">Име на хранилище</string>
-    <string name="repository_url_hint">URL адрес на хранилището</string>
+    <string name="repository_url_hint">URL на хранилището</string>
     <string name="plugin_loaded">Приставката е заредена</string>
     <string name="plugin_deleted">Приставката е изтрита</string>
     <string name="plugin_load_fail" formatted="true">Неуспешно зареждане %s</string>
@@ -418,7 +418,11 @@
     <string formatted="true" name="plugins_disabled">Деактивирано: %d</string>
     <string formatted="true" name="plugins_not_downloaded">Не е изтеглено: %d</string>
     <string formatted="true" name="plugins_updated">Актуализирани %d плъгини</string>
-    <string name="blank_repo_message">CloudStream няма инсталирани сайтове по подразбиране. Трябва да инсталирате сайтовете от хранилища.\n\nПоради безмозъчно премахване на DMCA от Sky Uk Limited 🤮 не можем да свържем сайтовете на хранилищата в приложението.\n\nПрисъединете се към нашия дискорд за връзки или търсете онлайн.</string>
+    <string name="blank_repo_message">CloudStream няма инсталирани сайтове по подразбиране. Трябва да инсталирате сайтовете от хранилища.
+\n
+\nПоради безмозъчно премахване на DMCA от Sky Uk Limited 🤮 не можем да свържем сайта на хранилището в приложението.
+\n
+\nПрисъединете се към нашия Дискорд или търсете онлайн.</string>
     <string name="view_public_repositories_button">Вижте хранилищата на общността</string>
     <string name="view_public_repositories_button_short">Публичен списък</string>
     <string name="uppercase_all_subtitles">Всички субтитри с главни букви</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index b37705b0..b0667a38 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -51,7 +51,67 @@
     <string name="reload_error">আবার সংযোগ দেওয়ার চেষ্টা করুন…</string>
     <string name="play_episode">এপিসোড চালান</string>
     <string name="download">ডাউনলোড</string>
-    <string name="downloaded">ডাউনলোড করা</string>
+    <string name="downloaded">ডাউনলোড হয়েছে</string>
     <string name="downloading">ডাউনলোড চলছে</string>
     <string name="download_paused">ডাউনলোড স্থগিত</string>
+    <string name="download_started">ডাউনলোড শুরু</string>
+    <string name="download_canceled">ডাউনলোড বাদ</string>
+    <string name="download_done">ডাউনলোড শেষ</string>
+    <string name="stream">স্ট্রিম</string>
+    <string name="error_loading_links_toast">লিংক লোডিং ব্যর্থ</string>
+    <string name="app_dubbed_text">ডাব</string>
+    <string name="app_subbed_text">সাব</string>
+    <string name="popup_play_file">ফাইল প্লে করুন</string>
+    <string name="popup_pause_download">ডাউনলোড থামান</string>
+    <string name="pref_disable_acra">আটো বাগ রিপোর্ট বন্ধ করুন</string>
+    <string name="home_more_info">আরো তথ্য</string>
+    <string name="home_expanded_hide">বন্ধ করুন</string>
+    <string name="home_play">প্লে</string>
+    <string name="home_info">তথ্য</string>
+    <string name="error_bookmarks_text">বুকমার্কসমূহ</string>
+    <string name="action_remove_from_bookmarks">বাদ দিন</string>
+    <string name="action_add_to_bookmarks">বুকমার্ক করুন</string>
+    <string name="sort_apply">এপ্লাই করুন</string>
+    <string name="sort_cancel">বাদ দিন</string>
+    <string name="sort_copy">কপি করুন</string>
+    <string name="sort_close">বন্ধ করুন</string>
+    <string name="sort_clear">মুছুন</string>
+    <string name="sort_save">সেভ করুন</string>
+    <string name="player_speed">ভিডিও এর গতি</string>
+    <string name="subs_outline_color">ফন্ট আউটলাইন কালার</string>
+    <string name="subs_edge_type">সাবটাইটেল এজের ধরণ</string>
+    <string name="subs_subtitle_elevation">সাবটাইটেল এর উচ্চতা</string>
+    <string name="search_provider_text_providers">প্রভাইডার অনুযায়ি খুঁজুন</string>
+    <string name="search_provider_text_types">ধরণ অনুযায়ি খুঁজুন</string>
+    <string name="benene_count_text">%d টা বেনেনা ডেভদের দেয়া হয়েছে</string>
+    <string name="benene_count_text_none">কোন বেনেনা দেয়া হয়নি</string>
+    <string name="subs_download_languages">ভাষা ডাউনলোড</string>
+    <string name="subs_subtitle_languages">সাবটাইটেল ভাষা</string>
+    <string name="subs_hold_to_reset_to_default">প্রাথমিক সেটিংসে নিতে চেপে রাখুন</string>
+    <string name="continue_watching">দেখতে থাকুন</string>
+    <string name="action_remove_watching">মুছুন</string>
+    <string name="action_open_watching">আরো তথ্য</string>
+    <string name="torrent_plot">বিবরণ</string>
+    <string name="normal_no_plot">কোন প্লট পাওয়া যায়নি</string>
+    <string name="torrent_no_plot">কোন বিবরণ পাওয়া যায়নি</string>
+    <string name="picture_in_picture">পিকচার ইন পিকচার</string>
+    <string name="picture_in_picture_des">অন্য অ্যাপ এর উপর ভিডিও চালাতে থাকুন</string>
+    <string name="player_size_settings">প্লেয়ারের সাইজ পরিবর্তন বাটন</string>
+    <string name="download_failed">ডাউনলোড ব্যর্থ</string>
+    <string name="download_storage_text">ইন্টারনাল স্টোরেজ</string>
+    <string name="filter_bookmarks">বুকমার্ক ফিল্টার করুন</string>
+    <string name="popup_delete_file">ফাইল ডিলিট করুন</string>
+    <string name="popup_resume_download">ডাউনলোড চালু করুন</string>
+    <string name="subtitles_settings">সাবটাইটেল সেটিংস</string>
+    <string name="subs_background_color">সাবটাইটেল ব্যাকগ্রাউন্ড কালার</string>
+    <string name="subs_text_color">ফন্ট কালার</string>
+    <string name="vpn_torrent">এটা একটি টরেন্ট প্রভাইডার, ভিপিএন ব্যবহার করা উচিৎ</string>
+    <string name="subs_window_color">উইন্ডো কালার</string>
+    <string name="subs_font_size">ফন্টের সাইজ</string>
+    <string name="subs_font">ফন্ট</string>
+    <string name="subs_auto_select_language">স্বয়ংক্রিয় ভাষা</string>
+    <string name="subs_import_text" formatted="true">সাবটাইটেল ফন্ট যোগ করতে এখানে ফাইলটি রাখুন %s</string>
+    <string name="show_log_cat">লগক্যাট দেখান 🐈</string>
+    <string name="vpn_might_be_needed">এই প্রভাইডার ঠিকভাবে চালাতে ভিপিএন লাগতে পারে</string>
+    <string name="provider_info_meta">প্রভাইডার থেকে মেটাডেটা পাওয়া যায়নি, যদি সম্পূর্ন সাইটে না পাওয়া যায় তাইলে ভিডিও লোড হবে না।</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bp/strings.xml b/app/src/main/res/values-bp/strings.xml
index f9c29b30..ebc3ecd2 100644
--- a/app/src/main/res/values-bp/strings.xml
+++ b/app/src/main/res/values-bp/strings.xml
@@ -269,7 +269,7 @@
     <string name="dns_pref_summary">Útil para burlar bloqueios de provedores de internet</string>
     <string name="add_site_pref">Clonar site</string>
     <string name="remove_site_pref">Remover site</string>
-    <string name="add_site_summary">Adiciona um clone de um site existente, com uma url diferente</string>
+    <string name="add_site_summary">Adiciona um clone de um site existente, com uma URL diferente</string>
     <string name="download_path_pref">Caminho para Download</string>
     <string name="nginx_url_pref">Url do servidor Nginx</string>
     <string name="display_subbed_dubbed_settings">Mostrar Anime Dublado/Legendado</string>
@@ -382,7 +382,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blu-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 3970014b..c2142173 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -367,7 +367,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blu-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index bbf14d28..645a3aac 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -275,7 +275,7 @@
     <string name="dns_pref_summary">Utile per bypassare i blocchi ISP</string>
     <string name="add_site_pref">Clona un sito</string>
     <string name="remove_site_pref">Rimuovi sito</string>
-    <string name="add_site_summary">Aggiungi un clone di un sito esistente, con un url differente</string>
+    <string name="add_site_summary">Aggiungi un clone di un sito esistente, con un URL differente</string>
     <string name="download_path_pref">Posizione Download</string>
     <string name="nginx_url_pref">URL server NGINX</string>
     <string name="display_subbed_dubbed_settings">Mostra anime doppiati/sottotitolati</string>
@@ -366,7 +366,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blu-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
@@ -382,7 +382,7 @@
     <string name="resolution">Risoluzione</string>
     <string name="error_invalid_id">ID non valido</string>
     <string name="error_invalid_data">Dati non validi</string>
-    <string name="error_invalid_url">Url non valido</string>
+    <string name="error_invalid_url">URL non valido</string>
     <string name="error">Errore</string>
     <!--<string name="subtitles_remove_captions">Remove closed captions from subtitles</string>-->
     <!--<string name="subtitles_remove_bloat">Remove bloat from subtitles</string>-->
@@ -402,7 +402,7 @@
     <string name="extensions">Estensioni</string>
     <string name="add_repository">Aggiungi repository</string>
     <string name="repository_name_hint">Nome repository</string>
-    <string name="repository_url_hint">Url repository</string>
+    <string name="repository_url_hint">URL repository</string>
     <string name="plugin_loaded">Plugin caricato</string>
     <string name="plugin_deleted">Plugin eliminato</string>
     <string name="plugin_load_fail" formatted="true">Caricamento non riuscito %s</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index a6aa283f..568f9f8f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -267,7 +267,7 @@
     <string name="dns_pref_summary">Handig om ISP-blokkades te omzeilen</string>
     <string name="add_site_pref">Kloon site</string>
     <string name="remove_site_pref">Site verwijderen</string>
-    <string name="add_site_summary">Voeg een kloon toe van een bestaande site, met een andere url</string>
+    <string name="add_site_summary">Voeg een kloon toe van een bestaande site, met een andere URL</string>
     <string name="download_path_pref">Downloadpad</string>
     <string name="nginx_url_pref">Nginx server url</string>
     <string name="display_subbed_dubbed_settings">Weergave Dubbed/Subbed Anime</string>
@@ -364,7 +364,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blu-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 728d405a..28872a1a 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -221,7 +221,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="sort_clear">Tøm</string>
     <string name="category_account">Kontoer</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %s</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="play_with_app_name">Spill med CloudStream</string>
     <string name="sort_copy">Kopier</string>
     <string name="next_episode_format" formatted="true">Episode %d vil bli sluppet om</string>
@@ -311,4 +311,104 @@
     <string name="history">Historikk</string>
     <string name="double_tap_to_pause_settings_des">Trykk i midten for å sette på pause</string>
     <string name="no_episodes_found">Fant ingen episoder</string>
+    <string name="filler" formatted="true">Fyllstoff</string>
+    <string name="play_livestream_button">Spill direktestrøm</string>
+    <string name="subs_import_text" formatted="true">Importer skrifter ved å plassere den i %s</string>
+    <string name="autoplay_next_settings_des">Start neste episode når den som spiller slutter</string>
+    <string name="episode_sync_settings">Oppdater visningsframdrift</string>
+    <string name="kitsu_settings">Vis plakater fra Kitsu</string>
+    <string name="automatic_plugin_download">Last ned programtillegg automatisk</string>
+    <string name="cartoons_singular">Tegnefilm</string>
+    <string name="show_title">Navn</string>
+    <string name="nginx_url_pref">NGINX-tjenernettadresse</string>
+    <string name="download_path_pref">Nedlastingssti</string>
+    <string name="subtitles_encoding">Undertekst-koding</string>
+    <string name="example_email">Hei@verden.no</string>
+    <string name="example_site_name">MinKuleSide</string>
+    <string name="example_site_url">eksempel.no</string>
+    <string name="login">Logg inn</string>
+    <string name="added_sync_format" formatted="true">La til %s</string>
+    <string name="subtitles_outline">Omriss</string>
+    <string name="subtitles_depressed">Nedsenket</string>
+    <string name="player_loaded_subtitles" formatted="true">Lastet inn %s</string>
+    <string name="subtitle_offset_extra_hint_none_format">Ingen undertekstforsinkelse</string>
+    <string name="subtitle_offset_extra_hint_later_format">Bruk dette hvis undertekster vises %dms for tidlig</string>
+    <string name="actor_main">Hovedrolle</string>
+    <string name="actor_supporting">Støtterolle</string>
+    <string name="next">Neste</string>
+    <string name="referer">Referent</string>
+    <string name="plugin_deleted">Programtillegg slettet</string>
+    <string name="repository_name_hint">Pakkebrønnsnavn</string>
+    <string name="repository_url_hint">Pakkebrønnsnettadresse</string>
+    <string name="add_repository">Legg til pakkebrønn</string>
+    <string name="is_adult">18+</string>
+    <string name="plugin_load_fail" formatted="true">Kunne ikke laste inn %s</string>
+    <string name="plugins_downloaded" formatted="true">Nedlastet: %d</string>
+    <string name="plugins_disabled" formatted="true">Avskrudd: %d</string>
+    <string name="plugins_not_downloaded" formatted="true">Ikke nedlastet: %d</string>
+    <string name="plugins_updated" formatted="true">Oppdaterte %d programtillegg</string>
+    <string name="setup_extensions_subtext">Last ned listen over sider du vil bruke</string>
+    <string name="delete_repository_plugins">Dette vil også slette alle pakkebrønnsprogramtillegg</string>
+    <string name="view_public_repositories_button">Vis gemenskapspakkebrønner</string>
+    <string name="download_all_plugins_from_repo">Last ned alle programtilleggene fra denne pakkebrønnen\?</string>
+    <string name="single_plugin_disabled" formatted="true">%s (avskrudd)</string>
+    <string name="tracks">Spor</string>
+    <string name="app_not_found_error">Fant ikke programmet</string>
+    <string name="clipboard_too_large">For mye tekst. Kunne ikke lagre i utklippstavlen.</string>
+    <string name="search_hint_site" formatted="true">Søk i %s …</string>
+    <string name="stream">Strøm</string>
+    <string name="provider_info_meta">Metadata tilbys ikke av siden, videoinnlasting vil mislykkes hvis den ikke finnes på siden.</string>
+    <string name="type_re_watching">Ser om igjen</string>
+    <string name="automatic_plugin_updates">Automatiske programtilleggsoppdateringer</string>
+    <string name="restore_failed_format" formatted="true">Klarte ikke å gjenopprette data fra fil %s</string>
+    <string name="backup_failed_error_format">Kunne ikke sikkerhetskopiere %s</string>
+    <string name="example_password">passord123</string>
+    <string name="example_lang_name">Språkkode (nb_NO)</string>
+    <string name="previous">Forrige</string>
+    <string name="crash_reporting_title">Krasjrapportering</string>
+    <string name="extensions">Utvidelser</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="example_username">MittKuleBrukernavn</string>
+    <string name="skip_setup">Hopp over oppsett</string>
+    <string name="preferred_media_subtext">Hva du ønsker å se</string>
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="provider_languages_tip">Se videoer på disse språkene</string>
+    <string name="setup_done">Ferdig</string>
+    <string name="plugin_singular">programtillegg</string>
+    <string name="safe_mode_title">Trygt modus på</string>
+    <string name="action_add_to_bookmarks">Sett visningsstatus</string>
+    <string name="episode_sync_settings_des">Auto-synkroniser din nåværende episode-framdrift</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="view_public_repositories_button_short">Offentlig liste</string>
+    <string name="plugin">programtillegg</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nigjen</string>
+    <string name="limit_title_rez">Videooppløsning</string>
+    <string name="subtitle_offset">Synkroniser undertekster</string>
+    <string name="subtitle_offset_title">Undertekstforsinkelse</string>
+    <string name="subtitles_example_text">Sær golfer med kølle vant sexquiz på WC i hjemby</string>
+    <string name="quality_blueray">Blu-ray</string>
+    <string name="error_invalid_data">Ugyldig data</string>
+    <string name="category_player">Avspiller</string>
+    <string name="resolution">Oppløsning</string>
+    <string name="poster_image">Plakatbilde</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="resolution_and_title">Oppløsning og navn</string>
+    <string name="title">Navn</string>
+    <string name="error_invalid_id">Ugyldig ID</string>
+    <string name="error">Feil</string>
+    <string name="app_layout_subtext">Endre programutseende for å passe din enhet</string>
+    <string name="error_invalid_url">Ugyldig nettadresse</string>
+    <string name="batch_download">Knippe-nedlasting</string>
+    <string name="delete_repository">Slett pakkebrønn</string>
+    <string name="blank_repo_message">CloudStream har ingen sider installert som forvalg. Du må installere sidene fra pakkebrønner.
+\n
+\nSom følge av en hjernedød DMCA-forespørsel fra Sky UK Limited 🤮 kan vi ikke lenke til pakkebrønnssiden i programmet.
+\n
+\nTa del i vår discord, eller søk på nett.</string>
+    <string name="subtitle_offset_extra_hint_before_format">Bruk dette hvis undertekster vises %dms for sent</string>
+    <string name="plugin_loaded">Programtillegg innlastet</string>
+    <string name="audio_tracks">Lydspor</string>
+    <string name="skip_type_creddits">Rulletekst</string>
+    <string name="skip_type_intro">Introduksjon</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 35683433..cba96c34 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -264,7 +264,7 @@
     <string name="dns_pref_summary">Przydatne w pomijaniu blokad dostawców internetu</string>
     <string name="add_site_pref">Sklonuj stronę</string>
     <string name="remove_site_pref">Usuń stronę</string>
-    <string name="add_site_summary">Dodaj klona istniejącej strony z innym adresem url</string>
+    <string name="add_site_summary">Dodaj klona istniejącej strony z innym adresem URL</string>
     <string name="download_path_pref">Ścieżka pobierania</string>
     <string name="nginx_url_pref">Url serwera Nginx</string>
     <string name="display_subbed_dubbed_settings">Wyświetlanie Anime z dubbingiem/subbingiem</string>
@@ -340,7 +340,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blu-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
@@ -356,7 +356,7 @@
     <string name="resolution">Rozdzielczość</string>
     <string name="error_invalid_id">Niepoprawne id</string>
     <string name="error_invalid_data">Niepoprawne dane</string>
-    <string name="error_invalid_url">Niepoprawny url</string>
+    <string name="error_invalid_url">Niepoprawny URL</string>
     <string name="error">Błąd</string>
     <string name="subtitles_remove_captions">Usuń informacje dla niesłyszących z napisów</string>
     <string name="subtitles_remove_bloat">Usuń nadmiarowe informacje z napisów</string>
@@ -375,7 +375,7 @@
     <string name="extensions">Dodatki</string>
     <string name="add_repository">Dodaj repozytorium</string>
     <string name="repository_name_hint">Nazwa repozytorium</string>
-    <string name="repository_url_hint">Adres url repozytorium</string>
+    <string name="repository_url_hint">Adres URL repozytorium</string>
     <string name="plugin_loaded">Rozszerzenie załadowane</string>
     <string name="plugin_deleted">Rozszerzenie usunięte</string>
     <string name="plugin_load_fail" formatted="true">Błąd ładowania %s</string>
@@ -395,7 +395,7 @@
     <string name="plugins_updated">Zaaktualizowano %d rozszerzeń</string>
     <string name="blank_repo_message">CloudStream nie ma domyślnie zainstalowanych żadnych witryn. Musisz zainstalować witryny z repozytoriów.
 \n
-\nZ powodu bezmyślnego usunięcia DMCA przez Sky Uk Limited 🤮 nie możemy zamieścić linku dowitryny z repozytoriami.
+\nZ powodu bezmyślnego usunięcia DMCA przez Sky UK Limited 🤮 nie możemy zamieścić linku dowitryny z repozytoriami.
 \n
 \nDołącz do naszego Discorda lub szukaj online.</string>
     <string name="view_public_repositories_button">Zobacz repozytoria społeczności</string>
@@ -446,4 +446,5 @@
     <string name="update_notification_downloading">Pobieranie aktualizacji aplikacji</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="cast_format" formatted="true">Obsada: %s</string>
+    <string name="automatic_plugin_download_summary">Automatycznie instaluj wszystkie jeszcze nie zainstalowane wtyczki z dodanych repozytoriów.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index ce8f328c..6fc50898 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,5 +1,5 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Distribuție: %s</string>
@@ -7,7 +7,6 @@
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-	
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
@@ -17,23 +16,19 @@
     <string name="go_back_img_des">Înapoi</string>
     <string name="home_change_provider_img_des">Schimbă furnizorul</string>
     <string name="preview_background_img_des">Previzualizare în fundal</string>
-	
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Viteză (%.2fx)</string>
     <string name="rated_format" formatted="true">Evaluare: %.1f</string>
-    <string name="new_update_format" formatted="true">Actualizare nouă găsită!\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">Actualizare nouă găsită!\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
-
     <!-- <string name="app_name">CloudStream</string> -->
     <string name="title_home">Prima pagină</string>
     <string name="title_search">Căutare</string>
     <string name="title_downloads">Descărcări</string>
     <string name="title_settings">Setări</string>
-
     <string name="search_hint">Căutare…</string>
     <string name="search_hint_site" formatted="true">Căutați %s...</string>
-
     <string name="no_data">Fără date</string>
     <string name="episode_more_options_des">Mai multe opțiunii</string>
     <string name="next_episode">Episodul următor</string>
@@ -42,7 +37,6 @@
     <string name="result_open_in_browser">Deschide în browser</string>
     <string name="skip_loading">Săriți încărcarea</string>
     <string name="loading">Se încarcă...</string>
-
     <string name="type_watching">În curs de vizualizare</string>
     <string name="type_on_hold">În așteptare</string>
     <string name="type_completed">Finalizat</string>
@@ -50,7 +44,6 @@
     <string name="type_plan_to_watch">Planificare pentru a urmări</string>
     <string name="type_none">Anuleaza</string>
     <string name="type_re_watching">Reurmat</string>
-
     <string name="play_movie_button">Urmărește</string>
     <string name="play_torrent_button">Stream Torrent</string>
     <string name="pick_source">Surse</string>
@@ -58,7 +51,6 @@
     <string name="reload_error">Încercați să vă conectați din nou...</string>
     <string name="go_back">Înapoi</string>
     <string name="play_episode">Redă episodul</string>
-
     <string name="download">Descărcare</string>
     <string name="downloaded">Descărcat</string>
     <string name="downloading">Se descarcă</string>
@@ -68,18 +60,14 @@
     <string name="download_canceled">Descărcare anulată</string>
     <string name="download_done">Descărcare finalizată</string>
     <string name="stream">Stream</string>
-
     <string name="error_loading_links_toast">Eroare la încărcarea linkurilor</string>
     <string name="download_storage_text">Stocare internă</string>
-
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Sub</string>
-
     <string name="popup_delete_file">Șterge fișierul</string>
     <string name="popup_play_file">Redare fișier</string>
     <string name="popup_resume_download">Continuați descărcarea</string>
     <string name="popup_pause_download">Opriți descărcarea</string>
-
     <string name="pref_disable_acra">Dezactivați raportarea automată a erorilor</string>
     <string name="home_more_info">Mai multe informații</string>
     <string name="home_expanded_hide">Ascunde</string>
@@ -95,9 +83,7 @@
     <string name="sort_close">Închide</string>
     <string name="sort_clear">Elimină</string>
     <string name="sort_save">Salvează</string>
-
     <string name="player_speed">Viteză video</string>
-
     <string name="subtitles_settings">Setări de subtitrare</string>
     <string name="subs_text_color">Culoarea textului</string>
     <string name="subs_outline_color">Culoare de contur</string>
@@ -107,35 +93,26 @@
     <string name="subs_subtitle_elevation">Elevație subtitlu</string>
     <string name="subs_font">Font</string>
     <string name="subs_font_size">Dimensiune</string>
-
     <string name="search_provider_text_providers">Căutare în funcție de furnizor</string>
     <string name="search_provider_text_types">Căutare în funcție de tip</string>
-
     <string name="benene_count_text">%d banane oferite dezvoltatorilor</string>
     <string name="benene_count_text_none">Nu s-au oferit banane</string>
-
     <string name="subs_auto_select_language">Selectare automată a limbii</string>
     <string name="subs_download_languages">Descarcă limbi străine</string>
     <string name="subs_subtitle_languages">Limba subtitrării</string>
     <string name="subs_hold_to_reset_to_default">Țineți apăsat pentru a reseta la valorile implicite</string>
     <string name="subs_import_text" formatted="true">Importați fonturi prin introducerea lor în %s</string>
     <string name="continue_watching">Continuați să urmăriți</string>
-
     <string name="action_remove_watching">Eliminați</string>
     <string name="action_open_watching">Mai multe informații</string>
     <string name="action_open_play">@string/home_play</string>
-
     <string name="vpn_might_be_needed">Există probabilitatea necesitații unui VPN pentru ca acest furnizor să funcționeze corespunzător</string>
     <string name="vpn_torrent">Acest furnizor este un torrent, se recomandă un VPN</string>
-
     <string name="provider_info_meta">Metadatele nu sunt furnizate de către site, există posibilitatea ca încărcarea videoclipului să eșueze.</string>
-
     <string name="torrent_plot">Descriere</string>
     <string name="normal_no_plot">Scenariul este indisponibil</string>
     <string name="torrent_no_plot">Descrierea este indisponibilă</string>
-
     <string name="show_log_cat">Arată Logcat 🐈</string>
-
     <string name="picture_in_picture">Picture-in-Picture</string>
     <string name="picture_in_picture_des">Continuă redarea într-un mini-player peste alte aplicații</string>
     <string name="player_size_settings">Buton de redimensionare video</string>
@@ -144,7 +121,6 @@
     <string name="player_subtitles_settings_des">Setări de subtitrare</string>
     <string name="chromecast_subtitles_settings">Subtitrări Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Setări pentru subtitrare Chromecast</string>
-
     <string name="eigengraumode_settings">Modul Eigengravy</string>
     <string name="eigengraumode_settings_des">Adăugați opțiunea de viteză în player</string>
     <string name="swipe_to_seek_settings">Derulați spre înainte/înapoi</string>
@@ -158,23 +134,18 @@
     <string name="double_tap_to_seek_amount_settings">Atingeți dublu pentru a căuta</string>
     <string name="use_system_brightness_settings">Utilizați luminozitatea sistemului</string>
     <string name="use_system_brightness_settings_des">Utilizați luminozitatea sistemului în playerul aplicației în loc de o suprapunere întunecată</string>
-	
     <!--<string name="episode_sync_settings">Update watch progress</string>-->
     <string name="episode_sync_settings_des">Sincronizează automat episoadele vizionate</string>
-
     <string name="restore_settings">Recuperează datele din copia de rezervă</string>
-
     <string name="backup_settings">Copie de rezervă a datelor</string>
     <string name="restore_success">Fișier de rezervă încărcat</string>
     <string name="restore_failed_format" formatted="true">Imposibilitatea de a restaura datele din %s</string>
     <string name="backup_success">Datele au fost salvate cu succes</string>
     <string name="backup_failed">Permisiuni de arhivare lipsă, vă rugăm să încercați din nou</string>
     <string name="backup_failed_error_format">Eroare de backup %s</string>
-
     <string name="search">Căutare</string>
     <string name="category_account">Conturi și credite</string>
     <string name="category_updates">Actualizări și copii de rezervă</string>
-    
     <string name="settings_info">Informații</string>
     <string name="advanced_search">Căutare avansată</string>
     <string name="advanced_search_des">Împărțiți rezultatele căutării în funcție de furnizor</string>
@@ -183,27 +154,23 @@
     <string name="show_fillers_settings">Afișează etichetele [filler] pentru anime</string>
     <string name="show_trailers_settings">Arată trailerul</string>
     <string name="kitsu_settings">Arată posterele de la Kitsu</string>
-
     <string name="updates_settings">Afișați actualizările aplicației</string>
     <string name="updates_settings_des">Căutați automat noi actualizări la pornire</string>
     <string name="uprereleases_settings">Actualizați la prerelease</string>
     <string name="uprereleases_settings_des">Căutați actualizări ale versiunilor preliminare în loc să căutați doar versiunile complete</string>
     <string name="github">GitHub</string>
-    <string name="lightnovel">>Aplicație Light Novel realizată de aceiași dezvoltator</string>
+    <string name="lightnovel">&gt;Aplicație Light Novel realizată de aceiași dezvoltator</string>
     <string name="anim">Aplicație Anime realizată de aceiași dezvoltatorilor</string>
     <string name="discord">Alăturați-vă pe Discord</string>
     <string name="benene">Oferiți dezvoltatorilor o banană</string>
     <string name="benene_des">Oferă o banană</string>
-
     <string name="app_language">Limba aplicației</string>
-
     <string name="no_chromecast_support_toast">Acest furnizor nu are suport pentru Chromecast</string>
     <string name="no_links_found_toast">Nu s-au găsit link-uri</string>
     <string name="copy_link_toast">Link copiat în clipboard</string>
     <string name="play_episode_toast">Redare episod</string>
     <string name="subs_default_reset_toast">Restabilirea la valorile implicite</string>
     <string name="acra_report_toast">Ne pare rău, aplicația s-a blocat. Un raport de eroare anonim va fi trimis dezvoltatorilor</string>
-
     <string name="season">Sezonul</string>
     <string name="no_season">Nu există sezon</string>
     <string name="episode">Episodul</string>
@@ -211,7 +178,6 @@
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Nu s-au găsit episoade</string>
-
     <string name="delete_file">Ștergeți fișierul</string>
     <string name="delete">Ștergeți</string>
     <string name="pause">Pauză</string>
@@ -220,7 +186,6 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">Sunteți pe cale să ștergeți definitiv %s\nSunteți sigur?</string>
     <string name="resume_time_left" formatted="true">%dm\nrămas</string>
-
     <string name="status_ongoing">În curs de desfășurare</string>
     <string name="status_completed">Finalizat</string>
     <string name="status">Status</string>
@@ -229,15 +194,12 @@
     <string name="duration">Durată</string>
     <string name="site">Site</string>
     <string name="synopsis">Rezumat</string>
-
     <string name="queued">În coada de așteptare</string>
     <string name="no_subtitles">Nu există subtitrare</string>
     <string name="default_subtitles">Implicit</string>
-
     <string name="free_storage">Liber</string>
     <string name="used_storage">Folosit</string>
     <string name="app_storage">Aplicație</string>
-
     <!--plural-->
     <string name="movies">Filme</string>
     <string name="tv_series">Seriale TV</string>
@@ -247,7 +209,6 @@
     <string name="torrent">Torrent</string>
     <string name="documentaries">Documentare</string>
     <string name="asian_drama">Drame asiatice</string>
-
     <!--singular-->
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Serie TV</string>
@@ -257,13 +218,11 @@
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Documentar</string>
     <string name="asian_drama_singular">Drama asiatică</string>
-
     <string name="source_error">Eroare de sursă</string>
     <string name="remote_error">Eroare de la distanță</string>
     <string name="render_error">Eroare de randare</string>
     <string name="unexpected_error">Eroare neașteptată a playerului</string>
     <string name="storage_error">Eroare de descărcare; verificați permisiunile de stocare</string>
-
     <string name="episode_action_chromecast_episode">Chromecast</string>
     <string name="episode_action_chromecast_mirror">Chromecast alternativ</string>
     <string name="episode_action_play_in_app">Redă în Aplicație</string>
@@ -274,54 +233,40 @@
     <string name="episode_action_download_mirror">Descărcă prin Alernativă</string>
     <string name="episode_action_reload_links">Reîncărcare link-uri</string>
     <string name="episode_action_download_subtitle">Descărcare subtitrări</string>
-    
     <string name="show_hd">Etichetă de calitate</string>
     <string name="show_dub">Etichetă Dub</string>
     <string name="show_sub">Etichetă Sub</string>
     <string name="show_title">Titlu</string>
     <string name="poster_ui_settings">Etichete de pe postere</string>
-
     <string name="no_update_found">Nu s-au găsit actualizări</string>
     <string name="check_for_update">Verifică pentru actualizări</string>
-
     <string name="video_lock">Blocare</string>
     <string name="video_aspect_ratio_resize">Redimensionare</string>
     <string name="video_source">Sursă</string>
     <string name="video_skip_op">Săriți peste intro</string>
-    
     <string name="dont_show_again">Nu se mai arată din nou</string>
     <string name="skip_update">Treci peste această actualizare</string>
     <string name="update">Actualizare</string>
     <string name="watch_quality_pref">Rezoluția preferată</string>
     <string name="limit_title">Limitarea caracterelor de titlu în player</string>
     <string name="limit_title_rez">Rezoluția playerului video</string>
-    
     <string name="video_buffer_size_settings">Dimensiunea cache-ului video</string>
     <string name="video_buffer_length_settings">Lungimea buffer-ului video</string>
     <string name="video_buffer_disk_settings">Dimensiunea cache-ului video pe disc</string>
     <string name="video_buffer_clear_settings">Ștergeți memoria cache de imagine și video</string>
-
     <string name="video_ram_description">Dacă este setat la un nivel prea ridicat, poate cauza probleme pe sistemele cu prea puțină memorie RAM. Cum ar fi dispozitivele Android TV sau telefoanele mai vechi</string>
     <string name="video_disk_description">Dacă este setat la un nivel prea ridicat, poate cauza probleme pe sistemele cu spațiu de stocare intern redus. Ca și dispozitivele Android TV</string>
-	  
     <string name="dns_pref">DNS peste HTTPS</string>
     <string name="dns_pref_summary">Folositor pentru evitarea blocajelor ISP</string>
-
     <string name="add_site_pref">Adaugați site-ul</string>
     <string name="remove_site_pref">Eliminați site-ul</string>
     <string name="add_site_summary">Adăugați o copie a unui site existent, cu o adresă URL diferită</string>
-	    
     <string name="download_path_pref">Locul descărcării</string>
-	
     <string name="nginx_url_pref">Adresa URL a serverului Nginx</string>
-
     <string name="display_subbed_dubbed_settings">Afișarea anime-urilor dublate/subtitrate</string>
-    
     <string name="resize_fit">Adaptare la ecran</string>
     <string name="resize_fill">Întindere</string>
     <string name="resize_zoom">Mărire</string>
-
-	
     <string name="legal_notice">Aviz juridic (declinarea responsabilității și drepturi de autor)</string>
     <string name="legal_notice_text">Orice probleme legale privind conținutul acestei aplicații ar trebui
         să fie rezolvate cu furnizorii și gazdele actuale de fișiere, întrucât noi nu suntem afiliați cu aceștia.
@@ -339,7 +284,6 @@
         responsabilitatea utilizatorului de a evita orice acțiune care ar putea încălca legile care guvernează locația sa. Utilizați 
         CloudStream 3 pe propria răspundere.
     </string>
-
     <string name="category_general">General</string>
     <string name="random_button_settings">Aleatoriu</string>
     <string name="random_button_settings_desc">Afișați butonul Aleatoriu pe pagina de start</string>
@@ -348,17 +292,14 @@
     <string name="preferred_media_settings">Media preferată</string>
     <string name="subtitles_encoding">Codificarea subtitrărilor</string>
     <string name="category_ui">Interfața utilizatorului</string>
-
     <string name="automatic">Auto</string>
     <string name="tv_layout">Dispunere TV</string>
     <string name="phone_layout">Dispunere telefonică</string>
     <string name="emulator_layout">Dispunerea emulatorului</string>
-
     <string name="primary_color_settings">Culoare primară</string>
     <string name="app_theme_settings">Tema</string>
     <string name="bottom_title_settings">Locația titlului posterului</string>
     <string name="bottom_title_settings_des">Locația titlului de pe poster</string>
-
     <!-- account stuff -->
     <string name="example_password">parola123</string>
     <string name="example_username">David Popovici</string>
@@ -367,7 +308,6 @@
     <string name="example_site_name">David Popovici</string>
     <string name="example_site_url">davidpopovici.com</string>
     <string name="example_lang_name">Cod limbă (RO)</string>
-
     <string name="login_format" formatted="true">%s %s</string>
     <string name="account">Cont</string>
     <string name="logout">Deconectare</string>
@@ -384,7 +324,6 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s autentificat</string>
     <string name="authenticated_user_fail" formatted="true">Imposibil de autentificat la %s</string>
-	    
     <!-- ============ -->
     <string name="none">Nu există</string>
     <string name="normal">Normal</string>
@@ -408,7 +347,6 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">Vând muzică de jazz și haine de bun-gust în New-York și Quebec la preț fix.</string>
-
     <string name="recommended">Recomandări</string>
     <string name="player_loaded_subtitles" formatted="true">A fost încărcat %s</string>
     <string name="player_load_subtitles">Încărcați din fișier</string>
@@ -417,12 +355,9 @@
     <string name="actor_main">Protagonist</string>
     <string name="actor_supporting">Suport</string>
     <string name="actor_background">Secundar</string>
-
     <string name="home_source">Sursa</string>
     <string name="home_random">Aleatoriu</string>
-
     <string name="coming_soon">În curând</string>
-
     <string name="quality_cam">Cam</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
@@ -430,7 +365,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blu-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
@@ -439,7 +374,6 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">Poster</string>
     <string name="category_player">Player</string>
     <string name="resolution_and_title">Titlu și rezoluție</string>
@@ -452,4 +386,4 @@
     <!--<string name="subtitles_remove_bloat">Remove bloat from subtitles</string>-->
     <!--<string name="extras">Extra</string>-->
     <string name="trailer">Trailer</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index dfe922ee..a8dc5211 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -1,11 +1,8 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- KEYS DON'T TRANSLATE -->
-
-
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format">%s Ep %d</string>
-
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
@@ -15,18 +12,15 @@
     <string name="go_back_img_des">Go back</string>
     <string name="home_change_provider_img_des">Change Provider</string>
     <string name="preview_background_img_des">Preview Background</string>
-
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Bilis (%.2fx)</string>
     <string name="rated_format" formatted="true">Rated: %.1f</string>
-    <string name="new_update_format" formatted="true">Bagong update!\n%s -> %s</string>
-
+    <string name="new_update_format" formatted="true">Bagong update!\n%s -&gt; %s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Home</string>
     <string name="title_search">Maghanap</string>
     <string name="title_downloads">Mga Downloads</string>
     <string name="title_settings">Mga Settings</string>
-
     <string name="search_hint">Maghanap…</string>
     <string name="no_data">Walang datos</string>
     <string name="episode_more_options_des">Opsyon</string>
@@ -36,14 +30,12 @@
     <string name="result_open_in_browser">Buksan sa browser</string>
     <string name="skip_loading">Skip Loading…</string>
     <string name="loading">Loading…</string>
-
     <string name="type_watching">Pinapanood</string>
     <string name="type_on_hold">Inihinto</string>
     <string name="type_completed">Tapos nang panoorin</string>
     <string name="type_dropped">Ayaw nang panoorin</string>
     <string name="type_plan_to_watch">Balak panoorin</string>
     <string name="type_none">None</string>
-
     <string name="play_movie_button">I-play ang Movie</string>
     <string name="play_torrent_button">Stream Torrent</string>
     <string name="pick_source">Sources</string>
@@ -52,7 +44,6 @@
     <string name="go_back">Go back</string>
     <string name="play_episode">I-play ang episode</string>
     <!--<string name="need_storage">Payagan sa Itabi</string>-->
-
     <string name="download">Download</string>
     <string name="downloaded">Downloaded</string>
     <string name="downloading">Downloading</string>
@@ -61,18 +52,14 @@
     <string name="download_failed">Download Failed</string>
     <string name="download_canceled">Download Canceled</string>
     <string name="download_done">Download Done</string>
-
     <string name="error_loading_links_toast">Error Loading Links</string>
     <string name="download_storage_text">Internal Storage</string>
-
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Sub</string>
-
     <string name="popup_delete_file">I-delete ang file</string>
     <string name="popup_play_file">I-play ang file</string>
     <string name="popup_resume_download">I-resume ang download</string>
     <string name="popup_pause_download">I-pause ang download</string>
-
     <string name="pref_disable_acra">Huwag awtomatikong mag-ulat ng bug</string>
     <string name="home_more_info">More Info</string>
     <string name="home_expanded_hide">Itago</string>
@@ -84,7 +71,6 @@
     <string name="sort_apply">Kumpirmahin</string>
     <string name="sort_cancel">Kanselahin</string>
     <string name="player_speed">Bilis ng Playback</string>
-
     <string name="subtitles_settings">Subtitle Setting</string>
     <string name="subs_text_color">Kulay ng Teksto</string>
     <string name="subs_outline_color">Kulay ng Outline</string>
@@ -94,35 +80,29 @@
     <string name="subs_subtitle_elevation">Subtitle Elevation</string>
     <string name="subs_font">Istilo ng Font</string>
     <string name="subs_font_size">Laki ng Font</string>
-
     <string name="search_provider_text_providers">Search using providers</string>
     <string name="search_provider_text_types">Search using types</string>
-
     <string name="benene_count_text">%d Benenes na ibinigay sa mga devs</string>
     <string name="benene_count_text_none">Walang Benenes na binigay</string>
-
     <string name="subs_auto_select_language">Awtomatikong magpili ng lenggwahe</string>
-    <string name="subs_download_languages">Download Languages</string>
+    <string name="subs_download_languages">I-download ang mga Wika</string>
     <string name="subs_hold_to_reset_to_default">Pindutin nang matagal upang i-reset sa default</string>
     <string name="continue_watching">Ipagpatuloy ang pinapanood</string>
-
     <string name="action_remove_watching">Tanggalin</string>
     <string name="action_open_watching">Impormasyon</string>
-
     <string name="vpn_might_be_needed">Maaaring nangangailangan gumamit ng VPN upang gumana ito</string>
     <string name="vpn_torrent">Ito ay torrent, inirerekomenda ang paggamit ng VPN</string>
     <string name="torrent_plot">Deskripsyon</string>
     <string name="normal_no_plot">Walang nakitang plot</string>
     <string name="torrent_no_plot">Walang nakitang deskripsyon</string>
-
     <string name="picture_in_picture">Picture-in-picture</string>
-    <string name="picture_in_picture_des">Nagpapatuloy ang playback sa isang maliit na player sa itaas ng ibang apps</string>
+    <string name="picture_in_picture_des">Magpatuloy ang playback sa isang maliit na player sa ibabaw ng ibang apps</string>
     <string name="player_size_settings">Pindutan upang baguhin ang laki</string>
     <string name="player_size_settings_des">Alisin ang black borders</string>
     <string name="player_subtitles_settings">Subtitles</string>
     <string name="player_subtitles_settings_des">Player subtitles settings</string>
     <string name="eigengraumode_settings">Eigengravy Mode</string>
-    <string name="eigengraumode_settings_des">Nagdadagdag ng opsyon sa player upang baguhin ang bilis ng pinapanood</string>
+    <string name="eigengraumode_settings_des">Magdagdag ng \'speed option\' sa \'player\'</string>
     <string name="swipe_to_seek_settings">Swipe to seek</string>
     <string name="swipe_to_seek_settings_des">Swipe pakanan o pakaliwa upang makontrol ang oras ng pinapanood</string>
     <string name="swipe_to_change_settings">Swipe to change settings</string>
@@ -131,7 +111,6 @@
     <string name="double_tap_to_seek_settings_des">Tapikin ng dalawang beses sa kanan o kaliwang bahagi ng player upang mag-forward/backward</string>
     <string name="use_system_brightness_settings">Gamitin ang brightness ng system</string>
     <string name="use_system_brightness_settings_des">Gamitin ang brightness ng system para sa player</string>
-
     <string name="search">Maghanap</string>
     <string name="settings_info">Impormasyon</string>
     <string name="advanced_search">Adbans na maghanap</string>
@@ -149,29 +128,24 @@
     <string name="discord">Sumali sa Discord</string>
     <string name="benene">Magbigay ng benene sa ang devs</string>
     <string name="benene_des">Sumali benene</string>
-
     <string name="app_language">Wika</string>
-
     <string name="no_chromecast_support_toast">Walang chromecast support ang provider na ito</string>
     <string name="no_links_found_toast">Walang link na nakita</string>
     <string name="copy_link_toast">Link copied to clipboard</string>
     <string name="play_episode_toast">Play Episode</string>
     <string name="subs_default_reset_toast">I-reset sa default value</string>
     <string name="acra_report_toast">Paumanhin, ang app ay nag-crash. Isang anonymous bug report ang ipapadala sa developers</string>
-
     <string name="season">Season</string>
     <string name="no_season">No season</string>
     <string name="episode">Episode</string>
     <string name="episodes">Episodes</string>
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
-
     <string name="delete_file">Burahin ang file</string>
     <string name="delete">Tanggalin</string>
     <string name="pause">I-pause</string>
     <string name="resume">I-resume</string>
     <string name="delete_message">This will permanently delete %s\nAre you sure?</string>
-
     <string name="status_ongoing">Patuloy</string>
     <string name="status_completed">Tapos na</string>
     <string name="status">Katayuan</string>
@@ -180,27 +154,22 @@
     <string name="duration">Tagal</string>
     <string name="site">Site</string>
     <string name="synopsis">Sinopsis</string>
-
     <string name="queued">nakapila</string>
     <string name="no_subtitles">walang subtitles</string>
     <string name="default_subtitles">Default</string>
-
     <string name="free_storage">Bakante</string>
     <string name="used_storage">Gamit</string>
     <string name="app_storage">App</string>
-
     <string name="movies">Pelikula</string>
     <string name="tv_series">Palabas sa TV</string>
     <string name="cartoons">Cartoons</string>
     <string name="anime">Anime</string>
     <string name="torrent">Torrent</string>
-
     <string name="source_error">Source error</string>
     <string name="remote_error">Remote error</string>
     <string name="render_error">Renderer error</string>
     <string name="unexpected_error">Unexpected player error</string>
     <string name="storage_error">Download error, check storage permissions</string>
-
     <string name="episode_action_chromecast_episode">Chromecast Episode</string>
     <string name="episode_action_chromecast_mirror">Chromecast Mirror</string>
     <string name="episode_action_play_in_app">I-play sa App</string>
@@ -210,29 +179,23 @@
     <string name="episode_action_auto_download">Awtomatiking i-download</string>
     <string name="episode_action_download_mirror">Download mirror</string>
     <string name="episode_action_reload_links">Subukan muli</string>
-
     <string name="no_update_found">Walang bagong update</string>
     <string name="check_for_update">Tingnan kung may bagong update</string>
-
     <string name="video_lock">I-lock</string>
     <string name="video_aspect_ratio_resize">Palakihin</string>
     <string name="video_source">Source</string>
     <string name="video_skip_op">Skip OP</string>
-
     <string name="dont_show_again">Huwag nang ipakita ulit</string>
     <string name="update">Update</string>
     <string name="watch_quality_pref">Preferred watch quality</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Mainam gamitin sa pag-bypass ng ISP blocks</string>
-
     <string name="display_subbed_dubbed_settings">Display Dubbed/Subbed Anime</string>
-
     <string name="resize_fit">Fit to screen</string>
     <string name="resize_fill">Punan ang buong screen</string>
     <string name="resize_zoom">Zoom</string>
-
     <string name="category_general">Pangkalahatan</string>
-    <string name="provider_lang_settings">Lenggwahe ng Provider</string>
+    <string name="provider_lang_settings">Wika ng Provider</string>
     <string name="app_layout">App Layout</string>
     <string name="automatic">Awtomatik</string>
     <string name="tv_layout">TV Layout</string>
@@ -240,4 +203,9 @@
     <string name="primary_color_settings">Pangunahin Kulay</string>
     <string name="app_theme_settings">Tema ng app</string>
     <string name="preferred_media_settings">Preferred Media</string>
-</resources>
+    <string name="subs_subtitle_languages">Wika ng Subtitle</string>
+    <string name="subs_import_text" formatted="true">Mag-Import ng font na nakalagay sa %s</string>
+    <string name="show_log_cat">Ipakita ang Logcat 🐈</string>
+    <string name="autoplay_next_settings">Kusang i-play ang next episode</string>
+    <string name="enable_nsfw_on_providers">Payagan ang NSFW sa mga suportadong providers</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 54b9ebea..d723a160 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,5 +1,5 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
     <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
@@ -17,7 +17,6 @@
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
@@ -29,24 +28,20 @@
     <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">Change Provider</string>
     <string name="preview_background_img_des">Preview Background</string>
-
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Hız (%.2fx)</string>
     <string name="rated_format" formatted="true">Puan: %.1f</string>
-    <string name="new_update_format" formatted="true">Yeni güncelleme bulundu!\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">Yeni güncelleme bulundu!\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d dakika</string>
-
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">CloudStream ile oynat</string>
     <string name="title_home">Ana sayfa</string>
     <string name="title_search">Arama</string>
     <string name="title_downloads">İndirilenler</string>
     <string name="title_settings">Ayarlar</string>
-
     <string name="search_hint">Ara…</string>
     <string name="search_hint_site" formatted="true">%s sağlayıcısında ara…</string>
-
     <string name="no_data">Veri yok</string>
     <string name="episode_more_options_des">Daha fazla seçenek</string>
     <string name="next_episode">Sonraki bölüm</string>
@@ -56,7 +51,6 @@
     <string name="result_open_in_browser">Tarayıcıda aç</string>
     <string name="skip_loading">Yüklemeyi atla</string>
     <string name="loading">Yükleniyor…</string>
-
     <string name="type_watching">İzleniyor</string>
     <string name="type_on_hold">Beklemede</string>
     <string name="type_completed">Tamamlandı</string>
@@ -64,7 +58,6 @@
     <string name="type_plan_to_watch">Planlandı</string>
     <string name="type_none">Hiçbiri</string>
     <string name="type_re_watching">Yeniden izleniyor</string>
-
     <string name="play_movie_button">Filmi oynat</string>
     <string name="play_livestream_button">Canlı yayını oynat</string>
     <string name="play_torrent_button">Torrent oynat</string>
@@ -74,7 +67,6 @@
     <string name="go_back">Geri dön</string>
     <string name="play_episode">Bölümü oynat</string>
     <!--<string name="need_storage">Allow to download episodes</string>-->
-
     <string name="download">İndir</string>
     <string name="downloaded">İndirildi</string>
     <string name="downloading">İndiriliyor</string>
@@ -85,18 +77,14 @@
     <string name="download_done">İndirme bitti</string>
     <string name="download_format" translatable="false">%s - %s</string>
     <string name="stream">Yayınla</string>
-
     <string name="error_loading_links_toast">Bağlantılar yüklenirken hata oluştu</string>
     <string name="download_storage_text">Dahili depolama</string>
-
     <string name="app_dubbed_text">Dublajlı</string>
     <string name="app_subbed_text">Alt yazılı</string>
-
     <string name="popup_delete_file">Dosyayı sil</string>
     <string name="popup_play_file">Dosyayı oynat</string>
     <string name="popup_resume_download">İndirmeyi sürdür</string>
     <string name="popup_pause_download">İndirmeyi duraklat</string>
-
     <string name="pref_disable_acra">Otomatik hata raporlamayı kapat</string>
     <string name="home_more_info">Daha fazla bilgi</string>
     <string name="home_expanded_hide">Gizle</string>
@@ -112,9 +100,7 @@
     <string name="sort_close">Kapat</string>
     <string name="sort_clear">Temizle</string>
     <string name="sort_save">Kaydet</string>
-
     <string name="player_speed">Oynatıcı hızı</string>
-
     <string name="subtitles_settings">Alt yazı ayarları</string>
     <string name="subs_text_color">Yazı rengi</string>
     <string name="subs_outline_color">Dış hat rengi</string>
@@ -124,35 +110,26 @@
     <string name="subs_subtitle_elevation">Alt yazı yüksekliği</string>
     <string name="subs_font">Yazı tipi</string>
     <string name="subs_font_size">Yazı boyutu</string>
-
     <string name="search_provider_text_providers">Sağlayıcıları kullanarak ara</string>
     <string name="search_provider_text_types">Türleri kullanarak ara</string>
-
     <string name="benene_count_text">Geliştiricilere %d muz verildi</string>
     <string name="benene_count_text_none">Hiç muz verilmedi</string>
-
     <string name="subs_auto_select_language">Otomatik seçilecek dil</string>
     <string name="subs_download_languages">İndirilecek diller</string>
     <string name="subs_subtitle_languages">Alt yazı dili</string>
     <string name="subs_hold_to_reset_to_default">Varsayılana döndürmek için basılı tut</string>
     <string name="subs_import_text" formatted="true">Fontları içe aktarmak için %s konumuna yerleştirin</string>
     <string name="continue_watching">İzlemeye devam et</string>
-
     <string name="action_remove_watching">Kaldır</string>
     <string name="action_open_watching">Daha fazla bilgi</string>
     <string name="action_open_play">@string/home_play </string>
-
     <string name="vpn_might_be_needed">Bu sağlayıcının düzgün çalışması için bir VPN gerekebilir</string>
     <string name="vpn_torrent">Bu sağlayıcı bir torrent. VPN önerilir</string>
-
     <string name="provider_info_meta">Metadata verisi site tarafından sağlanmadı, video yüklemesi eğer sitede bulunmuyorsa oynatma başarısız olacak</string>
-
     <string name="torrent_plot">Açıklama</string>
     <string name="normal_no_plot">Konu bulunamadı</string>
     <string name="torrent_no_plot">Açıklama bulunamadı</string>
-
     <string name="show_log_cat">Logcat\'i göster 🐈</string>
-
     <string name="picture_in_picture">Resim-içinde-resim</string>
     <string name="picture_in_picture_des">Diğer uygulamaların üzerinde minyatür bir oynatıcıda oynatmaya devam eder</string>
     <string name="player_size_settings">Oynatıcı yeniden boyutlandırma butonu</string>
@@ -161,17 +138,14 @@
     <string name="player_subtitles_settings_des">Oynatıcı alt yazı ayarları</string>
     <string name="chromecast_subtitles_settings">Chromecast alt yazı</string>
     <string name="chromecast_subtitles_settings_des">Chromecast alt yazı ayarları</string>
-
     <string name="eigengraumode_settings">Eigengravy modu</string>
     <string name="eigengraumode_settings_des">Oynatıcıya bir hız seçeneği ekle</string>
     <string name="swipe_to_seek_settings">Gözlemek için kaydır</string>
     <string name="swipe_to_seek_settings_des">Zamanı ayarlamak için sağa veya sola kaydır</string>
     <string name="swipe_to_change_settings">Ayarları değiştirmek için kaydır</string>
     <string name="swipe_to_change_settings_des">Sol ve sağ taraftan kaydırarak parlaklık ve sesi ayarla</string>
-
     <string name="autoplay_next_settings">Sonraki bölümü otomatik oynat</string>
     <string name="autoplay_next_settings_des">Mevcut bölüm bittiğinde sonraki bölüme başla</string>
-
     <string name="double_tap_to_seek_settings">Gözlemek için çift tıkla</string>
     <string name="double_tap_to_pause_settings">Durdurmak için çift tıkla</string>
     <string name="double_tap_to_seek_amount_settings">Oynatıcı gözleme miktarı</string>
@@ -179,23 +153,18 @@
     <string name="double_tap_to_pause_settings_des">Durdurmak için ortaya tıkla</string>
     <string name="use_system_brightness_settings">Sistem parlaklığını kullan</string>
     <string name="use_system_brightness_settings_des">Oynatıcıda karanlık kaplama yerine sistem parlaklığını kullan</string>
-
     <string name="episode_sync_settings">İzleme ilerlemesini güncelle</string>
     <string name="episode_sync_settings_des">Mevcut bölüm ilerlemesini otomatik güncelle</string>
-
     <string name="restore_settings">Yedekten geri yükle</string>
-
     <string name="backup_settings">Yedekle</string>
     <string name="restore_success">Yedek dosyası yüklendi</string>
     <string name="restore_failed_format" formatted="true">Geri yükleme başarısız oldu: %s</string>
     <string name="backup_success">Başarıyla yedeklendi</string>
     <string name="backup_failed">Depolama izinleri eksik, lütfen tekrar deneyin</string>
     <string name="backup_failed_error_format">%s yedeklenirken hata</string>
-
     <string name="search">Ara</string>
     <string name="category_account">Hesaplar</string>
     <string name="category_updates">Güncellemeler ve yedek</string>
-
     <string name="settings_info">Bilgi</string>
     <string name="advanced_search">Gelişmiş arama</string>
     <string name="advanced_search_des">Sağlayıcılara göre ayrılmış arama sonuçlarını ver</string>
@@ -205,7 +174,6 @@
     <string name="show_trailers_settings">Fragmanları göster</string>
     <string name="kitsu_settings">Kitsu\'dan posterleri göster</string>
     <string name="pref_filter_search_quality">Arama sonuçlarında seçilen video kalitelerini gizle</string>
-
     <string name="automatic_plugin_updates">Otomatik eklenti güncellemeleri</string>
     <string name="updates_settings">Uygulama güncellemelerini göster</string>
     <string name="updates_settings_des">Başlangıçta yeni güncellemeleri otomatik olarak ara</string>
@@ -217,16 +185,13 @@
     <string name="discord">Discord\'a katıl</string>
     <string name="benene">Geliştiricilere muz ver</string>
     <string name="benene_des">Verilen muz</string>
-
     <string name="app_language">Uygulama dili</string>
-
     <string name="no_chromecast_support_toast">Bu sağlayıcının Chromecast desteği yok</string>
     <string name="no_links_found_toast">Bağlantı bulunamadı</string>
     <string name="copy_link_toast">Bağlantı panoya kopyalandı</string>
     <string name="play_episode_toast">Bölümü oynat</string>
     <string name="subs_default_reset_toast">Varsayılana sıfırla</string>
     <string name="acra_report_toast">Üzgünüz, uygulama çöktü. Geliştiricilere isimsiz bir hata raporu gönderilecek</string>
-
     <string name="season">Sezon</string>
     <string name="season_format">%s %d%s</string>
     <string name="no_season">Sezon yok</string>
@@ -237,7 +202,6 @@
     <string name="season_short">S</string>
     <string name="episode_short">B</string>
     <string name="no_episodes_found">Bölüm bulunamadı</string>
-
     <string name="delete_file">Dosyayı sil</string>
     <string name="delete">Sil</string>
     <string name="cancel" translatable="false">@string/sort_cancel</string>
@@ -247,7 +211,6 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">%s dosyası tamamen silinecek\nEmins misiniz?</string>
     <string name="resume_time_left" formatted="true">%dm\nkaldı</string>
-
     <string name="status_ongoing">Devam ediyor</string>
     <string name="status_completed">Tamamlandı</string>
     <string name="status">Durum</string>
@@ -256,15 +219,12 @@
     <string name="duration">Süre</string>
     <string name="site">Site</string>
     <string name="synopsis">Özet</string>
-
     <string name="queued">Sıraya alındı</string>
     <string name="no_subtitles">Alt yazı yok</string>
     <string name="default_subtitles">Varsayılan</string>
-
     <string name="free_storage">Boş</string>
     <string name="used_storage">Kullanılan</string>
     <string name="app_storage">Uygulama</string>
-
     <!--plural-->
     <string name="movies">Filmler</string>
     <string name="tv_series">Diziler</string>
@@ -277,7 +237,6 @@
     <string name="livestreams">Canlı yayınlar</string>
     <string name="nsfw">NSFW</string>
     <string name="others">Diğerleri</string>
-
     <!--singular-->
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Dizi</string>
@@ -290,13 +249,11 @@
     <string name="live_singular">Canlı yayın</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Video</string>
-
     <string name="source_error">Kaynak hatası</string>
     <string name="remote_error">Sunucu hatası</string>
     <string name="render_error">İşleyici hatası</string>
     <string name="unexpected_error">Beklenmeyen oynatıcı hatası</string>
     <string name="storage_error">İndirme hatası, depolama izinlerini kontrol edin</string>
-
     <string name="episode_action_chromecast_episode">Bölümü Chromecast ile yayınla</string>
     <string name="episode_action_chromecast_mirror">Bağlantıyı Chromecast ile yayınla</string>
     <string name="episode_action_play_in_app">Uygulamada oynat</string>
@@ -307,7 +264,6 @@
     <string name="episode_action_download_mirror">Şu kaynaktan indir</string>
     <string name="episode_action_reload_links">Bağlantıları yenile</string>
     <string name="episode_action_download_subtitle">Alt yazıları indir</string>
-
     <string name="show_hd">Kalite etiketi</string>
     <string name="show_dub">Dublaj etiketi</string>
     <string name="show_sub">Alt yazı etiketi</string>
@@ -317,47 +273,35 @@
     <string name="show_sub_key" translatable="false">show_sub_key</string>
     <string name="show_title_key" translatable="false">show_title_key</string>
     <string name="poster_ui_settings">Poster üzerindeki öğeler</string>
-
     <string name="no_update_found">Güncelleme bulunamadı</string>
     <string name="check_for_update">Güncellemeleri denetle</string>
-
     <string name="video_lock">Kilitle</string>
     <string name="video_aspect_ratio_resize">Yeniden boyutlandır</string>
     <string name="video_source">Kaynak</string>
     <string name="video_skip_op">OP\'yi geç</string>
-
     <string name="dont_show_again">Bir daha gösterme</string>
     <string name="skip_update">Bu güncellemeyi atla</string>
     <string name="update">Güncelle</string>
     <string name="watch_quality_pref">Tercih edilen izleme kalitesi</string>
     <string name="limit_title">Oynatıcıdaki maksimum başlık karakter sayısı</string>
     <string name="limit_title_rez">Oynatıcının üst tarafındaki öğeler</string>
-
     <string name="video_buffer_size_settings">Video arabelleği boyutu</string>
     <string name="video_buffer_length_settings">Video arabelleği uzunluğu</string>
     <string name="video_buffer_disk_settings">Diskteki video önbelleği</string>
     <string name="video_buffer_clear_settings">Video ve resim önbelleğini temizle</string>
-
     <string name="video_ram_description">Çok yükseğe ayarlanırsa rastgele çökmelere neden olur. Android TV veya eski bir telefon gibi ram miktarı düşük cihazlarda değiştirmeyin</string>
     <string name="video_disk_description">Çok yükseğe ayarlanırsa, Android TV cihazları gibi düşük depolama alanına sahip sistemlerde sorunlara neden olabilir</string>
-
     <string name="dns_pref">HTTPS üzerinden DNS</string>
     <string name="dns_pref_summary">ISP bloklarını atlatmak için kullanışlıdır</string>
-
     <string name="add_site_pref">Klon site</string>
     <string name="remove_site_pref">Siteyi kaldır</string>
     <string name="add_site_summary">Farklı bir URL ile mevcut bir sitenin klonunu ekleyin</string>
-
     <string name="download_path_pref">İndirme konumu</string>
-
     <string name="nginx_url_pref">Nginx sunucu URL\'i</string>
-
     <string name="display_subbed_dubbed_settings">Dublajlı/Alt yazılı animeleri göster</string>
-
     <string name="resize_fit">Ekrana sığdır</string>
     <string name="resize_fill">Uzat</string>
     <string name="resize_zoom">Yakınlaştır</string>
-
     <string name="legal_notice">Disclaimer</string>
     <string name="legal_notice_key" translatable="false">legal_notice_key</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
@@ -386,18 +330,14 @@
     <string name="subtitles_encoding">Alt yazı kodlaması</string>
     <string name="category_providers">Sağlayıcılar</string>
     <string name="category_ui">Düzen</string>
-
     <string name="automatic">Otomatik</string>
     <string name="tv_layout">TV düzeni</string>
     <string name="phone_layout">Telefon düzeni</string>
     <string name="emulator_layout">Emülatör düzeni</string>
-
     <string name="primary_color_settings">Birincil renk</string>
     <string name="app_theme_settings">Uygulama teması</string>
     <string name="bottom_title_settings">Poster başlık konumu</string>
     <string name="bottom_title_settings_des">Başlığı posterin altına yerleştir</string>
-
-
     <!-- account stuff -->
     <string name="anilist_key" translatable="false">anilist_key</string>
     <string name="mal_key" translatable="false">mal_key</string>
@@ -410,7 +350,6 @@
     <string name="example_site_name">MyCoolSite</string>
     <string name="example_site_url">example.com</string>
     <string name="example_lang_name">Dil kodu (tr)</string>
-
     <!--
     <string name="mal_account_settings" translatable="false">MAL</string>
     <string name="anilist_account_settings" translatable="false">AniList</string>
@@ -435,7 +374,6 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s için doğrulama başarılı</string>
     <string name="authenticated_user_fail" formatted="true">%s için doğrulama başarısız</string>
-
     <!-- ============ -->
     <string name="none">Hiçbiri</string>
     <string name="normal">Normal</string>
@@ -453,7 +391,6 @@
     <string name="subtitle_offset_extra_hint_later_format">Alt yazılar %dms erken gözüküyorsa bunu kullanın</string>
     <string name="subtitle_offset_extra_hint_before_format">Alt yazılar %dms geç gözüküyorsa bunu kullanın</string>
     <string name="subtitle_offset_extra_hint_none_format">Alt yazı gecikmesi yok</string>
-
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
     see: 
@@ -461,7 +398,6 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">Pijamalı hasta yağız şoföre çabucak güvendi</string>
-
     <string name="recommended">Önerilen</string>
     <string name="player_loaded_subtitles" formatted="true">%s yüklendi</string>
     <string name="player_load_subtitles">Dosyadan yükle</string>
@@ -470,12 +406,9 @@
     <string name="actor_main">Baş</string>
     <string name="actor_supporting">Yardımcı</string>
     <string name="actor_background">Geri plan</string>
-
     <string name="home_source">Kaynak</string>
     <string name="home_random">Rastgele</string>
-
     <string name="coming_soon">Çok yakında…</string>
-
     <string name="quality_cam">Cam</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
@@ -483,7 +416,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blu-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
@@ -492,7 +425,6 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">Poster fotoğrafı</string>
     <string name="category_player">Oynatıcı</string>
     <string name="resolution_and_title">Çözünürlük ve başlık</string>
@@ -542,18 +474,15 @@
     <string name="view_public_repositories_button">Topluluk depolarını görüntüle</string>
     <string name="view_public_repositories_button_short">Herkese açık liste</string>
     <string name="uppercase_all_subtitles">Tüm alt yazılar büyük harf</string>
-
     <string name="download_all_plugins_from_repo">Bu depodaki tüm eklentiler indirilsin mi?</string>
     <string name="single_plugin_disabled" formatted="true">%s devre dışı bırakıldı</string>
     <string name="tracks">Parçalar</string>
     <string name="audio_tracks">Ses parçaları</string>
     <string name="video_tracks">Video parçaları</string>
     <string name="apply_on_restart">Yeniden başlatmada uygula</string>
-
     <string name="safe_mode_title">Güvenli mod etkin</string>
     <string name="safe_mode_description">Kurtarılamaz bir çökme meydana geldi ve soruna neden olan eklentiyi bulup kaldırabilmeniz için tüm eklentileri otomatik olarak devre dışı bıraktık.</string>
     <string name="safe_mode_crash_info">Çökme bilgisini göster</string>
-
     <string name="extension_rating" formatted="true">Puan: %s</string>
     <string name="extension_description">Açıklama</string>
     <string name="extension_version">Versiyon</string>
@@ -563,9 +492,7 @@
     <string name="extension_types">Desteklenen</string>
     <string name="extension_language">Dil</string>
     <string name="extension_install_first">Önce eklentiyi yükleyin</string>
-
     <string name="hls_playlist">HLS Oynatma Listesi</string>
-
     <string name="player_pref">Tercih edilen video oynatıcısı</string>
     <string name="player_settings_play_in_app">Dahili oynatıcı</string>
     <string name="player_settings_play_in_vlc">VLC</string>
@@ -573,5 +500,4 @@
     <string name="player_settings_play_in_web">Web Video Yayını</string>
     <string name="player_settings_play_in_browser">Tarayıcı</string>
     <string name="app_not_found_error">Uygulama bulunamadı</string>
-</resources>
-
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 6b3db353..fbbd0a48 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -367,7 +367,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blu-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bffd1eed..7a81964b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -234,7 +234,7 @@
     <string name="bug_report_settings_on">Sends no data</string>
     <string name="show_fillers_settings">Show filler episode for anime</string>
     <string name="show_trailers_settings">Show trailers</string>
-    <string name="kitsu_settings">Show posters from kitsu</string>
+    <string name="kitsu_settings">Show posters from Kitsu</string>
     <string name="pref_filter_search_quality">Hide selected video quality on Search results</string>
     <string name="automatic_plugin_updates">Automatic plugin updates</string>
     <string name="automatic_plugin_download">Automatically download plugins</string>
@@ -361,7 +361,7 @@
     <string name="dns_pref_summary">Useful for bypassing ISP blocks</string>
     <string name="add_site_pref">Clone site</string>
     <string name="remove_site_pref">Remove site</string>
-    <string name="add_site_summary">Add a clone of an existing site, with a different url</string>
+    <string name="add_site_summary">Add a clone of an existing site, with a different URL</string>
     <string name="download_path_pref">Download path</string>
     <string name="nginx_url_pref">NGINX server URL</string>
     <string name="display_subbed_dubbed_settings">Display Dubbed/Subbed Anime</string>
@@ -482,7 +482,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blu-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
@@ -496,9 +496,9 @@
     <string name="resolution_and_title">Resolution and title</string>
     <string name="title">Title</string>
     <string name="resolution">Resolution</string>
-    <string name="error_invalid_id">Invalid id</string>
+    <string name="error_invalid_id">Invalid ID</string>
     <string name="error_invalid_data">Invalid data</string>
-    <string name="error_invalid_url">Invalid url</string>
+    <string name="error_invalid_url">Invalid URL</string>
     <string name="error">Error</string>
     <string name="subtitles_remove_captions">Remove closed captions from subtitles</string>
     <string name="subtitles_remove_bloat">Remove bloat from subtitles</string>
@@ -518,10 +518,10 @@
     <string name="extensions">Extensions</string>
     <string name="add_repository">Add repository</string>
     <string name="repository_name_hint">Repository name</string>
-    <string name="repository_url_hint">Repository url</string>
+    <string name="repository_url_hint">Repository URL</string>
     <string name="plugin_loaded">Plugin Loaded</string>
     <string name="plugin_deleted">Plugin Deleted</string>
-    <string name="plugin_load_fail" formatted="true">Failed to load %s</string>
+    <string name="plugin_load_fail" formatted="true">Could not load %s</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">Started downloading %d %s</string>
     <string name="batch_download_finish_format" formatted="true">Downloaded %d %s successfully</string>
@@ -538,7 +538,7 @@
     <string name="plugins_updated" formatted="true">Updated %d plugins</string>
     <string name="blank_repo_message">CloudStream has no sites installed by default. You need to install the sites from repositories.
 \n
-\nBecause of a brainless DMCA takedown by Sky Uk Limited 🤮 we cannot link the repository site in app.
+\nBecause of a brainless DMCA takedown by Sky UK Limited 🤮 we cannot link the repository site in app.
 \n
 \nJoin our Discord or search online.</string>
     <string name="view_public_repositories_button">View community repositories</string>
@@ -584,7 +584,7 @@
     <string name="enable_skip_op_from_database_des">Show skip popups for opening/ending</string>
     <string name="clipboard_too_large">Too much text. Unable to save to clipboard.</string>
     <string name="action_mark_as_watched">Mark as watched</string>
-    <string name="confirm_exit_dialog">Are you sure you want to exit?</string>
+    <string name="confirm_exit_dialog">Are you sure you want to exit\?</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="update_notification_downloading">Downloading app update</string>

From e2fc946d917961ca3d627a33980618f95ad1268b Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Tue, 20 Dec 2022 10:07:34 +0100
Subject: [PATCH 119/273] Translated using Weblate (Tagalog)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 62.2% (338 of 543 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 98.3% (534 of 543 strings)

Translated using Weblate (Tagalog)

Currently translated at 53.7% (292 of 543 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 86.9% (472 of 543 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (543 of 543 strings)

Translated using Weblate (English)

Currently translated at 100.0% (543 of 543 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 84.5% (459 of 543 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (543 of 543 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (543 of 543 strings)

Translated using Weblate (French)

Currently translated at 72.9% (396 of 543 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (543 of 543 strings)

Translated using Weblate (English)

Currently translated at 100.0% (543 of 543 strings)

Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Jace Orwell <jaceorwell@gmail.com>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Sdarfeesh <Sdarfeesh@protonmail.com>
Co-authored-by: Translator-3000 <weblate.m1d0h@8shield.net>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/en/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml |  25 +++---
 app/src/main/res/values-fr/strings.xml |  28 +++++-
 app/src/main/res/values-it/strings.xml |  17 ++--
 app/src/main/res/values-no/strings.xml |  35 ++++++++
 app/src/main/res/values-tl/strings.xml |  51 +++++++++++
 app/src/main/res/values-zh/strings.xml | 116 +++++--------------------
 app/src/main/res/values/strings.xml    |  20 ++---
 7 files changed, 164 insertions(+), 128 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 0468d743..92f62746 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -136,8 +136,8 @@
     <string name="backup_settings">نسخ إحتياطي</string>
     <string name="restore_success">تم تحميل ملف النسخة الاحتياطية</string>
     <string name="restore_failed_format" formatted="true">فشل استيراد البيانات من الملف %s</string>
-    <string name="backup_success">تم تخزين البيانات بنجاح</string>
-    <string name="backup_failed">إذن الوصول الي ذاكرة التخزين مفقود, من فضلك حاول مجددا</string>
+    <string name="backup_success">البيانات المخزنة</string>
+    <string name="backup_failed">إذن الوصول الى ذاكرة التخزين مفقود, من فضلك حاول مجددا.</string>
     <string name="backup_failed_error_format">فشل إنشاء نسخة احتياطية %s</string>
     <string name="search">بحث</string>
     <string name="category_account">الحسابات</string>
@@ -263,7 +263,7 @@
     <string name="video_buffer_length_settings">طول التخزين المؤقت</string>
     <string name="video_buffer_disk_settings">التخزين المؤقت للفيديو علي القرص</string>
     <string name="video_buffer_clear_settings">مسح التخزين المؤقت للصورة والفيديو</string>
-    <string name="video_ram_description">سوف يسبب بعض الأعطال إذا تم إعداد قيمة عالية جدًا. لا\تغير القيمة إذا كان لديك ذاكرة تخزين عشوائية منخفضة كتلفاز أندرويد أو هاتف قديم</string>
+    <string name="video_ram_description">يتسبب في حدوث أعطال عشوائية إذا تم ضبطه على قيمة عالية جدًا. اتركه كما هو على الأجهزة ذات الذاكرة المنخفضة.</string>
     <string name="video_disk_description">قد يسبب مشاكل مع حجم ذاكرة التخزين المنخفضة كأجهزة تلفاز الأندرويد إذا أعددت قيمة عالية جدًا</string>
     <string name="dns_pref">إستخدام DNS بدلا من HTTPS</string>
     <string name="dns_pref_summary">مفيد لتجاوز حجب مزود خدمة الإنترنت</string>
@@ -347,7 +347,7 @@
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">تم توثيق %s</string>
-    <string name="authenticated_user_fail" formatted="true">فشل توثيق %s</string>
+    <string name="authenticated_user_fail" formatted="true">تعذر المصادقة على %s</string>
     <!-- ============ -->
     <string name="none">لا شيء</string>
     <string name="normal">عادي</string>
@@ -404,7 +404,7 @@
     <string name="resolution_and_title">الأبعاد والعنوان</string>
     <string name="title">العنوان</string>
     <string name="resolution">الأبعاد</string>
-    <string name="error_invalid_id">هوية غير صالحة</string>
+    <string name="error_invalid_id">معرف غير صالح</string>
     <string name="error_invalid_data">بيانات غير صالحة</string>
     <string name="error_invalid_url">عنون رابط غير صالح</string>
     <string name="error">خطأ</string>
@@ -429,10 +429,10 @@
     <string name="repository_url_hint">عنوان URL للمستودع</string>
     <string name="plugin_loaded">تم تحميل الإضافة</string>
     <string name="plugin_deleted">تم إزالة الإضافة</string>
-    <string name="plugin_load_fail" formatted="true">فشل التحميل %s</string>
+    <string name="plugin_load_fail" formatted="true">تعذر التحميل %s</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">بدأ تنزيل %d %s</string>
-    <string name="batch_download_finish_format" formatted="true">تم تنزيل %d %s بنجاح</string>
+    <string name="batch_download_finish_format" formatted="true">تم التنزيل %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">جميع %s محملة بالفعل</string>
     <string name="batch_download">تحميل مكثف</string>
     <string name="plugin_singular">إضافة</string>
@@ -445,7 +445,7 @@
     <string name="plugins_not_downloaded" formatted="true">غير مُحمل: %d</string>
     <string name="blank_repo_message">لا يحتوي CloudStream على مواقع مثبتة بشكل افتراضي. تحتاج إلى تثبيت المواقع من المستودعات.
 \n
-\nبسبب إزالة قانون الألفية الجديدة لحقوق طبع ونشر المواد الرقمية بدون عقل بواسطة Sky Uk Limited 🤮 ، لا يمكننا ربط موقع المستودع في التطبيق.
+\nبسبب إزالة قانون الألفية الجديدة لحقوق طبع ونشر المواد الرقمية بدون تفكير مسبق بواسطة Sky UK Limited 🤮 ، لا يمكننا ربط موقع المستودع في التطبيق.
 \n
 \nانضم إلى Discord أو ابحث عبر الإنترنت.</string>
     <string name="view_public_repositories_button">عرض مستودعات المجتمع</string>
@@ -483,7 +483,7 @@
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="player_settings_play_in_mpv">MPV</string>
     <string name="player_settings_play_in_web">اسقاط فيديو الويب</string>
-    <string name="player_settings_play_in_browser">المتصفح</string>
+    <string name="player_settings_play_in_browser">متصفح الإنترنت</string>
     <string name="skip_type_format" formatted="true">تخطي %s</string>
     <string name="skip_type_op">الافتتاح</string>
     <string name="skip_type_ed">النهاية</string>
@@ -497,16 +497,17 @@
     <string name="no">ﻻ</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s الحلقة %d</string>
     <string name="next_episode_format" formatted="true">سيتم إصدار الحلقة %d في</string>
-    <string name="update_notification_failed">فشل تحديث التطبيق</string>
+    <string name="update_notification_failed">تعذر تثبيت الإصدار الجديد من التطبيق</string>
     <string name="extension_install_first">تثبيت الإضافة أولا</string>
     <string name="player_settings_play_in_app">مشغل داخلي</string>
     <string name="app_not_found_error">لم يتم العثور على التطبيق</string>
     <string name="all_languages_preference">جميع اللغات</string>
     <string name="skip_type_creddits">الإعتمادات</string>
-    <string name="update_notification_downloading">تنزيل تحديث التطبيق</string>
-    <string name="update_notification_installing">تثبيت تحديث التطبيق</string>
+    <string name="update_notification_downloading">‌تنزيل تحديث التطبيق…</string>
+    <string name="update_notification_installing">‏تثبيت تحديث التطبيق…</string>
     <string name="next_episode_time_min_format" formatted="true">%d دقيقة</string>
     <string name="episodes_range">%d-%d</string>
     <string name="episode_format" formatted="true">%d %s</string>
     <string name="confirm_exit_dialog">هل أنت متأكد أنك تريد الخروج؟</string>
+    <string name="automatic_plugin_download_summary">قم بتثبيت جميع المكونات الإضافية التي لم يتم تثبيتها بعد تلقائيا من المستودعات المضافة.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index cd909dc8..ddfee69d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -37,11 +37,11 @@
     <string name="downloading">Téléchargement</string>
     <string name="download_paused">Téléchargement en pause</string>
     <string name="download_started">Téléchargement commencé</string>
-    <string name="download_failed">Échec du Téléchargement</string>
-    <string name="download_canceled">Téléchargement Annulé</string>
-    <string name="download_done">Téléchargement Terminé</string>
+    <string name="download_failed">Échec du téléchargement</string>
+    <string name="download_canceled">Téléchargement annulé</string>
+    <string name="download_done">Téléchargement terminé</string>
     <string name="error_loading_links_toast">Erreur lors du téléchargement des liens</string>
-    <string name="download_storage_text">Stockage Interne</string>
+    <string name="download_storage_text">Stockage interne</string>
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Sub</string>
     <string name="popup_delete_file">Supprimer le fichier</string>
@@ -303,4 +303,24 @@
     <string name="lightnovel">Application Light Novel par les mêmes devs</string>
     <string name="anim">Anime app by the same devs</string>
     <string name="discord">Rejoignez le Discord</string>
+    <string name="next_episode_time_hour_format" formatted="true">%d h %d min</string>
+    <string name="next_episode_time_min_format" formatted="true">%d min</string>
+    <string name="play_with_app_name">Lire avec CloudStream</string>
+    <string name="play_livestream_button">Lire en direct</string>
+    <string name="skip_type_ed">Fin</string>
+    <string name="history">Historique</string>
+    <string name="example_email">hello@world.com</string>
+    <string name="all_languages_preference">Toutes les langues</string>
+    <string name="skip_type_format" formatted="true">Ignorer %s</string>
+    <string name="skip_type_op">Ouverture</string>
+    <string name="skip_type_recap">Récap</string>
+    <string name="skip_type_creddits">Crédits</string>
+    <string name="skip_type_intro">Intro</string>
+    <string name="clear_history">Effacer l\'historique</string>
+    <string name="yes">Oui</string>
+    <string name="next_episode_time_day_format" formatted="true">%d j %d h %d min</string>
+    <string name="stream">Stream</string>
+    <string name="confirm_exit_dialog">Êtes-vous sûr·e de vouloir quitter \?</string>
+    <string name="no">Non</string>
+    <string name="update_notification_downloading">Téléchargement de la mise à jour de l\'application</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 645a3aac..1d165651 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -4,9 +4,9 @@
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
     <string name="next_episode_format" formatted="true">L\'episodio %d uscirà in</string>
-    <string name="next_episode_time_day_format" formatted="true">%dg %do %dm</string>
-    <string name="next_episode_time_hour_format" formatted="true">%do %dm</string>
-    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%d g %d o %d min</string>
+    <string name="next_episode_time_hour_format" formatted="true">%d o %d min</string>
+    <string name="next_episode_time_min_format" formatted="true">%d min</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
@@ -145,7 +145,7 @@
     <string name="restore_success">File di backup caricato</string>
     <string name="restore_failed_format" formatted="true">Impossibile ripristinare i dati dal file %s</string>
     <string name="backup_success">Dati salvati con successo</string>
-    <string name="backup_failed">Permessi di archiviazione mancanti, riprova</string>
+    <string name="backup_failed">Permessi di archiviazione mancanti. Per favore riprova.</string>
     <string name="backup_failed_error_format">Errore nel backup %s</string>
     <string name="search">Cerca</string>
     <string name="category_account">Accounts</string>
@@ -269,7 +269,7 @@
     <string name="video_buffer_length_settings">Lunghezza buffer video</string>
     <string name="video_buffer_disk_settings">Dimensione cache video su disco</string>
     <string name="video_buffer_clear_settings">Cancella cache immagini e video</string>
-    <string name="video_ram_description">Se impostato troppo alto può causare problemi su sistemi con poca RAM. Come i dispositivi Android TV o vecchi telefoni</string>
+    <string name="video_ram_description">Causa arresti casuali se impostato troppo alto. Lasciare così com\'è sui dispositivi con poca memoria.</string>
     <string name="video_disk_description">Se impostato troppo alto può causare problemi su sistemi con poca Archiviazione interna. Come i dispositivi Android TV</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Utile per bypassare i blocchi ISP</string>
@@ -405,7 +405,7 @@
     <string name="repository_url_hint">URL repository</string>
     <string name="plugin_loaded">Plugin caricato</string>
     <string name="plugin_deleted">Plugin eliminato</string>
-    <string name="plugin_load_fail" formatted="true">Caricamento non riuscito %s</string>
+    <string name="plugin_load_fail" formatted="true">Impossibile caricare %s</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">Download iniziato %d %s</string>
     <string name="batch_download_finish_format" formatted="true">Download %d %s completato</string>
@@ -422,7 +422,7 @@
     <string name="plugins_updated" formatted="true">Aggiornati %d plugin</string>
     <string name="blank_repo_message">CloudStream non ha siti installati per impostazione predefinita. È necessario installare i siti dai repository.
 \n
-\nA causa di una rimozione DMCA senza cervello da Sky Uk Limited 🤮 non possiamo collegare il sito repository nell\'app.
+\nA causa di una rimozione DMCA senza cervello da Sky UK Limited 🤮 non possiamo collegare il sito repository nell\'app.
 \n
 \nUnisciti al nostro Discord o cerca online.</string>
     <string name="view_public_repositories_button">Vedi le repository della community</string>
@@ -452,7 +452,7 @@
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="player_settings_play_in_mpv">MPV</string>
     <string name="player_settings_play_in_web">Cast Web Video</string>
-    <string name="player_settings_play_in_browser">Browser</string>
+    <string name="player_settings_play_in_browser">Web browser</string>
     <string name="app_not_found_error">App non trovata</string>
     <string name="all_languages_preference">Tutte le lingue</string>
     <string name="skip_type_format" formatted="true">Salta %s</string>
@@ -484,4 +484,5 @@
     <string name="yes">Sì</string>
     <string name="no">No</string>
     <string name="update_notification_downloading">Scaricando l\'aggiornamento dell\'app</string>
+    <string name="automatic_plugin_download_summary">Installa automaticamente tutti i plugin non ancora installati dai repository aggiunti.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 28872a1a..3b7f87d1 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -411,4 +411,39 @@
     <string name="audio_tracks">Lydspor</string>
     <string name="skip_type_creddits">Rulletekst</string>
     <string name="skip_type_intro">Introduksjon</string>
+    <string name="backup_failed">Lagringstilgang mangler. Prøv igjen.</string>
+    <string name="show_trailers_settings">Vis forfilmer</string>
+    <string name="show_dub">Dubbingsetikett</string>
+    <string name="show_sub">Undertekstetikett</string>
+    <string name="video_buffer_size_settings">Videomellomlagringsstørrelse</string>
+    <string name="video_buffer_length_settings">Videomellomlagringslengde</string>
+    <string name="video_buffer_disk_settings">Videohurtiglager på disk</string>
+    <string name="video_buffer_clear_settings">Tøm video- og bildehurtiglager</string>
+    <string name="add_site_summary">Legg til en klone av en eksisterende side, med en annen nettadresse</string>
+    <string name="automatic_plugin_download_summary">Installer alle programtillegg som ikke er installert enda fra de pakkebrønnene som er lagt til.</string>
+    <string name="show_hd">Kvalitetsetikett</string>
+    <string name="poster_ui_settings">Slå av/på grensesnittselementer på plakat</string>
+    <string name="skip_update">Hopp over denne oppdateringen</string>
+    <string name="video_ram_description">Forårsaker tilfeldige krasj hvis satt for høyt. Ikke endre dette hvis du ikke har lite minne, som f.eks. på Android TV, eller en gammel enhet.</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="backup_settings">Sikkerhetskopier data</string>
+    <string name="backup_success">Data lagret</string>
+    <string name="authenticated_user_fail" formatted="true">Kunne ikke logge inn på %s</string>
+    <string name="uppercase_all_subtitles">Store bokstaver i undertekster</string>
+    <string name="extension_authors">Utviklere</string>
+    <string name="player_settings_play_in_browser">Nettleser</string>
+    <string name="nsfw">Sensurerbart</string>
+    <string name="quality_webrip">Vev</string>
+    <string name="network_adress_example">Lenke til strøm</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="pref_filter_search_quality">Skjul valgt videokvalitet i søkeresultater</string>
+    <string name="restore_success">Lastet inn sikkerhetkopifil</string>
+    <string name="category_updates">Oppdateringer og sikkerhetskopi</string>
+    <string name="ova_singular">\@string/ova</string>
+    <string name="confirm_exit_dialog">Avslutt\?</string>
+    <string name="nsfw_singular">Sensurerbart</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Alle %s er allerede nedlastet</string>
+    <string name="update_notification_failed">Kunne ikke installere den nye versjonen av programmet</string>
+    <string name="update_notification_installing">Installerer ny versjon av programmet …</string>
+    <string name="update_notification_downloading">Laster ned ny versjon av programmet …</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index a8dc5211..abd84091 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -208,4 +208,55 @@
     <string name="show_log_cat">Ipakita ang Logcat 🐈</string>
     <string name="autoplay_next_settings">Kusang i-play ang next episode</string>
     <string name="enable_nsfw_on_providers">Payagan ang NSFW sa mga suportadong providers</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="cast_format" formatted="true">I-Cast: %s</string>
+    <string name="next_episode_format" formatted="true">Episode %d ay ipapalabas sa loob ng</string>
+    <string name="search_hint_site" formatted="true">Hanapin ang %s…</string>
+    <string name="duration_format" formatted="true">%d min</string>
+    <string name="next_episode_time_day_format" formatted="true">%dd, %dh:%dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dh : %dm</string>
+    <string name="play_with_app_name">I-play gamit ang CloudStream</string>
+    <string name="type_re_watching">Pinapanuod Uli</string>
+    <string name="play_livestream_button">Panuorin ang Livestream</string>
+    <string name="action_add_to_bookmarks">I-set ang Status</string>
+    <string name="sort_copy">Kopyahin</string>
+    <string name="sort_close">Isara</string>
+    <string name="sort_clear">Tanggalin Lahat</string>
+    <string name="sort_save">I-save</string>
+    <string name="provider_info_meta">Ang Metadata ay di galing sa site, mag-fail ang pag load ng video pag wala ito sa site.</string>
+    <string name="autoplay_next_settings_des">Simulan ang susunod na episode kapag natapos ang kasalukuyan</string>
+    <string name="restore_settings">Ibalik ang data gamit ang backup</string>
+    <string name="backup_settings">I-backup ang data</string>
+    <string name="restore_success">Nabuksan ang backup file</string>
+    <string name="backup_success">Naitabi ang Data</string>
+    <string name="backup_failed_error_format">Nagka error sa pag backup ng %s</string>
+    <string name="show_trailers_settings">Ipakita ang trailers</string>
+    <string name="kitsu_settings">Ipakita ang posters mula sa Kitsu</string>
+    <string name="pref_filter_search_quality">Wag ipakita ang mga video quality sa search results</string>
+    <string name="automatic_plugin_updates">Kusang i-update ang plugins</string>
+    <string name="automatic_plugin_download">Kusang i-download ang plugins</string>
+    <string name="bottom_title_settings">Lokasyon ng Poster title</string>
+    <string name="bottom_title_settings_des">Ilagay ang title sa ibaba ng poster</string>
+    <string name="logout">Mag log out</string>
+    <string name="automatic_plugin_download_summary">Kusang install ang mga di naka install na plugins mula sa repositories.</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="others">Iba pa</string>
+    <string name="documentaries_singular">Dokumentaryo</string>
+    <string name="episode_action_download_subtitle">I-download ang subtitles</string>
+    <string name="add_site_summary">Maglagay ng ibang url para sa site na meron na.</string>
+    <string name="random_button_settings_desc">Ipakita ang Random Button sa Homepage</string>
+    <string name="example_lang_name">Language code (tl)</string>
+    <string name="add_sync">Magdagdag ng tracking</string>
+    <string name="added_sync_format" formatted="true">Dinagdag ang %s</string>
+    <string name="backup_failed">Walang Storage permissions. Paki subukan muli.</string>
+    <string name="documentaries">Dokumentaryo</string>
+    <string name="no_episodes_found">Walang nakita na Episode</string>
+    <string name="restore_failed_format" formatted="true">Nagkamali sa pagbalik ng data galing sa file na %s</string>
+    <string name="video_buffer_clear_settings">Linisin ang video at image cache</string>
+    <string name="switch_account">Magpalit ng account</string>
+    <string name="video_ram_description">Magkakaron ng crashes kapag sobrang taas. Iwan lang kapag mababa ang memory ng iyong device.</string>
+    <string name="video_disk_description">Posibleng magka problema kapag sobrang taas kapag mababa ang storage ng device (tulad ng Android TV)</string>
+    <string name="create_account">Gumawa ng account</string>
+    <string name="add_account">Magdagdag ng Account</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index ac00c8f4..f68a0f75 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1,5 +1,5 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
     <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
@@ -17,7 +17,6 @@
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">封面</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
@@ -29,24 +28,20 @@
     <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">更改片源</string>
     <string name="preview_background_img_des">预览背景</string>
-
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">速度（%.2fx）</string>
     <string name="rated_format" formatted="true">评分：%.1f</string>
-    <string name="new_update_format" formatted="true">发现新版本！\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">发现新版本！\n%s -&gt; %s</string>
     <string name="filler" formatted="true">填充</string>
     <string name="duration_format" formatted="true">%d 分钟</string>
-
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">使用 CloudStream 播放</string>
     <string name="title_home">主页</string>
     <string name="title_search">搜索</string>
     <string name="title_downloads">下载</string>
     <string name="title_settings">设置</string>
-
     <string name="search_hint">搜索…</string>
     <string name="search_hint_site" formatted="true">搜索 %s…</string>
-
     <string name="no_data">无数据</string>
     <string name="episode_more_options_des">更多选项</string>
     <string name="next_episode">下一集</string>
@@ -56,7 +51,6 @@
     <string name="result_open_in_browser">在浏览器中打开</string>
     <string name="skip_loading">跳过加载</string>
     <string name="loading">加载中…</string>
-
     <string name="type_watching">正在观看</string>
     <string name="type_on_hold">暂时搁置</string>
     <string name="type_completed">观看完毕</string>
@@ -64,7 +58,6 @@
     <string name="type_plan_to_watch">计划观看</string>
     <string name="type_none">无</string>
     <string name="type_re_watching">重新观看</string>
-
     <string name="play_movie_button">播放电影</string>
     <string name="play_livestream_button">播放直播</string>
     <string name="play_torrent_button">播放种子</string>
@@ -74,7 +67,6 @@
     <string name="go_back">返回</string>
     <string name="play_episode">播放剧集</string>
     <!--<string name="need_storage">允许下载剧集</string>-->
-
     <string name="download">下载</string>
     <string name="downloaded">已下载</string>
     <string name="downloading">下载中</string>
@@ -85,18 +77,14 @@
     <string name="download_done">下载完毕</string>
     <string name="download_format" translatable="false">%s - %s</string>
     <string name="stream">播放</string>
-
     <string name="error_loading_links_toast">加载链接错误</string>
     <string name="download_storage_text">内部存储</string>
-
     <string name="app_dubbed_text">配音</string>
     <string name="app_subbed_text">字幕</string>
-
     <string name="popup_delete_file">删除文件</string>
     <string name="popup_play_file">播放文件</string>
     <string name="popup_resume_download">继续下载</string>
     <string name="popup_pause_download">暂停下载</string>
-
     <string name="pref_disable_acra">禁用自动错误报告</string>
     <string name="home_more_info">更多信息</string>
     <string name="home_expanded_hide">隐藏</string>
@@ -112,9 +100,7 @@
     <string name="sort_close">关闭</string>
     <string name="sort_clear">清除</string>
     <string name="sort_save">保存</string>
-
     <string name="player_speed">播放速度</string>
-
     <string name="subtitles_settings">字幕设置</string>
     <string name="subs_text_color">文本颜色</string>
     <string name="subs_outline_color">轮廓颜色</string>
@@ -124,35 +110,26 @@
     <string name="subs_subtitle_elevation">字幕高度</string>
     <string name="subs_font">字体</string>
     <string name="subs_font_size">字体大小</string>
-
     <string name="search_provider_text_providers">按片源搜索</string>
     <string name="search_provider_text_types">按类型搜索</string>
-
     <string name="benene_count_text">给开发者送 %d 根香蕉</string>
     <string name="benene_count_text_none">不送香蕉</string>
-
     <string name="subs_auto_select_language">自动选择语言</string>
     <string name="subs_download_languages">下载语言</string>
     <string name="subs_subtitle_languages">字幕语言</string>
     <string name="subs_hold_to_reset_to_default">按住重置为默认值</string>
     <string name="subs_import_text" formatted="true">将字体导入到 %s</string>
     <string name="continue_watching">继续观看</string>
-
     <string name="action_remove_watching">移除</string>
     <string name="action_open_watching">更多信息</string>
     <string name="action_open_play">@string/home_play </string>
-
     <string name="vpn_might_be_needed">此片源可能需要 VPN 才能正常使用</string>
     <string name="vpn_torrent">此片源为种子文件，建议使用 VPN</string>
-
     <string name="provider_info_meta">站点不提供元数据，如果站点上不存在元数据，视频加载将失败。</string>
-
     <string name="torrent_plot">简介</string>
     <string name="normal_no_plot">未找到简介</string>
     <string name="torrent_no_plot">未找到简介</string>
-
-    <string name="show_log_cat">显示日志 🐈</string>
-
+    <string name="show_log_cat">显示 Logcat 🐈</string>
     <string name="picture_in_picture">画中画</string>
     <string name="picture_in_picture_des">在其他应用上层的迷你播放器中继续播放</string>
     <string name="player_size_settings">播放器画面调整按钮</string>
@@ -161,17 +138,14 @@
     <string name="player_subtitles_settings_des">播放器字幕设置</string>
     <string name="chromecast_subtitles_settings">Chromecast 字幕</string>
     <string name="chromecast_subtitles_settings_des">Chromecast 字幕设置</string>
-
     <string name="eigengraumode_settings">倍速模式</string>
     <string name="eigengraumode_settings_des">在播放器中添加播放速度选项</string>
     <string name="swipe_to_seek_settings">滑动控制进度</string>
     <string name="swipe_to_seek_settings_des">左右滑动控制播放进度</string>
     <string name="swipe_to_change_settings">滑动更改设置</string>
     <string name="swipe_to_change_settings_des">上下滑动修改亮度或音量</string>
-
     <string name="autoplay_next_settings">自动播放下一集</string>
     <string name="autoplay_next_settings_des">播放完毕后播放下一集</string>
-
     <string name="double_tap_to_seek_settings">双击控制进度</string>
     <string name="double_tap_to_pause_settings">双击暂停</string>
     <string name="double_tap_to_seek_amount_settings">双击控制进度时间</string>
@@ -181,23 +155,18 @@
     <string name="use_system_brightness_settings">使用系统亮度</string>
     <string name="use_system_brightness_settings_des">在应用播放器中使用系统亮度替代黑色遮罩
     </string>
-
     <string name="episode_sync_settings">更新观看进度</string>
     <string name="episode_sync_settings_des">自动同步当前剧集进度</string>
-
     <string name="restore_settings">从备份中恢复数据</string>
-
     <string name="backup_settings">备份数据</string>
     <string name="restore_success">已加载备份文件</string>
     <string name="restore_failed_format" formatted="true">无法从 %s 文件中还原数据</string>
-    <string name="backup_success">成功保存数据</string>
-    <string name="backup_failed">缺少存储权限，请重试</string>
+    <string name="backup_success">数据已储存</string>
+    <string name="backup_failed">缺少存储权限，请重试。</string>
     <string name="backup_failed_error_format">备份 %s 出错</string>
-
     <string name="search">搜索</string>
     <string name="category_account">账户</string>
     <string name="category_updates">更新与备份</string>
-
     <string name="settings_info">信息</string>
     <string name="advanced_search">高级搜索</string>
     <string name="advanced_search_des">按片源分割搜索结果</string>
@@ -207,7 +176,6 @@
     <string name="show_trailers_settings">显示预告片</string>
     <string name="kitsu_settings">显示来自 Kitsu 的封面</string>
     <string name="pref_filter_search_quality">在搜索结果中隐藏选中视频画质</string>
-
     <string name="automatic_plugin_updates">自动更新插件</string>
     <string name="automatic_plugin_download">自动下载插件</string>
     <string name="updates_settings">显示应用更新</string>
@@ -220,9 +188,7 @@
     <string name="discord">加入 Discord</string>
     <string name="benene">给开发者送一根香蕉</string>
     <string name="benene_des">送香蕉</string>
-
     <string name="app_language">应用语言</string>
-
     <string name="no_chromecast_support_toast">此片源不支持 Chromecast</string>
     <string name="no_links_found_toast">未找到链接</string>
     <string name="copy_link_toast">链接已复制到剪贴板</string>
@@ -230,7 +196,6 @@
     <string name="subs_default_reset_toast">重置为默认值</string>
     <string name="acra_report_toast">抱歉，应用崩溃了，将发送一份匿名错误报告给开发者
     </string>
-
     <string name="season">季</string>
     <string name="season_format">%s %d%s</string>
     <string name="no_season">无季</string>
@@ -241,7 +206,6 @@
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">未找到剧集</string>
-
     <string name="delete_file">删除文件</string>
     <string name="delete">删除</string>
     <string name="cancel" translatable="false">@string/sort_cancel</string>
@@ -251,8 +215,6 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">这将永久删除 %s\n您确定吗?</string>
     <string name="resume_time_left" formatted="true">剩余 %d 分钟</string>
-
-
     <string name="status_ongoing">连载中</string>
     <string name="status_completed">已完结</string>
     <string name="status">状态</string>
@@ -261,15 +223,12 @@
     <string name="duration">时间</string>
     <string name="site">网站</string>
     <string name="synopsis">简介</string>
-
     <string name="queued">已加入队列</string>
     <string name="no_subtitles">无字幕</string>
     <string name="default_subtitles">默认</string>
-
     <string name="free_storage">空闲</string>
     <string name="used_storage">已使用</string>
     <string name="app_storage">应用</string>
-
     <!--plural-->
     <string name="movies">电影</string>
     <string name="tv_series">电视剧</string>
@@ -282,7 +241,6 @@
     <string name="livestreams">直播</string>
     <string name="nsfw">NSFW</string>
     <string name="others">其他</string>
-
     <!--singular-->
     <string name="movies_singular">电影</string>
     <string name="tv_series_singular">电视剧</string>
@@ -295,13 +253,11 @@
     <string name="live_singular">直播</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">其他</string>
-
     <string name="source_error">来源错误</string>
     <string name="remote_error">远程错误</string>
     <string name="render_error">渲染器错误</string>
     <string name="unexpected_error">意外的播放器错误</string>
     <string name="storage_error">下载错误，请检查存储权限</string>
-
     <string name="episode_action_chromecast_episode">Chromecast 剧集</string>
     <string name="episode_action_chromecast_mirror">Chromecast 镜像</string>
     <string name="episode_action_play_in_app">在应用中播放</string>
@@ -312,7 +268,6 @@
     <string name="episode_action_download_mirror">下载镜像</string>
     <string name="episode_action_reload_links">重新加载链接</string>
     <string name="episode_action_download_subtitle">下载字幕</string>
-
     <string name="show_hd">画质标签</string>
     <string name="show_dub">配音标签</string>
     <string name="show_sub">字幕标签</string>
@@ -322,47 +277,35 @@
     <string name="show_sub_key" translatable="false">show_sub_key</string>
     <string name="show_title_key" translatable="false">show_title_key</string>
     <string name="poster_ui_settings">封面内容</string>
-
     <string name="no_update_found">未找到更新</string>
     <string name="check_for_update">检查更新</string>
-
     <string name="video_lock">锁定</string>
     <string name="video_aspect_ratio_resize">调整画面</string>
     <string name="video_source">来源</string>
     <string name="video_skip_op">跳过片头</string>
-
     <string name="dont_show_again">不再显示</string>
     <string name="skip_update">跳过此更新</string>
     <string name="update">更新</string>
     <string name="watch_quality_pref">首选播放画质</string>
     <string name="limit_title">视频播放器标题最多字符</string>
     <string name="limit_title_rez">视频播放器标题</string>
-
     <string name="video_buffer_size_settings">视频缓冲大小</string>
     <string name="video_buffer_length_settings">视频缓冲长度</string>
     <string name="video_buffer_disk_settings">视频缓存存储</string>
     <string name="video_buffer_clear_settings">清除视频与图像缓存</string>
-
-    <string name="video_ram_description">设置过高可能导致崩溃。如果您使用如 Android TV 或旧手机此类低内存设备，请勿修改</string>
+    <string name="video_ram_description">设置过高可能导致崩溃。使用低内存设备请勿修改。</string>
     <string name="video_disk_description">设置过高可能导致如 Android TV 此类低存储空间设备出现系统问题</string>
-
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">用于绕过 ISP 的封锁</string>
-
     <string name="add_site_pref">复制片源</string>
     <string name="remove_site_pref">移除片源</string>
     <string name="add_site_summary">添加不同链接的已有片源复制</string>
-
     <string name="download_path_pref">下载路径</string>
-
-    <string name="nginx_url_pref">Nginx 服务器链接</string>
-
+    <string name="nginx_url_pref">NGINX 服务器链接</string>
     <string name="display_subbed_dubbed_settings">显示带配音/字幕的动漫</string>
-
     <string name="resize_fit">适应</string>
     <string name="resize_fill">拉伸</string>
     <string name="resize_zoom">缩放</string>
-
     <string name="legal_notice">免责声明</string>
     <string name="legal_notice_key" translatable="false">legal_notice_key</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
@@ -391,18 +334,14 @@
     <string name="subtitles_encoding">字幕编码</string>
     <string name="category_providers">片源</string>
     <string name="category_ui">布局</string>
-
     <string name="automatic">自动</string>
     <string name="tv_layout">电视布局</string>
     <string name="phone_layout">手机布局</string>
     <string name="emulator_layout">模拟器布局</string>
-
     <string name="primary_color_settings">主题色</string>
     <string name="app_theme_settings">应用主题</string>
     <string name="bottom_title_settings">封面标题位置</string>
     <string name="bottom_title_settings_des">将标题移至封面下方</string>
-
-
     <!-- account stuff -->
     <string name="anilist_key" translatable="false">anilist_key</string>
     <string name="mal_key" translatable="false">mal_key</string>
@@ -415,7 +354,6 @@
     <string name="example_site_name">网站名称</string>
     <string name="example_site_url">网站链接</string>
     <string name="example_lang_name">语言代码 (zh)</string>
-
     <!--
     <string name="mal_account_settings" translatable="false">MAL</string>
     <string name="anilist_account_settings" translatable="false">AniList</string>
@@ -439,8 +377,7 @@
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">已验证 %s</string>
-    <string name="authenticated_user_fail" formatted="true">验证 %s 失败</string>
-
+    <string name="authenticated_user_fail" formatted="true">无法验证 %s</string>
     <!-- ============ -->
     <string name="none">无</string>
     <string name="normal">普通</string>
@@ -458,7 +395,6 @@
     <string name="subtitle_offset_extra_hint_later_format">如果字幕过早显示 %dms，请使用此选项</string>
     <string name="subtitle_offset_extra_hint_before_format">如果字幕过晚显示 %dms，请使用此选项</string>
     <string name="subtitle_offset_extra_hint_none_format">无字幕延迟</string>
-
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
     see: 
@@ -466,7 +402,6 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">The quick brown fox jumps over the lazy dog</string>
-
     <string name="recommended">推荐</string>
     <string name="player_loaded_subtitles" formatted="true">已加载 %s</string>
     <string name="player_load_subtitles">从文件加载</string>
@@ -475,12 +410,9 @@
     <string name="actor_main">主演</string>
     <string name="actor_supporting">配演</string>
     <string name="actor_background">群演</string>
-
     <string name="home_source">来源</string>
     <string name="home_random">随机</string>
-
     <string name="coming_soon">即将到来…</string>
-
     <string name="quality_cam">Cam</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
@@ -488,7 +420,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blu-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
@@ -497,7 +429,6 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">封面图像</string>
     <string name="category_player">播放器</string>
     <string name="resolution_and_title">分辨率与标题</string>
@@ -528,10 +459,10 @@
     <string name="repository_url_hint">仓库链接</string>
     <string name="plugin_loaded">插件已加载</string>
     <string name="plugin_deleted">插件已删除</string>
-    <string name="plugin_load_fail" formatted="true">加载 %s 失败</string>
+    <string name="plugin_load_fail" formatted="true">无法加载 %s</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">开始下载 %d %s</string>
-    <string name="batch_download_finish_format" formatted="true">下载 %d %s 成功</string>
+    <string name="batch_download_finish_format" formatted="true">已下载 %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">全部 %s 已经下载</string>
     <string name="batch_download">批量下载</string>
     <string name="plugin_singular">插件</string>
@@ -543,22 +474,23 @@
     <string name="plugins_disabled" formatted="true">已禁用：%d</string>
     <string name="plugins_not_downloaded" formatted="true">未下载：%d</string>
     <string name="plugins_updated" formatted="true">已更新 %d 插件</string>
-    <string name="blank_repo_message">CloudStream 默认不安装片源。您需要从仓库中安装片源。\n\n由于 Sky Uk Limited 的无脑 DMCA 下架 🤮 我们不能在应用内提供仓库链接。\n\n加入我们的 Discord 获得链接或在网上搜索。</string>
+    <string name="blank_repo_message">CloudStream 默认不安装片源。您需要从仓库中安装片源。
+\n
+\n由于 Sky UK Limited 的无脑 DMCA 下架 🤮 我们不能在应用内提供仓库链接。
+\n
+\n加入我们的 Discord 或在网上搜索。</string>
     <string name="view_public_repositories_button">查看社区仓库</string>
     <string name="view_public_repositories_button_short">公开列表</string>
     <string name="uppercase_all_subtitles">字幕全大写</string>
-
     <string name="download_all_plugins_from_repo">从此仓库下载所有插件？</string>
     <string name="single_plugin_disabled" formatted="true">%s（禁用）</string>
     <string name="tracks">轨道</string>
     <string name="audio_tracks">音频轨道</string>
     <string name="video_tracks">视频轨道</string>
     <string name="apply_on_restart">重启生效</string>
-
     <string name="safe_mode_title">安全模式已启用</string>
     <string name="safe_mode_description">发生了不可恢复的崩溃，已自动禁用所有扩展，因此可以找到并删除导致问题的扩展。</string>
     <string name="safe_mode_crash_info">查看崩溃信息</string>
-
     <string name="extension_rating" formatted="true">评分：%s</string>
     <string name="extension_description">简介</string>
     <string name="extension_version">版本</string>
@@ -568,9 +500,7 @@
     <string name="extension_types">类型</string>
     <string name="extension_language">语言</string>
     <string name="extension_install_first">请先安装扩展</string>
-
     <string name="hls_playlist">HLS 播放列表</string>
-
     <string name="player_pref">首选视频播放器</string>
     <string name="player_settings_play_in_app">内部播放器</string>
     <string name="player_settings_play_in_vlc">VLC</string>
@@ -579,7 +509,6 @@
     <string name="player_settings_play_in_browser">浏览器</string>
     <string name="app_not_found_error">未找到应用</string>
     <string name="all_languages_preference">所有语言</string>
-
     <string name="skip_type_format" formatted="true">跳过 %s</string>
     <string name="skip_type_op">片头</string>
     <string name="skip_type_ed">片尾</string>
@@ -588,7 +517,6 @@
     <string name="skip_type_mixed_op">混合片头</string>
     <string name="skip_type_creddits">致谢名单</string>
     <string name="skip_type_intro">介绍</string>
-
     <string name="clear_history">清除历史记录</string>
     <string name="history">历史记录</string>
     <string name="enable_skip_op_from_database_des">显示跳过片头/片尾弹窗</string>
@@ -597,8 +525,8 @@
     <string name="confirm_exit_dialog">您确定要离开吗？</string>
     <string name="yes">是</string>
     <string name="no">否</string>
-
-    <string name="update_notification_downloading">正在下载应用更新</string>
-    <string name="update_notification_installing">正在安装应用更新</string>
-    <string name="update_notification_failed">应用更新失败</string>
-</resources>
+    <string name="update_notification_downloading">正在下载应用更新…</string>
+    <string name="update_notification_installing">正在安装应用更新…</string>
+    <string name="update_notification_failed">无法安装新版的应用</string>
+    <string name="automatic_plugin_download_summary">自动安装已添加的仓库内所有未安装的插件。</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a81964b..b3d91267 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -221,8 +221,8 @@
     <string name="backup_settings">Backup data</string>
     <string name="restore_success">Loaded backup file</string>
     <string name="restore_failed_format" formatted="true">Failed to restore data from file %s</string>
-    <string name="backup_success">Successfully stored data</string>
-    <string name="backup_failed">Storage permissions missing, please try again</string>
+    <string name="backup_success">Data stored</string>
+    <string name="backup_failed">Storage permissions missing. Please try again.</string>
     <string name="backup_failed_error_format">Error backing up %s</string>
     <string name="search">Search</string>
     <string name="category_account">Accounts</string>
@@ -235,7 +235,7 @@
     <string name="show_fillers_settings">Show filler episode for anime</string>
     <string name="show_trailers_settings">Show trailers</string>
     <string name="kitsu_settings">Show posters from Kitsu</string>
-    <string name="pref_filter_search_quality">Hide selected video quality on Search results</string>
+    <string name="pref_filter_search_quality">Hide selected video quality in search results</string>
     <string name="automatic_plugin_updates">Automatic plugin updates</string>
     <string name="automatic_plugin_download">Automatically download plugins</string>
     <string name="automatic_plugin_download_summary">Automatically install all not yet installed plugins from added repositories.</string>
@@ -355,7 +355,7 @@
     <string name="video_buffer_length_settings">Video buffer length</string>
     <string name="video_buffer_disk_settings">Video cache on disk</string>
     <string name="video_buffer_clear_settings">Clear video and image cache</string>
-    <string name="video_ram_description">Will cause random crashes if set too high. Don\'t change if you have a low amount of ram such as an Android TV or old phone</string>
+    <string name="video_ram_description">Causes random crashes if set too high. Leave as is on devices with low memory.</string>
     <string name="video_disk_description">May cause problems on systems with low storage space such as Android TV devices if you set it too high</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Useful for bypassing ISP blocks</string>
@@ -439,7 +439,7 @@
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">Authenticated %s</string>
-    <string name="authenticated_user_fail" formatted="true">Failed to authenticate to %s</string>
+    <string name="authenticated_user_fail" formatted="true">Could not authenticate to %s</string>
     <!-- ============ -->
     <string name="none">None</string>
     <string name="normal">Normal</string>
@@ -524,7 +524,7 @@
     <string name="plugin_load_fail" formatted="true">Could not load %s</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">Started downloading %d %s</string>
-    <string name="batch_download_finish_format" formatted="true">Downloaded %d %s successfully</string>
+    <string name="batch_download_finish_format" formatted="true">Downloaded %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">All %s already downloaded</string>
     <string name="batch_download">Batch download</string>
     <string name="plugin_singular">plugin</string>
@@ -568,7 +568,7 @@
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="player_settings_play_in_mpv">MPV</string>
     <string name="player_settings_play_in_web">Web Video Cast</string>
-    <string name="player_settings_play_in_browser">Browser</string>
+    <string name="player_settings_play_in_browser">Web browser</string>
     <string name="app_not_found_error">App not found</string>
     <string name="all_languages_preference">All Languages</string>
     <string name="skip_type_format" formatted="true">Skip %s</string>
@@ -587,7 +587,7 @@
     <string name="confirm_exit_dialog">Are you sure you want to exit\?</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="update_notification_downloading">Downloading app update</string>
-    <string name="update_notification_installing">Installing app update</string>
-    <string name="update_notification_failed">App update failed</string>
+    <string name="update_notification_downloading">Downloading app update…</string>
+    <string name="update_notification_installing">Installing app update…</string>
+    <string name="update_notification_failed">Could not install the new version of the app</string>
 </resources>
\ No newline at end of file

From d727099c294bf9948c39310be8d1cd18df68fa67 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Wed, 21 Dec 2022 15:19:49 +0100
Subject: [PATCH 120/273] add apk installer options for memeUI

---
 .../ui/settings/SettingsUpdates.kt            | 29 ++++++++++-
 .../cloudstream3/utils/InAppUpdater.kt        | 48 ++++++++++++-------
 app/src/main/res/values/array.xml             | 10 ++++
 app/src/main/res/values/strings.xml           |  7 +++
 app/src/main/res/xml/settings_updates.xml     | 19 +++++---
 5 files changed, 89 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
index d6a8be78..65dd7885 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
@@ -10,7 +10,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceFragmentCompat
-import com.lagradost.cloudstream3.CommonActivity
+import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
@@ -21,6 +21,7 @@ import com.lagradost.cloudstream3.utils.BackupUtils.backup
 import com.lagradost.cloudstream3.utils.BackupUtils.restorePrompt
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.InAppUpdater.Companion.runAutoUpdate
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
@@ -124,6 +125,32 @@ class SettingsUpdates : PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
+        getPref(R.string.apk_installer_key)?.setOnPreferenceClickListener {
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(it.context)
+
+            val prefNames = resources.getStringArray(R.array.apk_installer_pref)
+            val prefValues = resources.getIntArray(R.array.apk_installer_values)
+
+            val currentInstaller =
+                settingsManager.getInt(getString(R.string.apk_installer_key), 0)
+
+            activity?.showBottomDialog(
+                prefNames.toList(),
+                prefValues.indexOf(currentInstaller),
+                getString(R.string.app_layout),
+                true,
+                {}) {
+                try {
+                    settingsManager.edit()
+                        .putInt(getString(R.string.apk_installer_key), prefValues[it])
+                        .apply()
+                } catch (e: Exception) {
+                    logError(e)
+                }
+            }
+            return@setOnPreferenceClickListener true
+        }
+
         getPref(R.string.manual_check_update_key)?.setOnPreferenceClickListener {
             ioSafe {
                 if (activity?.runAutoUpdate(false) == false) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
index 30981ba4..1a671499 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -15,6 +15,7 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okio.BufferedSink
@@ -292,23 +293,36 @@ class InAppUpdater {
                             builder.apply {
                                 setPositiveButton(R.string.update) { _, _ ->
                                     showToast(context, R.string.download_started, Toast.LENGTH_LONG)
-                                    val intent = PackageInstallerService.getIntent(
-                                        context,
-                                        update.updateURL
-                                    )
-                                    ContextCompat.startForegroundService(context, intent)
-//                                    ioSafe {
-//                                        if (
-//                                        !downloadUpdate(update.updateURL)
-//                                        )
-//                                            runOnUiThread {
-//                                                showToast(
-//                                                    context,
-//                                                    R.string.download_failed,
-//                                                    Toast.LENGTH_LONG
-//                                                )
-//                                            }
-//                                    }
+
+                                    val currentInstaller =
+                                        settingsManager.getInt(
+                                            getString(R.string.apk_installer_key),
+                                            0
+                                        )
+
+                                    when (currentInstaller) {
+                                        // New method
+                                        0 -> {
+                                            val intent = PackageInstallerService.getIntent(
+                                                context,
+                                                update.updateURL
+                                            )
+                                            ContextCompat.startForegroundService(context, intent)
+                                        }
+                                        // Legacy
+                                        1 -> {
+                                            ioSafe {
+                                                if (!downloadUpdate(update.updateURL))
+                                                    runOnUiThread {
+                                                        showToast(
+                                                            context,
+                                                            R.string.download_failed,
+                                                            Toast.LENGTH_LONG
+                                                        )
+                                                    }
+                                            }
+                                        }
+                                    }
                                 }
 
                                 setNegativeButton(R.string.cancel) { _, _ -> }
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index 3554beb2..6aff7a59 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -33,6 +33,16 @@
         <item>6</item>
     </array>
 
+    <array name="apk_installer_pref">
+        <item>@string/apk_installer_package_installer</item>
+        <item>@string/apk_installer_legacy</item>
+    </array>
+    <array name="apk_installer_values">
+        <item>0</item>
+        <item>1</item>
+    </array>
+
+
     <array name="player_pref_names">
         <item>@string/player_settings_play_in_app</item>
         <item>@string/player_settings_play_in_vlc</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b3d91267..559f7e3d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,6 +18,7 @@
     <string name="player_pref_key" translatable="false">player_pref_key</string>
     <string name="prefer_limit_title_key" translatable="false">prefer_limit_title_key</string>
     <string name="prefer_limit_title_rez_key" translatable="false">prefer_limit_title_rez_key</string>
+    <string name="apk_installer_key" translatable="false">apk_installer_key</string>
     <string name="video_buffer_size_key" translatable="false">video_buffer_size_key</string>
     <string name="video_buffer_length_key" translatable="false">video_buffer_length_key</string>
     <string name="video_buffer_clear_key" translatable="false">video_buffer_clear_key</string>
@@ -243,6 +244,8 @@
     <string name="updates_settings_des">Automatically search for new updates on start</string>
     <string name="uprereleases_settings">Update to prereleases</string>
     <string name="uprereleases_settings_des">Search for prerelease updates instead of full releases only</string>
+    <string name="apk_installer_settings">APK Installer</string>
+    <string name="apk_installer_settings_des">Some phones do not support the new package installer. Try the legacy option if updates do not install. </string>
     <string name="github">Github</string>
     <string name="lightnovel">Light novel app by the same devs</string>
     <string name="anim">Anime app by the same devs</string>
@@ -590,4 +593,8 @@
     <string name="update_notification_downloading">Downloading app update…</string>
     <string name="update_notification_installing">Installing app update…</string>
     <string name="update_notification_failed">Could not install the new version of the app</string>
+
+    <string name="apk_installer_legacy">Legacy</string>
+    <string name="apk_installer_package_installer">PackageInstaller</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings_updates.xml b/app/src/main/res/xml/settings_updates.xml
index cc743e4d..6434a7ef 100644
--- a/app/src/main/res/xml/settings_updates.xml
+++ b/app/src/main/res/xml/settings_updates.xml
@@ -6,6 +6,19 @@
         app:icon="@drawable/ic_baseline_system_update_24"
         app:key="@string/manual_check_update_key"
         app:summary="@string/app_version" />
+    <SwitchPreference
+        android:icon="@drawable/ic_baseline_developer_mode_24"
+        android:summary="@string/uprereleases_settings_des"
+        android:title="@string/uprereleases_settings"
+        app:defaultValue="@bool/is_prerelease"
+        app:key="@string/prerelease_update_key" />
+
+    <Preference
+        android:icon="@drawable/netflix_download"
+        android:key="@string/apk_installer_key"
+        android:title="@string/apk_installer_settings"
+        android:summary="@string/apk_installer_settings_des"
+        />
 
     <Preference
         android:icon="@drawable/baseline_save_as_24"
@@ -45,12 +58,6 @@
         android:title="@string/updates_settings"
         app:defaultValue="true"
         app:key="@string/auto_update_key" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_developer_mode_24"
-        android:summary="@string/uprereleases_settings_des"
-        android:title="@string/uprereleases_settings"
-        app:defaultValue="@bool/is_prerelease"
-        app:key="@string/prerelease_update_key" />
     <Preference
         android:icon="@drawable/ic_baseline_construction_24"
         android:title="Redo setup process"

From a522ef0edb13dddb6ba41966693438b9cfcc8e41 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Wed, 21 Dec 2022 18:39:24 +0100
Subject: [PATCH 121/273] Translated using Weblate (Polish)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 98.7% (541 of 548 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (548 of 548 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (543 of 543 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (543 of 543 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 93.5% (508 of 543 strings)

Translated using Weblate (Italian)

Currently translated at 99.0% (538 of 543 strings)

Translated using Weblate (French)

Currently translated at 79.7% (433 of 543 strings)

Translated using Weblate (French)

Currently translated at 79.7% (433 of 543 strings)

Translated using Weblate (Arabic)

Currently translated at 99.4% (540 of 543 strings)

Translated using Weblate (English)

Currently translated at 100.0% (543 of 543 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 87.8% (477 of 543 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (543 of 543 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 86.9% (472 of 543 strings)

Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Sarlay <raphmd0@gmail.com>
Co-authored-by: Sdarfeesh <Sdarfeesh@protonmail.com>
Co-authored-by: Translator-3000 <weblate.m1d0h@8shield.net>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/en/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml | 20 ++++-----
 app/src/main/res/values-fr/strings.xml | 58 ++++++++++++++++++++++----
 app/src/main/res/values-it/strings.xml | 28 +++++++------
 app/src/main/res/values-no/strings.xml | 47 ++++++++++++++++++---
 app/src/main/res/values-pl/strings.xml | 38 ++++++++++++-----
 app/src/main/res/values-zh/strings.xml |  2 +-
 app/src/main/res/values/strings.xml    | 20 ++++-----
 7 files changed, 155 insertions(+), 58 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 92f62746..20689d4d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -133,7 +133,7 @@
     <string name="episode_sync_settings">تحديث تقدم المشاهدة</string>
     <string name="episode_sync_settings_des">مزامنة التقدم في الحلقة الحالية تلقائيًا</string>
     <string name="restore_settings">إسترجاع البيانات من نسخة إحتياطية</string>
-    <string name="backup_settings">نسخ إحتياطي</string>
+    <string name="backup_settings">نسخ إحتياطي للبيانات</string>
     <string name="restore_success">تم تحميل ملف النسخة الاحتياطية</string>
     <string name="restore_failed_format" formatted="true">فشل استيراد البيانات من الملف %s</string>
     <string name="backup_success">البيانات المخزنة</string>
@@ -263,8 +263,8 @@
     <string name="video_buffer_length_settings">طول التخزين المؤقت</string>
     <string name="video_buffer_disk_settings">التخزين المؤقت للفيديو علي القرص</string>
     <string name="video_buffer_clear_settings">مسح التخزين المؤقت للصورة والفيديو</string>
-    <string name="video_ram_description">يتسبب في حدوث أعطال عشوائية إذا تم ضبطه على قيمة عالية جدًا. اتركه كما هو على الأجهزة ذات الذاكرة المنخفضة.</string>
-    <string name="video_disk_description">قد يسبب مشاكل مع حجم ذاكرة التخزين المنخفضة كأجهزة تلفاز الأندرويد إذا أعددت قيمة عالية جدًا</string>
+    <string name="video_ram_description">يتسبب في حدوث أعطال إذا تم ضبطه على مستوى مرتفع جدا على الأجهزة ذات الذاكرة المنخفضة ، مثل Android TV.</string>
+    <string name="video_disk_description">يسبب مشاكل إذا تم ضبطه على مستوى مرتفع جدا على الأجهزة ذات مساحة التخزين المنخفضة ، مثل Android TV.</string>
     <string name="dns_pref">إستخدام DNS بدلا من HTTPS</string>
     <string name="dns_pref_summary">مفيد لتجاوز حجب مزود خدمة الإنترنت</string>
     <string name="add_site_pref">نسخ موقع</string>
@@ -346,8 +346,8 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="authenticated_user" formatted="true">تم توثيق %s</string>
-    <string name="authenticated_user_fail" formatted="true">تعذر المصادقة على %s</string>
+    <string name="authenticated_user" formatted="true">%s تم التوثيق</string>
+    <string name="authenticated_user_fail" formatted="true">تعذر تسجيل الدخول في %s</string>
     <!-- ============ -->
     <string name="none">لا شيء</string>
     <string name="normal">عادي</string>
@@ -362,8 +362,8 @@
     <string name="subtitle_offset">مزامنة الترجمة</string>
     <string name="subtitle_offset_hint">1000 مللي ثانية</string>
     <string name="subtitle_offset_title">تأخير الترجمة</string>
-    <string name="subtitle_offset_extra_hint_later_format">استخدم هذا إذا كانت الترجمة تُعرض %dms مبكرًا جدًا</string>
-    <string name="subtitle_offset_extra_hint_before_format">استخدم هذا إذا كانت الترجمة تُعرض %dms متأخرًا جدًا</string>
+    <string name="subtitle_offset_extra_hint_later_format">إستعملْ هذا إذا تَظْهرُ الترجماتَ %d m في وقت مبكر جداً</string>
+    <string name="subtitle_offset_extra_hint_before_format">استخدم هذا إذا تم عرض الترجمة %d مللي ثانية متأخرًا جدًا</string>
     <string name="subtitle_offset_extra_hint_none_format">لا تأخير في الترجمة</string>
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
@@ -431,7 +431,7 @@
     <string name="plugin_deleted">تم إزالة الإضافة</string>
     <string name="plugin_load_fail" formatted="true">تعذر التحميل %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">بدأ تنزيل %d %s</string>
+    <string name="batch_download_start_format" formatted="true">بدأ تنزيل %d %s …</string>
     <string name="batch_download_finish_format" formatted="true">تم التنزيل %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">جميع %s محملة بالفعل</string>
     <string name="batch_download">تحميل مكثف</string>
@@ -457,8 +457,8 @@
     <string name="audio_tracks">مسار الصوت</string>
     <string name="video_tracks">مسار الفيديو</string>
     <string name="apply_on_restart">تطبيق بعد إعادة التشغيل</string>
-    <string name="safe_mode_title">وضع الامان مفعل</string>
-    <string name="safe_mode_description">حدث عطل غير قابل للاسترداد وقمنا تلقائيا بتعطيل جميع الإضافات ، حتى تتمكن من العثور على الإضافة التي تسبب مشكلة وإزالتها.</string>
+    <string name="safe_mode_title">الوضع الآمن قيد التشغيل</string>
+    <string name="safe_mode_description">تم إيقاف تشغيل جميع الملحقات بسبب عطل لمساعدتك في العثور على الإضافة التي تسبب مشكلة.</string>
     <string name="safe_mode_crash_info">عرض بيانات الاعطال</string>
     <string name="extension_rating" formatted="true">تقييم: %s</string>
     <string name="extension_description">الوصف</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ddfee69d..17a0e253 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -168,8 +168,8 @@
     <string name="video_buffer_length_settings">Longueur de la vidéo tampon</string>
     <string name="video_buffer_disk_settings">Longueur de la vidéo cache</string>
     <string name="video_buffer_clear_settings">Effacer les vidéos et les images cache</string>
-    <string name="video_ram_description">Causera des crashs aléatoire si mit trop haut. Ne le changez pas si vous avez un appareil avec peu de ram comme une télévision android ou un vieux téléphone.</string>
-    <string name="video_disk_description">Causera des problèmes si mit trop haut et si vous avez un appareil avec peu de stockage comme une télévision android ou un vieux téléphone.</string>
+    <string name="video_ram_description">Causera des crashs si la valeur choisie est trop élevée sur un appareil avec peu de ram comme une télévision android</string>
+    <string name="video_disk_description">Cause des problèmes si la valeur choisie est trop élevée sur un appareil avec peu de stockage comme une télévision android.</string>
     <string name="random_button_settings">Bouton aléatoire</string>
     <string name="random_button_settings_desc">Afficher le bouton aléatoire</string>
     <string name="emulator_layout">Disposition émulateur</string>
@@ -184,7 +184,7 @@
     <string name="added_sync_format">%s ajouté</string>
     <string name="upload_sync">Synchroniser</string>
     <string name="sync_score">Noté</string>
-    <string name="authenticated_user_fail">Impossible de s\'authentifier avec %s</string>
+    <string name="authenticated_user_fail">Impossible de s\'authentifier à %s</string>
     <string name="none">Aucun</string>
     <string name="normal">Normal</string>
     <string name="all">Tous</string>
@@ -195,10 +195,10 @@
     <string name="subtitles_shadow">Ombre</string>
     <string name="subtitles_raised">Élévation</string>
     <string name="subtitle_offset">Synchroniser les sous-titres</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Délai des sous-titres</string>
-    <string name="subtitle_offset_extra_hint_later_format">Utilisez si les sous-titres sont affichés %dms trop tôt</string>
-    <string name="subtitle_offset_extra_hint_before_format">Utilisez si les sous-titres sont affichés %dms trop tard</string>
+    <string name="subtitle_offset_extra_hint_later_format">Utilisez cela si les sous-titres sont affichés %d ms trop tôt</string>
+    <string name="subtitle_offset_extra_hint_before_format">Utilisez cela si les sous-titres sont affichés %d ms trop tard</string>
     <string name="subtitle_offset_extra_hint_none_format">Aucun délai de sous-titre</string>
     <string name="subtitles_example_text">Portez ce vieux whisky au juge blond qui fume</string>
     <string name="recommended">Recommandé</string>
@@ -280,7 +280,7 @@
     <string name="restore_success">Fichier de sauvegarde chargé</string>
     <string name="restore_failed_format" formatted="true">Échec de la restauration des données du fichier %s</string>
     <string name="backup_success">Données stockées avec succès</string>
-    <string name="backup_failed">Permissions de stockage manquantes, veuillez réessayer</string>
+    <string name="backup_failed">Permissions de stockage manquantes. Veuillez réessayer</string>
     <string name="backup_failed_error_format">Erreur de sauvegarde %s</string>
     <string name="search">Recherche</string>
     <string name="category_account">Comptes</string>
@@ -292,8 +292,8 @@
     <string name="bug_report_settings_on">N\'envoie aucune donnée</string>
     <string name="show_fillers_settings">Afficher les épisodes spéciaux pour les animés</string>
     <string name="show_trailers_settings">Montrer les bandes-annonces</string>
-    <string name="kitsu_settings">Montrer les affiches de kitsu</string>
-    <string name="pref_filter_search_quality">Masquer la qualité vidéo sélectionnée dans les résultats de recherche</string>
+    <string name="kitsu_settings">Montrer les affiches provenant de Kitsu</string>
+    <string name="pref_filter_search_quality">Masque la qualité vidéo sélectionnée dans les résultats de recherche</string>
     <string name="automatic_plugin_updates">Mises à jour automatiques des plugins</string>
     <string name="updates_settings">Afficher les mises à jour de l\'application</string>
     <string name="updates_settings_des">Recherche automatique de nouvelles mises à jour au démarrage</string>
@@ -323,4 +323,44 @@
     <string name="confirm_exit_dialog">Êtes-vous sûr·e de vouloir quitter \?</string>
     <string name="no">Non</string>
     <string name="update_notification_downloading">Téléchargement de la mise à jour de l\'application</string>
+    <string name="next_episode_format" formatted="true">L\'épisode %d sera publié dans</string>
+    <string name="show_hd">Étiquette de qualité</string>
+    <string name="limit_title_rez">Résolution du lecteur vidéo</string>
+    <string name="add_site_pref">Cloner le site</string>
+    <string name="remove_site_pref">Supprimer le site</string>
+    <string name="add_site_summary">Ajoute un clone à un site déjà existant, avec une URL différente</string>
+    <string name="nginx_url_pref">URL du serveur NGINX</string>
+    <string name="example_site_name">MonSiteTresCool</string>
+    <string name="error_invalid_id">ID invalide</string>
+    <string name="automatic_plugin_download_summary">Installer automatiquement les plugins qui sont dans les repository mais qui n\'ont pas encore été installés</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nrestant</string>
+    <string name="livestreams">En Direct</string>
+    <string name="others">Autres</string>
+    <string name="live_singular">En Direct</string>
+    <string name="other_singular">Vidéo</string>
+    <string name="show_dub">Étiquette Dub (doublage anglais)</string>
+    <string name="show_sub">Étiquette sous titre</string>
+    <string name="show_title">Titre</string>
+    <string name="enable_nsfw_on_providers">Active le nsfw sur les fournisseurs ayant cette option</string>
+    <string name="example_password">motdepasse123</string>
+    <string name="example_username">MonNomDutilisateur</string>
+    <string name="example_lang_name">Code du langage (fr)</string>
+    <string name="create_account">Créer un compte</string>
+    <string name="player_load_subtitles_online">Charger depuis internet</string>
+    <string name="resolution_and_title">Résolution et titre</string>
+    <string name="category_player">Lecteur</string>
+    <string name="error_invalid_url">URL invalide</string>
+    <string name="error">Erreur</string>
+    <string name="subtitles_remove_captions">Fermer les</string>
+    <string name="automatic_plugin_download">Télécharger automatiquement les plugins</string>
+    <string name="poster_ui_settings">Activer ou désactiver les éléments du poster</string>
+    <string name="skip_update">Ignorer cette mise-à-jour</string>
+    <string name="error_invalid_data">Données invalides</string>
+    <string name="subtitles_encoding">Encodage des sous titres</string>
+    <string name="category_providers">Fournisseurs</string>
+    <string name="category_ui">Disposition</string>
+    <string name="example_site_url">exemple.com</string>
+    <string name="title">Titre</string>
+    <string name="resolution">Résolution</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1d165651..eca96a63 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -144,7 +144,7 @@
     <string name="backup_settings">Backup data</string>
     <string name="restore_success">File di backup caricato</string>
     <string name="restore_failed_format" formatted="true">Impossibile ripristinare i dati dal file %s</string>
-    <string name="backup_success">Dati salvati con successo</string>
+    <string name="backup_success">Dati salvati</string>
     <string name="backup_failed">Permessi di archiviazione mancanti. Per favore riprova.</string>
     <string name="backup_failed_error_format">Errore nel backup %s</string>
     <string name="search">Cerca</string>
@@ -269,8 +269,8 @@
     <string name="video_buffer_length_settings">Lunghezza buffer video</string>
     <string name="video_buffer_disk_settings">Dimensione cache video su disco</string>
     <string name="video_buffer_clear_settings">Cancella cache immagini e video</string>
-    <string name="video_ram_description">Causa arresti casuali se impostato troppo alto. Lasciare così com\'è sui dispositivi con poca memoria.</string>
-    <string name="video_disk_description">Se impostato troppo alto può causare problemi su sistemi con poca Archiviazione interna. Come i dispositivi Android TV</string>
+    <string name="video_ram_description">Causa arresti anomali se impostato troppo alto sui dispositivi con poca memoria, come Android TV.</string>
+    <string name="video_disk_description">Se impostato troppo alto può causare problemi su sistemi con poca archiviazione interna, come i dispositivi Android TV.</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Utile per bypassare i blocchi ISP</string>
     <string name="add_site_pref">Clona un sito</string>
@@ -338,8 +338,8 @@
     <string name="subtitle_offset">Sincronizza sottotitoli</string>
     <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Ritardo sottotitoli</string>
-    <string name="subtitle_offset_extra_hint_later_format">Usa se i sottotitoli sono mostrati %dms troppo presto</string>
-    <string name="subtitle_offset_extra_hint_before_format">Usa se i sottotitoli vengono mostrati %dms troppo tardi</string>
+    <string name="subtitle_offset_extra_hint_later_format">Usa se i sottotitoli sono mostrati %d ms troppo presto</string>
+    <string name="subtitle_offset_extra_hint_before_format">Usa se i sottotitoli vengono mostrati %d ms troppo tardi</string>
     <string name="subtitle_offset_extra_hint_none_format">Nessun ritardo dei sottotitoli</string>
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
@@ -407,8 +407,8 @@
     <string name="plugin_deleted">Plugin eliminato</string>
     <string name="plugin_load_fail" formatted="true">Impossibile caricare %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Download iniziato %d %s</string>
-    <string name="batch_download_finish_format" formatted="true">Download %d %s completato</string>
+    <string name="batch_download_start_format" formatted="true">Download iniziato %d %s…</string>
+    <string name="batch_download_finish_format" formatted="true">Scaricato %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Tutti %s già scaricati</string>
     <string name="batch_download">Download in blocco</string>
     <string name="plugin_singular">plugin</string>
@@ -434,8 +434,8 @@
     <string name="audio_tracks">Traccia audio</string>
     <string name="video_tracks">Traccia video</string>
     <string name="apply_on_restart">Applica al riavvio</string>
-    <string name="safe_mode_title">Safe Mode abilitata</string>
-    <string name="safe_mode_description">Si è verificato un crash irrecuperabile. Tutte le estensioni sono state disabilitate, in modo da trovare e rimuovere l\'estensione che causa il problema.</string>
+    <string name="safe_mode_title">Safe mode attiva</string>
+    <string name="safe_mode_description">Tutte le estensioni sono state disabilitate a causa di un arresto anomalo per aiutarti a trovare l\'estensione che causa il problema.</string>
     <string name="safe_mode_crash_info">Vedi informazioni del crash</string>
     <string name="extension_rating" formatted="true">Voto: %s</string>
     <string name="extension_description">Descrizione</string>
@@ -469,10 +469,10 @@
     <string name="clipboard_too_large">Testo troppo lungo. Impossibile salvare negli appunti.</string>
     <string name="app_name">CloudStream</string>
     <string name="automatic_plugin_download">Scarica automaticamente i plugins</string>
-    <string name="update_notification_failed">Aggiornamento dell\'app fallito</string>
+    <string name="update_notification_failed">Impossibile installare la nuova versione dell\'app</string>
     <string name="episode_sync_settings">Aggiorna il progresso di avanzamento</string>
     <string name="skip_type_mixed_op">Opening misto</string>
-    <string name="update_notification_installing">Installando l\'aggiornamento dell\'app</string>
+    <string name="update_notification_installing">Installando l\'aggiornamento dell\'app…</string>
     <string name="subtitles_remove_captions">Rimuovi le didascalie chiuse dai sottotitoli</string>
     <string name="subtitles_remove_bloat">Rimuovi il bloat dai sottotitoli</string>
     <string name="skip_type_op">Opening</string>
@@ -483,6 +483,10 @@
     <string name="confirm_exit_dialog">Sei sicuro di voler uscire\?</string>
     <string name="yes">Sì</string>
     <string name="no">No</string>
-    <string name="update_notification_downloading">Scaricando l\'aggiornamento dell\'app</string>
+    <string name="update_notification_downloading">Scaricando l\'aggiornamento dell\'app…</string>
     <string name="automatic_plugin_download_summary">Installa automaticamente tutti i plugin non ancora installati dai repository aggiunti.</string>
+    <string name="apk_installer_package_installer">ProgrammaInstallazionePacchetti</string>
+    <string name="apk_installer_settings_des">Alcuni telefoni non supportano il nuovo programma di installazione dei pacchetti. Prova l\'opzione legacy se gli aggiornamenti non vengono installati.</string>
+    <string name="apk_installer_settings">Installer APK</string>
+    <string name="apk_installer_legacy">Legacy</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 3b7f87d1..c7e92e52 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -332,7 +332,7 @@
     <string name="subtitles_depressed">Nedsenket</string>
     <string name="player_loaded_subtitles" formatted="true">Lastet inn %s</string>
     <string name="subtitle_offset_extra_hint_none_format">Ingen undertekstforsinkelse</string>
-    <string name="subtitle_offset_extra_hint_later_format">Bruk dette hvis undertekster vises %dms for tidlig</string>
+    <string name="subtitle_offset_extra_hint_later_format">Bruk dette hvis undertekster vises %d ms for tidlig</string>
     <string name="actor_main">Hovedrolle</string>
     <string name="actor_supporting">Støtterolle</string>
     <string name="next">Neste</string>
@@ -375,7 +375,7 @@
     <string name="provider_languages_tip">Se videoer på disse språkene</string>
     <string name="setup_done">Ferdig</string>
     <string name="plugin_singular">programtillegg</string>
-    <string name="safe_mode_title">Trygt modus på</string>
+    <string name="safe_mode_title">Trygt modus påslått</string>
     <string name="action_add_to_bookmarks">Sett visningsstatus</string>
     <string name="episode_sync_settings_des">Auto-synkroniser din nåværende episode-framdrift</string>
     <string name="episodes_range">%d-%d</string>
@@ -405,8 +405,8 @@
 \n
 \nSom følge av en hjernedød DMCA-forespørsel fra Sky UK Limited 🤮 kan vi ikke lenke til pakkebrønnssiden i programmet.
 \n
-\nTa del i vår discord, eller søk på nett.</string>
-    <string name="subtitle_offset_extra_hint_before_format">Bruk dette hvis undertekster vises %dms for sent</string>
+\nTa del i vår Discord, eller søk på nett.</string>
+    <string name="subtitle_offset_extra_hint_before_format">Bruk dette hvis undertekster vises %d ms for sent</string>
     <string name="plugin_loaded">Programtillegg innlastet</string>
     <string name="audio_tracks">Lydspor</string>
     <string name="skip_type_creddits">Rulletekst</string>
@@ -424,7 +424,7 @@
     <string name="show_hd">Kvalitetsetikett</string>
     <string name="poster_ui_settings">Slå av/på grensesnittselementer på plakat</string>
     <string name="skip_update">Hopp over denne oppdateringen</string>
-    <string name="video_ram_description">Forårsaker tilfeldige krasj hvis satt for høyt. Ikke endre dette hvis du ikke har lite minne, som f.eks. på Android TV, eller en gammel enhet.</string>
+    <string name="video_ram_description">Forårsaker tilfeldige krasj hvis satt for høyt. Ikke endre dette hvis du ikke har lite minne.</string>
     <string name="action_open_play">\@string/home_play</string>
     <string name="backup_settings">Sikkerhetskopier data</string>
     <string name="backup_success">Data lagret</string>
@@ -446,4 +446,41 @@
     <string name="update_notification_failed">Kunne ikke installere den nye versjonen av programmet</string>
     <string name="update_notification_installing">Installerer ny versjon av programmet …</string>
     <string name="update_notification_downloading">Laster ned ny versjon av programmet …</string>
+    <string name="upload_sync">Synkroniser</string>
+    <string name="authenticated_user" formatted="true">%s innlogget</string>
+    <string name="video_disk_description">Forårsaker problemer hvis satt for høyt på enheter med lite lagringsplass, som f.eks. Android TV.</string>
+    <string name="bottom_title_settings">Posisjon for plakatnavn</string>
+    <string name="skip_type_mixed_op">Blandet begynnelse</string>
+    <string name="skip_type_op">Begynnelse</string>
+    <string name="skip_type_mixed_ed">Blandet slutt</string>
+    <string name="skip_type_ed">Slutt</string>
+    <string name="ova">OVA</string>
+    <string name="limit_title">Maks. antall tegn for navn i videospiller</string>
+    <string name="enable_skip_op_from_database_des">Vis oppsprett for å hoppe over begynnelse/slutt</string>
+    <string name="enable_nsfw_on_providers">Skru på sensurerbart innhold for støttede tilbydere</string>
+    <string name="quality_cam">Cam</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_tc">TC</string>
+    <string name="subtitles_remove_captions">Fjern døveteksting fra undertekster</string>
+    <string name="subtitles_remove_bloat">Minimale undertekster</string>
+    <string name="extras">Ekstra</string>
+    <string name="subtitles_filter_lang">Filtrer etter foretrukket mediaspråk</string>
+    <string name="player_settings_play_in_web">Vev-videosending</string>
+    <string name="skip_type_recap">Tilbakeblikk</string>
+    <string name="quality_sd">SD</string>
+    <string name="trailer">Forfilm</string>
+    <string name="batch_download_finish_format" formatted="true">Lastet ned %d %s</string>
+    <string name="bottom_title_settings_des">Navn under plakat</string>
+    <string name="batch_download_start_format" formatted="true">Begynte nedlasting av %d %s …</string>
+    <string name="apply_on_restart">Bruk etter omstart av programmet</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
+    <string name="quality_hq">HQ</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_4k">4K</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="safe_mode_description">Alle utvidelser ble skrudd av som følge av et krasj for å hjelpe deg å finne det som lager trøbbel.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index cba96c34..bd3dfa1f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -135,7 +135,7 @@
     <string name="restore_success">Wczytano plik kopii zapasowej</string>
     <string name="restore_failed_format" formatted="true">Nie udało się przywrócić danych z pliku %s</string>
     <string name="backup_success">Dane zapisane z powodzeniem</string>
-    <string name="backup_failed">Brak uprawnień do przechowywania, spróbuj ponownien</string>
+    <string name="backup_failed">Brak uprawnień do pamięci, spróbuj ponownie</string>
     <string name="backup_failed_error_format">Błąd tworzenia kopii zapasowej %s</string>
     <string name="search">Szukaj</string>
     <string name="category_account">Konta</string>
@@ -266,7 +266,7 @@
     <string name="remove_site_pref">Usuń stronę</string>
     <string name="add_site_summary">Dodaj klona istniejącej strony z innym adresem URL</string>
     <string name="download_path_pref">Ścieżka pobierania</string>
-    <string name="nginx_url_pref">Url serwera Nginx</string>
+    <string name="nginx_url_pref">URL serwera Nginx</string>
     <string name="display_subbed_dubbed_settings">Wyświetlanie Anime z dubbingiem/subbingiem</string>
     <string name="resize_fit">Dopasuj do ekranu</string>
     <string name="resize_fill">Rozciągnij</string>
@@ -304,7 +304,7 @@
     <string name="sync_score">Ocenione</string>
     <string name="sync_score_format" formatted="true">%d na 10</string>
     <string name="authenticated_user" formatted="true">Uwierzytelniono %s</string>
-    <string name="authenticated_user_fail" formatted="true">Nie udało się uwierzytelnić w %s</string>
+    <string name="authenticated_user_fail" formatted="true">Nie udało się uwierzytelnić %s</string>
     <!-- ============ -->
     <string name="none">Brak</string>
     <string name="normal">Normalne</string>
@@ -316,10 +316,10 @@
     <string name="subtitles_shadow">Cień</string>
     <string name="subtitles_raised">Zniesione</string>
     <string name="subtitle_offset">Synchronizacja napisów</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Opóźnienie napisów</string>
-    <string name="subtitle_offset_extra_hint_later_format">Użyj tego, jeśli napisy są wyświetlane %dms za wcześnie</string>
-    <string name="subtitle_offset_extra_hint_before_format">Użyj tego, jeśli napisy są wyświetlane %dms za późno</string>
+    <string name="subtitle_offset_extra_hint_later_format">Użyj tego, jeśli napisy są wyświetlane %d ms za wcześnie</string>
+    <string name="subtitle_offset_extra_hint_before_format">Użyj tego, jeśli napisy są wyświetlane %d ms za późno</string>
     <string name="subtitle_offset_extra_hint_none_format">Brak opóźnienia napisów</string>
     <string name="subtitles_example_text">Pchnąć w tę łódź jeża lub ośm skrzyń fig.</string>
     <string name="recommended">Polecane</string>
@@ -354,7 +354,7 @@
     <string name="resolution_and_title">Rozdzielczość i tytuł</string>
     <string name="title">Tytuł</string>
     <string name="resolution">Rozdzielczość</string>
-    <string name="error_invalid_id">Niepoprawne id</string>
+    <string name="error_invalid_id">Niepoprawne ID</string>
     <string name="error_invalid_data">Niepoprawne dane</string>
     <string name="error_invalid_url">Niepoprawny URL</string>
     <string name="error">Błąd</string>
@@ -380,7 +380,7 @@
     <string name="plugin_deleted">Rozszerzenie usunięte</string>
     <string name="plugin_load_fail" formatted="true">Błąd ładowania %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Rozpoczęto pobieranie %d %s</string>
+    <string name="batch_download_start_format" formatted="true">Rozpoczęto pobieranie %d %s…</string>
     <string name="batch_download_finish_format" formatted="true">Pobrano %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Wszystkie %s już pobrane</string>
     <string name="batch_download">Pobierz wszystko</string>
@@ -408,7 +408,7 @@
     <string name="video_tracks">Ścieżki wideo</string>
     <string name="apply_on_restart">Zastosuj po ponownym uruchomieniu</string>
     <string name="safe_mode_title">Tryb bezpieczny włączony</string>
-    <string name="safe_mode_description">Wystąpiła nieoczekiwana awaria i automatycznie wyłączyliśmy wszystkie rozszerzenia, abyś mógł znaleźć i usunąć rozszerzenie, które powoduje problemy.</string>
+    <string name="safe_mode_description">Wszystkie rozszerzenia zostały wyłączone z powodu awarii, aby pomóc Ci znaleźć ten, który powoduje problemy.</string>
     <string name="safe_mode_crash_info">Wyświetl informacje o awarii</string>
     <string name="extension_rating" formatted="true">Ocena: %s</string>
     <string name="extension_description">Opis</string>
@@ -439,12 +439,28 @@
     <string name="no">Nie</string>
     <string name="update_notification_failed">Aktualizacja aplikacji nie powiodła się</string>
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
-    <string name="update_notification_installing">Instalowanie aktualizacji aplikacji</string>
+    <string name="update_notification_installing">Instalowanie aktualizacji aplikacji…</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="action_mark_as_watched">Oznacz jako obejrzane</string>
     <string name="confirm_exit_dialog">Czy na pewno chcesz wyjść\?</string>
-    <string name="update_notification_downloading">Pobieranie aktualizacji aplikacji</string>
+    <string name="update_notification_downloading">Pobieranie aktualizacji aplikacji…</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="cast_format" formatted="true">Obsada: %s</string>
     <string name="automatic_plugin_download_summary">Automatycznie instaluj wszystkie jeszcze nie zainstalowane wtyczki z dodanych repozytoriów.</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="skip_type_recap">Podsumowanie</string>
+    <string name="apk_installer_settings">Instalator APK</string>
+    <string name="apk_installer_settings_des">Niektóre telefony nie obsługują nowego instalatora pakietów. Wypróbuj tryb kompatybilności, jeśli aktualizacje nie zostaną zainstalowane.</string>
+    <string name="example_password">password123</string>
+    <string name="ova_singular">\@string/ova</string>
+    <string name="example_site_name">MojaFajnaWitryna</string>
+    <string name="example_username">MyCoolUsername</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="apk_installer_legacy">Tryb kompatybilności</string>
+    <string name="example_site_url">przyklad.pl</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="apk_installer_package_installer">Instalator pakietów</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="example_email">hello@world.com</string>
+    <string name="anime_singular">\@string/anime</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index f68a0f75..3956e245 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -390,7 +390,7 @@
     <string name="subtitles_shadow">阴影</string>
     <string name="subtitles_raised">凸出</string>
     <string name="subtitle_offset">同步字幕</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">字幕延迟</string>
     <string name="subtitle_offset_extra_hint_later_format">如果字幕过早显示 %dms，请使用此选项</string>
     <string name="subtitle_offset_extra_hint_before_format">如果字幕过晚显示 %dms，请使用此选项</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 559f7e3d..64c99449 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -219,7 +219,7 @@
     <string name="episode_sync_settings">Update watch progress</string>
     <string name="episode_sync_settings_des">Automatically sync your current episode progress</string>
     <string name="restore_settings">Restore data from backup</string>
-    <string name="backup_settings">Backup data</string>
+    <string name="backup_settings">Back up data</string>
     <string name="restore_success">Loaded backup file</string>
     <string name="restore_failed_format" formatted="true">Failed to restore data from file %s</string>
     <string name="backup_success">Data stored</string>
@@ -358,8 +358,8 @@
     <string name="video_buffer_length_settings">Video buffer length</string>
     <string name="video_buffer_disk_settings">Video cache on disk</string>
     <string name="video_buffer_clear_settings">Clear video and image cache</string>
-    <string name="video_ram_description">Causes random crashes if set too high. Leave as is on devices with low memory.</string>
-    <string name="video_disk_description">May cause problems on systems with low storage space such as Android TV devices if you set it too high</string>
+    <string name="video_ram_description">Causes crashes if set too high on devices with low memory, such as Android TV.</string>
+    <string name="video_disk_description">Causes problems if set too high on devices with low storage space, such as Android TV.</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Useful for bypassing ISP blocks</string>
     <string name="add_site_pref">Clone site</string>
@@ -441,8 +441,8 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="authenticated_user" formatted="true">Authenticated %s</string>
-    <string name="authenticated_user_fail" formatted="true">Could not authenticate to %s</string>
+    <string name="authenticated_user" formatted="true">%s authenticated</string>
+    <string name="authenticated_user_fail" formatted="true">Could not log in at %s</string>
     <!-- ============ -->
     <string name="none">None</string>
     <string name="normal">Normal</string>
@@ -457,8 +457,8 @@
     <string name="subtitle_offset">Sync subs</string>
     <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Subtitle delay</string>
-    <string name="subtitle_offset_extra_hint_later_format">Use this if the subtitles are shown %dms too early</string>
-    <string name="subtitle_offset_extra_hint_before_format">Use this if subtitles are shown %dms too late</string>
+    <string name="subtitle_offset_extra_hint_later_format">Use this if the subtitles are shown %d ms too early</string>
+    <string name="subtitle_offset_extra_hint_before_format">Use this if subtitles are shown %d ms too late</string>
     <string name="subtitle_offset_extra_hint_none_format">No subtitle delay</string>
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
@@ -526,7 +526,7 @@
     <string name="plugin_deleted">Plugin Deleted</string>
     <string name="plugin_load_fail" formatted="true">Could not load %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Started downloading %d %s</string>
+    <string name="batch_download_start_format" formatted="true">Started downloading %d %s…</string>
     <string name="batch_download_finish_format" formatted="true">Downloaded %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">All %s already downloaded</string>
     <string name="batch_download">Batch download</string>
@@ -553,8 +553,8 @@
     <string name="audio_tracks">Audio tracks</string>
     <string name="video_tracks">Video tracks</string>
     <string name="apply_on_restart">Apply on Restart</string>
-    <string name="safe_mode_title">Safe Mode enabled</string>
-    <string name="safe_mode_description">An unrecoverable crash occurred and we\'ve automatically disabled all extensions, so you can find and remove the extension which is causing trouble.</string>
+    <string name="safe_mode_title">Safe mode on</string>
+    <string name="safe_mode_description">All extensions were turned off due to a crash to help you find the one causing trouble.</string>
     <string name="safe_mode_crash_info">View crash info</string>
     <string name="extension_rating" formatted="true">Rating: %s</string>
     <string name="extension_description">Description</string>

From 53519381d709876f2d7ebf73dc4cd79a63b92d16 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Thu, 22 Dec 2022 13:11:37 +0100
Subject: [PATCH 122/273] Set default start season to 1

---
 .../com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index f5aae7fc..994d4759 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -1926,7 +1926,7 @@ class ResultViewModel2 : ViewModel() {
         // this takes the indexer most preferable by the user given the current sorting
         val min = ranges.keys.minByOrNull { index ->
             kotlin.math.abs(
-                index.season - (preferStartSeason ?: 0)
+                index.season - (preferStartSeason ?: 1)
             ) + if (index.dubStatus == preferDubStatus) 0 else 100000
         }
 
@@ -2139,7 +2139,7 @@ class ResultViewModel2 : ViewModel() {
 
                     preferDubStatus = getDub(mainId) ?: preferDubStatus
                     preferStartEpisode = getResultEpisode(mainId)
-                    preferStartSeason = getResultSeason(mainId)
+                    preferStartSeason = getResultSeason(mainId) ?: 1
 
                     setKey(
                         DOWNLOAD_HEADER_CACHE,

From a2dbabdb6e87c928e93b2d5ee1cacc782051069a Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 23 Dec 2022 12:41:09 +0100
Subject: [PATCH 123/273] Translated using Weblate (Polish)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (548 of 548 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (548 of 548 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (548 of 548 strings)

Translated using Weblate (French)

Currently translated at 100.0% (548 of 548 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 97.8% (536 of 548 strings)

Translated using Weblate (French)

Currently translated at 87.7% (481 of 548 strings)

Translated using Weblate (Czech)

Currently translated at 75.1% (412 of 548 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (548 of 548 strings)

Co-authored-by: Bitpaint <bitpaintclub@gmail.com>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Sarlay <raphmd0@gmail.com>
Co-authored-by: Sdarfeesh <Sdarfeesh@protonmail.com>
Co-authored-by: Václav Ornst <mplay.octopus@gmail.com>
Co-authored-by: jhihyu lin <thomas.jy.lin@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hant/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml     |   4 +
 app/src/main/res/values-cs/strings.xml     |   2 +-
 app/src/main/res/values-fr/strings.xml     | 136 +++++++++++++++++++--
 app/src/main/res/values-pl/strings.xml     |   7 ++
 app/src/main/res/values-zh-rTW/strings.xml |  62 ++++++----
 app/src/main/res/values-zh/strings.xml     |  18 +--
 6 files changed, 187 insertions(+), 42 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 20689d4d..bb7ba5d1 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -510,4 +510,8 @@
     <string name="episode_format" formatted="true">%d %s</string>
     <string name="confirm_exit_dialog">هل أنت متأكد أنك تريد الخروج؟</string>
     <string name="automatic_plugin_download_summary">قم بتثبيت جميع المكونات الإضافية التي لم يتم تثبيتها بعد تلقائيا من المستودعات المضافة.</string>
+    <string name="apk_installer_settings">مثبت الحزم</string>
+    <string name="apk_installer_settings_des">بعض الهواتف لا تدعم مثبت الحزمة الجديد. جرب الخيار القديم إذا لم يتم تثبيت التحديثات.</string>
+    <string name="apk_installer_legacy">قياسي</string>
+    <string name="apk_installer_package_installer">مثبت الحزمة</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index c2142173..32abfd95 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -5,7 +5,7 @@
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Hrají: %s</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
-    <string name="result_poster_img_des">Poster</string>
+    <string name="result_poster_img_des">Plakát</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 17a0e253..22140d89 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -168,7 +168,7 @@
     <string name="video_buffer_length_settings">Longueur de la vidéo tampon</string>
     <string name="video_buffer_disk_settings">Longueur de la vidéo cache</string>
     <string name="video_buffer_clear_settings">Effacer les vidéos et les images cache</string>
-    <string name="video_ram_description">Causera des crashs si la valeur choisie est trop élevée sur un appareil avec peu de ram comme une télévision android</string>
+    <string name="video_ram_description">Causera des crashs si la valeur choisie est trop élevée sur un appareil avec peu de ram comme une télévision android.</string>
     <string name="video_disk_description">Cause des problèmes si la valeur choisie est trop élevée sur un appareil avec peu de stockage comme une télévision android.</string>
     <string name="random_button_settings">Bouton aléatoire</string>
     <string name="random_button_settings_desc">Afficher le bouton aléatoire</string>
@@ -184,7 +184,7 @@
     <string name="added_sync_format">%s ajouté</string>
     <string name="upload_sync">Synchroniser</string>
     <string name="sync_score">Noté</string>
-    <string name="authenticated_user_fail">Impossible de s\'authentifier à %s</string>
+    <string name="authenticated_user_fail">Impossible de se connecté à %s</string>
     <string name="none">Aucun</string>
     <string name="normal">Normal</string>
     <string name="all">Tous</string>
@@ -212,7 +212,7 @@
     <string name="home_random">Aléatoire</string>
     <string name="coming_soon">À venir …</string>
     <string name="poster_image">Image de l\'affiche</string>
-    <string name="authenticated_user">Connecté %s</string>
+    <string name="authenticated_user">%s Connecté</string>
     <string name="action_add_to_bookmarks">Définir le statut de visionage</string>
     <string name="sort_copy">Copier</string>
     <string name="sort_close">Fermer</string>
@@ -258,16 +258,15 @@
     <string name="eigengraumode_settings">Mode Eigengravy</string>
     <string name="eigengraumode_settings_des">Ajout d\'une option de vitesse dans le lecteur</string>
     <string name="swipe_to_seek_settings">Balayez pour chercher</string>
-    <string name="swipe_to_seek_settings_des">Balayez vers la gauche ou la droite pour contrôler le temps dans le lecteur vidéo.</string>
+    <string name="swipe_to_seek_settings_des">Balayez vers la gauche ou la droite pour contrôler le temps dans le lecteur vidéo</string>
     <string name="swipe_to_change_settings">Balayez pour modifier les paramètres</string>
-    <string name="swipe_to_change_settings_des">Glissez sur le côté gauche ou droit pour modifier la luminosité ou le volume.</string>
+    <string name="swipe_to_change_settings_des">Glissez sur le côté gauche ou droit pour modifier la luminosité ou le volume</string>
     <string name="autoplay_next_settings">Lecture automatique du prochain épisode</string>
     <string name="autoplay_next_settings_des">Démarrer l\'épisode suivant lorsque l\'épisode en cours se termine</string>
     <string name="double_tap_to_seek_settings">Double tape pour chercher</string>
     <string name="double_tap_to_pause_settings">Double tape pour mettre en pause</string>
     <string name="double_tap_to_seek_amount_settings">Player seek amount</string>
-    <string name="double_tap_to_seek_settings_des">Tapez deux fois sur le côté droit ou gauche pour aller en avant ou en arrière.
-    </string>
+    <string name="double_tap_to_seek_settings_des">Tapez deux fois sur le côté droit ou gauche pour aller en avant ou en arrière</string>
     <string name="double_tap_to_pause_settings_des">Tapez au milieu pour mettre en pause</string>
     <string name="use_system_brightness_settings">Utiliser la luminosité du système</string>
     <string name="use_system_brightness_settings_des">Utiliser la luminosité du système dans le lecteur d\'applications au lieu du
@@ -279,8 +278,8 @@
     <string name="backup_settings">Sauvegarde des données</string>
     <string name="restore_success">Fichier de sauvegarde chargé</string>
     <string name="restore_failed_format" formatted="true">Échec de la restauration des données du fichier %s</string>
-    <string name="backup_success">Données stockées avec succès</string>
-    <string name="backup_failed">Permissions de stockage manquantes. Veuillez réessayer</string>
+    <string name="backup_success">Données stockées</string>
+    <string name="backup_failed">Permissions de stockage manquantes. Veuillez réessayer.</string>
     <string name="backup_failed_error_format">Erreur de sauvegarde %s</string>
     <string name="search">Recherche</string>
     <string name="category_account">Comptes</string>
@@ -322,7 +321,7 @@
     <string name="stream">Stream</string>
     <string name="confirm_exit_dialog">Êtes-vous sûr·e de vouloir quitter \?</string>
     <string name="no">Non</string>
-    <string name="update_notification_downloading">Téléchargement de la mise à jour de l\'application</string>
+    <string name="update_notification_downloading">Téléchargement de la mise à jour…</string>
     <string name="next_episode_format" formatted="true">L\'épisode %d sera publié dans</string>
     <string name="show_hd">Étiquette de qualité</string>
     <string name="limit_title_rez">Résolution du lecteur vidéo</string>
@@ -332,12 +331,12 @@
     <string name="nginx_url_pref">URL du serveur NGINX</string>
     <string name="example_site_name">MonSiteTresCool</string>
     <string name="error_invalid_id">ID invalide</string>
-    <string name="automatic_plugin_download_summary">Installer automatiquement les plugins qui sont dans les repository mais qui n\'ont pas encore été installés</string>
+    <string name="automatic_plugin_download_summary">Installer automatiquement les plugins qui sont dans les repository mais qui n\'ont pas encore été installés.</string>
     <string name="resume_time_left" formatted="true">%dm
 \nrestant</string>
-    <string name="livestreams">En Direct</string>
+    <string name="livestreams">En direct</string>
     <string name="others">Autres</string>
-    <string name="live_singular">En Direct</string>
+    <string name="live_singular">En direct</string>
     <string name="other_singular">Vidéo</string>
     <string name="show_dub">Étiquette Dub (doublage anglais)</string>
     <string name="show_sub">Étiquette sous titre</string>
@@ -363,4 +362,115 @@
     <string name="example_site_url">exemple.com</string>
     <string name="title">Titre</string>
     <string name="resolution">Résolution</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_tc">TC</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="next">Suivant</string>
+    <string name="quality_blueray">Blu-ray</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="nsfw">NSFW</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="quality_cam_hd">Cam</string>
+    <string name="quality_hq">HQ</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_4k">4K</string>
+    <string name="quality_webrip">Web</string>
+    <string name="go_back_30">-30</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="subtitles_filter_lang">Filtrez par langue préférée</string>
+    <string name="extras">Extras</string>
+    <string name="network_adress_example">Lien vers le stream</string>
+    <string name="referer">Référenceur</string>
+    <string name="apk_installer_settings">Installeur APK</string>
+    <string name="go_forward_30">+30</string>
+    <string name="quality_cam">Cam</string>
+    <string name="subtitles_remove_bloat">Supprimer les éléments superflus des sous-titres</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="trailer">Trailer</string>
+    <string name="provider_languages_tip">Regardez les vidéos dans ces langues</string>
+    <string name="app_layout_subtext">Modifier le style de l\'application pour être assortie à votre appareil</string>
+    <string name="uppercase_all_subtitles">Tous les sous-titres en majuscules</string>
+    <string name="view_public_repositories_button">Voir les repository de la communauté</string>
+    <string name="view_public_repositories_button_short">Liste publique</string>
+    <string name="action_mark_as_watched">Marquer comme regardé</string>
+    <string name="repository_url_hint">Url du repository</string>
+    <string name="setup_done">Finir</string>
+    <string name="add_repository">Ajouter le repository</string>
+    <string name="preferred_media_subtext">Ce que vous voulez voir</string>
+    <string name="extensions">Extensions</string>
+    <string name="plugin_load_fail" formatted="true">Impossible de charger %s</string>
+    <string name="is_adult">18+</string>
+    <string name="plugin_loaded">Plugin Chargé</string>
+    <string name="plugin_deleted">Plugin Supprimé</string>
+    <string name="batch_download">Téléchargement par lots</string>
+    <string name="batch_download_start_format" formatted="true">Début du téléchargement %d %s…</string>
+    <string name="batch_download_finish_format" formatted="true">Téléchargé %d %s</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Tous les %s déjà téléchargés</string>
+    <string name="setup_extensions_subtext">Télécharger la liste de sites que vous voulez utiliser</string>
+    <string name="plugins_downloaded" formatted="true">Téléchargé: %d</string>
+    <string name="video_tracks">Pistes vidéo</string>
+    <string name="apply_on_restart">Appliqué au redémarrage</string>
+    <string name="safe_mode_description">Toutes les extensions ont été désactivé à cause d\'un crash pour vous aider à trouver l\'extension causant le problème.</string>
+    <string name="safe_mode_title">Mode sans échec activé</string>
+    <string name="extension_size">Taille</string>
+    <string name="extension_version">Version</string>
+    <string name="extension_rating" formatted="true">Note: %s</string>
+    <string name="extension_description">Description</string>
+    <string name="extension_status">Status</string>
+    <string name="extension_install_first">Installer l\'extension d\'abord</string>
+    <string name="hls_playlist">Playlist HLS</string>
+    <string name="player_pref">Lecteur vidéo préféré</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="skip_type_mixed_ed">Fin mitigée</string>
+    <string name="skip_type_mixed_op">Introduction mitigée</string>
+    <string name="update_notification_installing">Installation de la mise a jour de l\'application…</string>
+    <string name="update_notification_failed">Impossible d\'installer la nouvelle version de l\'application</string>
+    <string name="player_settings_play_in_browser">Navigateur Web</string>
+    <string name="apk_installer_settings_des">Certains téléphones ne supporte pas le nouvel installateur d\'application. Essayez l\'option de l\'ancien installateur si les mises-à-jour ne s\'installe pas.</string>
+    <string name="previous">Précédent</string>
+    <string name="skip_setup">Ignorer la configuration</string>
+    <string name="crash_reporting_title">Rapport de crash</string>
+    <string name="repository_name_hint">Nom du repository</string>
+    <string name="plugin_singular">plugin</string>
+    <string name="delete_repository">Supprimer le repository</string>
+    <string name="plugins_disabled" formatted="true">Désactivé: %d</string>
+    <string name="plugins_not_downloaded" formatted="true">Non téléchargé: %d</string>
+    <string name="plugins_updated" formatted="true">%d plugins mis-à-jour</string>
+    <string name="download_all_plugins_from_repo">Télécharger tous les plugins de ce repository \?</string>
+    <string name="single_plugin_disabled" formatted="true">%s (Désactivé)</string>
+    <string name="tracks">Pistes</string>
+    <string name="audio_tracks">Pistes audio</string>
+    <string name="safe_mode_crash_info">Afficher les infos du crash</string>
+    <string name="extension_authors">Auteurs</string>
+    <string name="extension_types">Supporté</string>
+    <string name="player_settings_play_in_app">Lecteur interne</string>
+    <string name="app_not_found_error">Application non trouvée</string>
+    <string name="clipboard_too_large">Trop de texte. Impossible de sauvegarder dans le presse papier.</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="apk_installer_package_installer">Installateur de paquet</string>
+    <string name="plugin">plugins</string>
+    <string name="delete_repository_plugins">Cela supprimera également tous les plugins du repository</string>
+    <string name="blank_repo_message">CloudStream n\'a pas de site installés par défaut.
+\nIl faut installer les sites depuis des repository.
+\n
+\nA cause de Sky UK Limited 🤮 on ne peut pas afficher les repository dans l\'application.
+\n
+\nRejoignez notre Discord ou chercher des repository sur internet.</string>
+    <string name="extension_language">Langage</string>
+    <string name="enable_skip_op_from_database_des">Afficher les popups skip pour les intro / fins</string>
+    <string name="apk_installer_legacy">Ancienne méthode d\'installation</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index bd3dfa1f..5e7b0b27 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -463,4 +463,11 @@
     <string name="action_open_play">\@string/home_play</string>
     <string name="example_email">hello@world.com</string>
     <string name="anime_singular">\@string/anime</string>
+    <string name="skip_type_op">Opening</string>
+    <string name="skip_type_ed">Ending</string>
+    <string name="skip_type_mixed_op">Mixed opening</string>
+    <string name="skip_type_creddits">Napisy końcowe</string>
+    <string name="skip_type_intro">Intro</string>
+    <string name="skip_type_mixed_ed">Mixed ending</string>
+    <string name="enable_skip_op_from_database_des">Pokaż wyskakujące okienka pomijania dla niektórych segmentów</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 8c58cbd5..3b0b686f 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -160,8 +160,8 @@
     <string name="backup_settings">備份資料</string>
     <string name="restore_success">已載入備份資料</string>
     <string name="restore_failed_format" formatted="true">無法從 %s 檔案中還原資料</string>
-    <string name="backup_success">成功儲存資料</string>
-    <string name="backup_failed">缺少儲存權限，請重試</string>
+    <string name="backup_success">已儲存資料</string>
+    <string name="backup_failed">缺少儲存權限，請再試一次。</string>
     <string name="backup_failed_error_format">備份 %s 錯誤</string>
     <string name="search">搜尋</string>
     <string name="category_account">帳號</string>
@@ -211,7 +211,8 @@
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">這將永遠刪除 %s\n你確定嗎?</string>
-    <string name="resume_time_left" formatted="true">剩餘 %d 分鐘</string>
+    <string name="resume_time_left" formatted="true">%d 分鐘
+\n剩餘的</string>
     <string name="status_ongoing">連載中</string>
     <string name="status_completed">已完結</string>
     <string name="status">狀態</string>
@@ -290,15 +291,15 @@
     <string name="video_buffer_length_settings">影片緩衝長度</string>
     <string name="video_buffer_disk_settings">影片快取存儲</string>
     <string name="video_buffer_clear_settings">清除影片和圖片快取</string>
-    <string name="video_ram_description">如果設定得太高會導致隨機崩潰。 如果您的記憶體不足（例如 Android TV 或舊手機），請不要更改</string>
-    <string name="video_disk_description">如果您將其設定得太高，可能會導致儲存空間不足的系統（例如 Android TV 設備）出現問題</string>
+    <string name="video_ram_description">如果在記憶體不足的裝置（例如 Android TV）上設定得太高會導致崩潰。</string>
+    <string name="video_disk_description">如果在儲存空間較小的裝置（例如 Android TV）上設定過高會導致問題。</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">用於繞過網路服務供應商的封鎖</string>
     <string name="add_site_pref">複製片源</string>
     <string name="remove_site_pref">移除片源</string>
-    <string name="add_site_summary">添加具有不同URL的現有站點複製</string>
+    <string name="add_site_summary">使用不同的 URL 添加現有站點的複製</string>
     <string name="download_path_pref">下載路徑</string>
-    <string name="nginx_url_pref">Nginx 伺服器連結</string>
+    <string name="nginx_url_pref">NGINX 伺服器 URL</string>
     <string name="display_subbed_dubbed_settings">顯示有配音/字幕的動漫</string>
     <string name="resize_fit">適應螢幕</string>
     <string name="resize_fill">拉伸</string>
@@ -373,8 +374,8 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="authenticated_user" formatted="true">已驗證 %s</string>
-    <string name="authenticated_user_fail" formatted="true">驗證 %s 失敗</string>
+    <string name="authenticated_user" formatted="true">%s 已驗證</string>
+    <string name="authenticated_user_fail" formatted="true">無法在 %s 登入</string>
     <!-- ============ -->
     <string name="none">無</string>
     <string name="normal">普通</string>
@@ -387,10 +388,10 @@
     <string name="subtitles_shadow">陰影</string>
     <string name="subtitles_raised">凸出</string>
     <string name="subtitle_offset">同步字幕</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000 毫秒</string>
     <string name="subtitle_offset_title">字幕延遲</string>
-    <string name="subtitle_offset_extra_hint_later_format">如果字幕過早顯示 %dms ，請使用此選項</string>
-    <string name="subtitle_offset_extra_hint_before_format">如果字幕過晚顯示 %dms ，請使用此選項</string>
+    <string name="subtitle_offset_extra_hint_later_format">如果字幕過早顯示 %d 毫秒，請使用此選項</string>
+    <string name="subtitle_offset_extra_hint_before_format">如果字幕過晚顯示 %d 毫秒，請使用此選項</string>
     <string name="subtitle_offset_extra_hint_none_format">無字幕延遲</string>
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
@@ -417,7 +418,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blu-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
@@ -433,7 +434,7 @@
     <string name="resolution">解析度</string>
     <string name="error_invalid_id">無效 ID</string>
     <string name="error_invalid_data">無效資料</string>
-    <string name="error_invalid_url">無效連結</string>
+    <string name="error_invalid_url">無效 URL</string>
     <string name="error">錯誤</string>
     <string name="subtitles_remove_captions">移除隱藏式字幕</string>
     <string name="subtitles_remove_bloat">移除字幕廣告</string>
@@ -453,13 +454,13 @@
     <string name="extensions">擴充功能</string>
     <string name="add_repository">添加資源庫</string>
     <string name="repository_name_hint">資源庫名稱</string>
-    <string name="repository_url_hint">資源庫連結</string>
+    <string name="repository_url_hint">資源庫 URL</string>
     <string name="plugin_loaded">外掛程式已載入</string>
     <string name="plugin_deleted">外掛程式已刪除</string>
-    <string name="plugin_load_fail" formatted="true">載入 %s 失敗</string>
+    <string name="plugin_load_fail" formatted="true">無法載入 %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">開始下載 %d %s</string>
-    <string name="batch_download_finish_format" formatted="true">下載 %d %s 成功</string>
+    <string name="batch_download_start_format" formatted="true">開始下載 %d %s …</string>
+    <string name="batch_download_finish_format" formatted="true">已下載 %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">全部 %s 已經下載</string>
     <string name="batch_download">批次下載</string>
     <string name="plugin_singular">外掛程式</string>
@@ -471,7 +472,11 @@
     <string name="plugins_disabled" formatted="true">已禁用：%d</string>
     <string name="plugins_not_downloaded" formatted="true">未下載：%d</string>
     <string name="plugins_updated" formatted="true">已更新 %d 外掛程式</string>
-    <string name="blank_repo_message">CloudStream 預設沒有安裝任何片源。您需要從資源庫安裝站點。\n\n由於 Sky Uk Limited 的無腦 DMCA 刪除🤮，我們無法在應用程式中連結資源庫站點。\n\n加入我們的 Discord 獲得連結或自己在網路上搜尋</string>
+    <string name="blank_repo_message">CloudStream 預設沒有安裝任何片源。您需要從資源庫安裝站點。
+\n
+\n由於 Sky UK Limited 的無腦 DMCA 刪除🤮，我們無法在應用程式中連結資源庫站點。
+\n
+\n加入我們的 Discord 或自己在網路上搜尋。</string>
     <string name="view_public_repositories_button">查看</string>
     <string name="view_public_repositories_button_short">公開列表</string>
     <string name="uppercase_all_subtitles">字幕全大寫</string>
@@ -482,7 +487,7 @@
     <string name="video_tracks">影片軌道</string>
     <string name="apply_on_restart">重新啟動時生效</string>
     <string name="safe_mode_title">安全模式已啟用</string>
-    <string name="safe_mode_description">發生了不可恢復的崩潰，我們已自動禁用所有外掛程式，因此您可以找到並刪除導致問題的應用程式。</string>
+    <string name="safe_mode_description">由於崩潰，所有外掛程式皆已關閉，以幫助您找到導致問題的程式。</string>
     <string name="safe_mode_crash_info">查看崩潰資訊</string>
     <string name="extension_rating" formatted="true">評分：%s</string>
     <string name="extension_description">簡介</string>
@@ -499,7 +504,7 @@
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="player_settings_play_in_mpv">MPV</string>
     <string name="player_settings_play_in_web">網路影片播放</string>
-    <string name="player_settings_play_in_browser">瀏覽器</string>
+    <string name="player_settings_play_in_browser">網頁瀏覽器</string>
     <string name="app_not_found_error">未找到應用</string>
     <string name="all_languages_preference">所有語言</string>
     <string name="skip_type_format" formatted="true">跳過 %s</string>
@@ -512,4 +517,19 @@
     <string name="skip_type_intro">介紹</string>
     <string name="clear_history">清除歷史紀錄</string>
     <string name="history">歷史紀錄</string>
+    <string name="automatic_plugin_download">自動下載外掛程式</string>
+    <string name="confirm_exit_dialog">你確定要離開？</string>
+    <string name="automatic_plugin_download_summary">從添加的資源庫自動安裝所有尚未安裝的外掛程式。</string>
+    <string name="enable_skip_op_from_database_des">在開始/結束顯示跳過彈出窗口</string>
+    <string name="update_notification_failed">無法安裝新版本的應用程式</string>
+    <string name="apk_installer_settings">APK 安裝器</string>
+    <string name="apk_installer_settings_des">有些手機不支援新的軟體包安裝程式。 如果未安裝更新，請嘗試使用舊版選項。</string>
+    <string name="clipboard_too_large">文字太多。 無法儲存到剪貼簿。</string>
+    <string name="yes">是</string>
+    <string name="update_notification_downloading">正在下載應用程式更新…</string>
+    <string name="update_notification_installing">正在安裝應用程式更新…</string>
+    <string name="apk_installer_package_installer">套件安裝程式</string>
+    <string name="action_mark_as_watched">標記為已觀看</string>
+    <string name="no">否』</string>
+    <string name="apk_installer_legacy">傳統』</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 3956e245..6cf43a54 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -293,8 +293,8 @@
     <string name="video_buffer_length_settings">视频缓冲长度</string>
     <string name="video_buffer_disk_settings">视频缓存存储</string>
     <string name="video_buffer_clear_settings">清除视频与图像缓存</string>
-    <string name="video_ram_description">设置过高可能导致崩溃。使用低内存设备请勿修改。</string>
-    <string name="video_disk_description">设置过高可能导致如 Android TV 此类低存储空间设备出现系统问题</string>
+    <string name="video_ram_description">如果在内存较少的设备（例如 Android TV）上设置得太高会导致崩溃。</string>
+    <string name="video_disk_description">如果在存储空间较小的设备（例如 Android TV）上设置过高会导致问题。</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">用于绕过 ISP 的封锁</string>
     <string name="add_site_pref">复制片源</string>
@@ -377,7 +377,7 @@
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">已验证 %s</string>
-    <string name="authenticated_user_fail" formatted="true">无法验证 %s</string>
+    <string name="authenticated_user_fail" formatted="true">无法登录到 %s</string>
     <!-- ============ -->
     <string name="none">无</string>
     <string name="normal">普通</string>
@@ -392,8 +392,8 @@
     <string name="subtitle_offset">同步字幕</string>
     <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">字幕延迟</string>
-    <string name="subtitle_offset_extra_hint_later_format">如果字幕过早显示 %dms，请使用此选项</string>
-    <string name="subtitle_offset_extra_hint_before_format">如果字幕过晚显示 %dms，请使用此选项</string>
+    <string name="subtitle_offset_extra_hint_later_format">如果字幕过早显示 %d ms，请使用此选项</string>
+    <string name="subtitle_offset_extra_hint_before_format">如果字幕过晚显示 %d ms，请使用此选项</string>
     <string name="subtitle_offset_extra_hint_none_format">无字幕延迟</string>
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
@@ -461,7 +461,7 @@
     <string name="plugin_deleted">插件已删除</string>
     <string name="plugin_load_fail" formatted="true">无法加载 %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">开始下载 %d %s</string>
+    <string name="batch_download_start_format" formatted="true">开始下载 %d %s…</string>
     <string name="batch_download_finish_format" formatted="true">已下载 %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">全部 %s 已经下载</string>
     <string name="batch_download">批量下载</string>
@@ -489,7 +489,7 @@
     <string name="video_tracks">视频轨道</string>
     <string name="apply_on_restart">重启生效</string>
     <string name="safe_mode_title">安全模式已启用</string>
-    <string name="safe_mode_description">发生了不可恢复的崩溃，已自动禁用所有扩展，因此可以找到并删除导致问题的扩展。</string>
+    <string name="safe_mode_description">由于崩溃，所有扩展都已关闭，以帮助您找到导致问题的扩展。</string>
     <string name="safe_mode_crash_info">查看崩溃信息</string>
     <string name="extension_rating" formatted="true">评分：%s</string>
     <string name="extension_description">简介</string>
@@ -529,4 +529,8 @@
     <string name="update_notification_installing">正在安装应用更新…</string>
     <string name="update_notification_failed">无法安装新版的应用</string>
     <string name="automatic_plugin_download_summary">自动安装已添加的仓库内所有未安装的插件。</string>
+    <string name="apk_installer_settings">APK 安装器</string>
+    <string name="apk_installer_settings_des">部分手机不支持新的软件包安装程序。如果未安装更新，请尝试使用传统选项。</string>
+    <string name="apk_installer_legacy">传统</string>
+    <string name="apk_installer_package_installer">软件包安装程序</string>
 </resources>
\ No newline at end of file

From 23973042f436ffb12509ce464f704df1e301f6ef Mon Sep 17 00:00:00 2001
From: Deepak Patil <dspatil11599@gmail.com>
Date: Fri, 23 Dec 2022 17:25:27 +0530
Subject: [PATCH 124/273] feat(utils): add Jshunter deobfuscator (#250)

* feat(utils): add Jshunter deobfuscator

Co-authored-by: contusionglory <102427829+contusionglory@users.noreply.github.com>
---
 .../lagradost/cloudstream3/utils/JsHunter.kt  | 88 +++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/JsHunter.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/JsHunter.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/JsHunter.kt
new file mode 100644
index 00000000..8ccb2c70
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/JsHunter.kt
@@ -0,0 +1,88 @@
+package com.lagradost.cloudstream3.utils
+
+import com.lagradost.cloudstream3.mvvm.logError
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+import kotlin.math.pow
+
+//author: https://github.com/daarkdemon
+class JsHunter(private val hunterJS: String) {
+
+    /**
+     * Detects whether the javascript is H.U.N.T.E.R coded.
+     *
+     * @return true if it's H.U.N.T.E.R coded.
+     */
+    fun detect(): Boolean {
+        val p = Pattern.compile("eval\\(function\\(h,u,n,t,e,r\\)")
+        val searchResults = p.matcher(hunterJS)
+        return searchResults.find()
+    }
+
+    /**
+     * Unpack the javascript
+     *
+     * @return the javascript unhunt or null.
+     */
+
+    fun dehunt(): String? {
+        try {
+            val p: Pattern =
+                Pattern.compile(
+                    """}\("([^"]+)",[^,]+,\s*"([^"]+)",\s*(\d+),\s*(\d+)""",
+                    Pattern.DOTALL
+                )
+            val searchResults: Matcher = p.matcher(hunterJS)
+            if (searchResults.find() && searchResults.groupCount() == 4) {
+                val h = searchResults.group(1)!!.toString()
+                val n = searchResults.group(2)!!.toString()
+                val t = searchResults.group(3)!!.toInt()
+                val e = searchResults.group(4)!!.toInt()
+                return hunter(h, n, t, e)
+            }
+        } catch (e: Exception) {
+            logError(e)
+        }
+        return null
+    }
+
+    private fun duf(d: String, e: Int, f: Int = 10): Int {
+        val str = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ+/"
+        val g = str.toList()
+        val h = g.take(e)
+        val i = g.take(f)
+        val dList = d.reversed().toList()
+        var j = 0.0
+        for ((c, b) in dList.withIndex()) {
+            if (b in h) {
+                j += h.indexOf(b) * e.toDouble().pow(c)
+            }
+        }
+        var k = ""
+        while (j > 0) {
+            k = i[(j % f).toInt()] + k
+            j = (j - j % f) / f
+        }
+        return k.toIntOrNull() ?: 0
+    }
+
+    private fun hunter(h: String, n: String, t: Int, e: Int): String {
+        var result = ""
+        var i = 0
+        while (i < h.length) {
+            var j = 0
+            var s = ""
+            while (h[i] != n[e]) {
+                s += h[i]
+                i++
+            }
+            while (j < n.length) {
+                s = s.replace(n[j], j.digitToChar())
+                j++
+            }
+            result += (duf(s, e) - t).toChar()
+            i++
+        }
+        return result
+    }
+}
\ No newline at end of file

From b6b7cceea548ef8e05916be6ce4810c7bfa27846 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 23 Dec 2022 17:33:54 +0100
Subject: [PATCH 125/273] Changed SeekParameters to allow for faster seeking +
 fixed apk installer text

---
 .../java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt     | 2 ++
 .../com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 8f7e06f9..4772a7f1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -690,6 +690,8 @@ class CS3IPlayer : IPlayer {
                             maxVideoHeight
                         )
                     )
+                    // Allows any seeking to be +- 0.3s to allow for faster seeking
+                    .setSeekParameters(SeekParameters(300_000, 300_000))
                     .setLoadControl(
                         DefaultLoadControl.Builder()
                             .setTargetBufferBytes(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
index 65dd7885..f9ac3fee 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
@@ -137,7 +137,7 @@ class SettingsUpdates : PreferenceFragmentCompat() {
             activity?.showBottomDialog(
                 prefNames.toList(),
                 prefValues.indexOf(currentInstaller),
-                getString(R.string.app_layout),
+                getString(R.string.apk_installer_settings),
                 true,
                 {}) {
                 try {

From f3e7a5daa62f2743c2eeb109458b3de626b830b0 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Fri, 23 Dec 2022 20:50:05 +0100
Subject: [PATCH 126/273] Add categories to settings pages

---
 app/src/main/res/values/strings.xml       |  14 ++
 app/src/main/res/values/styles.xml        |   4 +-
 app/src/main/res/xml/settings_player.xml  | 254 ++++++++++++----------
 app/src/main/res/xml/settings_updates.xml | 123 ++++++-----
 app/src/main/res/xml/settins_general.xml  |  62 +++---
 app/src/main/res/xml/settins_ui.xml       | 104 +++++----
 6 files changed, 312 insertions(+), 249 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 64c99449..765553ae 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -242,6 +242,7 @@
     <string name="automatic_plugin_download_summary">Automatically install all not yet installed plugins from added repositories.</string>
     <string name="updates_settings">Show app updates</string>
     <string name="updates_settings_des">Automatically search for new updates on start</string>
+    <string name="redo_setup_process">Redo setup process</string>
     <string name="uprereleases_settings">Update to prereleases</string>
     <string name="uprereleases_settings_des">Search for prerelease updates instead of full releases only</string>
     <string name="apk_installer_settings">APK Installer</string>
@@ -389,6 +390,19 @@
         responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
         CloudStream 3 at your own risk.
     </string>
+    <string name="pref_category_links">Links</string>
+    <string name="pref_category_app_updates">App updates</string>
+    <string name="pref_category_backup">Backup</string>
+    <string name="pref_category_extensions">Extensions</string>
+    <string name="pref_category_actions">Actions</string>
+    <string name="pref_category_cache">Cache</string>
+    <string name="pref_category_gestures">Gestures</string>
+    <string name="pref_category_player_features">Player features</string>
+    <string name="pref_category_subtitles">Subtitles</string>
+    <string name="pref_category_player_layout">Layout</string>
+    <string name="pref_category_defaults">Defaults</string>
+    <string name="pref_category_looks">Looks</string>
+    <string name="pref_category_ui_features">Features</string>
     <string name="category_general">General</string>
     <string name="random_button_settings">Random Button</string>
     <string name="random_button_settings_desc">Show random button on Homepage</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 12da27de..6926bb47 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -158,7 +158,7 @@
         <item name="colorAccent">@color/material_dynamic_primary80</item>
         <item name="colorOnPrimary">@color/material_dynamic_primary20</item>
         <!-- Needed for leanback fuckery -->
-        <item name="android:colorAccent">@color/material_dynamic_primary30</item>
+        <item name="android:colorAccent">@color/material_dynamic_primary80</item>
     </style>
 
     <style name="OverlayPrimaryColorMonetTwo">
@@ -168,7 +168,7 @@
         <item name="colorAccent">@color/material_dynamic_secondary80</item>
         <item name="colorOnPrimary">@color/material_dynamic_secondary20</item>
         <!-- Needed for leanback fuckery -->
-        <item name="android:colorAccent">@color/material_dynamic_secondary30</item>
+        <item name="android:colorAccent">@color/material_dynamic_secondary80</item>
     </style>
 
     <style name="OverlayPrimaryColorBlue">
diff --git a/app/src/main/res/xml/settings_player.xml b/app/src/main/res/xml/settings_player.xml
index 0be6313f..d9b7e247 100644
--- a/app/src/main/res/xml/settings_player.xml
+++ b/app/src/main/res/xml/settings_player.xml
@@ -1,104 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Preference
-        android:icon="@drawable/ic_outline_subtitles_24"
-        android:key="@string/subtitle_settings_key"
-        android:title="@string/player_subtitles_settings"
-        app:summary="@string/player_subtitles_settings_des" />
-    <Preference
-        android:icon="@drawable/ic_outline_subtitles_24"
-        android:key="@string/subtitle_settings_chromecast_key"
-        android:title="@string/chromecast_subtitles_settings"
-        app:summary="@string/chromecast_subtitles_settings_des" />
-
-
-    <Preference
-        android:icon="@drawable/ic_baseline_hd_24"
-        android:key="@string/quality_pref_key"
-        android:title="@string/watch_quality_pref" />
-
-    <Preference
-        android:icon="@drawable/netflix_play"
-        android:key="@string/player_pref_key"
-        android:title="@string/player_pref" />
-
-    <Preference
-        android:icon="@drawable/ic_baseline_text_format_24"
-        android:key="@string/prefer_limit_title_key"
-        android:title="@string/limit_title" />
-
-    <Preference
-        android:icon="@drawable/ic_baseline_text_format_24"
-        android:key="@string/prefer_limit_title_rez_key"
-        android:title="@string/limit_title_rez" />
-
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_picture_in_picture_alt_24"
-        android:summary="@string/picture_in_picture_des"
-        android:title="@string/picture_in_picture"
-        app:defaultValue="true"
-        app:key="@string/pip_enabled_key" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_aspect_ratio_24"
-        android:summary="@string/player_size_settings_des"
-        android:title="@string/player_size_settings"
-        app:defaultValue="true"
-        app:key="@string/player_resize_enabled_key" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_speed_24"
-        android:summary="@string/eigengraumode_settings_des"
-        android:title="@string/eigengraumode_settings"
-        app:defaultValue="false"
-        app:key="@string/playback_speed_enabled_key" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_ondemand_video_24"
-        android:summary="@string/swipe_to_seek_settings_des"
-        android:title="@string/swipe_to_seek_settings"
-        app:defaultValue="true"
-        app:key="@string/swipe_enabled_key" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_ondemand_video_24"
-        android:summary="@string/swipe_to_change_settings_des"
-        android:title="@string/swipe_to_change_settings"
-        app:defaultValue="true"
-        app:key="@string/swipe_vertical_enabled_key" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_skip_next_24"
-        android:summary="@string/autoplay_next_settings_des"
-        android:title="@string/autoplay_next_settings"
-        app:defaultValue="true"
-        app:key="@string/autoplay_next_key" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_skip_next_24"
-        android:title="@string/video_skip_op"
-        app:defaultValue="true"
-        android:summary="@string/enable_skip_op_from_database_des"
-        app:key="@string/enable_skip_op_from_database" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_touch_app_24"
-        android:summary="@string/double_tap_to_seek_settings_des"
-        android:title="@string/double_tap_to_seek_settings"
-        app:defaultValue="false"
-        app:key="@string/double_tap_enabled_key" />
-    <SwitchPreference
-        android:icon="@drawable/netflix_pause"
-        android:summary="@string/double_tap_to_pause_settings_des"
-        android:title="@string/double_tap_to_pause_settings"
-        app:defaultValue="false"
-        app:key="@string/double_tap_pause_enabled_key" />
-
-    <SeekBarPreference
-        android:defaultValue="10"
-        android:max="60"
-        android:title="@string/double_tap_to_seek_amount_settings"
-        app:adjustable="true"
-        app:defaultValue="10"
-        app:icon="@drawable/go_forward_30"
-        app:key="@string/double_tap_seek_time_key"
-        app:min="5"
-        app:seekBarIncrement="5"
-        app:showSeekBarValue="true" />
 
     <SwitchPreference
         android:icon="@drawable/baseline_sync_24"
@@ -107,26 +9,144 @@
         app:defaultValue="true"
         app:key="@string/episode_sync_enabled_key" />
 
-    <Preference
-        android:icon="@drawable/ic_baseline_storage_24"
-        android:key="@string/video_buffer_disk_key"
-        android:summary="@string/video_disk_description"
-        android:title="@string/video_buffer_disk_settings" />
+    <PreferenceCategory
+        android:title="@string/pref_category_defaults">
+        <Preference
+            android:icon="@drawable/ic_baseline_hd_24"
+            android:key="@string/quality_pref_key"
+            android:title="@string/watch_quality_pref" />
 
-    <Preference
-        android:icon="@drawable/ic_baseline_storage_24"
-        android:key="@string/video_buffer_size_key"
-        android:summary="@string/video_ram_description"
-        android:title="@string/video_buffer_size_settings" />
+        <Preference
+            android:icon="@drawable/netflix_play"
+            android:key="@string/player_pref_key"
+            android:title="@string/player_pref" />
+    </PreferenceCategory>
 
-    <Preference
-        android:icon="@drawable/ic_baseline_storage_24"
-        android:key="@string/video_buffer_length_key"
-        android:summary="@string/video_ram_description"
-        android:title="@string/video_buffer_length_settings" />
+    <PreferenceCategory
+        android:title="@string/pref_category_player_layout">
+        <Preference
+            android:icon="@drawable/ic_baseline_text_format_24"
+            android:key="@string/prefer_limit_title_key"
+            android:title="@string/limit_title" />
 
-    <Preference
-        android:icon="@drawable/ic_baseline_delete_outline_24"
-        android:key="@string/video_buffer_clear_key"
-        android:title="@string/video_buffer_clear_settings" />
+        <Preference
+            android:icon="@drawable/ic_baseline_text_format_24"
+            android:key="@string/prefer_limit_title_rez_key"
+            android:title="@string/limit_title_rez" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_category_subtitles">
+        <Preference
+            android:icon="@drawable/ic_outline_subtitles_24"
+            android:key="@string/subtitle_settings_key"
+            android:title="@string/player_subtitles_settings"
+            app:summary="@string/player_subtitles_settings_des" />
+        <Preference
+            android:icon="@drawable/ic_outline_subtitles_24"
+            android:key="@string/subtitle_settings_chromecast_key"
+            android:title="@string/chromecast_subtitles_settings"
+            app:summary="@string/chromecast_subtitles_settings_des" />
+    </PreferenceCategory>
+
+
+    <PreferenceCategory
+        android:title="@string/pref_category_player_features">
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_picture_in_picture_alt_24"
+            android:summary="@string/picture_in_picture_des"
+            android:title="@string/picture_in_picture"
+            app:defaultValue="true"
+            app:key="@string/pip_enabled_key" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_aspect_ratio_24"
+            android:summary="@string/player_size_settings_des"
+            android:title="@string/player_size_settings"
+            app:defaultValue="true"
+            app:key="@string/player_resize_enabled_key" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_speed_24"
+            android:summary="@string/eigengraumode_settings_des"
+            android:title="@string/eigengraumode_settings"
+            app:defaultValue="false"
+            app:key="@string/playback_speed_enabled_key" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_skip_next_24"
+            android:summary="@string/autoplay_next_settings_des"
+            android:title="@string/autoplay_next_settings"
+            app:defaultValue="true"
+            app:key="@string/autoplay_next_key" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_skip_next_24"
+            android:title="@string/video_skip_op"
+            app:defaultValue="true"
+            android:summary="@string/enable_skip_op_from_database_des"
+            app:key="@string/enable_skip_op_from_database" />
+    </PreferenceCategory>
+    
+    <PreferenceCategory
+        android:title="@string/pref_category_gestures">
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_ondemand_video_24"
+            android:summary="@string/swipe_to_seek_settings_des"
+            android:title="@string/swipe_to_seek_settings"
+            app:defaultValue="true"
+            app:key="@string/swipe_enabled_key" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_ondemand_video_24"
+            android:summary="@string/swipe_to_change_settings_des"
+            android:title="@string/swipe_to_change_settings"
+            app:defaultValue="true"
+            app:key="@string/swipe_vertical_enabled_key" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_touch_app_24"
+            android:summary="@string/double_tap_to_seek_settings_des"
+            android:title="@string/double_tap_to_seek_settings"
+            app:defaultValue="false"
+            app:key="@string/double_tap_enabled_key" />
+        <SwitchPreference
+            android:icon="@drawable/netflix_pause"
+            android:summary="@string/double_tap_to_pause_settings_des"
+            android:title="@string/double_tap_to_pause_settings"
+            app:defaultValue="false"
+            app:key="@string/double_tap_pause_enabled_key" />
+
+        <SeekBarPreference
+            android:defaultValue="10"
+            android:max="60"
+            android:title="@string/double_tap_to_seek_amount_settings"
+            app:adjustable="true"
+            app:defaultValue="10"
+            app:icon="@drawable/go_forward_30"
+            app:key="@string/double_tap_seek_time_key"
+            app:min="5"
+            app:seekBarIncrement="5"
+            app:showSeekBarValue="true" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_category_cache">
+        <Preference
+            android:icon="@drawable/ic_baseline_storage_24"
+            android:key="@string/video_buffer_disk_key"
+            android:summary="@string/video_disk_description"
+            android:title="@string/video_buffer_disk_settings" />
+
+        <Preference
+            android:icon="@drawable/ic_baseline_storage_24"
+            android:key="@string/video_buffer_size_key"
+            android:summary="@string/video_ram_description"
+            android:title="@string/video_buffer_size_settings" />
+
+        <Preference
+            android:icon="@drawable/ic_baseline_storage_24"
+            android:key="@string/video_buffer_length_key"
+            android:summary="@string/video_ram_description"
+            android:title="@string/video_buffer_length_settings" />
+
+        <Preference
+            android:icon="@drawable/ic_baseline_delete_outline_24"
+            android:key="@string/video_buffer_clear_key"
+            android:title="@string/video_buffer_clear_settings" />
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings_updates.xml b/app/src/main/res/xml/settings_updates.xml
index 6434a7ef..ba098c8c 100644
--- a/app/src/main/res/xml/settings_updates.xml
+++ b/app/src/main/res/xml/settings_updates.xml
@@ -1,39 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Preference
-        android:title="@string/check_for_update"
-        app:icon="@drawable/ic_baseline_system_update_24"
-        app:key="@string/manual_check_update_key"
-        app:summary="@string/app_version" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_developer_mode_24"
-        android:summary="@string/uprereleases_settings_des"
-        android:title="@string/uprereleases_settings"
-        app:defaultValue="@bool/is_prerelease"
-        app:key="@string/prerelease_update_key" />
-
-    <Preference
-        android:icon="@drawable/netflix_download"
-        android:key="@string/apk_installer_key"
-        android:title="@string/apk_installer_settings"
-        android:summary="@string/apk_installer_settings_des"
-        />
-
-    <Preference
-        android:icon="@drawable/baseline_save_as_24"
-        android:key="@string/backup_key"
-        android:title="@string/backup_settings" />
-
-    <Preference
-        android:icon="@drawable/baseline_restore_page_24"
-        android:key="@string/restore_key"
-        android:title="@string/restore_settings" />
-
-    <Preference
-        android:icon="@drawable/baseline_description_24"
-        android:key="@string/show_logcat_key"
-        android:title="@string/show_log_cat" />
     <SwitchPreference
         android:defaultValue="false"
         android:icon="@drawable/ic_baseline_bug_report_24"
@@ -41,25 +8,73 @@
         android:summaryOff="@string/bug_report_settings_off"
         android:summaryOn="@string/bug_report_settings_on"
         android:title="@string/pref_disable_acra" />
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@drawable/ic_baseline_extension_24"
-        android:key="@string/auto_update_plugins_key"
-        android:title="@string/automatic_plugin_updates" />
-    <SwitchPreference
-        android:defaultValue="false"
-        android:icon="@drawable/ic_baseline_extension_24"
-        android:key="@string/auto_download_plugins_key"
-        android:title="@string/automatic_plugin_download"
-        android:summary="@string/automatic_plugin_download_summary" />
-    <SwitchPreference
-        android:icon="@drawable/ic_baseline_notifications_active_24"
-        android:summary="@string/updates_settings_des"
-        android:title="@string/updates_settings"
-        app:defaultValue="true"
-        app:key="@string/auto_update_key" />
-    <Preference
-        android:icon="@drawable/ic_baseline_construction_24"
-        android:title="Redo setup process"
-        app:key="@string/redo_setup_key" />
+
+    <PreferenceCategory 
+        android:title="@string/pref_category_app_updates">
+        <Preference
+            android:title="@string/check_for_update"
+            app:icon="@drawable/ic_baseline_system_update_24"
+            app:key="@string/manual_check_update_key"
+            app:summary="@string/app_version" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_developer_mode_24"
+            android:summary="@string/uprereleases_settings_des"
+            android:title="@string/uprereleases_settings"
+            app:defaultValue="@bool/is_prerelease"
+            app:key="@string/prerelease_update_key" />
+
+        <Preference
+            android:icon="@drawable/netflix_download"
+            android:key="@string/apk_installer_key"
+            android:title="@string/apk_installer_settings"
+            android:summary="@string/apk_installer_settings_des"
+            />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_notifications_active_24"
+            android:summary="@string/updates_settings_des"
+            android:title="@string/updates_settings"
+            app:defaultValue="true"
+            app:key="@string/auto_update_key" />
+    </PreferenceCategory>
+
+    <PreferenceCategory 
+        android:title="@string/pref_category_backup">
+        <Preference
+            android:icon="@drawable/baseline_save_as_24"
+            android:key="@string/backup_key"
+            android:title="@string/backup_settings" />
+
+        <Preference
+            android:icon="@drawable/baseline_restore_page_24"
+            android:key="@string/restore_key"
+            android:title="@string/restore_settings" />
+    </PreferenceCategory>
+
+    <PreferenceCategory 
+        android:title="@string/pref_category_extensions">
+        <SwitchPreference
+            android:defaultValue="true"
+            android:icon="@drawable/ic_baseline_extension_24"
+            android:key="@string/auto_update_plugins_key"
+            android:title="@string/automatic_plugin_updates" />
+        
+        <SwitchPreference
+            android:defaultValue="false"
+            android:icon="@drawable/ic_baseline_extension_24"
+            android:key="@string/auto_download_plugins_key"
+            android:title="@string/automatic_plugin_download"
+            android:summary="@string/automatic_plugin_download_summary" />
+    </PreferenceCategory>
+
+    <PreferenceCategory 
+        android:title="@string/pref_category_actions">
+        <Preference
+            android:icon="@drawable/baseline_description_24"
+            android:key="@string/show_logcat_key"
+            android:title="@string/show_log_cat" />
+        <Preference
+            android:icon="@drawable/ic_baseline_construction_24"
+            android:title="@string/redo_setup_process"
+            app:key="@string/redo_setup_key" />
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settins_general.xml b/app/src/main/res/xml/settins_general.xml
index ae87c611..726f3fd0 100644
--- a/app/src/main/res/xml/settins_general.xml
+++ b/app/src/main/res/xml/settins_general.xml
@@ -29,33 +29,39 @@
             android:icon="@drawable/ic_baseline_warning_24" />
 
     <Preference
-            android:title="@string/github"
-            android:icon="@drawable/ic_github_logo"
-            app:summary="https://github.com/recloudstream/cloudstream">
-        <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://github.com/recloudstream/cloudstream" />
-    </Preference>
+        android:key="@string/benene_count"
+        android:title="@string/benene"
+        android:icon="@drawable/benene"
+        app:summary="@string/benene_des" />
 
-    <Preference
-            android:title="@string/lightnovel"
-            android:icon="@drawable/quick_novel_icon"
-            app:summary="https://github.com/LagradOst/QuickNovel">
-        <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://github.com/LagradOst/QuickNovel" />
-    </Preference>
-    <Preference
-            android:title="@string/discord"
-            android:icon="@drawable/ic_baseline_discord_24"
-            app:summary="https://discord.gg/5Hus6fM">
-        <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://discord.gg/5Hus6fM" />
-    </Preference>
-    <Preference
-            android:key="@string/benene_count"
-            android:title="@string/benene"
-            android:icon="@drawable/benene"
-            app:summary="@string/benene_des" />
+    <PreferenceCategory
+            android:title="@string/pref_category_links">
+
+        <Preference
+                android:title="@string/github"
+                android:icon="@drawable/ic_github_logo"
+                app:summary="https://github.com/recloudstream/cloudstream">
+            <intent
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://github.com/recloudstream/cloudstream" />
+        </Preference>
+
+        <Preference
+                android:title="@string/lightnovel"
+                android:icon="@drawable/quick_novel_icon"
+                app:summary="https://github.com/LagradOst/QuickNovel">
+            <intent
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://github.com/LagradOst/QuickNovel" />
+        </Preference>
+        <Preference
+                android:title="@string/discord"
+                android:icon="@drawable/ic_baseline_discord_24"
+                app:summary="https://discord.gg/5Hus6fM">
+            <intent
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://discord.gg/5Hus6fM" />
+        </Preference>
+    
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settins_ui.xml b/app/src/main/res/xml/settins_ui.xml
index 071df918..0d9115a1 100644
--- a/app/src/main/res/xml/settins_ui.xml
+++ b/app/src/main/res/xml/settins_ui.xml
@@ -1,57 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Preference
-            android:icon="@drawable/ic_baseline_color_lens_24"
-            android:key="@string/primary_color_key"
-            android:title="@string/primary_color_settings" />
-    <Preference
-            android:icon="@drawable/ic_baseline_color_lens_24"
-            android:key="@string/app_theme_key"
-            android:title="@string/app_theme_settings" />
-    <Preference
-            android:icon="@drawable/ic_baseline_tv_24"
-            android:key="@string/app_layout_key"
-            android:title="@string/app_layout" />
-    <Preference
-            android:icon="@drawable/ic_baseline_tv_24"
-            android:key="@string/poster_ui_key"
-            android:title="@string/poster_ui_settings" />
-    <SwitchPreference
-            android:icon="@drawable/search_icon"
-            app:key="advanced_search"
-            android:title="@string/advanced_search"
-            android:summary="@string/advanced_search_des"
-            app:defaultValue="true" />
-    <SwitchPreference
+
+    <PreferenceCategory
+        android:title="@string/pref_category_looks">
+        <Preference
+                android:icon="@drawable/ic_baseline_color_lens_24"
+                android:key="@string/primary_color_key"
+                android:title="@string/primary_color_settings" />
+        <Preference
+                android:icon="@drawable/ic_baseline_color_lens_24"
+                android:key="@string/app_theme_key"
+                android:title="@string/app_theme_settings" />
+        <Preference
+                android:icon="@drawable/ic_baseline_tv_24"
+                android:key="@string/app_layout_key"
+                android:title="@string/app_layout" />
+        <SwitchPreference
             android:defaultValue="true"
             android:icon="@drawable/baseline_grid_view_24"
             android:key="@string/bottom_title_key"
             android:summary="@string/bottom_title_settings_des"
             android:title="@string/bottom_title_settings" />
-    <SwitchPreference
-            android:key="@string/show_trailers_key"
-            android:icon="@drawable/baseline_theaters_24"
-            android:title="@string/show_trailers_settings"
-            android:defaultValue="true" />
-    <SwitchPreference
-            android:key="@string/show_kitsu_posters_key"
-            android:icon="@drawable/kitsu_icon"
-            android:title="@string/kitsu_settings"
-            android:defaultValue="true" />
-    <SwitchPreference
-            android:key="@string/show_fillers_key"
-            android:icon="@drawable/ic_baseline_skip_next_24"
-            android:title="@string/show_fillers_settings"
-            android:defaultValue="false" />
-    <SwitchPreference
-            android:icon="@drawable/ic_baseline_play_arrow_24"
-            app:key="@string/random_button_key"
-            android:title="@string/random_button_settings"
-            android:summary="@string/random_button_settings_desc"
-            app:defaultValue="false" />
-    <Preference
-        android:icon="@drawable/ic_baseline_filter_list_24"
-        android:key="@string/pref_filter_search_quality_key"
-        android:title="@string/pref_filter_search_quality" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_category_ui_features">
+        <Preference
+                android:icon="@drawable/ic_baseline_tv_24"
+                android:key="@string/poster_ui_key"
+                android:title="@string/poster_ui_settings" />
+        <SwitchPreference
+                android:icon="@drawable/search_icon"
+                app:key="advanced_search"
+                android:title="@string/advanced_search"
+                android:summary="@string/advanced_search_des"
+                app:defaultValue="true" />
+        <SwitchPreference
+                android:key="@string/show_trailers_key"
+                android:icon="@drawable/baseline_theaters_24"
+                android:title="@string/show_trailers_settings"
+                android:defaultValue="true" />
+        <SwitchPreference
+                android:key="@string/show_kitsu_posters_key"
+                android:icon="@drawable/kitsu_icon"
+                android:title="@string/kitsu_settings"
+                android:defaultValue="true" />
+        <SwitchPreference
+                android:key="@string/show_fillers_key"
+                android:icon="@drawable/ic_baseline_skip_next_24"
+                android:title="@string/show_fillers_settings"
+                android:defaultValue="false" />
+        <SwitchPreference
+                android:icon="@drawable/ic_baseline_play_arrow_24"
+                app:key="@string/random_button_key"
+                android:title="@string/random_button_settings"
+                android:summary="@string/random_button_settings_desc"
+                app:defaultValue="false" />
+        <Preference
+            android:icon="@drawable/ic_baseline_filter_list_24"
+            android:key="@string/pref_filter_search_quality_key"
+            android:title="@string/pref_filter_search_quality" />
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file

From 5953420774a38ba1ebff41f78141427259264421 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 23 Dec 2022 20:54:21 +0100
Subject: [PATCH 127/273] Translated using Weblate (Polish)

Currently translated at 100.0% (562 of 562 strings)

Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translation: Cloudstream/App
---
 app/src/main/res/values-pl/strings.xml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5e7b0b27..56266dac 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -135,7 +135,7 @@
     <string name="restore_success">Wczytano plik kopii zapasowej</string>
     <string name="restore_failed_format" formatted="true">Nie udało się przywrócić danych z pliku %s</string>
     <string name="backup_success">Dane zapisane z powodzeniem</string>
-    <string name="backup_failed">Brak uprawnień do pamięci, spróbuj ponownie</string>
+    <string name="backup_failed">Brak uprawnień do pamięci, spróbuj ponownie.</string>
     <string name="backup_failed_error_format">Błąd tworzenia kopii zapasowej %s</string>
     <string name="search">Szukaj</string>
     <string name="category_account">Konta</string>
@@ -259,7 +259,7 @@
     <string name="video_buffer_disk_settings">Pamięć podręczna wideo na dysku</string>
     <string name="video_buffer_clear_settings">Wyczyść pamięć podręczną wideo i obrazów</string>
     <string name="video_ram_description">Ustawienie zbyt wysokiej wartości może powodować problemy w systemach z małą ilością pamięci RAM, takich jak urządzenia Android TV lub stare telefony.</string>
-    <string name="video_disk_description">Zbyt wysokie ustawienie może powodować problemy w systemach z małą ilością miejsca w pamięci, takich jak urządzenia Android TV</string>
+    <string name="video_disk_description">Zbyt wysokie ustawienie może powodować problemy w systemach z małą ilością miejsca w pamięci, takich jak urządzenia Android TV.</string>
     <string name="dns_pref">DNS przez HTTPS</string>
     <string name="dns_pref_summary">Przydatne w pomijaniu blokad dostawców internetu</string>
     <string name="add_site_pref">Sklonuj stronę</string>
@@ -470,4 +470,18 @@
     <string name="skip_type_intro">Intro</string>
     <string name="skip_type_mixed_ed">Mixed ending</string>
     <string name="enable_skip_op_from_database_des">Pokaż wyskakujące okienka pomijania dla niektórych segmentów</string>
+    <string name="pref_category_extensions">Dodatki</string>
+    <string name="pref_category_actions">Działania</string>
+    <string name="pref_category_cache">Pamięć podręczna</string>
+    <string name="redo_setup_process">Powtórz proces konfiguracji</string>
+    <string name="pref_category_links">Linki</string>
+    <string name="pref_category_app_updates">Aktualizacje aplikacji</string>
+    <string name="pref_category_backup">Kopia zapasowa</string>
+    <string name="pref_category_subtitles">Napisy</string>
+    <string name="pref_category_gestures">Gesty</string>
+    <string name="pref_category_player_features">Funkcje odtwarzacza</string>
+    <string name="pref_category_ui_features">Funkcje</string>
+    <string name="pref_category_defaults">Ustawienia domyślne</string>
+    <string name="pref_category_player_layout">Układ</string>
+    <string name="pref_category_looks">Wygląd</string>
 </resources>
\ No newline at end of file

From 5b26c998b43616e45bdecf48205d2f7f0bffb7c7 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 23 Dec 2022 22:53:51 +0100
Subject: [PATCH 128/273] Added trailers and poster to TV

---
 .../com/lagradost/cloudstream3/MainAPI.kt     |   1 -
 .../ui/player/ExtractorLinkGenerator.kt       |  52 +++++++
 .../cloudstream3/ui/result/ResultFragment.kt  |   2 +
 .../ui/result/ResultFragmentTv.kt             |  34 ++--
 .../main/res/layout/fragment_result_tv.xml    | 145 ++++++++++++------
 app/src/main/res/values/strings.xml           |   1 +
 6 files changed, 176 insertions(+), 59 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 1bcdf422..6565b144 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -237,7 +237,6 @@ object APIHolder {
     }
 
     private fun Context.getHasTrailers(): Boolean {
-        if (isTvSettings()) return false
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
         return settingsManager.getBoolean(this.getString(R.string.show_trailers_key), true)
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt
new file mode 100644
index 00000000..7c19e97d
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt
@@ -0,0 +1,52 @@
+package com.lagradost.cloudstream3.ui.player
+
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorUri
+
+class ExtractorLinkGenerator(
+    private val links: List<ExtractorLink>,
+    private val subtitles: List<SubtitleData>,
+) : IGenerator {
+    override val hasCache = false
+
+    override fun getCurrentId(): Int? {
+        return null
+    }
+
+    override fun hasNext(): Boolean {
+        return false
+    }
+
+    override fun getAll(): List<Any>? {
+        return null
+    }
+
+    override fun hasPrev(): Boolean {
+        return false
+    }
+
+    override fun getCurrent(offset: Int): Any? {
+        return null
+    }
+
+    override fun goto(index: Int) {}
+
+    override fun next() {}
+
+    override fun prev() {}
+
+    override suspend fun generateLinks(
+        clearCache: Boolean,
+        isCasting: Boolean,
+        callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
+        subtitleCallback: (SubtitleData) -> Unit,
+        offset: Int
+    ): Boolean {
+        subtitles.forEach(subtitleCallback)
+        links.forEach {
+            callback.invoke(it to null)
+        }
+
+        return true
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 30ea889e..3efaeff8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -83,6 +83,8 @@ import kotlinx.android.synthetic.main.fragment_result.result_next_airing
 import kotlinx.android.synthetic.main.fragment_result.result_next_airing_time
 import kotlinx.android.synthetic.main.fragment_result.result_no_episodes
 import kotlinx.android.synthetic.main.fragment_result.result_play_movie
+import kotlinx.android.synthetic.main.fragment_result.result_poster
+import kotlinx.android.synthetic.main.fragment_result.result_poster_holder
 import kotlinx.android.synthetic.main.fragment_result.result_reload_connection_open_in_browser
 import kotlinx.android.synthetic.main.fragment_result.result_reload_connectionerror
 import kotlinx.android.synthetic.main.fragment_result.result_resume_parent
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
index 0e3ee53e..d5cab1a6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
@@ -3,30 +3,28 @@ package com.lagradost.cloudstream3.ui.result
 import android.app.Dialog
 import android.os.Bundle
 import android.view.View
-import android.widget.LinearLayout
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.lagradost.cloudstream3.APIHolder.updateHasTrailers
 import com.lagradost.cloudstream3.DubStatus
+import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.mvvm.ResourceSome
 import com.lagradost.cloudstream3.mvvm.Some
 import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.ui.player.ExtractorLinkGenerator
+import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
-import com.lagradost.cloudstream3.utils.AppUtils.setMaxViewPoolSize
+import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_result.*
 import kotlinx.android.synthetic.main.fragment_result_tv.*
-import kotlinx.android.synthetic.main.fragment_result_tv.result_episodes
-import kotlinx.android.synthetic.main.fragment_result_tv.result_episodes_text
-import kotlinx.android.synthetic.main.fragment_result_tv.result_play_movie
-import kotlinx.android.synthetic.main.fragment_result_tv.result_root
 
 class ResultFragmentTv : ResultFragment() {
     override val resultLayout = R.layout.fragment_result_tv
@@ -85,6 +83,24 @@ class ResultFragmentTv : ResultFragment() {
         }
     }
 
+    override fun setTrailers(trailers: List<ExtractorLink>?) {
+        context?.updateHasTrailers()
+        if (!LoadResponse.isTrailersEnabled) return
+
+        result_play_trailer?.isGone = trailers.isNullOrEmpty()
+        result_play_trailer?.setOnClickListener {
+            if (trailers.isNullOrEmpty()) return@setOnClickListener
+            activity.navigate(
+                R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
+                    ExtractorLinkGenerator(
+                        trailers,
+                        emptyList()
+                    )
+                )
+            )
+        }
+    }
+
     override fun setRecommendations(rec: List<SearchResponse>?, validApiName: String?) {
         currentRecommendations = rec ?: emptyList()
         val isInvalid = rec.isNullOrEmpty()
@@ -110,7 +126,7 @@ class ResultFragmentTv : ResultFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         result_episodes?.layoutManager =
-            //LinearListLayout(result_episodes ?: return, result_episodes?.context).apply {
+                //LinearListLayout(result_episodes ?: return, result_episodes?.context).apply {
             LinearListLayout(result_episodes?.context).apply {
                 setHorizontal()
             }
diff --git a/app/src/main/res/layout/fragment_result_tv.xml b/app/src/main/res/layout/fragment_result_tv.xml
index 15e25b51..f6786196 100644
--- a/app/src/main/res/layout/fragment_result_tv.xml
+++ b/app/src/main/res/layout/fragment_result_tv.xml
@@ -227,61 +227,91 @@
                                     tools:text="The Perfect Run The Perfect Run" />
                             </LinearLayout>
 
-
-                            <com.lagradost.cloudstream3.widget.FlowLayout
+                            <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                app:itemSpacing="10dp">
+                                android:orientation="horizontal">
 
-                                <com.google.android.material.button.MaterialButton
-                                    android:id="@+id/result_meta_site"
-                                    style="@style/SmallBlackButton"
-                                    android:layout_gravity="center_vertical"
-                                    tools:text="Gogoanime" />
+                                <androidx.cardview.widget.CardView
+                                    android:id="@+id/result_poster_holder"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginEnd="10dp"
+                                    app:cardCornerRadius="@dimen/rounded_image_radius">
 
-                                <TextView
-                                    android:id="@+id/result_meta_type"
-                                    style="@style/ResultInfoText"
-                                    tools:text="Movie" />
+                                    <ImageView
+                                        android:id="@+id/result_poster"
+                                        android:layout_width="100dp"
+                                        android:layout_height="140dp"
+                                        android:layout_gravity="bottom"
+                                        android:contentDescription="@string/result_poster_img_des"
+                                        android:foreground="@drawable/outline_drawable"
+                                        android:scaleType="centerCrop"
+                                        tools:src="@drawable/example_poster" />
+                                </androidx.cardview.widget.CardView>
 
-                                <TextView
-                                    android:id="@+id/result_meta_year"
-                                    style="@style/ResultInfoText"
-                                    tools:text="2022" />
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:orientation="vertical">
 
-                                <TextView
-                                    android:id="@+id/result_meta_rating"
-                                    style="@style/ResultInfoText"
-                                    tools:text="Rated: 8.5/10.0" />
+                                    <com.lagradost.cloudstream3.widget.FlowLayout
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        app:itemSpacing="10dp">
 
-                                <TextView
-                                    android:id="@+id/result_meta_status"
-                                    style="@style/ResultInfoText"
-                                    tools:text="Ongoing" />
+                                        <com.google.android.material.button.MaterialButton
+                                            android:id="@+id/result_meta_site"
+                                            style="@style/SmallBlackButton"
+                                            android:layout_gravity="center_vertical"
+                                            tools:text="Gogoanime" />
+
+                                        <TextView
+                                            android:id="@+id/result_meta_type"
+                                            style="@style/ResultInfoText"
+                                            tools:text="Movie" />
+
+                                        <TextView
+                                            android:id="@+id/result_meta_year"
+                                            style="@style/ResultInfoText"
+                                            tools:text="2022" />
+
+                                        <TextView
+                                            android:id="@+id/result_meta_rating"
+                                            style="@style/ResultInfoText"
+                                            tools:text="Rated: 8.5/10.0" />
+
+                                        <TextView
+                                            android:id="@+id/result_meta_status"
+                                            style="@style/ResultInfoText"
+                                            tools:text="Ongoing" />
+
+                                        <TextView
+                                            android:id="@+id/result_meta_duration"
+                                            style="@style/ResultInfoText"
+                                            tools:text="121min" />
+                                    </com.lagradost.cloudstream3.widget.FlowLayout>
+                                    <!--
+                                    This has half margin and half padding to make TV focus on description look better.
+                                    The focus outline now settles between the poster and text.
+                                    -->
+                                    <TextView
+                                        android:id="@+id/result_description"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:ellipsize="end"
+                                        android:foreground="@drawable/outline_drawable"
+                                        android:maxLength="1000"
+                                        android:nextFocusUp="@id/result_back"
+                                        android:nextFocusDown="@id/result_play_movie"
+                                        android:padding="5dp"
+                                        android:textColor="?attr/textColor"
+                                        android:textSize="15sp"
+                                        tools:text="Ryan Quicksave Romano is an eccentric adventurer with a strange power: he can create a save-point in time and redo his life whenever he dies. Arriving in New Rome, the glitzy capital of sin of a rebuilding Europe, he finds the city torn between mega-corporations, sponsored heroes, superpowered criminals, and true monsters. It's a time of chaos, where potions can grant the power to rule the world and dangers lurk everywhere. " />
+                                </LinearLayout>
+                            </LinearLayout>
 
-                                <TextView
-                                    android:id="@+id/result_meta_duration"
-                                    style="@style/ResultInfoText"
-                                    tools:text="121min" />
-                            </com.lagradost.cloudstream3.widget.FlowLayout>
 
-                            <!--
-                            This has half margin and half padding to make TV focus on description look better.
-                            The focus outline now settles between the poster and text.
-                            -->
-                            <TextView
-                                android:id="@+id/result_description"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:ellipsize="end"
-                                android:foreground="@drawable/outline_drawable"
-                                android:maxLength="1000"
-                                android:nextFocusUp="@id/result_back"
-                                android:nextFocusDown="@id/result_play_movie"
-                                android:padding="5dp"
-                                android:textColor="?attr/textColor"
-                                android:textSize="15sp"
-                                tools:text="Ryan Quicksave Romano is an eccentric adventurer with a strange power: he can create a save-point in time and redo his life whenever he dies. Arriving in New Rome, the glitzy capital of sin of a rebuilding Europe, he finds the city torn between mega-corporations, sponsored heroes, superpowered criminals, and true monsters. It's a time of chaos, where potions can grant the power to rule the world and dangers lurk everywhere. " />
                         </LinearLayout>
                     </LinearLayout>
 
@@ -354,7 +384,7 @@
                         android:visibility="gone" />
 
 
-                  <com.google.android.material.chip.ChipGroup
+                    <com.google.android.material.chip.ChipGroup
                         android:id="@+id/result_tag"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
@@ -392,6 +422,7 @@
 
 
                         <LinearLayout
+                            android:animateLayoutChanges="true"
                             android:id="@+id/result_movie_parent"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -409,7 +440,7 @@
                                 android:layout_marginBottom="10dp"
                                 android:layout_weight="1"
                                 android:minWidth="250dp"
-                                android:nextFocusRight="@id/result_download_movie"
+                                android:nextFocusRight="@id/result_play_trailer"
                                 android:nextFocusUp="@id/result_cast_items"
                                 android:nextFocusDown="@id/result_resume_series_button_play"
                                 android:text="@string/play_movie_button"
@@ -418,6 +449,22 @@
 
                             </com.google.android.material.button.MaterialButton>
 
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/result_play_trailer"
+                                style="@style/WhiteButton"
+                                android:layout_width="wrap_content"
+                                android:layout_marginStart="0dp"
+                                android:layout_marginEnd="5dp"
+                                android:layout_marginBottom="10dp"
+                                android:layout_weight="1"
+                                android:minWidth="250dp"
+                                android:nextFocusUp="@id/result_cast_items"
+                                android:nextFocusDown="@id/result_resume_series_button_play"
+                                android:text="@string/play_trailer_button"
+                                android:visibility="gone"
+                                app:icon="@drawable/ic_baseline_play_arrow_24">
+
+                            </com.google.android.material.button.MaterialButton>
 
                             <FrameLayout
                                 android:id="@+id/result_movie_progress_downloaded_holder"
@@ -440,7 +487,7 @@
                                     android:layout_marginEnd="0dp"
                                     android:clickable="true"
                                     android:focusable="true"
-                                    android:nextFocusLeft="@id/result_play_movie"
+                                    android:nextFocusLeft="@id/result_play_trailer"
                                     android:nextFocusUp="@id/result_cast_items"
                                     android:nextFocusDown="@id/result_resume_series_button_play"
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 64c99449..d1b2ff9f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -119,6 +119,7 @@
     <string name="type_none">None</string>
     <string name="type_re_watching">Rewatching</string>
     <string name="play_movie_button">Play Movie</string>
+    <string name="play_trailer_button">Play Trailer</string>
     <string name="play_livestream_button">Play Livestream</string>
     <string name="play_torrent_button">Stream Torrent</string>
     <string name="pick_source">Sources</string>

From 871dcf717106d5945a7e898c3e211b4c8d74f6ad Mon Sep 17 00:00:00 2001
From: krrishkap <86251706+krrishkap@users.noreply.github.com>
Date: Sat, 24 Dec 2022 20:35:20 +0530
Subject: [PATCH 129/273] Update AndroidManifest.xml (#273)

Enabling Api for predictive back gesture for A13 .
---
 app/src/main/AndroidManifest.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 871c4f69..903a55fd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -45,7 +45,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        tools:targetApi="o">
+        tools:targetApi="o"
+        android:enableOnBackInvokedCallback="true">
 
         <meta-data
             android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
@@ -189,4 +190,4 @@
         </provider>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>

From 9e059af0bb51bfc6aa955a401615bbdb647a4c9b Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Sat, 24 Dec 2022 13:48:31 +0100
Subject: [PATCH 130/273] Translated using Weblate (Greek)

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Greek)

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (562 of 562 strings)

Co-authored-by: Alex Georgiou <alexandrosgeorgiou35@gmail.com>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Sdarfeesh <Sdarfeesh@protonmail.com>
Co-authored-by: Translator-3000 <weblate.m1d0h@8shield.net>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/el/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml |  25 ++-
 app/src/main/res/values-el/strings.xml | 272 ++++++++++++++++++-------
 app/src/main/res/values-it/strings.xml |  15 ++
 app/src/main/res/values-pl/strings.xml |   3 +-
 app/src/main/res/values-zh/strings.xml |  18 +-
 5 files changed, 248 insertions(+), 85 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index bb7ba5d1..84f70876 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -246,7 +246,7 @@
     <string name="show_dub_key" translatable="false">show_dub_key</string>
     <string name="show_sub_key" translatable="false">show_sub_key</string>
     <string name="show_title_key" translatable="false">show_title_key</string>
-    <string name="poster_ui_settings">التحكم في عناصر الواجهة علي الملصق </string>
+    <string name="poster_ui_settings">التحكم في عناصر الواجهة على الملصق</string>
     <string name="no_update_found">لم يتم العثور على تحديثات</string>
     <string name="check_for_update">تحقق من التحديثات</string>
     <string name="video_lock">قفل</string>
@@ -305,9 +305,9 @@
     <string name="category_providers">المصادر</string>
     <string name="category_ui">الواجهة</string>
     <string name="automatic">أوتوماتيك</string>
-    <string name="tv_layout">واجهة تلفاز</string>
-    <string name="phone_layout">واجهة هاتف</string>
-    <string name="emulator_layout">واجهة محاكي</string>
+    <string name="tv_layout">واجهة التلفاز</string>
+    <string name="phone_layout">واجهة الهاتف</string>
+    <string name="emulator_layout">واجهة المحاكي</string>
     <string name="primary_color_settings">اللون الأساسي</string>
     <string name="app_theme_settings">مظهر التطبيق</string>
     <string name="bottom_title_settings">موضع عنوان الملصق</string>
@@ -419,7 +419,7 @@
     <string name="provider_languages_tip">شاهد الفيديوهات بهذه اللغات</string>
     <string name="previous">السابق</string>
     <string name="skip_setup">تخطي الإعداد</string>
-    <string name="app_layout_subtext">تغيير شكل البرنامح حتي يلائم جهازك</string>
+    <string name="app_layout_subtext">قم بتغيير مظهر التطبيق ليناسب جهازك</string>
     <string name="crash_reporting_title">إبلاغ الأعطال</string>
     <string name="preferred_media_subtext">ماذا تريد ان تري</string>
     <string name="setup_done">تم</string>
@@ -514,4 +514,19 @@
     <string name="apk_installer_settings_des">بعض الهواتف لا تدعم مثبت الحزمة الجديد. جرب الخيار القديم إذا لم يتم تثبيت التحديثات.</string>
     <string name="apk_installer_legacy">قياسي</string>
     <string name="apk_installer_package_installer">مثبت الحزمة</string>
+    <string name="pref_category_player_layout">التخطيط</string>
+    <string name="redo_setup_process">إعادة عملية الإعداد</string>
+    <string name="pref_category_links">الروابط</string>
+    <string name="pref_category_app_updates">تحديثات التطبيق</string>
+    <string name="pref_category_backup">نسخ احتياطي</string>
+    <string name="pref_category_extensions">الإضافات</string>
+    <string name="pref_category_actions">الإجراءات</string>
+    <string name="pref_category_cache">الذاكرة المؤقتة</string>
+    <string name="pref_category_gestures">الإيماءات</string>
+    <string name="pref_category_player_features">ميزات المشغل</string>
+    <string name="pref_category_subtitles">الترجمات</string>
+    <string name="pref_category_defaults">الإفتراضي</string>
+    <string name="pref_category_ui_features">المميزات</string>
+    <string name="pref_category_looks">المظهر</string>
+    <string name="play_trailer_button">تشغيل المقطع الدعائي</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index ab6609bb..365bb3e0 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -12,7 +12,7 @@
     <string name="episode_more_options_des">Περισσότερες Επιλογές</string>
     <string name="go_back_img_des">Πίσω</string>
     <string name="next_episode">Επόμενο Επεισόδιο</string>
-    <string name="result_poster_img_des">Πόστερ</string>
+    <string name="result_poster_img_des">Αφίσα</string>
     <string name="result_tags">Κατηγορίες</string>
     <string name="result_share">Κοινοποίηση</string>
     <string name="result_open_in_browser">Άνοιγμα στον περιηγητή</string>
@@ -24,14 +24,14 @@
     <string name="type_dropped">Διακόπηκε</string>
     <string name="type_plan_to_watch">Για παρακολούθηση</string>
     <string name="type_none">Τίποτα</string>
-    <string name="play_movie_button">Αναπαραγωγή Ταινίας</string>
+    <string name="play_movie_button">Αναπαραγωγή ταινίας</string>
     <string name="play_torrent_button">Μετάδοση Torrent</string>
     <string name="pick_source">Πηγές</string>
     <string name="pick_subtitle">Υπότιτλοι</string>
     <string name="reload_error">Προσπάθεια επανασύνδεσης…</string>
     <string name="go_back">Πίσω</string>
-    <string name="episode_poster_img_des">Πόστερ</string>
-    <string name="play_episode">Αναπαραγωγή Επεισοδίου</string>
+    <string name="episode_poster_img_des">Αφίσα επεισοδίου</string>
+    <string name="play_episode">Αναπαραγωγή επεισοδίου</string>
     <!--<string name="need_storage">Απαιτείται άδεια για την λήψη επεισοδίου</string>-->
     <string name="download">Λήψη</string>
     <string name="error_loading_links_toast">Σφάλμα φόρτωσης συνδέσμων</string>
@@ -40,15 +40,15 @@
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Sub</string>
     <string name="popup_delete_file">Διαγραφή Αρχείου</string>
-    <string name="popup_play_file">Αναπαραγωγή Αρχείου</string>
-    <string name="popup_resume_download">Συνέχιση Λήψης</string>
-    <string name="popup_pause_download">Παύση Λήψης</string>
-    <string name="acra_report_toast">Λυπούμαστε, η εφαρμογή κατέρρευσε. Μια ανώνυμη αναφορά σφαλμάτων θα σταλεί στους προγραμματιστές</string>
+    <string name="popup_play_file">Αναπαραγωγή αρχείου</string>
+    <string name="popup_resume_download">Συνέχιση λήψης</string>
+    <string name="popup_pause_download">Παύση λήψης</string>
+    <string name="acra_report_toast">Λυπόμαστε, η εφαρμογή κατέρρευσε. Μια ανώνυμη αναφορά σφαλμάτων θα σταλεί στους προγραμματιστές</string>
     <string name="pref_disable_acra">Απενεργοποιήστε την αυτόματη αναφορά σφαλμάτων</string>
     <string name="show_log_cat">Εμφάνιση Logcat 🐈</string>
-    <string name="home_more_info">Παραπάνω πληροφορίες</string>
+    <string name="home_more_info">Περαιτέρω πληροφορίες</string>
     <string name="home_expanded_hide">Απόκρυψη</string>
-    <string name="home_main_poster_img_des">Κύριο Πόστερ</string>
+    <string name="home_main_poster_img_des">Κύρια αφίσα</string>
     <string name="home_play">Αναπαραγωγή</string>
     <string name="home_info">Πληροφορίες</string>
     <string name="home_next_random_img_des">Next Random</string>
@@ -56,7 +56,7 @@
     <string name="filter_bookmarks">Φιλτράρισμα Σελιδοδεικτών</string>
     <string name="error_bookmarks_text">Σελιδοδείκτες</string>
     <string name="action_remove_from_bookmarks">Αφαίρεση</string>
-    <string name="play_episode_toast">Αναπαραγωγή Επεισοδίου</string>
+    <string name="play_episode_toast">Αναπαραγωγή επεισοδίου</string>
     <string name="sort_apply">Υποβολή</string>
     <string name="sort_cancel">Ακύρωση</string>
     <string name="player_speed">Ταχύτητα αναπαραγωγής</string>
@@ -77,87 +77,88 @@
     <string name="subs_auto_select_language">Αυτόματη επιλογή γλώσσας</string>
     <string name="subs_download_languages">Λήψη γλωσσών</string>
     <string name="subs_hold_to_reset_to_default">Κρατήστε πατημένο για επαναφορά στις προεπιλεγμένες τιμές</string>
-    <string name="continue_watching">Συνέχεια Παρακολούθησης</string>
+    <string name="continue_watching">Συνέχεια παρακολούθησης</string>
     <string name="action_remove_watching">Αφαίρεση</string>
-    <string name="action_open_watching">Επιπλέον Πληροφορίες</string>
+    <string name="action_open_watching">Περαιτέρω πληροφορίες</string>
     <string name="vpn_might_be_needed">Η χρήση ενός VPN ίσως χρειαστεί για την ομαλή λειτουργία του τρέχοντος παρόχου</string>
-    <string name="vpn_torrent">Πρόκειται για torrent, η χρήση ενός VPN συνιστάται</string>
+    <string name="vpn_torrent">Ο πάροχος αυτός πρόκειται για torrent, η χρήση ενός VPN συνιστάται</string>
     <string name="torrent_plot">Περιγραφή</string>
     <string name="normal_no_plot">Δεν βρέθηκε περιγραφή</string>
     <string name="torrent_no_plot">Δεν βρέθηκε περιγραφή</string>
-    <string name="picture_in_picture">Εικόνα-σε-Εικόνα</string>
+    <string name="picture_in_picture">Εικόνα-εντός-Εικόνας</string>
     <string name="picture_in_picture_des">Συνεχίζει την αναπαραγωγή σε ένα μίνι παράθυρο πάνω από άλλες εφαρμογές</string>
     <string name="player_size_settings">Αλλαγή μεγέθους παραθύρου</string>
     <string name="player_size_settings_des">Αφαίρεση μαύρων περιγραμμάτων</string>
     <string name="player_subtitles_settings">Υπότιτλοι</string>
     <string name="player_subtitles_settings_des">Ρυθμίσεις υποτίτλων του προγράμματος αναπαραγωγής</string>
-    <string name="chromecast_subtitles_settings">Chromecast Υπότιτλοι</string>
-    <string name="chromecast_subtitles_settings_des">Ρυθμίσεις Chromecast υποτίτλων</string>
-    <string name="eigengraumode_settings">Eigengrau Mode</string>
+    <string name="chromecast_subtitles_settings">Υπότιτλοι για Chromecast</string>
+    <string name="chromecast_subtitles_settings_des">Ρυθμίσεις υποτίτλων για Chromecast</string>
+    <string name="eigengraumode_settings">Eigengravy Mode</string>
     <string name="eigengraumode_settings_des">Προσθέτει την επιλογή ταχύτητας στο πρόγραμμα αναπαραγωγής</string>
-    <string name="swipe_to_seek_settings">Σύρετε για αναζήτηση</string>
-    <string name="swipe_to_seek_settings_des">Σύρετε αριστερά ή δεξιά για να ελέγξετε τον χρόνο στην κάτω μπάρα</string>
+    <string name="swipe_to_seek_settings">Σύρετε για ιχνηλασία</string>
+    <string name="swipe_to_seek_settings_des">Σύρετε αριστερά ή δεξιά για να ελέγξετε τον χρόνο στην μπάρα του προγράμματος αναπαραγωγής</string>
     <string name="swipe_to_change_settings">Σύρετε για να αλλάξετε ρυθμίσεις</string>
     <string name="swipe_to_change_settings_des">Σύρετε αριστερά ή δεξιά για να αλλάξετε τη φωτεινότητα ή την ένταση</string>
-    <string name="double_tap_to_seek_settings">Διπλό πάτημα για αναζήτηση</string>
-    <string name="double_tap_to_seek_settings_des">Διπλό πάτημα στα αριστερά ή δεξιά για αναζήτηση μπροστά ή πίσω</string>
+    <string name="double_tap_to_seek_settings">Διπλό πάτημα για ιχνηλασία</string>
+    <string name="double_tap_to_seek_settings_des">Διπλό πάτημα στα αριστερά ή δεξιά για ιχνηλασία προς τα μπροστά ή πίσω</string>
     <string name="search">Αναζήτηση</string>
     <string name="settings_info">Πληροφορίες</string>
     <string name="advanced_search">Προχωρημένη Αναζήτηση</string>
     <string name="advanced_search_des">Δίνει τα αποτελέσματα αναζήτησης ταξινομημένα ανά πάροχο</string>
-    <string name="bug_report_settings_off">Αποστέλλει δεδομένα μόνο για σφάλματα</string>
+    <string name="bug_report_settings_off">Αποστέλλει δεδομένα μόνο για καταρρεύσεις</string>
     <string name="bug_report_settings_on">Δεν στέλνει δεδομένα</string>
     <string name="updates_settings">Εμφάνιση ενημερώσεων</string>
     <string name="updates_settings_des">Αυτόματη αναζήτηση νέων ενημερώσεων</string>
     <string name="uprereleases_settings">Ενημέρωση σε προ-εκδόσεις (beta)</string>
-    <string name="uprereleases_settings_des">Αναζητήστε ενημερώσεις προ-εκδόσεων (beta) αντί για σταθερές εκδόσεις</string>
-    <string name="github">Github</string>
-    <string name="lightnovel">Ελαφριά novel εφαρμογή από τους ίδιους προγραμματιστές</string>
-    <string name="anim">Anime εφαρμογή από τους ίδιους προγραμματιστές</string>
-    <string name="discord">Εγγραφείτε στο Discord</string>
-    <string name="benene">Δώστε μπανάνα στους προγραμματιστές</string>
-    <string name="benene_des">Μπανάνα δόθηκε δώθηκε</string>
+    <string name="uprereleases_settings_des">Αναζητήστε ενημερώσεις προ-εκδόσεων (beta) αντί για σταθερές εκδόσεις (stable)</string>
+    <string name="github">GitHub</string>
+    <string name="lightnovel">Εφαρμογή βιβλίων από τους ίδιους προγραμματιστές</string>
+    <string name="anim">Εφαρμογή άνιμε από τους ίδιους προγραμματιστές</string>
+    <string name="discord">Βρείτε μας στο Discord</string>
+    <string name="benene">Δώστε μία μπανάνα στους προγραμματιστές</string>
+    <string name="benene_des">Μπανάνα δόθηκε</string>
     <string name="player_speed_text_format" formatted="true">Ταχύτητα (%.2fx)</string>
     <string name="rated_format" formatted="true">Βαθμολογία: %.1f</string>
-    <string name="new_update_format" formatted="true">Νέα ενημέρωση διαθέσιμη!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Νέα διαθέσιμη ενημέρωση!
+\n%s -&gt; %s</string>
     <string name="double_tap_to_pause_settings_des">Πάτημα στη μέση για παύση</string>
     <string name="use_system_brightness_settings">Χρήση φωτεινότητας συστήματος</string>
-    <string name="use_system_brightness_settings_des">Χρήση φωτεινότητας συστήματος στο ενσωματωμένο πρόγραμμα αναπαραγωγής αντί να εφαρμοστεί το προεπιλεγμένο σκούρο επικάλυμμα
-    </string>
+    <string name="use_system_brightness_settings_des">Χρήση φωτεινότητας συστήματος στο ενσωματωμένο πρόγραμμα αναπαραγωγής, αντί εφαρμογής προεπιλεγμένου σκούρου επικαλύμματος</string>
     <string name="episode_sync_settings">Ενημέρωση προόδου παρακολούθησης</string>
     <string name="episode_sync_settings_des">Αυτόματος συγχρονισμός της προόδου του τρέχοντος επεισοδίου</string>
     <string name="restore_settings">Επαναφορά δεδομένων από αντίγραφο ασφαλείας</string>
     <string name="backup_settings">Αντίγραφα ασφαλείας</string>
     <string name="restore_success">Τα αντίγραφα ασφαλείας φορτώθηκαν</string>
-    <string name="restore_failed_format" formatted="true">Η επαναφορά αντιγράφων ασφαλαείας απέτυχε από το αρχείο %s</string>
-    <string name="backup_success">Επιτυχής αποθήκευση δεδομένων</string>
-    <string name="backup_failed">Δεν έχει δοθεί άδεια για πρόσβαση στον αποθηκευτικό χώρο, προσπαθήστε ξανά</string>
+    <string name="restore_failed_format" formatted="true">Η επαναφορά αντιγράφων ασφαλείας απέτυχε από το αρχείο %s</string>
+    <string name="backup_success">Τα δεδομένα αποθηκεύτηκαν</string>
+    <string name="backup_failed">Δεν έχει δοθεί άδεια για πρόσβαση στον αποθηκευτικό χώρο. Παρακαλώ προσπαθήστε ξανά.</string>
     <string name="backup_failed_error_format">Σφάλμα δημιουργίας αντιγράφων ασφαλείας %s</string>
     <string name="category_account">Λογαριασμοί</string>
     <string name="category_updates">Ενημερώσεις και αντίγραφα ασφαλείας</string>
-    <string name="show_fillers_settings">Εμφάνιση filler επεισοδίου για anime</string>
-    <string name="show_trailers_settings">Εμφάνιση trailers</string>
-    <string name="kitsu_settings">Εμφάνιση posters από kitsu</string>
+    <string name="show_fillers_settings">Εμφάνιση filler επεισοδίου για άνιμε</string>
+    <string name="show_trailers_settings">Εμφάνιση trailer</string>
+    <string name="kitsu_settings">Εμφάνιση αφισών από Kitsu</string>
     <string name="pref_filter_search_quality">Απόκρυψη επιλεγμένης ποιότητας βίντεο στα αποτελέσματα αναζήτησης</string>
-    <string name="app_language">App Language</string>
-    <string name="no_chromecast_support_toast">Αυτός ο πάροχος δεν έχει υποστήριξη Chromecast</string>
+    <string name="app_language">Γλώσσα εφαρμογής</string>
+    <string name="no_chromecast_support_toast">Αυτός ο πάροχος δεν έχει υποστήριξη για Chromecast</string>
     <string name="no_links_found_toast">Δεν βρέθηκαν διαθέσιμοι σύνδεσμοι</string>
     <string name="copy_link_toast">Ο σύνδεσμος αντιγράφηκε στο πρόχειρο</string>
-    <string name="season">Season</string>
+    <string name="season">Κύκλος</string>
     <string name="season_format">%s %d%s</string>
-    <string name="no_season">No Season</string>
-    <string name="episode">Episode</string>
-    <string name="episodes">Episodes</string>
+    <string name="no_season">Κανένας κύκλος</string>
+    <string name="episode">Επεισόδιο</string>
+    <string name="episodes">Επεισόδια</string>
     <string name="episodes_range">%d-%d</string>
     <string name="episode_format" formatted="true">%d %s</string>
-    <string name="season_short">S</string>
+    <string name="season_short">Κ</string>
     <string name="episode_short">E</string>
-    <string name="no_episodes_found">No Episodes found</string>
+    <string name="no_episodes_found">Δεν βρέθηκαν επεισόδια</string>
     <string name="delete_file">Διαγραφή αρχείου</string>
     <string name="delete">Διαγραφή</string>
-    <string name="pause">Πάυση</string>
+    <string name="pause">Παύση</string>
     <string name="resume">Συνέχιση</string>
-    <string name="delete_message" formatted="true">Αυτό θα διαγράψει μόνιμα το %s\nΕπιβεβαίωση;</string>
+    <string name="delete_message" formatted="true">Αυτό θα διαγράψει μόνιμα το %s
+\nΕίστε σίγουροι πως θέλετε να προχωρήσετε;</string>
     <string name="resume_time_left" formatted="true">%dm\nαπομένουν</string>
     <string name="status_ongoing">Σε εξέλιξη</string>
     <string name="status">Κατάσταση</string>
@@ -168,30 +169,30 @@
     <string name="queued">προστέθηκε στην ουρά</string>
     <string name="no_subtitles">Δεν υπάρχουν διαθέσιμοι υπότιτλοι</string>
     <string name="default_subtitles">Προεπιλεγμένοι υπότιτλοι</string>
-    <string name="free_storage">Ελέυθερος</string>
+    <string name="free_storage">Ελεύθερος</string>
     <string name="used_storage">Σε χρήση</string>
     <string name="app_storage">Εφαρμογή</string>
     <string name="movies">Ταινίες</string>
-    <string name="tv_series">Τηλεοπτικές Σειρές</string>
+    <string name="tv_series">Τηλεοπτικές σειρές</string>
     <string name="cartoons">Κινούμενα σχέδια</string>
     <string name="torrent">Torrents</string>
     <string name="documentaries">Ντοκιμαντέρ</string>
-    <string name="asian_drama">Ασιατικά Δράμα</string>
-    <string name="livestreams">Ζωντανές ροές</string>
+    <string name="asian_drama">Ασιατικά Δράματα</string>
+    <string name="livestreams">Ζωντανές Μεταδόσεις</string>
     <string name="others">Άλλα</string>
     <string name="movies_singular">Ταινία</string>
     <string name="tv_series_singular">Σειρά</string>
-    <string name="cartoons_singular">Cartoon</string>
+    <string name="cartoons_singular">Κινούμενα Σχέδια</string>
     <string name="documentaries_singular">Ντοκιμαντέρ</string>
     <string name="asian_drama_singular">Ασιατικό Δράμα</string>
-    <string name="live_singular">Ζωντανή ροή</string>
+    <string name="live_singular">Ζωντανή Μετάδοση</string>
     <string name="other_singular">Άλλο</string>
     <string name="source_error">Σφάλμα πηγής</string>
     <string name="remote_error">Απομακρυσμένο σφάλμα</string>
     <string name="render_error">Σφάλμα απόδοσης</string>
-    <string name="unexpected_error">Μη αναμενόμενο σφάλμα αναπαραγωγής</string>
+    <string name="unexpected_error">Απρόσμενο σφάλμα αναπαραγωγής</string>
     <string name="storage_error">Σφάλμα λήψης, επιβεβαιώστε ότι η άδεια αποθήκευσης είναι ενεργοποιημένη</string>
-    <string name="episode_action_chromecast_episode">Chromecast επεισόδο</string>
+    <string name="episode_action_chromecast_episode">Chromecast επεισόδιο</string>
     <string name="episode_action_play_in_app">Αναπαραγωγή εντός της εφαρμογής</string>
     <string name="episode_action_play_in_format">Αναπαραγωγή σε %s</string>
     <string name="episode_action_play_in_browser">Αναπαραγωγή στον περιηγητή</string>
@@ -204,7 +205,7 @@
     <string name="show_dub">Dub</string>
     <string name="show_sub">Sub</string>
     <string name="show_title">Τίτλος</string>
-    <string name="poster_ui_settings">Εναλλαγή των στοιχείων UI στο poster</string>
+    <string name="poster_ui_settings">Εναλλαγή γραφικών στοιχείων στην αφίσα</string>
     <string name="video_lock">Κλείδωμα</string>
     <string name="video_aspect_ratio_resize">Αλλαγή μεγέθους</string>
     <string name="video_source">Πηγή</string>
@@ -212,28 +213,28 @@
     <string name="dont_show_again">Να μην εμφανιστεί ξανά</string>
     <string name="skip_update">Παράλειψη της τρέχουσας ενημέρωσης</string>
     <string name="update">Ενημέρωση</string>
-    <string name="watch_quality_pref">Προτίμηση ποιότητας παρακολούθησης</string>
-    <string name="limit_title">Μέγιστοι χαρακτήρες για τίτλο</string>
-    <string name="limit_title_rez">Ανάλυση αναπαραγωγής βίντεο</string>
-    <string name="video_buffer_size_settings">Μέγεθος buffer βίντεο</string>
-    <string name="video_buffer_length_settings">Μήκος buffer βίντεο</string>
-    <string name="video_buffer_disk_settings">Προσωρινή μνήμη βίντεο στο δίσκο</string>
+    <string name="watch_quality_pref">Προτιμώμενη ποιότητας παρακολούθησης</string>
+    <string name="limit_title">Μέγιστος αριθμός χαρακτήρων τίτλου</string>
+    <string name="limit_title_rez">Ανάλυση προγράμματος αναπαραγωγής βίντεο</string>
+    <string name="video_buffer_size_settings">Μέγεθος buffer για βίντεο</string>
+    <string name="video_buffer_length_settings">Μήκος buffer για βίντεο</string>
+    <string name="video_buffer_disk_settings">Μέγεθος προσωρινής μνήμης βίντεο στον δίσκο</string>
     <string name="video_buffer_clear_settings">Εκκαθάριση προσωρινής μνήμης βίντεο και εικόνων</string>
-    <string name="video_ram_description">Θα προκαλέσει τυχαία σφάλματα εάν οριστεί πολύ ψηλά. Μην το αλλάξετε εάν έχετε χαμηλή ποσότητα μνήμης ram, όπως σε Android TV ή παλιό τηλέφωνο</string>
-    <string name="video_disk_description">Μπορεί να προκαλέσει προβλήματα σε συστήματα με χαμηλό αποθηκευτικό χώρο, όπως σε συσκευές Android TV, εάν τον ρυθμίσετε πολύ ψηλά</string>
-    <string name="dns_pref_summary">Χρήσιμο για παράκαμψη μπλοκ ISP</string>
+    <string name="video_ram_description">Προκαλεί καταρρεύσεις εάν οριστεί πολύ ψηλά. Μην το αλλάξετε εάν έχετε χαμηλή ποσότητα μνήμης RAM, όπως σε Android TV ή παλιά συσκευή.</string>
+    <string name="video_disk_description">Προκαλεί προβλήματα σε συστήματα με χαμηλό αποθηκευτικό χώρο, όπως σε συσκευές Android TV.</string>
+    <string name="dns_pref_summary">Χρήσιμο για παράκαμψη μπλοκαρισμάτων από ISP</string>
     <string name="add_site_pref">Αντίγραφο ιστοτόπου</string>
     <string name="remove_site_pref">Αφαίρεση ιστοτόπου</string>
     <string name="add_site_summary">Προσθήκη αντιγράφου ενός υπάρχοντος ιστοτόπου, με έναν διαφορετικό σύνδεσμο</string>
     <string name="download_path_pref">Διαδρομή λήψης</string>
-    <string name="display_subbed_dubbed_settings">Εμφάνιση Dubbed/Subbed Anime</string>
+    <string name="display_subbed_dubbed_settings">Εμφάνιση Dubbed/Subbed Άνιμε</string>
     <string name="resize_fit">Προσαρμογή στην οθόνη</string>
     <string name="resize_fill">Τέντωμα</string>
     <string name="resize_zoom">Μεγέθυνση</string>
     <string name="legal_notice">Αποποίηση ευθυνών</string>
     <string name="category_general">Γενικά</string>
-    <string name="random_button_settings">Τυχαίο κουμπί</string>
-    <string name="random_button_settings_desc">Εμφάνιση τυχαίου κουμπιού στην Αρχική οθόνη</string>
+    <string name="random_button_settings">Κουμπί τυχαίας δράσης</string>
+    <string name="random_button_settings_desc">Εμφάνιση κουμπιού τυχαίας δράσης στην Αρχική Οθόνη</string>
     <string name="provider_lang_settings">Γλώσσες παρόχων</string>
     <string name="app_layout">Διάταξη εφαρμογής</string>
     <string name="preferred_media_settings">Προτιμώμενα μέσα</string>
@@ -261,7 +262,7 @@
     <string name="upload_sync">Συγχρονισμός</string>
     <string name="sync_score">Βαθμολογήθηκε</string>
     <string name="authenticated_user" formatted="true">Πιστοποιήθηκε %s</string>
-    <string name="authenticated_user_fail" formatted="true">Αποτυχία πιστοποίησης σε %s</string>
+    <string name="authenticated_user_fail" formatted="true">Αποτυχία σύνδεσης στο %s</string>
     <string name="none">Τίποτα</string>
     <string name="normal">Κανονικά</string>
     <string name="all">Όλα</string>
@@ -293,7 +294,7 @@
     <string name="resolution_and_title">Ανάλυση και τίτλος</string>
     <string name="title">Τίτλος</string>
     <string name="resolution">Ανάλυση</string>
-    <string name="error_invalid_id">Μη έγκυρο id</string>
+    <string name="error_invalid_id">Μη έγκυρο ID</string>
     <string name="error_invalid_data">Μη έγκυρα δεδομένα</string>
     <string name="error_invalid_url">Μη έγκυρος σύνδεσμος</string>
     <string name="error">Σφάλμα</string>
@@ -307,7 +308,7 @@
     <string name="next">Επόμενο</string>
     <string name="provider_languages_tip">Παρακολούθηση βίντεο σε αυτή την γλώσσα</string>
     <string name="previous">Προηγούμενο</string>
-    <string name="skip_setup">Παράλειψη διαμόρφωσης</string>
+    <string name="skip_setup">Παράλειψη διαμόρφωσης της εφαρμογής</string>
     <string name="app_layout_subtext">Αλλαγή της εμφάνισης της συσκευής για να ταιριάζει με την συσκευή σας</string>
     <string name="crash_reporting_title">Αναφορά κατάρρευσης</string>
     <string name="preferred_media_subtext">Τι θα θέλατε να δείτε</string>
@@ -318,8 +319,8 @@
     <string name="repository_url_hint">Σύνδεσμος αποθετηρίου</string>
     <string name="plugin_loaded">Το πρόσθετο φορτώθηκε</string>
     <string name="plugin_deleted">Το πρόσθετο διαγράφηκε</string>
-    <string name="plugin_load_fail" formatted="true">Απέτυχε να φορτωθεί το %s</string>
-    <string name="batch_download_start_format" formatted="true">Ξεκίνησε η λήψη %d %s</string>
+    <string name="plugin_load_fail" formatted="true">Αποτυχία φόρτωσης του %s</string>
+    <string name="batch_download_start_format" formatted="true">Ξεκίνησε η λήψη %d %s…</string>
     <string name="batch_download_finish_format" formatted="true">Κατέβηκε το %d %s επιτυχώς</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Όλα τα %s έχουν ήδη κατέβει</string>
     <string name="batch_download">Μαζική λήψη</string>
@@ -327,12 +328,16 @@
     <string name="plugin">Πρόσθετα</string>
     <string name="delete_repository_plugins">Αυτό θα διαγράψει όλα τα πρόσθετα του αποθετηρίου</string>
     <string name="delete_repository">Διαγραφή αποθετηρίου</string>
-    <string name="setup_extensions_subtext">Λήψη της λίστας των ιστοσελίδων που θέλετε να δείτε</string>
+    <string name="setup_extensions_subtext">Κατεβάστε την λίστα των ιστότοπων που θέλετε να χρησιμοποιήσετε</string>
     <string name="plugins_downloaded" formatted="true">Κατέβηκε: %d</string>
     <string name="plugins_disabled" formatted="true">Απενεργοποιήθηκε: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Δεν κατέβηκε: %d</string>
     <string name="plugins_updated" formatted="true">Ενημερώθηκαν %d πρόσθετα</string>
-    <string name="blank_repo_message">Προσθήκη ενός αποθετηρίου για να εγκαταστήσετε πρόσθετα ιστοσελίδας</string>
+    <string name="blank_repo_message">Το CloudStream δεν έχει προεγκατεστημένους ιστότοπους. Πρέπει να εγκαταστήσετε ιστότοπους μέσω ορισμένων αποθετηρίων.
+\n
+\nΛόγω ενός χαζού DMCA takedown από μέρους των Sky UK Limited 🤮 δεν μπορούμε να προσθέσουμε απευθείας σύνδεσμο προς τα προαναφερόμενα αποθετήρια εντός της εφαρμογής.
+\n
+\nΒρείτε μας στο Discord ή ψάξτε στο διαδίκτυο.</string>
     <string name="view_public_repositories_button">Προβολή αποθετηρίων κοινότητας</string>
     <string name="view_public_repositories_button_short">Δημόσια λίστα</string>
     <string name="uppercase_all_subtitles">Κεφαλοποίηση υποτίτλων</string>
@@ -343,7 +348,7 @@
     <string name="video_tracks">Κομμάτια βίντεο</string>
     <string name="apply_on_restart">Εφαρμογή στην επανεκκίνηση</string>
     <string name="safe_mode_title">Η ασφαλής λειτουργία ενεργοποιήθηκε</string>
-    <string name="safe_mode_description">Ένα μη αντιστρέψιμο σφάλμα συνέβη και απενεργοποιήσαμε όλα τα πρόσθετα, ώστε να μπορέσετε να διαπιστώσετε ποιο πρόσθετο προκάλεσε αυτή τη κατάρρευση.</string>
+    <string name="safe_mode_description">Όλα τα extensions απενεργοποιήθηκαν , ώστε να μπορέσετε να διαπιστώσετε ποιο από αυτά προκάλεσε τη κατάρρευση.</string>
     <string name="safe_mode_crash_info">Προβολή πληροφορίας κατάρρευσης</string>
     <string name="extension_rating" formatted="true">Βαθμολογία: %s</string>
     <string name="extension_description">Περιγραφή</string>
@@ -370,4 +375,115 @@
     <string name="next_episode_time_day_format" formatted="true">%dμ %dω %dλ</string>
     <string name="next_episode_time_hour_format" formatted="true">%dω %dλ</string>
     <string name="next_episode_time_min_format" formatted="true">%dλ</string>
+    <string name="search_hint_site" formatted="true">Αναζήτηση %s…</string>
+    <string name="play_livestream_button">Αναπαραγωγή ζωντανής μετάδοσης</string>
+    <string name="downloaded">Ληφθέν</string>
+    <string name="download_canceled">Η λήψη ακυρώθηκε</string>
+    <string name="download_failed">Η λήψη απέτυχε</string>
+    <string name="download_started">Η λήψη ξεκίνησε</string>
+    <string name="download_paused">Η λήψη παύθηκε</string>
+    <string name="downloading">Κατεβαίνει</string>
+    <string name="sort_close">Κλείσιμο</string>
+    <string name="sort_clear">Εκκαθάριση</string>
+    <string name="subs_subtitle_languages">Γλώσσα υποτίτλων</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="provider_info_meta">Δεν έχουν παρασχεθεί μεταδεδομένα από τον ιστότοπο, η φόρτωση του βίντεο θα αποτύχει αν δεν υπάρχει στον ιστότοπο.</string>
+    <string name="double_tap_to_pause_settings">Διπλό πάτημα για παύση</string>
+    <string name="double_tap_to_seek_amount_settings">Μέγεθος ιχνηλασίας στο πρόγραμμα αναπαραγωγής</string>
+    <string name="automatic_plugin_updates">Αυτόματη ενημέρωση plugin</string>
+    <string name="automatic_plugin_download">Αυτόματη λήψη plugin</string>
+    <string name="dns_pref">DNS μέσω HTTPS</string>
+    <string name="example_site_url">παράδειγμα.com</string>
+    <string name="quality_hq">HQ</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_tc">TC</string>
+    <string name="quality_blueray">Blu-ray</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="quality_4k">4K</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="quality_webrip">Web</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="skip_type_mixed_op">Ανάμεικτοι τίτλοι αρχής</string>
+    <string name="skip_type_creddits">Εύσημα</string>
+    <string name="skip_type_intro">Εισαγωγή</string>
+    <string name="go_forward_30">+30</string>
+    <string name="status_completed">Ολοκληρώθηκε</string>
+    <string name="nsfw">NSFW</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="episode_action_chromecast_mirror">Chromecast mirror</string>
+    <string name="nginx_url_pref">Σύνδεσμος NGINX σέρβερ</string>
+    <string name="example_site_name">ΟΚουλΙστότοποςΜου</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="clear_history">Εκκαθάριση ιστορικού</string>
+    <string name="history">Ιστορικό</string>
+    <string name="enable_skip_op_from_database_des">Εμφάνισε pop-up για παράλειψη τίτλων αρχής και τέλους</string>
+    <string name="clipboard_too_large">Υπερβολικά μεγάλο μέγεθος κειμένου. Αδύνατη η αποθήκευση στο πρόχειρο.</string>
+    <string name="yes">Ναι</string>
+    <string name="no">Όχι</string>
+    <string name="update_notification_downloading">Λήψη ενημέρωσης εφαρμογής…</string>
+    <string name="update_notification_installing">Εγκατάσταση ενημέρωσης εφαρμογής…</string>
+    <string name="update_notification_failed">Αδύνατη η εγκατάσταση της νέας έκδοσης της εφαρμογής</string>
+    <string name="type_re_watching">Ξαναβλέπει</string>
+    <string name="stream">Μετάδοση</string>
+    <string name="download_done">Η λήψη ολοκληρώθηκε</string>
+    <string name="autoplay_next_settings">Αυτόματη αναπαραγωγή επόμενου επεισοδίου</string>
+    <string name="automatic_plugin_download_summary">Αυτόματη εγκατάσταση όλων των μη-εγκατεστημένων plugin από τους προστιθεμένους παρόχους.</string>
+    <string name="anime">Άνιμε</string>
+    <string name="no_update_found">Δεν βρέθηκε ενημέρωση</string>
+    <string name="check_for_update">Έλεγχος για ενημέρωση</string>
+    <string name="example_password">κωδικός123</string>
+    <string name="example_username">ΤοΚουλΨευδώνυμοΜου</string>
+    <string name="example_email">γειασου@κόσμε.com</string>
+    <string name="subtitles_example_text">Η γρήγορη, καφέ αλεπού πηδάει πάνω από τον τεμπέλη σκύλο / The quick brown fox jumps over the lazy dog</string>
+    <string name="quality_cam">Cam</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="is_adult">18+</string>
+    <string name="skip_type_op">Τίτλοι αρχής</string>
+    <string name="skip_type_ed">Τίτλοι τέλους</string>
+    <string name="skip_type_recap">Ανακεφαλαίωση</string>
+    <string name="skip_type_mixed_ed">Ανάμεικτοι τίτλοι τέλους</string>
+    <string name="go_back_30">-30</string>
+    <string name="rating">Κριτική</string>
+    <string name="ova_singular">\@string/ova</string>
+    <string name="pref_category_app_updates">Ενημερώσεις εφαρμογής</string>
+    <string name="pref_category_backup">Αντίγραφο ασφαλείας</string>
+    <string name="pref_category_extensions">Extensions</string>
+    <string name="pref_category_actions">Δράσεις</string>
+    <string name="pref_category_cache">Προσωρινή μνήμη</string>
+    <string name="pref_category_player_features">Χαρακτηριστικά προγράμματος αναπαραγωγής</string>
+    <string name="pref_category_subtitles">Υπότιτλοι</string>
+    <string name="pref_category_player_layout">Δομή</string>
+    <string name="pref_category_defaults">Προεπιλεγμένα</string>
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="subs_font_size">Μέγεθος γραμματοσειράς</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="pref_category_links">Σύνδεσμοι</string>
+    <string name="pref_category_looks">Εμφάνιση</string>
+    <string name="pref_category_ui_features">Χαρακτηριστικά</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="all_languages_preference">Όλες οι γλώσσες</string>
+    <string name="skip_type_format" formatted="true">Παράλειψη %s</string>
+    <string name="apk_installer_package_installer">PackageInstaller</string>
+    <string name="apk_installer_legacy">Legacy</string>
+    <string name="play_trailer_button">Αναπαραγωγή τρέιλερ</string>
+    <string name="action_add_to_bookmarks">Ορισμός κατάστασης θέασης</string>
+    <string name="sort_copy">Αντιγραφή</string>
+    <string name="sort_save">Αποθήκευση</string>
+    <string name="subs_import_text" formatted="true">Εισάγετε γραμματοσειρές τοποθετώντας \'τες στο %s</string>
+    <string name="autoplay_next_settings_des">Αναπαραγωγή του επόμενου επεισοδίου με το τέλος του τρέχοντος</string>
+    <string name="apk_installer_settings">Εγκαταστάτης APK</string>
+    <string name="apk_installer_settings_des">Ορισμένες συσκευές δεν υποστηρίζουν τον νέο εγκαταστάτη πακέτων. Δοκιμάστε την επιλογή Legacy εάν δεν εγκαθίστανται οι ενημερώσεις.</string>
+    <string name="ova">OVA</string>
+    <string name="torrent_singular">Torrent</string>
+    <string name="pref_category_gestures">Χειρονομίες</string>
+    <string name="action_mark_as_watched">Σημείωσε το ως πλήρως παρακολουθημένο</string>
+    <string name="confirm_exit_dialog">Είστε σίγουροι πως θέλετε να βγείτε;</string>
+    <string name="redo_setup_process">Επανάληψη διαδικασίας διαμόρφωσης της εφαρμογής</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index eca96a63..8b3f0625 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -489,4 +489,19 @@
     <string name="apk_installer_settings_des">Alcuni telefoni non supportano il nuovo programma di installazione dei pacchetti. Prova l\'opzione legacy se gli aggiornamenti non vengono installati.</string>
     <string name="apk_installer_settings">Installer APK</string>
     <string name="apk_installer_legacy">Legacy</string>
+    <string name="play_trailer_button">Riproduci trailer</string>
+    <string name="redo_setup_process">Ripeti il processo di configurazione</string>
+    <string name="pref_category_links">Link</string>
+    <string name="pref_category_app_updates">Aggiornamenti app</string>
+    <string name="pref_category_backup">Backup</string>
+    <string name="pref_category_extensions">Estensioni</string>
+    <string name="pref_category_actions">Azioni</string>
+    <string name="pref_category_cache">Cache</string>
+    <string name="pref_category_gestures">Gesti</string>
+    <string name="pref_category_player_features">Funzionalità lettore</string>
+    <string name="pref_category_subtitles">Sottotitoli</string>
+    <string name="pref_category_player_layout">Layout</string>
+    <string name="pref_category_defaults">Predefiniti</string>
+    <string name="pref_category_looks">Aspetto</string>
+    <string name="pref_category_ui_features">Funzionalità</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 56266dac..b3558e0d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -321,7 +321,7 @@
     <string name="subtitle_offset_extra_hint_later_format">Użyj tego, jeśli napisy są wyświetlane %d ms za wcześnie</string>
     <string name="subtitle_offset_extra_hint_before_format">Użyj tego, jeśli napisy są wyświetlane %d ms za późno</string>
     <string name="subtitle_offset_extra_hint_none_format">Brak opóźnienia napisów</string>
-    <string name="subtitles_example_text">Pchnąć w tę łódź jeża lub ośm skrzyń fig.</string>
+    <string name="subtitles_example_text">Pchnąć w tę łódź jeża lub ośm skrzyń fig</string>
     <string name="recommended">Polecane</string>
     <string name="player_loaded_subtitles" formatted="true">Załadowano %s</string>
     <string name="player_load_subtitles">Wczytaj z pliku</string>
@@ -484,4 +484,5 @@
     <string name="pref_category_defaults">Ustawienia domyślne</string>
     <string name="pref_category_player_layout">Układ</string>
     <string name="pref_category_looks">Wygląd</string>
+    <string name="play_trailer_button">Odtwórz zwiastun</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 6cf43a54..f516fd67 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -214,7 +214,8 @@
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">这将永久删除 %s\n您确定吗?</string>
-    <string name="resume_time_left" formatted="true">剩余 %d 分钟</string>
+    <string name="resume_time_left" formatted="true">%d 分钟
+\n剩余</string>
     <string name="status_ongoing">连载中</string>
     <string name="status_completed">已完结</string>
     <string name="status">状态</string>
@@ -533,4 +534,19 @@
     <string name="apk_installer_settings_des">部分手机不支持新的软件包安装程序。如果未安装更新，请尝试使用传统选项。</string>
     <string name="apk_installer_legacy">传统</string>
     <string name="apk_installer_package_installer">软件包安装程序</string>
+    <string name="play_trailer_button">播放预告片</string>
+    <string name="pref_category_ui_features">功能</string>
+    <string name="pref_category_defaults">默认</string>
+    <string name="redo_setup_process">重置设置向导</string>
+    <string name="pref_category_player_layout">布局</string>
+    <string name="pref_category_links">链接</string>
+    <string name="pref_category_extensions">扩展</string>
+    <string name="pref_category_subtitles">字幕</string>
+    <string name="pref_category_app_updates">应用更新</string>
+    <string name="pref_category_backup">备份</string>
+    <string name="pref_category_cache">缓存</string>
+    <string name="pref_category_gestures">手势</string>
+    <string name="pref_category_player_features">播放器功能</string>
+    <string name="pref_category_actions">行为</string>
+    <string name="pref_category_looks">外观</string>
 </resources>
\ No newline at end of file

From 2ba78eb37ed673928338427662fcd961acb14be8 Mon Sep 17 00:00:00 2001
From: LagradOst <46196380+Blatzar@users.noreply.github.com>
Date: Sat, 24 Dec 2022 16:11:52 +0000
Subject: [PATCH 131/273] Revert "Update AndroidManifest.xml (#273)" (#275)

This reverts commit 871dcf717106d5945a7e898c3e211b4c8d74f6ad.
---
 app/src/main/AndroidManifest.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 903a55fd..871c4f69 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -45,8 +45,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        tools:targetApi="o"
-        android:enableOnBackInvokedCallback="true">
+        tools:targetApi="o">
 
         <meta-data
             android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
@@ -190,4 +189,4 @@
         </provider>
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file

From 9c956f68f97ad53331c9a723332c7509ccc3a097 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sun, 25 Dec 2022 19:49:59 +0100
Subject: [PATCH 132/273] make CI add langs from weblate

---
 .github/locales.py                            | 47 +++++++++++++++++++
 .github/workflows/update_locales.yml          | 27 +++++++++++
 README.md                                     | 31 +-----------
 .../lagradost/cloudstream3/CommonActivity.kt  |  2 +-
 .../ui/settings/SettingsGeneral.kt            |  4 +-
 .../strings.xml                               |  0
 6 files changed, 79 insertions(+), 32 deletions(-)
 create mode 100644 .github/locales.py
 create mode 100644 .github/workflows/update_locales.yml
 rename app/src/main/res/{values-zh-rTW => values-zh-TW}/strings.xml (100%)

diff --git a/.github/locales.py b/.github/locales.py
new file mode 100644
index 00000000..e95ec902
--- /dev/null
+++ b/.github/locales.py
@@ -0,0 +1,47 @@
+import re
+import glob
+import requests
+
+
+SETTINGS_PATH = "app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt"
+START_MARKER = "/* begin language list */"
+END_MARKER = "/* end language list */"
+XML_NAME = "app/src/main/res/values-"
+ISO_MAP_URL = "https://gist.githubusercontent.com/Josantonius/b455e315bc7f790d14b136d61d9ae469/raw"
+INDENT = " "*4
+
+iso_map = requests.get(ISO_MAP_URL, timeout=300).json()
+
+# Load settings file
+src = open(SETTINGS_PATH, "r", encoding='utf-8').read()
+before_src, rest = src.split(START_MARKER)
+rest, after_src = rest.split(END_MARKER)
+
+# Load already added langs
+languages = {}
+for lang in re.finditer(r'Triple\("(.*)", "(.*)", "(.*)"\)', rest):
+    flag, name, iso = lang.groups()
+    languages[iso] = (flag, name)
+
+# Add not yet added langs
+for folder in glob.glob(f"{XML_NAME}*"):
+    iso = folder[len(XML_NAME):]
+    if iso not in languages.keys():
+        languages[iso] = ("", iso_map.get(iso.lower(),iso))
+
+# Create triples
+triples = []
+for iso in sorted(languages.keys()):
+    flag, name = languages[iso]
+    triples.append(f'{INDENT}Triple("{flag}", "{name}", "{iso}"),')
+
+# Update settings file
+open(SETTINGS_PATH, "w+",encoding='utf-8').write(
+    before_src +
+    START_MARKER +
+    "\n" +
+    "\n".join(triples) +
+    "\n" +
+    END_MARKER +
+    after_src
+)
\ No newline at end of file
diff --git a/.github/workflows/update_locales.yml b/.github/workflows/update_locales.yml
new file mode 100644
index 00000000..d1bc381f
--- /dev/null
+++ b/.github/workflows/update_locales.yml
@@ -0,0 +1,27 @@
+name: Update locale lists
+
+on:
+  push:
+    paths:
+      - '**.xml'
+
+concurrency: 
+  group: "locale-list"
+  cancel-in-progress: true
+
+jobs:
+  create:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Edit files
+      run: |
+        python3 .github/locales.py
+    - name: Commit to the repo
+      run: |
+        git config user.name "GitHub Actions"
+        git config user.email "actions@github.com"
+        git add .
+        # "echo" returns true so the build succeeds, even if no changed files
+        git commit -m 'chore: update list of locales' || echo
+        git push
\ No newline at end of file
diff --git a/README.md b/README.md
index 0fef9758..3430d626 100644
--- a/README.md
+++ b/README.md
@@ -20,33 +20,4 @@
 ### Supported languages:
 <a href="https://hosted.weblate.org/engage/cloudstream/">
   <img src="https://hosted.weblate.org/widgets/cloudstream/-/app/multi-auto.svg" alt="Translation status" />
-</a>
-
-<!--
-***The list of supported languages:***
-* 🇱🇧 Arabic
-* 🇧🇬 Bulgarian
-* 🇨🇳 Chinese Simplified
-* 🇹🇼 Chinese Traditional
-* 🇭🇷 Croatian
-* 🇨🇿 Czech
-* 🇳🇱 Dutch
-* 🇬🇧 English
-* 🇫🇷 French
-* 🇩🇪 German
-* 🇬🇷 Greek
-* 🇮🇳 Hindi
-* 🇮🇩 Indonesian
-* 🇮🇹 Italian
-* 🇲🇰 Macedonian
-* 🇮🇳 Malayalam
-* 🇳🇴 Norsk
-* 🇵🇱 Polish
-* 🇧🇷 Portuguese (Brazil)
-* 🇷🇴 Romanian
-* 🇪🇸 Spanish
-* 🇸🇪 Swedish
-* 🇵🇭 Tagalog
-* 🇹🇷 Turkish
-* 🇻🇳 Vietnamese
--->
+</a>
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index b7415811..81a65fa4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -116,7 +116,7 @@ object CommonActivity {
      * when setting the app language.
      **/
     val appLanguageExceptions = hashMapOf(
-        "zh_TW" to Locale.TRADITIONAL_CHINESE
+        "zh-TW" to Locale.TRADITIONAL_CHINESE
     )
 
     fun setLocale(context: Context?, languageCode: String?) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 68b65820..ede09805 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -55,6 +55,7 @@ fun getCurrentLocale(context: Context): String {
 // Emoji Character Encoding Data --> C/C++/Java Src
 // https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes leave blank for auto
 val appLanguages = arrayListOf(
+    /* begin language list */
     Triple("", "Spanish", "es"),
     Triple("", "English", "en"),
     Triple("", "Viet Nam", "vi"),
@@ -76,12 +77,13 @@ val appLanguages = arrayListOf(
     Triple("", "Romanian", "ro"),
     Triple("", "Italian", "it"),
     Triple("", "Chinese Simplified", "zh"),
-    Triple("\uD83C\uDDF9\uD83C\uDDFC", "Chinese Traditional", "zh_TW"),
+    Triple("\uD83C\uDDF9\uD83C\uDDFC", "Chinese Traditional", "zh-TW"),
     Triple("\uD83C\uDDEE\uD83C\uDDE9", "Indonesian", "in"),
     Triple("", "Czech", "cs"),
     Triple("", "Croatian", "hr"),
     Triple("", "Bulgarian", "bg"),
     Triple("", "Bengali", "bn"),
+    /* end language list */
 ).sortedBy { it.second } //ye, we go alphabetical, so ppl don't put their lang on top
 
 class SettingsGeneral : PreferenceFragmentCompat() {
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-TW/strings.xml
similarity index 100%
rename from app/src/main/res/values-zh-rTW/strings.xml
rename to app/src/main/res/values-zh-TW/strings.xml

From 7cf9c640b8aff979f00502e07864ad4e93608e81 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Sun, 25 Dec 2022 18:50:12 +0000
Subject: [PATCH 133/273] chore: update list of locales

---
 .../ui/settings/SettingsGeneral.kt            | 51 ++++++++++---------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index ede09805..38c00aa3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -56,34 +56,35 @@ fun getCurrentLocale(context: Context): String {
 // https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes leave blank for auto
 val appLanguages = arrayListOf(
     /* begin language list */
-    Triple("", "Spanish", "es"),
-    Triple("", "English", "en"),
-    Triple("", "Viet Nam", "vi"),
-    Triple("", "Dutch", "nl"),
-    Triple("", "French", "fr"),
-    Triple("", "Greek", "el"),
-    Triple("", "Swedish", "sv"),
-    Triple("", "Tagalog", "tl"),
-    Triple("", "Polish", "pl"),
-    Triple("", "Hindi", "hi"),
-    Triple("", "Malayalam", "ml"),
-    Triple("", "Norsk", "no"),
-    Triple("", "German", "de"),
     Triple("", "Arabic", "ar"),
-    Triple("", "Turkish", "tr"),
-    Triple("", "Macedonian", "mk"),
-    Triple("\uD83C\uDDF5\uD83C\uDDF9", "Portuguese", "pt"),
-    Triple("\uD83C\uDDE7\uD83C\uDDF7", "Brazilian Portuguese", "bp"),
-    Triple("", "Romanian", "ro"),
-    Triple("", "Italian", "it"),
-    Triple("", "Chinese Simplified", "zh"),
-    Triple("\uD83C\uDDF9\uD83C\uDDFC", "Chinese Traditional", "zh-TW"),
-    Triple("\uD83C\uDDEE\uD83C\uDDE9", "Indonesian", "in"),
-    Triple("", "Czech", "cs"),
-    Triple("", "Croatian", "hr"),
     Triple("", "Bulgarian", "bg"),
     Triple("", "Bengali", "bn"),
-    /* end language list */
+    Triple("\uD83C\uDDE7\uD83C\uDDF7", "Brazilian Portuguese", "bp"),
+    Triple("", "Czech", "cs"),
+    Triple("", "German", "de"),
+    Triple("", "Greek", "el"),
+    Triple("", "English", "en"),
+    Triple("", "Spanish", "es"),
+    Triple("", "French", "fr"),
+    Triple("", "Hindi", "hi"),
+    Triple("", "Croatian", "hr"),
+    Triple("\uD83C\uDDEE\uD83C\uDDE9", "Indonesian", "in"),
+    Triple("", "Italian", "it"),
+    Triple("", "Macedonian", "mk"),
+    Triple("", "Malayalam", "ml"),
+    Triple("", "Moldavian", "mo"),
+    Triple("", "Dutch", "nl"),
+    Triple("", "Norsk", "no"),
+    Triple("", "Polish", "pl"),
+    Triple("\uD83C\uDDF5\uD83C\uDDF9", "Portuguese", "pt"),
+    Triple("", "Romanian", "ro"),
+    Triple("", "Swedish", "sv"),
+    Triple("", "Tagalog", "tl"),
+    Triple("", "Turkish", "tr"),
+    Triple("", "Viet Nam", "vi"),
+    Triple("", "Chinese Simplified", "zh"),
+    Triple("\uD83C\uDDF9\uD83C\uDDFC", "Chinese Traditional", "zh-TW"),
+/* end language list */
 ).sortedBy { it.second } //ye, we go alphabetical, so ppl don't put their lang on top
 
 class SettingsGeneral : PreferenceFragmentCompat() {

From e71b70b6a0bad8d2151066dbed8d6836fd11b2c4 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Sun, 25 Dec 2022 19:50:05 +0100
Subject: [PATCH 134/273] Translated using Weblate (Swedish)

Currently translated at 58.0% (327 of 563 strings)

Translated using Weblate (Hebrew)

Currently translated at 35.5% (200 of 563 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (French)

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Hebrew)

Currently translated at 29.8% (168 of 563 strings)

Translated using Weblate (Swedish)

Currently translated at 56.1% (316 of 563 strings)

Added translation using Weblate (Hebrew)

Translated using Weblate (Greek)

Currently translated at 100.0% (563 of 563 strings)

Co-authored-by: Alex Georgiou <alexandrosgeorgiou35@gmail.com>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: LagradOst <blatzar@gmail.com>
Co-authored-by: The Initiator <eithansten@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/el/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/he/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sv/
Translation: Cloudstream/App
---
 app/src/main/res/values-el/strings.xml |   8 +-
 app/src/main/res/values-fr/strings.xml |  36 +++++---
 app/src/main/res/values-it/strings.xml |   8 +-
 app/src/main/res/values-iw/strings.xml | 119 +++++++++++++++++++++++++
 app/src/main/res/values-sv/strings.xml |  69 ++++++++------
 5 files changed, 192 insertions(+), 48 deletions(-)
 create mode 100644 app/src/main/res/values-iw/strings.xml

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 365bb3e0..a6ff5a36 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -95,12 +95,12 @@
     <string name="chromecast_subtitles_settings_des">Ρυθμίσεις υποτίτλων για Chromecast</string>
     <string name="eigengraumode_settings">Eigengravy Mode</string>
     <string name="eigengraumode_settings_des">Προσθέτει την επιλογή ταχύτητας στο πρόγραμμα αναπαραγωγής</string>
-    <string name="swipe_to_seek_settings">Σύρετε για ιχνηλασία</string>
+    <string name="swipe_to_seek_settings">Σύρετε για αναζήτηση</string>
     <string name="swipe_to_seek_settings_des">Σύρετε αριστερά ή δεξιά για να ελέγξετε τον χρόνο στην μπάρα του προγράμματος αναπαραγωγής</string>
     <string name="swipe_to_change_settings">Σύρετε για να αλλάξετε ρυθμίσεις</string>
     <string name="swipe_to_change_settings_des">Σύρετε αριστερά ή δεξιά για να αλλάξετε τη φωτεινότητα ή την ένταση</string>
-    <string name="double_tap_to_seek_settings">Διπλό πάτημα για ιχνηλασία</string>
-    <string name="double_tap_to_seek_settings_des">Διπλό πάτημα στα αριστερά ή δεξιά για ιχνηλασία προς τα μπροστά ή πίσω</string>
+    <string name="double_tap_to_seek_settings">Διπλό πάτημα για αναζήτηση</string>
+    <string name="double_tap_to_seek_settings_des">Διπλό πάτημα στα αριστερά ή δεξιά για αναζήτηση προς τα μπροστά ή πίσω</string>
     <string name="search">Αναζήτηση</string>
     <string name="settings_info">Πληροφορίες</string>
     <string name="advanced_search">Προχωρημένη Αναζήτηση</string>
@@ -389,7 +389,7 @@
     <string name="action_open_play">\@string/home_play</string>
     <string name="provider_info_meta">Δεν έχουν παρασχεθεί μεταδεδομένα από τον ιστότοπο, η φόρτωση του βίντεο θα αποτύχει αν δεν υπάρχει στον ιστότοπο.</string>
     <string name="double_tap_to_pause_settings">Διπλό πάτημα για παύση</string>
-    <string name="double_tap_to_seek_amount_settings">Μέγεθος ιχνηλασίας στο πρόγραμμα αναπαραγωγής</string>
+    <string name="double_tap_to_seek_amount_settings">Μέγεθος αναζήτησης στο πρόγραμμα αναπαραγωγής</string>
     <string name="automatic_plugin_updates">Αυτόματη ενημέρωση plugin</string>
     <string name="automatic_plugin_download">Αυτόματη λήψη plugin</string>
     <string name="dns_pref">DNS μέσω HTTPS</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 22140d89..8961d1a4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -149,7 +149,7 @@
     <string name="provider_lang_settings">Language des fournisseurs</string>
     <string name="preferred_media_settings">Médias préférées</string>
     <string name="automatic">Auto</string>
-    <string name="cast_format">Acteurs: %s</string>
+    <string name="cast_format">Distribution : %s</string>
     <string name="duration_format">%d min</string>
     <string name="search_hint_site">Rechercher sur %s…</string>
     <string name="type_re_watching">À re-regarder</string>
@@ -175,7 +175,7 @@
     <string name="emulator_layout">Disposition émulateur</string>
     <string name="bottom_title_settings">Position du titre du poster</string>
     <string name="bottom_title_settings_des">Mettre le titre sous le poster</string>
-    <string name="account">Compte</string>
+    <string name="account">compte</string>
     <string name="logout">Se déconnecter</string>
     <string name="login">Se connecter</string>
     <string name="switch_account">Changer de compte</string>
@@ -344,7 +344,7 @@
     <string name="enable_nsfw_on_providers">Active le nsfw sur les fournisseurs ayant cette option</string>
     <string name="example_password">motdepasse123</string>
     <string name="example_username">MonNomDutilisateur</string>
-    <string name="example_lang_name">Code du langage (fr)</string>
+    <string name="example_lang_name">Code de la langue (fr)</string>
     <string name="create_account">Créer un compte</string>
     <string name="player_load_subtitles_online">Charger depuis internet</string>
     <string name="resolution_and_title">Résolution et titre</string>
@@ -420,14 +420,14 @@
     <string name="batch_download_finish_format" formatted="true">Téléchargé %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Tous les %s déjà téléchargés</string>
     <string name="setup_extensions_subtext">Télécharger la liste de sites que vous voulez utiliser</string>
-    <string name="plugins_downloaded" formatted="true">Téléchargé: %d</string>
+    <string name="plugins_downloaded" formatted="true">Téléchargé : %d</string>
     <string name="video_tracks">Pistes vidéo</string>
     <string name="apply_on_restart">Appliqué au redémarrage</string>
     <string name="safe_mode_description">Toutes les extensions ont été désactivé à cause d\'un crash pour vous aider à trouver l\'extension causant le problème.</string>
     <string name="safe_mode_title">Mode sans échec activé</string>
     <string name="extension_size">Taille</string>
     <string name="extension_version">Version</string>
-    <string name="extension_rating" formatted="true">Note: %s</string>
+    <string name="extension_rating" formatted="true">Note : %s</string>
     <string name="extension_description">Description</string>
     <string name="extension_status">Status</string>
     <string name="extension_install_first">Installer l\'extension d\'abord</string>
@@ -446,8 +446,8 @@
     <string name="repository_name_hint">Nom du repository</string>
     <string name="plugin_singular">plugin</string>
     <string name="delete_repository">Supprimer le repository</string>
-    <string name="plugins_disabled" formatted="true">Désactivé: %d</string>
-    <string name="plugins_not_downloaded" formatted="true">Non téléchargé: %d</string>
+    <string name="plugins_disabled" formatted="true">Désactivé : %d</string>
+    <string name="plugins_not_downloaded" formatted="true">Non téléchargé : %d</string>
     <string name="plugins_updated" formatted="true">%d plugins mis-à-jour</string>
     <string name="download_all_plugins_from_repo">Télécharger tous les plugins de ce repository \?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Désactivé)</string>
@@ -463,14 +463,28 @@
     <string name="apk_installer_package_installer">Installateur de paquet</string>
     <string name="plugin">plugins</string>
     <string name="delete_repository_plugins">Cela supprimera également tous les plugins du repository</string>
-    <string name="blank_repo_message">CloudStream n\'a pas de site installés par défaut.
-\nIl faut installer les sites depuis des repository.
+    <string name="blank_repo_message">CloudStream n\'a pas de sites installés par défaut. Vous devez installer les sites à partir de dépôts.
 \n
-\nA cause de Sky UK Limited 🤮 on ne peut pas afficher les repository dans l\'application.
+\nEn raison d\'un retrait DMCA irréfléchi de Sky UK Limited 🤮, nous ne pouvons pas lier le site du dépôt dans l\'application.
 \n
-\nRejoignez notre Discord ou chercher des repository sur internet.</string>
+\nRejoignez notre Discord ou cherchez en ligne.</string>
     <string name="extension_language">Langage</string>
     <string name="enable_skip_op_from_database_des">Afficher les popups skip pour les intro / fins</string>
     <string name="apk_installer_legacy">Ancienne méthode d\'installation</string>
     <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="pref_category_links">Liens</string>
+    <string name="pref_category_gestures">Gestes</string>
+    <string name="pref_category_player_features">Fonctionnalités du lecteur</string>
+    <string name="pref_category_subtitles">Sous-titres</string>
+    <string name="pref_category_player_layout">Disposition</string>
+    <string name="pref_category_defaults">Valeurs par défaut</string>
+    <string name="pref_category_looks">Apparence</string>
+    <string name="pref_category_ui_features">Fonctionnalités</string>
+    <string name="play_trailer_button">Lire la bande-annonce</string>
+    <string name="pref_category_app_updates">Mises à jour de l\'application</string>
+    <string name="pref_category_backup">Sauvegarde</string>
+    <string name="pref_category_extensions">Extensions</string>
+    <string name="pref_category_actions">Actions</string>
+    <string name="pref_category_cache">Cache</string>
+    <string name="redo_setup_process">Refaire le processus d\'installation</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8b3f0625..91d7da85 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -312,11 +312,11 @@
     <string name="login_format" formatted="true">%s %s</string>
     <string name="account">account</string>
     <string name="logout">Disconnetti</string>
-    <string name="login">Login</string>
+    <string name="login">Accedi</string>
     <string name="switch_account">Cambia account</string>
     <string name="add_account">Aggiungi account</string>
-    <string name="create_account">Crea account</string>
-    <string name="add_sync">Aggiungi tracking</string>
+    <string name="create_account">Crea un account</string>
+    <string name="add_sync">Aggiungi tracciamento</string>
     <string name="added_sync_format" formatted="true">Aggiunto %s</string>
     <string name="upload_sync">Sincronizza</string>
     <string name="sync_score">Valutato</string>
@@ -500,7 +500,7 @@
     <string name="pref_category_gestures">Gesti</string>
     <string name="pref_category_player_features">Funzionalità lettore</string>
     <string name="pref_category_subtitles">Sottotitoli</string>
-    <string name="pref_category_player_layout">Layout</string>
+    <string name="pref_category_player_layout">Disposizione</string>
     <string name="pref_category_defaults">Predefiniti</string>
     <string name="pref_category_looks">Aspetto</string>
     <string name="pref_category_ui_features">Funzionalità</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
new file mode 100644
index 00000000..f5bd96f8
--- /dev/null
+++ b/app/src/main/res/values-iw/strings.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="preview_background_img_des">הרקע של ההצגה לפני</string>
+    <string name="cast_format" formatted="true">צוות שחקנים: %s</string>
+    <string name="go_back_img_des">לחזור</string>
+    <string name="home_change_provider_img_des">לשנות ספק</string>
+    <string name="player_speed_text_format" formatted="true">מהירות (%.2fx)</string>
+    <string name="rated_format" formatted="true">דירוג: %.1f</string>
+    <string name="new_update_format" formatted="true">נמצא עדכון חדש!
+\n%s -&gt; %s</string>
+    <string name="filler" formatted="true">סינון</string>
+    <string name="duration_format" formatted="true">%d דקות</string>
+    <string name="app_name">קלאודסטרים</string>
+    <string name="title_home">בית</string>
+    <string name="title_search">חיפוש</string>
+    <string name="title_downloads">הורדות</string>
+    <string name="title_settings">הגדרות</string>
+    <string name="search_hint">חיפוש…</string>
+    <string name="search_hint_site" formatted="true">חיפוש %s…</string>
+    <string name="no_data">ללא נתונים</string>
+    <string name="episode_more_options_des">יותר אפשרויות</string>
+    <string name="result_tags">ז\'אנרים</string>
+    <string name="result_share">שיתוף</string>
+    <string name="result_open_in_browser">לפתוח בדפדפן</string>
+    <string name="skip_loading">דלג על טעינה</string>
+    <string name="next_episode_format" formatted="true">פרק %d יצא בעוד</string>
+    <string name="next_episode_time_day_format" formatted="true">%dימים %dשעות %dחודשים</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dשעות %dחודשים</string>
+    <string name="next_episode_time_min_format" formatted="true">%dחודשים</string>
+    <string name="result_poster_img_des">פוסטר</string>
+    <string name="episode_poster_img_des">הפוסטר של הפרק</string>
+    <string name="home_main_poster_img_des">פוסטר ראשי</string>
+    <string name="home_next_random_img_des">ארקאי הבא</string>
+    <string name="type_completed">הושלם</string>
+    <string name="type_plan_to_watch">בתכנון לצפייה</string>
+    <string name="type_re_watching">צופה מחדש</string>
+    <string name="play_movie_button">נגן סרט</string>
+    <string name="play_trailer_button">נגן קדימון</string>
+    <string name="play_livestream_button">נגן שידור חי</string>
+    <string name="pick_source">מקורות</string>
+    <string name="reload_error">נסיון חדש לחיבור…</string>
+    <string name="type_dropped">נעצר</string>
+    <string name="play_torrent_button">שידור טורנט</string>
+    <string name="go_back">חזרה</string>
+    <string name="play_episode">נגן פרק</string>
+    <string name="downloaded">הורד</string>
+    <string name="downloading">מוריד</string>
+    <string name="download_paused">ההורדה מושהית</string>
+    <string name="download_started">ההורדה התחילה</string>
+    <string name="download_failed">ההורדה נכשלה</string>
+    <string name="download_canceled">ההורדה בוטלה</string>
+    <string name="download_done">נגן טריילר</string>
+    <string name="stream">להזרים טורנט</string>
+    <string name="error_loading_links_toast">שגיאה בטעינת קישורים</string>
+    <string name="download_storage_text">אחסון פנימי</string>
+    <string name="app_subbed_text">עם כתוביות</string>
+    <string name="popup_delete_file">מחיקת קובץ</string>
+    <string name="popup_play_file">נגן קובץ</string>
+    <string name="popup_resume_download">המשך הורדה</string>
+    <string name="popup_pause_download">השהה את ההורדה</string>
+    <string name="pref_disable_acra">השבת את דיווח הבאגים האוטומטי</string>
+    <string name="home_play">נגן</string>
+    <string name="home_info">מידע</string>
+    <string name="filter_bookmarks">סנן סימניות</string>
+    <string name="error_bookmarks_text">סימניות</string>
+    <string name="action_remove_from_bookmarks">הסר</string>
+    <string name="action_add_to_bookmarks">הגדר מצב צפייה</string>
+    <string name="sort_apply">ליישם</string>
+    <string name="sort_cancel">בטל</string>
+    <string name="sort_copy">העתק</string>
+    <string name="sort_close">לסגור</string>
+    <string name="sort_clear">נקה</string>
+    <string name="sort_save">לשמור</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s פרק %d</string>
+    <string name="play_with_app_name">נגן עם קלאודסטרים</string>
+    <string name="next_episode">פרק הבא</string>
+    <string name="loading">טוען…</string>
+    <string name="type_watching">צופה ב</string>
+    <string name="pick_subtitle">כתוביות</string>
+    <string name="type_on_hold">בהמתנה</string>
+    <string name="type_none">ללא</string>
+    <string name="download">להוריד</string>
+    <string name="app_dubbed_text">מדובב</string>
+    <string name="home_more_info">יותר מידע</string>
+    <string name="home_expanded_hide">להתחבא</string>
+    <string name="player_speed">מהירות הנגן</string>
+    <string name="subtitles_settings">הגדרות הכתוביות</string>
+    <string name="subs_text_color">צבע טקסט</string>
+    <string name="subs_outline_color">צבע חיצון</string>
+    <string name="subs_edge_type">סוג קצה</string>
+    <string name="subs_subtitle_elevation">גובה הכתוביות</string>
+    <string name="subs_font_size">גודל גופן</string>
+    <string name="search_provider_text_providers">חפש באמצעות הספקים</string>
+    <string name="search_provider_text_types">חפש באמצעות סוגים</string>
+    <string name="subs_auto_select_language">בחירת שפה אוטומטית</string>
+    <string name="subs_download_languages">הורדת שפות</string>
+    <string name="subs_subtitle_languages">שפת הכתוביות</string>
+    <string name="subs_import_text" formatted="true">ייבא גופנים בהצבתם ב %s</string>
+    <string name="continue_watching">להמשיך לצפות</string>
+    <string name="action_remove_watching">להסיר</string>
+    <string name="action_open_watching">עוד מידע</string>
+    <string name="vpn_torrent">הספק הזה הוא טורנט, שימוש ב-VPN הוא מומלץ</string>
+    <string name="torrent_plot">תיאור</string>
+    <string name="normal_no_plot">עלילה לא נמצאה</string>
+    <string name="torrent_no_plot">העלילה לא נמצאה</string>
+    <string name="picture_in_picture">מצב תמונה בתמונה</string>
+    <string name="player_size_settings">כפתור שינוי גודל הנגן</string>
+    <string name="player_size_settings_des">הסר את הגבולות השחורים</string>
+    <string name="benene_count_text">%d ניתן למפתחים</string>
+    <string name="player_subtitles_settings_des">הגדרות כתוביות הנגן</string>
+    <string name="chromecast_subtitles_settings_des">הגדרות כתוביות כרומקאסט</string>
+    <string name="subs_font">גופן</string>
+    <string name="subs_hold_to_reset_to_default">החזק כדי לאפס לברירת מחדל</string>
+    <string name="subs_background_color">צבע הרקע</string>
+    <string name="vpn_might_be_needed">ייתכן שיהיה צורך לשימוש ב-VPN כדי שספק זה יפעל באופן נכון</string>
+    <string name="chromecast_subtitles_settings">כתוביות כרומקאסט</string>
+    <string name="picture_in_picture_des">ממשיך ניגון בנגן מינימלי מעל ישומים אחרים</string>
+    <string name="player_subtitles_settings">כתוביות</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 58ff060e..c36d5056 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1,9 +1,8 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <string name="rated_format">Betygsatt: %.1f</string>
     <string name="player_speed_text_format">Hastighet (%.2fx)</string>
-    <string name="new_update_format">Ny uppdatering hittad!\n%s -> %s</string>
-
+    <string name="new_update_format">Ny uppdatering hittad!\n%s -&gt; %s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Hem</string>
     <string name="title_search">Sök</string>
@@ -21,14 +20,12 @@
     <string name="result_open_in_browser">Öppna i webbläsaren</string>
     <string name="skip_loading">Hoppa över</string>
     <string name="loading">Laddar…</string>
-
     <string name="type_watching">Tittar på</string>
     <string name="type_on_hold">Pausad</string>
     <string name="type_completed">Avslutad</string>
     <string name="type_dropped">Dropped</string>
     <string name="type_plan_to_watch">Plannerad</string>
     <string name="type_none">Ingen</string>
-
     <string name="play_movie_button">Spela Upp</string>
     <string name="play_torrent_button">Strömma Torrent</string>
     <string name="pick_source">Källor</string>
@@ -39,13 +36,10 @@
     <string name="play_episode">Spela Avsnitt</string>
     <string name="download">Ladda ner</string>
     <string name="download_storage_text">Intern lagring</string>
-
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Sub</string>
-
     <string name="popup_delete_file">Ta bort</string>
     <string name="popup_play_file">Spela upp</string>
-
     <string name="pref_disable_acra">Inaktivera automatisk felrapportering</string>
     <string name="home_more_info">Mer information</string>
     <string name="home_expanded_hide">Hide</string>
@@ -71,24 +65,19 @@
     <string name="subs_font">Font</string>
     <string name="search_provider_text_providers">Sök med följande leverantörer</string>
     <string name="search_provider_text_types">Sök med följande filmtyper</string>
-
     <string name="benene_count_text">%d Bananer donerade till utvecklarna</string>
     <string name="benene_count_text_none">Inga bananer givna</string>
-
     <string name="subs_auto_select_language">Automatisk val av undertextspråk</string>
     <string name="subs_download_languages">Automatisk nerladdaning av språk</string>
     <string name="subs_hold_to_reset_to_default">Håll inne för att återställa till standard</string>
     <string name="continue_watching">Fortsätt titta</string>
-
     <string name="action_remove_watching">Ta bort</string>
     <string name="action_open_watching">Mer information</string>
-
     <string name="vpn_might_be_needed">En VPN kan behövas för att den här leverantören ska fungera korrekt</string>
     <string name="vpn_torrent">Denna leverantör är en torrent, en VPN rekommenderas</string>
     <string name="torrent_plot">Beskrivning</string>
     <string name="normal_no_plot">Ingen sammanfattning hittades</string>
     <string name="torrent_no_plot">Ingen beskrivning hittades</string>
-
     <string name="picture_in_picture">Bild-i-bild</string>
     <string name="picture_in_picture_des">Fortsätter uppspelning i en miniatyrspelare ovanpå andra appar</string>
     <string name="player_size_settings">Lägger till en knapp för att justera bildförhållandet</string>
@@ -119,9 +108,7 @@
     <string name="discord">Gå med i Discord-gruppen</string>
     <string name="benene">Ge en banan till utvecklarna</string>
     <string name="benene_des">Ge banan</string>
-
     <string name="app_language">Språk</string>
-
     <string name="no_chromecast_support_toast">Denna leverantör har inget Chromecast-stöd</string>
     <string name="no_links_found_toast">Inga länkar hittades</string>
     <string name="copy_link_toast">Länken kopierades till urklipp</string>
@@ -129,18 +116,15 @@
     <string name="subs_default_reset_toast">Återställd till standardvärdet</string>
     <string name="acra_report_toast">Programmet kraschade tyvärr. En anonym felrapport kommer att skickas till utvecklarna</string>
     <string name="error_loading_links_toast">Fel uppstod vid laddning av länkarna</string>
-
     <string name="season">Säsong</string>
     <string name="no_season">Ingen Säsong</string>
     <string name="episode">Avsnitt</string>
     <string name="episodes">Avsnitt</string>
     <string name="season_short">S</string>
     <string name="episode_short">A</string>
-
     <string name="delete_file">Ta bort nerladdad fil</string>
     <string name="delete">Ta bort</string>
     <string name="delete_message">%s kommer att raderas permanent\nÄr du helt säker?</string>
-
     <string name="status_ongoing">Pågående</string>
     <string name="status_completed">Färdig</string>
     <string name="status">Status</string>
@@ -149,21 +133,17 @@
     <string name="duration">Längd</string>
     <string name="site">Sida</string>
     <string name="synopsis">Sammanfattning</string>
-
     <string name="queued">på kö</string>
     <string name="no_subtitles">Inga undertexter</string>
     <string name="default_subtitles">Standard</string>
-
     <string name="free_storage">Tillgängligt</string>
     <string name="used_storage">Använtt</string>
     <string name="app_storage">App</string>
-
     <string name="movies">Filmer</string>
     <string name="tv_series">Tv Serier</string>
     <string name="cartoons">Cartoons</string>
     <string name="anime">Anime</string>
     <string name="torrent">Torrent</string>
-
     <string name="episode_action_chromecast_episode">Chromecasta ett Avsnitt</string>
     <string name="episode_action_chromecast_mirror">Chromecasta en Länk</string>
     <string name="episode_action_play_in_app">Spela upp i appen</string>
@@ -173,18 +153,14 @@
     <string name="episode_action_auto_download">Automatisk nerladdning</string>
     <string name="episode_action_download_mirror">Ladda ner en specifik länk</string>
     <string name="episode_action_reload_links">Ladda om alla länkar</string>
-
     <string name="no_update_found">Ingen uppdatering hittad</string>
     <string name="check_for_update">Sök efter uppdatering</string>
-
     <string name="video_lock">Skärmlås</string>
     <string name="video_aspect_ratio_resize">Bildförhållande</string>
     <string name="video_source">Källa</string>
     <string name="video_skip_op">Hoppa över OP</string>
-
     <string name="dont_show_again">Visa inte igen</string>
     <string name="update">Uppdatera</string>
-
     <string name="download_started">Nerladdningar startad</string>
     <string name="download_failed">Nerladdning Misslyckades</string>
     <string name="downloaded">Nerladdad</string>
@@ -194,7 +170,6 @@
     <string name="download_done">Nerladdning Färdig</string>
     <string name="popup_resume_download">Återupta nerladdning</string>
     <string name="popup_pause_download">Pausa nerladdning</string>
-
     <string name="pause">Pausa</string>
     <string name="resume">Återuppta</string>
     <string name="storage_error">Ett nerladdningsfel uppstod, kolla om appen har lagringsbehörigheter</string>
@@ -235,4 +210,40 @@
     <string name="dns_pref_summary">" "</string>
     <string name="app_theme_settings">Appens tema</string>
     <string name="app_dub_sub_episode_text_format">%s A%d</string>
-</resources>
+    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="play_with_app_name">Spela med CloudStream</string>
+    <string name="chromecast_subtitles_settings">Chromecast-undertexter</string>
+    <string name="double_tap_to_pause_settings_des">Tryck i mitten för att pausa</string>
+    <string name="restore_settings">Återställ data från backup</string>
+    <string name="category_account">Konton</string>
+    <string name="category_updates">Uppdateringar och backup</string>
+    <string name="automatic_plugin_updates">Automatiska pluginuppdateringar</string>
+    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="search_hint_site" formatted="true">Sök %s…</string>
+    <string name="sort_copy">Kopiera</string>
+    <string name="sort_close">Stäng</string>
+    <string name="double_tap_to_pause_settings">Dubbeltryck för att pausa</string>
+    <string name="sort_save">Spara</string>
+    <string name="subs_subtitle_languages">Undertextspråk</string>
+    <string name="show_log_cat">Visa Logcat 🐈</string>
+    <string name="autoplay_next_settings">Autospela nästa episod</string>
+    <string name="play_trailer_button">Spela Trailer</string>
+    <string name="autoplay_next_settings_des">Starta nästa episod när nuvarande slutar</string>
+    <string name="next_episode_format" formatted="true">Episod %d kommer släppas om</string>
+    <string name="duration_format" formatted="true">%d min</string>
+    <string name="show_trailers_settings">Visa trailers</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="ova">OVA</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="go_back_30">-30</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nåterstår</string>
+    <string name="nsfw">NSFW</string>
+    <string name="ova_singular">\@string/ova</string>
+    <string name="torrent_singular">Torrent</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="go_forward_30">+30</string>
+</resources>
\ No newline at end of file

From c11bab4a511621edef706dacc0f56c6e196e2f14 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Sun, 25 Dec 2022 18:50:29 +0000
Subject: [PATCH 135/273] chore: update list of locales

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 38c00aa3..2e3ea612 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -70,6 +70,7 @@ val appLanguages = arrayListOf(
     Triple("", "Croatian", "hr"),
     Triple("\uD83C\uDDEE\uD83C\uDDE9", "Indonesian", "in"),
     Triple("", "Italian", "it"),
+    Triple("", "Hebrew", "iw"),
     Triple("", "Macedonian", "mk"),
     Triple("", "Malayalam", "ml"),
     Triple("", "Moldavian", "mo"),

From 6db688e0bfd1dcab0c623989cf4cf4f9a8eb0bdc Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sun, 25 Dec 2022 19:52:30 +0100
Subject: [PATCH 136/273] only run on master

---
 .github/workflows/update_locales.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/update_locales.yml b/.github/workflows/update_locales.yml
index d1bc381f..ef9c52e0 100644
--- a/.github/workflows/update_locales.yml
+++ b/.github/workflows/update_locales.yml
@@ -4,6 +4,8 @@ on:
   push:
     paths:
       - '**.xml'
+    branches:
+      - master
 
 concurrency: 
   group: "locale-list"
@@ -24,4 +26,4 @@ jobs:
         git add .
         # "echo" returns true so the build succeeds, even if no changed files
         git commit -m 'chore: update list of locales' || echo
-        git push
\ No newline at end of file
+        git push

From 0073ad8c81b4d82b8ae75ba590a2bc5b518e8c24 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sun, 25 Dec 2022 19:56:59 +0100
Subject: [PATCH 137/273] fix zh-TW

---
 app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt  | 2 +-
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt   | 2 +-
 app/src/main/res/{values-zh-TW => values-zh-rTW}/strings.xml    | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename app/src/main/res/{values-zh-TW => values-zh-rTW}/strings.xml (100%)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index 81a65fa4..89f0ae51 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -116,7 +116,7 @@ object CommonActivity {
      * when setting the app language.
      **/
     val appLanguageExceptions = hashMapOf(
-        "zh-TW" to Locale.TRADITIONAL_CHINESE
+        "zh-rTW" to Locale.TRADITIONAL_CHINESE
     )
 
     fun setLocale(context: Context?, languageCode: String?) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 2e3ea612..af87248b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -84,7 +84,7 @@ val appLanguages = arrayListOf(
     Triple("", "Turkish", "tr"),
     Triple("", "Viet Nam", "vi"),
     Triple("", "Chinese Simplified", "zh"),
-    Triple("\uD83C\uDDF9\uD83C\uDDFC", "Chinese Traditional", "zh-TW"),
+    Triple("\uD83C\uDDF9\uD83C\uDDFC", "Chinese Traditional", "zh-rTW"),
 /* end language list */
 ).sortedBy { it.second } //ye, we go alphabetical, so ppl don't put their lang on top
 
diff --git a/app/src/main/res/values-zh-TW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from app/src/main/res/values-zh-TW/strings.xml
rename to app/src/main/res/values-zh-rTW/strings.xml

From 5f1e790163036f3ad16fa5ba5fd934c166ab05e9 Mon Sep 17 00:00:00 2001
From: Horis <821938089@qq.com>
Date: Tue, 27 Dec 2022 03:55:23 +0800
Subject: [PATCH 138/273] Fix backup on A13 (#280)

---
 .../lagradost/cloudstream3/MainActivity.kt    |   1 +
 .../cloudstream3/utils/BackupUtils.kt         | 110 +++++++++---------
 .../lagradost/cloudstream3/utils/UIHelper.kt  |   5 +-
 3 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 9a591580..71c0b2b5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -4,6 +4,7 @@ import android.content.ComponentName
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.KeyEvent
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
index 338b1ed2..f4f4e3be 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.utils
 
+import android.annotation.SuppressLint
 import android.content.ContentValues
 import android.content.Context
 import android.net.Uri
@@ -74,7 +75,7 @@ object BackupUtils {
         return !nonTransferableKeys.contains(this)
     }
 
-    var restoreFileSelector: ActivityResultLauncher<Array<String>>? = null
+    private var restoreFileSelector: ActivityResultLauncher<Array<String>>? = null
 
     // Kinda hack, but I couldn't think of a better way
     data class BackupVars(
@@ -91,6 +92,7 @@ object BackupUtils {
         @JsonProperty("settings") val settings: BackupVars
     )
 
+    @Suppress("UNCHECKED_CAST")
     fun Context.getBackup(): BackupFile {
         val allData = getSharedPrefs().all.filter { it.key.isTransferable() }
         val allSettings = getDefaultSharedPrefs().all.filter { it.key.isTransferable() }
@@ -143,64 +145,66 @@ object BackupUtils {
         }
     }
 
+    @SuppressLint("SimpleDateFormat")
     fun FragmentActivity.backup() {
         try {
-            if (checkWrite()) {
-                val subDir = getBasePath().first
-                val date = SimpleDateFormat("yyyy_MM_dd_HH_mm").format(Date(currentTimeMillis()))
-                val ext = "json"
-                val displayName = "CS3_Backup_${date}"
-                val backupFile = getBackup()
-
-                val steam =
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && subDir?.isDownloadDir() == true) {
-                        val cr = this.contentResolver
-                        val contentUri =
-                            MediaStore.Downloads.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY) // USE INSTEAD OF MediaStore.Downloads.EXTERNAL_CONTENT_URI
-                        //val currentMimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-
-                        val newFile = ContentValues().apply {
-                            put(MediaStore.MediaColumns.DISPLAY_NAME, displayName)
-                            put(MediaStore.MediaColumns.TITLE, displayName)
-                            // While it a json file we store as txt because not
-                            // all file managers support mimetype json
-                            put(MediaStore.MediaColumns.MIME_TYPE, "text/plain")
-                            //put(MediaStore.MediaColumns.RELATIVE_PATH, folder)
-                        }
-
-                        val newFileUri = cr.insert(
-                            contentUri,
-                            newFile
-                        ) ?: throw IOException("Error creating file uri")
-                        cr.openOutputStream(newFileUri, "w")
-                            ?: throw IOException("Error opening stream")
-                    } else {
-                        val fileName = "$displayName.$ext"
-                        val rFile = subDir?.findFile(fileName)
-                        if (rFile?.exists() == true) {
-                            rFile.delete()
-                        }
-                        val file =
-                            subDir?.createFile(fileName)
-                                ?: throw IOException("Error creating file")
-                        if (!file.exists()) throw IOException("File does not exist")
-                        file.openOutputStream()
-                    }
-
-                val printStream = PrintWriter(steam)
-                printStream.print(mapper.writeValueAsString(backupFile))
-                printStream.close()
-
-                showToast(
-                    this,
-                    R.string.backup_success,
-                    Toast.LENGTH_LONG
-                )
-            } else {
+            if (!checkWrite()) {
                 showToast(this, getString(R.string.backup_failed), Toast.LENGTH_LONG)
                 requestRW()
                 return
             }
+
+            val subDir = getBasePath().first
+            val date = SimpleDateFormat("yyyy_MM_dd_HH_mm").format(Date(currentTimeMillis()))
+            val ext = "json"
+            val displayName = "CS3_Backup_${date}"
+            val backupFile = getBackup()
+
+            val steam = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+                && subDir?.isDownloadDir() == true
+            ) {
+                val cr = this.contentResolver
+                val contentUri =
+                    MediaStore.Downloads.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY) // USE INSTEAD OF MediaStore.Downloads.EXTERNAL_CONTENT_URI
+                //val currentMimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
+
+                val newFile = ContentValues().apply {
+                    put(MediaStore.MediaColumns.DISPLAY_NAME, displayName)
+                    put(MediaStore.MediaColumns.TITLE, displayName)
+                    // While it a json file we store as txt because not
+                    // all file managers support mimetype json
+                    put(MediaStore.MediaColumns.MIME_TYPE, "text/plain")
+                    //put(MediaStore.MediaColumns.RELATIVE_PATH, folder)
+                }
+
+                val newFileUri = cr.insert(
+                    contentUri,
+                    newFile
+                ) ?: throw IOException("Error creating file uri")
+                cr.openOutputStream(newFileUri, "w")
+                    ?: throw IOException("Error opening stream")
+            } else {
+                val fileName = "$displayName.$ext"
+                val rFile = subDir?.findFile(fileName)
+                if (rFile?.exists() == true) {
+                    rFile.delete()
+                }
+                val file =
+                    subDir?.createFile(fileName)
+                        ?: throw IOException("Error creating file")
+                if (!file.exists()) throw IOException("File does not exist")
+                file.openOutputStream()
+            }
+
+            val printStream = PrintWriter(steam)
+            printStream.print(mapper.writeValueAsString(backupFile))
+            printStream.close()
+
+            showToast(
+                this,
+                R.string.backup_success,
+                Toast.LENGTH_LONG
+            )
         } catch (e: Exception) {
             logError(e)
             try {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
index 553860ba..63b3623d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
@@ -57,7 +57,10 @@ object UIHelper {
             this,
             Manifest.permission.WRITE_EXTERNAL_STORAGE
         )
-                == PackageManager.PERMISSION_GRANTED)
+                == PackageManager.PERMISSION_GRANTED
+                // Since Android 13, we can't request external storage permission,
+                // so don't check it.
+                || Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
     }
 
     fun Activity.requestRW() {

From 9fc5c5352e48f7ecec3573d2373cc934a02fb713 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Mon, 26 Dec 2022 18:09:42 +0100
Subject: [PATCH 139/273] Translated using Weblate (Croatian)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Croatian)

Currently translated at 97.8% (551 of 563 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 93.6% (527 of 563 strings)

Translated using Weblate (Greek)

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Bulgarian)

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (563 of 563 strings)

Co-authored-by: Alex Georgiou <alexandrosgeorgiou35@gmail.com>
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Anarchydr <patrikpik879@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Radoslav Vasilev Vasilev <fifata@gmail.com>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bg/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/el/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nb_NO/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml |  21 +--
 app/src/main/res/values-bg/strings.xml |  64 ++++++---
 app/src/main/res/values-el/strings.xml |   2 +-
 app/src/main/res/values-hr/strings.xml | 186 +++++++++++--------------
 app/src/main/res/values-no/strings.xml |  19 +++
 5 files changed, 157 insertions(+), 135 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 84f70876..4cf4975b 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -12,7 +12,8 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">سرعة (%.2fx)</string>
     <string name="rated_format" formatted="true">تقييم: %.1f</string>
-    <string name="new_update_format" formatted="true">!تم العثور علي تحديث جديد\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">!تم العثور على تحديث جديد
+\n%s -&gt; %s</string>
     <string name="duration_format" formatted="true">%d دقيقة</string>
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">تشغيل بواسطة CloudStream</string>
@@ -132,7 +133,7 @@
     <string name="use_system_brightness_settings_des">استخدم سطوع النظام في مُشغل التطبيق بدلاً من التراكب الداكن</string>
     <string name="episode_sync_settings">تحديث تقدم المشاهدة</string>
     <string name="episode_sync_settings_des">مزامنة التقدم في الحلقة الحالية تلقائيًا</string>
-    <string name="restore_settings">إسترجاع البيانات من نسخة إحتياطية</string>
+    <string name="restore_settings">إسترجاع البيانات من النسخة الإحتياطية</string>
     <string name="backup_settings">نسخ إحتياطي للبيانات</string>
     <string name="restore_success">تم تحميل ملف النسخة الاحتياطية</string>
     <string name="restore_failed_format" formatted="true">فشل استيراد البيانات من الملف %s</string>
@@ -261,13 +262,13 @@
     <string name="limit_title_rez">أبعاد مُشغل الفيديو</string>
     <string name="video_buffer_size_settings">حجم ذاكرة التخزين المؤقت للفيديو</string>
     <string name="video_buffer_length_settings">طول التخزين المؤقت</string>
-    <string name="video_buffer_disk_settings">التخزين المؤقت للفيديو علي القرص</string>
+    <string name="video_buffer_disk_settings">التخزين المؤقت للفيديو على القرص</string>
     <string name="video_buffer_clear_settings">مسح التخزين المؤقت للصورة والفيديو</string>
     <string name="video_ram_description">يتسبب في حدوث أعطال إذا تم ضبطه على مستوى مرتفع جدا على الأجهزة ذات الذاكرة المنخفضة ، مثل Android TV.</string>
     <string name="video_disk_description">يسبب مشاكل إذا تم ضبطه على مستوى مرتفع جدا على الأجهزة ذات مساحة التخزين المنخفضة ، مثل Android TV.</string>
     <string name="dns_pref">إستخدام DNS بدلا من HTTPS</string>
     <string name="dns_pref_summary">مفيد لتجاوز حجب مزود خدمة الإنترنت</string>
-    <string name="add_site_pref">نسخ موقع</string>
+    <string name="add_site_pref">موقع بديل (نسخة)</string>
     <string name="remove_site_pref">حذف موقع</string>
     <string name="add_site_summary">إضافة نسخة من موقع موجود، بعنوان URL مختلف</string>
     <string name="download_path_pref">مسار التنزيل</string>
@@ -296,11 +297,11 @@
     </string>
     <string name="category_general">عام</string>
     <string name="random_button_settings">زر العشوائي</string>
-    <string name="random_button_settings_desc">إظهار زر العشوائي علي الشاشة الرئيسية</string>
+    <string name="random_button_settings_desc">إظهار زر العشوائي على الصفحة الرئيسية</string>
     <string name="provider_lang_settings">لغات المزود</string>
     <string name="app_layout">واجهة التطبيق</string>
-    <string name="preferred_media_settings">المحتوي المفضل</string>
-    <string name="enable_nsfw_on_providers">تفعيل محتوي البالغين داخل المزودين المدعومين</string>
+    <string name="preferred_media_settings">المحتوى المفضل</string>
+    <string name="enable_nsfw_on_providers">تفعيل محتوى خاص للبالغين داخل المزودين المدعومين</string>
     <string name="subtitles_encoding">فك تشفير الترجمة</string>
     <string name="category_providers">المصادر</string>
     <string name="category_ui">الواجهة</string>
@@ -310,7 +311,7 @@
     <string name="emulator_layout">واجهة المحاكي</string>
     <string name="primary_color_settings">اللون الأساسي</string>
     <string name="app_theme_settings">مظهر التطبيق</string>
-    <string name="bottom_title_settings">موضع عنوان الملصق</string>
+    <string name="bottom_title_settings">مكان عنوان الملصق</string>
     <string name="bottom_title_settings_des">وضع العنوان تحت الملصق</string>
     <!-- account stuff -->
     <string name="anilist_key" translatable="false">anilist_key</string>
@@ -410,7 +411,7 @@
     <string name="error">خطأ</string>
     <string name="subtitles_remove_captions">ازالة التسميات التوضيحية من الترجمة</string>
     <string name="subtitles_remove_bloat">ازالة البرمجيات الخبيثة من الترجمة</string>
-    <string name="subtitles_filter_lang">فلترة تبعا للغة المحتوي المفضلة</string>
+    <string name="subtitles_filter_lang">تصفية حسب لغة الوسائط المفضلة</string>
     <string name="extras">اكسترا</string>
     <string name="trailer">مقطع دعائي</string>
     <string name="network_adress_example">رابط الفيديو</string>
@@ -518,7 +519,7 @@
     <string name="redo_setup_process">إعادة عملية الإعداد</string>
     <string name="pref_category_links">الروابط</string>
     <string name="pref_category_app_updates">تحديثات التطبيق</string>
-    <string name="pref_category_backup">نسخ احتياطي</string>
+    <string name="pref_category_backup">النسخ الإحتياطي</string>
     <string name="pref_category_extensions">الإضافات</string>
     <string name="pref_category_actions">الإجراءات</string>
     <string name="pref_category_cache">الذاكرة المؤقتة</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index cc5e129e..52ec2f09 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -143,8 +143,8 @@
     <string name="backup_settings">Архивиране на данни</string>
     <string name="restore_success">Зареден архивен файл</string>
     <string formatted="true" name="restore_failed_format">Неуспешно възстановяване на данни от файл %s</string>
-    <string name="backup_success">Успешно съхранени данни</string>
-    <string name="backup_failed">Липсват разрешения за съхранение, моля, опитайте отново</string>
+    <string name="backup_success">Съхранени данни</string>
+    <string name="backup_failed">Липсват разрешения за съхранение. Моля, опитайте отново.</string>
     <string name="backup_failed_error_format">Грешка при архивирането на %s</string>
     <string name="search">Търсене</string>
     <string name="category_account">Акаунти</string>
@@ -156,8 +156,8 @@
     <string name="bug_report_settings_on">Не изпраща данни</string>
     <string name="show_fillers_settings">Показване заместващ епизод за аниме</string>
     <string name="show_trailers_settings">Показване на трейлъри</string>
-    <string name="kitsu_settings">Покажете плакати от kitsu</string>
-    <string name="pref_filter_search_quality">Скриване на избраното видео качество в резултатите от търсенето</string>
+    <string name="kitsu_settings">Покажете плакати от Kitsu</string>
+    <string name="pref_filter_search_quality">Скрий избраното видео качество в резултатите от търсенето</string>
     <string name="automatic_plugin_updates">Автоматични актуализации на плъгини</string>
     <string name="updates_settings">Показвай актуализации на приложението</string>
     <string name="updates_settings_des">Автоматично търси нови актуализации при стартиране</string>
@@ -267,8 +267,8 @@
     <string name="video_buffer_length_settings">Дължина на видео буфера</string>
     <string name="video_buffer_disk_settings">Видео кеш на диск</string>
     <string name="video_buffer_clear_settings">Изчистете кеша за видео и изображения</string>
-    <string name="video_ram_description">Ще предизвика случайни сривове, ако е зададено твърде високо. Не променяйте, ако имате малко количество RAM, като Android TV или стар телефон</string>
-    <string name="video_disk_description">Може да причини проблеми на системи с малко място за съхранение, като устройства с Android TV, ако го зададете твърде високо</string>
+    <string name="video_ram_description">Причинява сривове, ако е зададено твърде високо на устройства с малко памет, като Android TV.</string>
+    <string name="video_disk_description">Причинява проблеми, ако е зададено твърде високо на устройства с малко място за съхранение, като Android TV.</string>
     <string name="dns_pref">DNS през HTTPS</string>
     <string name="dns_pref_summary">Полезно за заобикаляне на блокирания от ISP доставчик</string>
     <string name="add_site_pref">Сайт за клониране</string>
@@ -322,8 +322,8 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string formatted="true" name="authenticated_user">Удостоверен %s</string>
-    <string formatted="true" name="authenticated_user_fail">Неуспешно удостоверяване на %s</string>
+    <string formatted="true" name="authenticated_user">%s удостоверен</string>
+    <string formatted="true" name="authenticated_user_fail">Не можах да вляза в %s</string>
     <string name="none">Нито един</string>
     <string name="normal">Нормално</string>
     <string name="all">Всичко</string>
@@ -336,8 +336,8 @@
     <string name="subtitle_offset">Синхронизиране на суб</string>
     <string name="subtitle_offset_hint">1000.ms</string>
     <string name="subtitle_offset_title">Забавяне на субтитрите</string>
-    <string name="subtitle_offset_extra_hint_later_format">Използвайте това, ако субтитрите се показват %dms твърде рано</string>
-    <string name="subtitle_offset_extra_hint_before_format">Използвайте това, ако субтитрите се показват %dms твърде късно</string>
+    <string name="subtitle_offset_extra_hint_later_format">Използвайте това, ако субтитрите се показват %d ms твърде рано</string>
+    <string name="subtitle_offset_extra_hint_before_format">Използвайте това, ако субтитрите се показват %d ms твърде късно</string>
     <string name="subtitle_offset_extra_hint_none_format">Без забавяне на субтитрите</string>
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
@@ -378,9 +378,9 @@
     <string name="resolution_and_title">Резолюция и заглавие</string>
     <string name="title">Заглавие</string>
     <string name="resolution">Резолюция</string>
-    <string name="error_invalid_id">Невалиден идентификатор</string>
+    <string name="error_invalid_id">Невалиден ID</string>
     <string name="error_invalid_data">Невалидни данни</string>
-    <string name="error_invalid_url">Невалиден адрес</string>
+    <string name="error_invalid_url">Невалиден URL</string>
     <string name="error">Грешка</string>
     <string name="subtitles_remove_captions">Премахнете затворените надписи от субтитрите</string>
     <string name="subtitles_remove_bloat">Премахнете рекламирането в субтитрите</string>
@@ -403,10 +403,10 @@
     <string name="repository_url_hint">URL на хранилището</string>
     <string name="plugin_loaded">Приставката е заредена</string>
     <string name="plugin_deleted">Приставката е изтрита</string>
-    <string name="plugin_load_fail" formatted="true">Неуспешно зареждане %s</string>
+    <string name="plugin_load_fail" formatted="true">Не може да зареди %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Започна да изтегля %d %s</string>
-    <string name="batch_download_finish_format" formatted="true">Изтеглено %d %s успешно</string>
+    <string name="batch_download_start_format" formatted="true">Започна да изтегля %d %s…</string>
+    <string name="batch_download_finish_format" formatted="true">Изтеглено %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Всички %s вече са изтеглени</string>
     <string name="batch_download">Пакетно изтегляне</string>
     <string name="plugin_singular">Плъгин</string>
@@ -420,7 +420,7 @@
     <string formatted="true" name="plugins_updated">Актуализирани %d плъгини</string>
     <string name="blank_repo_message">CloudStream няма инсталирани сайтове по подразбиране. Трябва да инсталирате сайтовете от хранилища.
 \n
-\nПоради безмозъчно премахване на DMCA от Sky Uk Limited 🤮 не можем да свържем сайта на хранилището в приложението.
+\nПоради безмозъчно премахване на DMCA от Sky UK Limited 🤮 не можем да свържем сайта на хранилището в приложението.
 \n
 \nПрисъединете се към нашия Дискорд или търсете онлайн.</string>
     <string name="view_public_repositories_button">Вижте хранилищата на общността</string>
@@ -432,8 +432,8 @@
     <string name="audio_tracks">Аудио потоци</string>
     <string name="video_tracks">Видео потоци</string>
     <string name="apply_on_restart">Приложете при рестартиране</string>
-    <string name="safe_mode_title">Безопасният режим е активиран</string>
-    <string name="safe_mode_description">Възникна непоправим срив и ние автоматично деактивирахме всички разширения, така че можете да намерите и премахнете разширението, което причинява проблеми.</string>
+    <string name="safe_mode_title">Безопасен режим включен</string>
+    <string name="safe_mode_description">Всички разширения бяха изключени поради срив, за да ви помогне да намерите това, което създава проблеми.</string>
     <string name="safe_mode_crash_info">Вижте информация за срива</string>
     <string formatted="true" name="extension_rating">Оценка: %s</string>
     <string name="extension_description">Описание</string>
@@ -450,7 +450,7 @@
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="player_settings_play_in_mpv">MPV</string>
     <string name="player_settings_play_in_web">Уеб видео предаване</string>
-    <string name="player_settings_play_in_browser">Браузър</string>
+    <string name="player_settings_play_in_browser">Уеб браузър</string>
     <string name="app_not_found_error">Приложението не е намерено</string>
     <string name="automatic_plugin_download">Автоматично изтегли добавки</string>
     <string name="all_languages_preference">Всички езици</string>
@@ -464,13 +464,33 @@
     <string name="confirm_exit_dialog">Сигурни ли сте, че искате да излезете\?</string>
     <string name="yes">Да</string>
     <string name="no">Не</string>
-    <string name="update_notification_installing">Инсталиране на актуализация на приложението</string>
-    <string name="update_notification_failed">Неуспешна актуализация на приложението</string>
+    <string name="update_notification_installing">Инсталиране на актуализация на приложението…</string>
+    <string name="update_notification_failed">Не можа да се инсталира новата версия на приложението</string>
     <string name="enable_skip_op_from_database_des">Покажи изскачащи прозорци при отваряне/затваряне</string>
-    <string name="update_notification_downloading">Изтегля се актуализация на приложението</string>
+    <string name="update_notification_downloading">Изтегля се актуализация на приложението…</string>
     <string name="skip_type_mixed_op">Смесено отваряне</string>
     <string name="skip_type_mixed_ed">Смесено затваряне</string>
     <string name="skip_type_creddits">Кредити</string>
     <string name="skip_type_intro">въведение</string>
     <string name="clear_history">Изчистване на историята</string>
+    <string name="automatic_plugin_download_summary">Автоматично инсталиране на всички все още неинсталирани добавки от добавени хранилища.</string>
+    <string name="apk_installer_settings">APK Инсталатор</string>
+    <string name="apk_installer_settings_des">Някои телефони не поддържат новия пакет за инсталиране. Опитайте предпоследената опция, ако актуализациите не се инсталират.</string>
+    <string name="play_trailer_button">Пусни трейлър</string>
+    <string name="pref_category_links">Връзки</string>
+    <string name="pref_category_app_updates">Актуализации на приложението</string>
+    <string name="pref_category_extensions">Разширения</string>
+    <string name="pref_category_actions">Действия</string>
+    <string name="apk_installer_legacy">Предишна версия</string>
+    <string name="apk_installer_package_installer">Пакетен инсталатор</string>
+    <string name="pref_category_player_features">Възможности на плеъра</string>
+    <string name="pref_category_defaults">По подразбиране</string>
+    <string name="pref_category_looks">Изгледи</string>
+    <string name="pref_category_subtitles">Субтитри</string>
+    <string name="pref_category_ui_features">Възможности</string>
+    <string name="redo_setup_process">Повторете процеса на настройка</string>
+    <string name="pref_category_backup">Архивиране</string>
+    <string name="pref_category_cache">Кеш</string>
+    <string name="pref_category_gestures">Жестове</string>
+    <string name="pref_category_player_layout">Шаблон</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index a6ff5a36..67b372ea 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -419,7 +419,7 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="clear_history">Εκκαθάριση ιστορικού</string>
     <string name="history">Ιστορικό</string>
-    <string name="enable_skip_op_from_database_des">Εμφάνισε pop-up για παράλειψη τίτλων αρχής και τέλους</string>
+    <string name="enable_skip_op_from_database_des">Εμφάνιση pop-up για παράλειψη τίτλων αρχής και τέλους</string>
     <string name="clipboard_too_large">Υπερβολικά μεγάλο μέγεθος κειμένου. Αδύνατη η αποθήκευση στο πρόχειρο.</string>
     <string name="yes">Ναι</string>
     <string name="no">Όχι</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 2a7bff1c..e2069ca3 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1,5 +1,5 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
     <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
@@ -17,7 +17,6 @@
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
@@ -27,24 +26,20 @@
     <string name="go_back_img_des">Go back</string>
     <string name="home_change_provider_img_des">Change Provider</string>
     <string name="preview_background_img_des">Preview Background</string>
-
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Brzina (%.2fx)</string>
     <string name="rated_format" formatted="true">Ocijenjeno: %.1f</string>
-    <string name="new_update_format" formatted="true">Pronađeno novo ažuriranje!\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">Pronađeno novo ažuriranje!\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Umetak</string>
     <string name="duration_format" formatted="true">%d min</string>
-
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Otvori s CloudStream-om</string>
     <string name="title_home">Početna stranica</string>
     <string name="title_search">Pretraži</string>
     <string name="title_downloads">Preuzimanja</string>
     <string name="title_settings">Postavke</string>
-
-    <string name="search_hint">Pretraži...</string>
+    <string name="search_hint">Pretraži…</string>
     <string name="search_hint_site" formatted="true">Pretraži %s…</string>
-
     <string name="no_data">Nema podataka</string>
     <string name="episode_more_options_des">Više postavki</string>
     <string name="next_episode">Sljedeća epizoda</string>
@@ -53,7 +48,6 @@
     <string name="result_open_in_browser">Otvori u pregledniku</string>
     <string name="skip_loading">Preskoči učitavanje</string>
     <string name="loading">Učitavanje...</string>
-
     <string name="type_watching">Gledam</string>
     <string name="type_on_hold">Na čekanju</string>
     <string name="type_completed">Dovršeno</string>
@@ -61,7 +55,6 @@
     <string name="type_plan_to_watch">Planiram pogledati</string>
     <string name="type_none">Ništa</string>
     <string name="type_re_watching">Ponovno gledam</string>
-
     <string name="play_movie_button">Pokreni Film</string>
     <string name="play_livestream_button">Pokreni LiveStream</string>
     <string name="play_torrent_button">Pokreni Torrent</string>
@@ -71,7 +64,6 @@
     <string name="go_back">Idi natrag</string>
     <string name="play_episode">Pokreni Epizodu</string>
     <!--<string name="need_storage">Allow to download episodes</string>-->
-
     <string name="download">Preuzmi</string>
     <string name="downloaded">Preuzeto</string>
     <string name="downloading">Trenutno preuzimam</string>
@@ -81,18 +73,14 @@
     <string name="download_canceled">Preuzimanje otkazano</string>
     <string name="download_done">Preuzimanje dovršeno</string>
     <string name="stream">Stream</string>
-
     <string name="error_loading_links_toast">Pogreška pri učitavanju veza</string>
     <string name="download_storage_text">Unutarnja pohrana</string>
-
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Sub</string>
-
     <string name="popup_delete_file">Izbriši datoteku</string>
     <string name="popup_play_file">Otvori datoteku</string>
     <string name="popup_resume_download">Nastavi preuzimanje</string>
     <string name="popup_pause_download">Pauziraj preuzimanje</string>
-
     <string name="pref_disable_acra">Onemogući automatsko izvješćivanje o bugovima</string>
     <string name="home_more_info">Više informacija</string>
     <string name="home_expanded_hide">Sakrij</string>
@@ -108,9 +96,7 @@
     <string name="sort_close">Zatvori</string>
     <string name="sort_clear">Očisti</string>
     <string name="sort_save">Sačuvaj</string>
-
     <string name="player_speed">Brzina playera</string>
-
     <string name="subtitles_settings">Postavke titlova</string>
     <string name="subs_text_color">Boja teksta</string>
     <string name="subs_outline_color">Boja obruba</string>
@@ -120,35 +106,26 @@
     <string name="subs_subtitle_elevation">Visina titlova</string>
     <string name="subs_font">Font</string>
     <string name="subs_font_size">Veličina fonta</string>
-
     <string name="search_provider_text_providers">Pretraži s uslugama</string>
     <string name="search_provider_text_types">Pretraži s tipovima</string>
-
     <string name="benene_count_text">%d banana dano developerima</string>
     <string name="benene_count_text_none">Nisi dao ni jednu bananu</string>
-
     <string name="subs_auto_select_language">Automatski odabir jezika</string>
     <string name="subs_download_languages">Preuzmi jezike</string>
     <string name="subs_subtitle_languages">Jezik titlova</string>
     <string name="subs_hold_to_reset_to_default">Držite za vraćanje na zadane postavke</string>
     <string name="subs_import_text" formatted="true">Uvezi fontove tako da ih postavite u %s</string>
     <string name="continue_watching">Nastavi gledati</string>
-
     <string name="action_remove_watching">Makni</string>
     <string name="action_open_watching">Više informacija</string>
     <string name="action_open_play">@string/home_play </string>
-
     <string name="vpn_might_be_needed">Za ispravan rad ovog pružatelja usluga može biti potreban VPN</string>
     <string name="vpn_torrent">Ovaj pružatelj usluga je torrent, preporučuje se VPN</string>
-
     <string name="provider_info_meta">Stranica ne daje metapodatke, učitavanje videozapisa neće uspjeti ako ne postoji na stranici.</string>
-
     <string name="torrent_plot">Opis</string>
     <string name="normal_no_plot">Plot nije pronađen</string>
     <string name="torrent_no_plot">Opis nije pronađen</string>
-
-    <string name="show_log_cat">Pokaži logmačku 🐈</string>
-
+    <string name="show_log_cat">Prikaži LogMačku 🐈</string>
     <string name="picture_in_picture">Picture-in-picture</string>
     <string name="picture_in_picture_des">Nastavlja reprodukciju u minijaturnom playeru povrh drugih aplikacija</string>
     <string name="player_size_settings">Gumb za promjenu veličine playera</string>
@@ -157,17 +134,14 @@
     <string name="player_subtitles_settings_des">Postavke titlova playera</string>
     <string name="chromecast_subtitles_settings">Chromecast Titlovi</string>
     <string name="chromecast_subtitles_settings_des">Postavke Chromecast titlova</string>
-
     <string name="eigengraumode_settings">Eigengravy način</string>
     <string name="eigengraumode_settings_des">Dodaje opciju brzine u playeru</string>
     <string name="swipe_to_seek_settings">Prijeđi prstom za traženje</string>
     <string name="swipe_to_seek_settings_des">Prijeđi prstom ulijevo ili udesno za kontrolu vremena u videoplayeru</string>
     <string name="swipe_to_change_settings">Klizni za promjenu postavki</string>
     <string name="swipe_to_change_settings_des">Prijeđi prstom ulijevo ili udesno za promjenu svjetline ili glasnoće</string>
-
     <string name="autoplay_next_settings">Automatski započni sljedeću epizodu</string>
     <string name="autoplay_next_settings_des">Započne sljedeću epizodu kad trenutna završi</string>
-
     <string name="double_tap_to_seek_settings">Dodirni dvaput za traženje</string>
     <string name="double_tap_to_pause_settings">Dodirni dvaput za pauziranje</string>
     <string name="double_tap_to_seek_amount_settings">Iznos traženja u playeru</string>
@@ -178,23 +152,18 @@
     <string name="use_system_brightness_settings_des">Koristi svjetlinu sustava u playeru aplikacija umjesto tamnog
         preklopa
     </string>
-
     <string name="episode_sync_settings">Ažuriraj napredak gledanja</string>
     <string name="episode_sync_settings_des">Automatski sinkroniziraj svoj trenutni napredak u epizodi</string>
-
     <string name="restore_settings">Vraćanje podataka iz sigurnosne kopije</string>
-
-    <string name="backup_settings">Sigurnosna kopija podataka</string>
+    <string name="backup_settings">Sigurnosno kopiranje podataka</string>
     <string name="restore_success">Učitana datoteka sigurnosne kopije</string>
     <string name="restore_failed_format" formatted="true">Vraćanje podataka iz datoteke nije uspjelo %s</string>
-    <string name="backup_success">Uspješno pohranjeni podaci</string>
-    <string name="backup_failed">Nedostaju dozvole za pohranu, pokušaj ponovo</string>
+    <string name="backup_success">Podaci pohranjeni</string>
+    <string name="backup_failed">Nedostaju dozvole za pohranu, pokušaj ponovo.</string>
     <string name="backup_failed_error_format">Pogreška pri sigurnosnom kopiranju %s</string>
-
     <string name="search">Pretraži</string>
     <string name="category_account">Računi</string>
     <string name="category_updates">Ažuriranja i sigurnosne kopije</string>
-    
     <string name="settings_info">Informacije</string>
     <string name="advanced_search">Napredno pretraživanje</string>
     <string name="advanced_search_des">Daje rezultate pretraživanja odvojene prema pružatelju usluga</string>
@@ -202,9 +171,8 @@
     <string name="bug_report_settings_on">Ne šalje podatke</string>
     <string name="show_fillers_settings">Prikaži dodatnu epizodu za anime</string>
     <string name="show_trailers_settings">Prikaži trailere</string>
-    <string name="kitsu_settings">Prikaži postere iz kitsua</string>
+    <string name="kitsu_settings">Prikaži postere iz Kitsua</string>
     <string name="pref_filter_search_quality">Sakrij odabranu kvalitetu videozapisa u rezultatima pretraživanja</string>
-
     <string name="automatic_plugin_updates">Automatsko ažuriranje dodataka</string>
     <string name="updates_settings">Prikaži ažuriranja aplikacije</string>
     <string name="updates_settings_des">Automatski traži nova ažuriranja pri pokretanju aplikacije</string>
@@ -216,9 +184,7 @@
     <string name="discord">Uđi u naš Discord</string>
     <string name="benene">Daj bananu developerima</string>
     <string name="benene_des">Dana banana</string>
-
     <string name="app_language">Jezik aplikacije</string>
-
     <string name="no_chromecast_support_toast">Ovaj pružatelj usluga nema podršku za Chromecast</string>
     <string name="no_links_found_toast">Nisu pronađene veze</string>
     <string name="copy_link_toast">Veza je kopirana u međuspremnik</string>
@@ -226,7 +192,6 @@
     <string name="subs_default_reset_toast">Vrati na zadanu vrijednost</string>
     <string name="acra_report_toast">Nažalost, aplikacija se srušila. Anonimno izvješće o bugu bit će poslano developerima
     </string>
-
     <string name="season">Sezona</string>
     <string name="no_season">Nema sezone</string>
     <string name="episode">Epizoda</string>
@@ -236,7 +201,6 @@
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Nisu pronađene epizode</string>
-
     <string name="delete_file">Izbriši datoteku</string>
     <string name="delete">Izbriši</string>
     <string name="pause">Pauziraj</string>
@@ -245,8 +209,6 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">Ovo će trajno izbrisati %s\nJeste li sigurni?</string>
     <string name="resume_time_left" formatted="true">%dm\npreostalo</string>
-
-
     <string name="status_ongoing">U tijeku</string>
     <string name="status_completed">Završeno</string>
     <string name="status">Status</string>
@@ -255,15 +217,12 @@
     <string name="duration">Trajanje</string>
     <string name="site">Stranica</string>
     <string name="synopsis">Sinopsis</string>
-
     <string name="queued">u redu čekanja</string>
     <string name="no_subtitles">Nema titlova</string>
     <string name="default_subtitles">Zadano</string>
-
     <string name="free_storage">Slobodno</string>
     <string name="used_storage">Iskorišteno</string>
     <string name="app_storage">Aplikacija</string>
-
     <!--plural-->
     <string name="movies">Filmovi</string>
     <string name="tv_series">TV Serije</string>
@@ -276,7 +235,6 @@
     <string name="livestreams">Livestreamovi</string>
     <string name="nsfw">NSFW</string>
     <string name="others">Ostali</string>
-
     <!--singular-->
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Serija</string>
@@ -289,13 +247,11 @@
     <string name="live_singular">Livestream</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Video</string>
-
     <string name="source_error">Greška u izvoru</string>
     <string name="remote_error">Pogreška remote-a</string>
     <string name="render_error">Pogreška renderera</string>
     <string name="unexpected_error">Neočekivana pogreška playera</string>
     <string name="storage_error">Pogreška preuzimanja, provjeri dozvole za pohranu</string>
-
     <string name="episode_action_chromecast_episode">Chromecast epizoda</string>
     <string name="episode_action_chromecast_mirror">Chromecast mirror</string>
     <string name="episode_action_play_in_app">Pokreni u aplikaciji</string>
@@ -306,53 +262,40 @@
     <string name="episode_action_download_mirror">Preuzmi zrcalo</string>
     <string name="episode_action_reload_links">Ponovno učitaj poveznice</string>
     <string name="episode_action_download_subtitle">Preuzmi titlove</string>
-
     <string name="show_hd">Oznaka kvalitete</string>
     <string name="show_dub">Oznaka sinkronizacije</string>
     <string name="show_sub">Oznaka titlova</string>
     <string name="show_title">Naslov</string>
     <string name="poster_ui_settings">Uključi/isključi elemente korisničkog sučelja na posteru</string>
-
     <string name="no_update_found">Nije pronađeno ažuriranje</string>
     <string name="check_for_update">Provjeri ažuriranja</string>
-
     <string name="video_lock">Zaključaj</string>
     <string name="video_aspect_ratio_resize">Promijeni veličinu</string>
     <string name="video_source">Izvor</string>
     <string name="video_skip_op">Preskoči OP</string>
-
     <string name="dont_show_again">Ne prikazuj više</string>
     <string name="skip_update">Preskoči ovo ažuriranje</string>
     <string name="update">Ažuriraj</string>
     <string name="watch_quality_pref">Preferirana kvaliteta streama</string>
     <string name="limit_title">Maksimalni broj znakova u naslovu video playera</string>
     <string name="limit_title_rez">Rezolucija video playera</string>
-
     <string name="video_buffer_size_settings">Veličina video međuspremnika</string>
     <string name="video_buffer_length_settings">Duljina video međuspremnika</string>
     <string name="video_buffer_disk_settings">Video predmemorija na disku</string>
     <string name="video_buffer_clear_settings">Očisti predmemoriju videa i slika</string>
-
-    <string name="video_ram_description">Izazvat će nasumična rušenja ako se postavi previsoko. Nemojte mijenjati ako imate malu količinu RAM-a kao što je Android TV ili stari telefon</string>
-    <string name="video_disk_description">Može uzrokovati probleme na sustavima s malo prostora za pohranu kao što su Android TV uređaji ako postavite previsoko</string>
-
+    <string name="video_ram_description">Izazvat će nasumična rušenja ako se postavi previsoko. Nemojte mijenjati ako imate malu količinu RAM-a kao što je Android TV ili stari telefon.</string>
+    <string name="video_disk_description">Može uzrokovati probleme na sustavima s malo prostora za pohranu kao što su Android TV uređaji ako postavite previsoko.</string>
     <string name="dns_pref">DNS preko HTTPS-a</string>
     <string name="dns_pref_summary">Korisno za zaobilaženje blokada ISP-a</string>
-
     <string name="add_site_pref">Kloniraj web stranicu</string>
     <string name="remove_site_pref">Ukloni web stranicu</string>
-    <string name="add_site_summary">Dodajt klon postojeće web-lokacije s drugim url-om</string>
-
+    <string name="add_site_summary">Dodajte klon postojeće web-lokacije s drugim url-om</string>
     <string name="download_path_pref">Put preuzimanja</string>
-
-    <string name="nginx_url_pref">Nginx server url</string>
-
+    <string name="nginx_url_pref">NGINX server URL</string>
     <string name="display_subbed_dubbed_settings">Prikaži sinkronizirani anime ili s titlovima</string>
-
     <string name="resize_fit">Prilagodi zaslonu</string>
     <string name="resize_fill">Rastegni</string>
     <string name="resize_zoom">Zoom</string>
-
     <string name="legal_notice">Odricanje</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
         should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
@@ -380,18 +323,14 @@
     <string name="subtitles_encoding">Kodiranje titlova</string>
     <string name="category_providers">Pružatelji usluga</string>
     <string name="category_ui">Izgled</string>
-
     <string name="automatic">Auto</string>
     <string name="tv_layout">TV izgled</string>
     <string name="phone_layout">Izgled za telefone</string>
     <string name="emulator_layout">Izgled za emulatore</string>
-
     <string name="primary_color_settings">Primarna boja</string>
     <string name="app_theme_settings">Tema aplikacije</string>
     <string name="bottom_title_settings">Mjesto naslova postera</string>
     <string name="bottom_title_settings_des">Stavi naslov ispod postera</string>
-
-
     <!-- account stuff -->
     <string name="example_password">lozinka123</string>
     <string name="example_username">MojeCoolIme</string>
@@ -400,7 +339,6 @@
     <string name="example_site_name">MojaCoolStranica</string>
     <string name="example_site_url">primjer.com</string>
     <string name="example_lang_name">Šifra jezika (en)</string>
-
     <string name="login_format" formatted="true">%s %s</string>
     <string name="account">račun</string>
     <string name="logout">Odjava</string>
@@ -415,9 +353,8 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="authenticated_user" formatted="true">Autentičnost %s</string>
-    <string name="authenticated_user_fail" formatted="true">Provjera autentičnosti nije uspjela %s</string>
-
+    <string name="authenticated_user" formatted="true">Ovjereno%s</string>
+    <string name="authenticated_user_fail" formatted="true">Nije moguće prijaviti se na %s</string>
     <!-- ============ -->
     <string name="none">Nijedan</string>
     <string name="normal">Normal</string>
@@ -429,12 +366,11 @@
     <string name="subtitles_shadow">Sjena</string>
     <string name="subtitles_raised">Podignuto</string>
     <string name="subtitle_offset">Sinkroniziraj titlove</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Kašnjenje titlova</string>
-    <string name="subtitle_offset_extra_hint_later_format">Koristi ovo ako su titlovi prikazani %dms prerano</string>
-    <string name="subtitle_offset_extra_hint_before_format">Koristite ovo ako se titlovi prikazuju %dms prekasno</string>
+    <string name="subtitle_offset_extra_hint_later_format">Koristi ovo ako su titlovi prikazani %d ms prerano</string>
+    <string name="subtitle_offset_extra_hint_before_format">Koristite ovo ako se titlovi prikazuju %d ms prekasno</string>
     <string name="subtitle_offset_extra_hint_none_format">Nema kašnjenja titlova</string>
-
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
     see: 
@@ -442,7 +378,6 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">The quick brown fox jumps over the lazy dog</string>
-
     <string name="recommended">Preporučeno</string>
     <string name="player_loaded_subtitles" formatted="true">Učitano %s</string>
     <string name="player_load_subtitles">Učitaj iz datoteke</string>
@@ -451,12 +386,9 @@
     <string name="actor_main">Glavno</string>
     <string name="actor_supporting">Podupiranje</string>
     <string name="actor_background">Pozadina</string>
-
     <string name="home_source">Izvor</string>
     <string name="home_random">Random</string>
-
     <string name="coming_soon">Dolazi uskoro…</string>
-
     <string name="quality_cam">Cam</string>
     <string name="quality_cam_rip">Cam</string>
     <string name="quality_cam_hd">Cam</string>
@@ -464,7 +396,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blu-Ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
@@ -473,15 +405,14 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-
     <string name="poster_image">Slika postera</string>
     <string name="category_player">Player</string>
     <string name="resolution_and_title">Rezolucija i naslov</string>
     <string name="title">Naslov</string>
     <string name="resolution">Rezolucija</string>
-    <string name="error_invalid_id">Nevažeći ID</string>
+    <string name="error_invalid_id">ID je nevažeći</string>
     <string name="error_invalid_data">Nevažeći podaci</string>
-    <string name="error_invalid_url">Nevažeći URL</string>
+    <string name="error_invalid_url">URL je nevažeći</string>
     <string name="error">Greška</string>
     <string name="subtitles_remove_captions">Ukloni titlove iz titlova</string>
     <string name="subtitles_remove_bloat">Ukloni reklame iz titlova</string>
@@ -501,13 +432,13 @@
     <string name="extensions">Ekstenzije</string>
     <string name="add_repository">Dodaj repository</string>
     <string name="repository_name_hint">Ime repositorya</string>
-    <string name="repository_url_hint">URL Repositorija</string>
+    <string name="repository_url_hint">URL spremišta (repositorija)</string>
     <string name="plugin_loaded">Dodatak je učitan</string>
     <string name="plugin_deleted">Dodatak je izbrisan</string>
-    <string name="plugin_load_fail" formatted="true">Učitavanje nije uspjelo %s</string>
+    <string name="plugin_load_fail" formatted="true">Nije moguće učitati %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Započelo preuzimanje %d %s</string>
-    <string name="batch_download_finish_format" formatted="true">Preuzeto %d %s uspješno</string>
+    <string name="batch_download_start_format" formatted="true">Započelo preuzimanje %d %s…</string>
+    <string name="batch_download_finish_format" formatted="true">Preuzeto %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Sve %s je već preuzeto</string>
     <string name="batch_download">Skupno preuzimanje</string>
     <string name="plugin_singular">plugin</string>
@@ -518,22 +449,23 @@
     <string name="plugins_downloaded" formatted="true">Preuzeto: %d</string>
     <string name="plugins_disabled" formatted="true">Onemogućeno: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Nije preuzeto: %d</string>
-    <string name="blank_repo_message">Dodaj spremište za instaliranje ekstenzija web mjesta</string>
+    <string name="blank_repo_message">CloudStream nema instalirane web stranice prema zadanim postavkama. Morate instalirati stranice iz repozitorija.
+\n
+\nZbog bezumnog uklanjanja DMCA od strane Sky UK Limited 🤮 ne možemo povezati web mjesto repozitorija u aplikaciji.
+\n
+\nPridružite se našem Discordu ili tražite online.</string>
     <string name="view_public_repositories_button">Pregledajte repozitorije zajednice</string>
     <string name="view_public_repositories_button_short">Javni popis</string>
     <string name="uppercase_all_subtitles">Svi titlovi pisani velikim slovima</string>
-
     <string name="download_all_plugins_from_repo">Preuzeti sve dodatke iz ovog repozitorija?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Onemogućeno)</string>
     <string name="tracks">Zapis</string>
     <string name="audio_tracks">Audio zapis</string>
     <string name="video_tracks">Video zapis</string>
     <string name="apply_on_restart">Primijeni na restart</string>
-
-    <string name="safe_mode_title">Siguran način rada omogućen</string>
-    <string name="safe_mode_description">Došlo je do nepopravljivog pada i automatski smo onemogućili sva proširenja, tako da možete pronaći i ukloniti proširenje koje uzrokuje probleme.</string>
+    <string name="safe_mode_title">Sigurnosni način rada omogućen</string>
+    <string name="safe_mode_description">Sve su ekstenzije isključene zbog rušenja aplikacije kako biste lakše pronašli ono koje uzrokuje probleme.</string>
     <string name="safe_mode_crash_info">Pogledajte podatke o padu</string>
-
     <string name="extension_rating" formatted="true">Ocjena: %s</string>
     <string name="extension_description">Opis</string>
     <string name="extension_version">Verzija</string>
@@ -542,6 +474,56 @@
     <string name="extension_authors">Autori</string>
     <string name="extension_types">Podržano</string>
     <string name="extension_language">Jezik</string>
-    
     <string name="hls_playlist">HLS Playlista</string>
-</resources>
+    <string name="automatic_plugin_download">Automatski instaliraj ekstenzije</string>
+    <string name="skip_type_creddits">Zasluge</string>
+    <string name="automatic_plugin_download_summary">Automatski instaliraj sve neinstalirane ekstenzije iz dodanih repozitorija.</string>
+    <string name="player_pref">Preferirani video player</string>
+    <string name="player_settings_play_in_app">Interni player</string>
+    <string name="extension_install_first">Prvo instalirajte ekstenziju</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="app_not_found_error">Aplikacija nije pronađena</string>
+    <string name="all_languages_preference">Svi jezici</string>
+    <string name="clipboard_too_large">Previše teksta. Nije moguće spremiti u međuspremnik.</string>
+    <string name="action_mark_as_watched">Označi kao gledano</string>
+    <string name="enable_skip_op_from_database_des">Prikaži skočne prozore za preskakanje za početak/završetak</string>
+    <string name="yes">Da</string>
+    <string name="update_notification_downloading">Preuzimanje ažuriranja aplikacije…</string>
+    <string name="confirm_exit_dialog">Jeste li sigurni da želite izaći\?</string>
+    <string name="no">Ne</string>
+    <string name="update_notification_installing">Instaliranje ažuriranja aplikacije…</string>
+    <string name="update_notification_failed">Nije moguće instalirati novu verziju aplikacije</string>
+    <string name="plugins_updated" formatted="true">Ažurirano %d ekstenzija</string>
+    <string name="skip_type_mixed_op">Mješoviti početak</string>
+    <string name="skip_type_intro">Uvod</string>
+    <string name="pref_category_links">Linkovi</string>
+    <string name="play_trailer_button">Pokreni Trailer</string>
+    <string name="redo_setup_process">Ponovi postupak postavljanja</string>
+    <string name="apk_installer_settings_des">Neki telefoni ne podržavaju novi program za instaliranje paketa. Isprobaj naslijeđenu opciju ako se ažuriranja ne instaliraju.</string>
+    <string name="apk_installer_settings">Instalator APK-a</string>
+    <string name="pref_category_app_updates">Ažuriranja aplikacije</string>
+    <string name="pref_category_backup">Sigurnosna kopija</string>
+    <string name="pref_category_extensions">Ekstenzije</string>
+    <string name="pref_category_actions">Radnje</string>
+    <string name="pref_category_cache">Predmemorija</string>
+    <string name="pref_category_gestures">Geste</string>
+    <string name="pref_category_player_features">Značajke playera</string>
+    <string name="pref_category_subtitles">Titlovi</string>
+    <string name="pref_category_player_layout">Izgled</string>
+    <string name="pref_category_defaults">Zadane postavke</string>
+    <string name="pref_category_looks">Izgled</string>
+    <string name="pref_category_ui_features">Značajke</string>
+    <string name="player_settings_play_in_browser">Web preglednik</string>
+    <string name="skip_type_format" formatted="true">Preskoči %s</string>
+    <string name="skip_type_ed">Završetak</string>
+    <string name="skip_type_recap">Zaključak</string>
+    <string name="skip_type_mixed_ed">Mješoviti završetak</string>
+    <string name="clear_history">Obriši povijest</string>
+    <string name="history">Povijest</string>
+    <string name="apk_installer_legacy">Legacy</string>
+    <string name="skip_type_op">Otvaranje</string>
+    <string name="apk_installer_package_installer">PackageInstaller</string>
+    <string name="season_format">%s %d%s</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index c7e92e52..4068b7bb 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -483,4 +483,23 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="safe_mode_description">Alle utvidelser ble skrudd av som følge av et krasj for å hjelpe deg å finne det som lager trøbbel.</string>
+    <string name="play_trailer_button">Spill forfilm</string>
+    <string name="pref_category_links">Lenker</string>
+    <string name="pref_category_app_updates">Programoppgraderinger</string>
+    <string name="pref_category_extensions">Utvidelser</string>
+    <string name="pref_category_actions">Handlinger</string>
+    <string name="pref_category_cache">Hurtiglager</string>
+    <string name="pref_category_gestures">Håndvendinger</string>
+    <string name="pref_category_player_features">Avspillerfunksjoner</string>
+    <string name="pref_category_player_layout">Tilpasning</string>
+    <string name="pref_category_defaults">Forvalg</string>
+    <string name="pref_category_looks">Utseende</string>
+    <string name="pref_category_ui_features">Funksjoner</string>
+    <string name="apk_installer_legacy">Gammeldags</string>
+    <string name="apk_installer_package_installer">PakkeInstallatør</string>
+    <string name="redo_setup_process">Gjenta oppsettsprosess</string>
+    <string name="pref_category_subtitles">Undertekster</string>
+    <string name="pref_category_backup">Sikkerhetskopi</string>
+    <string name="apk_installer_settings">APK-installatør</string>
+    <string name="apk_installer_settings_des">Noen enheter støtter ikke den nye pakkeinstallatøren. Prøv gammeldags alternativ hvis ting ikke installeres.</string>
 </resources>
\ No newline at end of file

From 53b06612c1a4fbe90534c56190a0f69394a561fa Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Wed, 28 Dec 2022 09:27:34 +0100
Subject: [PATCH 140/273] Translated using Weblate (Spanish)

Currently translated at 68.0% (383 of 563 strings)

Translated using Weblate (Urdu)

Currently translated at 76.9% (433 of 563 strings)

Translated using Weblate (Spanish)

Currently translated at 18.8% (106 of 563 strings)

Added translation using Weblate (Spanish)

Added translation using Weblate (Russian)

Translated using Weblate (Urdu)

Currently translated at 53.4% (301 of 563 strings)

Translated using Weblate (Urdu)

Currently translated at 46.8% (264 of 563 strings)

Translated using Weblate (Tamil)

Currently translated at 19.0% (107 of 563 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Hindi)

Currently translated at 39.6% (223 of 563 strings)

Added translation using Weblate (Kannada)

Added translation using Weblate (Urdu)

Added translation using Weblate (Tamil)

Translated using Weblate (Hebrew)

Currently translated at 35.8% (202 of 563 strings)

Translated using Weblate (Bengali)

Currently translated at 34.9% (197 of 563 strings)

Translated using Weblate (Vietnamese)

Currently translated at 84.9% (478 of 563 strings)

Translated using Weblate (Turkish)

Currently translated at 87.9% (495 of 563 strings)

Translated using Weblate (Tagalog)

Currently translated at 59.6% (336 of 563 strings)

Translated using Weblate (Swedish)

Currently translated at 64.1% (361 of 563 strings)

Translated using Weblate (Romanian)

Currently translated at 74.6% (420 of 563 strings)

Translated using Weblate (Dutch)

Currently translated at 78.6% (443 of 563 strings)

Translated using Weblate (Malayalam)

Currently translated at 39.2% (221 of 563 strings)

Translated using Weblate (Macedonian)

Currently translated at 51.5% (290 of 563 strings)

Translated using Weblate (Indonesian)

Currently translated at 89.1% (502 of 563 strings)

Translated using Weblate (Hindi)

Currently translated at 39.0% (220 of 563 strings)

Translated using Weblate (Czech)

Currently translated at 73.1% (412 of 563 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Indonesian)

Currently translated at 89.1% (502 of 563 strings)

Translated using Weblate (Swedish)

Currently translated at 64.1% (361 of 563 strings)

Translated using Weblate (Indonesian)

Currently translated at 78.3% (441 of 563 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (563 of 563 strings)

Co-authored-by: Abinanthankv <abinanthankv@protonmail.com>
Co-authored-by: Anarchydr <patrikpik879@gmail.com>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: John Smith <r9hwlp66@anonaddy.me>
Co-authored-by: Kolon Brin <brinkolon@gmail.com>
Co-authored-by: LagradOst <blatzar@gmail.com>
Co-authored-by: Muhammad Fahad Khan <itxmfahadkhan@gmail.com>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Sonaji Yusup <sonacore@gmail.com>
Co-authored-by: Tempo <lafemot433@octovie.com>
Co-authored-by: Walter H <walter75@gmail.com>
Co-authored-by: jhihyu lin <thomas.jy.lin@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/he/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/mk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ml/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ro/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sv/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ta/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ur/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hant/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml     |   8 +-
 app/src/main/res/values-bn/strings.xml     |   1 +
 app/src/main/res/values-cs/strings.xml     |   2 +
 app/src/main/res/values-es/strings.xml     | 308 ++++++++++++++++++
 app/src/main/res/values-hi/strings.xml     |  42 +--
 app/src/main/res/values-hr/strings.xml     |  10 +-
 app/src/main/res/values-in/strings.xml     | 138 +++++++-
 app/src/main/res/values-iw/strings.xml     |   6 +
 app/src/main/res/values-kn/strings.xml     |   2 +
 app/src/main/res/values-mk/strings.xml     |  49 +--
 app/src/main/res/values-ml/strings.xml     |  38 +--
 app/src/main/res/values-nl/strings.xml     |   2 +
 app/src/main/res/values-ro/strings.xml     |   2 +
 app/src/main/res/values-ru/strings.xml     |   2 +
 app/src/main/res/values-sv/strings.xml     |  35 ++
 app/src/main/res/values-ta/strings.xml     | 110 +++++++
 app/src/main/res/values-tl/strings.xml     |   2 +
 app/src/main/res/values-tr/strings.xml     |   2 +
 app/src/main/res/values-ur/strings.xml     | 359 +++++++++++++++++++++
 app/src/main/res/values-vi/strings.xml     |   2 +
 app/src/main/res/values-zh-rTW/strings.xml |  15 +
 21 files changed, 1008 insertions(+), 127 deletions(-)
 create mode 100644 app/src/main/res/values-es/strings.xml
 create mode 100644 app/src/main/res/values-kn/strings.xml
 create mode 100644 app/src/main/res/values-ru/strings.xml
 create mode 100644 app/src/main/res/values-ta/strings.xml
 create mode 100644 app/src/main/res/values-ur/strings.xml

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 4cf4975b..ac4b41b1 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -388,7 +388,7 @@
     <string name="quality_cam_rip">تصوير كام قطع</string>
     <string name="quality_cam_hd">تصوير كام جودة عالية</string>
     <string name="quality_hq">HQ</string>
-    <string name="quality_hd">HD</string>
+    <string name="quality_hd">عالي الدقة</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
     <string name="quality_blueray">بلو راي</string>
@@ -396,10 +396,10 @@
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
     <string name="quality_sd">SD</string>
-    <string name="quality_uhd">UHD</string>
-    <string name="quality_hdr">HDR</string>
+    <string name="quality_uhd">دقة فائقة</string>
+    <string name="quality_hdr">المستوى الديناميكي العالي</string>
     <string name="quality_sdr">SDR</string>
-    <string name="quality_webrip">Web</string>
+    <string name="quality_webrip">الويب</string>
     <string name="poster_image">صورة الملصق</string>
     <string name="category_player">المُشغل</string>
     <string name="resolution_and_title">الأبعاد والعنوان</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index b0667a38..13d62c40 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -114,4 +114,5 @@
     <string name="show_log_cat">লগক্যাট দেখান 🐈</string>
     <string name="vpn_might_be_needed">এই প্রভাইডার ঠিকভাবে চালাতে ভিপিএন লাগতে পারে</string>
     <string name="provider_info_meta">প্রভাইডার থেকে মেটাডেটা পাওয়া যায়নি, যদি সম্পূর্ন সাইটে না পাওয়া যায় তাইলে ভিডিও লোড হবে না।</string>
+    <string name="history">ইতিহাস</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 32abfd95..5a2d44d4 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -385,4 +385,6 @@
     <string name="subtitles_remove_captions">Odstranit skryté titulky z titulků</string>
     <string name="subtitles_remove_bloat">Odstranit nadbytečné titulky</string>
     <string name="extras">Extra</string>
+    <string name="action_mark_as_watched">Označit jako zhlédnuté</string>
+    <string name="history">Historie</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 00000000..5226280c
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_category_extensions">Extensiones</string>
+    <string name="setup_extensions_subtext">Descargue la lista de sitios que quiera utilizar</string>
+    <string name="plugins_downloaded" formatted="true">Descargado:%d</string>
+    <string name="downloaded">Descargado</string>
+    <string name="batch_download_finish_format" formatted="true">Descargado %d %s</string>
+    <string name="delete_repository">Borrar repositorio</string>
+    <string name="next_episode_format" formatted="true">El episodio %d se lanzará en</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="result_poster_img_des">Poster</string>
+    <string name="extensions">Extensiones</string>
+    <string name="downloaded_file">Archivo descargado</string>
+    <string name="safe_mode_description">Todas las extensiones se desactivaron debido a un fallo para ayudarlo a encontrar la que está causando problemas.</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Todo %s ha sido descargado</string>
+    <string name="plugins_not_downloaded" formatted="true">No descargado:%d</string>
+    <string name="single_plugin_disabled" formatted="true">%s (Desactivado)</string>
+    <string name="repository_url_hint">URL del repositorio</string>
+    <string name="plugins_disabled" formatted="true">Desactivado:%d</string>
+    <string name="add_repository">Agregar repositorio</string>
+    <string name="repository_name_hint">Nombre del repositorio</string>
+    <string name="delete_repository_plugins">Esto también eliminará todos los plugins del repositorio</string>
+    <string name="pref_filter_search_quality">Oculta la calidad de video en los resultados de búsqueda</string>
+    <string name="pref_category_player_layout">Diseño</string>
+    <string name="category_ui">Diseño</string>
+    <string name="watch_quality_pref">Calidad de visualización preferida</string>
+    <string name="player_pref">Reproductor de video preferido</string>
+    <string name="emulator_layout">Diseño para emulador</string>
+    <string name="app_layout">Diseño de la App</string>
+    <string name="tv_layout">Diseño de TV</string>
+    <string name="phone_layout">Diseño para teléfonos</string>
+    <string name="player_subtitles_settings">Subtítulos</string>
+    <string name="subtitles_encoding">Codificación de subtítulos</string>
+    <string name="app_layout_subtext">Cambia el aspecto de la aplicación para que se adapte a tu dispositivo</string>
+    <string name="subtitles_settings">Configurar Subtítulos</string>
+    <string name="player_subtitles_settings_des">Configuración de subtítulos del reproductor</string>
+    <string name="subtitles_shadow">Sombra</string>
+    <string name="chromecast_subtitles_settings">Subtítulos de Chomecast</string>
+    <string name="episode_action_download_subtitle">Descargar subtítulos</string>
+    <string name="pref_category_subtitles">Subtítulos</string>
+    <string name="subtitles_depressed">Deprimido</string>
+    <string name="subtitles_example_text">Le gustaba cenar un exquisito sándwich de jamón con zumo de piña y vodka fría</string>
+    <string name="player_load_subtitles">Cargar desde archivo</string>
+    <string name="player_load_subtitles_online">Cargar desde Internet</string>
+    <string name="autoplay_next_settings">Reproducir automáticamente episodio siguiente</string>
+    <string name="chromecast_subtitles_settings_des">Configuración de subtítulos de Chromecast</string>
+    <string name="default_subtitles">Predeterminado</string>
+    <string name="subtitles_outline">Contorno</string>
+    <string name="no_subtitles">Sin Subtítulos</string>
+    <string name="subtitles_raised">Elevado</string>
+    <string name="subtitle_offset_extra_hint_later_format">Use esto si los subtítulos se muestran %d ms muy pronto</string>
+    <string name="subtitle_offset_extra_hint_before_format">Use esto si los subtítulos se muestran %d ms tarde</string>
+    <string name="swipe_to_seek_settings_des">Desliza el dedo hacia la izquierda o hacia la derecha para controlar el tiempo en el reproductor de video</string>
+    <string name="subtitles_filter_lang">Filtrar por idioma de medios preferido</string>
+    <string name="subtitles_remove_captions">Eliminar Closed Captions (CC) de los subtítulos</string>
+    <string name="double_tap_to_seek_amount_settings">Cantidad de búsqueda del reproductor</string>
+    <string name="use_system_brightness_settings_des">Use el brillo del sistema en el reproductor de la app en lugar de una superposición oscura</string>
+    <string name="limit_title_rez">Resolución del reproductor de video</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="category_player">Reproductor</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="player_settings_play_in_browser">Navegador Web</string>
+    <string name="autoplay_next_settings_des">Iniciar el siguiente episodio cuando el actual termine</string>
+    <string name="video_skip_op">Omitir Intro</string>
+    <string name="skip_type_op">Apertura</string>
+    <string name="skip_update">Omitir esta actualización</string>
+    <string name="skip_type_format" formatted="true">Omitir %s</string>
+    <string name="skip_type_ed">Final</string>
+    <string name="skip_type_mixed_op">Apertura mixta</string>
+    <string name="skip_type_recap">Resumen</string>
+    <string name="skip_type_creddits">Créditos</string>
+    <string name="skip_type_mixed_ed">Final mixto</string>
+    <string name="episode_poster_img_des">Poster del Episodio</string>
+    <string name="next_episode">Siguiente episodio</string>
+    <string name="episode_more_options_des">Más opciones</string>
+    <string name="episode_sync_settings">Actualizar progreso de lo visto</string>
+    <string name="episode_action_chromecast_mirror">Duplicar en Chromecast</string>
+    <string name="no_episodes_found">No se encontraron Episodios</string>
+    <string name="episode_action_play_in_browser">Reproducir en Navegador</string>
+    <string name="episode_action_play_in_format">Reproducir en %s</string>
+    <string name="episode_action_copy_link">Copiar enlace</string>
+    <string name="episode_action_auto_download">Descarga automática</string>
+    <string name="episode_action_download_mirror">Descargar desde servidor alternativo</string>
+    <string name="episode_action_reload_links">Recargar enlaces</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="delete_message" formatted="true">Esto eliminará %s permanentemente 
+\nEstá seguro\?</string>
+    <string name="confirm_exit_dialog">Está seguro que quiere salir\?</string>
+    <string name="popup_resume_download">Continuar Descarga</string>
+    <string name="example_lang_name">Código de idioma (es_LA)</string>
+    <string name="home_main_poster_img_des">Poster Principal</string>
+    <string name="app_language">Idioma de la App</string>
+    <string name="provider_languages_tip">Ver videos en estos idiomas</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="home_next_random_img_des">Siguiente al azar</string>
+    <string name="all_languages_preference">Todos los Idiomas</string>
+    <string name="go_back_img_des">Volver</string>
+    <string name="home_change_provider_img_des">Cambiar proveedor</string>
+    <string name="preview_background_img_des">Vista previa del fondo</string>
+    <string name="rated_format" formatted="true">Nota:%.1f</string>
+    <string name="new_update_format" formatted="true">Nueva actualización encontrada!
+\n%s -&gt; %s</string>
+    <string name="download">Descargar</string>
+    <string name="popup_pause_download">Pausar Descarga</string>
+    <string name="subs_font">Fuente</string>
+    <string name="subs_background_color">Color de Fondo</string>
+    <string name="subs_font_size">Tamaño Fuente</string>
+    <string name="player_speed_text_format" formatted="true">Velocidad (%.2fx)</string>
+    <string name="skip_loading">Omitir carga</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="cast_format" formatted="true">Elenco %s</string>
+    <string name="filler" formatted="true">Relleno</string>
+    <string name="duration_format" formatted="true">%d min</string>
+    <string name="app_name">CloudStream</string>
+    <string name="play_with_app_name">Reproducir con Cloudstream</string>
+    <string name="title_home">Inicio</string>
+    <string name="title_search">Buscar</string>
+    <string name="title_downloads">Descargas</string>
+    <string name="title_settings">Configuración</string>
+    <string name="search_hint">Buscar…</string>
+    <string name="search_hint_site" formatted="true">Buscar en %s…</string>
+    <string name="no_data">Sin datos</string>
+    <string name="result_tags">Géneros</string>
+    <string name="result_share">Compartir</string>
+    <string name="result_open_in_browser">Abrir en Navegador</string>
+    <string name="loading">Cargando…</string>
+    <string name="home_expanded_hide">Ocultar</string>
+    <string name="sort_apply">Aplicar</string>
+    <string name="pick_subtitle">Subtítulos</string>
+    <string name="player_speed">Velocidad del reproductor</string>
+    <string name="play_episode">Reproducir Episodio</string>
+    <string name="type_watching">Mirando</string>
+    <string name="type_on_hold">En espera</string>
+    <string name="type_completed">Completado</string>
+    <string name="type_dropped">Descartado</string>
+    <string name="type_plan_to_watch">Planeando ver</string>
+    <string name="type_none">Ninguno</string>
+    <string name="type_re_watching">Volviendo a mirar</string>
+    <string name="play_movie_button">Reproducir película</string>
+    <string name="play_trailer_button">Reproducir Trailer</string>
+    <string name="play_livestream_button">Reproducir transmisión en vivo (livestream)</string>
+    <string name="play_torrent_button">Transmitir Torrent</string>
+    <string name="pick_source">Fuentes</string>
+    <string name="reload_error">Reintentar conexión…</string>
+    <string name="go_back">Volver</string>
+    <string name="downloading">Descargando</string>
+    <string name="download_paused">Descarga pausada</string>
+    <string name="download_started">Descarga iniciada</string>
+    <string name="download_failed">Descarga fallida</string>
+    <string name="download_canceled">Descarga Cancelada</string>
+    <string name="download_done">Descarga Finalizada</string>
+    <string name="stream">Stream</string>
+    <string name="error_loading_links_toast">Error cargando enlaces</string>
+    <string name="download_storage_text">Almacenamiento Interno</string>
+    <string name="app_dubbed_text">Doblado</string>
+    <string name="app_subbed_text">Subtitulado</string>
+    <string name="popup_delete_file">Borrar Archivo</string>
+    <string name="popup_play_file">Reproducir Archivo</string>
+    <string name="home_more_info">Más información</string>
+    <string name="home_play">Reproducir</string>
+    <string name="home_info">Info</string>
+    <string name="filter_bookmarks">Filtrar Marcadores</string>
+    <string name="error_bookmarks_text">Marcadores</string>
+    <string name="action_remove_from_bookmarks">Remover</string>
+    <string name="action_add_to_bookmarks">Seleccionar estado de visualización</string>
+    <string name="sort_cancel">Cancelar</string>
+    <string name="sort_copy">Copiar</string>
+    <string name="sort_close">Cerrar</string>
+    <string name="sort_clear">Limpiar</string>
+    <string name="sort_save">Guardar</string>
+    <string name="subs_text_color">Color de Texto</string>
+    <string name="subs_outline_color">Color de Contorno</string>
+    <string name="subs_window_color">Color de Ventana</string>
+    <string name="subs_edge_type">Tipo de Borde</string>
+    <string name="subs_subtitle_elevation">Elevación de Subtítulo</string>
+    <string name="search_provider_text_providers">Buscar usando proveedores</string>
+    <string name="picture_in_picture_des">Continúa la reproducción en un reproductor miniatura encima de otras aplicaciones</string>
+    <string name="player_size_settings">Botón de cambio de tamaño del reproductor</string>
+    <string name="player_size_settings_des">Eliminar bordes negros</string>
+    <string name="eigengraumode_settings_des">Agrega la opción de velocidad en el reproductor</string>
+    <string name="subs_auto_select_language">Seleccionar idioma automáticamente</string>
+    <string name="subs_download_languages">Descargar Idiomas</string>
+    <string name="subs_subtitle_languages">Idioma del subtítulo</string>
+    <string name="picture_in_picture">Imagen en Imagen (PIP)</string>
+    <string name="search_provider_text_types">Buscar por tipos</string>
+    <string name="benene_count_text">%d Bananas otorgadas a los desarrolladores</string>
+    <string name="benene_count_text_none">No se otorgaron bananas</string>
+    <string name="subs_hold_to_reset_to_default">mantenga pulsado para restablecer los valores predeterminados</string>
+    <string name="subs_import_text" formatted="true">Importar fuentes colocándolas en %s</string>
+    <string name="continue_watching">Continuar Viendo</string>
+    <string name="action_remove_watching">Remover</string>
+    <string name="action_open_watching">Más info</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="vpn_might_be_needed">Una VPN puede ser necesaria para que este proveedor funcione correctamente</string>
+    <string name="vpn_torrent">Este proveedor es un torrent, se recomienda una VPN</string>
+    <string name="provider_info_meta">El sitio no proporciona los metadatos, la carga del video fallará si no existe en el sitio.</string>
+    <string name="torrent_plot">Descripción</string>
+    <string name="normal_no_plot">Trama no encontrada</string>
+    <string name="torrent_no_plot">Descripción no encontrada</string>
+    <string name="show_log_cat">Mostrar Logcat 🐈</string>
+    <string name="eigengraumode_settings">Modo Eigengravy</string>
+    <string name="swipe_to_seek_settings">Deslice para avanzar/retroceder</string>
+    <string name="swipe_to_change_settings">Deslice para cambiar la configuración</string>
+    <string name="swipe_to_change_settings_des">Deslice el dedo hacia la izquierda o hacia la derecha para cambiar el brillo o el volumen</string>
+    <string name="double_tap_to_seek_settings">Toca dos veces para buscar</string>
+    <string name="double_tap_to_pause_settings">Tocar dos veces para pausar</string>
+    <string name="double_tap_to_seek_settings_des">Toque dos veces en el lado derecho o izquierdo para buscar hacia adelante o hacia atrás</string>
+    <string name="double_tap_to_pause_settings_des">Toque en el medio para pausar</string>
+    <string name="use_system_brightness_settings">Usar brillo del sistema</string>
+    <string name="restore_settings">Restaurar datos desde el backup</string>
+    <string name="backup_settings">Hacer copia de los datos (backup)</string>
+    <string name="restore_success">Archivo de backup cargado</string>
+    <string name="updates_settings_des">Buscar automáticamente nuevas actualizaciones al inicio</string>
+    <string name="redo_setup_process">Repetir el proceso de configuración inicial</string>
+    <string name="show_fillers_settings">Mostrar episodio de relleno para anime</string>
+    <string name="play_episode_toast">Reproducir Episodio</string>
+    <string name="episode">Episodio</string>
+    <string name="episodes">Episodios</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episode_short">E</string>
+    <string name="restore_failed_format" formatted="true">Falló la restauración de los datos desde el archivo %s</string>
+    <string name="backup_success">Datos guardados</string>
+    <string name="backup_failed">Faltan permisos de almacenamiento. Por favor intente de nuevo.</string>
+    <string name="backup_failed_error_format">Error de backup de %s</string>
+    <string name="search">Buscar</string>
+    <string name="category_account">Cuentas</string>
+    <string name="category_updates">Actualizaciones y copias de seguridad</string>
+    <string name="settings_info">Info</string>
+    <string name="advanced_search">Búsqueda Avanzada</string>
+    <string name="advanced_search_des">Da los resultados de la búsqueda separados por proveedor</string>
+    <string name="bug_report_settings_off">Solo envía datos si la app termina inesperadamente (crash)</string>
+    <string name="bug_report_settings_on">No enviar datos</string>
+    <string name="show_trailers_settings">Mostrar Trailers</string>
+    <string name="kitsu_settings">Mostrar posters de Kitsu</string>
+    <string name="uprereleases_settings">Actualizar a las versiones preliminares</string>
+    <string name="uprereleases_settings_des">Buscar actualizaciones preliminares en lugar de solo versiones completas</string>
+    <string name="github">Github</string>
+    <string name="lightnovel">App de novela ligera de los mismos desarrolladores</string>
+    <string name="anim">App de Anime de los mismos desarrolladores</string>
+    <string name="discord">Únete a Discord</string>
+    <string name="benene">Dale una banana a los desarrolladores</string>
+    <string name="benene_des">Banana otorgada</string>
+    <string name="no_chromecast_support_toast">El proveedor no tiene soporte para Chromecast</string>
+    <string name="no_links_found_toast">Enlaces no encontrados</string>
+    <string name="copy_link_toast">Enlaces copiados al portapapeles</string>
+    <string name="subs_default_reset_toast">Reiniciar a valores predefinidos</string>
+    <string name="acra_report_toast">Lo sentimos, la aplicación se bloqueó. Se enviará un informe de error anónimo a los desarrolladores</string>
+    <string name="season">Temporada</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="no_season">Ninguna Temporada</string>
+    <string name="season_short">T</string>
+    <string name="delete_file">Borrar Archivo</string>
+    <string name="delete">Borrar</string>
+    <string name="unexpected_error">Error inesperado del reproductor</string>
+    <string name="episode_action_chromecast_episode">Episodio en Chromecast</string>
+    <string name="episode_action_play_in_app">Reproducir en la app</string>
+    <string name="pause">Pausar</string>
+    <string name="resume">Continuar</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nfaltante</string>
+    <string name="status_ongoing">En curso</string>
+    <string name="status_completed">Completado</string>
+    <string name="status">Estado</string>
+    <string name="limit_title">Máxima cantidad de caracteres en el título del reproductor</string>
+    <string name="pref_category_app_updates">Actualizaciones de la App</string>
+    <string name="automatic">Auto</string>
+    <string name="pref_category_actions">Acciones</string>
+    <string name="enable_nsfw_on_providers">Activa NSFW en proveedores soportados</string>
+    <string name="category_providers">Proveedores</string>
+    <string name="pref_category_defaults">Predeterminados</string>
+    <string name="preferred_media_settings">Medio preferido</string>
+    <string name="pref_category_gestures">Gestos</string>
+    <string name="provider_lang_settings">Idiomas del proveedor</string>
+    <string name="player_loaded_subtitles" formatted="true">%s Cargado</string>
+    <string name="subtitles_remove_bloat">Eliminar excedente (bloat) de los subtítulos</string>
+    <string name="skip_setup">Omitir configuración</string>
+    <string name="preferred_media_subtext">Qué quieres ver</string>
+    <string name="uppercase_all_subtitles">Poner en mayúsculas todos los subtítulos</string>
+    <string name="apply_on_restart">Aplicar al Reiniciar</string>
+    <string name="player_settings_play_in_app">Reproductor interno</string>
+    <string name="extension_language">Idioma</string>
+    <string name="apk_installer_legacy">Legacy (método antiguo)</string>
+    <string name="apk_installer_package_installer">Instalador de paquetes</string>
+    <string name="blank_repo_message">CloudStream no tiene sitios instalados de forma predeterminada. Necesita instalar los sitios desde los repositorios.
+\n
+\nDebido a la eliminación sin sentido de DMCA por parte de Sky UK Limited 🤮, no podemos vincular el sitio del repositorio en la aplicación.
+\n
+\nÚnete a nuestro Discord o busca en línea.</string>
+    <string name="download_all_plugins_from_repo">Descarga todos los plugins desde este repositorio\?</string>
+    <string name="updates_settings">Mostrar actualizaciones de la app</string>
+    <string name="apk_installer_settings">Instalador de APK</string>
+    <string name="apk_installer_settings_des">Algunos dispositivos no soportan el nuevo instalador de paquetes. Pruebe la opción antigua (legacy) si las actualizaciones no se instalan.</string>
+    <string name="pref_disable_acra">Desactivar reporte automático de bugs</string>
+    <string name="episode_sync_settings_des">Sincronizar automáticamente el progreso de su episodio actual</string>
+    <string name="automatic_plugin_updates">Actualización automática de plugins</string>
+    <string name="pref_category_player_features">Características del reproductor</string>
+    <string name="automatic_plugin_download">Descarga automática de plugins</string>
+    <string name="automatic_plugin_download_summary">Instale automáticamente todos los plugins aún no instalados de los repositorios agregados.</string>
+    <string name="pref_category_looks">Aspecto</string>
+    <string name="pref_category_ui_features">Características</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index a6ad0af7..e07f3063 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -1,27 +1,23 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">रफ्तार (%.2fx)</string>
-    <string name="new_update_format" formatted="true">नया अपडेट आया है!\n%s -> %s</string>
-
+    <string name="new_update_format" formatted="true">नया अपडेट आया है!\n%s -&gt; %s</string>
     <string name="title_home">होम</string>
     <string name="title_search">खोजें</string>
     <string name="title_downloads">डाउनलोड</string>
     <string name="title_settings">सेटिंग</string>
-
     <string name="no_data">डेटा उपलब्ध नही है</string>
     <string name="episode_more_options_des">अन्य ऑप्शन</string>
     <string name="next_episode">अगला एपिसोड</string>
     <string name="result_tags">शैलियां</string>
     <string name="result_share">शेयर</string>
     <string name="result_open_in_browser">ब्राउज़र में खोलें</string>
-
     <string name="type_watching">देखा जा रहा है</string>
     <string name="type_on_hold">होल्ड पर</string>
     <string name="type_completed">पूरा देखा</string>
     <string name="type_dropped">अधूरा छोड़ा</string>
     <string name="type_plan_to_watch">देखने की योजना</string>
-
     <string name="play_movie_button">मूवी चलाये</string>
     <string name="play_torrent_button">टोरेंट चलाये</string>
     <string name="pick_source">सूत्र</string>
@@ -29,7 +25,6 @@
     <string name="go_back">वापिस जाए</string>
     <string name="play_episode">एपिसोड चलाये</string>
     <!--<string name="need_storage">Allow to download episodes</string>-->
-
     <string name="download">डाउनलोड</string>
     <string name="downloaded">डाउनलोड किया गया</string>
     <string name="downloading">डाउनलोड हो रहा</string>
@@ -38,15 +33,12 @@
     <string name="download_failed">डाउनलोड नही हो पाया</string>
     <string name="download_canceled">डाउनलोड रद्द</string>
     <string name="download_done">डाउनलोड पूरा हुआ</string>
-
     <string name="error_loading_links_toast">लिंक में गड़बड़ है</string>
     <string name="download_storage_text">अंदरूनी स्टोरेज</string>
-
     <string name="popup_delete_file">फ़ाइल डिलीट</string>
     <string name="popup_play_file">फ़ाइल चलाये</string>
     <string name="popup_resume_download">डाउनलोड फिर शुरू करे</string>
     <string name="popup_pause_download">डाउनलोड रोके</string>
-
     <string name="pref_disable_acra">स्वचालित त्रुटि रिपोर्ट रोकें</string>
     <string name="home_more_info">और जानकारी</string>
     <string name="home_expanded_hide">छिपाये</string>
@@ -58,25 +50,19 @@
     <string name="sort_apply">लागू करे</string>
     <string name="sort_cancel">रद्द करे</string>
     <string name="player_speed">प्लेयर की रफ्तार</string>
-
     <string name="search_provider_text_providers">सूत्रों से छांटे</string>
     <string name="search_provider_text_types">प्रकार से छांटे</string>
-
     <string name="benene_count_text">%d केले दिए गए</string>
     <string name="benene_count_text_none">कोई केले नही दिए गए</string>
-
     <string name="subs_hold_to_reset_to_default">रिसेट करने ले किये दबाये रखे</string>
     <string name="continue_watching">देखना जारी रखें</string>
-
     <string name="action_remove_watching">हटाएँ</string>
     <string name="action_open_watching">अधिक जानकारी</string>
-
     <string name="vpn_might_be_needed">इस सूत्र को इस्तेमाल करने के लिए एक VPN की ज़रूरत पड़ सकती है</string>
     <string name="vpn_torrent">यह सूत्र एक torrent है, एक VPN इस्तेमाल करने की सिफारिश की जाती है</string>
     <string name="torrent_plot">वर्णन</string>
     <string name="normal_no_plot">कोई विषय नही मिला</string>
     <string name="torrent_no_plot">कोई वर्णन नही मिला</string>
-
     <string name="picture_in_picture_des">आपकी वीडियो एक छोटे से डब्बे में चलाता है</string>
     <string name="player_size_settings_des">काले बॉर्डर को हटाता है</string>
     <string name="player_subtitles_settings_des">प्लेयर की subtitle सेटिंग्स</string>
@@ -97,23 +83,18 @@
     <string name="discord">Discord से जुड़िये</string>
     <string name="benene">इस प्रोग्राम के निर्माता को केला चढ़ाये</string>
     <string name="benene_des">केले दे दिए गए</string>
-
     <string name="app_language">एप्प की भाषा</string>
-
     <string name="no_chromecast_support_toast">यह सूत्र क्रोमकास्ट का समर्थन नही करता</string>
     <string name="no_links_found_toast">कोई लिंक नही मिले</string>
     <string name="copy_link_toast">लिंक को क्लिपबोर्ड पे कॉपी करदिया गया</string>
     <string name="play_episode_toast">चलाये</string>
     <string name="acra_report_toast">असुविधा के लिए खेद है, यह एप्प क्रैश हो गया है । एक गुमनाम रिपोर्ट निर्माताओं को भेज दी गयी है ।
     </string>
-
-
     <string name="delete_file">फ़ाइल डिलीट करें</string>
     <string name="delete">डिलीट</string>
     <string name="pause">रोके</string>
     <string name="resume">वापिस चलाये</string>
     <string name="delete_message">एज इस चीज़ को हमेशा के लिए नष्ट कर देगा %s\nक्या आपका निर्णय निश्चित है ?</string>
-
     <string name="status_ongoing">अभी चालू है</string>
     <string name="status_completed">खत्म हो गया है</string>
     <string name="status">स्तिथि</string>
@@ -122,17 +103,14 @@
     <string name="duration">अवधि</string>
     <string name="site">सूत्र</string>
     <string name="synopsis">Synopsis</string>
-
     <string name="free_storage">खाली</string>
     <string name="used_storage">इस्तेमाल में</string>
     <string name="app_storage">एप्प</string>
-
     <string name="movies">मूवी</string>
     <string name="tv_series">टीवी सीरियल</string>
     <string name="cartoons">कार्टून</string>
     <string name="anime">अनिमे</string>
     <string name="torrent">टोरेंट</string>
-
     <string name="episode_action_chromecast_episode">क्रोमकास्ट एपिसोड</string>
     <string name="episode_action_chromecast_mirror">कक्रोमकास्ट मिरर</string>
     <string name="episode_action_play_in_app">एप्प मैं चलाये</string>
@@ -142,15 +120,12 @@
     <string name="episode_action_auto_download">डाउनलोड करे</string>
     <string name="episode_action_download_mirror">मिरर डाउनलोड</string>
     <string name="episode_action_reload_links">लिंक फिरसे लोड करें</string>
-
     <string name="no_update_found">कोई अपडेट नही मिला</string>
     <string name="check_for_update">अपडेट के लिए खोजे</string>
-
     <string name="video_lock">ताला</string>
     <string name="video_aspect_ratio_resize">आकार</string>
     <string name="video_source">सूत्र</string>
     <string name="video_skip_op">OP स्किप करें</string>
-
     <string name="dont_show_again">फिरसे ना दिखाए</string>
     <string name="update">अपडेट</string>
     <string name="watch_quality_pref">पसंदीदा देखने की क्वालिटी</string>
@@ -158,13 +133,16 @@
     <string name="provider_lang_settings">सूत्र की भाषाएं</string>
     <string name="app_layout">ऐप का लेआउट</string>
     <string name="preferred_media_settings">पसंदीदा मीडिया </string>
-    
     <string name="download_path_pref"> डाउनलोड करने का मार्ग</string>
     <string name="display_subbed_dubbed_settings">Dubbed या Subbed Anime दिखाये</string>
-    
     <string name="tv_layout">टीवी लेआउट</string>
     <string name="phone_layout">फ़ोन लेआउट</string>
-
     <string name="primary_color_settings">मुख्य रंग</string>
     <string name="app_theme_settings">ऐप का रंग</string>
-</resources>
+    <string name="action_mark_as_watched">देखा हुआ चिह्नित करें</string>
+    <string name="history">इतिहास</string>
+    <string name="next_episode_format" formatted="true">भाग %d जारी होगा</string>
+    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index e2069ca3..f8d5fe26 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -144,10 +144,10 @@
     <string name="autoplay_next_settings_des">Započne sljedeću epizodu kad trenutna završi</string>
     <string name="double_tap_to_seek_settings">Dodirni dvaput za traženje</string>
     <string name="double_tap_to_pause_settings">Dodirni dvaput za pauziranje</string>
-    <string name="double_tap_to_seek_amount_settings">Iznos traženja u playeru</string>
+    <string name="double_tap_to_seek_amount_settings">Iznos preskakanja u playeru</string>
     <string name="double_tap_to_seek_settings_des">Dvaput dodirni desnu ili lijevu stranu ekrana za pomicanje naprijed ili natrag
     </string>
-    <string name="double_tap_to_pause_settings_des">Dodirni u sredini za pauziranje</string>
+    <string name="double_tap_to_pause_settings_des">Dodirni u sredinu zaslona za pauziranje</string>
     <string name="use_system_brightness_settings">Koristi svijetlinu u sustavu</string>
     <string name="use_system_brightness_settings_des">Koristi svjetlinu sustava u playeru aplikacija umjesto tamnog
         preklopa
@@ -195,7 +195,7 @@
     <string name="season">Sezona</string>
     <string name="no_season">Nema sezone</string>
     <string name="episode">Epizoda</string>
-    <string name="episodes">Epizode</string>
+    <string name="episodes">Epizoda</string>
     <string name="episodes_range">%d-%d</string>
     <string name="episode_format" formatted="true">%d %s</string>
     <string name="season_short">S</string>
@@ -296,7 +296,7 @@
     <string name="resize_fit">Prilagodi zaslonu</string>
     <string name="resize_fill">Rastegni</string>
     <string name="resize_zoom">Zoom</string>
-    <string name="legal_notice">Odricanje</string>
+    <string name="legal_notice">Obavijest</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
         should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
 
@@ -462,7 +462,7 @@
     <string name="tracks">Zapis</string>
     <string name="audio_tracks">Audio zapis</string>
     <string name="video_tracks">Video zapis</string>
-    <string name="apply_on_restart">Primijeni na restart</string>
+    <string name="apply_on_restart">Primijeni na ponovnom pokretanju</string>
     <string name="safe_mode_title">Sigurnosni način rada omogućen</string>
     <string name="safe_mode_description">Sve su ekstenzije isključene zbog rušenja aplikacije kako biste lakše pronašli ono koje uzrokuje probleme.</string>
     <string name="safe_mode_crash_info">Pogledajte podatke o padu</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index dbe3a30e..9d3fb59f 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -137,7 +137,7 @@
     <string name="backup_settings">Cadangkan data</string>
     <string name="restore_success">File cadangan termuat</string>
     <string name="restore_failed_format" formatted="true">Gagal untuk memulihkan data dari file %s</string>
-    <string name="backup_success">Data berhasil disimpan</string>
+    <string name="backup_success">Data tersimpan</string>
     <string name="backup_failed">Izin penyimpanan tidak ditemukan, mohon coba lagi</string>
     <string name="backup_failed_error_format">Error saat mencadang %s</string>
     <string name="search">Cari</string>
@@ -250,8 +250,8 @@
     <string name="video_buffer_length_settings">Panjang buffer video</string>
     <string name="video_buffer_disk_settings">Cache video di disk</string>
     <string name="video_buffer_clear_settings">Membersihkan cache video dan gambar</string>
-    <string name="video_ram_description">Akan menyebabkan crash acak jika disetel terlalu tinggi. Jangan diubah jika anda memiliki jumlah ram yang rendah seperti TV Android atau ponsel lama</string>
-    <string name="video_disk_description">Dapat menyebabkan masalah pada sistem dengan ruang penyimpanan yang rendah seperti perangkat Android TV jika anda menyetelnya terlalu tinggi</string>
+    <string name="video_ram_description">Dapat menyebabkan crash jika resolusi terlalu tinggi di RAM yang rendah, seperti TV Android atau ponsel lama.</string>
+    <string name="video_disk_description">Dapat bermasalah pada sistem dengan ruang penyimpanan rendah, seperti Android TV, jika diatur terlalu tinggi.</string>
     <string name="dns_pref">DNS melalui HTTPS</string>
     <string name="dns_pref_summary">Berguna untuk melewati blok ISP</string>
     <string name="download_path_pref">Jalur download</string>
@@ -303,8 +303,8 @@
     -->
     <string name="login_format" formatted="true">%s %s</string>
     <string name="account">akun</string>
-    <string name="logout">Logout</string>
-    <string name="login">Login</string>
+    <string name="logout">Keluar</string>
+    <string name="login">Masuk</string>
     <string name="switch_account">Ganti akun</string>
     <string name="add_account">Tambah akun</string>
     <string name="add_sync">Tambah pelacak</string>
@@ -314,8 +314,8 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="authenticated_user" formatted="true">%s Diautentikasikan</string>
-    <string name="authenticated_user_fail" formatted="true">Gagal untuk mengautentikasi ke %s</string>
+    <string name="authenticated_user" formatted="true">%s terautentikasi</string>
+    <string name="authenticated_user_fail" formatted="true">Gagal masuk ke %s</string>
     <!-- ============ -->
     <string name="none">Tidak Ada</string>
     <string name="normal">Normal</string>
@@ -327,10 +327,10 @@
     <string name="subtitles_shadow">Bayangan</string>
     <string name="subtitles_raised">Menonjol</string>
     <string name="subtitle_offset">Sinkronisasi sub</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Penundaan subtitle</string>
-    <string name="subtitle_offset_extra_hint_later_format">Gunakan ini jika subtitle ditampilkan %dms terlalu cepat</string>
-    <string name="subtitle_offset_extra_hint_before_format">Gunakan ini jika subtitle ditampilkan %dms terlalu lambat</string>
+    <string name="subtitle_offset_extra_hint_later_format">Gunakan ini jika subtitle ditampilkan %d ms terlalu cepat</string>
+    <string name="subtitle_offset_extra_hint_before_format">Gunakan ini jika subtitle ditampilkan %d ms terlalu lambat</string>
     <string name="subtitle_offset_extra_hint_none_format">Tidak ada penundaan subtitle</string>
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
@@ -356,7 +356,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blu-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
@@ -370,4 +370,120 @@
     <string name="resolution_and_title">Resolusi dan judul</string>
     <string name="title">Judul</string>
     <string name="resolution">Resolusi</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="next_episode_format" formatted="true">Episode %d akan dirilis tanggal</string>
+    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="automatic_plugin_updates">Pembaruan otomatis plugin</string>
+    <string name="automatic_plugin_download">Unduh plugins secara otomatis</string>
+    <string name="kitsu_settings">Tampilkan poster dari Kitsu</string>
+    <string name="automatic_plugin_download_summary">Pasang otomatis semua plugins yang belum terpasang, dari repositori yang telah ditambahkan.</string>
+    <string name="live_singular">Siaran langsung</string>
+    <string name="nsfw_singular">17+</string>
+    <string name="example_password">password123</string>
+    <string name="category_providers">Penyedia</string>
+    <string name="pref_category_cache">Cache</string>
+    <string name="pref_category_player_features">Fitur Pemutar</string>
+    <string name="pref_category_subtitles">Bahasa</string>
+    <string name="pref_category_player_layout">Tampilan</string>
+    <string name="pref_category_defaults">Bawaan</string>
+    <string name="pref_category_looks">Tampilan</string>
+    <string name="pref_category_ui_features">Fitur</string>
+    <string name="enable_nsfw_on_providers">Tampilkan konten 17+</string>
+    <string name="play_trailer_button">Putar Cuplikan</string>
+    <string name="play_livestream_button">Putar Siaran</string>
+    <string name="stream">Siaran</string>
+    <string name="subs_subtitle_languages">Bahasa Subtitel</string>
+    <string name="autoplay_next_settings">Putar otomatis episode selanjutnya</string>
+    <string name="autoplay_next_settings_des">Putar episode selanjutnya, setelah ini berakhir</string>
+    <string name="show_trailers_settings">Tampilkan cuplikan</string>
+    <string name="redo_setup_process">Ulang proses pemasangan</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="nsfw">17+</string>
+    <string name="others">Lainnya</string>
+    <string name="other_singular">Vidio</string>
+    <string name="add_site_pref">Duplikasi Website</string>
+    <string name="add_site_summary">Duplikasi website yang telah ada, dengan alamat berbeda</string>
+    <string name="pref_category_links">Tautan</string>
+    <string name="pref_category_app_updates">Perbarui Aplikasi</string>
+    <string name="pref_category_backup">Cadangkan</string>
+    <string name="pref_category_extensions">Fitur Tambahan</string>
+    <string name="play_with_app_name">Putar di CloudStream</string>
+    <string name="pref_filter_search_quality">Sembunyikan kualitas vidio terpilih di pencarian</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="livestreams">Siaran langsung</string>
+    <string name="remove_site_pref">Hapus Website</string>
+    <string name="example_username">UsernameKeren</string>
+    <string name="example_email">contoh@email.com</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="example_site_name">Websiteku</string>
+    <string name="example_site_url">contoh.com</string>
+    <string name="extras">Ekstra</string>
+    <string name="preferred_media_subtext">Apa yang ingin anda lihat</string>
+    <string name="plugin_deleted">Plugin terhapus</string>
+    <string name="plugins_updated" formatted="true">%d plugin diperbarui</string>
+    <string name="view_public_repositories_button">Lihat Repositori dari Group</string>
+    <string name="view_public_repositories_button_short">List Umum</string>
+    <string name="blank_repo_message">CloudStream tidak memiliki sumber video secara bawaan. Kamu harus menginstall dari repositori.
+\n
+\nKarena banyak laporan dari banyak pihak berwajib, kami tidak dapat memberikannya secara langsung.
+\n
+\nGabung dengan group Discord atau cari di internet.</string>
+    <string name="repository_url_hint">Alamat Repositori</string>
+    <string name="create_account">Buat Akun</string>
+    <string name="error">Error</string>
+    <string name="subtitles_filter_lang">Urutkan berdasarkan bahasa terpilih</string>
+    <string name="trailer">Cuplikan</string>
+    <string name="plugin_loaded">Plugin terpasang</string>
+    <string name="plugin_load_fail" formatted="true">Plugin %s gagal diambil</string>
+    <string name="is_adult">18+</string>
+    <string name="repository_name_hint">Nama Repositori</string>
+    <string name="plugin_singular">plugin</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Semua %s telah terunduh</string>
+    <string name="batch_download">Unduh bersamaan</string>
+    <string name="plugin">plugins</string>
+    <string name="plugins_disabled" formatted="true">Tidak aktif: %d</string>
+    <string name="uppercase_all_subtitles">Ganti subtitle jadi huruf besar semua</string>
+    <string name="plugins_downloaded" formatted="true">Terunduh: %d</string>
+    <string name="plugins_not_downloaded" formatted="true">Tidak terunduh: %d</string>
+    <string name="download_all_plugins_from_repo">Unduh semua plugin dari repositori ini\?</string>
+    <string name="safe_mode_title">Semua Umur</string>
+    <string name="single_plugin_disabled" formatted="true">%s (Tidak aktif)</string>
+    <string name="tracks">Tracks</string>
+    <string name="apply_on_restart">Terapkan saat Restart</string>
+    <string name="extension_description">Keterangan</string>
+    <string name="extension_version">Versi</string>
+    <string name="extension_status">Status</string>
+    <string name="safe_mode_crash_info">Lihat log crash</string>
+    <string name="extension_rating" formatted="true">Peringkat: %s</string>
+    <string name="extension_authors">Pembuat</string>
+    <string name="extension_language">Bahasa</string>
+    <string name="player_pref">Pemutar vidio utama</string>
+    <string name="player_settings_play_in_app">Pemutar Bawaan</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="batch_download_finish_format" formatted="true">Terunduh %d %s</string>
+    <string name="batch_download_start_format" formatted="true">"Memulai mengunduh  %d %s…"</string>
+    <string name="safe_mode_description">Semua fitur tambahkan dimatikan karena crash, untuk memudahkanmu mencari penyebab crash.</string>
+    <string name="example_lang_name">Kode bahasa (en)</string>
+    <string name="player_load_subtitles_online">ambil dari internet</string>
+    <string name="provider_languages_tip">Putar vidio di bahasa ini</string>
+    <string name="add_repository">Tambah Repositori</string>
+    <string name="delete_repository_plugins">Pilih ini untuk menghapus semua repositori plugin</string>
+    <string name="skip_setup">Lewati pengaturan</string>
+    <string name="error_invalid_url">alamat salah</string>
+    <string name="network_adress_example">"Alamat  streaming"</string>
+    <string name="next">Selanjutnya</string>
+    <string name="previous">Sebelumnya</string>
+    <string name="app_layout_subtext">Ubah tampilan aplikasi</string>
+    <string name="crash_reporting_title">Laporkan Crash</string>
+    <string name="setup_done">Selesai</string>
+    <string name="extensions">Fitur Tambahan</string>
+    <string name="delete_repository">Hapus Repositori</string>
+    <string name="setup_extensions_subtext">Unduh semua situs yang ingin digunakan</string>
+    <string name="extension_size">Ukuran</string>
+    <string name="error_invalid_id">ID salah</string>
+    <string name="history">Riwayat</string>
+    <string name="action_mark_as_watched">Tandai ditonton</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index f5bd96f8..f49f56b9 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -116,4 +116,10 @@
     <string name="chromecast_subtitles_settings">כתוביות כרומקאסט</string>
     <string name="picture_in_picture_des">ממשיך ניגון בנגן מינימלי מעל ישומים אחרים</string>
     <string name="player_subtitles_settings">כתוביות</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="history">היסטוריה</string>
+    <string name="apk_installer_legacy">מורשת</string>
+    <string name="no">לא</string>
+    <string name="yes">כן</string>
+    <string name="action_mark_as_watched">סימון כנצפה</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
new file mode 100644
index 00000000..a6b3daec
--- /dev/null
+++ b/app/src/main/res/values-kn/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 85aee997..19d1bc6e 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -1,17 +1,15 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
-       <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+    <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Брзина (%.2fx)</string>
     <string name="rated_format" formatted="true">Оценето: %.1f</string>
-    <string name="new_update_format" formatted="true">Пронајдена нова верзија на апликацијата!\n%s -> %s</string>
+    <string name="new_update_format" formatted="true">Пронајдена нова верзија на апликацијата!\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Филтер</string>
-
     <string name="app_name">CloudStream</string>
     <string name="title_home">Дома</string>
     <string name="title_search">Барај</string>
     <string name="title_downloads">Превземања</string>
     <string name="title_settings">Поставки</string>
-
     <string name="search_hint">Барај…</string>
     <string name="no_data">Нема податоци</string>
     <string name="episode_more_options_des">Повеќе опции</string>
@@ -21,7 +19,6 @@
     <string name="result_open_in_browser">Отвори во прелистувач</string>
     <string name="skip_loading">Прескокни вчитување</string>
     <string name="loading">Вчитување…</string>
-
     <string name="type_watching">Моментални гледања</string>
     <string name="type_on_hold">Ставено на чекање</string>
     <string name="type_completed">Завршени</string>
@@ -29,7 +26,6 @@
     <string name="type_plan_to_watch">Планирани за гледање</string>
     <string name="type_none">Ништо одбрано</string>
     <string name="type_re_watching">Повторно гледање</string>
-
     <string name="play_movie_button">Пушти филм</string>
     <string name="play_torrent_button">Стримај торент</string>
     <string name="pick_source">Извори</string>
@@ -38,7 +34,6 @@
     <string name="go_back">Оди назад</string>
     <string name="play_episode">Пушти епизода</string>
     <!--<string name="need_storage">Allow to download episodes</string>-->
-
     <string name="download">Превземи</string>
     <string name="downloaded">Превземено</string>
     <string name="downloading">Се превзема</string>
@@ -47,15 +42,12 @@
     <string name="download_failed">Превземањето е неуспешно</string>
     <string name="download_canceled">Превземањето е откажано</string>
     <string name="download_done">Превземањето е готово</string>
-
     <string name="error_loading_links_toast">Грешка при вчитување на врската</string>
     <string name="download_storage_text">Внатрешна меморија</string>
-
     <string name="popup_delete_file">Избриши датотека</string>
     <string name="popup_play_file">Пушти датотека</string>
     <string name="popup_resume_download">Продолжи со преземање</string>
     <string name="popup_pause_download">Паузирај со преземање</string>
-
     <string name="pref_disable_acra">Оневозможи автоматско известување за грешки</string>
     <string name="home_more_info">Повеќе информации</string>
     <string name="home_expanded_hide">Скриј</string>
@@ -67,7 +59,6 @@
     <string name="sort_apply">Активирај</string>
     <string name="sort_cancel">Откажи</string>
     <string name="player_speed">Брзина на плеер</string>
-
     <string name="subtitles_settings">Поставки за преводи</string>
     <string name="subs_text_color">Боја на текстот</string>
     <string name="subs_outline_color">Боја на надворешна линија од текстот</string>
@@ -77,30 +68,22 @@
     <string name="subs_subtitle_elevation">Висина на титл</string>
     <string name="subs_font">Фонт</string>
     <string name="subs_font_size">Големина на фонт</string>
-
     <string name="search_provider_text_providers">Пребарувај користејќи провајдери</string>
     <string name="search_provider_text_types">Пребарувај користејќи типови</string>
-
     <string name="benene_count_text">%d Крем банани дадени на девелоперите</string>
     <string name="benene_count_text_none">Нема крем банани дадени</string>
-
     <string name="subs_auto_select_language">Авто одбирање на јазик</string>
     <string name="subs_download_languages">Превземи јазици</string>
     <string name="subs_hold_to_reset_to_default">Држете за да се ресетира на стандардно</string>
     <string name="continue_watching">Продолжи со гледање</string>
-
     <string name="action_remove_watching">Избриши</string>
     <string name="action_open_watching">Повеќе информации</string>
-
     <string name="vpn_might_be_needed">Можеби ќе биде потребен VPN за да работи правилно овој провајдер</string>
     <string name="vpn_torrent">Овој провајдер е торент, се препорачува VPN</string>
-
     <string name="provider_info_meta">Метаподатоците не се обезбедени од страната, вчитувањето на видеото може да не успее.</string>
-
     <string name="torrent_plot">Опис</string>
     <string name="normal_no_plot">Не е пронајден заговор</string>
     <string name="torrent_no_plot">Не е пронајден опис</string>
-
     <string name="picture_in_picture">Слика-во-слика</string>
     <string name="picture_in_picture_des">Продолжува со репродукција во минијатурен плеер над другите апликации</string>
     <string name="player_size_settings">Копче за промена на големината на плеерот</string>
@@ -117,7 +100,6 @@
     <string name="double_tap_to_seek_settings_des">Допрете двапати на десната или левата страна за да барате напред или назад</string>
     <string name="use_system_brightness_settings">Користете ја осветленоста на системот</string>
     <string name="use_system_brightness_settings_des">Користете ја осветленоста на системот во плеерот наместо темната прекривка</string>
-
     <string name="search">Барај</string>
     <string name="settings_info">Информации</string>
     <string name="advanced_search">Напредно пребарување</string>
@@ -135,29 +117,24 @@
     <string name="discord">Придружете се на Discord</string>
     <string name="benene">Дајте им крем банана на развивачите</string>
     <string name="benene_des">Дадени крем банани</string>
-
     <string name="app_language">Јазик на апликацијата</string>
-
     <string name="no_chromecast_support_toast">Овој провајдер нема поддршка за Chromecast</string>
     <string name="no_links_found_toast">Не се пронајдени врски</string>
     <string name="copy_link_toast">Врската е копирана во таблата со исечоци</string>
     <string name="play_episode_toast">Пушти ја епизодата</string>
     <string name="subs_default_reset_toast">Ресетирање на стандардните вредности</string>
     <string name="acra_report_toast">За жал, апликацијата падна. Ќе се испрати анонимен извештај за грешка до програмерите</string>
-
     <string name="season">Сезона</string>
     <string name="no_season">Нема сезона</string>
     <string name="episode">Епизода</string>
     <string name="episodes">Епизоди</string>
     <string name="season_short">С</string>
     <string name="episode_short">Е</string>
-
     <string name="delete_file">Избриши датотека</string>
     <string name="delete">Избриши</string>
     <string name="pause">Паузирај</string>
     <string name="resume">Продолжи</string>
     <string name="delete_message">Ова трајно ќе го избрише %s\nДали си сигурен?</string>
-
     <string name="status_ongoing">Во тек</string>
     <string name="status_completed">Завршени</string>
     <string name="status">Статус</string>
@@ -166,27 +143,22 @@
     <string name="duration">Времетраење</string>
     <string name="site">Извор</string>
     <string name="synopsis">Крат</string>
-
     <string name="queued">во редица</string>
     <string name="no_subtitles">Нема преводи</string>
     <string name="default_subtitles">Стандардно</string>
-
     <string name="free_storage">Слободен простор</string>
     <string name="used_storage">Искористен простор</string>
     <string name="app_storage">Апликациски простор</string>
-
     <string name="movies">Филмови</string>
     <string name="tv_series">Серии</string>
     <string name="cartoons">Цртани</string>
     <string name="anime">Аниме</string>
     <string name="torrent">Торент</string>
-
     <string name="source_error">Извор на проблемот</string>
     <string name="remote_error">Грешка</string>
     <string name="render_error">Грешка</string>
     <string name="unexpected_error">Неочекувана грешка со плеерот</string>
     <string name="storage_error">Грешка при превземањето, проверете си ги дозволите за користење на простор</string>
-
     <string name="episode_action_chromecast_episode">Епизода на Chromecast</string>
     <string name="episode_action_chromecast_mirror">Огледало на Chromecastr</string>
     <string name="episode_action_play_in_app">Пушти во апликацијата</string>
@@ -196,42 +168,32 @@
     <string name="episode_action_auto_download">Авто превземање</string>
     <string name="episode_action_download_mirror">Превземи Mirror</string>
     <string name="episode_action_reload_links">Вчитај повторно врски</string>
-
     <string name="no_update_found">Не е пронајдено ажурирање</string>
     <string name="check_for_update">Проверете ажурирања</string>
-
     <string name="video_lock">Заклучи</string>
     <string name="video_aspect_ratio_resize">Променете ја големината</string>
     <string name="video_source">Избор</string>
     <string name="video_skip_op">Прескокни ОП</string>
-
     <string name="dont_show_again">Не прикажувај повторно</string>
     <string name="update">Ажурирај</string>
     <string name="watch_quality_pref">Префериран квалитет на гледање</string>
     <string name="dns_pref">DNS преку HTTPS</string>
     <string name="dns_pref_summary">Корисно за заобиколување на блоковите на интернет провајдерите</string>
-
     <string name="download_path_pref">Патека на превземање</string>
-
     <string name="display_subbed_dubbed_settings">Прикажи синхронизирано/сублирано аниме</string>
-
     <string name="resize_fit">Прилагоди на екранот</string>
     <string name="resize_fill">Истегни</string>
     <string name="resize_zoom">Зумирај</string>
-
     <string name="legal_notice">Disclaimer</string>
     <string name="category_general">Генерално</string>
     <string name="provider_lang_settings">Јазици на провајдерите</string>
     <string name="app_layout">Распоред на апликацијата</string>
     <string name="preferred_media_settings">Претпочитани медиуми</string>
-
     <string name="automatic">Автоматски</string>
     <string name="tv_layout">Изглед за гледање на телевизор</string>
     <string name="phone_layout">Изглед за гледање на телефон</string>
-
     <string name="primary_color_settings">Примарна боја</string>
     <string name="app_theme_settings">Тема на апликацијата</string>
-
     <string name="login_format">%s %s</string>
     <string name="account">Корисничко име</string>
     <string name="logout">Одјавување</string>
@@ -248,4 +210,5 @@
     <string name="subtitles_depressed">Депресиран</string>
     <string name="subtitles_shadow">Сенка</string>
     <string name="subtitles_raised">Подигнат</string>
-</resources>
+    <string name="history">Историја</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 78f45e26..b60aadae 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -1,10 +1,9 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">വേഗം (%.2fx)</string>
     <string name="rated_format" formatted="true">റേറ്റിംഗ്: %.1f</string>
-    <string name="new_update_format" formatted="true">പുതിയ അപ്ഡേറ്റ്\n%s -> %s</string>
-
+    <string name="new_update_format" formatted="true">പുതിയ അപ്ഡേറ്റ്\n%s -&gt; %s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">ഹോം</string>
     <string name="title_search">തിരയുക</string>
@@ -17,13 +16,11 @@
     <string name="result_tags">തരം</string>
     <string name="result_share">ഷെയർ</string>
     <string name="result_open_in_browser">ബ്രൗസറിൽ തുറക്കുക</string>
-
     <string name="type_watching">കാണുന്നു</string>
     <string name="type_on_hold">കണ്ടു നിർത്തി</string>
     <string name="type_completed">കണ്ടു തീർന്നു</string>
     <string name="type_dropped">കണ്ടു മതിയാക്കി</string>
     <string name="type_plan_to_watch">കാണാൻ പോകുന്നു</string>
-
     <string name="play_movie_button">സിനിമ പ്ലേ ചെയ്യുക</string>
     <string name="play_torrent_button">ടോറൻറ് സ്ട്രീം ചെയ്യുക</string>
     <string name="pick_source">സ്രോതസുകൾ</string>
@@ -31,7 +28,6 @@
     <string name="reload_error">വീണ്ടും കണക്ട് ചെയ്യുക…</string>
     <string name="go_back">പിന്നോട്ട് പോകുക</string>
     <string name="play_episode">എപ്പിസോഡ് പ്ലേയ് ചെയ്യുക</string>
-
     <string name="download">ഡൌൺലോഡ്</string>
     <string name="downloaded">ഡൌൺലോഡ് ചെയ്തവ</string>
     <string name="downloading">ഡൌൺലോഡ് ചെയ്യുന്നു</string>
@@ -40,18 +36,14 @@
     <string name="download_failed">ഡൌൺലോഡ് മുടങ്ങി</string>
     <string name="download_canceled">ഡൌൺലോഡ് റദ്ദാക്കി</string>
     <string name="download_done">ഡൌൺലോഡ് പൂർത്തിയായി</string>
-
     <string name="error_loading_links_toast">ലിങ്കിൽ തകരാർ</string>
     <string name="download_storage_text">ആന്തരിക സ്റ്റോറേജ്</string>
-
     <string name="app_dubbed_text">ഡബ്</string>
     <string name="app_subbed_text">സബ്</string>
-
     <string name="popup_delete_file">ഫയൽ ഡിലീറ്റ് ചെയ്യുക</string>
     <string name="popup_play_file">ഫയൽ പ്ലേയ് ചെയ്യുക</string>
     <string name="popup_resume_download">ഡൌൺലോഡ് തുടരുക</string>
     <string name="popup_pause_download">ഡൌൺലോഡ് നിർത്തുക</string>
-
     <string name="pref_disable_acra">ഓട്ടോമാറ്റിക് ബഗ് റിപ്പോർട്ടിംഗ് പ്രവർത്തനരഹിതമാക്കുക</string>
     <string name="home_more_info">കൂടുതൽ വിവരം</string>
     <string name="home_expanded_hide">ഒളിക്കുക</string>
@@ -63,7 +55,6 @@
     <string name="sort_apply">പ്രയോഗിക്കുക</string>
     <string name="sort_cancel">റദ്ദാക്കുക</string>
     <string name="player_speed">പ്ലേയർ വേഗത</string>
-
     <!-- <string name="subtitles_settings">Subtitle Settings</string>
     <string name="subs_text_color">Text Color</string>
     <string name="subs_outline_color">Outline Color</string>
@@ -72,27 +63,21 @@
     <string name="subs_edge_type">Edge Type</string>
     <string name="subs_subtitle_elevation">Subtitle Elevation</string>
     <string name="subs_font">Font</string> -->
-
     <string name="search_provider_text_providers">സ്രോതസ് അടിസ്ഥാനത്തിൽ തിരയുക</string>
     <string name="search_provider_text_types">തരം അടിസ്ഥാനത്തിൽ തിരയുക</string>
-
     <string name="benene_count_text">%d പഴം കൊടുത്തു</string>
     <string name="benene_count_text_none">പഴം കൊടുത്തിട്ടില്ല </string>
-
     <!-- <string name="subs_auto_select_language">Auto Select Language</string>
     <string name="subs_download_languages">Download Languages</string> -->
     <string name="subs_hold_to_reset_to_default">റീസെറ് ചെയ്യാൻ അമർത്തിപ്പിടിക്കുക</string>
     <string name="continue_watching">തുടർന്നു കാണുക</string>
-
     <string name="action_remove_watching">നീക്കം ചെയ്യുക</string>
     <string name="action_open_watching">കൂടുതൽ വിവരം</string>
-
     <string name="vpn_might_be_needed">ഈ സ്രോതസ് പ്രവൃത്തിക്കാൻ  VPN ഉപയോഗിക്കേണ്ടിവന്നേക്കാം</string>
     <string name="vpn_torrent">ഈ ടോറന്റ് സ്രോതസ് ഉപയോഗിക്കാൻ VPN ശുപാർശചെയ്യുന്നു</string>
     <string name="torrent_plot">വിവരണം</string>
     <string name="normal_no_plot">വിവരണം ലഭ്യമല്ല</string>
     <string name="torrent_no_plot">വിവരണം ലഭ്യമല്ല</string>
-
     <!-- <string name="picture_in_picture">Picture-in-picture</string> -->
     <string name="picture_in_picture_des">മറ്റ് ആപ്പുകളുടെ മുകളിൽ ഒരു മിനിയേച്ചർ പ്ലെയറിൽ പ്ലേബാക്ക് തുടരുക</string>
     <!-- <string name="player_size_settings">Player resize button</string> -->
@@ -107,7 +92,6 @@
     <string name="swipe_to_change_settings_des">തെളിച്ചം അല്ലെങ്കിൽ വോളിയം മാറ്റാൻ ഇടത്തോട്ടോ വലത്തോട്ടോ സ്വൈപ്പുചെയ്യുക</string>
     <!-- <string name="double_tap_to_seek_setthings">Double tap to seek</string> -->
     <string name="double_tap_to_seek_settings_des">മുന്നോട്ട് അല്ലെങ്കിൽ പിന്നിലേക്ക് നീങ്ങാൻ വലത്തോട്ടോ ഇടത്തോട്ടോ രണ്ടുതവണ ടാപ്പുചെയ്യുക</string>
-
     <string name="search">തിരയുക</string>
     <string name="settings_info">വിവരം</string>
     <!-- <string name="advanced_search">Advanced Search</string> -->
@@ -125,24 +109,20 @@
     <string name="benene">പഴം കൊടുക്കു</string>
     <string name="benene_des">പഴം കൊടുത്ത എണ്ണം</string>
     <string name="app_language">ആപ്പിന്റെ ഭാഷ</string>
-
     <string name="no_chromecast_support_toast">ഈ സ്രോതസ് ക്രോംകാസ്റ് അനുവദിക്കുന്നില്ല </string>
     <string name="no_links_found_toast">ലിങ്കുകൾ ലഭ്യമല്ല</string>
     <string name="copy_link_toast">ലിങ്ക് പകർത്തിയിരിക്കുന്നു</string>
     <string name="play_episode_toast">എപ്പിസോഡ് പ്ലേയ് ചെയ്യുക</string>
     <string name="acra_report_toast">ആപ്പ് നിശ്ചലമായിരിക്കുന്നതിന് ക്ഷമിക്കണം</string>
-
     <string name="season">സീസൺ</string>
     <string name="no_season">സീസണില്ല</string>
     <string name="episode">എപ്പിസോഡ്</string>
     <string name="episodes">എപ്പിസോഡുകൾ</string>
-
     <string name="delete_file">ഫയൽ ഡിലീറ്റ് ചെയ്യുക</string>
     <string name="delete">ഡിലീറ്റ്</string>
     <string name="pause">നിർത്തുക</string>
     <string name="resume">തുടരുക</string>
     <string name="delete_message">സ്ഥിരമായി %sനെ ഡിലീറ്റ് ചെയ്യുക\nഉറപ്പാണോ?</string>
-
     <string name="status_ongoing">തുടരുന്നു</string>
     <string name="status_completed">പൂർത്തിയായി</string>
     <string name="status">അവസ്ഥ</string>
@@ -151,27 +131,22 @@
     <string name="duration">ദൈര്ഘം</string>
     <string name="site">സ്രോതസ്</string>
     <string name="synopsis">സംഗ്രഹം</string>
-
     <!-- <string name="queued">queued</string>
     <string name="no_subtitles">No Subtitles</string>
     <string name="default_subtitles">Default</string> -->
-
     <string name="free_storage">ഒഴിവ്</string>
     <string name="used_storage">ഉപയോഗത്തിൽ</string>
     <string name="app_storage">ആപ്പ്</string>
-       
     <string name="movies">സിനിമ</string>
     <string name="tv_series">ടീവീ സീരീസ്</string>
     <string name="cartoons">കാർട്ടൂൺസ്</string>
     <string name="anime">ആനിമേ</string>
     <string name="torrent">ടോറൻറ്</string>
-
     <!-- <string name="source_error">Source error</string>
     <string name="remote_error">Remote error</string>
     <string name="render_error">Renderer error</string>
     <string name="unexpected_error">Unexpected player error</string>
     <string name="storage_error">Download error, check storage permissions</string> -->
-
     <!-- <string name="episode_action_chomecast_episode">Chromecast Episode</string>
     <string name="episode_action_chomecast_mirror">Chromecast Mirror</string> -->
     <string name="episode_action_play_in_app">ആപ്പിൽ പ്ലേയ് ചെയ്യുക</string>
@@ -181,16 +156,15 @@
     <string name="episode_action_auto_download">ഡൌൺലോഡ് ചെയ്യൂ</string>
     <string name="episode_action_download_mirror">മിറർ ഡൗണ്ലോഡ്</string>
     <string name="episode_action_reload_links">ലിങ്ക്സ് വീണ്ടും ലോഡുചെയ്യുക</string>
-
     <string name="no_update_found">അപ്ഡേറ്റ് ലഭ്യമല്ല</string>
     <string name="check_for_update">അപ്ഡേറ്റിനായി തിരയുക</string>
-
     <string name="video_lock">പൂട്ടുക</string>
     <string name="video_aspect_ratio_resize">വലുപ്പം മാറ്റുക</string>
     <string name="video_source">സ്രോതസ്</string>
     <string name="video_skip_op">OP ഒഴിവാക്കു</string>
-
     <string name="dont_show_again">ഇനിയും  കാണിക്കരുത്</string>
     <string name="update">അപ്ഡേറ്റ്</string>
     <string name="watch_quality_pref">ഔചിത്യ വീഡിയോ ക്വാളിറ്റി</string>
-</resources>
+    <string name="history">ചരിത്രം</string>
+    <string name="action_mark_as_watched">കണ്ടതാണെന്ന് അടയാളപ്പെടുത്തുക</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 568f9f8f..4011d6f5 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -396,4 +396,6 @@
     <string name="crash_reporting_title">Crashrapportage</string>
     <string name="preferred_media_subtext">Wat wil je zien?</string>
     <string name="setup_done">Klaar</string>
+    <string name="action_mark_as_watched">Markeer als bekeken</string>
+    <string name="history">Geschiedenis</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 6fc50898..9087f8d9 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -386,4 +386,6 @@
     <!--<string name="subtitles_remove_bloat">Remove bloat from subtitles</string>-->
     <!--<string name="extras">Extra</string>-->
     <string name="trailer">Trailer</string>
+    <string name="history">Istoric</string>
+    <string name="action_mark_as_watched">Marcare ca vizionat</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
new file mode 100644
index 00000000..a6b3daec
--- /dev/null
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index c36d5056..57af1678 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -246,4 +246,39 @@
     <string name="torrent_singular">Torrent</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="go_forward_30">+30</string>
+    <string name="provider_info_meta">Metadata är inte givet av sidan, videon kommer inte ladda om den inte existerar på sidan.</string>
+    <string name="automatic_plugin_download">Automatiskt ladda ner plugin</string>
+    <string name="pref_filter_search_quality">Dölj vald videokvalitet i sökresultat</string>
+    <string name="episode_action_download_subtitle">Ladda ner undertexter</string>
+    <string name="movies_singular">Film</string>
+    <string name="tv_series_singular">Serier</string>
+    <string name="skip_update">Skippa denna uppdatering</string>
+    <string name="backup_failed">Lagringsbehörigheter saknas. Var vänlig försök igen.</string>
+    <string name="no_episodes_found">Inga episoder hittade</string>
+    <string name="kitsu_settings">Visa bilder från Kitsu</string>
+    <string name="apk_installer_settings_des">Vissa telefoner stöder inte den nya paketinstallatören. Prova alternativet för äldre versioner om uppdateringarna inte installeras.</string>
+    <string name="apk_installer_settings">APK-installatör</string>
+    <string name="subs_import_text" formatted="true">Importera typsnitt genom att placera filerna i %s</string>
+    <string name="episode_sync_settings_des">Automatiskt uppdatera antalet episoder sedda</string>
+    <string name="backup_settings">Säkerhetskopiera data</string>
+    <string name="restore_success">Läste in säkerhetskopia</string>
+    <string name="restore_failed_format" formatted="true">Misslyckades att återställa data från %s</string>
+    <string name="backup_success">Data lagrad</string>
+    <string name="backup_failed_error_format">Problem att säkerhetskopiera %s</string>
+    <string name="automatic_plugin_download_summary">Installera automatiskt alla ännu inte installerade plugins från tillagda repositories.</string>
+    <string name="redo_setup_process">Gör om installationsprocessen</string>
+    <string name="documentaries">Dokumentärer</string>
+    <string name="asian_drama">Asiatiska draman</string>
+    <string name="others">Andra</string>
+    <string name="cartoons_singular">Tecknade serier</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="documentaries_singular">Dokumentär</string>
+    <string name="asian_drama_singular">Asiatisk drama</string>
+    <string name="other_singular">Video</string>
+    <string name="show_hd">Kvalitetsetikett</string>
+    <string name="show_title">Titel</string>
+    <string name="poster_ui_settings">Växla UI-element på affisch</string>
+    <string name="limit_title_rez">Videospelarens upplösning</string>
+    <string name="history">Historik</string>
+    <string name="action_mark_as_watched">Markera som sedd</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
new file mode 100644
index 00000000..b2334c5f
--- /dev/null
+++ b/app/src/main/res/values-ta/strings.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="search_hint">தேடுக</string>
+    <string name="search_hint_site" formatted="true">தேடல் %s…</string>
+    <string name="player_speed_text_format" formatted="true">வேகம்</string>
+    <string name="title_home">முகப்பு</string>
+    <string name="title_search">தேடு</string>
+    <string name="title_downloads">பதிவிறக்கம்</string>
+    <string name="no_data">தகவல் எதுவும் இல்லை</string>
+    <string name="episode_more_options_des">மேலும் விருப்பங்கள்</string>
+    <string name="next_episode">அடுத்த எபிசோட்</string>
+    <string name="result_tags">வகைகள்</string>
+    <string name="result_share">பகிர்</string>
+    <string name="result_open_in_browser">Browser இல் திற</string>
+    <string name="skip_loading">ஏற்றுவதைத் தவிர்</string>
+    <string name="type_watching">பார்த்து கொண்டிருப்பது</string>
+    <string name="type_on_hold">நிறுத்தி வைக்கப்பட்டுள்ளது</string>
+    <string name="type_completed">நிறைவடைந்தது</string>
+    <string name="type_plan_to_watch">பார்க்கத் திட்டமிடப்பட்டுள்ளது</string>
+    <string name="type_re_watching">மீண்டும் பார்க்கத் தொடங்கியது</string>
+    <string name="play_torrent_button">ஸ்ட்ரீம் டோரண்ட்</string>
+    <string name="pick_subtitle">வசன வரிகள்</string>
+    <string name="go_back">பின் செல்</string>
+    <string name="play_episode">எபிசோடை இயக்கு</string>
+    <string name="download">எபிசோட் பதிவிற்கான அனுமதி கொடுக்கவும்</string>
+    <string name="downloaded">பதிவிறக்கம் செய்யப்பட்டது</string>
+    <string name="downloading">பதிவிறக்குகிறது</string>
+    <string name="download_paused">பதிவிறக்கம் இடைநிறுத்தப்பட்டது</string>
+    <string name="download_started">பதிவிறக்கம் தொடங்கியது</string>
+    <string name="download_failed">பதிவிறக்கம் தோல்வியடைந்தது</string>
+    <string name="stream">ஸ்ட்ரீம்</string>
+    <string name="download_storage_text">உள் சேமிப்பு</string>
+    <string name="app_dubbed_text">மொழிபெயர்க்கப்பட்டது</string>
+    <string name="popup_delete_file">கோப்பை நீக்கு</string>
+    <string name="popup_play_file">கோப்பை இயக்கவும்</string>
+    <string name="popup_pause_download">பதிவிறக்கத்தை நிறுத்து</string>
+    <string name="pref_disable_acra">தானியங்கி பிழை அறிக்கையை முடக்கு</string>
+    <string name="home_more_info">மேலும் தகவல்கள்</string>
+    <string name="home_expanded_hide">மறை</string>
+    <string name="action_remove_from_bookmarks">நீக்கு</string>
+    <string name="sort_cancel">ரத்து செய்க</string>
+    <string name="sort_clear">நீக்கு</string>
+    <string name="sort_save">சேமிக்கவும்</string>
+    <string name="subs_text_color">உரை வண்ணம்</string>
+    <string name="subs_outline_color">வெளிப்புற நிறம்</string>
+    <string name="subs_background_color">பின்னணி நிறம்</string>
+    <string name="subs_subtitle_elevation">வசன உயர்வு</string>
+    <string name="subs_font">எழுத்துரு</string>
+    <string name="search_provider_text_providers">வழங்குபவர்கள் பயன்படுத்தி தேடுங்கள்</string>
+    <string name="search_provider_text_types">வகைகளைப் பயன்படுத்தி தேடவும்</string>
+    <string name="subs_download_languages">மொழிகளைப் பதிவிறக்கவும்</string>
+    <string name="subs_subtitle_languages">வசன மொழி</string>
+    <string name="continue_watching">தொடர்ந்து பார்க்கவும்</string>
+    <string name="vpn_might_be_needed">முறையாக இயங்க vpn பயன்படுத்தவும்</string>
+    <string name="player_size_settings">பிளேயர் அளவை மாற்றும் பொத்தான்</string>
+    <string name="chromecast_subtitles_settings">Chromecast வசனங்கள்</string>
+    <string name="swipe_to_change_settings">அமைப்புகளை மாற்ற ஸ்வைப் செய்யவும்</string>
+    <string name="autoplay_next_settings">அடுத்த எபிசோடை தானாக இயக்கவும்</string>
+    <string name="autoplay_next_settings_des">தற்போதைய அத்தியாயம் முடிந்ததும் அடுத்த அத்தியாயத்தைத் தொடங்கவும்</string>
+    <string name="double_tap_to_seek_settings">தேடுவதற்கு இருமுறை தட்டவும்</string>
+    <string name="double_tap_to_seek_amount_settings">பிளேயரில் தேடுதல் வேகம்</string>
+    <string name="double_tap_to_pause_settings_des">இடைநிறுத்துவதற்கு நடுவில் தட்டவும்</string>
+    <string name="cast_format" formatted="true">நடிகர்கள்</string>
+    <string name="go_back_img_des">பின் செல்</string>
+    <string name="title_settings">அமைப்புகள்</string>
+    <string name="type_none">ஏதும் இல்லை</string>
+    <string name="loading">ஏற்றுகிறது…</string>
+    <string name="type_dropped">கைவிடப்பட்டது</string>
+    <string name="download_done">பதிவிறக்கம் முடிந்தது</string>
+    <string name="reload_error">இணைப்பை மீண்டும் முயற்சிக்கவும்…</string>
+    <string name="play_movie_button">திரைப்படத்தை இயக்கு</string>
+    <string name="play_livestream_button">லைவ்ஸ்ட்ரீம் இயக்கு</string>
+    <string name="play_trailer_button">டிரெய்லரை இயக்கவும்</string>
+    <string name="pick_source">மூலம்</string>
+    <string name="error_loading_links_toast">இணைப்புகளை ஏற்றுவதில் பிழை</string>
+    <string name="home_play">இயக்கு</string>
+    <string name="download_canceled">பதிவிறக்கம் ரத்து செய்யப்பட்டது</string>
+    <string name="subtitles_settings">வசன அமைப்புகள்</string>
+    <string name="popup_resume_download">பதிவிறக்கத்தை மீண்டும் தொடங்கவும்</string>
+    <string name="filter_bookmarks">புக்மார்க்குகளை வடிகட்டவும்</string>
+    <string name="home_info">தகவல்</string>
+    <string name="player_speed">பிளேயர் வேகம்</string>
+    <string name="error_bookmarks_text">புக்மார்க்கு</string>
+    <string name="sort_apply">பயன்படுத்து</string>
+    <string name="sort_copy">நகலெடுக்கவும்</string>
+    <string name="sort_close">மூடு</string>
+    <string name="subs_font_size">எழுத்துரு அளவு</string>
+    <string name="action_remove_watching">நீக்கு</string>
+    <string name="action_open_watching">மேலும் தகவல்கள்</string>
+    <string name="subs_auto_select_language">தானாக மொழியை தேர்ந்தெடு</string>
+    <string name="double_tap_to_seek_settings_des">முன்னோக்கி அல்லது பின்னோக்கி தேட வலது அல்லது இடது பக்கத்தில் இருமுறை தட்டவும்</string>
+    <string name="use_system_brightness_settings">மொபைலில் பிரகாசத்தை பயன்படுத்த</string>
+    <string name="subs_hold_to_reset_to_default">இயல்புநிலைக்கு மீட்டமைக்க அழுத்திப் பிடிக்கவும்</string>
+    <string name="vpn_torrent">முறையாக இயங்க vpn பரிந்துரைக்கப்பட்டது</string>
+    <string name="player_size_settings_des">கருப்பு எல்லைகளை அகற்றவும்</string>
+    <string name="torrent_plot">விளக்கம்</string>
+    <string name="normal_no_plot">கதை எதுவும் காணப்படவில்லை</string>
+    <string name="torrent_no_plot">விளக்கம் ஏதும் காணப்படவில்லை</string>
+    <string name="picture_in_picture">படத்தில்-படம்</string>
+    <string name="player_subtitles_settings_des">பிளேயர் வசனங்கள் அமைப்புகள்</string>
+    <string name="show_log_cat">Logcat 🐈 காட்டு</string>
+    <string name="picture_in_picture_des">பிற பயன்பாடுகளுக்கு மேல் மினியேச்சர் பிளேயரில் பிளேபேக் தொடர்கிறது</string>
+    <string name="player_subtitles_settings">வசன வரிகள்</string>
+    <string name="eigengraumode_settings_des">பிளேயரில் வேக விருப்பத்தை சேர்க்க</string>
+    <string name="swipe_to_seek_settings_des">வீடியோ பிளேயரில் நேரத்தைக் கட்டுப்படுத்த இடது அல்லது வலதுபுறம் ஸ்வைப் செய்யவும்</string>
+    <string name="swipe_to_change_settings_des">பிரகாசம் அல்லது ஒலியளவை மாற்ற இடது அல்லது வலது பக்கத்தில் ஸ்வைப் செய்யவும்</string>
+    <string name="double_tap_to_pause_settings">இடைநிறுத்துவதற்கு இருமுறை தட்டவும்</string>
+    <string name="chromecast_subtitles_settings_des">Chromecast வசன அமைப்புகள்</string>
+    <string name="use_system_brightness_settings_des">இருண்ட மேலடுக்குக்குப் பதிலாக ஆப் பிளேயரில் சிஸ்டம் பிரகாசத்தைப் பயன்படுத்தவும்</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index abd84091..12b4e96c 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -259,4 +259,6 @@
     <string name="video_disk_description">Posibleng magka problema kapag sobrang taas kapag mababa ang storage ng device (tulad ng Android TV)</string>
     <string name="create_account">Gumawa ng account</string>
     <string name="add_account">Magdagdag ng Account</string>
+    <string name="history">Kasaysayan</string>
+    <string name="action_mark_as_watched">I-tanda bilang napanood na</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index d723a160..21496a3e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -500,4 +500,6 @@
     <string name="player_settings_play_in_web">Web Video Yayını</string>
     <string name="player_settings_play_in_browser">Tarayıcı</string>
     <string name="app_not_found_error">Uygulama bulunamadı</string>
+    <string name="history">Geçmiş</string>
+    <string name="action_mark_as_watched">İzlendi olarak imle</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
new file mode 100644
index 00000000..f733addc
--- /dev/null
+++ b/app/src/main/res/values-ur/strings.xml
@@ -0,0 +1,359 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="cast_format" formatted="true">کاسٹ: %s</string>
+    <string name="next_episode_format" formatted="true">قسط %d جاری کیا جائے گا</string>
+    <string name="search_poster_img_des">پروموشنل تصویر</string>
+    <string name="episode_poster_img_des">قسط کا پوسٹر</string>
+    <string name="home_main_poster_img_des">مرکزی پوسٹر</string>
+    <string name="home_next_random_img_des">اگلا بے ترتیب</string>
+    <string name="go_back_img_des">رجوع</string>
+    <string name="home_change_provider_img_des">ذریعہ تبدیل کریں</string>
+    <string name="preview_background_img_des">پس منظر کا دیکھنا</string>
+    <string name="rated_format" formatted="true">درجہ بندی: %.1f</string>
+    <string name="new_update_format" formatted="true">نیا update آگیا ہے!
+\n%s -&gt; %s</string>
+    <string name="filler" formatted="true">بھرنے والا</string>
+    <string name="duration_format" formatted="true">%d منٹ</string>
+    <string name="next_episode_time_day_format" formatted="true">%d دن %d گھنٹے %d منٹ</string>
+    <string name="next_episode_time_hour_format" formatted="true">%d گھنٹے %d منٹ</string>
+    <string name="next_episode_time_min_format" formatted="true">%d منٹ</string>
+    <string name="app_name">CloudStream</string>
+    <string name="play_with_app_name">CloudStream کے ساتھ چلائیں</string>
+    <string name="title_home">ہوم</string>
+    <string name="title_search">تلاش کریں</string>
+    <string name="title_downloads">ڈاؤن لوڈ</string>
+    <string name="title_settings">ترتیبات</string>
+    <string name="search_hint">تلاش کریں…</string>
+    <string name="search_hint_site" formatted="true">فراہم کنندہ میں تلاش کریں%s…</string>
+    <string name="episode_more_options_des">مزید آپشنز</string>
+    <string name="next_episode">اگلا قسط</string>
+    <string name="result_open_in_browser">براؤزر میں کھولیں</string>
+    <string name="skip_loading">لوڈ کرنا سکیپ کر دیں</string>
+    <string name="loading">لوڈ ہو رہا ہے…</string>
+    <string name="type_watching">دیکھنا</string>
+    <string name="type_on_hold">آن ہولڈ</string>
+    <string name="type_dropped">گرا دیا</string>
+    <string name="type_plan_to_watch">دیکھنا ہے</string>
+    <string name="type_none">کوئی نہیں</string>
+    <string name="type_re_watching">دوبارہ دیکھنا</string>
+    <string name="play_movie_button">مووی لگائے</string>
+    <string name="play_trailer_button">ٹریلر چلائیں</string>
+    <string name="play_livestream_button">لائیو اسٹریم چلائیں</string>
+    <string name="play_torrent_button">سٹریم ٹورینٹ</string>
+    <string name="pick_source">ذرائع</string>
+    <string name="reload_error">کنکشن کی دوبارہ کوشش کی جارہی ہے…</string>
+    <string name="go_back">واپس جاو</string>
+    <string name="play_episode">قسط چلائیں</string>
+    <string name="downloaded">ڈاؤن لوڈ کردہ ویڈیوز</string>
+    <string name="downloading">ڈاؤن لوڈ ہو رہا ہے</string>
+    <string name="download_paused">ڈاؤن لوڈ موقوف</string>
+    <string name="download_started">ڈاؤن لوڈ شروع ہو گیا</string>
+    <string name="download_failed">ڈاؤن لوڈ نہیں ہو پا رہا</string>
+    <string name="download_canceled">ڈاؤن لوڈ منسوخ ہو گیا</string>
+    <string name="stream">سٹریم</string>
+    <string name="error_loading_links_toast">لنک میں مسئلہ</string>
+    <string name="app_dubbed_text">ڈب</string>
+    <string name="app_subbed_text">سبد</string>
+    <string name="popup_delete_file">فائل کو ڈیلیٹ کریں</string>
+    <string name="no_data">کوئی مواد نہیں</string>
+    <string name="popup_play_file">فائل چلائیں</string>
+    <string name="popup_resume_download">ڈاؤن لوڈ دوبارہ شروع کریں</string>
+    <string name="home_more_info">مزید معلومات</string>
+    <string name="home_expanded_hide">چھپائیں</string>
+    <string name="home_play">چلائیں</string>
+    <string name="home_info">معلومات</string>
+    <string name="filter_bookmarks">بک مارکس کو فلٹر کریں</string>
+    <string name="error_bookmarks_text">بک مارکس</string>
+    <string name="action_remove_from_bookmarks">ریمو</string>
+    <string name="action_add_to_bookmarks">واچ اسٹیٹس کو سیٹ کریں</string>
+    <string name="sort_apply">لاگو کریں</string>
+    <string name="sort_cancel">منسوخ کریں</string>
+    <string name="sort_copy">کاپی</string>
+    <string name="sort_close">بند کریں</string>
+    <string name="sort_clear">صاف کریں</string>
+    <string name="sort_save">محفوظ کریں</string>
+    <string name="player_speed">چلانے کی رفتار</string>
+    <string name="subtitles_settings">Subtitles کی رفتار</string>
+    <string name="subs_text_color">لکھائی کا رنگ</string>
+    <string name="subs_outline_color">آؤٹ لائن کا رنگ</string>
+    <string name="subs_background_color">پس منظر کا رنگ</string>
+    <string name="subs_window_color">کھڑکی کا رنگ</string>
+    <string name="subs_edge_type">کنارے کی قسم</string>
+    <string name="subs_subtitle_elevation">ترجمہ کی اونچائی</string>
+    <string name="subs_font">لکھائی</string>
+    <string name="subs_font_size">حرف کا سائز</string>
+    <string name="search_provider_text_types">انواع کا استعمال کرتے ہوئے تلاش کریں</string>
+    <string name="benene_count_text">%d ایپ بنانے والے کیلئے 🍌</string>
+    <string name="benene_count_text_none">کیلے نہیں</string>
+    <string name="subs_auto_select_language">زبان خود بخود منتخب کریں</string>
+    <string name="subs_download_languages">زبانیں ڈاؤن لوڈ کریں</string>
+    <string name="subs_subtitle_languages">ترجمہ کی زبان</string>
+    <string name="subs_import_text" formatted="true">لکھائی کو یہاں رکھ کر درآمد کریں %s</string>
+    <string name="continue_watching">دیکھنا جاری رکھیں</string>
+    <string name="action_remove_watching">حذف کریں</string>
+    <string name="action_open_watching">مزید معلومات</string>
+    <string name="action_open_play">کھلا (آن)</string>
+    <string name="vpn_torrent">یہ سورس Torrent ہے، ضرورت پڑنے پر VPN کا استعمال کریں</string>
+    <string name="torrent_plot">تفصیل</string>
+    <string name="normal_no_plot">کوئی تفصیل نہیں ملی</string>
+    <string name="torrent_no_plot">کوئی تفصیل نہیں ملی</string>
+    <string name="show_log_cat">غلطی کا لاگ دیکھیں 🐈</string>
+    <string name="picture_in_picture">PIP</string>
+    <string name="picture_in_picture_des">دوسری ایپس کے اوپر ایک منی لانچر میں چلتا رہنا</string>
+    <string name="player_size_settings">پلیئر کا سائز تبدیل کرنے کا بٹن</string>
+    <string name="player_size_settings_des">سیاہ سرحد کو ہٹا دیں</string>
+    <string name="player_subtitles_settings">سنٹیٹلز</string>
+    <string name="chromecast_subtitles_settings">Chromecast ترجمہ</string>
+    <string name="chromecast_subtitles_settings_des">Chromecast ترجمہ کی ترتیبات</string>
+    <string name="eigengraumode_settings">پلیئر کی رفتار</string>
+    <string name="eigengraumode_settings_des">پلیئر میں رفتار کا اختیار شامل</string>
+    <string name="swipe_to_seek_settings">ویڈیو کو آگے سوائپ کریں</string>
+    <string name="swipe_to_change_settings">ترتیبات کو تبدیل کرنے کے لیے سوائپ کریں</string>
+    <string name="autoplay_next_settings">اگلا ایپی سوڈ خود بخود چلائیں</string>
+    <string name="autoplay_next_settings_des">موجودہ قسط ختم ہونے پر اگلی قسط شروع کریں</string>
+    <string name="double_tap_to_seek_settings">آگے یا پیچھے جانے کے لیے سکرین پر دو بار تھپتھپائیں</string>
+    <string name="double_tap_to_pause_settings">روکنے کے لیے دو بار تھپتھپائیں</string>
+    <string name="double_tap_to_seek_settings_des">آگے یا پیچھے کی طرف جانے کے لیے دائیں یا بائیں جانب دو بار تھپتھپائیں</string>
+    <string name="use_system_brightness_settings">سسٹم کی Brightness کا استعمال کریں</string>
+    <string name="use_system_brightness_settings_des">ڈارک overlay کے بجائے ایپ پلیئر میں سسٹم کی Brightness کا استعمال کریں</string>
+    <string name="restore_settings">بیک اپ سے ڈیٹا کو بحال کریں</string>
+    <string name="backup_settings">ڈیٹا کا بیک اپ لیں</string>
+    <string name="restore_success">بیک اپ فائل اپ لوڈ کر دی گئی ہے</string>
+    <string name="restore_failed_format" formatted="true">فائل سے ڈیٹا درآمد کرنا ناکام %s</string>
+    <string name="backup_success">ذخیرہ شدہ ڈیٹا</string>
+    <string name="backup_failed_error_format">بیک اپ بنانا ناکام ہوگیا %s</string>
+    <string name="episode_sync_settings">دیکھنے کی پیشرفت کو اپ ڈیٹ کریں</string>
+    <string name="search">تلاش کریں</string>
+    <string name="category_account">اکاؤنٹس</string>
+    <string name="settings_info">معلومات</string>
+    <string name="advanced_search_des">آپ کو فراہم کنندہ کے ذریعہ علیحدہ کردہ تلاش کے نتائج فراہم کرتا ہے</string>
+    <string name="bug_report_settings_off">صرف کریش پر ڈیٹا بھیجتا ہے</string>
+    <string name="bug_report_settings_on">کوئی ڈیٹا نہیں بھیجتا</string>
+    <string name="pref_filter_search_quality">تلاش کے نتائج میں منتخب ویڈیو کوالٹی چھپائیں</string>
+    <string name="automatic_plugin_updates">خودکار پلگ ان اپ ڈیٹس</string>
+    <string name="updates_settings">ایپ کی تازہ کاریاں نمایش کریں</string>
+    <string name="redo_setup_process">سیٹ اپ کا عمل دوبارہ کریں</string>
+    <string name="uprereleases_settings">پری ریلیز کے لیے اپ ڈیٹ کریں</string>
+    <string name="uprereleases_settings_des">صرف مکمل ریلیز کے بجائے پری ریلیز اپ ڈیٹس تلاش کریں</string>
+    <string name="apk_installer_settings">APK انسٹالر</string>
+    <string name="github">Github</string>
+    <string name="lightnovel">ایک ہی dev کی طرف سے light ناول اپلی کیشن</string>
+    <string name="anim">اسی devs کے ذریعے anime ایپ</string>
+    <string name="discord">ڈسکارڈ میں شامل ہوں</string>
+    <string name="benene">دیووں کو ایک بینین دیں</string>
+    <string name="benene_des">دی گئی بینین</string>
+    <string name="app_language">ایپ کی زبان</string>
+    <string name="no_chromecast_support_toast">اس فراہم کنندہ کے پاس کروم کاسٹ سپورٹ نہیں ہے</string>
+    <string name="no_links_found_toast">کوئی لنکس نہیں ملے</string>
+    <string name="copy_link_toast">کلپ بورڈ میں نقل ہوا</string>
+    <string name="play_episode_toast">قسط چلائیں</string>
+    <string name="subs_default_reset_toast">طے شدہ قدر پر ری سیٹ کریں</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s قسط %d</string>
+    <string name="result_poster_img_des">پوسٹر</string>
+    <string name="result_share">شیئر</string>
+    <string name="result_tags">انواع</string>
+    <string name="player_speed_text_format" formatted="true">رفتار (%.2fx)</string>
+    <string name="type_completed">مکمل</string>
+    <string name="pick_subtitle">سب ٹائٹلز</string>
+    <string name="download">ڈاؤنلوڈ</string>
+    <string name="download_done">ڈاؤن لوڈ ہو گیا</string>
+    <string name="download_storage_text">انٹرنل سٹوریج</string>
+    <string name="popup_pause_download">ڈاؤن لوڈ کو روکیں</string>
+    <string name="pref_disable_acra">خودکار بگ رپورٹنگ کو غیر فعال کریں</string>
+    <string name="search_provider_text_providers">ذرائع کا استعمال کرتے ہوئے تلاش کریں</string>
+    <string name="vpn_might_be_needed">اس فراہم کنندہ کو مناسب طریقے سے کام کرنے کے لیے VPN کی ضرورت پڑ سکتی ہے</string>
+    <string name="subs_hold_to_reset_to_default">ڈیفالٹ سیٹنگز پر ری سیٹ کرنے کے لیے دبائیں اور تھامیں</string>
+    <string name="provider_info_meta">سائٹ کی طرف سے میٹا ڈیٹا فراہم نہیں کیا گیا ہے، اور اگر ویڈیو سائٹ میں موجود نہیں ہے تو وہ لوڈ ہونے میں ناکام ہو جائے گا.</string>
+    <string name="player_subtitles_settings_des">پلیئر کے ترجمہ کی ترتیبات</string>
+    <string name="swipe_to_seek_settings_des">ویڈیو پلیئر میں وقت کو کنٹرول کرنے کے لیے بائیں یا دائیں سوائپ کریں</string>
+    <string name="swipe_to_change_settings_des">سکرین کی روشنی یا والیوم تبدیل کرنے کے لیے بائیں یا دائیں سوائپ کریں</string>
+    <string name="double_tap_to_seek_amount_settings">کنٹرول کریں کہ پلیئر کتنا آگے ہے</string>
+    <string name="double_tap_to_pause_settings_des">توقف کرنے کے لیے درمیان میں دبائیں</string>
+    <string name="backup_failed">سٹوریج کی اجازتیں غائب ہیں، براہ کرم دوبارہ کوشش کریں۔</string>
+    <string name="kitsu_settings">کٹسو سے پوسٹر نمایش کریں</string>
+    <string name="episode_sync_settings_des">آپ کی حالیہ قسط کی پیش رفت خود بخود مطابقت پذیر کریں</string>
+    <string name="category_updates">اپ ڈیٹس اور بیک اپ</string>
+    <string name="advanced_search">اعلی درجے کی تلاش</string>
+    <string name="show_trailers_settings">ٹریلر نمایش کریں</string>
+    <string name="show_fillers_settings">anime کے لیے فلر ایپیسوڈ دکھائیں</string>
+    <string name="automatic_plugin_download">پلگ ان خود بخود ڈاؤن لوڈ کریں</string>
+    <string name="automatic_plugin_download_summary">شامل کردہ ذخیروں سے خود بخود تمام ابھی تک انسٹال نہیں ہوئے پلگ ان انسٹال کریں۔</string>
+    <string name="updates_settings_des">شروع ہونے پر خودکار طور پر نئی اپ ڈیٹس تلاش کریں</string>
+    <string name="apk_installer_settings_des">کچھ فون نئے پیکیج انسٹالر کو سپورٹ نہیں کرتے ہیں. اگر اپ ڈیٹس انسٹال نہیں ہوتے ہیں تو لیگیسی آپشن کو آزمائیں.</string>
+    <string name="acra_report_toast">معذرت، ایپلی کیشن کریش ہو گئی. ایک گمنام بگ رپورٹ ڈویلپرز کو بھیجی جائے گی</string>
+    <string name="season">سیزن</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="no_season">کوئی سیزن نہیں</string>
+    <string name="episode">قسط</string>
+    <string name="episodes">اقساط</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="season_short">S</string>
+    <string name="episode_short">E</string>
+    <string name="no_episodes_found">کوئی اقساط نہیں ملی</string>
+    <string name="delete_file">فائل کو ڈیلیٹ کریں</string>
+    <string name="delete">مٹا دیں</string>
+    <string name="pause">توقف</string>
+    <string name="resume">از سر نو شروع کریں</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="delete_message" formatted="true">یہ مستقل طور پر حذف ہوجائے گا %s
+\nتمھيں يقين ہے\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nباقی</string>
+    <string name="status_ongoing">احوال</string>
+    <string name="status_completed">مکمل</string>
+    <string name="status">حالت</string>
+    <string name="year">سال</string>
+    <string name="rating">درجہ بندی</string>
+    <string name="duration">دورانیہ</string>
+    <string name="site">سائٹ</string>
+    <string name="synopsis">خلاصہ</string>
+    <string name="queued">قطار میں</string>
+    <string name="no_subtitles">کوئی سب ٹائٹلز نہیں</string>
+    <string name="default_subtitles">ڈیفالٹ</string>
+    <string name="free_storage">مفت</string>
+    <string name="used_storage">استعمال شُدہ</string>
+    <string name="cartoons">کارٹون</string>
+    <string name="app_storage">App</string>
+    <string name="movies">فلمیں</string>
+    <string name="tv_series">ٹی وی سیریز</string>
+    <string name="torrent">ٹورینٹ</string>
+    <string name="anime">anime</string>
+    <string name="documentaries">دستاویزی فلمیں</string>
+    <string name="ova">او وی اے</string>
+    <string name="asian_drama">ایشیائی ڈرامے</string>
+    <string name="livestreams">لائیو اسٹریمز</string>
+    <string name="nsfw">این ایس ایف ڈبلیو</string>
+    <string name="others">دوسرے</string>
+    <string name="movies_singular">فلم</string>
+    <string name="tv_series_singular">سلسلہ</string>
+    <string name="cartoons_singular">کارٹون</string>
+    <string name="anime_singular">انیمی</string>
+    <string name="ova_singular">\@string/اووا</string>
+    <string name="torrent_singular">ٹورینٹ</string>
+    <string name="documentaries_singular">دستاویزی فلم</string>
+    <string name="asian_drama_singular">ایشیائی ڈرامے</string>
+    <string name="live_singular">لائیو اسٹریمز</string>
+    <string name="other_singular">ویڈیو</string>
+    <string name="source_error">ماخذ نقص</string>
+    <string name="remote_error">بعید نقص</string>
+    <string name="render_error">پیش کنندہ کی خرابی</string>
+    <string name="unexpected_error">غیر متوقع پلیئر نقص</string>
+    <string name="storage_error">ڈاؤن لوڈ کی خرابی، سٹوریج کی اجازتیں چیک کریں</string>
+    <string name="episode_action_chromecast_episode">کروم کاسٹ قسط</string>
+    <string name="episode_action_chromecast_mirror">کروم کاسٹ مرر</string>
+    <string name="episode_action_play_in_app">ایپ میں چلائیں</string>
+    <string name="episode_action_play_in_format">%s میں چلائیں</string>
+    <string name="episode_action_copy_link">کاپی لنک</string>
+    <string name="episode_action_download_mirror">ڈاؤنلوڈ مرر</string>
+    <string name="episode_action_reload_links">لنکس کو دوبارہ لوڈ کریں</string>
+    <string name="episode_action_download_subtitle">سب ٹائٹلز ڈاؤن لوڈ</string>
+    <string name="show_hd">کوالٹی لیبل</string>
+    <string name="show_dub">ڈب لیبل</string>
+    <string name="show_sub">ذیلی لیبل</string>
+    <string name="show_title">عنوان</string>
+    <string name="poster_ui_settings">پوسٹر پر یو آئی عناصر کو ٹوگل کریں</string>
+    <string name="no_update_found">کوئی اپ ڈیٹ نہیں ملا</string>
+    <string name="check_for_update">اپ ڈیٹ کے لیے چیک کریں</string>
+    <string name="video_lock">تالا</string>
+    <string name="video_aspect_ratio_resize">سائز تبدیل کریں</string>
+    <string name="video_source">ماخذ</string>
+    <string name="video_skip_op">او پی چھوڑیں</string>
+    <string name="dont_show_again">دوبارہ نہ دکھائیں</string>
+    <string name="skip_update">اس اپ ڈیٹ کو چھوڑ دیں</string>
+    <string name="update">اپ ڈیٹ</string>
+    <string name="watch_quality_pref">ترجیحی ویڈیو کا معیار</string>
+    <string name="limit_title">ویڈیو پلیئر کے عنوان کے زیادہ سے زیادہ حروف</string>
+    <string name="limit_title_rez">ویڈیو پلیئر ریزولوشن</string>
+    <string name="video_buffer_size_settings">ویڈیو بفر سائز</string>
+    <string name="video_buffer_length_settings">ویڈیو بفر لمبائی</string>
+    <string name="video_buffer_disk_settings">ڈسک پر ویڈیو کیش</string>
+    <string name="video_buffer_clear_settings">ویڈیو اور تصویری کیشے صاف کریں</string>
+    <string name="video_disk_description">کم اسٹوریج اسپیس والے آلات، جیسے کہ Android TV پر بہت زیادہ سیٹ کرنے پر مسائل کا سبب بنتا ہے.</string>
+    <string name="dns_pref">HTTPS پر DNS</string>
+    <string name="dns_pref_summary">آئی ایس پی بلاکس کو بائی پاس کرنے کے لئے مفید</string>
+    <string name="add_site_pref">کلون سائٹ</string>
+    <string name="download_path_pref">ڈاؤنلوڈ کی جگہ</string>
+    <string name="nginx_url_pref">NGINX سرور URL</string>
+    <string name="display_subbed_dubbed_settings">ڈسپلے ڈب/سببیڈ انیمی</string>
+    <string name="resize_zoom">زوم</string>
+    <string name="legal_notice">دستبرداری</string>
+    <string name="pref_category_links">لینکس</string>
+    <string name="pref_category_app_updates">ایپ کی تازہ کاریاں</string>
+    <string name="pref_category_backup">بیک اپ</string>
+    <string name="pref_category_cache">کیسہ</string>
+    <string name="pref_category_gestures">اشارے</string>
+    <string name="pref_category_extensions">توسیعات</string>
+    <string name="pref_category_actions">اعمال</string>
+    <string name="pref_category_player_features">پلیئر کی خصوصیات</string>
+    <string name="pref_category_subtitles">سب ٹائٹلز</string>
+    <string name="pref_category_player_layout">لے آؤٹ</string>
+    <string name="pref_category_defaults">طے شدہ</string>
+    <string name="pref_category_looks">لگتا ہے</string>
+    <string name="pref_category_ui_features">خصوصیات</string>
+    <string name="category_general">عمومی</string>
+    <string name="random_button_settings">بے ترتیب بٹن</string>
+    <string name="random_button_settings_desc">ہوم پیج پر بے ترتیب بٹن نمایش کریں</string>
+    <string name="provider_lang_settings">فراہم کنندہ کی زبانیں</string>
+    <string name="app_layout">ایپ لے آؤٹ</string>
+    <string name="preferred_media_settings">ترجیحی میڈیا</string>
+    <string name="enable_nsfw_on_providers">معاون فراہم کنندگان پر NSFW اہل بنائیں</string>
+    <string name="subtitles_encoding">سب ٹائٹل انکوڈنگ</string>
+    <string name="category_providers">فراہم کنندگان</string>
+    <string name="category_ui">لے آؤٹ</string>
+    <string name="automatic">خودکار</string>
+    <string name="tv_layout">ٹی وی لے آؤٹ</string>
+    <string name="phone_layout">فون لے آؤٹ</string>
+    <string name="emulator_layout">ایمولیٹر لے آؤٹ</string>
+    <string name="primary_color_settings">بنیادی رنگ</string>
+    <string name="app_theme_settings">ایپ تھیم</string>
+    <string name="bottom_title_settings">پوسٹر کا عنوان محل وقوع</string>
+    <string name="bottom_title_settings_des">عنوان کو پوسٹر کے نیچے رکھیں</string>
+    <string name="example_password">password123</string>
+    <string name="example_username">مائی کولUsername</string>
+    <string name="example_email">hello@world.com</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="example_site_name">مائی کول سائٹ</string>
+    <string name="example_site_url">example.com</string>
+    <string name="example_lang_name">زبان کا کوڈ (en)</string>
+    <string name="account">اكاؤنٹ</string>
+    <string name="logout">لاگ آوٹ</string>
+    <string name="login">لاگ ان کریں</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="authenticated_user" formatted="true">%s تصدیق شدہ</string>
+    <string name="authenticated_user_fail" formatted="true">%s پر لاگ ان نہیں ہو سکا</string>
+    <string name="none">کچھ نہیں</string>
+    <string name="normal">عام</string>
+    <string name="all">سب</string>
+    <string name="max">زیادہ سے زیادہ</string>
+    <string name="min">کم از کم</string>
+    <string name="subtitles_outline">خاکہ</string>
+    <string name="subtitles_shadow">سایہ</string>
+    <string name="subtitle_offset">ذیلی ہم وقت سازی کریں</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
+    <string name="subtitle_offset_title">سب ٹائٹل تاخیر</string>
+    <string name="subtitle_offset_extra_hint_later_format">اگر سب ٹائٹلز %d ms بہت جلد دکھائے جائیں تو اسے استعمال کریں</string>
+    <string name="subtitle_offset_extra_hint_none_format">سب ٹائٹل تاخیر</string>
+    <string name="nsfw_singular">این ایس ایف ڈبلیو</string>
+    <string name="episode_action_auto_download">آٹو ڈاؤن لوڈ</string>
+    <string name="episode_action_play_in_browser">براؤزر میں چلائیں</string>
+    <string name="video_ram_description">کم میموری والے آلات، جیسے کہ Android TV پر بہت زیادہ سیٹ ہونے پر کریشوں کا سبب بنتا ہے.</string>
+    <string name="remove_site_pref">سائٹ ہٹائیں</string>
+    <string name="add_site_summary">ایک مختلف URL کے ساتھ ، موجودہ سائٹ کا کلون شامل کریں.</string>
+    <string name="resize_fit">اسکرین پر فٹ</string>
+    <string name="resize_fill">کھینچیں</string>
+    <string name="create_account">اکاؤنٹ بنائیں</string>
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="switch_account">اکاؤنٹ سوئچ کریں</string>
+    <string name="add_sync">ٹریکنگ شامل کریں</string>
+    <string name="upload_sync">تواقت</string>
+    <string name="subtitles_depressed">دپرسڈ</string>
+    <string name="add_account">اکاؤنٹ شامل کریں</string>
+    <string name="added_sync_format" formatted="true">شامل کیا گیا %s</string>
+    <string name="sync_score">ریٹیڈ</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="subtitles_raised">اٹھایا</string>
+    <string name="subtitle_offset_extra_hint_before_format">اگر سب ٹائٹلز %d ms بہت جلد دکھائے جائیں تو اسے استعمال کریں</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index fbbd0a48..64b2c0a5 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -433,4 +433,6 @@
     <string name="safe_mode_title">Bật chế độ an toàn</string>
     <string name="safe_mode_description">Đã xảy ra sự cố và chúng tôi đã tự động tắt tất cả các tiện ích mở rộng, hãy tìm và xóa tiện ích mở rộng đang gây ra sự cố.</string>
     <string name="safe_mode_crash_info">Xem thông tin sự cố</string>
+    <string name="history">Lịch sử</string>
+    <string name="action_mark_as_watched">Đánh dấu là đã xem</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3b0b686f..764304d7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -532,4 +532,19 @@
     <string name="action_mark_as_watched">標記為已觀看</string>
     <string name="no">否』</string>
     <string name="apk_installer_legacy">傳統』</string>
+    <string name="pref_category_player_features">播放器功能</string>
+    <string name="pref_category_subtitles">字幕</string>
+    <string name="play_trailer_button">播放預告片</string>
+    <string name="redo_setup_process">重設設定過程</string>
+    <string name="pref_category_links">連結</string>
+    <string name="pref_category_app_updates">應用程式更新</string>
+    <string name="pref_category_backup">備份</string>
+    <string name="pref_category_extensions">擴充功能</string>
+    <string name="pref_category_actions">動作</string>
+    <string name="pref_category_cache">快取</string>
+    <string name="pref_category_gestures">手勢</string>
+    <string name="pref_category_player_layout">版面</string>
+    <string name="pref_category_defaults">預設</string>
+    <string name="pref_category_looks">外觀</string>
+    <string name="pref_category_ui_features">功能</string>
 </resources>
\ No newline at end of file

From d6af1e4ab68f714b3a5920cdb60829d9bb88acf6 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Wed, 28 Dec 2022 10:48:52 +0000
Subject: [PATCH 141/273] chore: update list of locales

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index af87248b..ff23cea3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -71,6 +71,7 @@ val appLanguages = arrayListOf(
     Triple("\uD83C\uDDEE\uD83C\uDDE9", "Indonesian", "in"),
     Triple("", "Italian", "it"),
     Triple("", "Hebrew", "iw"),
+    Triple("", "Kannada", "kn"),
     Triple("", "Macedonian", "mk"),
     Triple("", "Malayalam", "ml"),
     Triple("", "Moldavian", "mo"),
@@ -79,9 +80,12 @@ val appLanguages = arrayListOf(
     Triple("", "Polish", "pl"),
     Triple("\uD83C\uDDF5\uD83C\uDDF9", "Portuguese", "pt"),
     Triple("", "Romanian", "ro"),
+    Triple("", "Russian", "ru"),
     Triple("", "Swedish", "sv"),
+    Triple("", "Tamil", "ta"),
     Triple("", "Tagalog", "tl"),
     Triple("", "Turkish", "tr"),
+    Triple("", "Urdu", "ur"),
     Triple("", "Viet Nam", "vi"),
     Triple("", "Chinese Simplified", "zh"),
     Triple("\uD83C\uDDF9\uD83C\uDDFC", "Chinese Traditional", "zh-rTW"),

From 7982f8c491a3032c573e1a52b5443fb8f26070e9 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Wed, 28 Dec 2022 11:52:56 +0100
Subject: [PATCH 142/273] localization fixes

---
 .../ui/settings/SettingsGeneral.kt            |   2 +-
 app/src/main/res/values-es/strings-es.xml     | 464 ------------------
 2 files changed, 1 insertion(+), 465 deletions(-)
 delete mode 100644 app/src/main/res/values-es/strings-es.xml

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index ff23cea3..a9a3426e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -70,7 +70,7 @@ val appLanguages = arrayListOf(
     Triple("", "Croatian", "hr"),
     Triple("\uD83C\uDDEE\uD83C\uDDE9", "Indonesian", "in"),
     Triple("", "Italian", "it"),
-    Triple("", "Hebrew", "iw"),
+    Triple("\uD83C\uDDEE\uD83C\uDDF1", "Hebrew", "iw"),
     Triple("", "Kannada", "kn"),
     Triple("", "Macedonian", "mk"),
     Triple("", "Malayalam", "ml"),
diff --git a/app/src/main/res/values-es/strings-es.xml b/app/src/main/res/values-es/strings-es.xml
deleted file mode 100644
index 172d079c..00000000
--- a/app/src/main/res/values-es/strings-es.xml
+++ /dev/null
@@ -1,464 +0,0 @@
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
-    <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
-    <string name="cast_format" formatted="true">Reparto: %s</string>
-    <string name="next_episode_format" formatted="true">El episodio %d se publicará en</string>
-    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
-    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
-    <string name="next_episode_time_min_format" formatted="true">%dm</string>
-
-
-    <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
-    <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
-    <string name="episode_poster_img_des">Episode Poster</string>
-    <string name="home_main_poster_img_des">Main Poster</string>
-    <string name="home_next_random_img_des">Next Random</string>
-    <string name="go_back_img_des">Go back</string>
-    <string name="home_change_provider_img_des">Change Provider</string>
-    <string name="preview_background_img_des">Preview Background</string>
-    
-    <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
-    <string name="player_speed_text_format" formatted="true">Velocidad (%.2fx)</string> 
-    <string name="rated_format" formatted="true">Calificación: %.1f</string> 
-    <string name="new_update_format" formatted="true">¡Nueva actualización encontrada!\n%s -> %s</string> 
-    <string name="filler" formatted="true">Rellenar</string> 
-    <string name="duration_format" formatted="true">%d minutos</string> 
- 
-    <string name="app_name">CloudStream</string>
-    <string name="title_home">Inicio</string> 
-    <string name="title_search">Búsqueda</string> 
-    <string name="title_downloads">Descargas</string> 
-    <string name="title_settings">Ajustes</string> 
- 
-    <string name="search_hint">Buscar…</string> 
-    <string name="search_hint_site" formatted="true">Buscar en %s…</string> 
- 
-    <string name="no_data">Sin datos</string> 
-    <string name="episode_more_options_des">Más opciones</string> 
-    <string name="next_episode">Siguiente episodio</string>
-    <string name="result_tags">Géneros</string>
-    <string name="result_share">Compartir</string> 
-    <string name="result_open_in_browser">Abrir en el navegador</string> 
-    <string name="skip_loading">Omitir carga</string> 
-    <string name="loading">Cargando…</string>
- 
-    <string name="type_watching">Viendo</string>
-    <string name="type_on_hold">En espera</string> 
-    <string name="type_completed">Completada</string> 
-    <string name="type_dropped">Caída</string> 
-    <string name="type_plan_to_watch">Planeo ver</string> 
-    <string name="type_none">Ninguno</string> 
-    <string name="type_re_watching">Volviendo a ver</string> 
- 
-    <string name="play_movie_button">Reproducir película</string> 
-    <string name="play_torrent_button">Transmitir torrent</string> 
-    <string name="pick_source">Fuentes</string> 
-    <string name="pick_subtitle">Subtítulos</string> 
-    <string name="reload_error">Reintentar la conexión…</string> 
-    <string name="go_back">Regresar</string> 
-    <string name="play_episode">Reproducir episodio</string> 
-    <!--<string name="need_storage">Permitir descargar episodios</string>--> 
- 
-    <string name="download">Descargar</string> 
-    <string name="downloaded">Descargado</string> 
-    <string name="downloading">Descargando</string> 
-    <string name="download_paused">Descarga pausada</string> 
-    <string name="download_started">Descarga iniciada</string> 
-    <string name="download_failed">Descarga fallida</string> 
-    <string name="download_canceled">Descarga cancelada</string> 
-    <string name="download_done">Descarga realizada</string>
-    <string name="stream">Transmitir</string>
- 
-    <string name="error_loading_links_toast">Error al cargar enlaces</string> 
-    <string name="download_storage_text">Almacenamiento interno</string> 
- 
-    <string name="app_dubbed_text">Doblado</string> 
-    <string name="app_subbed_text">Subtitulado</string> 
- 
-    <string name="popup_delete_file">Eliminar archivo</string> 
-    <string name="popup_play_file">Reproducir archivo</string> 
-    <string name="popup_resume_download">Reanudar descarga</string> 
-    <string name="popup_pause_download">Pausar descarga</string> 
- 
-    <string name="pref_disable_acra">Desactivar el informe automático de errores</string> 
-    <string name="home_more_info">Más información</string> 
-    <string name="home_expanded_hide">Ocultar</string> 
-    <string name="home_play">Reproducir</string>
-    <string name="home_info">Información</string> 
-    <string name="filter_bookmarks">Filtrar marcadores</string> 
-    <string name="error_bookmarks_text">Marcadores</string> 
-    <string name="action_remove_from_bookmarks">Eliminar</string> 
-    <string name="action_add_to_bookmarks">Establecer estado de vigilancia</string> 
-    <string name="sort_apply">Aplicar</string> 
-    <string name="sort_cancel">Cancelar</string>
-    <string name="sort_copy">Copiar</string> 
-    <string name="sort_close">Cerrar</string> 
-    <string name="sort_clear">Limpiar</string> 
-    <string name="sort_save">Guardar</string> 
- 
-    <string name="player_speed">Velocidad del reproductor</string> 
- 
-    <string name="subtitles_settings">Ajustes de subtítulos</string> 
-    <string name="subs_text_color">Color del texto</string> 
-    <string name="subs_outline_color">Color del contorno</string> 
-    <string name="subs_background_color">Color del fondo</string> 
-    <string name="subs_window_color">Color de la ventana</string> 
-    <string name="subs_edge_type">Tipo de borde</string> 
-    <string name="subs_subtitle_elevation">Elevación de subtítulos</string> 
-    <string name="subs_font">Fuente</string> 
-    <string name="subs_font_size">Tamaño de la fuente</string> 
- 
-    <string name="search_provider_text_providers">Buscar usando proveedores</string> 
-    <string name="search_provider_text_types">Buscar usando tipos</string> 
- 
-    <string name="benene_count_text">%d bananas otorgadas a los desarrolladores</string> 
-    <string name="benene_count_text_none">No se han otorgado bananas</string> 
- 
-    <string name="subs_auto_select_language">Selección automática de idioma</string> 
-    <string name="subs_download_languages">Idiomas a descargar</string> 
-    <string name="subs_subtitle_languages">Idioma de los subtítulos</string>
-    <string name="subs_hold_to_reset_to_default">Mantenga pulsado para restablecer a los valores predeterminados</string> 
-    <string name="subs_import_text" formatted="true">Importar fuentes colocándolas en %s</string> 
-    <string name="continue_watching">Seguir viendo</string> 
- 
-    <string name="action_remove_watching">Eliminar</string> 
-    <string name="action_open_watching">Más información</string> 
-    <string name="action_open_play">@string/home_play</string> 
- 
-    <string name="vpn_might_be_needed">Es posible que se necesite una VPN para que este proveedor funcione correctamente</string> 
-    <string name="vpn_torrent">Este proveedor es un torrent, se recomienda una VPN</string> 
-    <string name="provider_info_meta">El sitio no proporciona los metadatos, la carga del video fallará si no existe en el sitio.</string> 
- 
-    <string name="torrent_plot">Descripción</string> 
-    <string name="normal_no_plot">No se encontró ninguna trama</string> 
-    <string name="torrent_no_plot">No se encontró ninguna descripción</string> 
- 
-    <string name="show_log_cat">Mostrar logcat 🐈</string> 
- 
-    <string name="picture_in_picture">Imagen en imagen</string> 
-    <string name="picture_in_picture_des">Continúa la reproducción en un reproductor en miniatura encima de otras aplicaciones</string> 
-    <string name="player_size_settings">Botón de cambio de tamaño del reproductor</string> 
-    <string name="player_size_settings_des">Elimina los bordes negros</string> 
-    <string name="player_subtitles_settings">Subtítulos</string> 
-    <string name="player_subtitles_settings_des">Ajustes de subtítulos del reproductor</string> 
-    <string name="chromecast_subtitles_settings">Subtítulos de Chromecast</string> 
-    <string name="chromecast_subtitles_settings_des">Ajustes de subtítulos de Chromecast</string> 
- 
-    <string name="eigengraumode_settings">Modo Eigengravy</string> 
-    <string name="eigengraumode_settings_des">Añade una opción de velocidad en el reproductor</string> 
-    <string name="swipe_to_seek_settings">Deslizar para desplazarse</string> 
-    <string name="swipe_to_seek_settings_des">Deslice el dedo hacia la izquierda o hacia la derecha para controlar el tiempo en el reproductor de vídeo</string> 
-    <string name="swipe_to_change_settings">Deslizar para cambiar los ajustes</string> 
-    <string name="swipe_to_change_settings_des">Deslice el dedo hacia la izquierda o hacia la derecha para cambiar el brillo o el volumen</string> 
-    <string name="double_tap_to_seek_settings">Tocar dos veces para desplazarse</string>
-    <string name="double_tap_to_pause_settings">Tocar dos veces para pausar</string> 
-    <string name="double_tap_to_seek_amount_settings">Cantidad de desplazamiento del reproductor</string> 
-    <string name="double_tap_to_seek_settings_des">Toque dos veces en el lado derecho o izquierdo para desplazarse hacia adelante o hacia atrás</string> 
-    <string name="double_tap_to_pause_settings_des">Tocar en el medio para pausar</string> 
-    <string name="use_system_brightness_settings">Usar el brillo del sistema</string> 
-    <string name="use_system_brightness_settings_des">Usa el brillo del sistema en el reproductor en lugar de una superposición oscura</string> 
- 
-    <string name="episode_sync_settings">Actualizar el progreso visto</string> 
-    <string name="episode_sync_settings_des">Sincroniza automáticamente el progreso de tu episodio actual</string> 
- 
-    <string name="restore_settings">Restaurar datos desde una copia de seguridad</string>  
- 
-    <string name="backup_settings">Copia de seguridad de los datos</string> 
-    <string name="restore_success">Archivo de copia de seguridad cargado</string> 
-    <string name="restore_failed_format" formatted="true">No se pudieron restaurar los datos del archivo %s</string> 
-    <string name="backup_success">Datos almacenados con éxito</string> 
-    <string name="backup_failed">Faltan los permisos de almacenamiento, inténtelo de nuevo</string> 
-    <string name="backup_failed_error_format">Error al hacer una copia de seguridad de %s</string> 
- 
-    <string name="search">Búsqueda</string> 
-    <string name="category_account">Cuentas</string>
-    <string name="category_updates">Actualizaciones y copia de seguridad</string> 
-    
-    <string name="settings_info">Información</string> 
-    <string name="advanced_search">Búsqueda avanzada</string> 
-    <string name="advanced_search_des">Te da los resultados de la búsqueda separados por proveedor</string> 
-    <string name="bug_report_settings_off">Solo envía datos sobre fallas</string> 
-    <string name="bug_report_settings_on">No envía datos</string> 
-    <string name="show_fillers_settings">Mostrar episodio de relleno para anime</string> 
-    <string name="show_trailers_settings">Mostrar tráilers</string>
-    <string name="kitsu_settings">Mostrar pósters de kitsu</string>
-  
-    <string name="updates_settings">Mostrar actualizaciones de la aplicación</string> 
-    <string name="updates_settings_des">Busca automáticamente nuevas actualizaciones al abrir la app</string> 
-    <string name="uprereleases_settings">Actualizar a versiones preliminares</string> 
-    <string name="uprereleases_settings_des">Busca actualizaciones preliminares en lugar de solo versiones completas</string>
-    <string name="github">Github</string> 
-    <string name="lightnovel">Aplicación de novela ligera de los mismos desarrolladores</string> 
-    <string name="anim">Aplicación de anime de los mismos desarrolladores</string> 
-    <string name="discord">Únete al Discord</string> 
-    <string name="benene">Dar una banana a los desarrolladores</string> 
-    <string name="benene_des">Banana otorgada</string> 
- 
-    <string name="app_language">Idioma de la aplicación</string> 
- 
-    <string name="no_chromecast_support_toast">Este proveedor no es compatible con Chromecast</string> 
-    <string name="no_links_found_toast">No se encontraron enlaces</string> 
-    <string name="copy_link_toast">Enlace copiado al portapapeles</string> 
-    <string name="play_episode_toast">Reproducir episodio</string> 
-    <string name="subs_default_reset_toast">Restablecido al valor predeterminado</string> 
-    <string name="acra_report_toast">Lo sentimos, la aplicación se bloqueó. Se enviará un informe de error anónimo a los desarrolladores</string> 
- 
-    <string name="season">Temporada</string> 
-    <string name="no_season">Sin temporada</string> 
-    <string name="episode">Episodio</string> 
-    <string name="episodes">Episodios</string> 
-    <string name="season_short">T</string> 
-    <string name="episode_short">E</string> 
-    <string name="no_episodes_found">No se encontraron episodios</string> 
- 
-    <string name="delete_file">Eliminar archivo</string> 
-    <string name="delete">Eliminar</string>
-    <string name="pause">Pausar</string>
-    <string name="resume">Reanudar</string> 
-    <string name="go_back_30">-30</string> 
-    <string name="go_forward_30">+30</string> 
-    <string name="delete_message" formatted="true">Esto eliminará permanentemente %s\n¿Está seguro?</string> 
-    <string name="resume_time_left" formatted="true">%dm\nrestante</string> 
- 
- 
-    <string name="status_ongoing">En curso</string> 
-    <string name="status_completed">Completada</string> 
-    <string name="status">Estado</string> 
-    <string name="year">Año</string> 
-    <string name="rating">Calificación</string>
-    <string name="duration">Duración</string> 
-    <string name="site">Sitio</string> 
-    <string name="synopsis">Sinopsis</string> 
- 
-    <string name="queued">Puesto en cola</string> 
-    <string name="no_subtitles">Sin subtítulos</string> 
-    <string name="default_subtitles">Predeterminados</string> 
- 
-    <string name="free_storage">Libre</string> 
-    <string name="used_storage">Usado</string> 
-    <string name="app_storage">Aplicación</string> 
- 
-    <!--plural--> 
-    <string name="movies">Películas</string> 
-    <string name="tv_series">Series de TV</string> 
-    <string name="cartoons">Dibujos animados</string> 
-    <string name="anime">Anime</string> 
-    <string name="torrent">Torrents</string> 
-    <string name="documentaries">Documentales</string> 
-    <string name="ova">OVA</string> 
-    <string name="asian_drama">Dramas asiáticos</string> 
- 
-    <!--singular--> 
-    <string name="movies_singular">Película</string> 
-    <string name="tv_series_singular">Serie</string> 
-    <string name="cartoons_singular">Dibujo animado</string> 
-    <string name="anime_singular">@string/anime</string> 
-    <string name="ova_singular">@string/ova</string> 
-    <string name="torrent_singular">Torrent</string> 
-    <string name="documentaries_singular">Documental</string> 
-    <string name="asian_drama_singular">Drama asiático</string> 
- 
-    <string name="source_error">Error de fuente</string> 
-    <string name="remote_error">Error remoto</string> 
-    <string name="render_error">Error del renderizador</string> 
-    <string name="unexpected_error">Error inesperado del reproductor</string> 
-    <string name="storage_error">Error de descarga, verifique los permisos de almacenamiento</string> 
- 
-    <string name="episode_action_chromecast_episode">Episodio Chromecast</string> 
-    <string name="episode_action_chromecast_mirror">Espejo Chromecast</string> 
-    <string name="episode_action_play_in_app">Reproducir en la app</string> 
-    <string name="episode_action_play_in_format">Reproducir en %s</string>
-    <string name="episode_action_play_in_browser">Reproducir en el navegador</string> 
-    <string name="episode_action_copy_link">Copiar enlace</string> 
-    <string name="episode_action_auto_download">Descarga automática</string> 
-    <string name="episode_action_download_mirror">Descargar espejo</string> 
-    <string name="episode_action_reload_links">Recargar enlaces</string> 
-    <string name="episode_action_download_subtitle">Descargar subtítulos</string> 
- 
-    <string name="show_hd">Etiqueta de calidad</string> 
-    <string name="show_dub">Etiqueta de doblaje</string> 
-    <string name="show_sub">Etiqueta de subtitulado</string> 
-    <string name="show_title">Título</string>
-    <string name="poster_ui_settings">Alternar elementos de la interfaz de usuario en el póster</string>
- 
-    <string name="no_update_found">No se encontró ninguna actualización</string> 
-    <string name="check_for_update">Buscar actualizaciones</string> 
- 
-    <string name="video_lock">Bloquear</string> 
-    <string name="video_aspect_ratio_resize">Redimensionar</string> 
-    <string name="video_source">Fuente</string> 
-    <string name="video_skip_op">Omitir OP</string> 
- 
-    <string name="dont_show_again">No volver a mostrar</string> 
-    <string name="skip_update">Omitir esta actualización</string> 
-    <string name="update">Actualizar</string> 
-    <string name="watch_quality_pref">Calidad de vista preferida</string> 
-    <string name="limit_title">Caracteres máximos del título en el reproductor</string> 
-    <string name="limit_title_rez">Resolución del reproductor de vídeo</string> 
- 
-    <string name="video_buffer_size_settings">Tamaño del búfer de vídeo</string> 
-    <string name="video_buffer_length_settings">Duración del búfer de vídeo</string> 
-    <string name="video_buffer_disk_settings">Caché de vídeo en disco</string> 
-    <string name="video_buffer_clear_settings">Limpiar caché de imágenes y vídeos</string> 
- 
-    <string name="video_ram_description">Provocará bloqueos aleatorios si se establece demasiado alto. No lo cambie si tiene poca memoria RAM, como un Android TV o un teléfono antiguo</string> 
-    <string name="video_disk_description">Puede causar problemas en sistemas con poco espacio de almacenamiento, como dispositivos Android TV, si lo configura demasiado alto</string> 
- 
-    <string name="dns_pref">DNS sobre HTTPS</string> 
-    <string name="dns_pref_summary">Útil para eludir los bloqueos del ISP</string> 
-    
-    <string name="add_site_pref">Clonar sitio</string>
-    <string name="remove_site_pref">Eliminar sitio</string>
-    <string name="add_site_summary">Añade un clon de un sitio existente, con una URL diferente</string>
- 
-    <string name="download_path_pref">Ruta de descarga</string> 
- 
-    <string name="nginx_url_pref">URL del servidor Nginx</string> 
- 
-    <string name="display_subbed_dubbed_settings">Mostrar anime doblado/subtitulado</string> 
- 
-    <string name="resize_fit">Ajustar a la pantalla</string> 
-    <string name="resize_fill">Estirar</string> 
-    <string name="resize_zoom">Zoom</string> 
- 
-    <string name="legal_notice">Descargo de responsabilidad</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
-        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. 
- 
-        In case of copyright infringement, please directly contact the responsible parties or the streaming websites. 
- 
-        The app is purely for educational and personal use. 
- 
-        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. 
-        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or 
-        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, 
-        user-friendly interface. 
- 
-        It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the 
-        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use 
-        CloudStream 3 at your own risk. 
-    </string> 
-    <string name="category_general">General</string>
-    <string name="random_button_settings">Botón aleatorio</string> 
-    <string name="random_button_settings_desc">Muestra un botón aleatorio en la página de inicio</string> 
-    <string name="provider_lang_settings">Idiomas del proveedor</string> 
-    <string name="app_layout">Diseño de la aplicación</string> 
-    <string name="preferred_media_settings">Medios preferidos</string> 
-    <string name="subtitles_encoding">Codificación de subtítulos</string>
-    <string name="category_ui">Diseño</string> 
- 
-    <string name="automatic">Automático</string>
-    <string name="tv_layout">Diseño de televisión</string> 
-    <string name="phone_layout">Diseño de teléfono</string> 
-    <string name="emulator_layout">Diseño de emulador</string> 
- 
-    <string name="primary_color_settings">Color primario</string> 
-    <string name="app_theme_settings">Tema de la aplicación</string> 
-    <string name="bottom_title_settings">Póster en la ubicación del título</string> 
-    <string name="bottom_title_settings_des">Coloca el título debajo del póster</string> 
- 
- 
-    <!-- account stuff -->
-    <string name="example_password">contraseña123</string>
-    <string name="example_username">MiNombreDeUsuarioGenial</string>
-    <string name="example_email">hola@mundo.com</string>
-    <string name="example_ip">127.0.0.1</string>
-    <string name="example_site_name">MiSitioGenial</string>
-    <string name="example_site_url">ejemplo.com</string>
-    <string name="example_lang_name">Código de idioma (es)</string>
-  
-    <!-- 
-    <string name="mal_account_settings" translatable="false">MAL</string> 
-    <string name="anilist_account_settings" translatable="false">AniList</string> 
-    <string name="tmdb_account_settings" translatable="false">TMDB</string> 
-    <string name="imdb_account_settings" translatable="false">IMDB</string> 
-    <string name="kitsu_account_settings" translatable="false">Kitsu</string> 
-    <string name="trakt_account_settings" translatable="false">Trakt</string> 
-    --> 
-    <string name="login_format" formatted="true">%s %s</string> 
-    <string name="account">cuenta</string> 
-    <string name="logout">Cerrar sesión</string> 
-    <string name="login">Iniciar sesión</string> 
-    <string name="switch_account">Cambiar cuenta</string> 
-    <string name="add_account">Añadir cuenta</string> 
-    <string name="add_sync">Añadir seguimiento</string> 
-    <string name="added_sync_format" formatted="true">Añadido %s</string> 
-    <string name="upload_sync">Sincronizar</string> 
-    <string name="sync_score">Calificación</string> 
-    <string name="sync_score_format" formatted="true">%d / 10</string> 
-    <string name="sync_total_episodes_none">/??</string> 
-    <string name="sync_total_episodes_some" formatted="true">/%d</string> 
-    <string name="authenticated_user" formatted="true">%s autenticado</string> 
-    <string name="authenticated_user_fail" formatted="true">No se pudo autenticar a %s</string> 
- 
-    <!-- ============ --> 
-    <string name="none">Ninguno</string> 
-    <string name="normal">Normal</string> 
-    <string name="all">Todo</string> 
-    <string name="max">Máximo</string> 
-    <string name="min">Mínimo</string>
-    <string name="subtitles_outline">Contorno</string>
-    <string name="subtitles_depressed">Deprimido</string> 
-    <string name="subtitles_shadow">Sombra</string> 
-    <string name="subtitles_raised">Elevado</string> 
-    <string name="subtitle_offset">Sincronizar subtítulos</string> 
-    <string name="subtitle_offset_hint">1000ms</string> 
-    <string name="subtitle_offset_title">Retraso de subtítulos</string> 
-    <string name="subtitle_offset_extra_hint_later_format">Use esto si los subtítulos se muestran %dms demasiado pronto</string> 
-    <string name="subtitle_offset_extra_hint_before_format">Use esto si los subtítulos se muestran %dms demasiado tarde</string> 
-    <string name="subtitle_offset_extra_hint_none_format">Sin retraso de subtítulos</string> 
- 
-    <!-- 
-    Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet, 
-    see:  
-	https://en.wikipedia.org/w/index.php?title=Pangram&oldid=225849300 
-	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog 
-    --> 
-    <string name="subtitles_example_text">El rápido zorro marrón salta sobre el perro perezoso</string> 
- 
-    <string name="recommended">Recomendado</string> 
-    <string name="player_loaded_subtitles" formatted="true">%s cargado</string> 
-    <string name="player_load_subtitles">Cargar desde archivo</string> 
-    <string name="player_load_subtitles_online">Cargar desde Internet</string>
-    <string name="downloaded_file">Archivo descargado</string> 
-    <string name="actor_main">Principal</string>
-    <string name="actor_supporting">Secundario</string> 
-    <string name="actor_background">Extra</string> 
- 
-    <string name="home_source">Fuente</string> 
-    <string name="home_random">Aleatorio</string> 
- 
-    <string name="coming_soon">Próximamente…</string> 
- 
-    <string name="quality_cam">Cam</string> 
-    <string name="quality_cam_rip">Cam</string> 
-    <string name="quality_cam_hd">Cam</string> 
-    <string name="quality_hq">HQ</string> 
-    <string name="quality_hd">HD</string> 
-    <string name="quality_ts">TS</string> 
-    <string name="quality_tc">TC</string> 
-    <string name="quality_blueray">BlueRay</string> 
-    <string name="quality_workprint">WP</string>
-    <string name="quality_dvd">DVD</string> 
-    <string name="quality_4k">4K</string> 
-    <string name="quality_sd">SD</string> 
-    <string name="quality_uhd">UHD</string> 
-    <string name="quality_hdr">HDR</string> 
-    <string name="quality_sdr">SDR</string> 
-    <string name="quality_webrip">Web</string>
-  
-    <string name="poster_image">Imagen del póster</string> 
-    <string name="category_player">Reproductor</string> 
-    <string name="resolution_and_title">Resolución y título</string> 
-    <string name="title">Título</string> 
-    <string name="resolution">Resolución</string> 
-    <string name="error_invalid_id">Identificación no válida</string> 
-    <string name="error_invalid_data">Datos no válidos</string>
-    <string name="error">Error</string>
-    <string name="subtitles_remove_captions">Eliminar subtítulos cerrados de subtítulos</string>
-    <string name="subtitles_remove_bloat">Eliminar exceso de peso de subtítulos</string>
-    <string name="extras">Extras</string>
-    <string name="trailer">Tráiler</string>
-</resources> 

From 2a32f62fe365486e005c8ca0a0fc55493c732e46 Mon Sep 17 00:00:00 2001
From: LagradOst <11805592+LagradOst@users.noreply.github.com>
Date: Wed, 28 Dec 2022 12:51:55 +0100
Subject: [PATCH 143/273] tv UI change + homepage optimization

---
 .../cloudstream3/ExampleInstrumentedTest.kt   |  10 +-
 .../HeaderDecorationBindingAdapter.kt         |  11 +
 .../lagradost/cloudstream3/MainActivity.kt    |  36 +-
 .../cloudstream3/ui/HeaderViewDecoration.kt   |  42 ++
 .../cloudstream3/ui/home/HomeFragment.kt      | 573 +++++++----------
 .../ui/home/HomeParentItemAdapter.kt          |  91 ++-
 .../ui/home/HomeParentItemAdapterPreview.kt   | 581 ++++++++++++++++++
 .../cloudstream3/ui/home/HomeScrollAdapter.kt |  15 +-
 .../cloudstream3/ui/home/HomeViewModel.kt     |   1 +
 .../cloudstream3/ui/result/ResultFragment.kt  |   3 +-
 .../cloudstream3/ui/search/SearchAdaptor.kt   |  20 +-
 .../cloudstream3/ui/search/SearchFragment.kt  |   7 +-
 .../utils/SingleSelectionHelper.kt            |  14 +-
 .../ic_baseline_keyboard_arrow_left_24.xml    |   2 +-
 .../ic_baseline_keyboard_arrow_right_24.xml   |  14 +-
 app/src/main/res/layout/activity_main.xml     |   3 +-
 app/src/main/res/layout/activity_main_tv.xml  |  92 +--
 app/src/main/res/layout/fragment_home.xml     | 435 +------------
 .../main/res/layout/fragment_home_head.xml    | 259 ++++++++
 .../main/res/layout/fragment_home_head_tv.xml | 248 ++++++++
 app/src/main/res/layout/fragment_home_tv.xml  | 510 ++++-----------
 app/src/main/res/layout/fragment_result.xml   |   1 +
 .../main/res/layout/fragment_result_tv.xml    |   1 +
 app/src/main/res/layout/fragment_search.xml   | 168 ++---
 .../main/res/layout/fragment_search_tv.xml    | 155 +++++
 .../main/res/layout/home_scroll_view_tv.xml   |  21 +
 .../main/res/layout/homepage_parent_tv.xml    |  48 +-
 app/src/main/res/layout/tvtypes_chips.xml     |   1 +
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/dimens.xml            |   1 +
 app/src/main/res/values/styles.xml            |  10 +
 31 files changed, 2012 insertions(+), 1362 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/HeaderDecorationBindingAdapter.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/HeaderViewDecoration.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
 create mode 100644 app/src/main/res/layout/fragment_home_head.xml
 create mode 100644 app/src/main/res/layout/fragment_home_head_tv.xml
 create mode 100644 app/src/main/res/layout/fragment_search_tv.xml
 create mode 100644 app/src/main/res/layout/home_scroll_view_tv.xml

diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
index 2a3e13e5..81753f6b 100644
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
@@ -138,7 +138,7 @@ class ExampleInstrumentedTest {
                 }
                 break
             }
-            if(!validResults) {
+            if (!validResults) {
                 System.err.println("Api ${api.name} did not load on any")
             }
 
@@ -183,7 +183,9 @@ class ExampleInstrumentedTest {
             getAllProviders().amap { api ->
                 if (api.hasMainPage) {
                     try {
-                        val homepage = api.getMainPage()
+                        val f = api.mainPage.first()
+                        val homepage =
+                            api.getMainPage(1, MainPageRequest(f.name, f.data, f.horizontalImages))
                         when {
                             homepage == null -> {
                                 System.err.println("Homepage provider ${api.name} did not correctly load homepage!")
@@ -192,7 +194,7 @@ class ExampleInstrumentedTest {
                                 System.err.println("Homepage provider ${api.name} does not contain any items!")
                             }
                             homepage.items.any { it.list.isEmpty() } -> {
-                                System.err.println ("Homepage provider ${api.name} does not have any items on result!")
+                                System.err.println("Homepage provider ${api.name} does not have any items on result!")
                             }
                         }
                     } catch (e: Exception) {
@@ -231,7 +233,7 @@ class ExampleInstrumentedTest {
                     invalidProvider.add(Pair(api, e))
                 }
             }
-            if(invalidProvider.isEmpty()) {
+            if (invalidProvider.isEmpty()) {
                 println("No Invalid providers! :D")
             } else {
                 println("Invalid providers are: ")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/HeaderDecorationBindingAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/HeaderDecorationBindingAdapter.kt
new file mode 100644
index 00000000..045a7963
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/HeaderDecorationBindingAdapter.kt
@@ -0,0 +1,11 @@
+package com.lagradost.cloudstream3
+
+import android.view.LayoutInflater
+import androidx.annotation.LayoutRes
+import androidx.recyclerview.widget.RecyclerView
+import com.lagradost.cloudstream3.ui.HeaderViewDecoration
+
+fun setHeaderDecoration(view: RecyclerView, @LayoutRes headerViewRes: Int) {
+    val headerView = LayoutInflater.from(view.context).inflate(headerViewRes, null)
+    view.addItemDecoration(HeaderViewDecoration(headerView))
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 9a591580..1551467b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -10,12 +10,18 @@ import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
 import android.view.WindowManager
+import android.widget.FrameLayout
+import android.widget.LinearLayout
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.isVisible
+import androidx.core.view.marginRight
+import androidx.core.view.setMargins
 import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentContainerView
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy
@@ -66,6 +72,7 @@ import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isEmulatorSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.updateTv
 import com.lagradost.cloudstream3.ui.settings.SettingsGeneral
 import com.lagradost.cloudstream3.ui.setup.HAS_DONE_SETUP_KEY
 import com.lagradost.cloudstream3.ui.setup.SetupFragmentExtensions
@@ -89,6 +96,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
+import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
 import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 import com.lagradost.nicehttp.Requests
@@ -379,6 +387,27 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             R.id.navigation_settings_plugins,
         ).contains(destination.id)
 
+
+        val dontPush = listOf(
+            R.id.navigation_home,
+            R.id.navigation_search,
+            R.id.navigation_results_phone,
+            R.id.navigation_results_tv,
+            R.id.navigation_player,
+        ).contains(destination.id)
+
+        nav_host_fragment?.apply {
+            val params = layoutParams as ConstraintLayout.LayoutParams
+
+            params.setMargins(
+                if (!dontPush && isTvSettings()) resources.getDimensionPixelSize(R.dimen.navbar_width) else 0,
+                params.topMargin,
+                params.rightMargin,
+                params.bottomMargin
+            )
+            layoutParams = params
+        }
+
         val landscape = when (resources.configuration.orientation) {
             Configuration.ORIENTATION_LANDSCAPE -> {
                 true
@@ -619,7 +648,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         }
 
         window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
-
+        updateTv()
         if (isTvSettings()) {
             setContentView(R.layout.activity_main_tv)
         } else {
@@ -743,7 +772,12 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         nav_view?.setupWithNavController(navController)
         val nav_rail = findViewById<NavigationRailView?>(R.id.nav_rail_view)
         nav_rail?.setupWithNavController(navController)
+        if (isTvSettings()) {
+            nav_rail?.background?.alpha = 200
+        } else {
+            nav_rail?.background?.alpha = 255
 
+        }
         nav_rail?.setOnItemSelectedListener { item ->
             onNavDestinationSelected(
                 item,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/HeaderViewDecoration.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/HeaderViewDecoration.kt
new file mode 100644
index 00000000..40c03012
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/HeaderViewDecoration.kt
@@ -0,0 +1,42 @@
+package com.lagradost.cloudstream3.ui
+
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+
+class HeaderViewDecoration(private val customView: View) : RecyclerView.ItemDecoration() {
+    override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        super.onDraw(c, parent, state)
+        customView.layout(parent.left, 0, parent.right, customView.measuredHeight)
+        for (i in 0 until parent.childCount) {
+            val view = parent.getChildAt(i)
+            if (parent.getChildAdapterPosition(view) == 0) {
+                c.save()
+                val height = customView.measuredHeight
+                val top = view.top - height
+                c.translate(0f, top.toFloat())
+                customView.draw(c)
+                c.restore()
+                break
+            }
+        }
+    }
+
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        parent: RecyclerView,
+        state: RecyclerView.State
+    ) {
+        if (parent.getChildAdapterPosition(view) == 0) {
+            customView.measure(
+                View.MeasureSpec.makeMeasureSpec(parent.measuredWidth, View.MeasureSpec.AT_MOST),
+                View.MeasureSpec.makeMeasureSpec(parent.measuredHeight, View.MeasureSpec.AT_MOST)
+            )
+            outRect.set(0, customView.measuredHeight, 0, 0)
+        } else {
+            outRect.setEmpty()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 8e2ca6af..2f08e065 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -31,6 +31,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipDrawable
 import com.google.android.material.chip.ChipGroup
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.apis
@@ -84,31 +85,21 @@ import com.lagradost.cloudstream3.utils.UIHelper.setImage
 import com.lagradost.cloudstream3.utils.UIHelper.setImageBlur
 import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 import com.lagradost.cloudstream3.widget.CenterZoomLayoutManager
+import kotlinx.android.synthetic.main.activity_main_tv.*
 import kotlinx.android.synthetic.main.fragment_home.*
 import kotlinx.android.synthetic.main.fragment_home.home_api_fab
-import kotlinx.android.synthetic.main.fragment_home.home_bookmarked_child_recyclerview
-import kotlinx.android.synthetic.main.fragment_home.home_bookmarked_holder
 import kotlinx.android.synthetic.main.fragment_home.home_change_api_loading
-import kotlinx.android.synthetic.main.fragment_home.home_loaded
 import kotlinx.android.synthetic.main.fragment_home.home_loading
 import kotlinx.android.synthetic.main.fragment_home.home_loading_error
 import kotlinx.android.synthetic.main.fragment_home.home_loading_shimmer
 import kotlinx.android.synthetic.main.fragment_home.home_loading_statusbar
 import kotlinx.android.synthetic.main.fragment_home.home_master_recycler
-import kotlinx.android.synthetic.main.fragment_home.home_plan_to_watch_btt
-import kotlinx.android.synthetic.main.fragment_home.home_provider_meta_info
-import kotlinx.android.synthetic.main.fragment_home.home_provider_name
 import kotlinx.android.synthetic.main.fragment_home.home_reload_connection_open_in_browser
 import kotlinx.android.synthetic.main.fragment_home.home_reload_connectionerror
-import kotlinx.android.synthetic.main.fragment_home.home_type_completed_btt
-import kotlinx.android.synthetic.main.fragment_home.home_type_dropped_btt
-import kotlinx.android.synthetic.main.fragment_home.home_type_on_hold_btt
-import kotlinx.android.synthetic.main.fragment_home.home_type_watching_btt
-import kotlinx.android.synthetic.main.fragment_home.home_watch_child_recyclerview
-import kotlinx.android.synthetic.main.fragment_home.home_watch_holder
-import kotlinx.android.synthetic.main.fragment_home.home_watch_parent_item_title
 import kotlinx.android.synthetic.main.fragment_home.result_error_text
+import kotlinx.android.synthetic.main.fragment_home_head_tv.*
 import kotlinx.android.synthetic.main.fragment_home_tv.*
+import kotlinx.android.synthetic.main.fragment_result.*
 import kotlinx.android.synthetic.main.fragment_search.*
 import kotlinx.android.synthetic.main.home_episodes_expanded.*
 import kotlinx.android.synthetic.main.tvtypes_chips.*
@@ -440,10 +431,6 @@ class HomeFragment : Fragment() {
         return inflater.inflate(layout, container, false)
     }
 
-    private fun toggleMainVisibility(visible: Boolean) {
-        home_main_poster_recyclerview?.isVisible = visible
-    }
-
     @SuppressLint("NotifyDataSetChanged") // we need to notify to change poster
     private fun fixGrid() {
         activity?.getSpanCount()?.let {
@@ -467,7 +454,7 @@ class HomeFragment : Fragment() {
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
-        (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.notifyDataSetChanged()
+        //(home_preview_viewpager?.adapter as? HomeScrollAdapter)?.notifyDataSetChanged()
         fixGrid()
     }
 
@@ -517,8 +504,9 @@ class HomeFragment : Fragment() {
     }*/
 
     private fun focusCallback(card: SearchResponse) {
-        home_focus_text?.text = card.name
-        home_blur_poster?.setImageBlur(card.posterUrl, 50)
+        // home_focus_text?.text = card.name
+        // home_blur_poster?.setImageBlur(card.posterUrl, 50, headers = card.posterHeaders)
+        // home_bg_poster?.setImage(card.posterUrl,headers =card.posterHeaders)
     }
 
     private fun homeHandleSearch(callback: SearchClickCallback) {
@@ -537,8 +525,8 @@ class HomeFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         fixGrid()
 
-        home_change_api?.setOnClickListener(apiChangeClickListener)
         home_change_api_loading?.setOnClickListener(apiChangeClickListener)
+        home_preview_change_api?.setOnClickListener(apiChangeClickListener)
         home_api_fab?.setOnClickListener(apiChangeClickListener)
         home_random?.setOnClickListener {
             if (listHomepageItems.isNotEmpty()) {
@@ -557,208 +545,135 @@ class HomeFragment : Fragment() {
         observe(homeViewModel.preview) { preview ->
             // Always reset the padding, otherwise the will move lower and lower
             // home_fix_padding?.setPadding(0, 0, 0, 0)
-            home_fix_padding?.let { v ->
-                val params = v.layoutParams
-                params.height = 0
-                v.layoutParams = params
-            }
+            //home_fix_padding?.let { v ->
+            //    val params = v.layoutParams
+            //    params.height = 0
+            //    v.layoutParams = params
+            //}
 
-            when (preview) {
-                is Resource.Success -> {
-                    home_preview?.isVisible = true
-                    (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.apply {
-                        if (!setItems(preview.value.second, preview.value.first)) {
-                            home_preview_viewpager?.setCurrentItem(0, false)
-                        }
-                        // home_preview_viewpager?.setCurrentItem(1000, false)
-                    }
+            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setPreviewData(
+                preview
+            )
 
-                    //.also {
-                    //home_preview_viewpager?.adapter =
-                    //}
-                }
-                else -> {
-                    (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.setItems(
-                        listOf(),
-                        false
-                    )
-                    home_preview?.isVisible = false
-                    context?.fixPaddingStatusbarView(home_fix_padding)
-                }
-            }
+            //when (preview) {
+            //    is Resource.Success -> {
+            //        home_preview?.isVisible = true
+            //        (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.apply {
+            //            if (!setItems(preview.value.second, preview.value.first)) {
+            //                home_preview_viewpager?.setCurrentItem(0, false)
+            //            }
+            //            // home_preview_viewpager?.setCurrentItem(1000, false)
+            //        }
+//
+            //        //.also {
+            //        //home_preview_viewpager?.adapter =
+            //        //}
+            //    }
+            //    else -> {
+            //        (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.setItems(
+            //            listOf(),
+            //            false
+            //        )
+            //        home_preview?.isVisible = false
+            //        context?.fixPaddingStatusbarView(home_fix_padding)
+            //    }
+            //}
         }
 
-        val searchText =
-            home_search?.findViewById<SearchView.SearchAutoComplete>(androidx.appcompat.R.id.search_src_text)
-        searchText?.context?.getResourceColor(R.attr.white)?.let { color ->
-            searchText.setTextColor(color)
-            searchText.setHintTextColor(color)
-        }
-
-        home_preview_viewpager?.apply {
-            setPageTransformer(HomeScrollTransformer())
-            val callback: OnPageChangeCallback = object : OnPageChangeCallback() {
-                override fun onPageSelected(position: Int) {
-
-                    // home_search?.isIconified = true
-                    //home_search?.isVisible = true
-                    //home_search?.clearFocus()
-
-                    (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.apply {
-                        if (position >= itemCount - 1 && hasMoreItems) {
-                            hasMoreItems = false // dont make two requests
-                            homeViewModel.loadMoreHomeScrollResponses()
-                        }
-
-                        getItem(position)
-                            ?.apply {
-                                home_preview_title_holder?.let { parent ->
-                                    TransitionManager.beginDelayedTransition(parent, ChangeBounds())
-                                }
-
-                                // home_preview_tags?.text = tags?.joinToString(" • ") ?: ""
-                                // home_preview_tags?.isGone = tags.isNullOrEmpty()
-                                // home_preview_image?.setImage(posterUrl, posterHeaders)
-                                // home_preview_title?.text = name
-
-                                home_preview_play?.setOnClickListener {
-                                    activity?.loadResult(url, apiName, START_ACTION_RESUME_LATEST)
-                                    //activity.loadSearchResult(url, START_ACTION_RESUME_LATEST)
-                                }
-                                home_preview_info?.setOnClickListener {
-                                    activity?.loadResult(url, apiName)
-                                    //activity.loadSearchResult(random)
-                                }
-                                // very ugly code, but I dont care
-                                val watchType = DataStoreHelper.getResultWatchState(this.getId())
-                                home_preview_bookmark?.setText(watchType.stringRes)
-                                home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
-                                    null,
-                                    getDrawable(home_preview_bookmark.context, watchType.iconRes),
-                                    null,
-                                    null
-                                )
-                                home_preview_bookmark?.setOnClickListener { fab ->
-                                    activity?.showBottomDialog(
-                                        WatchType.values()
-                                            .map { fab.context.getString(it.stringRes) }
-                                            .toList(),
-                                        DataStoreHelper.getResultWatchState(this.getId()).ordinal,
-                                        fab.context.getString(R.string.action_add_to_bookmarks),
-                                        showApply = false,
-                                        {}) {
-                                        val newValue = WatchType.values()[it]
-                                        home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
-                                            null,
-                                            getDrawable(
-                                                home_preview_bookmark.context,
-                                                newValue.iconRes
-                                            ),
-                                            null,
-                                            null
-                                        )
-                                        home_preview_bookmark?.setText(newValue.stringRes)
-
-                                        updateWatchStatus(this, newValue)
-                                        reloadStored()
-                                    }
-                                }
-
-                            }
-                    }
-                }
-            }
-            registerOnPageChangeCallback(callback)
-            adapter = HomeScrollAdapter()
-        }
+        //val searchText =
+        //    home_search?.findViewById<SearchView.SearchAutoComplete>(androidx.appcompat.R.id.search_src_text)
+        //searchText?.context?.getResourceColor(R.attr.white)?.let { color ->
+        //    searchText.setTextColor(color)
+        //    searchText.setHintTextColor(color)
+        //}
 
         observe(homeViewModel.apiName) { apiName ->
             currentApiName = apiName
             // setKey(USER_SELECTED_HOMEPAGE_API, apiName)
             home_api_fab?.text = apiName
-            home_provider_name?.text = apiName
-            try {
-                home_search?.queryHint = getString(R.string.search_hint_site).format(apiName)
-            } catch (e: Exception) {
-                logError(e)
-            }
-            home_provider_meta_info?.isVisible = false
+            //home_provider_name?.text = apiName
+            // try {
+            //     home_search?.queryHint = getString(R.string.search_hint_site).format(apiName)
+            // } catch (e: Exception) {
+            //     logError(e)
+            // }
+            //home_provider_meta_info?.isVisible = false
 
-            getApiFromNameNull(apiName)?.let { currentApi ->
-                val typeChoices = listOf(
-                    Pair(R.string.movies, listOf(TvType.Movie)),
-                    Pair(R.string.tv_series, listOf(TvType.TvSeries)),
-                    Pair(R.string.documentaries, listOf(TvType.Documentary)),
-                    Pair(R.string.cartoons, listOf(TvType.Cartoon)),
-                    Pair(R.string.anime, listOf(TvType.Anime, TvType.OVA, TvType.AnimeMovie)),
-                    Pair(R.string.torrent, listOf(TvType.Torrent)),
-                    Pair(R.string.asian_drama, listOf(TvType.AsianDrama)),
-                ).filter { item -> currentApi.supportedTypes.any { type -> item.second.contains(type) } }
-                home_provider_meta_info?.text =
-                    typeChoices.joinToString(separator = ", ") { getString(it.first) }
-                home_provider_meta_info?.isVisible = true
-            }
+            //getApiFromNameNull(apiName)?.let { currentApi ->
+            //    val typeChoices = listOf(
+            //        Pair(R.string.movies, listOf(TvType.Movie)),
+            //        Pair(R.string.tv_series, listOf(TvType.TvSeries)),
+            //        Pair(R.string.documentaries, listOf(TvType.Documentary)),
+            //        Pair(R.string.cartoons, listOf(TvType.Cartoon)),
+            //        Pair(R.string.anime, listOf(TvType.Anime, TvType.OVA, TvType.AnimeMovie)),
+            //        Pair(R.string.torrent, listOf(TvType.Torrent)),
+            //        Pair(R.string.asian_drama, listOf(TvType.AsianDrama)),
+            //    ).filter { item -> currentApi.supportedTypes.any { type -> item.second.contains(type) } }
+            //    home_provider_meta_info?.text =
+            //        typeChoices.joinToString(separator = ", ") { getString(it.first) }
+            //    home_provider_meta_info?.isVisible = true
+            //}
         }
 
-        home_main_poster_recyclerview?.adapter =
-            HomeChildItemAdapter(
-                mutableListOf(),
-                R.layout.home_result_big_grid,
-                nextFocusUp = home_main_poster_recyclerview?.nextFocusUpId,
-                nextFocusDown = home_main_poster_recyclerview?.nextFocusDownId
-            ) { callback ->
-                homeHandleSearch(callback)
-            }
-        home_main_poster_recyclerview?.setLinearListLayout()
-        observe(homeViewModel.randomItems) { items ->
-            if (items.isNullOrEmpty()) {
-                toggleMainVisibility(false)
-            } else {
-                val tempAdapter = home_main_poster_recyclerview?.adapter as? HomeChildItemAdapter?
-                // no need to reload if it has the same data
-                if (tempAdapter != null && tempAdapter.cardList == items) {
-                    toggleMainVisibility(true)
-                    return@observe
-                }
+        //home_main_poster_recyclerview?.adapter =
+        //    HomeChildItemAdapter(
+        //        mutableListOf(),
+        //        R.layout.home_result_big_grid,
+        //        nextFocusUp = home_main_poster_recyclerview?.nextFocusUpId,
+        //        nextFocusDown = home_main_poster_recyclerview?.nextFocusDownId
+        //    ) { callback ->
+        //        homeHandleSearch(callback)
+        //    }
+        //home_main_poster_recyclerview?.setLinearListLayout()
+        //observe(homeViewModel.randomItems) { items ->
+        //    if (items.isNullOrEmpty()) {
+        //        toggleMainVisibility(false)
+        //    } else {
+        //        val tempAdapter = home_main_poster_recyclerview?.adapter as? HomeChildItemAdapter?
+        //        // no need to reload if it has the same data
+        //        if (tempAdapter != null && tempAdapter.cardList == items) {
+        //            toggleMainVisibility(true)
+        //            return@observe
+        //        }
+//
+        //        val randomSize = items.size
+        //        tempAdapter?.updateList(items)
+        //        if (!isTvSettings()) {
+        //            home_main_poster_recyclerview?.post {
+        //                (home_main_poster_recyclerview?.layoutManager as CenterZoomLayoutManager?)?.let { manager ->
+        //                    manager.updateSize(forceUpdate = true)
+        //                    if (randomSize > 2) {
+        //                        manager.scrollToPosition(randomSize / 2)
+        //                        manager.snap { dx ->
+        //                            home_main_poster_recyclerview?.post {
+        //                                // this is the best I can do, fuck android for not including instant scroll
+        //                                home_main_poster_recyclerview?.smoothScrollBy(dx, 0)
+        //                            }
+        //                        }
+        //                    }
+        //                }
+        //            }
+        //        } else {
+        //            items.firstOrNull()?.let {
+        //                focusCallback(it)
+        //            }
+        //        }
+        //        toggleMainVisibility(true)
+        //    }
+        //}
 
-                val randomSize = items.size
-                tempAdapter?.updateList(items)
-                if (!isTvSettings()) {
-                    home_main_poster_recyclerview?.post {
-                        (home_main_poster_recyclerview?.layoutManager as CenterZoomLayoutManager?)?.let { manager ->
-                            manager.updateSize(forceUpdate = true)
-                            if (randomSize > 2) {
-                                manager.scrollToPosition(randomSize / 2)
-                                manager.snap { dx ->
-                                    home_main_poster_recyclerview?.post {
-                                        // this is the best I can do, fuck android for not including instant scroll
-                                        home_main_poster_recyclerview?.smoothScrollBy(dx, 0)
-                                    }
-                                }
-                            }
-                        }
-                    }
-                } else {
-                    items.firstOrNull()?.let {
-                        focusCallback(it)
-                    }
-                }
-                toggleMainVisibility(true)
-            }
-        }
-
-        home_search?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-            override fun onQueryTextSubmit(query: String): Boolean {
-                QuickSearchFragment.pushSearch(activity, query, currentApiName?.let { arrayOf(it) })
-
-                return true
-            }
-
-            override fun onQueryTextChange(newText: String): Boolean {
-                //searchViewModel.quickSearch(newText)
-                return true
-            }
-        })
+        //home_search?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+        //    override fun onQueryTextSubmit(query: String): Boolean {
+        //        QuickSearchFragment.pushSearch(activity, query, currentApiName?.let { arrayOf(it) })
+//
+        //        return true
+        //    }
+//
+        //    override fun onQueryTextChange(newText: String): Boolean {
+        //        //searchViewModel.quickSearch(newText)
+        //        return true
+        //    }
+        //})
 
         observe(homeViewModel.page) { data ->
             when (data) {
@@ -769,7 +684,6 @@ class HomeFragment : Fragment() {
                     val mutableListOfResponse = mutableListOf<SearchResponse>()
                     listHomepageItems.clear()
 
-                    // println("ITEMCOUNT: ${d.values.size} ${home_master_recycler?.adapter?.itemCount}")
                     (home_master_recycler?.adapter as? ParentItemAdapter?)?.updateList(
                         d.values.toMutableList(),
                         home_master_recycler
@@ -777,7 +691,7 @@ class HomeFragment : Fragment() {
 
                     home_loading?.isVisible = false
                     home_loading_error?.isVisible = false
-                    home_loaded?.isVisible = true
+                    //home_loaded?.isVisible = true
                     if (toggleRandomButton) {
                         //Flatten list
                         d.values.forEach { dlist ->
@@ -817,80 +731,29 @@ class HomeFragment : Fragment() {
 
                     home_loading?.isVisible = false
                     home_loading_error?.isVisible = true
-                    home_loaded?.isVisible = false
+                    //home_loaded?.isVisible = false
                 }
                 is Resource.Loading -> {
                     (home_master_recycler?.adapter as? ParentItemAdapter?)?.updateList(listOf())
                     home_loading_shimmer?.startShimmer()
                     home_loading?.isVisible = true
                     home_loading_error?.isVisible = false
-                    home_loaded?.isVisible = false
+                    //home_loaded?.isVisible = false
                 }
             }
         }
 
-        val toggleList = listOf(
-            Pair(home_type_watching_btt, WatchType.WATCHING),
-            Pair(home_type_completed_btt, WatchType.COMPLETED),
-            Pair(home_type_dropped_btt, WatchType.DROPPED),
-            Pair(home_type_on_hold_btt, WatchType.ONHOLD),
-            Pair(home_plan_to_watch_btt, WatchType.PLANTOWATCH),
-        )
-        val currentSet = getKey<IntArray>(HOME_BOOKMARK_VALUE_LIST)
-            ?.map { WatchType.fromInternalId(it) }?.toSet() ?: emptySet()
 
-        for ((chip, watch) in toggleList) {
-            chip.isChecked = currentSet.contains(watch)
-            chip?.setOnCheckedChangeListener { _, isChecked ->
-                if (isChecked) {
-                    homeViewModel.loadStoredData(
-                        setOf(watch)
-                        // If we filter all buttons then two can be checked at the same time
-                        // Revert this if you want to go back to multi selection
-//                    toggleList.filter { it.first?.isChecked == true }.map { it.second }.toSet()
-                    )
-                }
-                // Else if all are unchecked -> Do not load data
-                else if (toggleList.all { it.first?.isChecked != true }) {
-                    homeViewModel.loadStoredData(emptySet())
-                }
-            }
-            /*chip?.setOnClickListener {
-
-
-                homeViewModel.loadStoredData(EnumSet.of(watch))
-            }
-
-            chip?.setOnLongClickListener { itemView ->
-                val list = EnumSet.noneOf(WatchType::class.java)
-                itemView.context.getKey<IntArray>(HOME_BOOKMARK_VALUE_LIST)
-                    ?.map { WatchType.fromInternalId(it) }?.let {
-                        list.addAll(it)
-                    }
-
-                if (list.contains(watch)) {
-                    list.remove(watch)
-                } else {
-                    list.add(watch)
-                }
-                homeViewModel.loadStoredData(list)
-                return@setOnLongClickListener true
-            }*/
-        }
 
         observe(homeViewModel.availableWatchStatusTypes) { availableWatchStatusTypes ->
             context?.setKey(
                 HOME_BOOKMARK_VALUE_LIST,
                 availableWatchStatusTypes.first.map { it.internalId }.toIntArray()
             )
+            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setAvailableWatchStatusTypes(
+                availableWatchStatusTypes
+            )
 
-            for (item in toggleList) {
-                val watch = item.second
-                item.first?.apply {
-                    isVisible = availableWatchStatusTypes.second.contains(watch)
-                    isSelected = availableWatchStatusTypes.first.contains(watch)
-                }
-            }
 
             /*home_bookmark_select?.setOnClickListener {
                 it.popupMenuNoIcons(availableWatchStatusTypes.second.map { type ->
@@ -905,32 +768,40 @@ class HomeFragment : Fragment() {
             home_bookmarked_parent_item_title?.text = getString(availableWatchStatusTypes.first.stringRes)*/
         }
 
-        observe(homeViewModel.bookmarks) { (isVis, bookmarks) ->
-            home_bookmarked_holder.isVisible = isVis
-
-            (home_bookmarked_child_recyclerview?.adapter as? HomeChildItemAdapter?)?.updateList(
-                bookmarks
+        //TODO REMAKE
+        observe(homeViewModel.bookmarks) { data ->
+            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setBookmarkData(
+                data
             )
 
-            home_bookmarked_child_more_info?.setOnClickListener {
-                activity?.loadHomepageList(
-                    HomePageList(
-                        getString(R.string.error_bookmarks_text), //home_bookmarked_parent_item_title?.text?.toString() ?: getString(R.string.error_bookmarks_text),
-                        bookmarks
-                    )
-                ) {
-                    deleteAllBookmarkedData()
-                    homeViewModel.loadStoredData(null)
-                }
-            }
+            //(home_bookmarked_child_recyclerview?.adapter as? HomeChildItemAdapter?)?.updateList(
+            //    bookmarks
+            //)
+//
+            //    home_bookmarked_child_more_info?.setOnClickListener {
+            //        activity?.loadHomepageList(
+            //            HomePageList(
+            //                getString(R.string.error_bookmarks_text), //home_bookmarked_parent_item_title?.text?.toString() ?: getString(R.string.error_bookmarks_text),
+            //                bookmarks
+            //            )
+            //        ) {
+            //            deleteAllBookmarkedData()
+            //            homeViewModel.loadStoredData(null)
+            //        }
+            //    }
         }
 
         observe(homeViewModel.resumeWatching) { resumeWatching ->
-            home_watch_holder?.isVisible = resumeWatching.isNotEmpty()
-            (home_watch_child_recyclerview?.adapter as? HomeChildItemAdapter?)?.updateList(
+            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setResumeWatchingData(
                 resumeWatching
             )
 
+
+            //home_watch_holder?.isVisible = resumeWatching.isNotEmpty()
+            //(home_watch_child_recyclerview?.adapter as? HomeChildItemAdapter?)?.updateList(
+            //    resumeWatching
+            //)
+
             if (isTrueTvSettings()) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     ioSafe {
@@ -939,21 +810,21 @@ class HomeFragment : Fragment() {
                 }
             }
 
-            home_watch_child_more_info?.setOnClickListener {
-                activity?.loadHomepageList(
-                    HomePageList(
-                        home_watch_parent_item_title?.text?.toString()
-                            ?: getString(R.string.continue_watching),
-                        resumeWatching
-                    )
-                ) {
-                    deleteAllResumeStateIds()
-                    homeViewModel.loadResumeWatching()
-                }
-            }
+            //home_watch_child_more_info?.setOnClickListener {
+            //    activity?.loadHomepageList(
+            //        HomePageList(
+            //            home_watch_parent_item_title?.text?.toString()
+            //                ?: getString(R.string.continue_watching),
+            //            resumeWatching
+            //        )
+            //    ) {
+            //        deleteAllResumeStateIds()
+            //        homeViewModel.loadResumeWatching()
+            //    }
+            //}
         }
 
-        home_bookmarked_child_recyclerview.adapter = HomeChildItemAdapter(
+        home_bookmarked_child_recyclerview?.adapter = HomeChildItemAdapter(
             ArrayList(),
             nextFocusUp = home_bookmarked_child_recyclerview?.nextFocusUpId,
             nextFocusDown = home_bookmarked_child_recyclerview?.nextFocusDownId
@@ -995,26 +866,15 @@ class HomeFragment : Fragment() {
                         reloadStored()
                     }
 
-                    if (isTv) {
-                        when (actionId) {
-                            0 -> {
-                                play()
-                            }
-                            1 -> {
-                                info()
-                            }
-                            2 -> {
-                                remove()
-                            }
+                    when (actionId) {
+                        0 -> {
+                            play()
                         }
-                    } else {
-                        when (actionId) {
-                            0 -> {
-                                info()
-                            }
-                            1 -> {
-                                remove()
-                            }
+                        1 -> {
+                            info()
+                        }
+                        2 -> {
+                            remove()
                         }
                     }
                 }
@@ -1022,8 +882,8 @@ class HomeFragment : Fragment() {
                 homeHandleSearch(callback)
             }
         }
-        home_watch_child_recyclerview.setLinearListLayout()
-        home_bookmarked_child_recyclerview.setLinearListLayout()
+        home_watch_child_recyclerview?.setLinearListLayout()
+        home_bookmarked_child_recyclerview?.setLinearListLayout()
 
         home_watch_child_recyclerview?.adapter = HomeChildItemAdapter(
             ArrayList(),
@@ -1100,11 +960,11 @@ class HomeFragment : Fragment() {
         }
 
         //context?.fixPaddingStatusbarView(home_statusbar)
-        context?.fixPaddingStatusbar(home_padding)
+        //context?.fixPaddingStatusbar(home_padding)
         context?.fixPaddingStatusbar(home_loading_statusbar)
 
-        home_master_recycler.adapter =
-            ParentItemAdapter(mutableListOf(), { callback ->
+        home_master_recycler?.adapter =
+            HomeParentItemAdapterPreview(mutableListOf(), { callback ->
                 homeHandleSearch(callback)
             }, { item ->
                 activity?.loadHomepageList(item, expandCallback = {
@@ -1112,53 +972,68 @@ class HomeFragment : Fragment() {
                 })
             }, { name ->
                 homeViewModel.expand(name)
+            }, { load ->
+                activity?.loadResult(load.response.url, load.response.apiName, load.action)
+            }, {
+                homeViewModel.loadMoreHomeScrollResponses()
+            }, {
+                apiChangeClickListener.onClick(it)
+            }, reloadStored = {
+                reloadStored()
+            }, loadStoredData = {
+                homeViewModel.loadStoredData(it)
+            }, { (isQuickSearch, text) ->
+                if (!isQuickSearch) {
+                    QuickSearchFragment.pushSearch(
+                        activity,
+                        text,
+                        currentApiName?.let { arrayOf(it) })
+                }
             })
-        home_master_recycler.setLinearListLayout()
-        home_master_recycler?.setMaxViewPoolSize(0, Int.MAX_VALUE)
-        home_master_recycler.layoutManager = object : LinearLayoutManager(context) {
-            override fun supportsPredictiveItemAnimations(): Boolean {
-                return false
-            }
-        } // GridLayoutManager(context, 1).also { it.supportsPredictiveItemAnimations() }
+        //home_master_recycler.setLinearListLayout()
+
+        //home_master_recycler?.setMaxViewPoolSize(0, 4)
+        //home_master_recycler.layoutManager = object : LinearLayoutManager(context) {
+        //    override fun supportsPredictiveItemAnimations(): Boolean {
+        //        return false
+        //    }
+        //} // GridLayoutManager(context, 1).also { it.supportsPredictiveItemAnimations() }
 
         reloadStored()
         loadHomePage(false)
 
-        home_loaded.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { v, _, scrollY, _, oldScrollY ->
-            val dy = scrollY - oldScrollY
-            if (dy > 0) { //check for scroll down
-                home_api_fab?.shrink() // hide
-                home_random?.shrink()
-            } else if (dy < -5) {
-                if (!isTvSettings()) {
-                    home_api_fab?.extend() // show
-                    home_random?.extend()
-                }
+        /*
+    home_loaded?.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { v, _, scrollY, _, oldScrollY ->
+        val dy = scrollY - oldScrollY
+        if (dy > 0) { //check for scroll down
+            home_api_fab?.shrink() // hide
+            home_random?.shrink()
+        } else if (dy < -5) {
+            if (!isTvSettings()) {
+                home_api_fab?.extend() // show
+                home_random?.extend()
             }
-        })
-
+        }
+    })
+*/
         // nice profile pic on homepage
-        home_profile_picture_holder?.isVisible = false
+        //home_profile_picture_holder?.isVisible = false
         // just in case
         if (isTvSettings()) {
             home_api_fab?.isVisible = false
-            home_change_api?.isVisible = true
             if (isTrueTvSettings()) {
                 home_change_api_loading?.isVisible = true
                 home_change_api_loading?.isFocusable = true
                 home_change_api_loading?.isFocusableInTouchMode = true
-                home_change_api?.isFocusable = true
-                home_change_api?.isFocusableInTouchMode = true
             }
             // home_bookmark_select?.isFocusable = true
             // home_bookmark_select?.isFocusableInTouchMode = true
         } else {
             home_api_fab?.isVisible = true
-            home_change_api?.isVisible = false
             home_change_api_loading?.isVisible = false
         }
 
-        for (syncApi in OAuth2Apis) {
+        /*for (syncApi in OAuth2Apis) {
             val login = syncApi.loginInfo()
             val pic = login?.profilePicture
             if (home_profile_picture?.setImage(
@@ -1169,6 +1044,6 @@ class HomeFragment : Fragment() {
                 home_profile_picture_holder?.isVisible = true
                 break
             }
-        }
+        }*/
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
index 23ab81ce..f85d5a08 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
@@ -4,34 +4,70 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListUpdateCallback
 import androidx.recyclerview.widget.RecyclerView
+import androidx.transition.ChangeBounds
+import androidx.transition.TransitionManager
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipDrawable
+import com.lagradost.cloudstream3.APIHolder.getId
+import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
 import com.lagradost.cloudstream3.HomePageList
+import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.result.LinearListLayout
+import com.lagradost.cloudstream3.ui.result.ResultViewModel2
+import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
+import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchFragment.Companion.filterSearchResponse
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.isRecyclerScrollable
+import com.lagradost.cloudstream3.utils.AppUtils.loadResult
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
+import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
+import kotlinx.android.synthetic.main.activity_main_tv.*
+import kotlinx.android.synthetic.main.activity_main_tv.view.*
+import kotlinx.android.synthetic.main.fragment_home.*
+import kotlinx.android.synthetic.main.fragment_home.view.*
+import kotlinx.android.synthetic.main.fragment_home_head_tv.*
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.*
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_viewpager
 import kotlinx.android.synthetic.main.homepage_parent.view.*
 
+class LoadClickCallback(
+    val action: Int = 0,
+    val view: View,
+    val position: Int,
+    val response: LoadResponse
+)
 
-class ParentItemAdapter(
+open class ParentItemAdapter(
     private var items: MutableList<HomeViewModel.ExpandableHomepageList>,
     private val clickCallback: (SearchClickCallback) -> Unit,
     private val moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit,
     private val expandCallback: ((String) -> Unit)? = null,
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, i: Int): ParentViewHolder {
-        //println("onCreateViewHolder $i")
-        val layout =
-            if (isTvSettings()) R.layout.homepage_parent_tv else R.layout.homepage_parent
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return ParentViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false),
+            LayoutInflater.from(parent.context).inflate(
+                if (isTvSettings()) R.layout.homepage_parent_tv else R.layout.homepage_parent,
+                parent,
+                false
+            ),
             clickCallback,
             moreInfoClickCallback,
             expandCallback
@@ -39,8 +75,6 @@ class ParentItemAdapter(
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        //println("onBindViewHolder $position")
-
         when (holder) {
             is ParentViewHolder -> {
                 holder.bind(items[position])
@@ -84,7 +118,10 @@ class ParentItemAdapter(
         val mAdapter = this
         diffResult.dispatchUpdatesTo(object : ListUpdateCallback {
             override fun onInserted(position: Int, count: Int) {
-                mAdapter.notifyItemRangeInserted(position, count)
+                mAdapter.notifyItemRangeChanged(
+                    position,
+                    count
+                )//notifyItemRangeInserted(position, count)
             }
 
             override fun onRemoved(position: Int, count: Int) {
@@ -95,23 +132,32 @@ class ParentItemAdapter(
                 mAdapter.notifyItemMoved(fromPosition, toPosition)
             }
 
-            override fun onChanged(position: Int, count: Int, payload: Any?) {
+            override fun onChanged(_position: Int, count: Int, payload: Any?) {
+                val delta = if (this@ParentItemAdapter is HomeParentItemAdapterPreview) {
+                    headItems
+                } else {
+                    0
+                }
+                val position = _position + delta
+
                 // I know kinda messy, what this does is using the update or bind instead of onCreateViewHolder -> bind
                 recyclerView?.apply {
                     // this loops every viewHolder in the recycle view and checks the position to see if it is within the update range
                     val missingUpdates = (position until (position + count)).toMutableSet()
                     for (i in 0 until itemCount) {
-                        val viewHolder = getChildViewHolder(getChildAt(i))
-                        val absolutePosition = viewHolder.absoluteAdapterPosition
+                        val child = getChildAt(i) ?: continue
+                        val viewHolder = getChildViewHolder(child) ?: continue
+                        if (viewHolder !is ParentViewHolder) continue
+
+                        val absolutePosition = viewHolder.bindingAdapterPosition
                         if (absolutePosition >= position && absolutePosition < position + count) {
-                            val expand = items.getOrNull(absolutePosition) ?: continue
-                            if (viewHolder is ParentViewHolder) {
-                                missingUpdates -= absolutePosition
-                                if (viewHolder.title.text == expand.list.name) {
-                                    viewHolder.update(expand)
-                                } else {
-                                    viewHolder.bind(expand)
-                                }
+                            val expand = items.getOrNull(absolutePosition - delta) ?: continue
+                            missingUpdates -= absolutePosition
+                            //println("Updating ${viewHolder.title.text} ($absolutePosition $position) -> ${expand.list.name}")
+                            if (viewHolder.title.text == expand.list.name) {
+                                viewHolder.update(expand)
+                            } else {
+                                viewHolder.bind(expand)
                             }
                         }
                     }
@@ -120,7 +166,8 @@ class ParentItemAdapter(
                     for (i in missingUpdates) {
                         mAdapter.notifyItemChanged(i, payload)
                     }
-                } ?: run { // in case we don't have a nice
+                } ?: run {
+                    // in case we don't have a nice
                     mAdapter.notifyItemRangeChanged(position, count, payload)
                 }
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
new file mode 100644
index 00000000..c84b861a
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
@@ -0,0 +1,581 @@
+package com.lagradost.cloudstream3.ui.home
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import androidx.appcompat.widget.SearchView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipDrawable
+import com.lagradost.cloudstream3.APIHolder.getId
+import com.lagradost.cloudstream3.AcraApplication
+import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
+import com.lagradost.cloudstream3.ui.result.ResultViewModel2
+import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
+import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
+import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_SHOW_METADATA
+import com.lagradost.cloudstream3.ui.search.SearchClickCallback
+import com.lagradost.cloudstream3.ui.search.SearchHelper
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
+import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectStringRes
+import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import kotlinx.android.synthetic.main.activity_main_tv.view.*
+import kotlinx.android.synthetic.main.fragment_home_head.view.*
+import kotlinx.android.synthetic.main.fragment_home_head.view.home_bookmarked_child_recyclerview
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.*
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_bookmarked_holder
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_plan_to_watch_btt
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_viewpager
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_completed_btt
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_dropped_btt
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_on_hold_btt
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_watching_btt
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_watch_child_recyclerview
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_watch_holder
+import kotlinx.android.synthetic.main.fragment_setup_media.*
+import java.util.ArrayList
+
+class HomeParentItemAdapterPreview(
+    items: MutableList<HomeViewModel.ExpandableHomepageList>,
+    val clickCallback: (SearchClickCallback) -> Unit,
+    moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit,
+    expandCallback: ((String) -> Unit)? = null,
+    private val loadCallback: (LoadClickCallback) -> Unit,
+    private val loadMoreCallback: (() -> Unit),
+    private val changeHomePageCallback: ((View) -> Unit),
+    private val reloadStored: (() -> Unit),
+    private val loadStoredData: ((Set<WatchType>) -> Unit),
+    private val searchQueryCallback: ((Pair<Boolean, String>) -> Unit)
+) : ParentItemAdapter(items, clickCallback, moreInfoClickCallback, expandCallback) {
+    private var previewData: Resource<Pair<Boolean, List<LoadResponse>>> = Resource.Loading()
+    private var resumeWatchingData: List<SearchResponse> = listOf()
+    private var bookmarkData: Pair<Boolean, List<SearchResponse>> =
+        false to listOf()
+
+    val headItems = 1
+
+    private var availableWatchStatusTypes: Pair<Set<WatchType>, Set<WatchType>> =
+        setOf<WatchType>() to setOf()
+
+    fun setAvailableWatchStatusTypes(data: Pair<Set<WatchType>, Set<WatchType>>) {
+        availableWatchStatusTypes = data
+        holder?.setAvailableWatchStatusTypes(data)
+    }
+
+    companion object {
+        private const val VIEW_TYPE_HEADER = 4815
+        private const val VIEW_TYPE_ITEM = 1623
+    }
+
+    fun setResumeWatchingData(resumeWatching: List<SearchResponse>) {
+        resumeWatchingData = resumeWatching
+        holder?.updateResume(resumeWatchingData)
+    }
+
+    fun setPreviewData(preview: Resource<Pair<Boolean, List<LoadResponse>>>) {
+        previewData = preview
+        holder?.updatePreview(preview)
+        //notifyItemChanged(0)
+    }
+
+    fun setBookmarkData(data: Pair<Boolean, List<SearchResponse>>) {
+        bookmarkData = data
+        holder?.updateBookmarks(data)
+    }
+
+    override fun getItemViewType(position: Int) = when (position) {
+        0 -> VIEW_TYPE_HEADER
+        else -> VIEW_TYPE_ITEM
+    }
+
+    var holder: HeaderViewHolder? = null
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> {
+                holder.updatePreview(previewData)
+                holder.updateResume(resumeWatchingData)
+                holder.updateBookmarks(bookmarkData)
+                holder.setAvailableWatchStatusTypes(availableWatchStatusTypes)
+            }
+            else -> super.onBindViewHolder(holder, position - 1)
+        }
+    }
+
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        return when (viewType) {
+            VIEW_TYPE_HEADER -> HeaderViewHolder(
+                LayoutInflater.from(parent.context).inflate(
+                    if (isTvSettings()) R.layout.fragment_home_head_tv else R.layout.fragment_home_head,
+                    parent,
+                    false
+                ),
+                loadCallback,
+                loadMoreCallback,
+                changeHomePageCallback,
+                clickCallback,
+                reloadStored,
+                loadStoredData,
+                searchQueryCallback
+            ).also {
+                this.holder = it
+            }
+            VIEW_TYPE_ITEM -> super.onCreateViewHolder(parent, viewType)
+            else -> error("Unhandled viewType=$viewType")
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return super.getItemCount() + headItems
+    }
+
+    override fun getItemId(position: Int): Long {
+        if (position == 0) return previewData.hashCode().toLong()
+        return super.getItemId(position - headItems)
+    }
+
+    override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
+        when (holder) {
+            is HeaderViewHolder -> {
+                holder.onViewDetachedFromWindow()
+            }
+            else -> super.onViewDetachedFromWindow(holder)
+        }
+    }
+
+    override fun onViewAttachedToWindow(holder: RecyclerView.ViewHolder) {
+        when (holder) {
+            is HeaderViewHolder -> {
+                holder.onViewAttachedToWindow()
+            }
+            else -> super.onViewAttachedToWindow(holder)
+        }
+    }
+
+
+    class HeaderViewHolder
+    constructor(
+        itemView: View,
+        private val clickCallback: ((LoadClickCallback) -> Unit)?,
+        private val loadMoreCallback: (() -> Unit),
+        private val changeHomePageCallback: ((View) -> Unit),
+        private val searchClickCallback: (SearchClickCallback) -> Unit,
+        private val reloadStored: () -> Unit,
+        private val loadStoredData: ((Set<WatchType>) -> Unit),
+        private val searchQueryCallback: ((Pair<Boolean, String>) -> Unit)
+    ) : RecyclerView.ViewHolder(itemView) {
+        private var previewAdapter: HomeScrollAdapter? = null
+        private val previewViewpager: ViewPager2? = itemView.home_preview_viewpager
+        private val previewHeader: LinearLayout? = itemView.home_preview
+        private val previewCallback: ViewPager2.OnPageChangeCallback =
+            object : ViewPager2.OnPageChangeCallback() {
+                override fun onPageSelected(position: Int) {
+                    // home_search?.isIconified = true
+                    //home_search?.isVisible = true
+                    //home_search?.clearFocus()
+
+                    previewAdapter?.apply {
+                        if (position >= itemCount - 1 && hasMoreItems) {
+                            hasMoreItems = false // dont make two requests
+                            loadMoreCallback()
+                            //homeViewModel.loadMoreHomeScrollResponses()
+                        }
+                    }
+                    previewAdapter?.getItem(position)
+                        ?.apply {
+                            //itemView.home_preview_title_holder?.let { parent ->
+                            //    TransitionManager.beginDelayedTransition(
+                            //        parent,
+                            //        ChangeBounds()
+                            //    )
+                            //}
+                            itemView.home_preview_description?.isGone =
+                                this.plot.isNullOrBlank()
+                            itemView.home_preview_description?.text =
+                                this.plot ?: ""
+                            itemView.home_preview_text?.text = this.name
+                            itemView.home_preview_change_api?.text = apiName
+                            itemView.home_preview_change_api?.setOnClickListener { view ->
+                                changeHomePageCallback(view)
+                            }
+                            itemView.home_preview_tags?.apply {
+                                removeAllViews()
+                                tags?.forEach { tag ->
+                                    val chip = Chip(context)
+                                    val chipDrawable =
+                                        ChipDrawable.createFromAttributes(
+                                            context,
+                                            null,
+                                            0,
+                                            R.style.ChipFilledSemiTransparent
+                                        )
+                                    chip.setChipDrawable(chipDrawable)
+                                    chip.text = tag
+                                    chip.isChecked = false
+                                    chip.isCheckable = false
+                                    chip.isFocusable = false
+                                    chip.isClickable = false
+                                    addView(chip)
+                                }
+                            }
+                            itemView.home_preview_tags?.isGone =
+                                tags.isNullOrEmpty()
+                            itemView.home_preview_image?.setImage(
+                                posterUrl,
+                                posterHeaders
+                            )
+                            //  itemView.home_preview_title?.text = name
+
+                            itemView.home_preview_play?.setOnClickListener { view ->
+                                clickCallback?.invoke(
+                                    LoadClickCallback(
+                                        START_ACTION_RESUME_LATEST,
+                                        view,
+                                        position,
+                                        this
+                                    )
+                                )
+                            }
+                            itemView.home_preview_info?.setOnClickListener { view ->
+                                clickCallback?.invoke(
+                                    LoadClickCallback(0, view, position, this)
+                                )
+                            }
+
+                            itemView.home_preview_play_btt?.setOnClickListener { view ->
+                                clickCallback?.invoke(
+                                    LoadClickCallback(
+                                        START_ACTION_RESUME_LATEST,
+                                        view,
+                                        position,
+                                        this
+                                    )
+                                )
+                            }
+                            itemView.home_preview_info_btt?.setOnClickListener { view ->
+                                clickCallback?.invoke(
+                                    LoadClickCallback(0, view, position, this)
+                                )
+                            }
+                            itemView.home_preview_hidden_next_focus?.setOnFocusChangeListener { _, hasFocus ->
+                                if (hasFocus) {
+                                    previewViewpager?.apply {
+                                        setCurrentItem(currentItem + 1, true)
+                                    }
+                                    itemView.home_preview_info_btt?.requestFocus()
+                                }
+                            }
+                            itemView.home_preview_hidden_prev_focus?.setOnFocusChangeListener { _, hasFocus ->
+                                if (hasFocus) {
+                                    previewViewpager?.apply {
+                                        if (currentItem <= 0) {
+                                            nav_rail_view?.menu?.getItem(0)?.actionView?.requestFocus()
+                                        } else {
+                                            setCurrentItem(currentItem - 1, true)
+                                            itemView.home_preview_play_btt?.requestFocus()
+                                        }
+                                    }
+                                }
+                            }
+                            // very ugly code, but I dont care
+                            val watchType =
+                                DataStoreHelper.getResultWatchState(this.getId())
+                            itemView.home_preview_bookmark?.setText(watchType.stringRes)
+                            itemView.home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
+                                null,
+                                ContextCompat.getDrawable(
+                                    itemView.home_preview_bookmark.context,
+                                    watchType.iconRes
+                                ),
+                                null,
+                                null
+                            )
+                            itemView.home_preview_bookmark?.setOnClickListener { fab ->
+                                fab.context.getActivity()?.showBottomDialog(
+                                    WatchType.values()
+                                        .map { fab.context.getString(it.stringRes) }
+                                        .toList(),
+                                    DataStoreHelper.getResultWatchState(this.getId()).ordinal,
+                                    fab.context.getString(R.string.action_add_to_bookmarks),
+                                    showApply = false,
+                                    {}) {
+                                    val newValue = WatchType.values()[it]
+                                    itemView.home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
+                                        null,
+                                        ContextCompat.getDrawable(
+                                            itemView.home_preview_bookmark.context,
+                                            newValue.iconRes
+                                        ),
+                                        null,
+                                        null
+                                    )
+                                    itemView.home_preview_bookmark?.setText(newValue.stringRes)
+
+                                    ResultViewModel2.updateWatchStatus(
+                                        this,
+                                        newValue
+                                    )
+                                    reloadStored()
+                                }
+                            }
+                        }
+                }
+            }
+
+        private var resumeAdapter: HomeChildItemAdapter? = null
+        private var resumeHolder: View? = itemView.home_watch_holder
+        private var resumeRecyclerView: RecyclerView? = itemView.home_watch_child_recyclerview
+
+        private var bookmarkHolder: View? = itemView.home_bookmarked_holder
+        private var bookmarkAdapter: HomeChildItemAdapter? = null
+        private var bookmarkRecyclerView: RecyclerView? =
+            itemView.home_bookmarked_child_recyclerview
+
+        fun onViewDetachedFromWindow() {
+            previewViewpager?.unregisterOnPageChangeCallback(previewCallback)
+        }
+
+        fun onViewAttachedToWindow() {
+            previewViewpager?.registerOnPageChangeCallback(previewCallback)
+        }
+
+        private val toggleList = listOf(
+            Pair(itemView.home_type_watching_btt, WatchType.WATCHING),
+            Pair(itemView.home_type_completed_btt, WatchType.COMPLETED),
+            Pair(itemView.home_type_dropped_btt, WatchType.DROPPED),
+            Pair(itemView.home_type_on_hold_btt, WatchType.ONHOLD),
+            Pair(itemView.home_plan_to_watch_btt, WatchType.PLANTOWATCH),
+        )
+
+        init {
+            previewViewpager?.apply {
+                if (!isTvSettings())
+                    setPageTransformer(HomeScrollTransformer())
+                else
+                    setPageTransformer(null)
+
+                if (adapter == null)
+                    adapter = HomeScrollAdapter(
+                        if (isTvSettings()) R.layout.home_scroll_view_tv else R.layout.home_scroll_view,
+                        if (isTvSettings()) true else null
+                    )
+            }
+            previewAdapter = previewViewpager?.adapter as? HomeScrollAdapter?
+            previewViewpager?.registerOnPageChangeCallback(previewCallback)
+
+            if (resumeAdapter == null) {
+                resumeRecyclerView?.adapter = HomeChildItemAdapter(
+                    ArrayList(),
+                    nextFocusUp = itemView.nextFocusUpId,
+                    nextFocusDown = itemView.nextFocusDownId
+                ) { callback ->
+                    if (callback.action != SEARCH_ACTION_SHOW_METADATA) {
+                        searchClickCallback(callback)
+                        return@HomeChildItemAdapter
+                    }
+                    callback.view.context?.getActivity()?.showOptionSelectStringRes(
+                        callback.view,
+                        callback.card.posterUrl,
+                        listOf(
+                            R.string.action_open_watching,
+                            R.string.action_remove_watching
+                        ),
+                        listOf(
+                            R.string.action_open_play,
+                            R.string.action_open_watching,
+                            R.string.action_remove_watching
+                        )
+                    ) { (isTv, actionId) ->
+                        when (actionId + if (isTv) 0 else 1) {
+                            // play
+                            0 -> {
+                                searchClickCallback.invoke(
+                                    SearchClickCallback(
+                                        START_ACTION_RESUME_LATEST,
+                                        callback.view,
+                                        -1,
+                                        callback.card
+                                    )
+                                )
+                                reloadStored()
+                            }
+                            //info
+                            1 -> {
+                                searchClickCallback(
+                                    SearchClickCallback(
+                                        SEARCH_ACTION_LOAD,
+                                        callback.view,
+                                        -1,
+                                        callback.card
+                                    )
+                                )
+
+                                reloadStored()
+                            }
+                            // remove
+                            2 -> {
+                                val card = callback.card
+                                if (card is DataStoreHelper.ResumeWatchingResult) {
+                                    DataStoreHelper.removeLastWatched(card.parentId)
+                                    reloadStored()
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            resumeAdapter = resumeRecyclerView?.adapter as? HomeChildItemAdapter
+            if (bookmarkAdapter == null) {
+                bookmarkRecyclerView?.adapter = HomeChildItemAdapter(
+                    ArrayList(),
+                    nextFocusUp = itemView.nextFocusUpId,
+                    nextFocusDown = itemView.nextFocusDownId
+                ) { callback ->
+                    if (callback.action != SEARCH_ACTION_SHOW_METADATA) {
+                        searchClickCallback(callback)
+                        return@HomeChildItemAdapter
+                    }
+                    callback.view.context?.getActivity()?.showOptionSelectStringRes(
+                        callback.view,
+                        callback.card.posterUrl,
+                        listOf(
+                            R.string.action_open_watching,
+                            R.string.action_remove_from_bookmarks,
+                        ),
+                        listOf(
+                            R.string.action_open_play,
+                            R.string.action_open_watching,
+                            R.string.action_remove_from_bookmarks
+                        )
+                    ) { (isTv, actionId) ->
+                        when (actionId + if (isTv) 0 else 1) { // play
+                            0 -> {
+                                searchClickCallback.invoke(
+                                    SearchClickCallback(
+                                        START_ACTION_RESUME_LATEST,
+                                        callback.view,
+                                        -1,
+                                        callback.card
+                                    )
+                                )
+                                reloadStored()
+                            }
+                            1 -> { // info
+                                searchClickCallback(
+                                    SearchClickCallback(
+                                        SEARCH_ACTION_LOAD,
+                                        callback.view,
+                                        -1,
+                                        callback.card
+                                    )
+                                )
+
+                                reloadStored()
+                            }
+                            2 -> { // remove
+                                DataStoreHelper.setResultWatchState(
+                                    callback.card.id,
+                                    WatchType.NONE.internalId
+                                )
+                                reloadStored()
+                            }
+                        }
+                    }
+                }
+            }
+            bookmarkAdapter = bookmarkRecyclerView?.adapter as? HomeChildItemAdapter
+
+            for ((chip, watch) in toggleList) {
+                chip?.isChecked = false
+                chip?.setOnCheckedChangeListener { _, isChecked ->
+                    if (isChecked) {
+                        loadStoredData(
+                            setOf(watch)
+                            // If we filter all buttons then two can be checked at the same time
+                            // Revert this if you want to go back to multi selection
+//                    toggleList.filter { it.first?.isChecked == true }.map { it.second }.toSet()
+                        )
+                    }
+                    // Else if all are unchecked -> Do not load data
+                    else if (toggleList.all { it.first?.isChecked != true }) {
+                        loadStoredData(emptySet())
+                    }
+                }
+            }
+
+            itemView.home_search?.context?.fixPaddingStatusbar(itemView.home_search)
+
+            itemView.home_search?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String): Boolean {
+                    searchQueryCallback.invoke(false to query)
+                    //QuickSearchFragment.pushSearch(activity, query, currentApiName?.let { arrayOf(it) }
+                    return true
+                }
+
+                override fun onQueryTextChange(newText: String): Boolean {
+                    searchQueryCallback.invoke(true to newText)
+                    //searchViewModel.quickSearch(newText)
+                    return true
+                }
+            })
+        }
+
+        fun updatePreview(preview: Resource<Pair<Boolean, List<LoadResponse>>>) {
+            when (preview) {
+                is Resource.Success -> {
+                    previewHeader?.isVisible = true
+                    if (true != previewAdapter?.setItems(
+                            preview.value.second,
+                            preview.value.first
+                        )
+                    ) {
+                        previewViewpager?.setCurrentItem(0, false)
+                    }
+                }
+                else -> {
+                    previewHeader?.isVisible = false
+
+                    previewAdapter?.setItems(listOf(), false)
+                    previewViewpager?.setCurrentItem(0, false)
+                }
+            }
+        }
+
+        fun updateResume(resumeWatching: List<SearchResponse>) {
+            resumeHolder?.isVisible = resumeWatching.isNotEmpty()
+            resumeAdapter?.updateList(resumeWatching)
+        }
+
+        fun updateBookmarks(data: Pair<Boolean, List<SearchResponse>>) {
+            bookmarkHolder?.isVisible = true // data.first
+            bookmarkAdapter?.updateList(data.second)
+        }
+
+        fun setAvailableWatchStatusTypes(availableWatchStatusTypes: Pair<Set<WatchType>, Set<WatchType>>) {
+            for ((chip, watch) in toggleList) {
+                chip?.apply {
+                    isVisible = availableWatchStatusTypes.second.contains(watch)
+                    isChecked = availableWatchStatusTypes.first.contains(watch)
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
index 7ed074dc..f296e53d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
@@ -4,16 +4,22 @@ import android.content.res.Configuration
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.LayoutRes
 import androidx.core.view.isGone
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import kotlinx.android.synthetic.main.fragment_home_head_tv.*
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.*
 import kotlinx.android.synthetic.main.home_scroll_view.view.*
 
 
-class HomeScrollAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class HomeScrollAdapter(
+    @LayoutRes val layout: Int = R.layout.home_scroll_view,
+    private val forceHorizontalPosters: Boolean? = null
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private var items: MutableList<LoadResponse> = mutableListOf()
     var hasMoreItems: Boolean = false
 
@@ -40,7 +46,8 @@ class HomeScrollAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return CardViewHolder(
-            LayoutInflater.from(parent.context).inflate(R.layout.home_scroll_view, parent, false),
+            LayoutInflater.from(parent.context).inflate(layout, parent, false),
+            forceHorizontalPosters
         )
     }
 
@@ -55,13 +62,15 @@ class HomeScrollAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     class CardViewHolder
     constructor(
         itemView: View,
+        private val forceHorizontalPosters: Boolean? = null
     ) :
         RecyclerView.ViewHolder(itemView) {
 
         fun bind(card: LoadResponse) {
             card.apply {
                 val isHorizontal =
-                    itemView.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    (forceHorizontalPosters == true) || ((forceHorizontalPosters != false) && itemView.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE)
+
                 val posterUrl = if (isHorizontal) backgroundPosterUrl ?: posterUrl else posterUrl
                     ?: backgroundPosterUrl
                 itemView.home_scroll_preview_tags?.text = tags?.joinToString(" • ") ?: ""
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index 3bb196e2..58c01603 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -128,6 +128,7 @@ class HomeViewModel : ViewModel() {
         currentWatchTypes.remove(WatchType.NONE)
 
         if (currentWatchTypes.size <= 0) {
+            _availableWatchStatusTypes.postValue(setOf<WatchType>() to setOf())
             _bookmarks.postValue(Pair(false, ArrayList()))
             return@launchSafe
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 3efaeff8..6e7e341f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -921,8 +921,6 @@ open class ResultFragment : ResultTrailerPlayer() {
                         }
 
 
-                    result_tag?.removeAllViews()
-
                     d.comingSoon.let { soon ->
                         result_coming_soon?.isVisible = soon
                         result_data_holder?.isGone = soon
@@ -931,6 +929,7 @@ open class ResultFragment : ResultTrailerPlayer() {
                     val tags = d.tags
                     result_tag_holder?.isVisible = tags.isNotEmpty()
                     result_tag?.apply {
+                        removeAllViews()
                         tags.forEach { tag ->
                             val chip = Chip(context)
                             val chipDrawable = ChipDrawable.createFromAttributes(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
index c2523931..ddf559fc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
@@ -20,17 +20,23 @@ const val SEARCH_ACTION_SHOW_METADATA = 1
 const val SEARCH_ACTION_PLAY_FILE = 2
 const val SEARCH_ACTION_FOCUSED = 4
 
-class SearchClickCallback(val action: Int, val view: View, val position : Int, val card: SearchResponse)
+class SearchClickCallback(
+    val action: Int,
+    val view: View,
+    val position: Int,
+    val card: SearchResponse
+)
 
 class SearchAdapter(
     private val cardList: MutableList<SearchResponse>,
     private val resView: AutofitRecyclerView,
     private val clickCallback: (SearchClickCallback) -> Unit,
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-    var hasNext : Boolean = false
+    var hasNext: Boolean = false
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val layout = if(parent.context.IsBottomLayout()) R.layout.search_result_grid_expanded else R.layout.search_result_grid
+        val layout =
+            if (parent.context.IsBottomLayout()) R.layout.search_result_grid_expanded else R.layout.search_result_grid
         return CardViewHolder(
             LayoutInflater.from(parent.context).inflate(layout, parent, false),
             clickCallback,
@@ -71,7 +77,8 @@ class SearchAdapter(
         val cardView: ImageView = itemView.imageView
 
         private val compactView = false//itemView.context.getGridIsCompact()
-        private val coverHeight: Int = if (compactView) 80.toPx else (resView.itemWidth / 0.68).roundToInt()
+        private val coverHeight: Int =
+            if (compactView) 80.toPx else (resView.itemWidth / 0.68).roundToInt()
 
         fun bind(card: SearchResponse, position: Int) {
             if (!compactView) {
@@ -88,7 +95,10 @@ class SearchAdapter(
     }
 }
 
-class SearchResponseDiffCallback(private val oldList: List<SearchResponse>, private val newList: List<SearchResponse>) :
+class SearchResponseDiffCallback(
+    private val oldList: List<SearchResponse>,
+    private val newList: List<SearchResponse>
+) :
     DiffUtil.Callback() {
     override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
         oldList[oldItemPosition].name == newList[newItemPosition].name
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 4e59e6a0..9c6b62e8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -44,6 +44,7 @@ import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.loadHomepageLis
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.updateChips
 import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.setKey
@@ -93,7 +94,11 @@ class SearchFragment : Fragment() {
         activity?.window?.setSoftInputMode(
             WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
         )
-        return inflater.inflate(R.layout.fragment_search, container, false)
+        return inflater.inflate(
+            if (isTvSettings()) R.layout.fragment_search_tv else R.layout.fragment_search,
+            container,
+            false
+        )
     }
 
     private fun fixGrid() {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt
index b3bce446..2dc6846c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt
@@ -99,7 +99,8 @@ object SingleSelectionHelper {
         val textView = dialog.text1//.findViewById<TextView>(R.id.text1)!!
         val applyButton = dialog.apply_btt//.findViewById<TextView>(R.id.apply_btt)
         val cancelButton = dialog.cancel_btt//findViewById<TextView>(R.id.cancel_btt)
-        val applyHolder = dialog.apply_btt_holder//.findViewById<LinearLayout>(R.id.apply_btt_holder)
+        val applyHolder =
+            dialog.apply_btt_holder//.findViewById<LinearLayout>(R.id.apply_btt_holder)
 
         applyHolder?.isVisible = realShowApply
         if (!realShowApply) {
@@ -249,6 +250,17 @@ object SingleSelectionHelper {
         )
     }
 
+    fun showBottomDialog(
+        items: List<String>,
+        selectedIndex: Int,
+        name: String,
+        showApply: Boolean,
+        dismissCallback: () -> Unit,
+        callback: (Int) -> Unit,
+    ) {
+
+    }
+
     /** Only for a low amount of items */
     fun Activity?.showBottomDialog(
         items: List<String>,
diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml
index ff93af1f..916c761c 100644
--- a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:tint="?attr/white" android:viewportHeight="24"
     android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M15.41,16.59L10.83,12l4.58,-4.59L14,6l-6,6 6,6 1.41,-1.41z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M13.3,17.3 L8.7,12.7Q8.55,12.55 8.488,12.375Q8.425,12.2 8.425,12Q8.425,11.8 8.488,11.625Q8.55,11.45 8.7,11.3L13.3,6.7Q13.575,6.425 14,6.425Q14.425,6.425 14.7,6.7Q14.975,6.975 14.975,7.4Q14.975,7.825 14.7,8.1L10.8,12L14.7,15.9Q14.975,16.175 14.975,16.6Q14.975,17.025 14.7,17.3Q14.425,17.575 14,17.575Q13.575,17.575 13.3,17.3Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right_24.xml b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right_24.xml
index fc07eaae..ea924625 100644
--- a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right_24.xml
@@ -1,5 +1,11 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="?attr/white" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M8.59,16.59L13.17,12 8.59,7.41 10,6l6,6 -6,6 -1.41,-1.41z"/>
+<vector android:autoMirrored="true"
+    android:height="24dp"
+    android:tint="?attr/white"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M8.7,17.3Q8.425,17.025 8.425,16.6Q8.425,16.175 8.7,15.9L12.6,12L8.7,8.1Q8.425,7.825 8.425,7.4Q8.425,6.975 8.7,6.7Q8.975,6.425 9.4,6.425Q9.825,6.425 10.1,6.7L14.7,11.3Q14.85,11.45 14.913,11.625Q14.975,11.8 14.975,12Q14.975,12.2 14.913,12.375Q14.85,12.55 14.7,12.7L10.1,17.3Q9.825,17.575 9.4,17.575Q8.975,17.575 8.7,17.3Z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4905d454..ad29d22a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,10 +14,11 @@
 
         <com.google.android.material.navigationrail.NavigationRailView
             android:id="@+id/nav_rail_view"
-            android:layout_width="62dp"
+            android:layout_width="@dimen/navbar_width"
             android:layout_height="match_parent"
             android:background="?attr/primaryGrayBackground"
             app:itemIconTint="@color/item_select_color"
+            android:descendantFocusability="afterDescendants"
 
             app:itemTextColor="@color/item_select_color"
             app:labelVisibilityMode="unlabeled"
diff --git a/app/src/main/res/layout/activity_main_tv.xml b/app/src/main/res/layout/activity_main_tv.xml
index 930feec4..dc29dec9 100644
--- a/app/src/main/res/layout/activity_main_tv.xml
+++ b/app/src/main/res/layout/activity_main_tv.xml
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/homeRoot"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|keyboard|navigation"
-        android:paddingTop="0dp">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/homeRoot"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|keyboard|navigation"
+    android:paddingTop="0dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_height="match_parent"
-            android:layout_width="match_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/nav_host_fragment"
-                android:name="androidx.navigation.fragment.NavHostFragment"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:defaultNavHost="true"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintLeft_toRightOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/cast_mini_controller_holder"
-                app:navGraph="@navigation/mobile_navigation"
-                app:layout_constraintStart_toEndOf="@id/nav_rail_view"
-                app:layout_constraintEnd_toEndOf="parent" />
+            android:id="@+id/nav_host_fragment"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:defaultNavHost="true"
+            app:layout_constraintBottom_toTopOf="@id/cast_mini_controller_holder"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:navGraph="@navigation/mobile_navigation" />
 
         <com.google.android.material.navigationrail.NavigationRailView
-                android:layout_width="62dp"
-                android:layout_height="match_parent"
-                android:id="@+id/nav_rail_view"
-                android:background="?attr/primaryGrayBackground"
-                app:itemTextColor="@color/item_select_color"
-                app:itemIconTint="@color/item_select_color"
+            android:id="@+id/nav_rail_view"
+            android:layout_width="62dp"
+            
+            android:layout_height="match_parent"
+            android:background="?attr/primaryGrayBackground"
+            android:descendantFocusability="afterDescendants"
+            app:itemIconTint="@color/item_select_color"
+            app:itemTextColor="@color/item_select_color"
 
-                app:menuGravity="center"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:labelVisibilityMode="unlabeled"
-                app:menu="@menu/bottom_nav_menu">
+            app:labelVisibilityMode="unlabeled"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:menu="@menu/bottom_nav_menu"
+            app:menuGravity="center">
 
         </com.google.android.material.navigationrail.NavigationRailView>
 
         <LinearLayout
-                app:layout_constraintStart_toEndOf="@+id/nav_rail_view"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                tools:layout_height="100dp"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:id="@+id/cast_mini_controller_holder">
+            android:id="@+id/cast_mini_controller_holder"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/nav_rail_view"
+            tools:layout_height="100dp">
             <!--com.google.android.gms.cast.framework.media.widget.MiniControllerFragment-->
             <fragment
-                    app:customCastBackgroundColor="?attr/primaryGrayBackground"
-                    app:castControlButtons="@array/cast_mini_controller_control_buttons"
-                    android:id="@+id/cast_mini_controller"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    class="com.lagradost.cloudstream3.ui.MyMiniControllerFragment"
-                    tools:ignore="FragmentTagUsage" />
+                android:id="@+id/cast_mini_controller"
+                class="com.lagradost.cloudstream3.ui.MyMiniControllerFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                app:castControlButtons="@array/cast_mini_controller_control_buttons"
+                app:customCastBackgroundColor="?attr/primaryGrayBackground"
+                tools:ignore="FragmentTagUsage" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 7f8e2c01..eb38e262 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -153,435 +153,14 @@
             android:textColor="?attr/textColor" />
     </LinearLayout>
 
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/home_loaded"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/home_master_recycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/primaryBlackBackground"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <View
-                android:id="@+id/home_statusbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/primaryGrayBackground" />
-
-            <FrameLayout
-                android:id="@+id/home_settings_bar"
-
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:background="?attr/primaryGrayBackground"
-                android:visibility="gone">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-
-                    android:orientation="horizontal"
-                    android:paddingStart="10dp"
-
-                    android:paddingTop="10dp"
-                    android:paddingEnd="10dp"
-                    android:paddingBottom="10dp">
-
-                    <androidx.cardview.widget.CardView
-                        android:id="@+id/home_profile_picture_holder"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginEnd="10dp"
-                        app:cardCornerRadius="100dp">
-
-                        <ImageView
-                            android:id="@+id/home_profile_picture"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:scaleType="centerCrop"
-                            tools:ignore="ContentDescription" />
-                    </androidx.cardview.widget.CardView>
-
-                    <FrameLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center_vertical"
-                        android:background="@drawable/search_background"
-                        android:visibility="visible">
-
-                        <androidx.appcompat.widget.SearchView
-                            android:id="@+id/home_search2"
-                            android:layout_width="match_parent"
-
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center_vertical"
-                            android:iconifiedByDefault="false"
-                            android:paddingStart="-10dp"
-                            app:iconifiedByDefault="false"
-                            app:queryBackground="@color/transparent"
-                            app:queryHint="@string/search_hint"
-                            app:searchIcon="@drawable/search_icon"
-                            tools:ignore="RtlSymmetry" />
-                    </FrameLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:visibility="gone">
-
-                        <TextView
-                            android:id="@+id/home_provider_name"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:gravity="center_vertical"
-                            android:textColor="?attr/textColor"
-                            android:textSize="20sp"
-
-                            tools:text="Hello World" />
-
-                        <TextView
-                            android:id="@+id/home_provider_meta_info"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:gravity="center_vertical"
-                            android:textColor="?attr/grayTextColor"
-                            android:textSize="14sp"
-                            tools:text="Hello World" />
-                    </LinearLayout>
-                </LinearLayout>
-
-                <!--
-                                <ImageView
-                                        android:nextFocusDown="@id/home_main_poster_recyclerview"
-                                        android:nextFocusUp="@id/nav_rail_view"
-                                        android:nextFocusLeft="@id/nav_rail_view"
-
-                                        android:id="@+id/home_change_api"
-                                        android:layout_margin="10dp"
-                                        android:layout_gravity="center|end"
-                                        android:background="?android:attr/selectableItemBackgroundBorderless"
-
-                                        android:src="@drawable/ic_baseline_keyboard_arrow_down_24"
-                                        android:layout_width="30dp"
-                                        android:layout_height="30dp"
-                                        android:contentDescription="@string/home_change_provider_img_des">
-
-                                    <requestFocus />
-                                </ImageView>-->
-            </FrameLayout>
-            <!--https://www.digitalocean.com/community/tutorials/android-viewpager-example-tutorial-->
-            <FrameLayout
-                android:id="@+id/home_preview"
-                android:layout_width="match_parent"
-                android:layout_height="500dp"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <androidx.viewpager2.widget.ViewPager2
-                    android:id="@+id/home_preview_viewpager"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal">
-
-                </androidx.viewpager2.widget.ViewPager2>
-
-                <ImageView
-                    android:id="@+id/home_preview_image"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:alpha="0.8"
-                    android:scaleType="centerCrop"
-                    android:visibility="gone"
-                    tools:src="@drawable/example_poster" />
-
-                <LinearLayout
-                    android:id="@+id/home_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <androidx.appcompat.widget.SearchView
-                        android:id="@+id/home_search"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="start"
-                        android:editTextColor="@color/white"
-                        android:gravity="start"
-                        android:iconifiedByDefault="true"
-                        android:textColor="@color/white"
-                        android:textColorHint="@color/white"
-                        app:iconifiedByDefault="true"
-                        app:queryBackground="@color/transparent"
-                        app:queryHint="@string/search"
-                        app:closeIcon="@drawable/ic_baseline_close_24"
-
-                        app:searchIcon="@drawable/search_icon"
-                        tools:ignore="RtlSymmetry" />
-                </LinearLayout>
-
-                <!--
-                                <TextView
-                                    android:visibility="gone"
-                                    android:id="@+id/test_search"
-                                    android:background="?android:attr/selectableItemBackgroundBorderless"
-                                    android:layout_gravity="start"
-                                    android:gravity="center"
-
-                                    android:textSize="20dp"
-                                    android:layout_margin="20dp"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="@string/search"
-                                    android:textColor="@color/white"
-                                    app:drawableLeftCompat="@drawable/search_icon"
-                                    app:tint="@color/white" />
-                -->
-
-                <LinearLayout
-
-                    android:id="@+id/home_preview_title_holder"
-                    android:layout_width="match_parent"
-                    android:layout_height="100dp"
-                    android:layout_gravity="bottom"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:orientation="horizontal"
-                        android:padding="20dp">
-
-                        <TextView
-                            android:id="@+id/home_preview_bookmark"
-                            android:layout_width="70dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginStart="25dp"
-                            android:layout_marginEnd="25dp"
-                            android:background="?android:attr/selectableItemBackgroundBorderless"
-                            android:gravity="center"
-                            android:text="@string/none"
-                            android:textColor="?attr/white"
-                            app:drawableTint="?attr/white"
-                            app:drawableTopCompat="@drawable/ic_baseline_add_24"
-                            app:tint="?attr/white" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/home_preview_play"
-                            style="@style/WhiteButton"
-                            android:layout_width="wrap_content"
-                            android:layout_gravity="center"
-
-                            android:text="@string/home_play"
-                            app:icon="@drawable/ic_baseline_play_arrow_24" />
-
-                        <TextView
-                            android:id="@+id/home_preview_info"
-                            android:layout_width="70dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginStart="25dp"
-                            android:layout_marginEnd="25dp"
-                            android:background="?android:attr/selectableItemBackgroundBorderless"
-                            android:gravity="center"
-                            android:text="@string/home_info"
-                            android:textColor="?attr/white"
-                            app:drawableTint="?attr/white"
-                            app:drawableTopCompat="@drawable/ic_outline_info_24"
-                            app:tint="?attr/white" />
-                    </LinearLayout>
-                </LinearLayout>
-            </FrameLayout>
-
-            <View
-                android:id="@+id/home_fix_padding"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"></View>
-            <!--
-            All padding in home_watch_holder is determined in runtime
-            This is because the home poster can be invisible which forces
-            us to take the status bar space into account
-            -->
-            <LinearLayout
-                android:id="@+id/home_watch_holder"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <FrameLayout
-                    android:id="@+id/home_watch_child_more_info"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-
-                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                    android:nextFocusLeft="@id/nav_rail_view"
-                    android:nextFocusDown="@id/home_watch_child_recyclerview"
-                    android:padding="12dp">
-
-                    <TextView
-                        android:id="@+id/home_watch_parent_item_title"
-                        style="@style/WatchHeaderText"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/continue_watching" />
-
-                    <ImageView
-                        android:layout_width="30dp"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="end|center_vertical"
-                        android:layout_marginEnd="5dp"
-                        android:contentDescription="@string/home_more_info"
-                        android:src="@drawable/ic_baseline_arrow_forward_24"
-                        app:tint="?attr/textColor" />
-                </FrameLayout>
-
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/home_watch_child_recyclerview"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clipToPadding="false"
-                    android:descendantFocusability="afterDescendants"
-                    android:orientation="horizontal"
-                    android:paddingHorizontal="5dp"
-                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                    tools:listitem="@layout/home_result_grid" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/home_bookmarked_holder"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <FrameLayout
-                    android:id="@+id/home_bookmarked_child_more_info"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-
-                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                    android:nextFocusLeft="@id/nav_rail_view"
-                    android:nextFocusUp="@id/home_watch_child_recyclerview"
-                    android:nextFocusForward="@id/home_bookmarked_child_recyclerview"
-                    android:paddingStart="12dp"
-                    android:paddingTop="5dp"
-                    android:paddingEnd="12dp"
-                    android:paddingBottom="5dp">
-
-                    <HorizontalScrollView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="50dp"
-                        android:fadingEdge="horizontal"
-                        android:requiresFadingEdge="horizontal">
-
-                        <com.google.android.material.chip.ChipGroup
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            app:singleSelection="true">
-
-                            <com.google.android.material.chip.Chip
-                                android:id="@+id/home_type_watching_btt"
-                                style="@style/ChipFilled"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-
-                                android:nextFocusLeft="@id/nav_rail_view"
-                                android:nextFocusRight="@id/home_plan_to_watch_btt"
-                                android:text="@string/type_watching" />
-
-                            <com.google.android.material.chip.Chip
-                                android:id="@+id/home_plan_to_watch_btt"
-                                style="@style/ChipFilled"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-
-                                android:nextFocusLeft="@id/home_type_watching_btt"
-                                android:nextFocusRight="@id/home_type_on_hold_btt"
-                                android:text="@string/type_plan_to_watch" />
-
-                            <com.google.android.material.chip.Chip
-                                android:id="@+id/home_type_on_hold_btt"
-                                style="@style/ChipFilled"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-
-                                android:nextFocusLeft="@id/home_plan_to_watch_btt"
-                                android:nextFocusRight="@id/home_type_dropped_btt"
-                                android:text="@string/type_on_hold" />
-
-                            <com.google.android.material.chip.Chip
-                                android:id="@+id/home_type_dropped_btt"
-                                style="@style/ChipFilled"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-
-                                android:nextFocusLeft="@id/home_type_on_hold_btt"
-                                android:nextFocusRight="@id/home_type_completed_btt"
-                                android:text="@string/type_dropped" />
-
-                            <com.google.android.material.chip.Chip
-                                android:id="@+id/home_type_completed_btt"
-                                style="@style/ChipFilled"
-                                android:layout_width="wrap_content"
-
-                                android:layout_height="wrap_content"
-                                android:nextFocusLeft="@id/home_type_dropped_btt"
-                                android:text="@string/type_completed" />
-                        </com.google.android.material.chip.ChipGroup>
-                    </HorizontalScrollView>
-
-                    <ImageView
-                        android:layout_width="30dp"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="end|center_vertical"
-                        android:layout_marginEnd="5dp"
-                        android:contentDescription="@string/home_more_info"
-                        android:src="@drawable/ic_baseline_arrow_forward_24"
-                        app:tint="?attr/textColor" />
-                </FrameLayout>
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/home_bookmarked_child_recyclerview"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-
-                    android:clipToPadding="false"
-                    android:descendantFocusability="afterDescendants"
-                    android:orientation="horizontal"
-                    android:paddingHorizontal="5dp"
-                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                    tools:listitem="@layout/home_result_grid" />
-            </LinearLayout>
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/home_master_recycler"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:descendantFocusability="afterDescendants"
-                android:nextFocusLeft="@id/nav_rail_view"
-                tools:listitem="@layout/homepage_parent" />
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+        android:layout_height="wrap_content"
+        android:descendantFocusability="afterDescendants"
+        android:nextFocusLeft="@id/nav_rail_view"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:listitem="@layout/homepage_parent" />
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/home_api_fab"
diff --git a/app/src/main/res/layout/fragment_home_head.xml b/app/src/main/res/layout/fragment_home_head.xml
new file mode 100644
index 00000000..67474b69
--- /dev/null
+++ b/app/src/main/res/layout/fragment_home_head.xml
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:orientation="vertical"
+    android:id="@+id/home_preview"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/primaryBlackBackground"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="500dp">
+
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/home_preview_viewpager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+        </androidx.viewpager2.widget.ViewPager2>
+
+        <ImageView
+            android:id="@+id/home_preview_image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:alpha="0.8"
+            android:scaleType="centerCrop"
+            android:visibility="gone"
+            tools:src="@drawable/example_poster" />
+
+        <LinearLayout
+            android:id="@+id/home_padding"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <androidx.appcompat.widget.SearchView
+                android:id="@+id/home_search"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:editTextColor="@color/white"
+                android:gravity="start"
+                android:iconifiedByDefault="true"
+                android:textColor="@color/white"
+                android:textColorHint="@color/white"
+                app:iconifiedByDefault="true"
+                app:queryBackground="@color/transparent"
+                app:queryHint="@string/search_hint"
+                app:closeIcon="@drawable/ic_baseline_close_24"
+
+                app:searchIcon="@drawable/search_icon"
+                tools:ignore="RtlSymmetry" />
+        </LinearLayout>
+
+        <!--
+                        <TextView
+                            android:visibility="gone"
+                            android:id="@+id/test_search"
+                            android:background="?android:attr/selectableItemBackgroundBorderless"
+                            android:layout_gravity="start"
+                            android:gravity="center"
+
+                            android:textSize="20dp"
+                            android:layout_margin="20dp"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/search"
+                            android:textColor="@color/white"
+                            app:drawableLeftCompat="@drawable/search_icon"
+                            app:tint="@color/white" />
+        -->
+
+        <LinearLayout
+
+            android:id="@+id/home_preview_title_holder"
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:layout_gravity="bottom"
+            android:gravity="center"
+            android:orientation="vertical">
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:padding="20dp">
+
+                <TextView
+                    android:id="@+id/home_preview_bookmark"
+                    android:layout_width="70dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="25dp"
+                    android:layout_marginEnd="25dp"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:gravity="center"
+                    android:text="@string/none"
+                    android:textColor="?attr/white"
+                    app:drawableTint="?attr/white"
+                    app:drawableTopCompat="@drawable/ic_baseline_add_24"
+                    app:tint="?attr/white" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/home_preview_play"
+                    style="@style/WhiteButton"
+                    android:layout_width="wrap_content"
+                    android:layout_gravity="center"
+
+                    android:text="@string/home_play"
+                    app:icon="@drawable/ic_baseline_play_arrow_24" />
+
+                <TextView
+                    android:id="@+id/home_preview_info"
+                    android:layout_width="70dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="25dp"
+                    android:layout_marginEnd="25dp"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:gravity="center"
+                    android:text="@string/home_info"
+                    android:textColor="?attr/white"
+                    app:drawableTint="?attr/white"
+                    app:drawableTopCompat="@drawable/ic_outline_info_24"
+                    app:tint="?attr/white" />
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
+
+
+    <LinearLayout
+        android:id="@+id/home_watch_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <TextView
+            android:id="@+id/home_watch_parent_item_title"
+
+            style="@style/WatchHeaderText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="0dp"
+            android:padding="12dp"
+            android:text="@string/continue_watching" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/home_watch_child_recyclerview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:descendantFocusability="afterDescendants"
+            android:orientation="horizontal"
+            android:paddingEnd="5dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/home_result_grid" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/home_bookmarked_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fadingEdge="horizontal"
+
+            android:foreground="?android:attr/selectableItemBackgroundBorderless"
+            android:nextFocusLeft="@id/nav_rail_view"
+            android:nextFocusUp="@id/home_watch_child_recyclerview"
+            android:nextFocusForward="@id/home_bookmarked_child_recyclerview"
+            android:paddingStart="12dp"
+            android:paddingTop="5dp"
+            android:paddingEnd="12dp"
+
+            android:paddingBottom="5dp"
+            android:requiresFadingEdge="horizontal">
+
+            <com.google.android.material.chip.ChipGroup
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/home_type_watching_btt"
+                    style="@style/ChipFilled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:nextFocusLeft="@id/nav_rail_view"
+                    android:nextFocusRight="@id/home_plan_to_watch_btt"
+                    android:text="@string/type_watching" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/home_plan_to_watch_btt"
+                    style="@style/ChipFilled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:nextFocusLeft="@id/home_type_watching_btt"
+                    android:nextFocusRight="@id/home_type_on_hold_btt"
+                    android:text="@string/type_plan_to_watch" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/home_type_on_hold_btt"
+                    style="@style/ChipFilled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:nextFocusLeft="@id/home_plan_to_watch_btt"
+                    android:nextFocusRight="@id/home_type_dropped_btt"
+                    android:text="@string/type_on_hold" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/home_type_dropped_btt"
+                    style="@style/ChipFilled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:nextFocusLeft="@id/home_type_on_hold_btt"
+                    android:nextFocusRight="@id/home_type_completed_btt"
+                    android:text="@string/type_dropped" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/home_type_completed_btt"
+                    style="@style/ChipFilled"
+                    android:layout_width="wrap_content"
+
+                    android:layout_height="wrap_content"
+                    android:nextFocusLeft="@id/home_type_dropped_btt"
+                    android:text="@string/type_completed" />
+            </com.google.android.material.chip.ChipGroup>
+        </HorizontalScrollView>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/home_bookmarked_child_recyclerview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+
+            android:descendantFocusability="afterDescendants"
+            android:orientation="horizontal"
+            android:paddingEnd="5dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/home_result_grid" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home_head_tv.xml b/app/src/main/res/layout/fragment_home_head_tv.xml
new file mode 100644
index 00000000..5992ac91
--- /dev/null
+++ b/app/src/main/res/layout/fragment_home_head_tv.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:orientation="vertical"
+    android:id="@+id/home_preview"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/primaryBlackBackground"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/home_preview_viewpager"
+            android:layout_width="match_parent"
+            android:layout_height="400dp"
+            android:orientation="horizontal">
+
+        </androidx.viewpager2.widget.ViewPager2>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="5dp">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/home_preview_change_api"
+                style="@style/BlackButton"
+                android:layout_width="wrap_content"
+                android:layout_gravity="top|start"
+                android:layout_marginStart="@dimen/navbar_width"
+                android:backgroundTint="@color/semiWhite"
+                android:minWidth="150dp" />
+        </FrameLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="bottom"
+            android:layout_marginStart="@dimen/navbar_width"
+            android:gravity="bottom"
+            android:orientation="vertical"
+            android:padding="10dp">
+
+
+            <TextView
+                android:id="@+id/home_preview_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                tools:text="The Perfect Run" />
+
+            <TextView
+                android:id="@+id/home_preview_description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="5"
+                android:paddingBottom="5dp"
+                android:textSize="15sp"
+                tools:text="very nice tv series" />
+
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/home_preview_tags"
+                style="@style/ChipParent"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp">
+
+                <View
+                    android:id="@+id/home_preview_hidden_prev_focus"
+                    android:layout_width="1dp"
+                    android:layout_height="1dp"
+                    android:focusable="true" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/home_preview_play_btt"
+                    style="@style/WhiteButton"
+                    android:layout_width="wrap_content"
+                    android:layout_margin="0dp"
+                    android:minWidth="150dp"
+                    android:nextFocusLeft="@id/home_preview_hidden_prev_focus"
+                    android:nextFocusRight="@id/home_preview_info_btt"
+                    android:nextFocusUp="@id/home_preview_change_api"
+                    android:nextFocusDown="@id/home_watch_parent_item_title"
+                    android:text="@string/home_play"
+                    app:icon="@drawable/ic_baseline_play_arrow_24" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/home_preview_info_btt"
+                    style="@style/BlackButton"
+                    android:layout_width="wrap_content"
+                    android:minWidth="150dp"
+
+                    android:nextFocusLeft="@id/home_preview_play_btt"
+                    android:nextFocusRight="@id/home_preview_hidden_next_focus"
+                    android:nextFocusUp="@id/home_preview_change_api"
+                    android:nextFocusDown="@id/home_watch_parent_item_title"
+                    android:text="@string/home_info"
+                    app:icon="@drawable/ic_outline_info_24" />
+
+                <View
+                    android:id="@+id/home_preview_hidden_next_focus"
+                    android:layout_width="1dp"
+                    android:layout_height="1dp"
+                    android:focusable="true" />
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
+
+    <LinearLayout
+        android:id="@+id/home_watch_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <TextView
+            android:id="@+id/home_watch_parent_item_title"
+
+            style="@style/WatchHeaderText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/navbar_width"
+            android:layout_marginEnd="0dp"
+            android:padding="12dp"
+            android:text="@string/continue_watching" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/home_watch_child_recyclerview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:descendantFocusability="afterDescendants"
+            android:orientation="horizontal"
+            android:paddingStart="@dimen/navbar_width"
+            android:paddingEnd="5dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/home_result_grid" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/home_bookmarked_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fadingEdge="horizontal"
+
+            android:foreground="?android:attr/selectableItemBackgroundBorderless"
+            android:nextFocusLeft="@id/nav_rail_view"
+            android:nextFocusUp="@id/home_watch_child_recyclerview"
+            android:nextFocusForward="@id/home_bookmarked_child_recyclerview"
+            android:paddingStart="12dp"
+            android:paddingTop="5dp"
+            android:paddingEnd="12dp"
+
+            android:paddingBottom="5dp"
+            android:requiresFadingEdge="horizontal">
+
+            <com.google.android.material.chip.ChipGroup
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/navbar_width"
+                android:orientation="horizontal">
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/home_type_watching_btt"
+                    style="@style/ChipFilled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:nextFocusLeft="@id/nav_rail_view"
+                    android:nextFocusRight="@id/home_plan_to_watch_btt"
+                    android:text="@string/type_watching" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/home_plan_to_watch_btt"
+                    style="@style/ChipFilled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:nextFocusLeft="@id/home_type_watching_btt"
+                    android:nextFocusRight="@id/home_type_on_hold_btt"
+                    android:text="@string/type_plan_to_watch" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/home_type_on_hold_btt"
+                    style="@style/ChipFilled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:nextFocusLeft="@id/home_plan_to_watch_btt"
+                    android:nextFocusRight="@id/home_type_dropped_btt"
+                    android:text="@string/type_on_hold" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/home_type_dropped_btt"
+                    style="@style/ChipFilled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:nextFocusLeft="@id/home_type_on_hold_btt"
+                    android:nextFocusRight="@id/home_type_completed_btt"
+                    android:text="@string/type_dropped" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/home_type_completed_btt"
+                    style="@style/ChipFilled"
+                    android:layout_width="wrap_content"
+
+                    android:layout_height="wrap_content"
+                    android:nextFocusLeft="@id/home_type_dropped_btt"
+                    android:text="@string/type_completed" />
+            </com.google.android.material.chip.ChipGroup>
+        </HorizontalScrollView>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/home_bookmarked_child_recyclerview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+
+            android:descendantFocusability="afterDescendants"
+            android:orientation="horizontal"
+            android:paddingStart="@dimen/navbar_width"
+            android:paddingEnd="5dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/home_result_grid" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home_tv.xml b/app/src/main/res/layout/fragment_home_tv.xml
index 5b092927..ebcd3e9f 100644
--- a/app/src/main/res/layout/fragment_home_tv.xml
+++ b/app/src/main/res/layout/fragment_home_tv.xml
@@ -1,87 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/home_root"
+    android:layout_width="match_parent"
 
-        android:id="@+id/home_root"
-        tools:context=".ui.home.HomeFragment">
+    android:layout_height="match_parent"
+    tools:context=".ui.home.HomeFragment">
 
     <FrameLayout
-            android:visibility="gone"
-            tools:visibility="gone"
-            android:id="@+id/home_loading"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:id="@+id/home_loading"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="@dimen/navbar_width"
+        android:visibility="gone"
+        tools:visibility="gone">
 
         <ProgressBar
-                android:layout_gravity="center"
-                android:visibility="gone"
-                tools:visibility="gone"
-                android:layout_width="50dp"
-                android:layout_height="50dp" />
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center"
+            android:visibility="gone"
+            tools:visibility="gone" />
 
         <com.facebook.shimmer.ShimmerFrameLayout
-                android:id="@+id/home_loading_shimmer"
-                app:shimmer_base_alpha="0.2"
-                app:shimmer_highlight_alpha="0.3"
-                app:shimmer_duration="@integer/loading_time"
-                app:shimmer_auto_start="true"
-                android:paddingTop="40dp"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:layout_marginTop="15dp"
-                android:orientation="vertical">
+            android:id="@+id/home_loading_shimmer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_marginTop="15dp"
+            android:orientation="vertical"
+            android:paddingTop="40dp"
+            app:shimmer_auto_start="true"
+            app:shimmer_base_alpha="0.2"
+            app:shimmer_duration="@integer/loading_time"
+            app:shimmer_highlight_alpha="0.3">
 
             <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
                 <FrameLayout
-                        android:orientation="horizontal"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
                     <androidx.cardview.widget.CardView
-                            android:layout_margin="@dimen/loading_margin"
-                            android:layout_gravity="center"
-                            app:cardCornerRadius="@dimen/loading_radius"
-                            android:background="@color/grayShimmer"
-                            android:translationX="-164dp"
-                            android:layout_width="125dp"
-                            android:layout_height="200dp" />
+                        android:layout_width="125dp"
+                        android:layout_height="200dp"
+                        android:layout_gravity="center"
+                        android:layout_margin="@dimen/loading_margin"
+                        android:background="@color/grayShimmer"
+                        android:translationX="-164dp"
+                        app:cardCornerRadius="@dimen/loading_radius" />
 
                     <androidx.cardview.widget.CardView
-                            android:layout_margin="@dimen/loading_margin"
-                            android:layout_gravity="center"
-                            app:cardCornerRadius="@dimen/loading_radius"
-                            android:background="@color/grayShimmer"
-                            android:layout_width="148dp"
-                            android:layout_height="234dp" />
+                        android:layout_width="148dp"
+                        android:layout_height="234dp"
+                        android:layout_gravity="center"
+                        android:layout_margin="@dimen/loading_margin"
+                        android:background="@color/grayShimmer"
+                        app:cardCornerRadius="@dimen/loading_radius" />
 
                     <androidx.cardview.widget.CardView
-                            android:layout_margin="@dimen/loading_margin"
-                            android:layout_gravity="center"
-                            app:cardCornerRadius="@dimen/loading_radius"
-                            android:background="@color/grayShimmer"
-                            android:translationX="164dp"
-                            android:layout_width="125dp"
-                            android:layout_height="200dp" />
+                        android:layout_width="125dp"
+                        android:layout_height="200dp"
+                        android:layout_gravity="center"
+                        android:layout_margin="@dimen/loading_margin"
+                        android:background="@color/grayShimmer"
+                        android:translationX="164dp"
+                        app:cardCornerRadius="@dimen/loading_radius" />
                 </FrameLayout>
 
                 <include layout="@layout/loading_line_short_center" />
 
                 <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_marginTop="@dimen/result_padding"
-                        android:layout_marginStart="@dimen/result_padding"
-                        android:layout_marginEnd="@dimen/result_padding"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/result_padding"
+                    android:layout_marginTop="@dimen/result_padding"
 
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:layout_marginEnd="@dimen/result_padding"
+                    android:orientation="vertical">
 
                     <include layout="@layout/loading_list" />
 
@@ -93,355 +94,82 @@
         </com.facebook.shimmer.ShimmerFrameLayout>
 
         <FrameLayout
-                android:id="@+id/home_loading_statusbar"
-                android:layout_width="match_parent"
-                android:layout_height="70dp">
+            android:id="@+id/home_loading_statusbar"
+            android:layout_width="match_parent"
+            android:layout_height="70dp">
 
             <ImageView
-                    android:id="@+id/home_change_api_loading"
-                    android:layout_margin="10dp"
-                    android:layout_gravity="center_vertical|end"
-                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:id="@+id/home_change_api_loading"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_vertical|end"
 
-                    android:src="@drawable/ic_baseline_keyboard_arrow_down_24"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:contentDescription="@string/home_change_provider_img_des" />
+                android:layout_margin="10dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/home_change_provider_img_des"
+                android:src="@drawable/ic_baseline_keyboard_arrow_down_24" />
         </FrameLayout>
     </FrameLayout>
 
     <LinearLayout
-            android:visibility="gone"
-            tools:visibility="gone"
-            android:id="@+id/home_loading_error"
-            android:orientation="vertical"
+        android:id="@+id/home_loading_error"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/navbar_width"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="gone">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/home_reload_connectionerror"
+            style="@style/WhiteButton"
+
+            android:layout_width="wrap_content"
+
             android:layout_gravity="center"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_margin="5dp"
+            android:minWidth="200dp"
+            android:text="@string/reload_error"
+            app:icon="@drawable/ic_baseline_autorenew_24" />
 
         <com.google.android.material.button.MaterialButton
-                android:layout_gravity="center"
-                style="@style/WhiteButton"
+            android:id="@+id/home_reload_connection_open_in_browser"
+            style="@style/BlackButton"
 
-                android:layout_margin="5dp"
+            android:layout_width="wrap_content"
 
-                app:icon="@drawable/ic_baseline_autorenew_24"
-                android:text="@string/reload_error"
-                android:id="@+id/home_reload_connectionerror"
-                android:layout_width="wrap_content"
-                android:minWidth="200dp" />
-
-        <com.google.android.material.button.MaterialButton
-                android:layout_gravity="center"
-                style="@style/BlackButton"
-
-                android:layout_margin="5dp"
-
-                app:icon="@drawable/ic_baseline_public_24"
-                android:text="@string/result_open_in_browser"
-                android:id="@+id/home_reload_connection_open_in_browser"
-                android:layout_width="wrap_content"
-                android:minWidth="200dp" />
+            android:layout_gravity="center"
+            android:layout_margin="5dp"
+            android:minWidth="200dp"
+            android:text="@string/result_open_in_browser"
+            app:icon="@drawable/ic_baseline_public_24" />
 
         <TextView
-                android:layout_margin="5dp"
-                android:gravity="center"
-                android:layout_gravity="center"
-                android:id="@+id/result_error_text"
-                android:textColor="?attr/textColor"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+            android:id="@+id/result_error_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_margin="5dp"
+            android:gravity="center"
+            android:textColor="?attr/textColor" />
     </LinearLayout>
 
-    <androidx.core.widget.NestedScrollView
-            android:background="?attr/primaryBlackBackground"
-            tools:visibility="visible"
-            android:visibility="gone"
-            android:id="@+id/home_loaded"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
 
-        <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-            <View
-                    android:background="?attr/primaryGrayBackground"
-                    android:id="@+id/home_statusbar"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent" />
-
-            <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                <ImageView
-                        android:scaleType="centerCrop"
-                        tools:src="@drawable/example_poster"
-                        android:id="@+id/home_blur_poster"
-                        android:layout_width="match_parent"
-                        android:layout_height="200dp" />
-
-                <ImageView
-                        android:id="@+id/shadow_overlay"
-                        android:layout_width="match_parent"
-                        android:layout_height="200dp"
-                        android:background="@drawable/background_shadow" />
-
-                <LinearLayout
-                        android:layout_marginTop="100dp"
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                    <LinearLayout
-                            android:paddingTop="10dp"
-                            android:paddingBottom="10dp"
-                            android:orientation="horizontal"
-                            android:layout_width="match_parent"
-                            android:layout_height="100dp">
-
-                        <!--
-                        <androidx.cardview.widget.CardView
-                                android:id="@+id/home_profile_picture_holder"
-                                android:layout_marginEnd="20dp"
-                                app:cardCornerRadius="100dp"
-                                android:layout_gravity="center_vertical"
-                                android:layout_width="35dp"
-                                android:layout_height="35dp">
-
-                            <ImageView
-                                    android:id="@+id/home_profile_picture"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
-                                    tools:ignore="ContentDescription" />
-                        </androidx.cardview.widget.CardView>-->
-
-                        <LinearLayout
-                                android:orientation="vertical"
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent">
-
-
-                            <LinearLayout
-                                    android:orientation="horizontal"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content">
-
-                                <ImageView
-                                        android:nextFocusDown="@id/home_main_poster_recyclerview"
-                                        android:nextFocusUp="@id/nav_rail_view"
-                                        android:nextFocusLeft="@id/nav_rail_view"
-                                        android:layout_gravity="center_vertical"
-
-                                        android:id="@+id/home_change_api"
-                                        android:layout_margin="10dp"
-                                        android:background="?android:attr/selectableItemBackgroundBorderless"
-                                        android:foreground="@drawable/outline_drawable"
-                                        android:src="@drawable/ic_baseline_filter_list_24"
-                                        android:layout_width="30dp"
-                                        android:layout_height="30dp"
-                                        android:contentDescription="@string/home_change_provider_img_des">
-
-                                    <requestFocus />
-                                </ImageView>
-
-                                <TextView
-                                        android:maxLines="1"
-                                        android:ellipsize="end"
-                                        android:gravity="center_vertical"
-                                        android:layout_gravity="center_vertical"
-                                        android:textStyle="bold"
-                                        android:textSize="25sp"
-                                        tools:text="The Perfect Run"
-                                        android:id="@+id/home_focus_text"
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content" />
-                            </LinearLayout>
-
-                            <LinearLayout
-                                    android:layout_marginStart="12dp"
-                                    android:orientation="horizontal"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content">
-
-                                <TextView
-                                        android:gravity="center_vertical"
-                                        android:id="@+id/home_provider_name"
-                                        android:textColor="?attr/grayTextColor"
-                                        android:textSize="20sp"
-                                        android:paddingEnd="10dp"
-                                        tools:text="Hello World"
-                                        android:layout_width="wrap_content"
-
-                                        android:layout_height="wrap_content" />
-
-                                <TextView
-                                        android:gravity="center_vertical"
-                                        android:id="@+id/home_provider_meta_info"
-                                        android:textColor="?attr/grayTextColor"
-                                        android:textSize="20sp"
-                                        tools:text="Hello World"
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content" />
-                            </LinearLayout>
-                        </LinearLayout>
-                    </LinearLayout>
-
-                    <androidx.recyclerview.widget.RecyclerView
-                            android:paddingHorizontal="5dp"
-                            android:clipToPadding="false"
-                            android:descendantFocusability="afterDescendants"
-                            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                            android:id="@+id/home_main_poster_recyclerview"
-                            android:orientation="horizontal"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            tools:listitem="@layout/home_result_grid" />
-                </LinearLayout>
-            </FrameLayout>
-
-
-            <LinearLayout
-                    android:id="@+id/home_watch_holder"
-                    android:orientation="vertical"
-                    android:visibility="gone"
-                    tools:visibility="visible"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-
-                <TextView
-                        android:id="@+id/home_watch_parent_item_title"
-                        android:padding="12dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/WatchHeaderText"
-                        android:layout_marginEnd="0dp"
-                        android:text="@string/continue_watching">
-                </TextView>
-
-                <androidx.recyclerview.widget.RecyclerView
-                        android:paddingHorizontal="5dp"
-                        android:clipToPadding="false"
-                        android:descendantFocusability="afterDescendants"
-                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                        android:id="@+id/home_watch_child_recyclerview"
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        tools:listitem="@layout/home_result_grid" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                    android:id="@+id/home_bookmarked_holder"
-                    android:orientation="vertical"
-                    android:visibility="gone"
-                    tools:visibility="visible"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                <HorizontalScrollView
-                        android:nextFocusLeft="@id/nav_rail_view"
-                        android:nextFocusUp="@id/home_watch_child_recyclerview"
-                        android:nextFocusForward="@id/home_bookmarked_child_recyclerview"
-
-                        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                        android:paddingTop="5dp"
-                        android:paddingBottom="5dp"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-
-                        android:fadingEdge="horizontal"
-                        android:requiresFadingEdge="horizontal">
-
-                    <com.google.android.material.chip.ChipGroup
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <com.google.android.material.chip.Chip
-                            android:id="@+id/home_type_watching_btt"
-                            style="@style/ChipFilled"
-                            android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-
-                            android:nextFocusLeft="@id/nav_rail_view"
-                            android:nextFocusRight="@id/home_plan_to_watch_btt"
-                            android:text="@string/type_watching" />
-
-                        <com.google.android.material.chip.Chip
-                            android:id="@+id/home_plan_to_watch_btt"
-                            style="@style/ChipFilled"
-                            android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-
-                            android:nextFocusLeft="@id/home_type_watching_btt"
-                            android:nextFocusRight="@id/home_type_on_hold_btt"
-                            android:text="@string/type_plan_to_watch" />
-
-                        <com.google.android.material.chip.Chip
-                            android:id="@+id/home_type_on_hold_btt"
-                            style="@style/ChipFilled"
-                            android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-
-                            android:nextFocusLeft="@id/home_plan_to_watch_btt"
-                            android:nextFocusRight="@id/home_type_dropped_btt"
-                            android:text="@string/type_on_hold" />
-
-                        <com.google.android.material.chip.Chip
-                            android:id="@+id/home_type_dropped_btt"
-                            style="@style/ChipFilled"
-                            android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-
-                            android:nextFocusLeft="@id/home_type_on_hold_btt"
-                            android:nextFocusRight="@id/home_type_completed_btt"
-                            android:text="@string/type_dropped" />
-
-                        <com.google.android.material.chip.Chip
-                            android:id="@+id/home_type_completed_btt"
-                            android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-
-                            style="@style/ChipFilled"
-                            android:nextFocusLeft="@id/home_type_dropped_btt"
-                            android:text="@string/type_completed" />
-                    </com.google.android.material.chip.ChipGroup>                </HorizontalScrollView>
-
-                <androidx.recyclerview.widget.RecyclerView
-                        android:paddingHorizontal="5dp"
-                        android:clipToPadding="false"
-                        android:descendantFocusability="afterDescendants"
-
-                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                        android:id="@+id/home_bookmarked_child_recyclerview"
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        tools:listitem="@layout/home_result_grid" />
-            </LinearLayout>
-
-            <androidx.recyclerview.widget.RecyclerView
-                    android:nextFocusLeft="@id/nav_rail_view"
-                    android:descendantFocusability="afterDescendants"
-                    android:id="@+id/home_master_recycler"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    tools:listitem="@layout/homepage_parent_tv" />
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/home_master_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:descendantFocusability="afterDescendants"
+        android:nextFocusLeft="@id/nav_rail_view"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:listitem="@layout/homepage_parent_tv" />
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-            android:visibility="gone"
-            tools:visibility="visible"
-            android:id="@+id/home_api_fab"
-            app:icon="@drawable/ic_baseline_filter_list_24"
-            style="@style/ExtendedFloatingActionButton"
-            tools:ignore="ContentDescription" />
+        android:id="@+id/home_api_fab"
+        style="@style/ExtendedFloatingActionButton"
+        android:visibility="gone"
+        app:icon="@drawable/ic_baseline_filter_list_24"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index f88fc173..8b9b9e36 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -516,6 +516,7 @@
                         android:visibility="gone" />
 
                     <com.google.android.material.chip.ChipGroup
+                        style="@style/ChipParent"
                         android:id="@+id/result_tag"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/fragment_result_tv.xml b/app/src/main/res/layout/fragment_result_tv.xml
index f6786196..a29dc192 100644
--- a/app/src/main/res/layout/fragment_result_tv.xml
+++ b/app/src/main/res/layout/fragment_result_tv.xml
@@ -385,6 +385,7 @@
 
 
                     <com.google.android.material.chip.ChipGroup
+                        style="@style/ChipParent"
                         android:id="@+id/result_tag"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 6df5837f..bed08570 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -10,79 +10,86 @@
     android:orientation="vertical"
     tools:context=".ui.search.SearchFragment">
 
-    <FrameLayout
+    <LinearLayout
+        android:paddingBottom="10dp"
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_margin="10dp"
-        android:background="@drawable/search_background"
-        android:visibility="visible">
+        android:layout_height="wrap_content">
 
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginEnd="30dp">
+            android:layout_height="40dp"
+            android:layout_margin="10dp"
+            android:background="@drawable/search_background"
+            android:visibility="visible">
 
-            <androidx.appcompat.widget.SearchView
-                android:id="@+id/main_search"
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="30dp"
                 android:layout_gravity="center_vertical"
+                android:layout_marginEnd="30dp">
 
-                android:iconifiedByDefault="false"
-                android:imeOptions="actionSearch"
+                <androidx.appcompat.widget.SearchView
+                    android:id="@+id/main_search"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_vertical"
 
-                android:inputType="text"
-                android:nextFocusLeft="@id/nav_rail_view"
+                    android:iconifiedByDefault="false"
+                    android:imeOptions="actionSearch"
 
-                android:nextFocusRight="@id/search_filter"
+                    android:inputType="text"
+                    android:nextFocusLeft="@id/nav_rail_view"
+
+                    android:nextFocusRight="@id/search_filter"
+                    android:nextFocusUp="@id/nav_rail_view"
+                    android:nextFocusDown="@id/search_autofit_results"
+                    android:paddingStart="-10dp"
+                    app:iconifiedByDefault="false"
+                    app:queryBackground="@color/transparent"
+                    app:queryHint="@string/search_hint"
+                    app:searchIcon="@drawable/search_icon"
+                    tools:ignore="RtlSymmetry">
+
+                    <requestFocus />
+
+                    <androidx.core.widget.ContentLoadingProgressBar
+                        android:id="@+id/search_loading_bar"
+                        style="@style/Widget.AppCompat.ProgressBar"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_gravity="center"
+                        android:layout_marginStart="-35dp"
+                        android:foregroundTint="@color/white"
+                        android:progressTint="@color/white">
+
+                    </androidx.core.widget.ContentLoadingProgressBar>
+                    <!--app:queryHint="@string/search_hint"
+                     android:background="@color/grayBackground" @color/itemBackground
+                                app:searchHintIcon="@drawable/search_white"
+                                -->
+                </androidx.appcompat.widget.SearchView>
+            </FrameLayout>
+
+            <ImageView
+                android:id="@+id/search_filter"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_gravity="end|center_vertical"
+
+                android:layout_margin="10dp"
+                android:background="?selectableItemBackgroundBorderless"
+                android:contentDescription="@string/change_providers_img_des"
+                android:nextFocusLeft="@id/main_search"
+                android:nextFocusRight="@id/main_search"
                 android:nextFocusUp="@id/nav_rail_view"
                 android:nextFocusDown="@id/search_autofit_results"
-                android:paddingStart="-10dp"
-                app:iconifiedByDefault="false"
-                app:queryBackground="@color/transparent"
-                app:queryHint="@string/search_hint"
-                app:searchIcon="@drawable/search_icon"
-                tools:ignore="RtlSymmetry">
-
-                <requestFocus />
-
-                <androidx.core.widget.ContentLoadingProgressBar
-                    android:id="@+id/search_loading_bar"
-                    style="@style/Widget.AppCompat.ProgressBar"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="-35dp"
-                    android:foregroundTint="@color/white"
-                    android:progressTint="@color/white">
-
-                </androidx.core.widget.ContentLoadingProgressBar>
-                <!--app:queryHint="@string/search_hint"
-                 android:background="@color/grayBackground" @color/itemBackground
-                            app:searchHintIcon="@drawable/search_white"
-                            -->
-            </androidx.appcompat.widget.SearchView>
+                android:src="@drawable/ic_baseline_tune_24"
+                app:tint="?attr/textColor" />
         </FrameLayout>
 
-        <ImageView
-            android:id="@+id/search_filter"
-            android:layout_width="25dp"
-            android:layout_height="25dp"
-            android:layout_gravity="end|center_vertical"
-
-            android:layout_margin="10dp"
-            android:background="?selectableItemBackgroundBorderless"
-            android:contentDescription="@string/change_providers_img_des"
-            android:nextFocusLeft="@id/main_search"
-            android:nextFocusRight="@id/main_search"
-            android:nextFocusUp="@id/nav_rail_view"
-            android:nextFocusDown="@id/search_autofit_results"
-            android:src="@drawable/ic_baseline_tune_24"
-            app:tint="?attr/textColor" />
-    </FrameLayout>
-
-    <include layout="@layout/tvtypes_chips_scroll" />
+        <include layout="@layout/tvtypes_chips_scroll" />
+    </LinearLayout>
 
 
     <com.lagradost.cloudstream3.ui.AutofitRecyclerView
@@ -112,34 +119,35 @@
         android:nextFocusLeft="@id/nav_rail_view"
         android:visibility="gone"
         tools:listitem="@layout/homepage_parent" />
+
     <FrameLayout
         android:id="@+id/search_history_holder"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/search_history_recycler"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/search_history_recycler"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
 
-        android:background="?attr/primaryBlackBackground"
-        android:descendantFocusability="afterDescendants"
-        android:nextFocusLeft="@id/nav_rail_view"
-        android:visibility="visible"
-        android:paddingBottom="50dp"
-        tools:listitem="@layout/search_history_item" />
+            android:background="?attr/primaryBlackBackground"
+            android:descendantFocusability="afterDescendants"
+            android:nextFocusLeft="@id/nav_rail_view"
+            android:visibility="visible"
+            android:paddingBottom="50dp"
+            tools:listitem="@layout/search_history_item" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/search_clear_call_history"
-        style="@style/BlackButton"
-        android:layout_gravity="bottom"
-        android:padding="0dp"
-        app:cornerRadius="0dp"
-        android:layout_margin="0dp"
-        android:text="@string/clear_history"
-        app:icon="@drawable/delete_all"
-        android:layout_width="match_parent"
-        android:layout_height="50dp" />
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/search_clear_call_history"
+            style="@style/BlackButton"
+            android:layout_gravity="bottom"
+            android:padding="0dp"
+            app:cornerRadius="0dp"
+            android:layout_margin="0dp"
+            android:text="@string/clear_history"
+            app:icon="@drawable/delete_all"
+            android:layout_width="match_parent"
+            android:layout_height="50dp" />
     </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search_tv.xml b/app/src/main/res/layout/fragment_search_tv.xml
new file mode 100644
index 00000000..0a85a471
--- /dev/null
+++ b/app/src/main/res/layout/fragment_search_tv.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/searchRoot"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginTop="@dimen/navbar_height"
+    android:background="?attr/primaryGrayBackground"
+    android:orientation="vertical"
+    tools:context=".ui.search.SearchFragment">
+
+    <LinearLayout
+        android:layout_marginStart="@dimen/navbar_width"
+        android:paddingBottom="10dp"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_margin="10dp"
+            android:background="@drawable/search_background"
+            android:visibility="visible">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="30dp">
+
+                <androidx.appcompat.widget.SearchView
+                    android:id="@+id/main_search"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_vertical"
+
+                    android:iconifiedByDefault="false"
+                    android:imeOptions="actionSearch"
+
+                    android:inputType="text"
+                    android:nextFocusLeft="@id/nav_rail_view"
+
+                    android:nextFocusRight="@id/search_filter"
+                    android:nextFocusUp="@id/nav_rail_view"
+                    android:nextFocusDown="@id/search_autofit_results"
+                    android:paddingStart="-10dp"
+                    app:iconifiedByDefault="false"
+                    app:queryBackground="@color/transparent"
+                    app:queryHint="@string/search_hint"
+                    app:searchIcon="@drawable/search_icon"
+                    tools:ignore="RtlSymmetry">
+
+                    <requestFocus />
+
+                    <androidx.core.widget.ContentLoadingProgressBar
+                        android:id="@+id/search_loading_bar"
+                        style="@style/Widget.AppCompat.ProgressBar"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_gravity="center"
+                        android:layout_marginStart="-35dp"
+                        android:foregroundTint="@color/white"
+                        android:progressTint="@color/white">
+
+                    </androidx.core.widget.ContentLoadingProgressBar>
+                    <!--app:queryHint="@string/search_hint"
+                     android:background="@color/grayBackground" @color/itemBackground
+                                app:searchHintIcon="@drawable/search_white"
+                                -->
+                </androidx.appcompat.widget.SearchView>
+            </FrameLayout>
+
+            <ImageView
+                android:id="@+id/search_filter"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_gravity="end|center_vertical"
+
+                android:layout_margin="10dp"
+                android:background="?selectableItemBackgroundBorderless"
+                android:contentDescription="@string/change_providers_img_des"
+                android:nextFocusLeft="@id/main_search"
+                android:nextFocusRight="@id/main_search"
+                android:nextFocusUp="@id/nav_rail_view"
+                android:nextFocusDown="@id/search_autofit_results"
+                android:src="@drawable/ic_baseline_tune_24"
+                app:tint="?attr/textColor" />
+        </FrameLayout>
+
+        <include layout="@layout/tvtypes_chips_scroll" />
+    </LinearLayout>
+
+
+    <com.lagradost.cloudstream3.ui.AutofitRecyclerView
+        android:id="@+id/search_autofit_results"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+
+        android:background="?attr/primaryBlackBackground"
+        android:clipToPadding="false"
+        android:descendantFocusability="afterDescendants"
+        android:nextFocusLeft="@id/nav_rail_view"
+        android:orientation="vertical"
+        android:paddingStart="8dp"
+        android:paddingTop="5dp"
+        android:paddingEnd="8dp"
+        android:visibility="gone"
+        app:spanCount="3"
+        tools:listitem="@layout/search_result_grid" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/search_master_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+
+        android:background="?attr/primaryBlackBackground"
+        android:descendantFocusability="afterDescendants"
+        android:nextFocusLeft="@id/nav_rail_view"
+        android:visibility="gone"
+        tools:listitem="@layout/homepage_parent" />
+
+    <FrameLayout
+        android:id="@+id/search_history_holder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:paddingStart="@dimen/navbar_width"
+            android:id="@+id/search_history_recycler"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+
+            android:background="?attr/primaryBlackBackground"
+            android:descendantFocusability="afterDescendants"
+            android:nextFocusLeft="@id/nav_rail_view"
+            android:visibility="visible"
+            android:paddingBottom="50dp"
+            tools:listitem="@layout/search_history_item" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/search_clear_call_history"
+            style="@style/BlackButton"
+            android:layout_gravity="bottom"
+            android:padding="0dp"
+            app:cornerRadius="0dp"
+            android:layout_margin="0dp"
+            android:text="@string/clear_history"
+            app:icon="@drawable/delete_all"
+            android:layout_width="match_parent"
+            android:layout_height="50dp" />
+    </FrameLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/home_scroll_view_tv.xml b/app/src/main/res/layout/home_scroll_view_tv.xml
new file mode 100644
index 00000000..e0da8197
--- /dev/null
+++ b/app/src/main/res/layout/home_scroll_view_tv.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:background="?attr/primaryGrayBackground"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/home_scroll_preview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        tools:src="@drawable/example_poster" />
+
+    <View
+        android:id="@+id/title_shadow"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        android:layout_gravity="bottom"
+        android:background="@drawable/background_shadow" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/homepage_parent_tv.xml b/app/src/main/res/layout/homepage_parent_tv.xml
index bfbee465..f9adf1c1 100644
--- a/app/src/main/res/layout/homepage_parent_tv.xml
+++ b/app/src/main/res/layout/homepage_parent_tv.xml
@@ -1,32 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <TextView
-            android:id="@+id/home_parent_item_title"
-            android:padding="12dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/WatchHeaderText"
-            android:layout_marginEnd="0dp"
-            tools:text="Trending">
-    </TextView>
+        android:layout_marginStart="@dimen/navbar_width"
+        android:id="@+id/home_parent_item_title"
+        android:padding="12dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/WatchHeaderText"
+        android:layout_marginEnd="0dp"
+        tools:text="Trending" />
 
     <androidx.recyclerview.widget.RecyclerView
-            android:nextFocusUp="@id/home_child_more_info"
-            android:paddingHorizontal="5dp"
-            android:clipToPadding="false"
+        android:nextFocusUp="@id/home_child_more_info"
 
-            android:descendantFocusability="afterDescendants"
+        android:paddingEnd="5dp"
+        android:paddingStart="@dimen/navbar_width"
+        android:clipToPadding="false"
 
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            android:id="@+id/home_child_recyclerview"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:listitem="@layout/home_result_grid" />
+        android:descendantFocusability="afterDescendants"
+
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        android:id="@+id/home_child_recyclerview"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:listitem="@layout/home_result_grid" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tvtypes_chips.xml b/app/src/main/res/layout/tvtypes_chips.xml
index 33ca7762..6b13546b 100644
--- a/app/src/main/res/layout/tvtypes_chips.xml
+++ b/app/src/main/res/layout/tvtypes_chips.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.chip.ChipGroup android:layout_width="match_parent"
+    style="@style/ChipParent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:paddingStart="8dp"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ff8e3db4..85eb3a48 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,6 +13,7 @@
     <color name="boxItemBackground">#161616</color> <!-- 17171B 1B1B20-->
 
     <color name="textColor">#e9eaee</color> <!--FFF-->
+    <color name="semiWhite">#1AFFFFFF</color> <!--FFF-->
     <color name="grayTextColor">#9ba0a4</color> <!-- 5e5f62-->
     <color name="grayShimmer">#DCDCDC</color> <!-- 5e5f62-->
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index dac8b9cd..567b6d35 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -16,4 +16,5 @@
     <integer name="loading_time">2000</integer>
 
     <dimen name="storage_radius">3dp</dimen>
+    <dimen name="navbar_width">62dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6926bb47..b14cd189 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -88,6 +88,16 @@
         <item name="fontFamily">@font/google_sans</item>
         <item name="chipIconTint">@color/chip_color_text</item>
         <item name="android:fontFamily">@font/google_sans</item>
+        <item name="chipMinTouchTargetSize">0dp</item>
+    </style>
+    <style name="ChipFilledSemiTransparent" parent="@style/ChipFilled">
+        <item name="chipBackgroundColor">@color/transparent</item>
+        <item name="chipSurfaceColor">@color/semiWhite</item>
+        <item name="backgroundColor">@color/transparent</item>
+    </style>
+    <style name="ChipParent">
+        <item name="chipSpacingVertical">5dp</item>
+        <item name="chipSpacingHorizontal">5dp</item>
     </style>
 
     <style name="AmoledMode">

From 4440096ea433b5ea9f8b0c39ce98d0ffa76ce31c Mon Sep 17 00:00:00 2001
From: LagradOst <11805592+LagradOst@users.noreply.github.com>
Date: Wed, 28 Dec 2022 13:09:00 +0100
Subject: [PATCH 144/273] fixed scroll

---
 .../cloudstream3/ui/home/HomeFragment.kt      | 50 ++++++-------------
 1 file changed, 15 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 2f08e065..8893ce02 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -14,44 +14,32 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.*
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.widget.SearchView
-import androidx.core.content.ContextCompat.getDrawable
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import androidx.transition.ChangeBounds
-import androidx.transition.TransitionManager
-import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.chip.Chip
-import com.google.android.material.chip.ChipDrawable
 import com.google.android.material.chip.ChipGroup
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
-import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
-import com.lagradost.cloudstream3.APIHolder.getId
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.MainActivity.Companion.mainPluginsLoadedEvent
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.OAuth2Apis
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.noneApi
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.randomApi
 import com.lagradost.cloudstream3.ui.AutofitRecyclerView
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
-import com.lagradost.cloudstream3.ui.result.ResultViewModel2.Companion.updateWatchStatus
 import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.search.*
@@ -62,29 +50,20 @@ import com.lagradost.cloudstream3.utils.AppUtils.addProgramsToContinueWatching
 import com.lagradost.cloudstream3.utils.AppUtils.isRecyclerScrollable
 import com.lagradost.cloudstream3.utils.AppUtils.loadResult
 import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
-import com.lagradost.cloudstream3.utils.AppUtils.setMaxViewPoolSize
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.DataStoreHelper.deleteAllBookmarkedData
-import com.lagradost.cloudstream3.utils.DataStoreHelper.deleteAllResumeStateIds
 import com.lagradost.cloudstream3.utils.DataStoreHelper.removeLastWatched
 import com.lagradost.cloudstream3.utils.DataStoreHelper.setResultWatchState
 import com.lagradost.cloudstream3.utils.Event
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectStringRes
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
-import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import com.lagradost.cloudstream3.utils.UIHelper.setImageBlur
 import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
-import com.lagradost.cloudstream3.widget.CenterZoomLayoutManager
 import kotlinx.android.synthetic.main.activity_main_tv.*
 import kotlinx.android.synthetic.main.fragment_home.*
 import kotlinx.android.synthetic.main.fragment_home.home_api_fab
@@ -1001,21 +980,22 @@ class HomeFragment : Fragment() {
 
         reloadStored()
         loadHomePage(false)
-
-        /*
-    home_loaded?.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { v, _, scrollY, _, oldScrollY ->
-        val dy = scrollY - oldScrollY
-        if (dy > 0) { //check for scroll down
-            home_api_fab?.shrink() // hide
-            home_random?.shrink()
-        } else if (dy < -5) {
-            if (!isTvSettings()) {
-                home_api_fab?.extend() // show
-                home_random?.extend()
+        home_master_recycler?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                if (dy > 0) { //check for scroll down
+                    home_api_fab?.shrink() // hide
+                    home_random?.shrink()
+                } else if (dy < -5) {
+                    if (!isTvSettings()) {
+                        home_api_fab?.extend() // show
+                        home_random?.extend()
+                    }
+                }
+                
+                super.onScrolled(recyclerView, dx, dy)
             }
-        }
-    })
-*/
+        })
+
         // nice profile pic on homepage
         //home_profile_picture_holder?.isVisible = false
         // just in case

From c6749bf9885c16e1bb0fa009b524558937bf20df Mon Sep 17 00:00:00 2001
From: codefactor-io <support@codefactor.io>
Date: Wed, 28 Dec 2022 12:11:25 +0000
Subject: [PATCH 145/273] [CodeFactor] Apply fixes to commit 4440096

---
 .../java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 8893ce02..367b7987 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -991,7 +991,7 @@ class HomeFragment : Fragment() {
                         home_random?.extend()
                     }
                 }
-                
+
                 super.onScrolled(recyclerView, dx, dy)
             }
         })

From 79c8b4e5237d5ba67a92415a329b7832e1ff4401 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Wed, 28 Dec 2022 13:20:23 +0100
Subject: [PATCH 146/273] Translated using Weblate (German)

Currently translated at 94.6% (533 of 563 strings)

Translated using Weblate (German)

Currently translated at 94.1% (530 of 563 strings)

Translated using Weblate (German)

Currently translated at 94.1% (530 of 563 strings)

Translated using Weblate (German)

Currently translated at 15.4% (87 of 563 strings)

Added translation using Weblate (German)

Translated using Weblate (Spanish)

Currently translated at 90.4% (509 of 563 strings)

Translated using Weblate (Spanish)

Currently translated at 90.4% (509 of 563 strings)

Translated using Weblate (Spanish)

Currently translated at 71.9% (405 of 563 strings)

Translated using Weblate (Indonesian)

Currently translated at 95.2% (536 of 563 strings)

Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Julian <hello@apollo.moe>
Co-authored-by: Sonaji Yusup <sonacore@gmail.com>
Co-authored-by: TubaApollo <86665265+TubaApollo@users.noreply.github.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translation: Cloudstream/App
---
 app/src/main/res/values-de/strings.xml | 454 +++++++++++++++++++++++++
 app/src/main/res/values-es/strings.xml | 126 +++++++
 app/src/main/res/values-in/strings.xml |  25 +-
 3 files changed, 599 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/values-de/strings.xml

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 00000000..bfc9d6ee
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,454 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="cast_format" formatted="true">Besetzung: %s</string>
+    <string name="next_episode_format" formatted="true">Episode %d wird veröffentlicht in</string>
+    <string name="result_poster_img_des">Vorschaubild</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="subs_hold_to_reset_to_default">Halten, um auf die Standardeinstellungen zurückzusetzen</string>
+    <string name="restore_failed_format" formatted="true">Wiederherstellung der Daten aus der Datei %s fehlgeschlagen</string>
+    <string name="backup_success">Daten erfolgreich gesichert</string>
+    <string name="backup_failed_error_format">Fehler beim Sichern von %s</string>
+    <string name="no_chromecast_support_toast">Dieser Anbieter hat keine Chromecast-Unterstützung</string>
+    <string name="episode_action_chromecast_mirror">Chromecastmirror</string>
+    <string name="episode_action_play_in_app">In App wiedergeben</string>
+    <string name="skip_type_mixed_op">Vermischte Openings</string>
+    <string name="skip_type_creddits">Abspann</string>
+    <string name="skip_type_intro">Intro</string>
+    <string name="clear_history">Verlauf löschen</string>
+    <string name="history">Verlauf</string>
+    <string name="enable_skip_op_from_database_des">Überspringen Button für Openings/Endings anzeigen</string>
+    <string name="clipboard_too_large">Zu viel Text. Kann nicht in der Zwischenablage gespeichert werden.</string>
+    <string name="episode_poster_img_des">Episodenvorschaubild</string>
+    <string name="home_main_poster_img_des">Medienvorschaubild</string>
+    <string name="home_next_random_img_des">Nächstes zufällig</string>
+    <string name="go_back_img_des">Zurück</string>
+    <string name="home_change_provider_img_des">Anbieter wechseln</string>
+    <string name="preview_background_img_des">Hintergrundbildvorschau</string>
+    <string name="player_speed_text_format" formatted="true">Geschwindigkeit (%.2fx)</string>
+    <string name="rated_format" formatted="true">Bewertung: %.1f</string>
+    <string name="new_update_format" formatted="true">Neues Update gefunden!
+\n%s -&gt; %s</string>
+    <string name="filler" formatted="true">Füller</string>
+    <string name="duration_format" formatted="true">%d Min</string>
+    <string name="app_name">CloudStream</string>
+    <string name="play_with_app_name">Mit CloudStream abspielen</string>
+    <string name="title_home">Startseite</string>
+    <string name="title_search">Suchen</string>
+    <string name="title_downloads">Downloads</string>
+    <string name="title_settings">Einstellungen</string>
+    <string name="search_hint">Suchen…</string>
+    <string name="search_hint_site" formatted="true">Suche %s…</string>
+    <string name="no_data">Keine Daten vorhanden</string>
+    <string name="episode_more_options_des">Mehr Optionen</string>
+    <string name="next_episode">Nächste Epsisode</string>
+    <string name="result_tags">Genres</string>
+    <string name="result_share">Teilen</string>
+    <string name="result_open_in_browser">In Browser öffnen</string>
+    <string name="skip_loading">Puffern überspringen</string>
+    <string name="loading">Lädt…</string>
+    <string name="type_watching">Am schauen</string>
+    <string name="type_on_hold">Pausiert</string>
+    <string name="type_completed">Abgeschlossen</string>
+    <string name="type_dropped">Abgebrochen</string>
+    <string name="type_plan_to_watch">Geplant</string>
+    <string name="type_none">Nichts</string>
+    <string name="type_re_watching">Erneut anschauen</string>
+    <string name="play_movie_button">Film abspielen</string>
+    <string name="play_livestream_button">Livestream abspielen</string>
+    <string name="play_torrent_button">Torrent streamen</string>
+    <string name="pick_source">Quellen</string>
+    <string name="pick_subtitle">Untertitel</string>
+    <string name="reload_error">Erneuter Verbindungsaufbau…</string>
+    <string name="go_back">Zurück</string>
+    <string name="play_episode">Episode abspielen</string>
+    <string name="download">Herunterladen</string>
+    <string name="downloaded">Heruntergeladen</string>
+    <string name="downloading">Lädt herunter</string>
+    <string name="download_paused">Download pausiert</string>
+    <string name="download_started">Download startet</string>
+    <string name="download_failed">Download fehlgeschlagen</string>
+    <string name="download_canceled">Download abgebrochen</string>
+    <string name="download_done">Download abgeschlossen</string>
+    <string name="stream">Stream</string>
+    <string name="error_loading_links_toast">Fehler beim Laden von Links</string>
+    <string name="download_storage_text">Interner Speicher</string>
+    <string name="app_dubbed_text">Dub</string>
+    <string name="app_subbed_text">Sub</string>
+    <string name="popup_delete_file">Datei löschen</string>
+    <string name="popup_play_file">Datei abspielen</string>
+    <string name="popup_resume_download">Download fortsetzen</string>
+    <string name="popup_pause_download">Download pausieren</string>
+    <string name="pref_disable_acra">Automatische Fehlerberichterstattung deaktivieren</string>
+    <string name="home_more_info">Mehr Infos</string>
+    <string name="home_expanded_hide">Verstecken</string>
+    <string name="home_play">Abspielen</string>
+    <string name="home_info">Info</string>
+    <string name="filter_bookmarks">Lesezeichen filtern</string>
+    <string name="error_bookmarks_text">Lesezeichen</string>
+    <string name="action_remove_from_bookmarks">Entfernen</string>
+    <string name="action_add_to_bookmarks">Status setzen</string>
+    <string name="sort_apply">Anwenden</string>
+    <string name="sort_cancel">Abbrechen</string>
+    <string name="sort_copy">Kopieren</string>
+    <string name="sort_close">Schließen</string>
+    <string name="sort_clear">Löschen</string>
+    <string name="sort_save">Speichern</string>
+    <string name="player_speed">Player Geschwindigkeit</string>
+    <string name="subtitles_settings">Untertiteleinstellungen</string>
+    <string name="subs_text_color">Textfarbe</string>
+    <string name="subs_outline_color">Konturfarbe</string>
+    <string name="subs_background_color">Hintergrundfarbe</string>
+    <string name="subs_window_color">Fensterfarbe</string>
+    <string name="subs_edge_type">Kanten-Typ</string>
+    <string name="subs_subtitle_elevation">Untertitelhöhe</string>
+    <string name="subs_font">Schriftart</string>
+    <string name="subs_font_size">Schriftgröße</string>
+    <string name="search_provider_text_providers">Suche anhand Anbietern</string>
+    <string name="search_provider_text_types">Suche anhand Typen</string>
+    <string name="benene_count_text">%d Benenes an die Devs verteilt</string>
+    <string name="benene_count_text_none">Noch keine Benenes verteilt</string>
+    <string name="subs_auto_select_language">Sprache automatisch wählen</string>
+    <string name="subs_download_languages">Sprachen herunterladen</string>
+    <string name="subs_subtitle_languages">Untertitelsprache</string>
+    <string name="subs_import_text" formatted="true">Fonts in %s importieren</string>
+    <string name="continue_watching">Weiterschauen</string>
+    <string name="action_remove_watching">Entfernen</string>
+    <string name="action_open_watching">Mehr Infos</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="vpn_might_be_needed">Damit dieser Anbieter korrekt funktioniert, ist möglicherweise ein VPN erforderlich</string>
+    <string name="vpn_torrent">Dieser Anbieter bietet Torrents an, ein VPN wird dringend empfohlen</string>
+    <string name="provider_info_meta">Metadaten werden nicht von der Website bereitgestellt, das Laden des Videos schlägt fehl, wenn sie auf der Website nicht vorhanden sind.</string>
+    <string name="torrent_plot">Beschreibung</string>
+    <string name="normal_no_plot">Keine Handlung gefunden</string>
+    <string name="torrent_no_plot">Keine Beschreibung gefunden</string>
+    <string name="show_log_cat">Logcat anzeigen 🐈</string>
+    <string name="picture_in_picture">Bild-in-Bild</string>
+    <string name="picture_in_picture_des">Setzt die Wiedergabe in einem kleinen Fenster über anderen Anwendungen fort</string>
+    <string name="player_size_settings">Player Skalierung anpassen</string>
+    <string name="player_size_settings_des">Entfernt schwarze Ränder</string>
+    <string name="player_subtitles_settings">Untertitel</string>
+    <string name="player_subtitles_settings_des">Player Untertiteleinstellungen</string>
+    <string name="chromecast_subtitles_settings">Chromecast Untertitel</string>
+    <string name="chromecast_subtitles_settings_des">Chromecast Untertiteleinstellungen</string>
+    <string name="eigengraumode_settings">Eigengravy-Modus</string>
+    <string name="eigengraumode_settings_des">Fügt eine Geschwindigkeitsoption im Player hinzu</string>
+    <string name="swipe_to_seek_settings">Wischen zum vor- und zurückspulen</string>
+    <string name="swipe_to_seek_settings_des">Nach links oder rechts wischen, um die Zeit im Videoplayer zu steuern</string>
+    <string name="swipe_to_change_settings">Wischen, um Einstellungen zu ändern</string>
+    <string name="swipe_to_change_settings_des">Nach links oder rechts wischen, um die Helligkeit oder Lautstärke zu ändern</string>
+    <string name="autoplay_next_settings">Nächste Episode automatisch abspielen</string>
+    <string name="autoplay_next_settings_des">Nächste Episode wird gestartet, sobald die aktuelle Episode endet</string>
+    <string name="double_tap_to_seek_settings">Doppeltippen zum vor- und zurückspulen</string>
+    <string name="double_tap_to_pause_settings">Doppeltippen zum Pausieren</string>
+    <string name="double_tap_to_seek_amount_settings">Zeit für vor- und zurückspulen im Player</string>
+    <string name="double_tap_to_seek_settings_des">Zweimal auf die rechte oder linke Seite tippen, um vor- oder zurückzuspulen</string>
+    <string name="double_tap_to_pause_settings_des">In die Mitte tippen, um zu pausieren</string>
+    <string name="use_system_brightness_settings">Systemhelligkeit verwenden</string>
+    <string name="use_system_brightness_settings_des">Systemhelligkeit anstelle eines dunklen Overlay im Player verwenden</string>
+    <string name="episode_sync_settings">Episodenfortschritt aktualisieren</string>
+    <string name="episode_sync_settings_des">Automatisches Synchronisieren des aktuellen Episodenfortschritts</string>
+    <string name="restore_settings">Daten aus Sicherung wiederherstellen</string>
+    <string name="backup_settings">Daten sichern</string>
+    <string name="restore_success">Sicherungsdatei geladen</string>
+    <string name="backup_failed">Speicherberechtigungen fehlen, bitte erneut versuchen</string>
+    <string name="search">Suche</string>
+    <string name="category_account">Konten</string>
+    <string name="category_updates">Updates und Datensicherung</string>
+    <string name="settings_info">Info</string>
+    <string name="advanced_search">Erweiterte Suche</string>
+    <string name="advanced_search_des">Liefert die Suchergebnisse getrennt nach Anbietern</string>
+    <string name="bug_report_settings_off">Sendet Daten nur bei Abstürzen</string>
+    <string name="bug_report_settings_on">Sendet keine Daten</string>
+    <string name="show_fillers_settings">Füller-Episoden für Animes zeigen</string>
+    <string name="show_trailers_settings">Trailer zeigen</string>
+    <string name="kitsu_settings">Vorschaubilder von Kitsu anzeigen</string>
+    <string name="pref_filter_search_quality">Ausgewählte Videoqualität bei Suchergebnissen ausblenden</string>
+    <string name="automatic_plugin_updates">Automatische Plugin-Updates</string>
+    <string name="updates_settings">App-Updates anzeigen</string>
+    <string name="updates_settings_des">Automatisches Suchen nach neuen Updates beim Start</string>
+    <string name="uprereleases_settings">Auf Vorabversionen updaten</string>
+    <string name="uprereleases_settings_des">Suche nach Vorabversionen statt nur nach Vollversionen</string>
+    <string name="github">Github</string>
+    <string name="lightnovel">Light Novel App von denselben Entwicklern</string>
+    <string name="anim">Anime App von denselben Entwicklern</string>
+    <string name="discord">Discord beitreten</string>
+    <string name="benene">Eine Benene an die Devs verteilen</string>
+    <string name="benene_des">Verteilte Benenes</string>
+    <string name="app_language">App Sprache</string>
+    <string name="no_links_found_toast">Keine Verlinkung gefunden</string>
+    <string name="copy_link_toast">Link in die Zwischenablage kopiert</string>
+    <string name="play_episode_toast">Episode abspielen</string>
+    <string name="subs_default_reset_toast">Auf Standardwert zurücksetzen</string>
+    <string name="acra_report_toast">Sorry, die Anwendung ist abgestürzt. Ein anonymer Fehlerbericht wird an die Entwickler gesendet</string>
+    <string name="season">Staffel</string>
+    <string name="no_season">Keine Staffel</string>
+    <string name="episode">Episode</string>
+    <string name="episodes">Episoden</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="season_short">S</string>
+    <string name="delete_file">Datei löschen</string>
+    <string name="episode_short">E</string>
+    <string name="no_episodes_found">Keine Episoden gefunden</string>
+    <string name="delete">Löschen</string>
+    <string name="pause">Pause</string>
+    <string name="resume">Fortsetzen</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="delete_message" formatted="true">Dadurch wird %s permanent gelöscht
+\nBist du dir sicher\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nverbleibend</string>
+    <string name="status_ongoing">Laufend</string>
+    <string name="status_completed">Abgeschlossen</string>
+    <string name="status">Status</string>
+    <string name="year">Jahr</string>
+    <string name="rating">Bewertung</string>
+    <string name="duration">Länge</string>
+    <string name="site">Website</string>
+    <string name="synopsis">Zusammenfassung</string>
+    <string name="queued">In Warteschlange eingereiht</string>
+    <string name="no_subtitles">Keine Untertitel</string>
+    <string name="default_subtitles">Standard</string>
+    <string name="free_storage">Frei</string>
+    <string name="used_storage">Benutzt</string>
+    <string name="app_storage">App</string>
+    <string name="movies">Filme</string>
+    <string name="tv_series">TV Serien</string>
+    <string name="cartoons">Trickfilme</string>
+    <string name="anime">Anime</string>
+    <string name="torrent">Torrents</string>
+    <string name="documentaries">Dokumentationen</string>
+    <string name="ova">OVA</string>
+    <string name="asian_drama">Asiatische Dramen</string>
+    <string name="livestreams">Livestreams</string>
+    <string name="nsfw">NSFW</string>
+    <string name="others">Andere</string>
+    <string name="movies_singular">Film</string>
+    <string name="tv_series_singular">Serie</string>
+    <string name="cartoons_singular">Trickfilm</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
+    <string name="torrent_singular">Torrent</string>
+    <string name="documentaries_singular">Dokumentation</string>
+    <string name="asian_drama_singular">Asiatisches Drama</string>
+    <string name="live_singular">Livestream</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="other_singular">Video</string>
+    <string name="source_error">Quellenfehler</string>
+    <string name="remote_error">Remotefehler</string>
+    <string name="render_error">Renderfehler</string>
+    <string name="unexpected_error">Unerwarteter Playerfehler</string>
+    <string name="storage_error">Downloadfehler, Speicherberechtigungen prüfen</string>
+    <string name="episode_action_chromecast_episode">Chromecast-Episode</string>
+    <string name="episode_action_play_in_format">In %s wiedergeben</string>
+    <string name="episode_action_play_in_browser">In Browser wiedergeben</string>
+    <string name="episode_action_copy_link">Link kopieren</string>
+    <string name="episode_action_auto_download">Auto Download</string>
+    <string name="episode_action_download_mirror">Downloadmirror</string>
+    <string name="episode_action_reload_links">Links neu laden</string>
+    <string name="episode_action_download_subtitle">Untertitel herunterladen</string>
+    <string name="show_hd">Qualitätsanzeige</string>
+    <string name="show_dub">Dub Label</string>
+    <string name="show_sub">Sub Label</string>
+    <string name="show_title">Titel</string>
+    <string name="poster_ui_settings">UI-Elemente auf Vorschaubild umschalten</string>
+    <string name="no_update_found">Kein Update gefunden</string>
+    <string name="check_for_update">Auf Update prüfen</string>
+    <string name="video_lock">Sperren</string>
+    <string name="video_aspect_ratio_resize">Skalieren</string>
+    <string name="video_source">Quelle</string>
+    <string name="video_skip_op">Intro überspringen</string>
+    <string name="dont_show_again">Nicht mehr anzeigen</string>
+    <string name="skip_update">Update ignorieren</string>
+    <string name="update">Update</string>
+    <string name="watch_quality_pref">Bevorzugte Auflösung</string>
+    <string name="limit_title">Videoplayer Titel max. Zeichen</string>
+    <string name="limit_title_rez">Videoplayers Auflösung</string>
+    <string name="video_buffer_size_settings">Videopuffergröße</string>
+    <string name="video_buffer_length_settings">Videopufferlänge</string>
+    <string name="video_buffer_disk_settings">Video-Cache in Speicher</string>
+    <string name="video_buffer_clear_settings">Video- und Bild-Cache leeren</string>
+    <string name="video_ram_description">Verursacht Abstürze, wenn zu hoch eingestellt. Nicht ändern, wenn wenig Arbeitsspeicher verfügbar ist, wie z.B. ein Android TV oder ein altes Telefon</string>
+    <string name="video_disk_description">Kann auf Systemen mit geringem Speicherplatz, wie z. B. Android TV-Geräten, zu Problemen führen, wenn der Wert zu hoch eingestellt ist</string>
+    <string name="dns_pref">DNS über HTTPS</string>
+    <string name="dns_pref_summary">Nützlich für die Umgehung von ISP-Sperren</string>
+    <string name="add_site_pref">Website klonen</string>
+    <string name="remove_site_pref">Website entfernen</string>
+    <string name="add_site_summary">Einen Klon einer bestehenden Website mit einer anderen URL hinzufügen</string>
+    <string name="download_path_pref">Downloadpfad</string>
+    <string name="nginx_url_pref">Nginx-Server-URL</string>
+    <string name="display_subbed_dubbed_settings">Dubbed/Subbed Anime anzeigen (Synchronisiert/Untertitelt)</string>
+    <string name="resize_fit">An Bildschirm anpassen</string>
+    <string name="resize_fill">Strecken</string>
+    <string name="resize_zoom">Vergrößern</string>
+    <string name="legal_notice">Haftungsausschluss</string>
+    <string name="category_general">General</string>
+    <string name="random_button_settings">Zufalls-Button</string>
+    <string name="random_button_settings_desc">Zeige Zufallsgenerator Schaltfläche auf der Startseite</string>
+    <string name="provider_lang_settings">Anbieter Sprachen</string>
+    <string name="app_layout">App Layout</string>
+    <string name="preferred_media_settings">Bevorzugte Medien</string>
+    <string name="enable_nsfw_on_providers">Aktivieren der NSFW auf unterstützten Anbietern</string>
+    <string name="subtitles_encoding">Untertitel-Kodierung</string>
+    <string name="category_providers">Anbieter</string>
+    <string name="category_ui">Layout</string>
+    <string name="automatic">Auto</string>
+    <string name="tv_layout">TV Layout</string>
+    <string name="phone_layout">Handy Layout</string>
+    <string name="emulator_layout">Emulator Layout</string>
+    <string name="primary_color_settings">Grundfarbe</string>
+    <string name="app_theme_settings">App-Thema</string>
+    <string name="bottom_title_settings">Vorschaubild Titel Platzierung</string>
+    <string name="bottom_title_settings_des">Titel unter Vorschaubild platzieren</string>
+    <string name="example_password">passwort123</string>
+    <string name="example_username">MeinCoolerUsername</string>
+    <string name="example_email">hello@world.com</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="example_site_name">MeineCooleSeite</string>
+    <string name="example_site_url">example.com</string>
+    <string name="example_lang_name">Sprachcode (en)</string>
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="account">Account</string>
+    <string name="logout">Ausloggen</string>
+    <string name="login">Einloggen</string>
+    <string name="switch_account">Account wechseln</string>
+    <string name="add_account">Account hinzufügen</string>
+    <string name="create_account">Account erstellen</string>
+    <string name="add_sync">Synchronisation hinzufügen</string>
+    <string name="added_sync_format" formatted="true">Hinzugefügt %s</string>
+    <string name="upload_sync">Sync</string>
+    <string name="sync_score">Bewertung</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="authenticated_user" formatted="true">Authentifiziert %s</string>
+    <string name="authenticated_user_fail" formatted="true">Die Authentifizierung bei %s ist fehlgeschlagen</string>
+    <string name="none">Keine</string>
+    <string name="normal">Normal</string>
+    <string name="all">Alle</string>
+    <string name="max">Max</string>
+    <string name="min">Min</string>
+    <string name="subtitles_outline">Umrandung</string>
+    <string name="subtitles_depressed">Gesenkt</string>
+    <string name="subtitles_shadow">Schatten</string>
+    <string name="subtitles_raised">Erhöht</string>
+    <string name="subtitle_offset">Untertitel synchronisieren</string>
+    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_title">Untertitelverzögerung</string>
+    <string name="subtitle_offset_extra_hint_later_format">Verwenden, wenn die Untertitel %dms zu früh angezeigt werden</string>
+    <string name="subtitle_offset_extra_hint_before_format">Verwenden, wenn die Untertitel %dms zu spät angezeigt werden</string>
+    <string name="subtitle_offset_extra_hint_none_format">Keine Untertitelverzögerung</string>
+    <string name="subtitles_example_text">Vogel Quax zwickt Johnys Pferd Bim</string>
+    <string name="recommended">Empfohlen</string>
+    <string name="player_loaded_subtitles" formatted="true">%s geladen</string>
+    <string name="player_load_subtitles">Aus Datei laden</string>
+    <string name="player_load_subtitles_online">Vom Internet laden</string>
+    <string name="downloaded_file">Heruntergeladene Datei</string>
+    <string name="actor_main">Hauptdarsteller</string>
+    <string name="actor_supporting">Nebendarsteller</string>
+    <string name="actor_background">Hintergrunddarsteller</string>
+    <string name="home_source">Anbieter</string>
+    <string name="home_random">Zufällig</string>
+    <string name="coming_soon">Demnächst…</string>
+    <string name="quality_cam">Cam</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
+    <string name="quality_hq">HQ</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_tc">TC</string>
+    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="quality_4k">4K</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="quality_webrip">Web</string>
+    <string name="poster_image">Vorschaubild</string>
+    <string name="category_player">Player</string>
+    <string name="resolution_and_title">Auflösung und Titel</string>
+    <string name="title">Titel</string>
+    <string name="resolution">Auflösung</string>
+    <string name="error_invalid_id">Ungültige ID</string>
+    <string name="error_invalid_data">Ungültige Daten</string>
+    <string name="error_invalid_url">Ungültige URL</string>
+    <string name="error">Fehler</string>
+    <string name="subtitles_remove_captions">Softsubs aus Untertiteln entfernen</string>
+    <string name="subtitles_remove_bloat">Entferne nutzloses aus Untertiteln (z.B. Werbung)</string>
+    <string name="subtitles_filter_lang">Nach bevorzugter Mediensprache filtern</string>
+    <string name="extras">Extras</string>
+    <string name="trailer">Trailer</string>
+    <string name="network_adress_example">Link zum Stream</string>
+    <string name="referer">Referent</string>
+    <string name="next">Weiter</string>
+    <string name="provider_languages_tip">Videos in diesen Sprachen ansehen</string>
+    <string name="previous">Vorherige</string>
+    <string name="skip_setup">Einrichtung überspringen</string>
+    <string name="app_layout_subtext">Aussehen der App passend zu dem des Geräts ändern</string>
+    <string name="crash_reporting_title">Absturzmeldung</string>
+    <string name="preferred_media_subtext">Was möchtest du anschauen\?</string>
+    <string name="setup_done">Fertig</string>
+    <string name="extensions">Erweiterungen</string>
+    <string name="add_repository">Repository hinzufügen</string>
+    <string name="repository_name_hint">Repository-Name</string>
+    <string name="repository_url_hint">Repository-URL</string>
+    <string name="plugin_loaded">Plugin geladen</string>
+    <string name="plugin_deleted">Plugin gelöscht</string>
+    <string name="plugin_load_fail" formatted="true">Fehler beim Laden von %s</string>
+    <string name="is_adult">18+</string>
+    <string name="batch_download_start_format" formatted="true">Herunterladen begonnen %d %s</string>
+    <string name="batch_download_finish_format" formatted="true">Downloaded %d %s erfolgreich</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Alle %s bereits heruntergeladen</string>
+    <string name="batch_download">Batch Download</string>
+    <string name="plugin_singular">Plugin</string>
+    <string name="plugin">Plugins</string>
+    <string name="delete_repository_plugins">Dadurch werden auch alle Repository-Plugins gelöscht</string>
+    <string name="delete_repository">Repository löschen</string>
+    <string name="setup_extensions_subtext">Liste der Websites herunterladen, welche du verwenden möchtest</string>
+    <string name="plugins_downloaded" formatted="true">Downloaded: %d</string>
+    <string name="plugins_disabled" formatted="true">Heruntergeladen: %d</string>
+    <string name="plugins_not_downloaded" formatted="true">Nicht heruntergeladen: %d</string>
+    <string name="blank_repo_message">Repository hinzufügen um Anbieter-Erweiterungen herunterzuladen</string>
+    <string name="view_public_repositories_button">Community-Repositories anzeigen</string>
+    <string name="view_public_repositories_button_short">Öffentliche Liste</string>
+    <string name="uppercase_all_subtitles">Alle Untertitel in Großbuchstaben</string>
+    <string name="download_all_plugins_from_repo">Alle Plugins aus diesem Repository herunterladen\?</string>
+    <string name="single_plugin_disabled" formatted="true">%s (Deaktiviert)</string>
+    <string name="tracks">Spuren</string>
+    <string name="audio_tracks">Audiospuren</string>
+    <string name="video_tracks">Videospuren</string>
+    <string name="apply_on_restart">Bei Neustart anwenden</string>
+    <string name="safe_mode_title">Abgesicherter Modus aktiviert</string>
+    <string name="safe_mode_description">Ein nicht behebbarer Absturz ist aufgetreten, und wir haben automatisch alle Erweiterungen deaktiviert, damit du die Erweiterung finden und entfernen kannst, die das Problem verursacht.</string>
+    <string name="safe_mode_crash_info">Absturzinfo ansehen</string>
+    <string name="extension_rating" formatted="true">Bewertung: %s</string>
+    <string name="extension_description">Beschreibung</string>
+    <string name="extension_version">Version</string>
+    <string name="extension_status">Status</string>
+    <string name="extension_size">Größe</string>
+    <string name="extension_authors">Autoren</string>
+    <string name="extension_types">Unterstützt</string>
+    <string name="extension_language">Sprache</string>
+    <string name="extension_install_first">Zuerst muss die Erweiterung installiert werden</string>
+    <string name="hls_playlist">HLS Playlist</string>
+    <string name="player_pref">Bevorzugter Videoplayer</string>
+    <string name="player_settings_play_in_app">Interner Player</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="player_settings_play_in_browser">Browser</string>
+    <string name="app_not_found_error">App nicht gefunden</string>
+    <string name="all_languages_preference">Alle Sprachen</string>
+    <string name="skip_type_format" formatted="true">Überspringen %s</string>
+    <string name="skip_type_op">Opening</string>
+    <string name="skip_type_ed">Ending</string>
+    <string name="skip_type_recap">Zusammenfassung</string>
+    <string name="skip_type_mixed_ed">Vermischte Endings</string>
+    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5226280c..38966c3b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -305,4 +305,130 @@
     <string name="automatic_plugin_download_summary">Instale automáticamente todos los plugins aún no instalados de los repositorios agregados.</string>
     <string name="pref_category_looks">Aspecto</string>
     <string name="pref_category_ui_features">Características</string>
+    <string name="random_button_settings">Botón aleatorio</string>
+    <string name="random_button_settings_desc">Muestra un botón aleatorio en la página de inicio</string>
+    <string name="account">cuenta</string>
+    <string name="logout">Cerrar sesión</string>
+    <string name="switch_account">Cambiar cuenta</string>
+    <string name="add_account">Añadir cuenta</string>
+    <string name="upload_sync">Sincronizar</string>
+    <string name="sync_score">Calificación</string>
+    <string name="authenticated_user" formatted="true">%s autenticado</string>
+    <string name="authenticated_user_fail" formatted="true">No se pudo autenticar a %s</string>
+    <string name="recommended">Recomendado</string>
+    <string name="poster_image">Imagen del póster</string>
+    <string name="trailer">Tráiler</string>
+    <string name="coming_soon">Próximamente…</string>
+    <string name="home_random">Aleatorio</string>
+    <string name="actor_main">Principal</string>
+    <string name="error_invalid_data">Datos no válidos</string>
+    <string name="add_sync">Añadir seguimiento</string>
+    <string name="home_source">Fuente</string>
+    <string name="normal">Normal</string>
+    <string name="added_sync_format" formatted="true">Añadido %s</string>
+    <string name="login">Iniciar sesión</string>
+    <string name="year">Año</string>
+    <string name="rating">Calificación</string>
+    <string name="duration">Duración</string>
+    <string name="site">Sitio</string>
+    <string name="synopsis">Sinopsis</string>
+    <string name="queued">Puesto en cola</string>
+    <string name="free_storage">Libre</string>
+    <string name="used_storage">Usado</string>
+    <string name="app_storage">Aplicación</string>
+    <string name="movies">Películas</string>
+    <string name="tv_series">Series de TV</string>
+    <string name="cartoons">Dibujos animados</string>
+    <string name="show_title">Título</string>
+    <string name="poster_ui_settings">Alternar elementos de la interfaz de usuario en el póster</string>
+    <string name="no_update_found">No se encontró ninguna actualización</string>
+    <string name="category_general">General</string>
+    <string name="primary_color_settings">Color primario</string>
+    <string name="app_theme_settings">Tema de la aplicación</string>
+    <string name="example_email">hola@mundo.com</string>
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="all">Todo</string>
+    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_extra_hint_none_format">Sin retraso de subtítulos</string>
+    <string name="actor_supporting">Secundario</string>
+    <string name="actor_background">Extra</string>
+    <string name="resolution_and_title">Resolución y título</string>
+    <string name="error">Error</string>
+    <string name="extras">Extras</string>
+    <string name="anime">Anime</string>
+    <string name="torrent">Torrents</string>
+    <string name="documentaries">Documentales</string>
+    <string name="ova">OVA</string>
+    <string name="asian_drama">Dramas asiáticos</string>
+    <string name="movies_singular">Película</string>
+    <string name="tv_series_singular">Serie</string>
+    <string name="cartoons_singular">Dibujo animado</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
+    <string name="torrent_singular">Torrent</string>
+    <string name="documentaries_singular">Documental</string>
+    <string name="asian_drama_singular">Drama asiático</string>
+    <string name="source_error">Error de fuente</string>
+    <string name="remote_error">Error remoto</string>
+    <string name="render_error">Error del renderizador</string>
+    <string name="storage_error">Error de descarga, verifique los permisos de almacenamiento</string>
+    <string name="show_hd">Etiqueta de calidad</string>
+    <string name="show_dub">Etiqueta de doblaje</string>
+    <string name="show_sub">Etiqueta de subtitulado</string>
+    <string name="check_for_update">Buscar actualizaciones</string>
+    <string name="display_subbed_dubbed_settings">Mostrar anime doblado/subtitulado</string>
+    <string name="video_lock">Bloquear</string>
+    <string name="video_aspect_ratio_resize">Redimensionar</string>
+    <string name="video_source">Fuente</string>
+    <string name="dont_show_again">No volver a mostrar</string>
+    <string name="update">Actualizar</string>
+    <string name="video_buffer_size_settings">Tamaño del búfer de vídeo</string>
+    <string name="video_buffer_length_settings">Duración del búfer de vídeo</string>
+    <string name="video_buffer_disk_settings">Caché de vídeo en disco</string>
+    <string name="video_buffer_clear_settings">Limpiar caché de imágenes y vídeos</string>
+    <string name="video_ram_description">Provocará bloqueos aleatorios si se establece demasiado alto. No lo cambie si tiene poca memoria RAM, como un Android TV o un teléfono antiguo.</string>
+    <string name="video_disk_description">Puede causar problemas en sistemas con poco espacio de almacenamiento, como dispositivos Android TV, si lo configura demasiado alto.</string>
+    <string name="dns_pref">DNS sobre HTTPS</string>
+    <string name="dns_pref_summary">Útil para eludir los bloqueos del ISP</string>
+    <string name="add_site_pref">Clonar sitio</string>
+    <string name="remove_site_pref">Eliminar sitio</string>
+    <string name="add_site_summary">Añade un clon de un sitio existente, con una URL diferente</string>
+    <string name="download_path_pref">Ruta de descarga</string>
+    <string name="nginx_url_pref">URL del servidor Nginx</string>
+    <string name="resize_fit">Ajustar a la pantalla</string>
+    <string name="resize_fill">Estirar</string>
+    <string name="resize_zoom">Zoom</string>
+    <string name="legal_notice">Descargo de responsabilidad</string>
+    <string name="bottom_title_settings">Póster en la ubicación del título</string>
+    <string name="bottom_title_settings_des">Coloca el título debajo del póster</string>
+    <string name="example_password">contraseña123</string>
+    <string name="example_username">MiNombreDeUsuarioGenial</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="example_site_name">MiSitioGenial</string>
+    <string name="example_site_url">ejemplo.com</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="none">Ninguno</string>
+    <string name="max">Máximo</string>
+    <string name="min">Mínimo</string>
+    <string name="subtitle_offset">Sincronizar subtítulos</string>
+    <string name="subtitle_offset_title">Retraso de subtítulos</string>
+    <string name="quality_cam">Cam</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
+    <string name="quality_hq">HQ</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_tc">TC</string>
+    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="quality_4k">4K</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="quality_webrip">Web</string>
+    <string name="title">Título</string>
+    <string name="resolution">Resolución</string>
+    <string name="error_invalid_id">Identificación no válida</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 9d3fb59f..a1611f97 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -250,12 +250,12 @@
     <string name="video_buffer_length_settings">Panjang buffer video</string>
     <string name="video_buffer_disk_settings">Cache video di disk</string>
     <string name="video_buffer_clear_settings">Membersihkan cache video dan gambar</string>
-    <string name="video_ram_description">Dapat menyebabkan crash jika resolusi terlalu tinggi di RAM yang rendah, seperti TV Android atau ponsel lama.</string>
+    <string name="video_ram_description">Dapat menyebabkan crash jika disetel terlalu tinggi. Jangan diubah jika perangkat anda memiliki jumlah RAM yang rendah, seperti TV Android atau ponsel lama.</string>
     <string name="video_disk_description">Dapat bermasalah pada sistem dengan ruang penyimpanan rendah, seperti Android TV, jika diatur terlalu tinggi.</string>
     <string name="dns_pref">DNS melalui HTTPS</string>
     <string name="dns_pref_summary">Berguna untuk melewati blok ISP</string>
     <string name="download_path_pref">Jalur download</string>
-    <string name="nginx_url_pref">Url server Nginx</string>
+    <string name="nginx_url_pref">NGINX server URL</string>
     <string name="display_subbed_dubbed_settings">Tampilkan Anime Dub/Sub</string>
     <string name="resize_fit">Paskan dengan layar</string>
     <string name="resize_fill">Regang</string>
@@ -450,8 +450,8 @@
     <string name="download_all_plugins_from_repo">Unduh semua plugin dari repositori ini\?</string>
     <string name="safe_mode_title">Semua Umur</string>
     <string name="single_plugin_disabled" formatted="true">%s (Tidak aktif)</string>
-    <string name="tracks">Tracks</string>
-    <string name="apply_on_restart">Terapkan saat Restart</string>
+    <string name="tracks">Trek</string>
+    <string name="apply_on_restart">Terapkan saat dimuat ulang</string>
     <string name="extension_description">Keterangan</string>
     <string name="extension_version">Versi</string>
     <string name="extension_status">Status</string>
@@ -467,12 +467,12 @@
     <string name="batch_download_start_format" formatted="true">"Memulai mengunduh  %d %s…"</string>
     <string name="safe_mode_description">Semua fitur tambahkan dimatikan karena crash, untuk memudahkanmu mencari penyebab crash.</string>
     <string name="example_lang_name">Kode bahasa (en)</string>
-    <string name="player_load_subtitles_online">ambil dari internet</string>
+    <string name="player_load_subtitles_online">Ambil dari internet</string>
     <string name="provider_languages_tip">Putar vidio di bahasa ini</string>
     <string name="add_repository">Tambah Repositori</string>
     <string name="delete_repository_plugins">Pilih ini untuk menghapus semua repositori plugin</string>
     <string name="skip_setup">Lewati pengaturan</string>
-    <string name="error_invalid_url">alamat salah</string>
+    <string name="error_invalid_url">Alamat salah</string>
     <string name="network_adress_example">"Alamat  streaming"</string>
     <string name="next">Selanjutnya</string>
     <string name="previous">Sebelumnya</string>
@@ -486,4 +486,17 @@
     <string name="error_invalid_id">ID salah</string>
     <string name="history">Riwayat</string>
     <string name="action_mark_as_watched">Tandai ditonton</string>
+    <string name="error_invalid_data">Data salah</string>
+    <string name="subtitles_remove_captions">Hapus teks tertutup dari subtitel</string>
+    <string name="subtitles_remove_bloat">Hapus karakter sampah dari subtitel</string>
+    <string name="audio_tracks">Audio Trek</string>
+    <string name="video_tracks">Vidio Trek</string>
+    <string name="extension_types">Dukungan</string>
+    <string name="hls_playlist">Daftar putar HLS</string>
+    <string name="apk_installer_settings">Penginstal APK</string>
+    <string name="subtitles_encoding">Teknik menampilkan subtitel</string>
+    <string name="pref_category_gestures">Gerakan</string>
+    <string name="apk_installer_settings_des">Beberapa perangkat tidak mendukung penginstal paket mode baru. Coba mode lama jika pembaruan tidak dapat diinstal.</string>
+    <string name="pref_category_actions">Aksi</string>
+    <string name="referer">Sumber</string>
 </resources>
\ No newline at end of file

From 83132f183a3dae77a1a8e1500f411edcf3269d98 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Wed, 28 Dec 2022 13:21:46 +0100
Subject: [PATCH 147/273] fix translations

---
 app/src/main/res/values-de/strings-de.xml | 535 ----------------------
 1 file changed, 535 deletions(-)
 delete mode 100644 app/src/main/res/values-de/strings-de.xml

diff --git a/app/src/main/res/values-de/strings-de.xml b/app/src/main/res/values-de/strings-de.xml
deleted file mode 100644
index 065990c5..00000000
--- a/app/src/main/res/values-de/strings-de.xml
+++ /dev/null
@@ -1,535 +0,0 @@
-<resources>
-    <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
-    <string name="result_poster_img_des">Vorschaubild</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
-    <string name="episode_poster_img_des">Episodenvorschaubild</string>
-    <string name="home_main_poster_img_des">Medienvorschaubild</string>
-    <string name="home_next_random_img_des">Nächstes zufällig</string>
-    <string name="go_back_img_des">Zurück</string>
-    <string name="home_change_provider_img_des">Anbieter wechseln</string>
-    <string name="preview_background_img_des">Hintergrundbildvorschau</string>
-
-    <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
-    <string name="player_speed_text_format" formatted="true">Geschwindigkeit (%.2fx)</string>
-    <string name="rated_format" formatted="true">Bewertung: %.1f</string>
-    <string name="new_update_format" formatted="true">Neues Update gefunden!\n%s -> %s</string>
-    <string name="filler" formatted="true">Füller</string>
-    <string name="duration_format" formatted="true">%d Min</string>
-
-    <string name="app_name">CloudStream</string>
-    <string name="play_with_app_name">Mit CloudStream abspielen</string>
-    <string name="title_home">Startseite</string>
-    <string name="title_search">Suchen</string>
-    <string name="title_downloads">Downloads</string>
-    <string name="title_settings">Einstellungen</string>
-
-    <string name="search_hint">Suchen…</string>
-    <string name="search_hint_site" formatted="true">Suche %s…</string>
-
-    <string name="no_data">Keine Daten vorhanden</string>
-    <string name="episode_more_options_des">Mehr Optionen</string>
-    <string name="next_episode">Nächste Epsisode</string>
-    <string name="result_tags">Genres</string>
-    <string name="result_share">Teilen</string>
-    <string name="result_open_in_browser">In Browser öffnen</string>
-    <string name="skip_loading">Puffern überspringen</string>
-    <string name="loading">Lädt…</string>
-
-    <string name="type_watching">Am schauen</string>
-    <string name="type_on_hold">Pausiert</string>
-    <string name="type_completed">Abgeschlossen</string>
-    <string name="type_dropped">Abgebrochen</string>
-    <string name="type_plan_to_watch">Geplant</string>
-    <string name="type_none">Nichts</string>
-    <string name="type_re_watching">Erneut anschauen</string>
-
-    <string name="play_movie_button">Film abspielen</string>
-    <string name="play_livestream_button">Livestream abspielen</string>
-    <string name="play_torrent_button">Torrent streamen</string>
-    <string name="pick_source">Quellen</string>
-    <string name="pick_subtitle">Untertitel</string>
-    <string name="reload_error">Erneuter Verbindungsaufbau…</string>
-    <string name="go_back">Zurück</string>
-    <string name="play_episode">Episode abspielen</string>
-    <!--<string name="need_storage">Allow to download episodes</string>-->
-
-    <string name="download">Herunterladen</string>
-    <string name="downloaded">Heruntergeladen</string>
-    <string name="downloading">Lädt herunter</string>
-    <string name="download_paused">Download pausiert</string>
-    <string name="download_started">Download startet</string>
-    <string name="download_failed">Download fehlgeschlagen</string>
-    <string name="download_canceled">Download abgebrochen</string>
-    <string name="download_done">Download abgeschlossen</string>
-    <string name="stream">Stream</string>
-
-    <string name="error_loading_links_toast">Fehler beim Laden von Links</string>
-    <string name="download_storage_text">Interner Speicher</string>
-
-    <string name="app_dubbed_text">Dub</string>
-    <string name="app_subbed_text">Sub</string>
-
-    <string name="popup_delete_file">Datei löschen</string>
-    <string name="popup_play_file">Datei abspielen</string>
-    <string name="popup_resume_download">Download fortsetzen</string>
-    <string name="popup_pause_download">Download pausieren</string>
-
-    <string name="pref_disable_acra">Automatische Fehlerberichterstattung deaktivieren</string>
-    <string name="home_more_info">Mehr Infos</string>
-    <string name="home_expanded_hide">Verstecken</string>
-    <string name="home_play">Abspielen</string>
-    <string name="home_info">Info</string>
-    <string name="filter_bookmarks">Lesezeichen filtern</string>
-    <string name="error_bookmarks_text">Lesezeichen</string>
-    <string name="action_remove_from_bookmarks">Entfernen</string>
-    <string name="action_add_to_bookmarks">Status setzen</string>
-    <string name="sort_apply">Anwenden</string>
-    <string name="sort_cancel">Abbrechen</string>
-    <string name="sort_copy">Kopieren</string>
-    <string name="sort_close">Schließen</string>
-    <string name="sort_clear">Löschen</string>
-    <string name="sort_save">Speichern</string>
-
-    <string name="player_speed">Player Geschwindigkeit</string>
-
-    <string name="subtitles_settings">Untertiteleinstellungen</string>
-    <string name="subs_text_color">Textfarbe</string>
-    <string name="subs_outline_color">Konturfarbe</string>
-    <string name="subs_background_color">Hintergrundfarbe</string>
-    <string name="subs_window_color">Fensterfarbe</string>
-    <string name="subs_edge_type">Kanten-Typ</string>
-    <string name="subs_subtitle_elevation">Untertitelhöhe</string>
-    <string name="subs_font">Schriftart</string>
-    <string name="subs_font_size">Schriftgröße</string>
-
-    <string name="search_provider_text_providers">Suche anhand Anbietern</string>
-    <string name="search_provider_text_types">Suche anhand Typen</string>
-
-    <string name="benene_count_text">%d Benenes an die Devs verteilt</string>
-    <string name="benene_count_text_none">Noch keine Benenes verteilt</string>
-
-    <string name="subs_auto_select_language">Sprache automatisch wählen</string>
-    <string name="subs_download_languages">Sprachen herunterladen</string>
-    <string name="subs_subtitle_languages">Untertitelsprache</string>
-    <string name="subs_hold_to_reset_to_default">Halten, um auf die Standardeinstellungen zurückzusetzen</string>
-    <string name="subs_import_text" formatted="true">Fonts in %s importieren</string>
-    <string name="continue_watching">Weiterschauen</string>
-
-    <string name="action_remove_watching">Entfernen</string>
-    <string name="action_open_watching">Mehr Infos</string>
-    <string name="action_open_play">@string/home_play </string>
-
-    <string name="vpn_might_be_needed">Damit dieser Anbieter korrekt funktioniert, ist möglicherweise ein VPN erforderlich</string>
-    <string name="vpn_torrent">Dieser Anbieter bietet Torrents an, ein VPN wird dringend empfohlen</string>
-
-    <string name="provider_info_meta">Metadaten werden nicht von der Website bereitgestellt, das Laden des Videos schlägt fehl, wenn sie auf der Website nicht vorhanden sind.</string>
-
-    <string name="torrent_plot">Beschreibung</string>
-    <string name="normal_no_plot">Keine Handlung gefunden</string>
-    <string name="torrent_no_plot">Keine Beschreibung gefunden</string>
-
-    <string name="show_log_cat">Logcat anzeigen 🐈</string>
-
-    <string name="picture_in_picture">Bild-in-Bild</string>
-    <string name="picture_in_picture_des">Setzt die Wiedergabe in einem kleinen Fenster über anderen Anwendungen fort</string>
-    <string name="player_size_settings">Player Skalierung anpassen</string>
-    <string name="player_size_settings_des">Entfernt schwarze Ränder</string>
-    <string name="player_subtitles_settings">Untertitel</string>
-    <string name="player_subtitles_settings_des">Player Untertiteleinstellungen</string>
-    <string name="chromecast_subtitles_settings">Chromecast Untertitel</string>
-    <string name="chromecast_subtitles_settings_des">Chromecast Untertiteleinstellungen</string>
-
-    <string name="eigengraumode_settings">Eigengravy-Modus</string>
-    <string name="eigengraumode_settings_des">Fügt eine Geschwindigkeitsoption im Player hinzu</string>
-    <string name="swipe_to_seek_settings">Wischen zum vor- und zurückspulen</string>
-    <string name="swipe_to_seek_settings_des">Nach links oder rechts wischen, um die Zeit im Videoplayer zu steuern</string>
-    <string name="swipe_to_change_settings">Wischen, um Einstellungen zu ändern</string>
-    <string name="swipe_to_change_settings_des">Nach links oder rechts wischen, um die Helligkeit oder Lautstärke zu ändern</string>
-
-    <string name="autoplay_next_settings">Nächste Episode automatisch abspielen</string>
-    <string name="autoplay_next_settings_des">Nächste Episode wird gestartet, sobald die aktuelle Episode endet</string>
-
-    <string name="double_tap_to_seek_settings">Doppeltippen zum vor- und zurückspulen</string>
-    <string name="double_tap_to_pause_settings">Doppeltippen zum Pausieren</string>
-    <string name="double_tap_to_seek_amount_settings">Zeit für vor- und zurückspulen im Player</string>
-    <string name="double_tap_to_seek_settings_des">Zweimal auf die rechte oder linke Seite tippen, um vor- oder zurückzuspulen
-    </string>
-    <string name="double_tap_to_pause_settings_des">In die Mitte tippen, um zu pausieren</string>
-    <string name="use_system_brightness_settings">Systemhelligkeit verwenden</string>
-    <string name="use_system_brightness_settings_des">Systemhelligkeit anstelle eines dunklen 
-        Overlay im Player verwenden
-    </string>
-
-    <string name="episode_sync_settings">Episodenfortschritt aktualisieren</string>
-    <string name="episode_sync_settings_des">Automatisches Synchronisieren des aktuellen Episodenfortschritts</string>
-
-    <string name="restore_settings">Daten aus Sicherung wiederherstellen</string>
-
-    <string name="backup_settings">Daten sichern</string>
-    <string name="restore_success">Sicherungsdatei geladen</string>
-    <string name="restore_failed_format" formatted="true">Wiederherstellung der Daten aus der Datei %s fehlgeschlagen</string>
-    <string name="backup_success">Daten erfolgreich gesichert</string>
-    <string name="backup_failed">Speicherberechtigungen fehlen, bitte erneut versuchen</string>
-    <string name="backup_failed_error_format">Fehler beim Sichern von %s</string>
-
-    <string name="search">Suche</string>
-    <string name="category_account">Konten</string>
-    <string name="category_updates">Updates und Datensicherung</string>
-    
-    <string name="settings_info">Info</string>
-    <string name="advanced_search">Erweiterte Suche</string>
-    <string name="advanced_search_des">Liefert die Suchergebnisse getrennt nach Anbietern</string>
-    <string name="bug_report_settings_off">Sendet Daten nur bei Abstürzen</string>
-    <string name="bug_report_settings_on">Sendet keine Daten</string>
-    <string name="show_fillers_settings">Füller-Episoden für Animes zeigen</string>
-    <string name="show_trailers_settings">Trailer zeigen</string>
-    <string name="kitsu_settings">Vorschaubilder von Kitsu anzeigen</string>
-    <string name="pref_filter_search_quality">Ausgewählte Videoqualität bei Suchergebnissen ausblenden</string>
-
-    <string name="automatic_plugin_updates">Automatische Plugin-Updates</string>
-    <string name="updates_settings">App-Updates anzeigen</string>
-    <string name="updates_settings_des">Automatisches Suchen nach neuen Updates beim Start</string>
-    <string name="uprereleases_settings">Auf Vorabversionen updaten</string>
-    <string name="uprereleases_settings_des">Suche nach Vorabversionen statt nur nach Vollversionen</string>
-    <string name="github">Github</string>
-    <string name="lightnovel">Light Novel App von denselben Entwicklern</string>
-    <string name="anim">Anime App von denselben Entwicklern</string>
-    <string name="discord">Discord beitreten</string>
-    <string name="benene">Eine Benene an die Devs verteilen</string>
-    <string name="benene_des">Verteilte Benenes</string>
-
-    <string name="app_language">App Sprache</string>
-
-    <string name="no_chromecast_support_toast">Dieser Anbieter hat keine Chromecast-Unterstützung</string>
-    <string name="no_links_found_toast">Keine Verlinkung gefunden</string>
-    <string name="copy_link_toast">Link in die Zwischenablage kopiert</string>
-    <string name="play_episode_toast">Episode abspielen</string>
-    <string name="subs_default_reset_toast">Auf Standardwert zurücksetzen</string>
-    <string name="acra_report_toast">Sorry, die Anwendung ist abgestürzt. Ein anonymer Fehlerbericht wird an die
-        Entwickler gesendet
-    </string>
-
-    <string name="season">Staffel</string>
-    <string name="no_season">Keine Staffel</string>
-    <string name="episode">Episode</string>
-    <string name="episodes">Episoden</string>
-    <string name="episodes_range">%d-%d</string>
-    <string name="episode_format" formatted="true">%d %s</string>
-    <string name="season_short">S</string>
-    <string name="episode_short">E</string>
-    <string name="no_episodes_found">Keine Episoden gefunden</string>
-
-    <string name="delete_file">Datei löschen</string>
-    <string name="delete">Löschen</string>
-    <string name="pause">Pause</string>
-    <string name="resume">Fortsetzen</string>
-    <string name="go_back_30">-30</string>
-    <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Dadurch wird %s permanent gelöscht \nBist du dir sicher?</string>
-    <string name="resume_time_left" formatted="true">%dm\nverbleibend</string>
-
-
-    <string name="status_ongoing">Laufend</string>
-    <string name="status_completed">Abgeschlossen</string>
-    <string name="status">Status</string>
-    <string name="year">Jahr</string>
-    <string name="rating">Bewertung</string>
-    <string name="duration">Länge</string>
-    <string name="site">Website</string>
-    <string name="synopsis">Zusammenfassung</string>
-
-    <string name="queued">In Warteschlange eingereiht</string>
-    <string name="no_subtitles">Keine Untertitel</string>
-    <string name="default_subtitles">Standard</string>
-
-    <string name="free_storage">Frei</string>
-    <string name="used_storage">Benutzt</string>
-    <string name="app_storage">App</string>
-
-    <!--plural-->
-    <string name="movies">Filme</string>
-    <string name="tv_series">TV Serien</string>
-    <string name="cartoons">Trickfilme</string>
-    <string name="anime">Anime</string>
-    <string name="torrent">Torrents</string>
-    <string name="documentaries">Dokumentationen</string>
-    <string name="ova">OVA</string>
-    <string name="asian_drama">Asiatische Dramen</string>
-    <string name="livestreams">Livestreams</string>
-    <string name="nsfw">NSFW</string>
-    <string name="others">Andere</string>
-
-    <!--singular-->
-    <string name="movies_singular">Film</string>
-    <string name="tv_series_singular">Serie</string>
-    <string name="cartoons_singular">Trickfilm</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
-    <string name="torrent_singular">Torrent</string>
-    <string name="documentaries_singular">Dokumentation</string>
-    <string name="asian_drama_singular">Asiatisches Drama</string>
-    <string name="live_singular">Livestream</string>
-    <string name="nsfw_singular">NSFW</string>
-    <string name="other_singular">Video</string>
-
-    <string name="source_error">Quellenfehler</string>
-    <string name="remote_error">Remotefehler</string>
-    <string name="render_error">Renderfehler</string>
-    <string name="unexpected_error">Unerwarteter Playerfehler</string>
-    <string name="storage_error">Downloadfehler, Speicherberechtigungen prüfen</string>
-
-    <string name="episode_action_chromecast_episode">Chromecast-Episode</string>
-    <string name="episode_action_chromecast_mirror">Chromecastmirror</string>
-    <string name="episode_action_play_in_app">In App wiedergeben</string>
-    <string name="episode_action_play_in_format">In %s wiedergeben</string>
-    <string name="episode_action_play_in_browser">In Browser wiedergeben</string>
-    <string name="episode_action_copy_link">Link kopieren</string>
-    <string name="episode_action_auto_download">Auto Download</string>
-    <string name="episode_action_download_mirror">Downloadmirror</string>
-    <string name="episode_action_reload_links">Links neu laden</string>
-    <string name="episode_action_download_subtitle">Untertitel herunterladen</string>
-
-    <string name="show_hd">Qualitätsanzeige</string>
-    <string name="show_dub">Dub Label</string>
-    <string name="show_sub">Sub Label</string>
-    <string name="show_title">Titel</string>
-    <string name="poster_ui_settings">UI-Elemente auf Vorschaubild umschalten</string>
-
-    <string name="no_update_found">Kein Update gefunden</string>
-    <string name="check_for_update">Auf Update prüfen</string>
-
-    <string name="video_lock">Sperren</string>
-    <string name="video_aspect_ratio_resize">Skalieren</string>
-    <string name="video_source">Quelle</string>
-    <string name="video_skip_op">Intro überspringen</string>
-
-    <string name="dont_show_again">Nicht mehr anzeigen</string>
-    <string name="skip_update">Update ignorieren</string>
-    <string name="update">Update</string>
-    <string name="watch_quality_pref">Bevorzugte Auflösung</string>
-    <string name="limit_title">Videoplayer Titel max. Zeichen</string>
-    <string name="limit_title_rez">Videoplayers Auflösung</string>
-
-    <string name="video_buffer_size_settings">Videopuffergröße</string>
-    <string name="video_buffer_length_settings">Videopufferlänge</string>
-    <string name="video_buffer_disk_settings">Video-Cache in Speicher</string>
-    <string name="video_buffer_clear_settings">Video- und Bild-Cache leeren</string>
-
-    <string name="video_ram_description">Verursacht Abstürze, wenn zu hoch eingestellt. Nicht ändern, wenn wenig Arbeitsspeicher verfügbar ist, wie z.B. ein Android TV oder ein altes Telefon</string>
-    <string name="video_disk_description">Kann auf Systemen mit geringem Speicherplatz, wie z. B. Android TV-Geräten, zu Problemen führen, wenn der Wert zu hoch eingestellt ist</string>
-
-    <string name="dns_pref">DNS über HTTPS</string>
-    <string name="dns_pref_summary">Nützlich für die Umgehung von ISP-Sperren</string>
-
-    <string name="add_site_pref">Website klonen</string>
-    <string name="remove_site_pref">Website entfernen</string>
-    <string name="add_site_summary">Einen Klon einer bestehenden Website mit einer anderen URL hinzufügen</string>
-
-    <string name="download_path_pref">Downloadpfad</string>
-
-    <string name="nginx_url_pref">Nginx-Server-URL</string>
-
-    <string name="display_subbed_dubbed_settings">Dubbed/Subbed Anime anzeigen (Synchronisiert/Untertitelt)</string>
-
-    <string name="resize_fit">An Bildschirm anpassen</string>
-    <string name="resize_fill">Strecken</string>
-    <string name="resize_zoom">Vergrößern</string>
-
-    <string name="legal_notice">Haftungsausschluss</string>
-    <string name="category_general">General</string>
-    <string name="random_button_settings">Zufalls-Button</string>
-    <string name="random_button_settings_desc">Zeige Zufallsgenerator Schaltfläche auf der Startseite</string>
-    <string name="provider_lang_settings">Anbieter Sprachen</string>
-    <string name="app_layout">App Layout</string>
-    <string name="preferred_media_settings">Bevorzugte Medien</string>
-    <string name="subtitles_encoding">Untertitel-Kodierung</string>
-    <string name="category_ui">Layout</string>
-
-    <string name="automatic">Auto</string>
-    <string name="tv_layout">TV Layout</string>
-    <string name="phone_layout">Handy Layout</string>
-    <string name="emulator_layout">Emulator Layout</string>
-
-    <string name="primary_color_settings">Grundfarbe</string>
-    <string name="app_theme_settings">App-Thema</string>
-    <string name="bottom_title_settings">Vorschaubild Titel Platzierung</string>
-    <string name="bottom_title_settings_des">Titel unter Vorschaubild platzieren</string>
-
-
-    <!-- account stuff -->
-    <string name="example_password">passwort123</string>
-    <string name="example_username">MeinCoolerUsername</string>
-    <string name="example_email">hello@world.com</string>
-    <string name="example_ip">127.0.0.1</string>
-    <string name="example_site_name">MeineCooleSeite</string>
-    <string name="example_site_url">example.com</string>
-    <string name="example_lang_name">Sprachcode (en)</string>
-    <string name="login_format" formatted="true">%s %s</string>
-    <string name="account">Account</string>
-    <string name="logout">Ausloggen</string>
-    <string name="login">Einloggen</string>
-    <string name="switch_account">Account wechseln</string>
-    <string name="add_account">Account hinzufügen</string>
-    <string name="create_account">Account erstellen</string>
-    <string name="add_sync">Synchronisation hinzufügen</string>
-    <string name="added_sync_format" formatted="true">Hinzugefügt %s</string>
-    <string name="upload_sync">Sync</string>
-    <string name="sync_score">Bewertung</string>
-    <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
-    <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="authenticated_user" formatted="true">Authentifiziert %s</string>
-    <string name="authenticated_user_fail" formatted="true">Die Authentifizierung bei %s ist fehlgeschlagen</string>
-
-    <!-- ============ -->
-    <string name="none">Keine</string>
-    <string name="normal">Normal</string>
-    <string name="all">Alle</string>
-    <string name="max">Max</string>
-    <string name="min">Min</string>
-    <string name="subtitles_outline">Umrandung</string>
-    <string name="subtitles_depressed">Gesenkt</string>
-    <string name="subtitles_shadow">Schatten</string>
-    <string name="subtitles_raised">Erhöht</string>
-    <string name="subtitle_offset">Untertitel synchronisieren</string>
-    <string name="subtitle_offset_hint">1000ms</string>
-    <string name="subtitle_offset_title">Untertitelverzögerung</string>
-    <string name="subtitle_offset_extra_hint_later_format">Verwenden, wenn die Untertitel %dms zu früh angezeigt werden</string>
-    <string name="subtitle_offset_extra_hint_before_format">Verwenden, wenn die Untertitel %dms zu spät angezeigt werden</string>
-    <string name="subtitle_offset_extra_hint_none_format">Keine Untertitelverzögerung</string>
-
-    <!--
-    Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
-    see: 
-	https://en.wikipedia.org/w/index.php?title=Pangram&oldid=225849300
-	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
-    -->
-    <string name="subtitles_example_text">Vogel Quax zwickt Johnys Pferd Bim</string>
-
-    <string name="recommended">Empfohlen</string>
-    <string name="player_loaded_subtitles" formatted="true">%s geladen</string>
-    <string name="player_load_subtitles">Aus Datei laden</string>
-    <string name="player_load_subtitles_online">Vom Internet laden</string>
-    <string name="downloaded_file">Heruntergeladene Datei</string>
-    <string name="actor_main">Hauptdarsteller</string>
-    <string name="actor_supporting">Nebendarsteller</string>
-    <string name="actor_background">Hintergrunddarsteller</string>
-
-    <string name="home_source">Anbieter</string>
-    <string name="home_random">Zufällig</string>
-
-    <string name="coming_soon">Demnächst...</string>
-
-    <string name="quality_cam">Cam</string>
-    <string name="quality_cam_rip">Cam</string>
-    <string name="quality_cam_hd">Cam</string>
-    <string name="quality_hq">HQ</string>
-    <string name="quality_hd">HD</string>
-    <string name="quality_ts">TS</string>
-    <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
-    <string name="quality_workprint">WP</string>
-    <string name="quality_dvd">DVD</string>
-    <string name="quality_4k">4K</string>
-    <string name="quality_sd">SD</string>
-    <string name="quality_uhd">UHD</string>
-    <string name="quality_hdr">HDR</string>
-    <string name="quality_sdr">SDR</string>
-    <string name="quality_webrip">Web</string>
-
-    <string name="poster_image">Vorschaubild</string>
-    <string name="category_player">Player</string>
-    <string name="resolution_and_title">Auflösung und Titel</string>
-    <string name="title">Titel</string>
-    <string name="resolution">Auflösung</string>
-    <string name="error_invalid_id">Ungültige ID</string>
-    <string name="error_invalid_data">Ungültige Daten</string>
-    <string name="error_invalid_url">Ungültige URL</string>
-    <string name="error">Fehler</string>
-    <string name="subtitles_remove_captions">Softsubs aus Untertiteln entfernen</string>
-    <string name="subtitles_remove_bloat">Entferne nutzloses aus Untertiteln (z.B. Werbung)</string>
-    <string name="subtitles_filter_lang">Nach bevorzugter Mediensprache filtern</string>
-    <string name="extras">Extras</string>
-    <string name="trailer">Trailer</string>
-    <string name="network_adress_example">Link zum Stream</string>
-    <string name="referer">Referent</string>
-    <string name="next">Weiter</string>
-    <string name="provider_languages_tip">Videos in diesen Sprachen ansehen</string>
-    <string name="previous">Vorherige</string>
-    <string name="skip_setup">Einrichtung überspringen</string>
-    <string name="app_layout_subtext">Aussehen der App passend zu dem des Geräts ändern</string>
-    <string name="crash_reporting_title">Absturzmeldung</string>
-    <string name="preferred_media_subtext">Was möchtest du anschauen?</string>
-    <string name="setup_done">Fertig</string>
-    <string name="extensions">Erweiterungen</string>
-    <string name="add_repository">Repository hinzufügen</string>
-    <string name="repository_name_hint">Repository-Name</string>
-    <string name="repository_url_hint">Repository-URL</string>
-    <string name="plugin_loaded">Plugin geladen</string>
-    <string name="plugin_deleted">Plugin gelöscht</string>
-    <string name="plugin_load_fail" formatted="true">Fehler beim Laden von %s</string>
-    <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Herunterladen begonnen %d %s</string>
-    <string name="batch_download_finish_format" formatted="true">Downloaded %d %s erfolgreich</string>
-    <string name="batch_download_nothing_to_download_format" formatted="true">Alle %s bereits heruntergeladen</string>
-    <string name="batch_download">Batch Download</string>
-    <string name="plugin_singular">Plugin</string>
-    <string name="plugin">Plugins</string>
-    <string name="delete_repository_plugins">Dadurch werden auch alle Repository-Plugins gelöscht</string>
-    <string name="delete_repository">Repository löschen</string>
-    <string name="setup_extensions_subtext">Liste der Websites herunterladen, welche du verwenden möchtest</string>
-    <string name="plugins_downloaded" formatted="true">Downloaded: %d</string>
-    <string name="plugins_disabled" formatted="true">Heruntergeladen: %d</string>
-    <string name="plugins_not_downloaded" formatted="true">Nicht heruntergeladen: %d</string>
-    <string name="blank_repo_message">Repository hinzufügen um Anbieter-Erweiterungen herunterzuladen</string>
-    <string name="view_public_repositories_button">Community-Repositories anzeigen</string>
-    <string name="view_public_repositories_button_short">Öffentliche Liste</string>
-    <string name="uppercase_all_subtitles">Alle Untertitel in Großbuchstaben</string>
-
-    <string name="download_all_plugins_from_repo">Alle Plugins aus diesem Repository herunterladen?</string>
-    <string name="single_plugin_disabled" formatted="true">%s (Deaktiviert)</string>
-    <string name="safe_mode_title">Abgesicherter Modus aktiviert</string>
-    <string name="safe_mode_description">Ein nicht behebbarer Absturz ist aufgetreten, und wir haben automatisch alle Erweiterungen deaktiviert, damit du die Erweiterung finden und entfernen kannst, die das Problem verursacht.</string>
-    <string name="safe_mode_crash_info">Absturzinfo ansehen</string>
-    <string name="apply_on_restart">Bei Neustart anwenden</string>
-    <string name="audio_tracks">Audiospuren</string>
-    <string name="video_tracks">Videospuren</string>
-    <string name="tracks">Spuren</string>
-    <string name="enable_nsfw_on_providers">Aktivieren der NSFW auf unterstützten Anbietern</string>
-    <string name="category_providers">Anbieter</string>
-	
-    <string name="extension_rating" formatted="true">Bewertung: %s</string>
-    <string name="extension_description">Beschreibung</string>
-    <string name="extension_version">Version</string>
-    <string name="extension_status">Status</string>
-    <string name="extension_size">Größe</string>
-    <string name="extension_authors">Autoren</string>
-    <string name="extension_types">Unterstützt</string>
-    <string name="extension_language">Sprache</string>
-    <string name="extension_install_first">Zuerst muss die Erweiterung installiert werden</string>
-
-    <string name="hls_playlist">HLS Playlist</string>
-
-    <string name="player_pref">Bevorzugter Videoplayer</string>
-    <string name="player_settings_play_in_app">Interner Player</string>
-    <string name="player_settings_play_in_vlc">VLC</string>
-    <string name="player_settings_play_in_mpv">MPV</string>
-    <string name="player_settings_play_in_web">Web Video Cast</string>
-    <string name="player_settings_play_in_browser">Browser</string>
-    <string name="app_not_found_error">App nicht gefunden</string>
-    <string name="all_languages_preference">Alle Sprachen</string>
-
-    <string name="skip_type_format" formatted="true">Überspringen %s</string>
-    <string name="skip_type_op">Opening</string>
-    <string name="skip_type_ed">Ending</string>
-    <string name="skip_type_recap">Zusammenfassung</string>
-    <string name="skip_type_mixed_ed">Vermischte Endings</string>
-    <string name="skip_type_mixed_op">Vermischte Openings</string>
-    <string name="skip_type_creddits">Abspann</string>
-    <string name="skip_type_intro">Intro</string>
-
-    <string name="clear_history">Verlauf löschen</string>
-    <string name="history">Verlauf</string>
-    <string name="enable_skip_op_from_database_des">Überspringen Button für Openings/Endings anzeigen</string>
-    <string name="clipboard_too_large">Zu viel Text. Kann nicht in der Zwischenablage gespeichert werden.</string>
-</resources>

From 714062c6d4832ba81fc0056aeb2c2a2e4876a67d Mon Sep 17 00:00:00 2001
From: LagradOst <11805592+LagradOst@users.noreply.github.com>
Date: Wed, 28 Dec 2022 13:29:23 +0100
Subject: [PATCH 148/273] removed bloat

---
 .../cloudstream3/ui/home/HomeFragment.kt      | 339 +-----------------
 1 file changed, 3 insertions(+), 336 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 8893ce02..3e8970b3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -40,8 +40,6 @@ import com.lagradost.cloudstream3.ui.APIRepository.Companion.randomApi
 import com.lagradost.cloudstream3.ui.AutofitRecyclerView
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
-import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
-import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.search.*
 import com.lagradost.cloudstream3.ui.search.SearchHelper.handleSearchClickCallback
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
@@ -54,10 +52,7 @@ import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.DataStoreHelper.removeLastWatched
-import com.lagradost.cloudstream3.utils.DataStoreHelper.setResultWatchState
 import com.lagradost.cloudstream3.utils.Event
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectStringRes
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
@@ -76,7 +71,6 @@ import kotlinx.android.synthetic.main.fragment_home.home_master_recycler
 import kotlinx.android.synthetic.main.fragment_home.home_reload_connection_open_in_browser
 import kotlinx.android.synthetic.main.fragment_home.home_reload_connectionerror
 import kotlinx.android.synthetic.main.fragment_home.result_error_text
-import kotlinx.android.synthetic.main.fragment_home_head_tv.*
 import kotlinx.android.synthetic.main.fragment_home_tv.*
 import kotlinx.android.synthetic.main.fragment_result.*
 import kotlinx.android.synthetic.main.fragment_search.*
@@ -476,21 +470,9 @@ class HomeFragment : Fragment() {
         }
     }
 
-    /*private fun handleBack(poppedFragment: Boolean) {
-        if (poppedFragment) {
-            reloadStored()
-        }
-    }*/
-
-    private fun focusCallback(card: SearchResponse) {
-        // home_focus_text?.text = card.name
-        // home_blur_poster?.setImageBlur(card.posterUrl, 50, headers = card.posterHeaders)
-        // home_bg_poster?.setImage(card.posterUrl,headers =card.posterHeaders)
-    }
-
     private fun homeHandleSearch(callback: SearchClickCallback) {
         if (callback.action == SEARCH_ACTION_FOCUSED) {
-            focusCallback(callback.card)
+            //focusCallback(callback.card)
         } else {
             handleSearchClickCallback(activity, callback)
         }
@@ -505,7 +487,6 @@ class HomeFragment : Fragment() {
         fixGrid()
 
         home_change_api_loading?.setOnClickListener(apiChangeClickListener)
-        home_preview_change_api?.setOnClickListener(apiChangeClickListener)
         home_api_fab?.setOnClickListener(apiChangeClickListener)
         home_random?.setOnClickListener {
             if (listHomepageItems.isNotEmpty()) {
@@ -522,138 +503,16 @@ class HomeFragment : Fragment() {
         }
 
         observe(homeViewModel.preview) { preview ->
-            // Always reset the padding, otherwise the will move lower and lower
-            // home_fix_padding?.setPadding(0, 0, 0, 0)
-            //home_fix_padding?.let { v ->
-            //    val params = v.layoutParams
-            //    params.height = 0
-            //    v.layoutParams = params
-            //}
-
             (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setPreviewData(
                 preview
             )
-
-            //when (preview) {
-            //    is Resource.Success -> {
-            //        home_preview?.isVisible = true
-            //        (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.apply {
-            //            if (!setItems(preview.value.second, preview.value.first)) {
-            //                home_preview_viewpager?.setCurrentItem(0, false)
-            //            }
-            //            // home_preview_viewpager?.setCurrentItem(1000, false)
-            //        }
-//
-            //        //.also {
-            //        //home_preview_viewpager?.adapter =
-            //        //}
-            //    }
-            //    else -> {
-            //        (home_preview_viewpager?.adapter as? HomeScrollAdapter)?.setItems(
-            //            listOf(),
-            //            false
-            //        )
-            //        home_preview?.isVisible = false
-            //        context?.fixPaddingStatusbarView(home_fix_padding)
-            //    }
-            //}
         }
 
-        //val searchText =
-        //    home_search?.findViewById<SearchView.SearchAutoComplete>(androidx.appcompat.R.id.search_src_text)
-        //searchText?.context?.getResourceColor(R.attr.white)?.let { color ->
-        //    searchText.setTextColor(color)
-        //    searchText.setHintTextColor(color)
-        //}
-
         observe(homeViewModel.apiName) { apiName ->
             currentApiName = apiName
-            // setKey(USER_SELECTED_HOMEPAGE_API, apiName)
             home_api_fab?.text = apiName
-            //home_provider_name?.text = apiName
-            // try {
-            //     home_search?.queryHint = getString(R.string.search_hint_site).format(apiName)
-            // } catch (e: Exception) {
-            //     logError(e)
-            // }
-            //home_provider_meta_info?.isVisible = false
-
-            //getApiFromNameNull(apiName)?.let { currentApi ->
-            //    val typeChoices = listOf(
-            //        Pair(R.string.movies, listOf(TvType.Movie)),
-            //        Pair(R.string.tv_series, listOf(TvType.TvSeries)),
-            //        Pair(R.string.documentaries, listOf(TvType.Documentary)),
-            //        Pair(R.string.cartoons, listOf(TvType.Cartoon)),
-            //        Pair(R.string.anime, listOf(TvType.Anime, TvType.OVA, TvType.AnimeMovie)),
-            //        Pair(R.string.torrent, listOf(TvType.Torrent)),
-            //        Pair(R.string.asian_drama, listOf(TvType.AsianDrama)),
-            //    ).filter { item -> currentApi.supportedTypes.any { type -> item.second.contains(type) } }
-            //    home_provider_meta_info?.text =
-            //        typeChoices.joinToString(separator = ", ") { getString(it.first) }
-            //    home_provider_meta_info?.isVisible = true
-            //}
         }
 
-        //home_main_poster_recyclerview?.adapter =
-        //    HomeChildItemAdapter(
-        //        mutableListOf(),
-        //        R.layout.home_result_big_grid,
-        //        nextFocusUp = home_main_poster_recyclerview?.nextFocusUpId,
-        //        nextFocusDown = home_main_poster_recyclerview?.nextFocusDownId
-        //    ) { callback ->
-        //        homeHandleSearch(callback)
-        //    }
-        //home_main_poster_recyclerview?.setLinearListLayout()
-        //observe(homeViewModel.randomItems) { items ->
-        //    if (items.isNullOrEmpty()) {
-        //        toggleMainVisibility(false)
-        //    } else {
-        //        val tempAdapter = home_main_poster_recyclerview?.adapter as? HomeChildItemAdapter?
-        //        // no need to reload if it has the same data
-        //        if (tempAdapter != null && tempAdapter.cardList == items) {
-        //            toggleMainVisibility(true)
-        //            return@observe
-        //        }
-//
-        //        val randomSize = items.size
-        //        tempAdapter?.updateList(items)
-        //        if (!isTvSettings()) {
-        //            home_main_poster_recyclerview?.post {
-        //                (home_main_poster_recyclerview?.layoutManager as CenterZoomLayoutManager?)?.let { manager ->
-        //                    manager.updateSize(forceUpdate = true)
-        //                    if (randomSize > 2) {
-        //                        manager.scrollToPosition(randomSize / 2)
-        //                        manager.snap { dx ->
-        //                            home_main_poster_recyclerview?.post {
-        //                                // this is the best I can do, fuck android for not including instant scroll
-        //                                home_main_poster_recyclerview?.smoothScrollBy(dx, 0)
-        //                            }
-        //                        }
-        //                    }
-        //                }
-        //            }
-        //        } else {
-        //            items.firstOrNull()?.let {
-        //                focusCallback(it)
-        //            }
-        //        }
-        //        toggleMainVisibility(true)
-        //    }
-        //}
-
-        //home_search?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-        //    override fun onQueryTextSubmit(query: String): Boolean {
-        //        QuickSearchFragment.pushSearch(activity, query, currentApiName?.let { arrayOf(it) })
-//
-        //        return true
-        //    }
-//
-        //    override fun onQueryTextChange(newText: String): Boolean {
-        //        //searchViewModel.quickSearch(newText)
-        //        return true
-        //    }
-        //})
-
         observe(homeViewModel.page) { data ->
             when (data) {
                 is Resource.Success -> {
@@ -732,55 +591,18 @@ class HomeFragment : Fragment() {
             (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setAvailableWatchStatusTypes(
                 availableWatchStatusTypes
             )
-
-
-            /*home_bookmark_select?.setOnClickListener {
-                it.popupMenuNoIcons(availableWatchStatusTypes.second.map { type ->
-                    Pair(
-                        type.internalId,
-                        type.stringRes
-                    )
-                }) {
-                    homeViewModel.loadStoredData(it.context, WatchType.fromInternalId(this.itemId))
-                }
-            }
-            home_bookmarked_parent_item_title?.text = getString(availableWatchStatusTypes.first.stringRes)*/
         }
 
-        //TODO REMAKE
         observe(homeViewModel.bookmarks) { data ->
             (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setBookmarkData(
                 data
             )
-
-            //(home_bookmarked_child_recyclerview?.adapter as? HomeChildItemAdapter?)?.updateList(
-            //    bookmarks
-            //)
-//
-            //    home_bookmarked_child_more_info?.setOnClickListener {
-            //        activity?.loadHomepageList(
-            //            HomePageList(
-            //                getString(R.string.error_bookmarks_text), //home_bookmarked_parent_item_title?.text?.toString() ?: getString(R.string.error_bookmarks_text),
-            //                bookmarks
-            //            )
-            //        ) {
-            //            deleteAllBookmarkedData()
-            //            homeViewModel.loadStoredData(null)
-            //        }
-            //    }
         }
 
         observe(homeViewModel.resumeWatching) { resumeWatching ->
             (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setResumeWatchingData(
                 resumeWatching
             )
-
-
-            //home_watch_holder?.isVisible = resumeWatching.isNotEmpty()
-            //(home_watch_child_recyclerview?.adapter as? HomeChildItemAdapter?)?.updateList(
-            //    resumeWatching
-            //)
-
             if (isTrueTvSettings()) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     ioSafe {
@@ -788,155 +610,8 @@ class HomeFragment : Fragment() {
                     }
                 }
             }
-
-            //home_watch_child_more_info?.setOnClickListener {
-            //    activity?.loadHomepageList(
-            //        HomePageList(
-            //            home_watch_parent_item_title?.text?.toString()
-            //                ?: getString(R.string.continue_watching),
-            //            resumeWatching
-            //        )
-            //    ) {
-            //        deleteAllResumeStateIds()
-            //        homeViewModel.loadResumeWatching()
-            //    }
-            //}
         }
 
-        home_bookmarked_child_recyclerview?.adapter = HomeChildItemAdapter(
-            ArrayList(),
-            nextFocusUp = home_bookmarked_child_recyclerview?.nextFocusUpId,
-            nextFocusDown = home_bookmarked_child_recyclerview?.nextFocusDownId
-        ) { callback ->
-            if (callback.action == SEARCH_ACTION_SHOW_METADATA) {
-                activity?.showOptionSelectStringRes(
-                    callback.view,
-                    callback.card.posterUrl,
-                    listOf(
-                        R.string.action_open_watching,
-                        R.string.action_remove_from_bookmarks,
-                    ),
-                    listOf(
-                        R.string.action_open_play,
-                        R.string.action_open_watching,
-                        R.string.action_remove_from_bookmarks
-                    )
-                ) { (isTv, actionId) ->
-                    fun play() {
-                        activity.loadSearchResult(callback.card, START_ACTION_RESUME_LATEST)
-                        reloadStored()
-                    }
-
-                    fun remove() {
-                        setResultWatchState(callback.card.id, WatchType.NONE.internalId)
-                        reloadStored()
-                    }
-
-                    fun info() {
-                        handleSearchClickCallback(
-                            activity,
-                            SearchClickCallback(
-                                SEARCH_ACTION_LOAD,
-                                callback.view,
-                                -1,
-                                callback.card
-                            )
-                        )
-                        reloadStored()
-                    }
-
-                    when (actionId) {
-                        0 -> {
-                            play()
-                        }
-                        1 -> {
-                            info()
-                        }
-                        2 -> {
-                            remove()
-                        }
-                    }
-                }
-            } else {
-                homeHandleSearch(callback)
-            }
-        }
-        home_watch_child_recyclerview?.setLinearListLayout()
-        home_bookmarked_child_recyclerview?.setLinearListLayout()
-
-        home_watch_child_recyclerview?.adapter = HomeChildItemAdapter(
-            ArrayList(),
-            nextFocusUp = home_watch_child_recyclerview?.nextFocusUpId,
-            nextFocusDown = home_watch_child_recyclerview?.nextFocusDownId
-        ) { callback ->
-            if (callback.action == SEARCH_ACTION_SHOW_METADATA) {
-                activity?.showOptionSelectStringRes(
-                    callback.view,
-                    callback.card.posterUrl,
-                    listOf(
-                        R.string.action_open_watching,
-                        R.string.action_remove_watching
-                    ),
-                    listOf(
-                        R.string.action_open_play,
-                        R.string.action_open_watching,
-                        R.string.action_remove_watching
-                    )
-                ) { (isTv, actionId) ->
-                    fun play() {
-                        activity.loadSearchResult(callback.card, START_ACTION_RESUME_LATEST)
-                        reloadStored()
-                    }
-
-                    fun remove() {
-                        val card = callback.card
-                        if (card is DataStoreHelper.ResumeWatchingResult) {
-                            removeLastWatched(card.parentId)
-                            reloadStored()
-                        }
-                    }
-
-                    fun info() {
-                        handleSearchClickCallback(
-                            activity,
-                            SearchClickCallback(
-                                SEARCH_ACTION_LOAD,
-                                callback.view,
-                                -1,
-                                callback.card
-                            )
-                        )
-                        reloadStored()
-                    }
-
-                    if (isTv) {
-                        when (actionId) {
-                            0 -> {
-                                play()
-                            }
-                            1 -> {
-                                info()
-                            }
-                            2 -> {
-                                remove()
-                            }
-                        }
-                    } else {
-                        when (actionId) {
-                            0 -> {
-                                info()
-                            }
-                            1 -> {
-                                remove()
-                            }
-                        }
-                    }
-
-                }
-            } else {
-                homeHandleSearch(callback)
-            }
-        }
 
         //context?.fixPaddingStatusbarView(home_statusbar)
         //context?.fixPaddingStatusbar(home_padding)
@@ -969,14 +644,6 @@ class HomeFragment : Fragment() {
                         currentApiName?.let { arrayOf(it) })
                 }
             })
-        //home_master_recycler.setLinearListLayout()
-
-        //home_master_recycler?.setMaxViewPoolSize(0, 4)
-        //home_master_recycler.layoutManager = object : LinearLayoutManager(context) {
-        //    override fun supportsPredictiveItemAnimations(): Boolean {
-        //        return false
-        //    }
-        //} // GridLayoutManager(context, 1).also { it.supportsPredictiveItemAnimations() }
 
         reloadStored()
         loadHomePage(false)
@@ -991,7 +658,7 @@ class HomeFragment : Fragment() {
                         home_random?.extend()
                     }
                 }
-                
+
                 super.onScrolled(recyclerView, dx, dy)
             }
         })
@@ -1012,7 +679,7 @@ class HomeFragment : Fragment() {
             home_api_fab?.isVisible = true
             home_change_api_loading?.isVisible = false
         }
-
+        //TODO READD THIS
         /*for (syncApi in OAuth2Apis) {
             val login = syncApi.loginInfo()
             val pic = login?.profilePicture

From 710885a3b7708889c4af0e34dd37b33c385ca7ff Mon Sep 17 00:00:00 2001
From: LagradOst <11805592+LagradOst@users.noreply.github.com>
Date: Wed, 28 Dec 2022 15:25:22 +0100
Subject: [PATCH 149/273] none fix

---
 .../cloudstream3/ui/home/HomeFragment.kt      |   6 +
 .../ui/home/HomeParentItemAdapterPreview.kt   |  42 ++++-
 .../cloudstream3/ui/home/HomeViewModel.kt     | 147 +++++++++---------
 .../main/res/layout/fragment_home_head.xml    |   4 +-
 .../main/res/layout/fragment_home_head_tv.xml |  20 ++-
 5 files changed, 136 insertions(+), 83 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 3e8970b3..26597ef0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -511,6 +511,9 @@ class HomeFragment : Fragment() {
         observe(homeViewModel.apiName) { apiName ->
             currentApiName = apiName
             home_api_fab?.text = apiName
+            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setApiName(
+                apiName
+            )
         }
 
         observe(homeViewModel.page) { data ->
@@ -529,6 +532,7 @@ class HomeFragment : Fragment() {
 
                     home_loading?.isVisible = false
                     home_loading_error?.isVisible = false
+                    home_master_recycler?.isVisible = true
                     //home_loaded?.isVisible = true
                     if (toggleRandomButton) {
                         //Flatten list
@@ -569,6 +573,7 @@ class HomeFragment : Fragment() {
 
                     home_loading?.isVisible = false
                     home_loading_error?.isVisible = true
+                    home_master_recycler?.isVisible = false
                     //home_loaded?.isVisible = false
                 }
                 is Resource.Loading -> {
@@ -576,6 +581,7 @@ class HomeFragment : Fragment() {
                     home_loading_shimmer?.startShimmer()
                     home_loading?.isVisible = true
                     home_loading_error?.isVisible = false
+                    home_master_recycler?.isVisible = false
                     //home_loaded?.isVisible = false
                 }
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
index c84b861a..19649574 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.ui.home
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.FrameLayout
 import android.widget.LinearLayout
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
@@ -38,6 +39,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.setImage
 import kotlinx.android.synthetic.main.activity_main_tv.view.*
 import kotlinx.android.synthetic.main.fragment_home_head.view.*
 import kotlinx.android.synthetic.main.fragment_home_head.view.home_bookmarked_child_recyclerview
+import kotlinx.android.synthetic.main.fragment_home_head.view.home_header
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.*
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_bookmarked_holder
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_plan_to_watch_btt
@@ -68,6 +70,7 @@ class HomeParentItemAdapterPreview(
     private var resumeWatchingData: List<SearchResponse> = listOf()
     private var bookmarkData: Pair<Boolean, List<SearchResponse>> =
         false to listOf()
+    private var apiName: String = "NONE"
 
     val headItems = 1
 
@@ -80,8 +83,8 @@ class HomeParentItemAdapterPreview(
     }
 
     companion object {
-        private const val VIEW_TYPE_HEADER = 4815
-        private const val VIEW_TYPE_ITEM = 1623
+        private const val VIEW_TYPE_HEADER = 2
+        private const val VIEW_TYPE_ITEM = 1
     }
 
     fun setResumeWatchingData(resumeWatching: List<SearchResponse>) {
@@ -95,6 +98,12 @@ class HomeParentItemAdapterPreview(
         //notifyItemChanged(0)
     }
 
+    fun setApiName(name: String) {
+        apiName = name
+        holder?.updateApiName(name)
+        //notifyItemChanged(0)
+    }
+
     fun setBookmarkData(data: Pair<Boolean, List<SearchResponse>>) {
         bookmarkData = data
         holder?.updateBookmarks(data)
@@ -114,6 +123,7 @@ class HomeParentItemAdapterPreview(
                 holder.updateResume(resumeWatchingData)
                 holder.updateBookmarks(bookmarkData)
                 holder.setAvailableWatchStatusTypes(availableWatchStatusTypes)
+                holder.updateApiName(apiName)
             }
             else -> super.onBindViewHolder(holder, position - 1)
         }
@@ -184,7 +194,7 @@ class HomeParentItemAdapterPreview(
     ) : RecyclerView.ViewHolder(itemView) {
         private var previewAdapter: HomeScrollAdapter? = null
         private val previewViewpager: ViewPager2? = itemView.home_preview_viewpager
-        private val previewHeader: LinearLayout? = itemView.home_preview
+        private val previewHeader: FrameLayout? = itemView.home_preview
         private val previewCallback: ViewPager2.OnPageChangeCallback =
             object : ViewPager2.OnPageChangeCallback() {
                 override fun onPageSelected(position: Int) {
@@ -212,10 +222,6 @@ class HomeParentItemAdapterPreview(
                             itemView.home_preview_description?.text =
                                 this.plot ?: ""
                             itemView.home_preview_text?.text = this.name
-                            itemView.home_preview_change_api?.text = apiName
-                            itemView.home_preview_change_api?.setOnClickListener { view ->
-                                changeHomePageCallback(view)
-                            }
                             itemView.home_preview_tags?.apply {
                                 removeAllViews()
                                 tags?.forEach { tag ->
@@ -366,6 +372,13 @@ class HomeParentItemAdapterPreview(
         )
 
         init {
+            itemView.home_preview_change_api?.setOnClickListener { view ->
+                changeHomePageCallback(view)
+            }
+            itemView.home_preview_change_api2?.setOnClickListener { view ->
+                changeHomePageCallback(view)
+            }
+
             previewViewpager?.apply {
                 if (!isTvSettings())
                     setPageTransformer(HomeScrollTransformer())
@@ -538,7 +551,15 @@ class HomeParentItemAdapterPreview(
             })
         }
 
+        fun updateApiName(name: String) {
+            itemView.home_preview_change_api2?.text = name
+            itemView.home_preview_change_api?.text = name
+        }
+
         fun updatePreview(preview: Resource<Pair<Boolean, List<LoadResponse>>>) {
+            itemView.home_header?.isGone = preview is Resource.Loading
+            itemView.home_preview_change_api2?.isGone = preview is Resource.Success
+
             when (preview) {
                 is Resource.Success -> {
                     previewHeader?.isVisible = true
@@ -570,12 +591,17 @@ class HomeParentItemAdapterPreview(
         }
 
         fun setAvailableWatchStatusTypes(availableWatchStatusTypes: Pair<Set<WatchType>, Set<WatchType>>) {
+            var anyVisible = false
             for ((chip, watch) in toggleList) {
                 chip?.apply {
-                    isVisible = availableWatchStatusTypes.second.contains(watch)
+                    isVisible = availableWatchStatusTypes.second.contains(watch).also {
+                        anyVisible = anyVisible || it
+                    }
+                    
                     isChecked = availableWatchStatusTypes.first.contains(watch)
                 }
             }
+            itemView.home_bookmarked_holder?.isVisible = anyVisible
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index 58c01603..edf58008 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -265,80 +265,83 @@ class HomeViewModel : ViewModel() {
         _apiName.postValue(repo?.name)
         _randomItems.postValue(listOf())
 
-        if (repo?.hasMainPage == true) {
-            _page.postValue(Resource.Loading())
-            _preview.postValue(Resource.Loading())
-            addJob?.cancel()
-
-            when (val data = repo?.getMainPage(1, null)) {
-                is Resource.Success -> {
-                    try {
-                        expandable.clear()
-                        data.value.forEach { home ->
-                            home?.items?.forEach { list ->
-                                val filteredList =
-                                    context?.filterHomePageListByFilmQuality(list) ?: list
-                                expandable[list.name] =
-                                    ExpandableHomepageList(filteredList, 1, home.hasNext)
-                            }
-                        }
-
-                        val items = data.value.mapNotNull { it?.items }.flatten()
-
-
-                        previewResponses.clear()
-                        previewResponsesAdded.clear()
-
-                        //val home = data.value
-                        if (items.isNotEmpty()) {
-                            val currentList =
-                                items.shuffled().filter { it.list.isNotEmpty() }
-                                    .flatMap { it.list }
-                                    .distinctBy { it.url }
-                                    .toList()
-
-                            if (currentList.isNotEmpty()) {
-                                val randomItems =
-                                    context?.filterSearchResultByFilmQuality(currentList.shuffled())
-                                        ?: currentList.shuffled()
-
-                                updatePreviewResponses(
-                                    previewResponses,
-                                    previewResponsesAdded,
-                                    randomItems,
-                                    3
-                                )
-
-                                _randomItems.postValue(randomItems)
-                                currentShuffledList = randomItems
-                            }
-                        }
-                        if (previewResponses.isEmpty()) {
-                            _preview.postValue(
-                                Resource.Failure(
-                                    false,
-                                    null,
-                                    null,
-                                    "No homepage responses"
-                                )
-                            )
-                        } else {
-                            _preview.postValue(Resource.Success((previewResponsesAdded.size < currentShuffledList.size) to previewResponses))
-                        }
-                        _page.postValue(Resource.Success(expandable))
-                    } catch (e: Exception) {
-                        _randomItems.postValue(emptyList())
-                        logError(e)
-                    }
-                }
-                is Resource.Failure -> {
-                    _page.postValue(data!!)
-                }
-                else -> Unit
-            }
-        } else {
+        if (repo?.hasMainPage != true) {
             _page.postValue(Resource.Success(emptyMap()))
             _preview.postValue(Resource.Failure(false, null, null, "No homepage"))
+            return@ioSafe
+        }
+
+
+        _page.postValue(Resource.Loading())
+        _preview.postValue(Resource.Loading())
+        addJob?.cancel()
+
+        when (val data = repo?.getMainPage(1, null)) {
+            is Resource.Success -> {
+                try {
+                    expandable.clear()
+                    data.value.forEach { home ->
+                        home?.items?.forEach { list ->
+                            val filteredList =
+                                context?.filterHomePageListByFilmQuality(list) ?: list
+                            expandable[list.name] =
+                                ExpandableHomepageList(filteredList, 1, home.hasNext)
+                        }
+                    }
+
+                    val items = data.value.mapNotNull { it?.items }.flatten()
+
+
+                    previewResponses.clear()
+                    previewResponsesAdded.clear()
+
+                    //val home = data.value
+                    if (items.isNotEmpty()) {
+                        val currentList =
+                            items.shuffled().filter { it.list.isNotEmpty() }
+                                .flatMap { it.list }
+                                .distinctBy { it.url }
+                                .toList()
+
+                        if (currentList.isNotEmpty()) {
+                            val randomItems =
+                                context?.filterSearchResultByFilmQuality(currentList.shuffled())
+                                    ?: currentList.shuffled()
+
+                            updatePreviewResponses(
+                                previewResponses,
+                                previewResponsesAdded,
+                                randomItems,
+                                3
+                            )
+
+                            _randomItems.postValue(randomItems)
+                            currentShuffledList = randomItems
+                        }
+                    }
+                    if (previewResponses.isEmpty()) {
+                        _preview.postValue(
+                            Resource.Failure(
+                                false,
+                                null,
+                                null,
+                                "No homepage responses"
+                            )
+                        )
+                    } else {
+                        _preview.postValue(Resource.Success((previewResponsesAdded.size < currentShuffledList.size) to previewResponses))
+                    }
+                    _page.postValue(Resource.Success(expandable))
+                } catch (e: Exception) {
+                    _randomItems.postValue(emptyList())
+                    logError(e)
+                }
+            }
+            is Resource.Failure -> {
+                _page.postValue(data!!)
+                _preview.postValue(data!!)
+            }
+            else -> Unit
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_home_head.xml b/app/src/main/res/layout/fragment_home_head.xml
index 67474b69..66f0d136 100644
--- a/app/src/main/res/layout/fragment_home_head.xml
+++ b/app/src/main/res/layout/fragment_home_head.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:orientation="vertical"
-    android:id="@+id/home_preview"
+    android:id="@+id/home_header"
+
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/primaryBlackBackground"
@@ -9,6 +10,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <FrameLayout
+        android:id="@+id/home_preview"
         android:layout_width="match_parent"
         android:layout_height="500dp">
 
diff --git a/app/src/main/res/layout/fragment_home_head_tv.xml b/app/src/main/res/layout/fragment_home_head_tv.xml
index 5992ac91..c7f7dafa 100644
--- a/app/src/main/res/layout/fragment_home_head_tv.xml
+++ b/app/src/main/res/layout/fragment_home_head_tv.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:orientation="vertical"
-    android:id="@+id/home_preview"
+    android:id="@+id/home_header"
+
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/primaryBlackBackground"
@@ -9,6 +10,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <FrameLayout
+        android:id="@+id/home_preview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -35,7 +37,6 @@
                 android:minWidth="150dp" />
         </FrameLayout>
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -118,6 +119,21 @@
         </LinearLayout>
     </FrameLayout>
 
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="5dp">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/home_preview_change_api2"
+            style="@style/BlackButton"
+            android:layout_width="wrap_content"
+            android:layout_gravity="top|start"
+            android:layout_marginStart="@dimen/navbar_width"
+            android:backgroundTint="@color/semiWhite"
+            android:minWidth="150dp" />
+    </FrameLayout>
+
     <LinearLayout
         android:id="@+id/home_watch_holder"
         android:layout_width="match_parent"

From 1e8277b0879a85adfe0423b39e8fa7ae6c29f1e3 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Wed, 28 Dec 2022 18:41:50 +0100
Subject: [PATCH 150/273] [skip ci] Apply fixes from CodeFactor (#289)

Co-authored-by: codefactor-io <support@codefactor.io>
---
 .../cloudstream3/ui/home/HomeParentItemAdapterPreview.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
index 19649574..45af0893 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
@@ -597,7 +597,7 @@ class HomeParentItemAdapterPreview(
                     isVisible = availableWatchStatusTypes.second.contains(watch).also {
                         anyVisible = anyVisible || it
                     }
-                    
+
                     isChecked = availableWatchStatusTypes.first.contains(watch)
                 }
             }

From 6e61fe5f3e58a7478320302211ddc0f0448860c7 Mon Sep 17 00:00:00 2001
From: LagradOst <11805592+LagradOst@users.noreply.github.com>
Date: Thu, 29 Dec 2022 03:08:08 +0100
Subject: [PATCH 151/273] mini fix

---
 .../cloudstream3/ui/home/HomeFragment.kt      |  1 -
 .../ui/home/HomeParentItemAdapter.kt          | 28 ++++-----
 .../ui/home/HomeParentItemAdapterPreview.kt   | 57 ++++++++++---------
 .../main/res/layout/fragment_home_head.xml    |  5 ++
 .../main/res/layout/fragment_home_head_tv.xml |  9 ++-
 5 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 26597ef0..b03e40cf 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -404,7 +404,6 @@ class HomeFragment : Fragment() {
         return inflater.inflate(layout, container, false)
     }
 
-    @SuppressLint("NotifyDataSetChanged") // we need to notify to change poster
     private fun fixGrid() {
         activity?.getSpanCount()?.let {
             currentSpan = it
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
index f85d5a08..8b7832e2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
@@ -115,29 +115,29 @@ open class ParentItemAdapter(
         items.clear()
         items.addAll(new)
 
-        val mAdapter = this
+        //val mAdapter = this
+        val delta = if (this@ParentItemAdapter is HomeParentItemAdapterPreview) {
+            headItems
+        } else {
+            0
+        }
+
         diffResult.dispatchUpdatesTo(object : ListUpdateCallback {
             override fun onInserted(position: Int, count: Int) {
-                mAdapter.notifyItemRangeChanged(
-                    position,
-                    count
-                )//notifyItemRangeInserted(position, count)
+                //notifyItemRangeChanged(position + delta, count)
+                notifyItemRangeInserted(position + delta, count)
             }
 
             override fun onRemoved(position: Int, count: Int) {
-                mAdapter.notifyItemRangeRemoved(position, count)
+                notifyItemRangeRemoved(position + delta, count)
             }
 
             override fun onMoved(fromPosition: Int, toPosition: Int) {
-                mAdapter.notifyItemMoved(fromPosition, toPosition)
+                notifyItemMoved(fromPosition + delta, toPosition + delta)
             }
 
             override fun onChanged(_position: Int, count: Int, payload: Any?) {
-                val delta = if (this@ParentItemAdapter is HomeParentItemAdapterPreview) {
-                    headItems
-                } else {
-                    0
-                }
+
                 val position = _position + delta
 
                 // I know kinda messy, what this does is using the update or bind instead of onCreateViewHolder -> bind
@@ -164,11 +164,11 @@ open class ParentItemAdapter(
 
                     // just in case some item did not get updated
                     for (i in missingUpdates) {
-                        mAdapter.notifyItemChanged(i, payload)
+                        notifyItemChanged(i, payload)
                     }
                 } ?: run {
                     // in case we don't have a nice
-                    mAdapter.notifyItemRangeChanged(position, count, payload)
+                    notifyItemRangeChanged(position, count, payload)
                 }
             }
         })
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
index 19649574..a2e768b9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
@@ -4,7 +4,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.LinearLayout
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
@@ -14,34 +13,30 @@ import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
 import com.lagradost.cloudstream3.APIHolder.getId
-import com.lagradost.cloudstream3.AcraApplication
 import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.ui.WatchType
-import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
 import com.lagradost.cloudstream3.ui.result.ResultViewModel2
 import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_SHOW_METADATA
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
-import com.lagradost.cloudstream3.ui.search.SearchHelper
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
-import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectStringRes
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
 import kotlinx.android.synthetic.main.activity_main_tv.view.*
 import kotlinx.android.synthetic.main.fragment_home_head.view.*
 import kotlinx.android.synthetic.main.fragment_home_head.view.home_bookmarked_child_recyclerview
-import kotlinx.android.synthetic.main.fragment_home_head.view.home_header
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.*
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_bookmarked_holder
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_none_padding
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_plan_to_watch_btt
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_viewpager
@@ -51,8 +46,6 @@ import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_on_ho
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_watching_btt
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_watch_child_recyclerview
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_watch_holder
-import kotlinx.android.synthetic.main.fragment_setup_media.*
-import java.util.ArrayList
 
 class HomeParentItemAdapterPreview(
     items: MutableList<HomeViewModel.ExpandableHomepageList>,
@@ -95,13 +88,11 @@ class HomeParentItemAdapterPreview(
     fun setPreviewData(preview: Resource<Pair<Boolean, List<LoadResponse>>>) {
         previewData = preview
         holder?.updatePreview(preview)
-        //notifyItemChanged(0)
     }
 
     fun setApiName(name: String) {
         apiName = name
         holder?.updateApiName(name)
-        //notifyItemChanged(0)
     }
 
     fun setBookmarkData(data: Pair<Boolean, List<SearchResponse>>) {
@@ -131,6 +122,7 @@ class HomeParentItemAdapterPreview(
 
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        println("onCreateViewHolder $viewType")
         return when (viewType) {
             VIEW_TYPE_HEADER -> HeaderViewHolder(
                 LayoutInflater.from(parent.context).inflate(
@@ -380,10 +372,10 @@ class HomeParentItemAdapterPreview(
             }
 
             previewViewpager?.apply {
-                if (!isTvSettings())
-                    setPageTransformer(HomeScrollTransformer())
-                else
-                    setPageTransformer(null)
+                //if (!isTvSettings())
+                setPageTransformer(HomeScrollTransformer())
+                //else
+                //    setPageTransformer(null)
 
                 if (adapter == null)
                     adapter = HomeScrollAdapter(
@@ -392,7 +384,7 @@ class HomeParentItemAdapterPreview(
                     )
             }
             previewAdapter = previewViewpager?.adapter as? HomeScrollAdapter?
-            previewViewpager?.registerOnPageChangeCallback(previewCallback)
+            // previewViewpager?.registerOnPageChangeCallback(previewCallback)
 
             if (resumeAdapter == null) {
                 resumeRecyclerView?.adapter = HomeChildItemAdapter(
@@ -557,27 +549,41 @@ class HomeParentItemAdapterPreview(
         }
 
         fun updatePreview(preview: Resource<Pair<Boolean, List<LoadResponse>>>) {
-            itemView.home_header?.isGone = preview is Resource.Loading
             itemView.home_preview_change_api2?.isGone = preview is Resource.Success
-
+            if (preview is Resource.Success) {
+                itemView.home_none_padding?.apply {
+                    val params = layoutParams
+                    params.height = 0
+                    layoutParams = params
+                }
+            } else {
+                itemView.home_none_padding?.context?.fixPaddingStatusbarView(itemView.home_none_padding)
+            }
             when (preview) {
                 is Resource.Success -> {
-                    previewHeader?.isVisible = true
                     if (true != previewAdapter?.setItems(
                             preview.value.second,
                             preview.value.first
                         )
                     ) {
+                        // this might seam weird and useless, however this prevents a very weird andrid bug were the viewpager is not rendered properly
+                        // I have no idea why that happens, but this is my ducktape solution
                         previewViewpager?.setCurrentItem(0, false)
+                        previewViewpager?.beginFakeDrag()
+                        previewViewpager?.fakeDragBy(1f)
+                        previewViewpager?.endFakeDrag()
+                        previewCallback.onPageSelected(0)
+                        previewHeader?.isVisible = true
                     }
                 }
                 else -> {
-                    previewHeader?.isVisible = false
-
                     previewAdapter?.setItems(listOf(), false)
                     previewViewpager?.setCurrentItem(0, false)
+                    previewHeader?.isVisible = false
                 }
             }
+            // previewViewpager?.postDelayed({ previewViewpager?.scr(100, 0) }, 1000)
+            //previewViewpager?.postInvalidate()
         }
 
         fun updateResume(resumeWatching: List<SearchResponse>) {
@@ -586,22 +592,17 @@ class HomeParentItemAdapterPreview(
         }
 
         fun updateBookmarks(data: Pair<Boolean, List<SearchResponse>>) {
-            bookmarkHolder?.isVisible = true // data.first
+            bookmarkHolder?.isVisible = data.first
             bookmarkAdapter?.updateList(data.second)
         }
 
         fun setAvailableWatchStatusTypes(availableWatchStatusTypes: Pair<Set<WatchType>, Set<WatchType>>) {
-            var anyVisible = false
             for ((chip, watch) in toggleList) {
                 chip?.apply {
-                    isVisible = availableWatchStatusTypes.second.contains(watch).also {
-                        anyVisible = anyVisible || it
-                    }
-                    
+                    isVisible = availableWatchStatusTypes.second.contains(watch)
                     isChecked = availableWatchStatusTypes.first.contains(watch)
                 }
             }
-            itemView.home_bookmarked_holder?.isVisible = anyVisible
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home_head.xml b/app/src/main/res/layout/fragment_home_head.xml
index 66f0d136..28d7ca2f 100644
--- a/app/src/main/res/layout/fragment_home_head.xml
+++ b/app/src/main/res/layout/fragment_home_head.xml
@@ -9,6 +9,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <View
+        android:id="@+id/home_none_padding"
+        android:layout_width="match_parent"
+        android:layout_height="0dp" />
+
     <FrameLayout
         android:id="@+id/home_preview"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_home_head_tv.xml b/app/src/main/res/layout/fragment_home_head_tv.xml
index c7f7dafa..c3001416 100644
--- a/app/src/main/res/layout/fragment_home_head_tv.xml
+++ b/app/src/main/res/layout/fragment_home_head_tv.xml
@@ -9,6 +9,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <View
+        android:id="@+id/home_none_padding"
+        android:layout_width="match_parent"
+        android:layout_height="0dp" />
+
     <FrameLayout
         android:id="@+id/home_preview"
         android:layout_width="match_parent"
@@ -25,7 +30,7 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_margin="5dp">
+            android:layout_margin="10dp">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/home_preview_change_api"
@@ -122,7 +127,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="5dp">
+        android:layout_margin="10dp">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/home_preview_change_api2"

From 4926c91f6c60d933b6842110841dad8c2c769a61 Mon Sep 17 00:00:00 2001
From: Horis <821938089@qq.com>
Date: Thu, 29 Dec 2022 18:19:08 +0800
Subject: [PATCH 152/273] Fix .json file cant select on restore. (#292)

---
 .../main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
index f4f4e3be..80e5d64a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
@@ -268,6 +268,7 @@ object BackupUtils {
                         "application/json",
                         "unknown/unknown",
                         "content/unknown",
+                        "application/octet-stream",
                     )
                 )
             } catch (e: Exception) {

From dee269ce5e92469fe863561daa1d3b7d15690200 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Thu, 29 Dec 2022 09:20:02 +0100
Subject: [PATCH 153/273] Translated using Weblate (German)

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Indonesian)

Currently translated at 99.4% (560 of 563 strings)

Translated using Weblate (Hindi)

Currently translated at 39.7% (224 of 563 strings)

Co-authored-by: Julian <hello@apollo.moe>
Co-authored-by: Walter H <walter75@gmail.com>
Co-authored-by: sonacore <sonacore@gmail.com>
Co-authored-by: translate <boledo7225@khaxan.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translation: Cloudstream/App
---
 app/src/main/res/values-de/strings.xml | 118 ++++++++++++++++---------
 app/src/main/res/values-es/strings.xml | 106 ++++++++++++++++------
 app/src/main/res/values-hi/strings.xml |   1 +
 app/src/main/res/values-in/strings.xml |  32 ++++++-
 4 files changed, 185 insertions(+), 72 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index bfc9d6ee..5959fe83 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -10,7 +10,7 @@
     <string name="backup_success">Daten erfolgreich gesichert</string>
     <string name="backup_failed_error_format">Fehler beim Sichern von %s</string>
     <string name="no_chromecast_support_toast">Dieser Anbieter hat keine Chromecast-Unterstützung</string>
-    <string name="episode_action_chromecast_mirror">Chromecastmirror</string>
+    <string name="episode_action_chromecast_mirror">Chromecast-Mirror</string>
     <string name="episode_action_play_in_app">In App wiedergeben</string>
     <string name="skip_type_mixed_op">Vermischte Openings</string>
     <string name="skip_type_creddits">Abspann</string>
@@ -66,7 +66,7 @@
     <string name="downloaded">Heruntergeladen</string>
     <string name="downloading">Lädt herunter</string>
     <string name="download_paused">Download pausiert</string>
-    <string name="download_started">Download startet</string>
+    <string name="download_started">Download gestartet</string>
     <string name="download_failed">Download fehlgeschlagen</string>
     <string name="download_canceled">Download abgebrochen</string>
     <string name="download_done">Download abgeschlossen</string>
@@ -94,13 +94,13 @@
     <string name="sort_close">Schließen</string>
     <string name="sort_clear">Löschen</string>
     <string name="sort_save">Speichern</string>
-    <string name="player_speed">Player Geschwindigkeit</string>
+    <string name="player_speed">Player-Geschwindigkeit</string>
     <string name="subtitles_settings">Untertiteleinstellungen</string>
     <string name="subs_text_color">Textfarbe</string>
     <string name="subs_outline_color">Konturfarbe</string>
     <string name="subs_background_color">Hintergrundfarbe</string>
     <string name="subs_window_color">Fensterfarbe</string>
-    <string name="subs_edge_type">Kanten-Typ</string>
+    <string name="subs_edge_type">Kantentyp</string>
     <string name="subs_subtitle_elevation">Untertitelhöhe</string>
     <string name="subs_font">Schriftart</string>
     <string name="subs_font_size">Schriftgröße</string>
@@ -125,18 +125,18 @@
     <string name="show_log_cat">Logcat anzeigen 🐈</string>
     <string name="picture_in_picture">Bild-in-Bild</string>
     <string name="picture_in_picture_des">Setzt die Wiedergabe in einem kleinen Fenster über anderen Anwendungen fort</string>
-    <string name="player_size_settings">Player Skalierung anpassen</string>
+    <string name="player_size_settings">Player-Skalierung anpassen</string>
     <string name="player_size_settings_des">Entfernt schwarze Ränder</string>
     <string name="player_subtitles_settings">Untertitel</string>
-    <string name="player_subtitles_settings_des">Player Untertiteleinstellungen</string>
-    <string name="chromecast_subtitles_settings">Chromecast Untertitel</string>
-    <string name="chromecast_subtitles_settings_des">Chromecast Untertiteleinstellungen</string>
+    <string name="player_subtitles_settings_des">Player-Untertiteleinstellungen</string>
+    <string name="chromecast_subtitles_settings">Chromecast-Untertitel</string>
+    <string name="chromecast_subtitles_settings_des">Chromecast-Untertiteleinstellungen</string>
     <string name="eigengraumode_settings">Eigengravy-Modus</string>
     <string name="eigengraumode_settings_des">Fügt eine Geschwindigkeitsoption im Player hinzu</string>
     <string name="swipe_to_seek_settings">Wischen zum vor- und zurückspulen</string>
     <string name="swipe_to_seek_settings_des">Nach links oder rechts wischen, um die Zeit im Videoplayer zu steuern</string>
     <string name="swipe_to_change_settings">Wischen, um Einstellungen zu ändern</string>
-    <string name="swipe_to_change_settings_des">Nach links oder rechts wischen, um die Helligkeit oder Lautstärke zu ändern</string>
+    <string name="swipe_to_change_settings_des">Links oder rechts wischen, um die Helligkeit oder Lautstärke zu ändern</string>
     <string name="autoplay_next_settings">Nächste Episode automatisch abspielen</string>
     <string name="autoplay_next_settings_des">Nächste Episode wird gestartet, sobald die aktuelle Episode endet</string>
     <string name="double_tap_to_seek_settings">Doppeltippen zum vor- und zurückspulen</string>
@@ -147,11 +147,11 @@
     <string name="use_system_brightness_settings">Systemhelligkeit verwenden</string>
     <string name="use_system_brightness_settings_des">Systemhelligkeit anstelle eines dunklen Overlay im Player verwenden</string>
     <string name="episode_sync_settings">Episodenfortschritt aktualisieren</string>
-    <string name="episode_sync_settings_des">Automatisches Synchronisieren des aktuellen Episodenfortschritts</string>
+    <string name="episode_sync_settings_des">Automatisches synchronisieren des aktuellen Episodenfortschritts</string>
     <string name="restore_settings">Daten aus Sicherung wiederherstellen</string>
     <string name="backup_settings">Daten sichern</string>
     <string name="restore_success">Sicherungsdatei geladen</string>
-    <string name="backup_failed">Speicherberechtigungen fehlen, bitte erneut versuchen</string>
+    <string name="backup_failed">Speicherberechtigungen fehlen. Bitte erneut versuchen.</string>
     <string name="search">Suche</string>
     <string name="category_account">Konten</string>
     <string name="category_updates">Updates und Datensicherung</string>
@@ -160,8 +160,8 @@
     <string name="advanced_search_des">Liefert die Suchergebnisse getrennt nach Anbietern</string>
     <string name="bug_report_settings_off">Sendet Daten nur bei Abstürzen</string>
     <string name="bug_report_settings_on">Sendet keine Daten</string>
-    <string name="show_fillers_settings">Füller-Episoden für Animes zeigen</string>
-    <string name="show_trailers_settings">Trailer zeigen</string>
+    <string name="show_fillers_settings">Füller-Episoden für Animes anzeigen</string>
+    <string name="show_trailers_settings">Trailer anzeigen</string>
     <string name="kitsu_settings">Vorschaubilder von Kitsu anzeigen</string>
     <string name="pref_filter_search_quality">Ausgewählte Videoqualität bei Suchergebnissen ausblenden</string>
     <string name="automatic_plugin_updates">Automatische Plugin-Updates</string>
@@ -175,7 +175,7 @@
     <string name="discord">Discord beitreten</string>
     <string name="benene">Eine Benene an die Devs verteilen</string>
     <string name="benene_des">Verteilte Benenes</string>
-    <string name="app_language">App Sprache</string>
+    <string name="app_language">App-Sprache</string>
     <string name="no_links_found_toast">Keine Verlinkung gefunden</string>
     <string name="copy_link_toast">Link in die Zwischenablage kopiert</string>
     <string name="play_episode_toast">Episode abspielen</string>
@@ -215,7 +215,7 @@
     <string name="used_storage">Benutzt</string>
     <string name="app_storage">App</string>
     <string name="movies">Filme</string>
-    <string name="tv_series">TV Serien</string>
+    <string name="tv_series">TV-Serien</string>
     <string name="cartoons">Trickfilme</string>
     <string name="anime">Anime</string>
     <string name="torrent">Torrents</string>
@@ -237,7 +237,7 @@
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Video</string>
     <string name="source_error">Quellenfehler</string>
-    <string name="remote_error">Remotefehler</string>
+    <string name="remote_error">Remote-Fehler</string>
     <string name="render_error">Renderfehler</string>
     <string name="unexpected_error">Unerwarteter Playerfehler</string>
     <string name="storage_error">Downloadfehler, Speicherberechtigungen prüfen</string>
@@ -245,13 +245,13 @@
     <string name="episode_action_play_in_format">In %s wiedergeben</string>
     <string name="episode_action_play_in_browser">In Browser wiedergeben</string>
     <string name="episode_action_copy_link">Link kopieren</string>
-    <string name="episode_action_auto_download">Auto Download</string>
-    <string name="episode_action_download_mirror">Downloadmirror</string>
+    <string name="episode_action_auto_download">Auto-Download</string>
+    <string name="episode_action_download_mirror">Download-Mirror</string>
     <string name="episode_action_reload_links">Links neu laden</string>
     <string name="episode_action_download_subtitle">Untertitel herunterladen</string>
     <string name="show_hd">Qualitätsanzeige</string>
-    <string name="show_dub">Dub Label</string>
-    <string name="show_sub">Sub Label</string>
+    <string name="show_dub">Dub-Label</string>
+    <string name="show_sub">Sub-Label</string>
     <string name="show_title">Titel</string>
     <string name="poster_ui_settings">UI-Elemente auf Vorschaubild umschalten</string>
     <string name="no_update_found">Kein Update gefunden</string>
@@ -264,14 +264,14 @@
     <string name="skip_update">Update ignorieren</string>
     <string name="update">Update</string>
     <string name="watch_quality_pref">Bevorzugte Auflösung</string>
-    <string name="limit_title">Videoplayer Titel max. Zeichen</string>
-    <string name="limit_title_rez">Videoplayers Auflösung</string>
+    <string name="limit_title">Videoplayertitel max. Zeichen</string>
+    <string name="limit_title_rez">Videoplayer Auflösung</string>
     <string name="video_buffer_size_settings">Videopuffergröße</string>
     <string name="video_buffer_length_settings">Videopufferlänge</string>
     <string name="video_buffer_disk_settings">Video-Cache in Speicher</string>
     <string name="video_buffer_clear_settings">Video- und Bild-Cache leeren</string>
-    <string name="video_ram_description">Verursacht Abstürze, wenn zu hoch eingestellt. Nicht ändern, wenn wenig Arbeitsspeicher verfügbar ist, wie z.B. ein Android TV oder ein altes Telefon</string>
-    <string name="video_disk_description">Kann auf Systemen mit geringem Speicherplatz, wie z. B. Android TV-Geräten, zu Problemen führen, wenn der Wert zu hoch eingestellt ist</string>
+    <string name="video_ram_description">Verursacht Abstürze, wenn zu hoch eingestellt. Nicht ändern, wenn wenig Arbeitsspeicher verfügbar ist, wie z.B. ein Android TV oder ein altes Telefon.</string>
+    <string name="video_disk_description">Kann auf Systemen mit geringem Speicherplatz, wie z. B. Android TV-Geräten, zu Problemen führen, wenn der Wert zu hoch eingestellt ist.</string>
     <string name="dns_pref">DNS über HTTPS</string>
     <string name="dns_pref_summary">Nützlich für die Umgehung von ISP-Sperren</string>
     <string name="add_site_pref">Website klonen</string>
@@ -286,21 +286,21 @@
     <string name="legal_notice">Haftungsausschluss</string>
     <string name="category_general">General</string>
     <string name="random_button_settings">Zufalls-Button</string>
-    <string name="random_button_settings_desc">Zeige Zufallsgenerator Schaltfläche auf der Startseite</string>
-    <string name="provider_lang_settings">Anbieter Sprachen</string>
-    <string name="app_layout">App Layout</string>
+    <string name="random_button_settings_desc">Zufallsbutton auf der Startseite anzeigen</string>
+    <string name="provider_lang_settings">Anbieter-Sprachen</string>
+    <string name="app_layout">App-Layout</string>
     <string name="preferred_media_settings">Bevorzugte Medien</string>
-    <string name="enable_nsfw_on_providers">Aktivieren der NSFW auf unterstützten Anbietern</string>
+    <string name="enable_nsfw_on_providers">NSFW bei unterstützten Anbietern aktivieren</string>
     <string name="subtitles_encoding">Untertitel-Kodierung</string>
     <string name="category_providers">Anbieter</string>
     <string name="category_ui">Layout</string>
     <string name="automatic">Auto</string>
-    <string name="tv_layout">TV Layout</string>
-    <string name="phone_layout">Handy Layout</string>
-    <string name="emulator_layout">Emulator Layout</string>
+    <string name="tv_layout">TV-Layout</string>
+    <string name="phone_layout">Telefon-Layout</string>
+    <string name="emulator_layout">Emulator-Layout</string>
     <string name="primary_color_settings">Grundfarbe</string>
     <string name="app_theme_settings">App-Thema</string>
-    <string name="bottom_title_settings">Vorschaubild Titel Platzierung</string>
+    <string name="bottom_title_settings">Vorschaubildtitel Platzierung</string>
     <string name="bottom_title_settings_des">Titel unter Vorschaubild platzieren</string>
     <string name="example_password">passwort123</string>
     <string name="example_username">MeinCoolerUsername</string>
@@ -344,12 +344,12 @@
     <string name="recommended">Empfohlen</string>
     <string name="player_loaded_subtitles" formatted="true">%s geladen</string>
     <string name="player_load_subtitles">Aus Datei laden</string>
-    <string name="player_load_subtitles_online">Vom Internet laden</string>
+    <string name="player_load_subtitles_online">Aus Internet laden</string>
     <string name="downloaded_file">Heruntergeladene Datei</string>
     <string name="actor_main">Hauptdarsteller</string>
     <string name="actor_supporting">Nebendarsteller</string>
     <string name="actor_background">Hintergrunddarsteller</string>
-    <string name="home_source">Anbieter</string>
+    <string name="home_source">Quelle</string>
     <string name="home_random">Zufällig</string>
     <string name="coming_soon">Demnächst…</string>
     <string name="quality_cam">Cam</string>
@@ -378,7 +378,7 @@
     <string name="error_invalid_url">Ungültige URL</string>
     <string name="error">Fehler</string>
     <string name="subtitles_remove_captions">Softsubs aus Untertiteln entfernen</string>
-    <string name="subtitles_remove_bloat">Entferne nutzloses aus Untertiteln (z.B. Werbung)</string>
+    <string name="subtitles_remove_bloat">Entfernt Schrott aus Untertiteln (z.B. Werbung)</string>
     <string name="subtitles_filter_lang">Nach bevorzugter Mediensprache filtern</string>
     <string name="extras">Extras</string>
     <string name="trailer">Trailer</string>
@@ -400,19 +400,23 @@
     <string name="plugin_deleted">Plugin gelöscht</string>
     <string name="plugin_load_fail" formatted="true">Fehler beim Laden von %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Herunterladen begonnen %d %s</string>
-    <string name="batch_download_finish_format" formatted="true">Downloaded %d %s erfolgreich</string>
+    <string name="batch_download_start_format" formatted="true">Herunterladen begonnen %d %s…</string>
+    <string name="batch_download_finish_format" formatted="true">%d %s heruntergeladen</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Alle %s bereits heruntergeladen</string>
-    <string name="batch_download">Batch Download</string>
+    <string name="batch_download">Batch-Download</string>
     <string name="plugin_singular">Plugin</string>
     <string name="plugin">Plugins</string>
     <string name="delete_repository_plugins">Dadurch werden auch alle Repository-Plugins gelöscht</string>
     <string name="delete_repository">Repository löschen</string>
-    <string name="setup_extensions_subtext">Liste der Websites herunterladen, welche du verwenden möchtest</string>
-    <string name="plugins_downloaded" formatted="true">Downloaded: %d</string>
+    <string name="setup_extensions_subtext">Lade eine Liste der Websiten herunter, welche du verwenden möchtest</string>
+    <string name="plugins_downloaded" formatted="true">Heruntergeladen: %d</string>
     <string name="plugins_disabled" formatted="true">Heruntergeladen: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Nicht heruntergeladen: %d</string>
-    <string name="blank_repo_message">Repository hinzufügen um Anbieter-Erweiterungen herunterzuladen</string>
+    <string name="blank_repo_message">CloudStream hat standardmäßig keine Websites installiert. Websites müssen aus Repositories installiert werden.
+\n
+\nAufgrund eines hirnlosen DMCA-Takedowns durch Sky UK Limited 🤮 können wir die Repository-Site nicht in der App verlinken.
+\n
+\nTrete unserem Discord bei oder suche online.</string>
     <string name="view_public_repositories_button">Community-Repositories anzeigen</string>
     <string name="view_public_repositories_button_short">Öffentliche Liste</string>
     <string name="uppercase_all_subtitles">Alle Untertitel in Großbuchstaben</string>
@@ -434,7 +438,7 @@
     <string name="extension_types">Unterstützt</string>
     <string name="extension_language">Sprache</string>
     <string name="extension_install_first">Zuerst muss die Erweiterung installiert werden</string>
-    <string name="hls_playlist">HLS Playlist</string>
+    <string name="hls_playlist">HLS-Playlist</string>
     <string name="player_pref">Bevorzugter Videoplayer</string>
     <string name="player_settings_play_in_app">Interner Player</string>
     <string name="player_settings_play_in_vlc">VLC</string>
@@ -451,4 +455,34 @@
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="play_trailer_button">Trailer abspielen</string>
+    <string name="automatic_plugin_download">Automatisches Herunterladen von Plugins</string>
+    <string name="automatic_plugin_download_summary">Automatische Installation aller noch nicht installierten Plugins aus hinzugefügten Repositories.</string>
+    <string name="redo_setup_process">Einrichtungsvorgang wiederholen</string>
+    <string name="apk_installer_settings">APK-Installer</string>
+    <string name="apk_installer_settings_des">Einige Telefone unterstützen das neue Installationsprogramm für Pakete nicht. Benutze die Legacy-Option, wenn sich die Updates nicht installieren lassen.</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="pref_category_links">Links</string>
+    <string name="pref_category_app_updates">App-Updates</string>
+    <string name="pref_category_backup">Back-Up</string>
+    <string name="pref_category_extensions">Erweiterungen</string>
+    <string name="pref_category_actions">Wartung</string>
+    <string name="pref_category_cache">Cache</string>
+    <string name="pref_category_gestures">Gesten</string>
+    <string name="pref_category_player_features">Player-Funktionen</string>
+    <string name="pref_category_subtitles">Untertitel</string>
+    <string name="pref_category_player_layout">Layout</string>
+    <string name="pref_category_defaults">Voreinstellungen</string>
+    <string name="pref_category_looks">Aussehen</string>
+    <string name="pref_category_ui_features">Funktionen</string>
+    <string name="plugins_updated" formatted="true">%d Plugins aktualisiert</string>
+    <string name="action_mark_as_watched">Als beobachtet markieren</string>
+    <string name="confirm_exit_dialog">Sind Sie sicher, dass Sie die App beenden möchten\?</string>
+    <string name="yes">Ja</string>
+    <string name="no">Nein</string>
+    <string name="update_notification_downloading">App-Update wird heruntergeladen…</string>
+    <string name="update_notification_installing">App-Update wird installiert…</string>
+    <string name="update_notification_failed">Konnte die neue Version der App nicht installieren</string>
+    <string name="apk_installer_legacy">Legacy</string>
+    <string name="apk_installer_package_installer">PackageInstaller</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 38966c3b..0e247ca8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -21,13 +21,13 @@
     <string name="add_repository">Agregar repositorio</string>
     <string name="repository_name_hint">Nombre del repositorio</string>
     <string name="delete_repository_plugins">Esto también eliminará todos los plugins del repositorio</string>
-    <string name="pref_filter_search_quality">Oculta la calidad de video en los resultados de búsqueda</string>
+    <string name="pref_filter_search_quality">Ocultar la calidad de video en los resultados de búsqueda</string>
     <string name="pref_category_player_layout">Diseño</string>
     <string name="category_ui">Diseño</string>
     <string name="watch_quality_pref">Calidad de visualización preferida</string>
     <string name="player_pref">Reproductor de video preferido</string>
     <string name="emulator_layout">Diseño para emulador</string>
-    <string name="app_layout">Diseño de la App</string>
+    <string name="app_layout">Diseño de la aplicación</string>
     <string name="tv_layout">Diseño de TV</string>
     <string name="phone_layout">Diseño para teléfonos</string>
     <string name="player_subtitles_settings">Subtítulos</string>
@@ -54,7 +54,7 @@
     <string name="swipe_to_seek_settings_des">Desliza el dedo hacia la izquierda o hacia la derecha para controlar el tiempo en el reproductor de video</string>
     <string name="subtitles_filter_lang">Filtrar por idioma de medios preferido</string>
     <string name="subtitles_remove_captions">Eliminar Closed Captions (CC) de los subtítulos</string>
-    <string name="double_tap_to_seek_amount_settings">Cantidad de búsqueda del reproductor</string>
+    <string name="double_tap_to_seek_amount_settings">Cantidad de tiempo de búsqueda en el reproductor (en segundos)</string>
     <string name="use_system_brightness_settings_des">Use el brillo del sistema en el reproductor de la app en lugar de una superposición oscura</string>
     <string name="limit_title_rez">Resolución del reproductor de video</string>
     <string name="player_settings_play_in_mpv">MPV</string>
@@ -92,7 +92,7 @@
     <string name="popup_resume_download">Continuar Descarga</string>
     <string name="example_lang_name">Código de idioma (es_LA)</string>
     <string name="home_main_poster_img_des">Poster Principal</string>
-    <string name="app_language">Idioma de la App</string>
+    <string name="app_language">Idioma de la aplicación</string>
     <string name="provider_languages_tip">Ver videos en estos idiomas</string>
     <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="home_next_random_img_des">Siguiente al azar</string>
@@ -153,7 +153,7 @@
     <string name="download_failed">Descarga fallida</string>
     <string name="download_canceled">Descarga Cancelada</string>
     <string name="download_done">Descarga Finalizada</string>
-    <string name="stream">Stream</string>
+    <string name="stream">Transmitir</string>
     <string name="error_loading_links_toast">Error cargando enlaces</string>
     <string name="download_storage_text">Almacenamiento Interno</string>
     <string name="app_dubbed_text">Doblado</string>
@@ -187,9 +187,9 @@
     <string name="subs_subtitle_languages">Idioma del subtítulo</string>
     <string name="picture_in_picture">Imagen en Imagen (PIP)</string>
     <string name="search_provider_text_types">Buscar por tipos</string>
-    <string name="benene_count_text">%d Bananas otorgadas a los desarrolladores</string>
+    <string name="benene_count_text">%d bananas otorgadas a los desarrolladores</string>
     <string name="benene_count_text_none">No se otorgaron bananas</string>
-    <string name="subs_hold_to_reset_to_default">mantenga pulsado para restablecer los valores predeterminados</string>
+    <string name="subs_hold_to_reset_to_default">Mantenga pulsado para restablecer los valores predeterminados</string>
     <string name="subs_import_text" formatted="true">Importar fuentes colocándolas en %s</string>
     <string name="continue_watching">Continuar Viendo</string>
     <string name="action_remove_watching">Remover</string>
@@ -215,8 +215,8 @@
     <string name="backup_settings">Hacer copia de los datos (backup)</string>
     <string name="restore_success">Archivo de backup cargado</string>
     <string name="updates_settings_des">Buscar automáticamente nuevas actualizaciones al inicio</string>
-    <string name="redo_setup_process">Repetir el proceso de configuración inicial</string>
-    <string name="show_fillers_settings">Mostrar episodio de relleno para anime</string>
+    <string name="redo_setup_process">Rehacer el proceso de configuración inicial</string>
+    <string name="show_fillers_settings">Mostrar episodio de relleno para Anime</string>
     <string name="play_episode_toast">Reproducir Episodio</string>
     <string name="episode">Episodio</string>
     <string name="episodes">Episodios</string>
@@ -233,12 +233,12 @@
     <string name="settings_info">Info</string>
     <string name="advanced_search">Búsqueda Avanzada</string>
     <string name="advanced_search_des">Da los resultados de la búsqueda separados por proveedor</string>
-    <string name="bug_report_settings_off">Solo envía datos si la app termina inesperadamente (crash)</string>
+    <string name="bug_report_settings_off">Solo envía datos si la App termina / falla inesperadamente (crash)</string>
     <string name="bug_report_settings_on">No enviar datos</string>
-    <string name="show_trailers_settings">Mostrar Trailers</string>
-    <string name="kitsu_settings">Mostrar posters de Kitsu</string>
+    <string name="show_trailers_settings">Mostrar Trailers (avances)</string>
+    <string name="kitsu_settings">Mostrar pósters de Kitsu</string>
     <string name="uprereleases_settings">Actualizar a las versiones preliminares</string>
-    <string name="uprereleases_settings_des">Buscar actualizaciones preliminares en lugar de solo versiones completas</string>
+    <string name="uprereleases_settings_des">Buscar actualizaciones preliminares (beta) en lugar de solo versiones completas (stable releases)</string>
     <string name="github">Github</string>
     <string name="lightnovel">App de novela ligera de los mismos desarrolladores</string>
     <string name="anim">App de Anime de los mismos desarrolladores</string>
@@ -258,7 +258,7 @@
     <string name="delete">Borrar</string>
     <string name="unexpected_error">Error inesperado del reproductor</string>
     <string name="episode_action_chromecast_episode">Episodio en Chromecast</string>
-    <string name="episode_action_play_in_app">Reproducir en la app</string>
+    <string name="episode_action_play_in_app">Reproducir en la aplicación</string>
     <string name="pause">Pausar</string>
     <string name="resume">Continuar</string>
     <string name="go_back_30">-30</string>
@@ -269,32 +269,32 @@
     <string name="status_completed">Completado</string>
     <string name="status">Estado</string>
     <string name="limit_title">Máxima cantidad de caracteres en el título del reproductor</string>
-    <string name="pref_category_app_updates">Actualizaciones de la App</string>
+    <string name="pref_category_app_updates">Actualizaciones de la aplicación</string>
     <string name="automatic">Auto</string>
     <string name="pref_category_actions">Acciones</string>
-    <string name="enable_nsfw_on_providers">Activa NSFW en proveedores soportados</string>
+    <string name="enable_nsfw_on_providers">Activa NSFW (contenido adulto) en proveedores soportados</string>
     <string name="category_providers">Proveedores</string>
     <string name="pref_category_defaults">Predeterminados</string>
-    <string name="preferred_media_settings">Medio preferido</string>
+    <string name="preferred_media_settings">Medios preferidos</string>
     <string name="pref_category_gestures">Gestos</string>
     <string name="provider_lang_settings">Idiomas del proveedor</string>
     <string name="player_loaded_subtitles" formatted="true">%s Cargado</string>
     <string name="subtitles_remove_bloat">Eliminar excedente (bloat) de los subtítulos</string>
     <string name="skip_setup">Omitir configuración</string>
     <string name="preferred_media_subtext">Qué quieres ver</string>
-    <string name="uppercase_all_subtitles">Poner en mayúsculas todos los subtítulos</string>
-    <string name="apply_on_restart">Aplicar al Reiniciar</string>
+    <string name="uppercase_all_subtitles">Poner en MAYÚSCULAS todos los subtítulos</string>
+    <string name="apply_on_restart">Se aplican los cambios al reiniciar la App</string>
     <string name="player_settings_play_in_app">Reproductor interno</string>
     <string name="extension_language">Idioma</string>
     <string name="apk_installer_legacy">Legacy (método antiguo)</string>
     <string name="apk_installer_package_installer">Instalador de paquetes</string>
-    <string name="blank_repo_message">CloudStream no tiene sitios instalados de forma predeterminada. Necesita instalar los sitios desde los repositorios.
+    <string name="blank_repo_message">CloudStream no tiene sitios instalados de forma predeterminada. Necesita instalalos desde los repositorios.
 \n
 \nDebido a la eliminación sin sentido de DMCA por parte de Sky UK Limited 🤮, no podemos vincular el sitio del repositorio en la aplicación.
 \n
 \nÚnete a nuestro Discord o busca en línea.</string>
     <string name="download_all_plugins_from_repo">Descarga todos los plugins desde este repositorio\?</string>
-    <string name="updates_settings">Mostrar actualizaciones de la app</string>
+    <string name="updates_settings">Mostrar actualizaciones de la aplicación</string>
     <string name="apk_installer_settings">Instalador de APK</string>
     <string name="apk_installer_settings_des">Algunos dispositivos no soportan el nuevo instalador de paquetes. Pruebe la opción antigua (legacy) si las actualizaciones no se instalan.</string>
     <string name="pref_disable_acra">Desactivar reporte automático de bugs</string>
@@ -302,11 +302,11 @@
     <string name="automatic_plugin_updates">Actualización automática de plugins</string>
     <string name="pref_category_player_features">Características del reproductor</string>
     <string name="automatic_plugin_download">Descarga automática de plugins</string>
-    <string name="automatic_plugin_download_summary">Instale automáticamente todos los plugins aún no instalados de los repositorios agregados.</string>
+    <string name="automatic_plugin_download_summary">Instala automáticamente todos los plugins aún no instalados de los repositorios agregados.</string>
     <string name="pref_category_looks">Aspecto</string>
     <string name="pref_category_ui_features">Características</string>
-    <string name="random_button_settings">Botón aleatorio</string>
-    <string name="random_button_settings_desc">Muestra un botón aleatorio en la página de inicio</string>
+    <string name="random_button_settings">Botón de Al azar</string>
+    <string name="random_button_settings_desc">Muestra un botón de reproducción \"al azar\" en la página de inicio</string>
     <string name="account">cuenta</string>
     <string name="logout">Cerrar sesión</string>
     <string name="switch_account">Cambiar cuenta</string>
@@ -319,7 +319,7 @@
     <string name="poster_image">Imagen del póster</string>
     <string name="trailer">Tráiler</string>
     <string name="coming_soon">Próximamente…</string>
-    <string name="home_random">Aleatorio</string>
+    <string name="home_random">Al azar</string>
     <string name="actor_main">Principal</string>
     <string name="error_invalid_data">Datos no válidos</string>
     <string name="add_sync">Añadir seguimiento</string>
@@ -399,7 +399,7 @@
     <string name="resize_fill">Estirar</string>
     <string name="resize_zoom">Zoom</string>
     <string name="legal_notice">Descargo de responsabilidad</string>
-    <string name="bottom_title_settings">Póster en la ubicación del título</string>
+    <string name="bottom_title_settings">Ubicación del título en el póster</string>
     <string name="bottom_title_settings_des">Coloca el título debajo del póster</string>
     <string name="example_password">contraseña123</string>
     <string name="example_username">MiNombreDeUsuarioGenial</string>
@@ -431,4 +431,58 @@
     <string name="title">Título</string>
     <string name="resolution">Resolución</string>
     <string name="error_invalid_id">Identificación no válida</string>
+    <string name="livestreams">Transmisiones en vivo</string>
+    <string name="nsfw">NSFW</string>
+    <string name="others">Otros</string>
+    <string name="live_singular">Transmisión en vivo</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="other_singular">Video</string>
+    <string name="pref_category_links">Enlaces</string>
+    <string name="pref_category_backup">Backup</string>
+    <string name="pref_category_cache">Caché</string>
+    <string name="create_account">Crear cuenta</string>
+    <string name="error_invalid_url">URL Inválida</string>
+    <string name="network_adress_example">Enlace a la transmisión</string>
+    <string name="referer">Referente</string>
+    <string name="next">Siguiente</string>
+    <string name="previous">Anterior</string>
+    <string name="setup_done">Hecho</string>
+    <string name="plugin_loaded">Plugin Cargado</string>
+    <string name="is_adult">18+</string>
+    <string name="batch_download_start_format" formatted="true">Iniciada la descarga %d %s…</string>
+    <string name="batch_download">Descarga por lotes</string>
+    <string name="plugin_singular">plugin</string>
+    <string name="plugin">plugins</string>
+    <string name="plugins_updated" formatted="true">Actualizados %d plugins</string>
+    <string name="view_public_repositories_button">Ver repositorios de la comunidad</string>
+    <string name="view_public_repositories_button_short">Lista pública</string>
+    <string name="tracks">Pistas</string>
+    <string name="audio_tracks">Pistas de audio</string>
+    <string name="video_tracks">Pistas de video</string>
+    <string name="safe_mode_title">Modo seguro ON</string>
+    <string name="safe_mode_crash_info">Ver info de fallos</string>
+    <string name="extension_rating" formatted="true">Puntaje:%s</string>
+    <string name="extension_version">Versión</string>
+    <string name="extension_status">Estado</string>
+    <string name="extension_size">Tamaño</string>
+    <string name="extension_authors">Autores</string>
+    <string name="extension_types">Soportado</string>
+    <string name="extension_install_first">Instale las extensiones primero</string>
+    <string name="hls_playlist">Lista de reproducción HLS</string>
+    <string name="clear_history">Limpiar historial</string>
+    <string name="history">Historial</string>
+    <string name="action_mark_as_watched">Marcar como visto</string>
+    <string name="clipboard_too_large">Demasiado texto. No se puede guardar en el portapapeles.</string>
+    <string name="no">No</string>
+    <string name="update_notification_downloading">Descargando actualización de la aplicación…</string>
+    <string name="update_notification_installing">Instalando actualización de la aplicación…</string>
+    <string name="update_notification_failed">No se pudo instalar la nueva versión de la aplicación</string>
+    <string name="app_not_found_error">App no encontrada</string>
+    <string name="crash_reporting_title">Reporte de fallos</string>
+    <string name="plugin_deleted">Plugin Borrado</string>
+    <string name="plugin_load_fail" formatted="true">No puede cargar %s</string>
+    <string name="extension_description">Descripción</string>
+    <string name="skip_type_intro">Intro</string>
+    <string name="enable_skip_op_from_database_des">Muestrar botones emergentes para saltar apertura/finalización del video</string>
+    <string name="yes">Si</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index e07f3063..a8816ce8 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -145,4 +145,5 @@
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="result_poster_img_des">विज्ञापन</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index a1611f97..85e4f2c0 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -138,7 +138,7 @@
     <string name="restore_success">File cadangan termuat</string>
     <string name="restore_failed_format" formatted="true">Gagal untuk memulihkan data dari file %s</string>
     <string name="backup_success">Data tersimpan</string>
-    <string name="backup_failed">Izin penyimpanan tidak ditemukan, mohon coba lagi</string>
+    <string name="backup_failed">Izin penyimpanan tidak ditemukan, mohon coba lagi.</string>
     <string name="backup_failed_error_format">Error saat mencadang %s</string>
     <string name="search">Cari</string>
     <string name="category_account">Kredit dan akun</string>
@@ -464,7 +464,7 @@
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="player_settings_play_in_mpv">MPV</string>
     <string name="batch_download_finish_format" formatted="true">Terunduh %d %s</string>
-    <string name="batch_download_start_format" formatted="true">"Memulai mengunduh  %d %s…"</string>
+    <string name="batch_download_start_format" formatted="true">Memulai mengunduh %d %s…</string>
     <string name="safe_mode_description">Semua fitur tambahkan dimatikan karena crash, untuk memudahkanmu mencari penyebab crash.</string>
     <string name="example_lang_name">Kode bahasa (en)</string>
     <string name="player_load_subtitles_online">Ambil dari internet</string>
@@ -473,7 +473,7 @@
     <string name="delete_repository_plugins">Pilih ini untuk menghapus semua repositori plugin</string>
     <string name="skip_setup">Lewati pengaturan</string>
     <string name="error_invalid_url">Alamat salah</string>
-    <string name="network_adress_example">"Alamat  streaming"</string>
+    <string name="network_adress_example">Alamat streaming</string>
     <string name="next">Selanjutnya</string>
     <string name="previous">Sebelumnya</string>
     <string name="app_layout_subtext">Ubah tampilan aplikasi</string>
@@ -485,7 +485,7 @@
     <string name="extension_size">Ukuran</string>
     <string name="error_invalid_id">ID salah</string>
     <string name="history">Riwayat</string>
-    <string name="action_mark_as_watched">Tandai ditonton</string>
+    <string name="action_mark_as_watched">Telah ditonton</string>
     <string name="error_invalid_data">Data salah</string>
     <string name="subtitles_remove_captions">Hapus teks tertutup dari subtitel</string>
     <string name="subtitles_remove_bloat">Hapus karakter sampah dari subtitel</string>
@@ -499,4 +499,28 @@
     <string name="apk_installer_settings_des">Beberapa perangkat tidak mendukung penginstal paket mode baru. Coba mode lama jika pembaruan tidak dapat diinstal.</string>
     <string name="pref_category_actions">Aksi</string>
     <string name="referer">Sumber</string>
+    <string name="yes">Ya</string>
+    <string name="extension_install_first">Pasang dulu fitur tambahan</string>
+    <string name="all_languages_preference">Semua Bahasa</string>
+    <string name="skip_type_format" formatted="true">Lewati %s</string>
+    <string name="skip_type_op">Pembuka</string>
+    <string name="skip_type_ed">Sesi Akhir</string>
+    <string name="skip_type_recap">Sinopsis</string>
+    <string name="skip_type_mixed_ed">Sesi akhir ganda</string>
+    <string name="skip_type_creddits">Sesi Kredit</string>
+    <string name="skip_type_intro">Sesi Intro</string>
+    <string name="clipboard_too_large">Terlalu banyak karakter, tidak dapat menyimpan di clipboard.</string>
+    <string name="confirm_exit_dialog">Yakin ingin keluar\?</string>
+    <string name="no">Tidak</string>
+    <string name="update_notification_installing">Memasang pembaruan…</string>
+    <string name="update_notification_failed">Tidak dapat memasang versi terbaru</string>
+    <string name="player_settings_play_in_browser">Web browser</string>
+    <string name="app_not_found_error">Aplikasi tidak ditemukan</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="clear_history">Hapus Riwayat</string>
+    <string name="enable_skip_op_from_database_des">Tampilkan popup untuk skip sesi pembuka/akhir</string>
+    <string name="update_notification_downloading">Mengunduh pembaruan…</string>
+    <string name="apk_installer_legacy">Versi lama</string>
+    <string name="skip_type_mixed_op">Sesi pembuka ganda</string>
+    <string name="apk_installer_package_installer">Penginstal Paket</string>
 </resources>
\ No newline at end of file

From 591ac137f990ff23c81b5911aa68339f653d88a8 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Mon, 2 Jan 2023 12:42:58 +0100
Subject: [PATCH 154/273] Add ebd.cda.pl and automatically set legacy for miui
 (#296)

Co-authored-by: codefactor-io <support@codefactor.io>
---
 .../lagradost/cloudstream3/extractors/Cda.kt  | 97 +++++++++++++++++++
 .../cloudstream3/utils/ExtractorApi.kt        |  2 +
 .../cloudstream3/utils/InAppUpdater.kt        | 36 +++++++
 3 files changed, 135 insertions(+)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/extractors/Cda.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Cda.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Cda.kt
new file mode 100644
index 00000000..6a2f399d
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Cda.kt
@@ -0,0 +1,97 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import android.util.Log
+import java.net.URLDecoder
+
+open class Cda: ExtractorApi() {
+    override var mainUrl = "https://ebd.cda.pl"
+    override var name = "Cda"
+    override val requiresReferer = false
+
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+        val mediaId = url
+            .split("/").last()
+            .split("?").first()
+        val doc = app.get("https://ebd.cda.pl/647x500/$mediaId", headers=mapOf(
+            "Referer" to "https://ebd.cda.pl/647x500/$mediaId",
+            "User-Agent" to USER_AGENT,
+            "Cookie" to "cda.player=html5"
+        )).document
+        val dataRaw = doc.selectFirst("[player_data]")?.attr("player_data") ?: return null
+        val playerData = tryParseJson<PlayerData>(dataRaw) ?: return null
+        return listOf(ExtractorLink(
+            name,
+            name,
+            getFile(playerData.video.file),
+            referer = "https://ebd.cda.pl/647x500/$mediaId",
+            quality = Qualities.Unknown.value
+        ))
+    }
+
+    private fun rot13(a: String): String {
+        return a.map {
+            when {
+                it in 'A'..'M' || it in 'a'..'m' -> it + 13
+                it in 'N'..'Z' || it in 'n'..'z' -> it - 13
+                else -> it
+            }
+        }.joinToString("")
+    }
+
+    private fun cdaUggc(a: String): String {
+        val decoded = rot13(a)
+        return if (decoded.endsWith("adc.mp4")) decoded.replace("adc.mp4",".mp4")
+        else decoded
+    }
+
+    private fun cdaDecrypt(b: String): String {
+        var a = b
+            .replace("_XDDD", "")
+            .replace("_CDA", "")
+            .replace("_ADC", "")
+            .replace("_CXD", "")
+            .replace("_QWE", "")
+            .replace("_Q5", "")
+            .replace("_IKSDE", "")
+        a = URLDecoder.decode(a, "UTF-8")
+        a = a.map { char ->
+            if (32 < char.toInt() && char.toInt() < 127) {
+                return@map String.format("%c", 33 + (char.toInt() + 14) % 94)
+            } else {
+                return@map char
+            }
+        }.joinToString("")
+        a = a
+            .replace(".cda.mp4", "")
+            .replace(".2cda.pl", ".cda.pl")
+            .replace(".3cda.pl", ".cda.pl")
+        return if (a.contains("/upstream")) "https://" + a.replace("/upstream", ".mp4/upstream")
+            else "https://${a}.mp4"
+    }
+
+    private fun getFile(a: String) = when {
+        a.startsWith("uggc") -> cdaUggc(a)
+        !a.startsWith("http") -> cdaDecrypt(a)
+        else -> a
+    }
+
+    data class VideoPlayerData(
+        val file: String,
+        val qualities: Map<String, String> = mapOf(),
+        val quality: String?,
+        val ts: Int?,
+        val hash2: String?
+    )
+
+    data class PlayerData(
+        val video: VideoPlayerData
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 24708e99..cf6d0bae 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -356,6 +356,8 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     VidSrcExtractor2(),
     PlayLtXyz(),
     AStreamHub(),
+
+    Cda()
 )
 
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
index 1a671499..796d509e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -22,6 +22,10 @@ import okio.BufferedSink
 import okio.buffer
 import okio.sink
 import java.io.File
+import android.text.TextUtils
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStreamReader
 
 
 class InAppUpdater {
@@ -294,6 +298,12 @@ class InAppUpdater {
                                 setPositiveButton(R.string.update) { _, _ ->
                                     showToast(context, R.string.download_started, Toast.LENGTH_LONG)
 
+                                    // Check if the setting hasn't been changed
+                                    if (settingsManager.getInt(getString(R.string.apk_installer_key), -1) == -1) {
+                                        if (isMiUi()) // Set to legacy if using miui
+                                            settingsManager.edit().putInt(getString(R.string.apk_installer_key), 1).apply()
+                                    }
+
                                     val currentInstaller =
                                         settingsManager.getInt(
                                             getString(R.string.apk_installer_key),
@@ -347,5 +357,31 @@ class InAppUpdater {
             }
             return false
         }
+
+        fun isMiUi(): Boolean {
+            return !TextUtils.isEmpty(getSystemProperty("ro.miui.ui.version.name"))
+        }
+
+        fun getSystemProperty(propName: String): String? {
+            var line: String? = null
+            var input: BufferedReader? = null
+            try {
+                val p = Runtime.getRuntime().exec("getprop $propName")
+                input = BufferedReader(InputStreamReader(p.inputStream), 1024)
+                line = input.readLine()
+                input.close()
+            } catch (ex: IOException) {
+                return null
+            } finally {
+                if (input != null) {
+                    try {
+                        input.close()
+                    } catch (e: IOException) {
+                        e.printStackTrace()
+                    }
+                }
+            }
+            return line
+        }
     }
 }

From 8712f08bb182db1ac31483007f6c1f77675e4a5f Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Mon, 2 Jan 2023 11:57:09 +0100
Subject: [PATCH 155/273] Translated using Weblate (Bengali)

Currently translated at 39.9% (225 of 563 strings)

Translated using Weblate (Hungarian)

Currently translated at 17.7% (100 of 563 strings)

Translated using Weblate (Bengali)

Currently translated at 39.7% (224 of 563 strings)

Translated using Weblate (Turkish)

Currently translated at 88.9% (501 of 563 strings)

Translated using Weblate (Dutch)

Currently translated at 78.8% (444 of 563 strings)

Translated using Weblate (Hungarian)

Currently translated at 17.5% (99 of 563 strings)

Translated using Weblate (Hungarian)

Currently translated at 17.5% (99 of 563 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (563 of 563 strings)

Added translation using Weblate (Hungarian)

Translated using Weblate (Russian)

Currently translated at 17.5% (99 of 563 strings)

Translated using Weblate (Russian)

Currently translated at 15.6% (88 of 563 strings)

Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Eff ji <Paper.Pepperoni@protonmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: g0szt <gost1336@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hu/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml |  2 +-
 app/src/main/res/values-bn/strings.xml | 28 +++++++++++++++++++++++
 app/src/main/res/values-hu/strings.xml | 31 ++++++++++++++++++++++++++
 app/src/main/res/values-nl/strings.xml |  1 +
 app/src/main/res/values-ru/strings.xml | 17 +++++++++++++-
 app/src/main/res/values-tr/strings.xml |  8 +++++--
 6 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/values-hu/strings.xml

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index ac4b41b1..5dad5937 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -388,7 +388,7 @@
     <string name="quality_cam_rip">تصوير كام قطع</string>
     <string name="quality_cam_hd">تصوير كام جودة عالية</string>
     <string name="quality_hq">HQ</string>
-    <string name="quality_hd">عالي الدقة</string>
+    <string name="quality_hd">عالِ الدقة</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
     <string name="quality_blueray">بلو راي</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 13d62c40..2e11c3c8 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -115,4 +115,32 @@
     <string name="vpn_might_be_needed">এই প্রভাইডার ঠিকভাবে চালাতে ভিপিএন লাগতে পারে</string>
     <string name="provider_info_meta">প্রভাইডার থেকে মেটাডেটা পাওয়া যায়নি, যদি সম্পূর্ন সাইটে না পাওয়া যায় তাইলে ভিডিও লোড হবে না।</string>
     <string name="history">ইতিহাস</string>
+    <string name="player_subtitles_settings">সাবটাইটেল</string>
+    <string name="player_subtitles_settings_des">প্লেয়ার এর সাবটাইটেলসমূহের সেটিংস</string>
+    <string name="chromecast_subtitles_settings">ক্রোমক্যাস্ট এ সাবটাইটেলসমূহ</string>
+    <string name="chromecast_subtitles_settings_des">ক্রোমক্যাস্ট এ সাবটাইটেল সমূহের সেটিংস</string>
+    <string name="player_size_settings_des">কালো প্রান্ত অপসারণ করুন</string>
+    <string name="eigengraumode_settings_des">প্লেয়ার এ দ্রুততা এর অপশন যুক্ত করে</string>
+    <string name="search">অনুসন্ধান করুন</string>
+    <string name="category_account">অ্যাকাউন্টসমূহ</string>
+    <string name="bug_report_settings_on">কোনো উপাত্ত পাঠাবে না</string>
+    <string name="double_tap_to_pause_settings_des">বিরতি দিতে মাঝে চাপুন</string>
+    <string name="use_system_brightness_settings">সিস্টেম এর উজ্জ্বলতা ব্যবহার করুন</string>
+    <string name="play_trailer_button">ট্রেইলার চালু করুন</string>
+    <string name="swipe_to_seek_settings_des">ভিডিওপ্লেয়ার এ সময় নিয়ন্ত্রণ করতে, ডানে অথবা বামে সোয়াইপ করুন</string>
+    <string name="swipe_to_change_settings">সেটিংস পরিবর্তন করতে সোয়াইপ করুন</string>
+    <string name="swipe_to_change_settings_des">উজ্জ্বলতা অথবা স্বরমাত্রা পরিবর্তন করতে যথাক্রমে বামে অথবা ডানে সোয়াইপ করুন</string>
+    <string name="autoplay_next_settings">স্বয়ংক্রিয়ভাবে পরবর্তী এপিসোড প্লে করুন</string>
+    <string name="autoplay_next_settings_des">পরবর্তী এপিসোডটি চালু করুন যখন চলতি এপিসোডটি শেষ হয়</string>
+    <string name="double_tap_to_pause_settings">থামতে দুইবার চাপুন</string>
+    <string name="backup_success">ডাটা জমা হয়েছে</string>
+    <string name="backup_failed">স্টোরেজ এর অনুমতি অনুপস্থিত। দয়া করে আবার চেষ্টা করুন।</string>
+    <string name="settings_info">তথ্য</string>
+    <string name="show_trailers_settings">ট্রেইলার প্রদর্শন করুন</string>
+    <string name="kitsu_settings">কিটসু হতে পোস্টারসমূহ প্রদর্শন করুন</string>
+    <string name="automatic_plugin_updates">স্বয়ংক্রিয়ভাবে প্লাগিন এর হালনাগাদ</string>
+    <string name="automatic_plugin_download">স্বয়ংক্রিয়ভাবে প্লাগিনসমুহের ডাউনলোড</string>
+    <string name="category_updates">হালনাগাদ ও ব্যাকআপ</string>
+    <string name="updates_settings">অ্যাপ এর হালনাগাদ দেখান</string>
+    <string name="swipe_to_seek_settings">খুঁজতে সোয়াইপ করুন</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
new file mode 100644
index 00000000..894b6d79
--- /dev/null
+++ b/app/src/main/res/values-hu/strings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="cast_format" formatted="true">Stáblista: %s</string>
+    <string name="next_episode_time_day_format" formatted="true">%dn %dó%dp</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dó%dp</string>
+    <string name="next_episode_time_min_format" formatted="true">%dp</string>
+    <string name="episode_poster_img_des">Epizód Plakát</string>
+    <string name="home_main_poster_img_des">Fő Plakát</string>
+    <string name="go_back_img_des">Vissza</string>
+    <string name="home_change_provider_img_des">Szolgáltató Váltás</string>
+    <string name="player_speed_text_format" formatted="true">Sebesség (%.2fx)</string>
+    <string name="rated_format" formatted="true">Értékelés: %.1f</string>
+    <string name="new_update_format" formatted="true">Új frissítés található!
+\n%s -&gt; %s</string>
+    <string name="duration_format" formatted="true">%d perc</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%sEp%d</string>
+    <string name="app_name">CloudStream</string>
+    <string name="preview_background_img_des">Háttér Előnézet</string>
+    <string name="download_failed">Letöltés sikertelen</string>
+    <string name="download">Letöltés</string>
+    <string name="search">Keresés</string>
+    <string name="delete">Törlés</string>
+    <string name="pause">Szüneteltetés</string>
+    <string name="queued">sorba állítva</string>
+    <string name="resize_fit">Igazítás</string>
+    <string name="resize_fill">Kitöltés</string>
+    <string name="resize_zoom">Nagyítás</string>
+    <string name="all">Összes</string>
+    <string name="tracks">Zeneszámok</string>
+    <string name="home_next_random_img_des">Következő random</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 4011d6f5..0e69f9fc 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -398,4 +398,5 @@
     <string name="setup_done">Klaar</string>
     <string name="action_mark_as_watched">Markeer als bekeken</string>
     <string name="history">Geschiedenis</string>
+    <string name="play_trailer_button">Speel Trailer</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a6b3daec..64f67d87 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,2 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="history">История</string>
+    <string name="no">Нет</string>
+    <string name="yes">Да</string>
+    <string name="tracks">Треки</string>
+    <string name="queued">в очереди</string>
+    <string name="resize_zoom">Приблизить</string>
+    <string name="download">Скачать</string>
+    <string name="search">Поиск</string>
+    <string name="resize_fill">Заполнить</string>
+    <string name="download_failed">Ошибка загрузки</string>
+    <string name="resize_fit">Подогнать</string>
+    <string name="delete">Удалить</string>
+    <string name="all">Всё</string>
+    <string name="pause">Пауза</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 21496a3e..82757560 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -156,11 +156,11 @@
     <string name="episode_sync_settings">İzleme ilerlemesini güncelle</string>
     <string name="episode_sync_settings_des">Mevcut bölüm ilerlemesini otomatik güncelle</string>
     <string name="restore_settings">Yedekten geri yükle</string>
-    <string name="backup_settings">Yedekle</string>
+    <string name="backup_settings">Verileri yedekleyin</string>
     <string name="restore_success">Yedek dosyası yüklendi</string>
     <string name="restore_failed_format" formatted="true">Geri yükleme başarısız oldu: %s</string>
     <string name="backup_success">Başarıyla yedeklendi</string>
-    <string name="backup_failed">Depolama izinleri eksik, lütfen tekrar deneyin</string>
+    <string name="backup_failed">Depolama izinleri eksik. Lütfen tekrar deneyin.</string>
     <string name="backup_failed_error_format">%s yedeklenirken hata</string>
     <string name="search">Ara</string>
     <string name="category_account">Hesaplar</string>
@@ -502,4 +502,8 @@
     <string name="app_not_found_error">Uygulama bulunamadı</string>
     <string name="history">Geçmiş</string>
     <string name="action_mark_as_watched">İzlendi olarak imle</string>
+    <string name="update_notification_installing">Uygulama güncellemesi yükleniyor…</string>
+    <string name="redo_setup_process">Kurulum işlemini tekrarla</string>
+    <string name="play_trailer_button">Fragmanı oynat</string>
+    <string name="automatic_plugin_download_summary">Eklenen depolardan henüz yüklenmemiş tüm eklentileri otomatik olarak yükleyin.</string>
 </resources>
\ No newline at end of file

From e362795493e5c10d3bf1599e6863bc5029a5f14d Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Mon, 2 Jan 2023 11:43:28 +0000
Subject: [PATCH 156/273] chore: update list of locales

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index a9a3426e..0814bf9d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -68,6 +68,7 @@ val appLanguages = arrayListOf(
     Triple("", "French", "fr"),
     Triple("", "Hindi", "hi"),
     Triple("", "Croatian", "hr"),
+    Triple("", "Hungarian", "hu"),
     Triple("\uD83C\uDDEE\uD83C\uDDE9", "Indonesian", "in"),
     Triple("", "Italian", "it"),
     Triple("\uD83C\uDDEE\uD83C\uDDF1", "Hebrew", "iw"),

From 0afb6b62aa878c7f4f1ce20a2a5003bc1b8db552 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Mon, 2 Jan 2023 12:44:23 +0100
Subject: [PATCH 157/273] Update update_locales.yml

---
 .github/workflows/update_locales.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update_locales.yml b/.github/workflows/update_locales.yml
index ef9c52e0..032637ab 100644
--- a/.github/workflows/update_locales.yml
+++ b/.github/workflows/update_locales.yml
@@ -25,5 +25,5 @@ jobs:
         git config user.email "actions@github.com"
         git add .
         # "echo" returns true so the build succeeds, even if no changed files
-        git commit -m 'chore: update list of locales' || echo
+        git commit -m 'update list of locales' || echo
         git push

From 657971d008e6ddd5f3fa5e034be06f4338a5c816 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Tue, 3 Jan 2023 20:56:03 +0100
Subject: [PATCH 158/273] Added delayed updating on A13 to make it less jarring

---
 app/build.gradle.kts                          |  2 +-
 .../lagradost/cloudstream3/MainActivity.kt    | 18 +++-----
 .../cloudstream3/network/CloudflareKiller.kt  |  8 +++-
 .../cloudstream3/utils/InAppUpdater.kt        | 38 ++++++++--------
 .../cloudstream3/utils/PackageInstaller.kt    | 45 ++++++++++++++++++-
 .../utils/PackageInstallerService.kt          |  2 +-
 app/src/main/res/values/strings.xml           |  2 +
 7 files changed, 78 insertions(+), 37 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index fa1cabaa..f8e0091c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -48,7 +48,7 @@ android {
         targetSdk = 33
 
         versionCode = 55
-        versionName = "3.3.0"
+        versionName = "3.4.0"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 6ae21691..ee54783f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -4,25 +4,20 @@ import android.content.ComponentName
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.Configuration
-import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
 import android.view.WindowManager
-import android.widget.FrameLayout
-import android.widget.LinearLayout
+import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.isVisible
-import androidx.core.view.marginRight
-import androidx.core.view.setMargins
 import androidx.fragment.app.FragmentActivity
-import androidx.fragment.app.FragmentContainerView
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy
@@ -77,6 +72,7 @@ import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.updateT
 import com.lagradost.cloudstream3.ui.settings.SettingsGeneral
 import com.lagradost.cloudstream3.ui.setup.HAS_DONE_SETUP_KEY
 import com.lagradost.cloudstream3.ui.setup.SetupFragmentExtensions
+import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
 import com.lagradost.cloudstream3.utils.AppUtils.loadCache
 import com.lagradost.cloudstream3.utils.AppUtils.loadRepository
@@ -87,8 +83,6 @@ import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.DataStoreHelper.migrateResumeWatching
-import com.lagradost.cloudstream3.utils.Event
-import com.lagradost.cloudstream3.utils.IOnBackPressed
 import com.lagradost.cloudstream3.utils.InAppUpdater.Companion.runAutoUpdate
 import com.lagradost.cloudstream3.utils.UIHelper.changeStatusBarState
 import com.lagradost.cloudstream3.utils.UIHelper.checkWrite
@@ -97,9 +91,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
-import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
-import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.ResponseParser
 import kotlinx.android.synthetic.main.activity_main.*
@@ -475,6 +466,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
     override fun onPause() {
         super.onPause()
+
+        // Start any delayed updates
+        if (ApkInstaller.delayedInstaller?.startInstallation() == true) {
+            Toast.makeText(this, R.string.update_started, Toast.LENGTH_LONG).show()
+        }
         try {
             if (isCastApiAvailable()) {
                 mSessionManager.removeSessionManagerListener(mSessionManagerListener)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt b/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt
index 7dc8dba7..068cb968 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt
@@ -5,6 +5,7 @@ import android.webkit.CookieManager
 import androidx.annotation.AnyThread
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.debugWarning
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.nicehttp.Requests.Companion.await
 import com.lagradost.nicehttp.cookies
 import kotlinx.coroutines.runBlocking
@@ -26,7 +27,10 @@ class CloudflareKiller : Interceptor {
 
     init {
         // Needs to clear cookies between sessions to generate new cookies.
-        CookieManager.getInstance().removeAllCookies(null)
+        normalSafeApiCall {
+            // This can throw an exception on unsupported devices :(
+            CookieManager.getInstance().removeAllCookies(null)
+        }
     }
 
     val savedCookies: MutableMap<String, Map<String, String>> = mutableMapOf()
@@ -35,7 +39,7 @@ class CloudflareKiller : Interceptor {
      * Gets the headers with cookies, webview user agent included!
      * */
     fun getCookieHeaders(url: String): Headers {
-        val userAgentHeaders =  WebViewResolver.webViewUserAgent?.let {
+        val userAgentHeaders = WebViewResolver.webViewUserAgent?.let {
             mapOf("user-agent" to it)
         } ?: emptyMap()
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
index 796d509e..3acfb9a1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -296,12 +296,21 @@ class InAppUpdater {
                             val context = this
                             builder.apply {
                                 setPositiveButton(R.string.update) { _, _ ->
+                                    // Forcefully start any delayed installations
+                                    if (ApkInstaller.delayedInstaller?.startInstallation() == true) return@setPositiveButton
+
                                     showToast(context, R.string.download_started, Toast.LENGTH_LONG)
 
                                     // Check if the setting hasn't been changed
-                                    if (settingsManager.getInt(getString(R.string.apk_installer_key), -1) == -1) {
+                                    if (settingsManager.getInt(
+                                            getString(R.string.apk_installer_key),
+                                            -1
+                                        ) == -1
+                                    ) {
                                         if (isMiUi()) // Set to legacy if using miui
-                                            settingsManager.edit().putInt(getString(R.string.apk_installer_key), 1).apply()
+                                            settingsManager.edit()
+                                                .putInt(getString(R.string.apk_installer_key), 1)
+                                                .apply()
                                     }
 
                                     val currentInstaller =
@@ -358,30 +367,19 @@ class InAppUpdater {
             return false
         }
 
-        fun isMiUi(): Boolean {
+        private fun isMiUi(): Boolean {
             return !TextUtils.isEmpty(getSystemProperty("ro.miui.ui.version.name"))
         }
 
-        fun getSystemProperty(propName: String): String? {
-            var line: String? = null
-            var input: BufferedReader? = null
-            try {
+        private fun getSystemProperty(propName: String): String? {
+            return try {
                 val p = Runtime.getRuntime().exec("getprop $propName")
-                input = BufferedReader(InputStreamReader(p.inputStream), 1024)
-                line = input.readLine()
-                input.close()
-            } catch (ex: IOException) {
-                return null
-            } finally {
-                if (input != null) {
-                    try {
-                        input.close()
-                    } catch (e: IOException) {
-                        e.printStackTrace()
-                    }
+                BufferedReader(InputStreamReader(p.inputStream), 1024).use {
+                    it.readLine()
                 }
+            } catch (ex: IOException) {
+                null
             }
-            return line
         }
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt
index 5cf6c359..6b6d3928 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt
@@ -5,15 +5,42 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.content.IntentSender
 import android.content.pm.PackageInstaller
 import android.os.Build
+import android.widget.Toast
+import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.utils.Coroutines.main
 import java.io.InputStream
 
 const val INSTALL_ACTION = "ApkInstaller.INSTALL_ACTION"
 
 
 class ApkInstaller(private val service: PackageInstallerService) {
+
+    companion object {
+        /**
+         * Used for postponed installations
+         **/
+        var delayedInstaller: DelayedInstaller? = null
+    }
+
+    inner class DelayedInstaller(
+        private val session: PackageInstaller.Session,
+        private val intent: IntentSender
+    ) {
+        fun startInstallation(): Boolean {
+            return try {
+                session.commit(intent)
+                true
+            } catch (e: Exception) {
+                false
+            }.also { delayedInstaller = null }
+        }
+    }
+
     private val packageInstaller = service.packageManager.packageInstaller
 
     enum class InstallProgressStatus {
@@ -76,7 +103,6 @@ class ApkInstaller(private val service: PackageInstallerService) {
                     inputStream.close()
                 }
 
-            installProgressStatus.invoke(InstallProgressStatus.Installing)
 
             val intentSender = PendingIntent.getBroadcast(
                 service,
@@ -85,7 +111,22 @@ class ApkInstaller(private val service: PackageInstallerService) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0,
             ).intentSender
 
-            session.commit(intentSender)
+            // Use delayed installations on android 13 and only if "allow from unknown sources" is enabled
+            // if the app lacks installation permission it cannot ask for the permission when it's closed.
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+                context.packageManager.canRequestPackageInstalls()
+            ) {
+                // Save for later installation since it's more jarring to have the app exit abruptly
+                delayedInstaller = DelayedInstaller(session, intentSender)
+                main {
+                    // Use real toast since it should show even if app is exited
+                    Toast.makeText(context, R.string.delayed_update_notice, Toast.LENGTH_LONG)
+                        .show()
+                }
+            } else {
+                installProgressStatus.invoke(InstallProgressStatus.Installing)
+                session.commit(intentSender)
+            }
         } catch (e: Exception) {
             logError(e)
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt
index fc50bed5..1625981e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt
@@ -187,7 +187,7 @@ class PackageInstallerService : Service() {
         const val UPDATE_CHANNEL_ID = "cloudstream3.updates"
         const val UPDATE_CHANNEL_NAME = "App Updates"
         const val UPDATE_CHANNEL_DESCRIPTION = "App updates notification channel"
-        const val UPDATE_NOTIFICATION_ID = -68454136
+        const val UPDATE_NOTIFICATION_ID = -68454136 // Random unique
 
         fun getIntent(
             context: Context,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c8526aa5..7a88f498 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -137,6 +137,7 @@
     <string name="download_canceled">Download Canceled</string>
     <string name="download_done">Download Done</string>
     <string name="download_format" translatable="false">%s - %s</string>
+    <string name="update_started">Update Started</string>
     <string name="stream">Stream</string>
     <string name="error_loading_links_toast">Error Loading Links</string>
     <string name="download_storage_text">Internal Storage</string>
@@ -611,5 +612,6 @@
 
     <string name="apk_installer_legacy">Legacy</string>
     <string name="apk_installer_package_installer">PackageInstaller</string>
+    <string name="delayed_update_notice">App will be updated upon exit</string>
 
 </resources>
\ No newline at end of file

From c57fce2abcfca59d4dcc383dac6e1d613e68a69a Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Fri, 6 Jan 2023 17:51:34 +0100
Subject: [PATCH 159/273] save state of popup menu

---
 .../cloudstream3/ui/home/HomeFragment.kt      | 62 ++++++++++++++-----
 .../ui/quicksearch/QuickSearchFragment.kt     | 10 ++-
 .../cloudstream3/ui/search/SearchFragment.kt  |  7 ++-
 .../lagradost/cloudstream3/utils/AppUtils.kt  | 18 +++++-
 4 files changed, 77 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index b03e40cf..3e9f6810 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -18,6 +18,7 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.*
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -48,6 +49,8 @@ import com.lagradost.cloudstream3.utils.AppUtils.addProgramsToContinueWatching
 import com.lagradost.cloudstream3.utils.AppUtils.isRecyclerScrollable
 import com.lagradost.cloudstream3.utils.AppUtils.loadResult
 import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
+import com.lagradost.cloudstream3.utils.AppUtils.ownHide
+import com.lagradost.cloudstream3.utils.AppUtils.ownShow
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.setKey
@@ -104,26 +107,32 @@ class HomeFragment : Fragment() {
 
         val errorProfilePic = errorProfilePics.random()
 
-        fun Activity.loadHomepageList(
-            item: HomePageList,
-            deleteCallback: (() -> Unit)? = null,
-        ) {
-            loadHomepageList(
-                expand = HomeViewModel.ExpandableHomepageList(item, 1, false),
-                deleteCallback = deleteCallback,
-                expandCallback = null
-            )
-        }
+        //fun Activity.loadHomepageList(
+        //    item: HomePageList,
+        //    deleteCallback: (() -> Unit)? = null,
+        //) {
+        //    loadHomepageList(
+        //        expand = HomeViewModel.ExpandableHomepageList(item, 1, false),
+        //        deleteCallback = deleteCallback,
+        //        expandCallback = null
+        //    )
+        //}
 
+        // returns a BottomSheetDialog that will be hidden with OwnHidden upon hide, and must be saved to be able call ownShow in onCreateView
         fun Activity.loadHomepageList(
             expand: HomeViewModel.ExpandableHomepageList,
             deleteCallback: (() -> Unit)? = null,
-            expandCallback: (suspend (String) -> HomeViewModel.ExpandableHomepageList?)? = null
-        ) {
+            expandCallback: (suspend (String) -> HomeViewModel.ExpandableHomepageList?)? = null,
+            dismissCallback : (() -> Unit),
+        ): BottomSheetDialog {
             val context = this
             val bottomSheetDialogBuilder = BottomSheetDialog(context)
+
             bottomSheetDialogBuilder.setContentView(R.layout.home_episodes_expanded)
             val title = bottomSheetDialogBuilder.findViewById<TextView>(R.id.home_expanded_text)!!
+
+            //title.findViewTreeLifecycleOwner().lifecycle.addObserver()
+
             val item = expand.list
             title.text = item.name
             val recycle =
@@ -131,6 +140,23 @@ class HomeFragment : Fragment() {
             val titleHolder =
                 bottomSheetDialogBuilder.findViewById<FrameLayout>(R.id.home_expanded_drag_down)!!
 
+            // main {
+            //(bottomSheetDialogBuilder.ownerActivity as androidx.fragment.app.FragmentActivity?)?.supportFragmentManager?.fragments?.lastOrNull()?.viewLifecycleOwner?.apply {
+            //    println("GOT LIFE: lifecycle $this")
+            //    this.lifecycle.addObserver(object : DefaultLifecycleObserver {
+            //        override fun onResume(owner: LifecycleOwner) {
+            //            super.onResume(owner)
+            //            println("onResume!!!!")
+            //            bottomSheetDialogBuilder?.ownShow()
+            //        }
+
+            //        override fun onStop(owner: LifecycleOwner) {
+            //            super.onStop(owner)
+            //            bottomSheetDialogBuilder?.ownHide()
+            //        }
+            //    })
+            //}
+            // }
             val delete = bottomSheetDialogBuilder.home_expanded_delete
             delete.isGone = deleteCallback == null
             if (deleteCallback != null) {
@@ -175,7 +201,8 @@ class HomeFragment : Fragment() {
             recycle.adapter = SearchAdapter(item.list.toMutableList(), recycle) { callback ->
                 handleSearchClickCallback(this, callback)
                 if (callback.action == SEARCH_ACTION_LOAD || callback.action == SEARCH_ACTION_PLAY_FILE) {
-                    bottomSheetDialogBuilder.dismissSafe(this)
+                    bottomSheetDialogBuilder.ownHide() // we hide here because we want to resume it later
+                    //bottomSheetDialogBuilder.dismissSafe(this)
                 }
             }.apply {
                 hasNext = expand.hasNext
@@ -216,12 +243,14 @@ class HomeFragment : Fragment() {
             configEvent += spanListener
 
             bottomSheetDialogBuilder.setOnDismissListener {
+                dismissCallback.invoke()
                 configEvent -= spanListener
             }
 
             //(recycle.adapter as SearchAdapter).notifyDataSetChanged()
 
             bottomSheetDialogBuilder.show()
+            return bottomSheetDialogBuilder
         }
 
         fun getPairList(
@@ -399,6 +428,7 @@ class HomeFragment : Fragment() {
     ): View? {
         //homeViewModel =
         //     ViewModelProvider(this).get(HomeViewModel::class.java)
+        bottomSheetDialog?.ownShow()
         val layout =
             if (isTvSettings()) R.layout.fragment_home_tv else R.layout.fragment_home
         return inflater.inflate(layout, container, false)
@@ -480,6 +510,8 @@ class HomeFragment : Fragment() {
     private var currentApiName: String? = null
     private var toggleRandomButton = false
 
+    private var bottomSheetDialog: BottomSheetDialog? = null
+
     @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -626,8 +658,10 @@ class HomeFragment : Fragment() {
             HomeParentItemAdapterPreview(mutableListOf(), { callback ->
                 homeHandleSearch(callback)
             }, { item ->
-                activity?.loadHomepageList(item, expandCallback = {
+                bottomSheetDialog = activity?.loadHomepageList(item, expandCallback = {
                     homeViewModel.expandAndReturn(it)
+                }, dismissCallback = {
+                    bottomSheetDialog = null
                 })
             }, { name ->
                 homeViewModel.expand(name)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
index 62f967d2..ad3d9eb8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
@@ -15,6 +15,7 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
+import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.APIHolder.filterSearchResultByFilmQuality
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
@@ -30,6 +31,7 @@ import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchHelper
 import com.lagradost.cloudstream3.ui.search.SearchViewModel
+import com.lagradost.cloudstream3.utils.AppUtils.ownShow
 import com.lagradost.cloudstream3.utils.UIHelper
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
@@ -71,6 +73,8 @@ class QuickSearchFragment : Fragment() {
     private var providers: Set<String>? = null
     private lateinit var searchViewModel: SearchViewModel
 
+    private var bottomSheetDialog: BottomSheetDialog? = null
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -80,7 +84,7 @@ class QuickSearchFragment : Fragment() {
             WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
         )
         searchViewModel = ViewModelProvider(this)[SearchViewModel::class.java]
-
+        bottomSheetDialog?.ownShow()
         return inflater.inflate(R.layout.quick_search, container, false)
     }
 
@@ -156,7 +160,9 @@ class QuickSearchFragment : Fragment() {
                     //    else -> SearchHelper.handleSearchClickCallback(activity, callback)
                     //}
                 }, { item ->
-                    activity?.loadHomepageList(item)
+                    bottomSheetDialog = activity?.loadHomepageList(item, dismissCallback = {
+                        bottomSheetDialog = null
+                    })
                 })
             quick_search_master_recycler?.layoutManager = GridLayoutManager(context, 1)
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 9c6b62e8..5c101246 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -45,6 +45,7 @@ import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.updateChips
 import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
+import com.lagradost.cloudstream3.utils.AppUtils.ownShow
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.setKey
@@ -85,6 +86,7 @@ class SearchFragment : Fragment() {
     }
 
     private val searchViewModel: SearchViewModel by activityViewModels()
+    private var bottomSheetDialog: BottomSheetDialog? = null
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -94,6 +96,7 @@ class SearchFragment : Fragment() {
         activity?.window?.setSoftInputMode(
             WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
         )
+        bottomSheetDialog?.ownShow()
         return inflater.inflate(
             if (isTvSettings()) R.layout.fragment_search_tv else R.layout.fragment_search,
             container,
@@ -473,7 +476,9 @@ class SearchFragment : Fragment() {
             ParentItemAdapter(mutableListOf(), { callback ->
                 SearchHelper.handleSearchClickCallback(activity, callback)
             }, { item ->
-                activity?.loadHomepageList(item)
+                bottomSheetDialog = activity?.loadHomepageList(item, dismissCallback = {
+                    bottomSheetDialog = null
+                })
             })
 
         val historyAdapter = SearchHistoryAdaptor(mutableListOf()) { click ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
index 847b3328..a3eb7362 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -13,9 +13,7 @@ import android.media.tv.TvContract.Channels.COLUMN_INTERNAL_PROVIDER_ID
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.net.Uri
-import android.os.Build
-import android.os.Environment
-import android.os.ParcelFileDescriptor
+import android.os.*
 import android.provider.MediaStore
 import android.text.Spanned
 import android.util.Log
@@ -40,6 +38,7 @@ import com.google.android.gms.cast.framework.CastState
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.android.gms.common.wrappers.Wrappers
+import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainActivity.Companion.afterRepositoryLoadedEvent
@@ -79,6 +78,19 @@ object AppUtils {
         return if (layoutManager == null || adapter == null) false else layoutManager.findLastCompletelyVisibleItemPosition() < adapter.itemCount - 7 // bit more than 1 to make it more seamless
     }
 
+    fun BottomSheetDialog?.ownHide() {
+        this?.hide()
+    }
+
+    fun BottomSheetDialog?.ownShow() {
+        // the reason for this is because show has a shitty animation we don't want
+        this?.window?.setWindowAnimations(-1)
+        this?.show()
+        Handler(Looper.getMainLooper()).postDelayed({
+            this?.window?.setWindowAnimations(R.style.Animation_Design_BottomSheetDialog)
+        },200)
+    }
+
     //fun Context.deleteFavorite(data: SearchResponse) {
     //    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
     //    normalSafeApiCall {

From e7d37aa07c6b2bced6c67aa14f9445ccd6aed2ea Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 6 Jan 2023 17:51:54 +0100
Subject: [PATCH 160/273] Translated using Weblate (German)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (565 of 565 strings)

Translated using Weblate (Hungarian)

Currently translated at 56.6% (320 of 565 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (565 of 565 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (565 of 565 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (565 of 565 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (565 of 565 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (565 of 565 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (565 of 565 strings)

Translated using Weblate (Esperanto)

Currently translated at 28.9% (163 of 563 strings)

Added translation using Weblate (Esperanto)

Translated using Weblate (Hungarian)

Currently translated at 37.4% (211 of 563 strings)

Translated using Weblate (Hebrew)

Currently translated at 37.8% (213 of 563 strings)

Translated using Weblate (Hungarian)

Currently translated at 21.3% (120 of 563 strings)

Translated using Weblate (Persian)

Currently translated at 18.4% (104 of 563 strings)

Translated using Weblate (Russian)

Currently translated at 19.0% (107 of 563 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (Swedish)

Currently translated at 79.2% (446 of 563 strings)

Translated using Weblate (Persian)

Currently translated at 17.0% (96 of 563 strings)

Translated using Weblate (Russian)

Currently translated at 17.7% (100 of 563 strings)

Translated using Weblate (Russian)

Currently translated at 17.7% (100 of 563 strings)

Translated using Weblate (Swedish)

Currently translated at 79.0% (445 of 563 strings)

Added translation using Weblate (Persian)

Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: LagradOst <blatzar@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Márkó <gost1336@gmail.com>
Co-authored-by: Piotr Strebski <strebski@gmail.com>
Co-authored-by: Pmmmp frd <Pmmmpfrd@hi2.in>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Sdarfeesh <Sdarfeesh@protonmail.com>
Co-authored-by: Translator-3000 <weblate.m1d0h@8shield.net>
Co-authored-by: Vandam <goatli@danwin1210.de>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: inkarnation <94744834+inkarnation@users.noreply.github.com>
Co-authored-by: phlostically <phlostically@mailinator.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/eo/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fa/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/he/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hu/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sv/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml |   2 +
 app/src/main/res/values-de/strings.xml |   8 +-
 app/src/main/res/values-eo/strings.xml |  81 +++++++++
 app/src/main/res/values-es/strings.xml |   2 +
 app/src/main/res/values-fa/strings.xml |  22 +++
 app/src/main/res/values-hr/strings.xml |   2 +
 app/src/main/res/values-hu/strings.xml | 235 ++++++++++++++++++++++++-
 app/src/main/res/values-it/strings.xml |   2 +
 app/src/main/res/values-iw/strings.xml |   7 +
 app/src/main/res/values-pl/strings.xml |   6 +-
 app/src/main/res/values-ru/strings.xml |   8 +
 app/src/main/res/values-sv/strings.xml |  85 +++++++++
 app/src/main/res/values-zh/strings.xml |   2 +
 13 files changed, 456 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/values-eo/strings.xml
 create mode 100644 app/src/main/res/values-fa/strings.xml

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 5dad5937..f08ffa89 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -530,4 +530,6 @@
     <string name="pref_category_ui_features">المميزات</string>
     <string name="pref_category_looks">المظهر</string>
     <string name="play_trailer_button">تشغيل المقطع الدعائي</string>
+    <string name="delayed_update_notice">سيتم تحديث التطبيق عند الخروج</string>
+    <string name="update_started">بدأ التحديث</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5959fe83..9148a7a3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -410,7 +410,7 @@
     <string name="delete_repository">Repository löschen</string>
     <string name="setup_extensions_subtext">Lade eine Liste der Websiten herunter, welche du verwenden möchtest</string>
     <string name="plugins_downloaded" formatted="true">Heruntergeladen: %d</string>
-    <string name="plugins_disabled" formatted="true">Heruntergeladen: %d</string>
+    <string name="plugins_disabled" formatted="true">Deaktiviert: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Nicht heruntergeladen: %d</string>
     <string name="blank_repo_message">CloudStream hat standardmäßig keine Websites installiert. Websites müssen aus Repositories installiert werden.
 \n
@@ -427,7 +427,7 @@
     <string name="video_tracks">Videospuren</string>
     <string name="apply_on_restart">Bei Neustart anwenden</string>
     <string name="safe_mode_title">Abgesicherter Modus aktiviert</string>
-    <string name="safe_mode_description">Ein nicht behebbarer Absturz ist aufgetreten, und wir haben automatisch alle Erweiterungen deaktiviert, damit du die Erweiterung finden und entfernen kannst, die das Problem verursacht.</string>
+    <string name="safe_mode_description">Alle Erweiterungen wurden aufgrund eines Absturzes deaktiviert, damit Sie diejenige finden können, die Probleme verursacht.</string>
     <string name="safe_mode_crash_info">Absturzinfo ansehen</string>
     <string name="extension_rating" formatted="true">Bewertung: %s</string>
     <string name="extension_description">Beschreibung</string>
@@ -476,7 +476,7 @@
     <string name="pref_category_looks">Aussehen</string>
     <string name="pref_category_ui_features">Funktionen</string>
     <string name="plugins_updated" formatted="true">%d Plugins aktualisiert</string>
-    <string name="action_mark_as_watched">Als beobachtet markieren</string>
+    <string name="action_mark_as_watched">Als gesehen markieren</string>
     <string name="confirm_exit_dialog">Sind Sie sicher, dass Sie die App beenden möchten\?</string>
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
@@ -485,4 +485,6 @@
     <string name="update_notification_failed">Konnte die neue Version der App nicht installieren</string>
     <string name="apk_installer_legacy">Legacy</string>
     <string name="apk_installer_package_installer">PackageInstaller</string>
+    <string name="update_started">Aktualisierung gestartet</string>
+    <string name="delayed_update_notice">Die Anwendung wird beim Beenden aktualisiert</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
new file mode 100644
index 00000000..09e6941d
--- /dev/null
+++ b/app/src/main/res/values-eo/strings.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="go_back_img_des">Reen</string>
+    <string name="title_home">Hejmo</string>
+    <string name="title_downloads">Elŝutoj</string>
+    <string name="go_back">Reen</string>
+    <string name="pick_source">Fontoj</string>
+    <string name="sort_apply">Efektivigi</string>
+    <string name="sort_save">Konservi</string>
+    <string name="subs_font_size">Tipara grando</string>
+    <string name="action_remove_watching">Forigi</string>
+    <string name="episodes">Epizodoj</string>
+    <string name="episode_short">E</string>
+    <string name="go_forward_30">+30</string>
+    <string name="year">Jaro</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="extension_language">Lingvo</string>
+    <string name="extension_size">Grando</string>
+    <string name="extension_authors">Aŭtoroj</string>
+    <string name="extension_description">Priskribo</string>
+    <string name="extension_version">Versio</string>
+    <string name="extension_status">Stato</string>
+    <string name="sort_cancel">Nuligi</string>
+    <string name="sort_clear">Forviŝi</string>
+    <string name="yes">Jes</string>
+    <string name="no">Ne</string>
+    <string name="history">Historio</string>
+    <string name="title_search">Serĉi</string>
+    <string name="result_poster_img_des">Afiŝo</string>
+    <string name="play_movie_button">Spekti filmon</string>
+    <string name="home_play">Spekti</string>
+    <string name="home_info">Informoj</string>
+    <string name="sort_copy">Kopii</string>
+    <string name="sort_close">Fermi</string>
+    <string name="subs_font">Tiparo</string>
+    <string name="subs_download_languages">Elŝuti lingvojn</string>
+    <string name="subs_auto_select_language">Aŭtomate elekti lingvon</string>
+    <string name="subs_text_color">Teksta koloro</string>
+    <string name="action_remove_from_bookmarks">Forigi</string>
+    <string name="settings_info">Informoj</string>
+    <string name="season_short">S</string>
+    <string name="status">Stato</string>
+    <string name="source_error">Fonta eraro</string>
+    <string name="login">Saluti</string>
+    <string name="account">konto</string>
+    <string name="subs_window_color">Fenestra koloro</string>
+    <string name="title_settings">Agordoj</string>
+    <string name="result_tags">Ĝenroj</string>
+    <string name="all_languages_preference">Ĉiuj lingvoj</string>
+    <string name="search">Serĉi</string>
+    <string name="category_account">Kontoj</string>
+    <string name="github">GitHub</string>
+    <string name="season">Sezono</string>
+    <string name="episode">Epizodo</string>
+    <string name="asian_drama_singular">Azia dramo</string>
+    <string name="asian_drama">Aziaj dramoj</string>
+    <string name="tv_series_singular">Serio</string>
+    <string name="tv_series">Televidaj serioj</string>
+    <string name="go_back_30">−30</string>
+    <string name="movies_singular">Filmo</string>
+    <string name="movies">Filmoj</string>
+    <string name="others">Aliaj</string>
+    <string name="quality_blueray">Blu-radia</string>
+    <string name="title">Titolo</string>
+    <string name="none">Nenio</string>
+    <string name="logout">Adiaŭi</string>
+    <string name="show_title">Titolo</string>
+    <string name="video_source">Fonto</string>
+    <string name="example_lang_name">Lingvokodo (eo)</string>
+    <string name="example_password">pasvorto123</string>
+    <string name="example_username">MiaSalutNomo</string>
+    <string name="example_email">saluton@mondo.com</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="example_site_name">MiaRetejo</string>
+    <string name="example_site_url">ekzemplo.com</string>
+    <string name="player_speed_text_format" formatted="true">Rapido (%.2fx)</string>
+    <string name="search_hint">Serĉi…</string>
+    <string name="download">Elŝuti</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0e247ca8..af1e894e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -485,4 +485,6 @@
     <string name="skip_type_intro">Intro</string>
     <string name="enable_skip_op_from_database_des">Muestrar botones emergentes para saltar apertura/finalización del video</string>
     <string name="yes">Si</string>
+    <string name="delayed_update_notice">La aplicación se actualizará al salir</string>
+    <string name="update_started">Actualización iniciada</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
new file mode 100644
index 00000000..b1303012
--- /dev/null
+++ b/app/src/main/res/values-fa/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="delete">حذف</string>
+    <string name="pause">مکث</string>
+    <string name="queued">در صف</string>
+    <string name="download">بارگیری</string>
+    <string name="download_failed">بارگیری ناموفق بود</string>
+    <string name="search">جست‌وجو</string>
+    <string name="resize_fit">اندازه‌کردن</string>
+    <string name="resize_fill">پر کردن</string>
+    <string name="resize_zoom">بزرگ‌نمایی</string>
+    <string name="all">همه</string>
+    <string name="tracks">قطعه‌ها</string>
+    <string name="status">وضعیت</string>
+    <string name="loading">درحال بارگیری…</string>
+    <string name="show_title">عنوان منبع</string>
+    <string name="logout">خروج</string>
+    <string name="login">ورود</string>
+    <string name="none">هیچ‌کدام</string>
+    <string name="title">عنوان</string>
+    <string name="history">تاریخچه</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index f8d5fe26..61e461b2 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -526,4 +526,6 @@
     <string name="skip_type_op">Otvaranje</string>
     <string name="apk_installer_package_installer">PackageInstaller</string>
     <string name="season_format">%s %d%s</string>
+    <string name="update_started">Aktualiziranje započeto</string>
+    <string name="delayed_update_notice">Program če se aktualizirati tijekom zatvaranja programa</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 894b6d79..90306869 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -27,5 +27,238 @@
     <string name="resize_zoom">Nagyítás</string>
     <string name="all">Összes</string>
     <string name="tracks">Zeneszámok</string>
-    <string name="home_next_random_img_des">Következő random</string>
+    <string name="home_next_random_img_des">Következő véletlenszerű</string>
+    <string name="logout">Kijelentkezés</string>
+    <string name="login">Bejelentkezés</string>
+    <string name="none">Semmi</string>
+    <string name="title">Cím</string>
+    <string name="loading">Betöltés…</string>
+    <string name="status">Állapot</string>
+    <string name="show_title">Forrás címe</string>
+    <string name="history">Előzmények</string>
+    <string name="eigengraumode_settings">Eigengravy mód</string>
+    <string name="subs_subtitle_elevation">Felirat magassága</string>
+    <string name="download_started">Letöltés elkezdve</string>
+    <string name="normal_no_plot">Nem található cselekmény</string>
+    <string name="continue_watching">Lejátszás folytatása</string>
+    <string name="filler" formatted="true">Filler</string>
+    <string name="play_with_app_name">Lejátszás CloudStreamel</string>
+    <string name="title_home">Kezdőlap</string>
+    <string name="title_search">Keresés</string>
+    <string name="title_downloads">Letöltések</string>
+    <string name="title_settings">Beállítások</string>
+    <string name="search_hint">Keresés…</string>
+    <string name="search_hint_site" formatted="true">Keresés %s…</string>
+    <string name="no_data">Nincs adat</string>
+    <string name="episode_more_options_des">Több opció</string>
+    <string name="next_episode">Következő epizód</string>
+    <string name="result_tags">Műfajok</string>
+    <string name="result_share">Megosztás</string>
+    <string name="result_open_in_browser">Megnyitás böngészőben</string>
+    <string name="skip_loading">Betöltés kihagyása</string>
+    <string name="result_poster_img_des">Poster</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="type_watching">Nézés</string>
+    <string name="type_completed">Befejezve</string>
+    <string name="type_plan_to_watch">Később megnézés</string>
+    <string name="type_none">Nincs</string>
+    <string name="type_re_watching">Újranézés</string>
+    <string name="play_movie_button">Film lejátszása</string>
+    <string name="play_trailer_button">Előzetes lejátszása</string>
+    <string name="play_livestream_button">Élőadás lejátszása</string>
+    <string name="play_torrent_button">Torrent streamelése</string>
+    <string name="pick_source">Források</string>
+    <string name="pick_subtitle">Feliratok</string>
+    <string name="go_back">Vissza</string>
+    <string name="download_done">Letöltés kész</string>
+    <string name="stream">Stream</string>
+    <string name="error_loading_links_toast">Hiba a linkek betöltésekor</string>
+    <string name="download_storage_text">Belső tárhely</string>
+    <string name="app_dubbed_text">Dub</string>
+    <string name="app_subbed_text">Sub</string>
+    <string name="popup_delete_file">Fájl törlése</string>
+    <string name="popup_play_file">Fájl lejátszása</string>
+    <string name="popup_resume_download">Letöltés folytatása</string>
+    <string name="popup_pause_download">Letöltés szüneteltetése</string>
+    <string name="pref_disable_acra">Automatikus hibajelentés kikapcsolása</string>
+    <string name="home_more_info">Több információ</string>
+    <string name="home_expanded_hide">Elrejtés</string>
+    <string name="home_play">Lejátszás</string>
+    <string name="home_info">Információ</string>
+    <string name="filter_bookmarks">Könyvjelző szűrése</string>
+    <string name="error_bookmarks_text">Könyvjelzők</string>
+    <string name="action_remove_from_bookmarks">Eltávolítás</string>
+    <string name="action_add_to_bookmarks">Megtekintés állapotának beállítása</string>
+    <string name="sort_apply">Alkalmazás</string>
+    <string name="sort_cancel">Mégse</string>
+    <string name="sort_copy">Másolás</string>
+    <string name="sort_close">Bezárás</string>
+    <string name="sort_clear">Törlés</string>
+    <string name="sort_save">Mentés</string>
+    <string name="player_speed">Lejátszás sebessége</string>
+    <string name="subtitles_settings">Felirat beállítások</string>
+    <string name="subs_text_color">Szövegszín</string>
+    <string name="subs_outline_color">Körvonal szín</string>
+    <string name="subs_background_color">Háttér szín</string>
+    <string name="subs_window_color">Ablak szín</string>
+    <string name="subs_edge_type">Edge típus</string>
+    <string name="subs_font">Betűtípus</string>
+    <string name="search_provider_text_types">Keresés típusok szerint</string>
+    <string name="search_provider_text_providers">Keresés szolgáltatók szerint</string>
+    <string name="benene_count_text">%d Banán a fejlesztőknek</string>
+    <string name="subs_download_languages">Nyelvek letöltése</string>
+    <string name="subs_hold_to_reset_to_default">Tartsa lenyomva az alapértelmezett érték visszaállításához</string>
+    <string name="subs_import_text" formatted="true">Betűtípusok importálása %s</string>
+    <string name="action_remove_watching">Eltávolítás</string>
+    <string name="action_open_watching">Több információ</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="vpn_might_be_needed">VPN szükséges lehet ehhez a szolgáltató megfelelő működéséhez</string>
+    <string name="vpn_torrent">Ez a szolgáltató torrent, VPN ajánlott</string>
+    <string name="torrent_plot">Leírás</string>
+    <string name="torrent_no_plot">Nem található leírás</string>
+    <string name="show_log_cat">Logcat megjelenítése 🐈</string>
+    <string name="picture_in_picture">Kép-a-képben</string>
+    <string name="picture_in_picture_des">Folytatja a lejátszást egy miniatűr lejátszóban, más alkalmazások mellett</string>
+    <string name="player_size_settings">Lejátszó átméretezése gomb</string>
+    <string name="player_size_settings_des">Fekete szegélyek eltávolítása</string>
+    <string name="player_subtitles_settings">Feliratok</string>
+    <string name="player_subtitles_settings_des">Lejátszó feliratok beállításai</string>
+    <string name="chromecast_subtitles_settings">Chromecast Feliratok</string>
+    <string name="chromecast_subtitles_settings_des">Chromecast feliratok beállításai</string>
+    <string name="eigengraumode_settings_des">Sebességbeállítást ad hozzá a lejátszóhoz</string>
+    <string name="play_episode">Epizód lejátszása</string>
+    <string name="downloaded">Letöltve</string>
+    <string name="download_paused">Letöltés szüneteltetve</string>
+    <string name="download_canceled">Letöltés megszakítva</string>
+    <string name="downloading">Letöltés</string>
+    <string name="subs_font_size">Betűtípus mérete</string>
+    <string name="subs_subtitle_languages">Felirat nyelve</string>
+    <string name="provider_info_meta">A metaadatokat a webhely nem biztosítja, a videó betöltése sikertelen lesz, ha nem létezik a webhelyen.</string>
+    <string name="subs_auto_select_language">Nyelv automatikus kiválasztása</string>
+    <string name="category_updates">Frissítések és biztonsági mentés</string>
+    <string name="advanced_search">Speciális keresés</string>
+    <string name="show_fillers_settings">Filler epizódok mutatása animéknél</string>
+    <string name="show_trailers_settings">Előzetesek megjelenítése</string>
+    <string name="redo_setup_process">Telepítési folyamat megismétlése</string>
+    <string name="anim">Anime applikáció ugyanazoktól a fejlesztőktől</string>
+    <string name="lightnovel">Light novel applikáció ugyanazoktól a fejlesztőktől</string>
+    <string name="app_language">Alkalmazás nyelve</string>
+    <string name="episode">Epizód</string>
+    <string name="episodes">Epizódok</string>
+    <string name="season_short">Év</string>
+    <string name="movies_singular">Film</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episode_short">Ep</string>
+    <string name="no_episodes_found">Nem található epizód</string>
+    <string name="delete_file">Fájl törlése</string>
+    <string name="resume_time_left" formatted="true">%dp
+\nhátra</string>
+    <string name="duration">Időtartam</string>
+    <string name="free_storage">Elérhető</string>
+    <string name="used_storage">Használatban</string>
+    <string name="app_storage">Alkalmazás</string>
+    <string name="status_completed">Befejezve</string>
+    <string name="rating">Értékelés</string>
+    <string name="cartoons">Rajzfilmek</string>
+    <string name="livestreams">Élőadások</string>
+    <string name="default_subtitles">Alapértelmezett</string>
+    <string name="movies">Filmek</string>
+    <string name="tv_series">TV sorozat</string>
+    <string name="anime">Anime</string>
+    <string name="torrent">Torrentek</string>
+    <string name="asian_drama">Ázsiai drámák</string>
+    <string name="documentaries">Dokumentumfilmek</string>
+    <string name="ova">OVA</string>
+    <string name="others">Egyebek</string>
+    <string name="tv_series_singular">Sorozat</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="source_error">Forráshiba</string>
+    <string name="nsfw">NSFW</string>
+    <string name="cartoons_singular">Rajzfilm</string>
+    <string name="ova_singular">\@string/ova</string>
+    <string name="live_singular">Élőadás</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="other_singular">Videó</string>
+    <string name="torrent_singular">Torrent</string>
+    <string name="documentaries_singular">Dokumentumfilm</string>
+    <string name="asian_drama_singular">Ázsiai dráma</string>
+    <string name="episode_action_reload_links">Linkek újratöltése</string>
+    <string name="episode_action_copy_link">Link másolás</string>
+    <string name="episode_action_download_mirror">Link letöltés</string>
+    <string name="episode_action_auto_download">Automatikus letöltés</string>
+    <string name="backup_success">Adatok eltárolva</string>
+    <string name="backup_failed_error_format">Hiba a biztonsági mentés során %s</string>
+    <string name="category_account">Fiókok</string>
+    <string name="advanced_search_des">Szolgáltatás szerinti keresés eredmények</string>
+    <string name="bug_report_settings_on">Nem küld adatokat</string>
+    <string name="kitsu_settings">Poszterek megjelenítése Kitsu-ról</string>
+    <string name="pref_filter_search_quality">Kiválasztott videóminőségek elrejtése keresési eredményekbe</string>
+    <string name="automatic_plugin_updates">Automatikus bővítményfrissítések</string>
+    <string name="automatic_plugin_download">Bővítmények automatikus letöltése</string>
+    <string name="automatic_plugin_download_summary">Automatikusan telepíti az összes még nem telepített bővítményt a hozzáadott tárolókból.</string>
+    <string name="updates_settings">Alkalmazás frissítések megjelenítése</string>
+    <string name="updates_settings_des">Automatikusan keressen új frissítéseket indításkor</string>
+    <string name="uprereleases_settings">Frissítés az előzetes kiadásokhoz (prerelease)</string>
+    <string name="uprereleases_settings_des">Csak előzetesen kiadott frissítések (prerelease) keresése a teljes kiadások helyett</string>
+    <string name="github">Github</string>
+    <string name="discord">Csatlakozz a Discordhoz</string>
+    <string name="benene">Adj Banánt a fejlesztőknek</string>
+    <string name="no_chromecast_support_toast">Ez a szolgáltató nem támogatja a Chromecast-ot</string>
+    <string name="no_links_found_toast">Nem található link</string>
+    <string name="copy_link_toast">A link vágólapra másolva</string>
+    <string name="play_episode_toast">Epizód lejátszása</string>
+    <string name="subs_default_reset_toast">Alapértelmezett értékre visszaállítása</string>
+    <string name="acra_report_toast">Az alkalmazás összeomlott. Egy névtelen hibabejelentés küldünk a fejlesztőknek</string>
+    <string name="season">Évad</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="no_season">Nincs évad</string>
+    <string name="go_forward_30">+30</string>
+    <string name="delete_message" formatted="true">Ezzel véglegesen törli a %s
+\nBiztosan törli\?</string>
+    <string name="status_ongoing">Folyamatban levő</string>
+    <string name="year">Év</string>
+    <string name="site">Webhely</string>
+    <string name="synopsis">Szinopszis</string>
+    <string name="no_subtitles">Nincsenek feliratok</string>
+    <string name="remote_error">Távoli hiba</string>
+    <string name="render_error">Render hiba</string>
+    <string name="unexpected_error">Váratlan lejátszó hiba</string>
+    <string name="storage_error">Letöltés hiba, ellenőrízze a tárolási engedélyeket</string>
+    <string name="episode_action_chromecast_episode">Chromecast epizód</string>
+    <string name="episode_action_chromecast_mirror">Chromecast link</string>
+    <string name="episode_action_play_in_app">Lejátszás az alkalmazásban</string>
+    <string name="episode_action_play_in_format">Lejátszás %s</string>
+    <string name="episode_action_play_in_browser">Lejátszás böngészőben</string>
+    <string name="episode_action_download_subtitle">Feliratok letöltése</string>
+    <string name="reload_error">Újracsatlakozás…</string>
+    <string name="swipe_to_seek_settings_des">Swipe balra vagy jobbra a videólejátszóban az idő vezérléséhez</string>
+    <string name="swipe_to_change_settings">Csúsztassa ujját a beállítások módosításához</string>
+    <string name="swipe_to_change_settings_des">Csúsztassa az újját bal vagy jobb oldalon a fényerő vagy hangerő megváltoztatásához</string>
+    <string name="backup_settings">Biztonsági mentés</string>
+    <string name="benene_count_text_none">0 Banán a fejlesztőknek</string>
+    <string name="swipe_to_seek_settings">Swipe to seek</string>
+    <string name="autoplay_next_settings">Következő epizód automatikus lejátszása</string>
+    <string name="autoplay_next_settings_des">Következő epizód lejátszása amikor az aktuális epizód véget ér</string>
+    <string name="double_tap_to_seek_settings">Dupla koppintás to seek</string>
+    <string name="double_tap_to_pause_settings">Dupla koppintás a szüneteltetéshez</string>
+    <string name="double_tap_to_seek_amount_settings">Player seek amount</string>
+    <string name="double_tap_to_seek_settings_des">Koppintson kétszer a jobb vagy bal oldalra az előre vagy hátra ugráshoz</string>
+    <string name="double_tap_to_pause_settings_des">Koppintson középre a szüneteltetéshez</string>
+    <string name="use_system_brightness_settings">Rendszer fényerejének használata</string>
+    <string name="use_system_brightness_settings_des">Rendszer fényerejének használata az appban a sötét átfedés helyett</string>
+    <string name="episode_sync_settings">Előrehaladás frissítése</string>
+    <string name="episode_sync_settings_des">Automatikusan szinkronizálja az aktuális epizód előrehaladását</string>
+    <string name="restore_settings">Adatok visszaállítása a biztonsági mentésből</string>
+    <string name="restore_success">Biztonsági mentés betöltve</string>
+    <string name="settings_info">Információ</string>
+    <string name="resume">Folytatás</string>
+    <string name="go_back_30">-30</string>
+    <string name="update_started">Frissítés elkezdődött</string>
+    <string name="restore_failed_format" formatted="true">Nem sikerült visszaállítani az adatok a fájlból %s</string>
+    <string name="backup_failed">Tárolási engedélyek hiányoznak. Kérjük próbálja újra.</string>
+    <string name="bug_report_settings_off">Csak összeomlásokról küld adatokat</string>
+    <string name="apk_installer_settings">APK Telepítő</string>
+    <string name="apk_installer_settings_des">Egyes telefonok nem támogatják az új csomag telepítőt. Ha a frissítések nem települnek, próbálja meg a régi opciót.</string>
+    <string name="benene_des">Banán adva</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 91d7da85..e3ac0e56 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -504,4 +504,6 @@
     <string name="pref_category_defaults">Predefiniti</string>
     <string name="pref_category_looks">Aspetto</string>
     <string name="pref_category_ui_features">Funzionalità</string>
+    <string name="delayed_update_notice">L\'app verrà aggiornata all\'uscita</string>
+    <string name="update_started">Aggiornamento avviato</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index f49f56b9..cb8d5945 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -122,4 +122,11 @@
     <string name="no">לא</string>
     <string name="yes">כן</string>
     <string name="action_mark_as_watched">סימון כנצפה</string>
+    <string name="status">סטטוס</string>
+    <string name="logout">התנתק</string>
+    <string name="login">התחברות</string>
+    <string name="show_title">כותרת</string>
+    <string name="none">אין</string>
+    <string name="all">הכל</string>
+    <string name="title">כותרת</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index b3558e0d..907ac76e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -294,7 +294,7 @@
     <string name="login_format" formatted="true">%s %s</string>
     <string name="account">konto</string>
     <string name="logout">Wyloguj się</string>
-    <string name="login">Logowanie</string>
+    <string name="login">Zaloguj się</string>
     <string name="switch_account">Przełącz konto</string>
     <string name="add_account">Dodaj konto</string>
     <string name="create_account">Utwórz konto</string>
@@ -308,7 +308,7 @@
     <!-- ============ -->
     <string name="none">Brak</string>
     <string name="normal">Normalne</string>
-    <string name="all">Wszystkie</string>
+    <string name="all">Wszystko</string>
     <string name="max">Maks</string>
     <string name="min">Min</string>
     <string name="subtitles_outline">Kontur</string>
@@ -485,4 +485,6 @@
     <string name="pref_category_player_layout">Układ</string>
     <string name="pref_category_looks">Wygląd</string>
     <string name="play_trailer_button">Odtwórz zwiastun</string>
+    <string name="delayed_update_notice">Aplikacja zostanie zaktualizowana po wyjściu</string>
+    <string name="update_started">Aktualizacja rozpoczęta</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 64f67d87..c374b4bc 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -14,4 +14,12 @@
     <string name="delete">Удалить</string>
     <string name="all">Всё</string>
     <string name="pause">Пауза</string>
+    <string name="cast_format" formatted="true">В ролях: %s</string>
+    <string name="show_title">Название источника</string>
+    <string name="login">Вход</string>
+    <string name="none">Нет</string>
+    <string name="title">Название</string>
+    <string name="loading">Загрузка…</string>
+    <string name="status">Статус</string>
+    <string name="logout">Выйти</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 57af1678..7e83f840 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -281,4 +281,89 @@
     <string name="limit_title_rez">Videospelarens upplösning</string>
     <string name="history">Historik</string>
     <string name="action_mark_as_watched">Markera som sedd</string>
+    <string name="chromecast_subtitles_settings_des">Inställningar för Chromecast-undertexter</string>
+    <string name="tv_layout">TV-layout</string>
+    <string name="create_account">Skapa konto</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="subtitle_offset_extra_hint_later_format">Använd detta om undertexterna visas %d ms för tidigt</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="resolution_and_title">Upplösning och titel</string>
+    <string name="error">Fel</string>
+    <string name="referer">Referer</string>
+    <string name="next">Nästa</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
+    <string name="add_site_summary">Lägga till en klon av en befintlig webbplats med en annan webbadress.</string>
+    <string name="error_invalid_id">Ogiltigt ID</string>
+    <string name="error_invalid_url">Ogiltig webbadress</string>
+    <string name="video_ram_description">Orsakar krascher om inställningen är för hög på enheter med lågt minne, t.ex. Android TV.</string>
+    <string name="video_disk_description">Orsakar problem om inställningen är för hög på enheter med lågt lagringsutrymme, t.ex. Android TV.</string>
+    <string name="remove_site_pref">Ta bort webbplats</string>
+    <string name="add_site_pref">Klona webbplats</string>
+    <string name="phone_layout">Telefonlayout</string>
+    <string name="primary_color_settings">Primärfärg</string>
+    <string name="example_username">Användarnamn</string>
+    <string name="example_email">namn@email.se</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="home_source">Källa</string>
+    <string name="home_random">Slumpmässig</string>
+    <string name="coming_soon">Kommer snart…</string>
+    <string name="subtitles_filter_lang">Filtrera efter föredraget språk</string>
+    <string name="crash_reporting_title">Kraschrapportering</string>
+    <string name="authenticated_user_fail" formatted="true">Kunde inte logga in på %s</string>
+    <string name="pref_category_looks">Utseende</string>
+    <string name="category_ui">Layout</string>
+    <string name="quality_4k">4K</string>
+    <string name="app_layout_subtext">Ändra appens utseende så att den passar din enhet</string>
+    <string name="cast_format" formatted="true">Skådespelare: %s</string>
+    <string name="play_livestream_button">Spela Livestream</string>
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="subtitle_offset_extra_hint_none_format">Ingen undertextfördröjning</string>
+    <string name="pref_category_player_features">Spelarfunktioner</string>
+    <string name="trailer">Trailer</string>
+    <string name="app_layout">Applayout</string>
+    <string name="pref_category_ui_features">Funktioner</string>
+    <string name="example_site_url">exempel.se</string>
+    <string name="example_lang_name">Språkkod (en)</string>
+    <string name="video_buffer_disk_settings">Videocache på disken</string>
+    <string name="video_buffer_clear_settings">Rensa video- och bildcache</string>
+    <string name="pref_category_links">Länkar</string>
+    <string name="pref_category_app_updates">Appuppdateringar</string>
+    <string name="pref_category_player_layout">Layout</string>
+    <string name="title">Titel</string>
+    <string name="skip_setup">Hoppa över installationen</string>
+    <string name="setup_done">Klar</string>
+    <string name="extensions">Tillägg</string>
+    <string name="sort_clear">Rensa</string>
+    <string name="live_singular">Direktsändning</string>
+    <string name="limit_title">Max tecken i videospelartiteln</string>
+    <string name="video_buffer_size_settings">Videobuffertstorlek</string>
+    <string name="video_buffer_length_settings">Videobuffertlängd</string>
+    <string name="legal_notice">Ansvarsfriskrivning</string>
+    <string name="pref_category_extensions">Tillägg</string>
+    <string name="pref_category_cache">Cache</string>
+    <string name="pref_category_backup">Säkerhetskopiering</string>
+    <string name="pref_category_subtitles">Undertexter</string>
+    <string name="enable_nsfw_on_providers">Aktivera NSFW på sidor som stöds</string>
+    <string name="subtitles_encoding">Undertextkodning</string>
+    <string name="example_password">lösenord123</string>
+    <string name="subtitle_offset_title">Fördröjning av undertexter</string>
+    <string name="subtitle_offset_extra_hint_before_format">Använd detta om undertexterna visas %d ms för sent</string>
+    <string name="player_load_subtitles">Importera från fil</string>
+    <string name="player_load_subtitles_online">Importera från Internet</string>
+    <string name="downloaded_file">Nedladdad fil</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_tc">TC</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="resolution">Upplösning</string>
+    <string name="error_invalid_data">Ogiltig data</string>
+    <string name="subtitles_remove_captions">Ta bort dold textning från undertexter</string>
+    <string name="provider_languages_tip">Titta på videor på dessa språk</string>
+    <string name="previous">Föregående</string>
+    <string name="tracks">Spår</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index f516fd67..71bbbf7a 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -549,4 +549,6 @@
     <string name="pref_category_player_features">播放器功能</string>
     <string name="pref_category_actions">行为</string>
     <string name="pref_category_looks">外观</string>
+    <string name="update_started">更新开始</string>
+    <string name="delayed_update_notice">应用退出后将会更新</string>
 </resources>
\ No newline at end of file

From 36e780f7c9111b53142b92442de7eb552ad43d11 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Fri, 6 Jan 2023 16:56:31 +0000
Subject: [PATCH 161/273] update list of locales

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 0814bf9d..78b028c2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -64,7 +64,9 @@ val appLanguages = arrayListOf(
     Triple("", "German", "de"),
     Triple("", "Greek", "el"),
     Triple("", "English", "en"),
+    Triple("", "Esperanto", "eo"),
     Triple("", "Spanish", "es"),
+    Triple("", "Farsi", "fa"),
     Triple("", "French", "fr"),
     Triple("", "Hindi", "hi"),
     Triple("", "Croatian", "hr"),

From 61ab957e35ff44d67a3dc344c5541c818e573042 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Fri, 6 Jan 2023 22:27:23 +0100
Subject: [PATCH 162/273] make the update_locales not use github actions token

gh actions token supposedly makes it so the next action doesnt trigger on push
---
 .github/workflows/update_locales.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update_locales.yml b/.github/workflows/update_locales.yml
index 032637ab..8764d721 100644
--- a/.github/workflows/update_locales.yml
+++ b/.github/workflows/update_locales.yml
@@ -15,14 +15,23 @@ jobs:
   create:
     runs-on: ubuntu-latest
     steps:
+    - name: Generate access token
+      id: generate_token
+      uses: tibdex/github-app-token@v1
+      with:
+        app_id: ${{ secrets.GH_APP_ID }}
+        private_key: ${{ secrets.GH_APP_KEY }}
+        repository: "recloudstream/cloudstream"
     - uses: actions/checkout@v2
+      with:
+        token: ${{ steps.generate_token.outputs.token }}
     - name: Edit files
       run: |
         python3 .github/locales.py
     - name: Commit to the repo
       run: |
-        git config user.name "GitHub Actions"
-        git config user.email "actions@github.com"
+        git config --local user.email "111277985+recloudstream[bot]@users.noreply.github.com"
+        git config --local user.name "recloudstream[bot]"
         git add .
         # "echo" returns true so the build succeeds, even if no changed files
         git commit -m 'update list of locales' || echo

From 75cc4f6dfa0a0efba3709273590a053830e5e7c1 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Fri, 6 Jan 2023 22:28:16 +0100
Subject: [PATCH 163/273] trigger rerun ci

---
 app/src/main/res/values/strings.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a88f498..5a1f011b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- KEYS DON'T TRANSLATE -->
     <string name="search_providers_list_key" translatable="false">search_providers_list</string>
     <string name="locale_key" translatable="false">app_locale</string>
@@ -614,4 +615,4 @@
     <string name="apk_installer_package_installer">PackageInstaller</string>
     <string name="delayed_update_notice">App will be updated upon exit</string>
 
-</resources>
\ No newline at end of file
+</resources>

From 308affb6aa0b417ab112d4c8a3267f65ada65721 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sat, 7 Jan 2023 14:56:52 +0100
Subject: [PATCH 164/273] Fixed loading disabled plugins on download

---
 .../cloudstream3/plugins/PluginManager.kt     | 65 ++++++++++---------
 .../cloudstream3/plugins/RepositoryManager.kt | 48 +++++---------
 .../settings/extensions/PluginsViewModel.kt   | 15 +++--
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index c0bc4f1f..54fe5d75 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -255,11 +255,12 @@ object PluginManager {
                 //updatedPlugins.add(activity.getString(R.string.single_plugin_disabled, pluginData.onlineData.second.name))
                 unloadPlugin(pluginData.savedData.filePath)
             } else if (pluginData.isOutdated) {
-                downloadAndLoadPlugin(
+                downloadPlugin(
                     activity,
                     pluginData.onlineData.second.url,
                     pluginData.savedData.internalName,
-                    File(pluginData.savedData.filePath)
+                    File(pluginData.savedData.filePath),
+                    true
                 ).let { success ->
                     if (success)
                         updatedPlugins.add(pluginData.onlineData.second.name)
@@ -341,11 +342,12 @@ object PluginManager {
         //Log.i(TAG, "notDownloadedPlugins => ${notDownloadedPlugins.toJson()}")
 
         notDownloadedPlugins.apmap { pluginData ->
-            downloadAndLoadPlugin(
+            downloadPlugin(
                 activity,
                 pluginData.onlineData.second.url,
                 pluginData.savedData.internalName,
-                pluginData.onlineData.first
+                pluginData.onlineData.first,
+                !pluginData.isDisabled
             ).let { success ->
                 if (success)
                     newDownloadPlugins.add(pluginData.onlineData.second.name)
@@ -496,7 +498,7 @@ object PluginManager {
         }
     }
 
-    private fun unloadPlugin(absolutePath: String) {
+    fun unloadPlugin(absolutePath: String) {
         Log.i(TAG, "Unloading plugin: $absolutePath")
         val plugin = plugins[absolutePath]
         if (plugin == null) {
@@ -547,49 +549,48 @@ object PluginManager {
         return File("${context.filesDir}/${ONLINE_PLUGINS_FOLDER}/${folderName}/$fileName.cs3")
     }
 
-    /**
-     * Used for fresh installs
-     * */
-    suspend fun downloadAndLoadPlugin(
+    suspend fun downloadPlugin(
         activity: Activity,
         pluginUrl: String,
         internalName: String,
-        repositoryUrl: String
+        repositoryUrl: String,
+        loadPlugin: Boolean
     ): Boolean {
         val file = getPluginPath(activity, internalName, repositoryUrl)
-        downloadAndLoadPlugin(activity, pluginUrl, internalName, file)
-        return true
+        return downloadPlugin(activity, pluginUrl, internalName, file, loadPlugin)
     }
 
-    /**
-     * Used for updates.
-     *
-     * Uses a file instead of repository url, as extensions can get moved it is better to directly
-     * update the files instead of getting the filepath from repo url.
-     * */
-    private suspend fun downloadAndLoadPlugin(
+    suspend fun downloadPlugin(
         activity: Activity,
         pluginUrl: String,
         internalName: String,
         file: File,
+        loadPlugin: Boolean
     ): Boolean {
         try {
-            unloadPlugin(file.absolutePath)
-
             Log.d(TAG, "Downloading plugin: $pluginUrl to ${file.absolutePath}")
             // The plugin file needs to be salted with the repository url hash as to allow multiple repositories with the same internal plugin names
-            val newFile = downloadPluginToFile(pluginUrl, file)
-            return loadPlugin(
-                activity,
-                newFile ?: return false,
-                PluginData(
-                    internalName,
-                    pluginUrl,
-                    true,
-                    newFile.absolutePath,
-                    PLUGIN_VERSION_NOT_SET
-                )
+            val newFile = downloadPluginToFile(pluginUrl, file) ?: return false
+
+            val data = PluginData(
+                internalName,
+                pluginUrl,
+                true,
+                newFile.absolutePath,
+                PLUGIN_VERSION_NOT_SET
             )
+
+            return if (loadPlugin) {
+                unloadPlugin(file.absolutePath)
+                loadPlugin(
+                    activity,
+                    newFile,
+                    data
+                )
+            } else {
+                setPluginData(data)
+                true
+            }
         } catch (e: Exception) {
             logError(e)
             return false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
index 0f23782d..e77b2d54 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
@@ -7,8 +7,10 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
 import com.lagradost.cloudstream3.plugins.PluginManager.getPluginSanitizedFileName
+import com.lagradost.cloudstream3.plugins.PluginManager.unloadPlugin
 import com.lagradost.cloudstream3.ui.settings.extensions.REPOSITORIES_KEY
 import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
@@ -77,7 +79,7 @@ object RepositoryManager {
         } else if (fixedUrl.contains("^(cloudstreamrepo://)|(https://cs\\.repo/\\??)".toRegex())) {
             fixedUrl.replace("^(cloudstreamrepo://)|(https://cs\\.repo/\\??)".toRegex(), "").let {
                 return@let if (!it.contains("^https?://".toRegex()))
-                     "https://${it}"
+                    "https://${it}"
                 else fixedUrl
             }
         } else if (fixedUrl.matches("^[a-zA-Z0-9!_-]+$".toRegex())) {
@@ -132,7 +134,9 @@ object RepositoryManager {
             file.mkdirs()
 
             // Overwrite if exists
-            if (file.exists()) { file.delete() }
+            if (file.exists()) {
+                file.delete()
+            }
             file.createNewFile()
 
             val body = app.get(pluginUrl).okhttpResponse.body
@@ -141,34 +145,6 @@ object RepositoryManager {
         }
     }
 
-    suspend fun downloadPluginToFile(
-        context: Context,
-        pluginUrl: String,
-        /** Filename without .cs3 */
-        fileName: String,
-        folder: String
-    ): File? {
-        return suspendSafeApiCall {
-            val extensionsDir = File(context.filesDir, ONLINE_PLUGINS_FOLDER)
-            if (!extensionsDir.exists())
-                extensionsDir.mkdirs()
-
-            val newDir = File(extensionsDir, folder)
-            newDir.mkdirs()
-
-            val newFile = File(newDir, "${fileName}.cs3")
-            // Overwrite if exists
-            if (newFile.exists()) {
-                newFile.delete()
-            }
-            newFile.createNewFile()
-
-            val body = app.get(pluginUrl).okhttpResponse.body
-            write(body.byteStream(), newFile.outputStream())
-            newFile
-        }
-    }
-
     fun getRepositories(): Array<RepositoryData> {
         return getKey(REPOSITORIES_KEY) ?: emptyArray()
     }
@@ -200,9 +176,17 @@ object RepositoryManager {
             extensionsDir,
             getPluginSanitizedFileName(repository.url)
         )
-        PluginManager.deleteRepositoryData(file.absolutePath)
 
-        file.delete()
+        // Unload all plugins, not using deletePlugin since we
+        // delete all data and files in deleteRepositoryData
+        normalSafeApiCall {
+            file.listFiles { plugin: File ->
+                unloadPlugin(plugin.absolutePath)
+                false
+            }
+        }
+
+        PluginManager.deleteRepositoryData(file.absolutePath)
     }
 
     private fun write(stream: InputStream, output: OutputStream) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
index 894a9331..934f65bb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.PROVIDER_STATUS_DOWN
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.launchSafe
@@ -102,11 +103,12 @@ class PluginsViewModel : ViewModel() {
                         )
                     }
                 }.amap { (repo, metadata) ->
-                    PluginManager.downloadAndLoadPlugin(
+                    PluginManager.downloadPlugin(
                         activity,
                         metadata.url,
                         metadata.internalName,
-                        repo
+                        repo,
+                        metadata.status != PROVIDER_STATUS_DOWN
                     )
                 }.main { list ->
                     if (list.any { it }) {
@@ -151,12 +153,15 @@ class PluginsViewModel : ViewModel() {
         val (success, message) = if (file.exists()) {
             PluginManager.deletePlugin(file) to R.string.plugin_deleted
         } else {
-            PluginManager.downloadAndLoadPlugin(
+            val isEnabled = plugin.second.status != PROVIDER_STATUS_DOWN
+            val message = if (isEnabled) R.string.plugin_loaded else R.string.plugin_downloaded
+            PluginManager.downloadPlugin(
                 activity,
                 metadata.url,
                 metadata.name,
-                repo
-            ) to R.string.plugin_loaded
+                repo,
+                isEnabled
+            ) to message
         }
 
         runOnMainThread {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a88f498..068dd88a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -539,6 +539,7 @@
     <string name="repository_name_hint">Repository name</string>
     <string name="repository_url_hint">Repository URL</string>
     <string name="plugin_loaded">Plugin Loaded</string>
+    <string name="plugin_downloaded">Plugin Downloaded</string>
     <string name="plugin_deleted">Plugin Deleted</string>
     <string name="plugin_load_fail" formatted="true">Could not load %s</string>
     <string name="is_adult">18+</string>

From 06c2cf86ec076cb934afb30acfb59c9b55b8c899 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Mon, 9 Jan 2023 02:15:06 +0100
Subject: [PATCH 165/273] Various Android TV homepage fixes

---
 .../java/com/lagradost/cloudstream3/MainActivity.kt |  9 +++++++--
 .../com/lagradost/cloudstream3/ui/APIRepository.kt  |  3 ++-
 .../ui/home/HomeParentItemAdapterPreview.kt         | 13 +++++++++++++
 app/src/main/res/layout/fragment_home_head_tv.xml   |  5 +++--
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index ee54783f..0b0b787a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3
 
 import android.content.ComponentName
+import android.content.DialogInterface
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.Configuration
@@ -102,6 +103,7 @@ import java.net.URI
 import java.net.URLDecoder
 import java.nio.charset.Charset
 import kotlin.reflect.KClass
+import kotlin.system.exitProcess
 
 
 //https://github.com/videolan/vlc-android/blob/3706c4be2da6800b3d26344fc04fab03ffa4b860/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt#L1898
@@ -505,10 +507,13 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         val builder: AlertDialog.Builder = AlertDialog.Builder(this)
         builder.setTitle(R.string.confirm_exit_dialog)
         builder.apply {
-            setPositiveButton(R.string.yes) { _, _ -> super.onBackPressed() }
+            // Forceful exit since back button can actually go back to setup
+            setPositiveButton(R.string.yes) { _, _ -> exitProcess(0) }
             setNegativeButton(R.string.no) { _, _ -> }
         }
-        builder.show()
+        builder.show().also {
+            it.getButton(DialogInterface.BUTTON_NEGATIVE).requestFocus()
+        }
     }
 
     private fun backPressed() {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
index 645cd573..4ab2e8e2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
@@ -81,6 +81,8 @@ class APIRepository(val api: MainAPI) {
             }
 
             api.load(fixedUrl)?.also { response ->
+                // Remove all blank tags as early as possible
+                response.tags = response.tags?.filter { it.isNotBlank() }
                 val add = SavedLoadResponse(unixTime, response, lookingForHash)
 
                 synchronized(cache) {
@@ -122,7 +124,6 @@ class APIRepository(val api: MainAPI) {
         delay(delta)
     }
 
-    @OptIn(DelicateCoroutinesApi::class)
     suspend fun getMainPage(page: Int, nameIndex: Int? = null): Resource<List<HomePageResponse?>> {
         return safeApiCall {
             api.lastHomepageRequest = unixTimeMS
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
index a2e768b9..7564a9de 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
@@ -268,11 +268,23 @@ class HomeParentItemAdapterPreview(
                                     )
                                 )
                             }
+
+                            // This makes the hidden next buttons only available when on the info button
+                            // Otherwise you might be able to go to the next item without being at the info button
+                            itemView.home_preview_info_btt?.setOnFocusChangeListener { _, hasFocus ->
+                                itemView.home_preview_hidden_next_focus?.isFocusable = hasFocus
+                            }
+                            itemView.home_preview_play_btt?.setOnFocusChangeListener { _, hasFocus ->
+                                itemView.home_preview_hidden_prev_focus?.isFocusable = hasFocus
+                            }
+
+
                             itemView.home_preview_info_btt?.setOnClickListener { view ->
                                 clickCallback?.invoke(
                                     LoadClickCallback(0, view, position, this)
                                 )
                             }
+
                             itemView.home_preview_hidden_next_focus?.setOnFocusChangeListener { _, hasFocus ->
                                 if (hasFocus) {
                                     previewViewpager?.apply {
@@ -281,6 +293,7 @@ class HomeParentItemAdapterPreview(
                                     itemView.home_preview_info_btt?.requestFocus()
                                 }
                             }
+
                             itemView.home_preview_hidden_prev_focus?.setOnFocusChangeListener { _, hasFocus ->
                                 if (hasFocus) {
                                     previewViewpager?.apply {
diff --git a/app/src/main/res/layout/fragment_home_head_tv.xml b/app/src/main/res/layout/fragment_home_head_tv.xml
index c3001416..b9b4fec0 100644
--- a/app/src/main/res/layout/fragment_home_head_tv.xml
+++ b/app/src/main/res/layout/fragment_home_head_tv.xml
@@ -20,6 +20,7 @@
         android:layout_height="wrap_content">
 
         <androidx.viewpager2.widget.ViewPager2
+            android:descendantFocusability="blocksDescendants"
             android:id="@+id/home_preview_viewpager"
             android:layout_width="match_parent"
             android:layout_height="400dp"
@@ -87,7 +88,7 @@
                     android:id="@+id/home_preview_hidden_prev_focus"
                     android:layout_width="1dp"
                     android:layout_height="1dp"
-                    android:focusable="true" />
+                    android:focusable="false" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/home_preview_play_btt"
@@ -119,7 +120,7 @@
                     android:id="@+id/home_preview_hidden_next_focus"
                     android:layout_width="1dp"
                     android:layout_height="1dp"
-                    android:focusable="true" />
+                    android:focusable="false" />
             </LinearLayout>
         </LinearLayout>
     </FrameLayout>

From 92d03fc163356a7b4929166f8f498b9218740449 Mon Sep 17 00:00:00 2001
From: Horis <821938089@qq.com>
Date: Sat, 14 Jan 2023 20:07:21 +0800
Subject: [PATCH 166/273] Add Dailymotion Extractor (#312)

---
 .../cloudstream3/extractors/Dailymotion.kt    | 102 ++++++++++++++++++
 .../cloudstream3/utils/ExtractorApi.kt        |   3 +-
 2 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/extractors/Dailymotion.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Dailymotion.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Dailymotion.kt
new file mode 100644
index 00000000..125e4bcf
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Dailymotion.kt
@@ -0,0 +1,102 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+import java.net.URL
+
+open class Dailymotion : ExtractorApi() {
+    override val mainUrl = "https://www.dailymotion.com"
+    override val name = "Dailymotion"
+    override val requiresReferer = false
+
+    @Suppress("RegExpSimplifiable")
+    private val videoIdRegex = "^[kx][a-zA-Z0-9]+\$".toRegex()
+
+    // https://www.dailymotion.com/video/k3JAHfletwk94ayCVIu
+    // https://www.dailymotion.com/embed/video/k3JAHfletwk94ayCVIu
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val embedUrl = getEmbedUrl(url) ?: return
+        val doc = app.get(embedUrl).document
+        val prefix = "window.__PLAYER_CONFIG__ = "
+        val configStr = doc.selectFirst("script:containsData($prefix)")?.data() ?: return
+        val config = tryParseJson<Config>(configStr.substringAfter(prefix)) ?: return
+        val id = getVideoId(embedUrl) ?: return
+        val dmV1st = config.dmInternalData.v1st
+        val dmTs = config.dmInternalData.ts
+        val metaDataUrl =
+            "$mainUrl/player/metadata/video/$id?locale=en&dmV1st=$dmV1st&dmTs=$dmTs&is_native_app=0"
+        val cookies = mapOf(
+            "v1st" to dmV1st,
+            "dmvk" to config.context.dmvk,
+            "ts" to dmTs.toString()
+        )
+        val metaData = app.get(metaDataUrl, referer = embedUrl, cookies = cookies)
+            .parsedSafe<MetaData>() ?: return
+        metaData.qualities.forEach { (key, video) ->
+            video.forEach {
+                callback.invoke(
+                    ExtractorLink(
+                        name,
+                        "$name $key",
+                        it.url,
+                        "",
+                        Qualities.Unknown.value,
+                        true
+                    )
+                )
+            }
+        }
+    }
+
+    private fun getEmbedUrl(url: String): String? {
+        if (url.contains("/embed/")) {
+            return url
+        }
+        val vid = getVideoId(url) ?: return null
+        return "$mainUrl/embed/video/$vid"
+    }
+
+    private fun getVideoId(url: String): String? {
+        val path = URL(url).path
+        val id = path.substringAfter("video/")
+        if (id.matches(videoIdRegex)) {
+            return id
+        }
+        return null
+    }
+
+    data class Config(
+        val context: Context,
+        val dmInternalData: InternalData
+    )
+
+    data class InternalData(
+        val ts: Int,
+        val v1st: String
+    )
+
+    data class Context(
+        @JsonProperty("access_token") val accessToken: String?,
+        val dmvk: String,
+    )
+
+    data class MetaData(
+        val qualities: Map<String, List<VideoLink>>
+    )
+
+    data class VideoLink(
+        val type: String,
+        val url: String
+    )
+
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index cf6d0bae..3978eb62 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -357,7 +357,8 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     PlayLtXyz(),
     AStreamHub(),
 
-    Cda()
+    Cda(),
+    Dailymotion(),
 )
 
 

From a87bbd3cfc4fb92bd587547a6e2fb4b4bfa51da2 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Sat, 14 Jan 2023 02:32:12 +0100
Subject: [PATCH 167/273] Translated using Weblate (Ukrainian)

Currently translated at 83.0% (470 of 566 strings)

Translated using Weblate (Russian)

Currently translated at 28.9% (164 of 566 strings)

Translated using Weblate (Russian)

Currently translated at 21.3% (121 of 566 strings)

Translated using Weblate (Russian)

Currently translated at 20.8% (118 of 566 strings)

Translated using Weblate (Indonesian)

Currently translated at 99.4% (563 of 566 strings)

Translated using Weblate (Bulgarian)

Currently translated at 100.0% (566 of 566 strings)

Translated using Weblate (Ukrainian)

Currently translated at 62.0% (351 of 566 strings)

Translated using Weblate (Ukrainian)

Currently translated at 61.1% (346 of 566 strings)

Translated using Weblate (Ukrainian)

Currently translated at 37.1% (210 of 566 strings)

Translated using Weblate (Russian)

Currently translated at 19.4% (110 of 566 strings)

Translated using Weblate (Turkish)

Currently translated at 92.4% (523 of 566 strings)

Added translation using Weblate (Ukrainian)

Translated using Weblate (Hungarian)

Currently translated at 58.8% (333 of 566 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (566 of 566 strings)

Translated using Weblate (French)

Currently translated at 100.0% (566 of 566 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (566 of 566 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (566 of 566 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (566 of 566 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (566 of 566 strings)

Translated using Weblate (French)

Currently translated at 100.0% (565 of 565 strings)

Co-authored-by: Anarchydr <patrikpik879@gmail.com>
Co-authored-by: Anna Teplaya <na-nebesax-anna@yandex.ru>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Jonas Kahnwald <elcan.osmanov123@gmail.com>
Co-authored-by: Nepx <anandabaskara@outlook.com>
Co-authored-by: Radoslav Vasilev Vasilev <fifata@gmail.com>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Sdarfeesh <Sdarfeesh@protonmail.com>
Co-authored-by: Skrripy <rozihrash.ya6w7@simplelogin.com>
Co-authored-by: Valere <weblare@hostux.net>
Co-authored-by: d4f5409d <d4f5409d-4b6a-4640-9ff3-155ebcdc7ab7@anonaddy.me>
Co-authored-by: eightyy8 <oliver.kha@pm.me>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: h <tachyglossues@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bg/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hu/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml |   1 +
 app/src/main/res/values-bg/strings.xml |   3 +
 app/src/main/res/values-es/strings.xml |   1 +
 app/src/main/res/values-fr/strings.xml |   3 +
 app/src/main/res/values-hr/strings.xml |   7 +-
 app/src/main/res/values-hu/strings.xml |  14 +
 app/src/main/res/values-in/strings.xml |   3 +
 app/src/main/res/values-pl/strings.xml |   1 +
 app/src/main/res/values-ru/strings.xml |  63 +++-
 app/src/main/res/values-tr/strings.xml |  25 +-
 app/src/main/res/values-uk/strings.xml | 396 +++++++++++++++++++++++++
 app/src/main/res/values-zh/strings.xml |   1 +
 12 files changed, 508 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/values-uk/strings.xml

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index f08ffa89..ecb15f78 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -532,4 +532,5 @@
     <string name="play_trailer_button">تشغيل المقطع الدعائي</string>
     <string name="delayed_update_notice">سيتم تحديث التطبيق عند الخروج</string>
     <string name="update_started">بدأ التحديث</string>
+    <string name="plugin_downloaded">تم تنزيل الإضافة</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 52ec2f09..0fdda385 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -493,4 +493,7 @@
     <string name="pref_category_cache">Кеш</string>
     <string name="pref_category_gestures">Жестове</string>
     <string name="pref_category_player_layout">Шаблон</string>
+    <string name="plugin_downloaded">Приставката е изтеглена</string>
+    <string name="delayed_update_notice">Приложението ще се актуализира при изход от него</string>
+    <string name="update_started">Започна Актуализация</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index af1e894e..f1426317 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -487,4 +487,5 @@
     <string name="yes">Si</string>
     <string name="delayed_update_notice">La aplicación se actualizará al salir</string>
     <string name="update_started">Actualización iniciada</string>
+    <string name="plugin_downloaded">Complemento descargado</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8961d1a4..218d7a3a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -487,4 +487,7 @@
     <string name="pref_category_actions">Actions</string>
     <string name="pref_category_cache">Cache</string>
     <string name="redo_setup_process">Refaire le processus d\'installation</string>
+    <string name="update_started">Mise à jour commencée</string>
+    <string name="delayed_update_notice">L\'application sera mise à jour dès la fin de la session</string>
+    <string name="plugin_downloaded">Plugin Téléchargé</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 61e461b2..accb625d 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -115,7 +115,7 @@
     <string name="subs_subtitle_languages">Jezik titlova</string>
     <string name="subs_hold_to_reset_to_default">Držite za vraćanje na zadane postavke</string>
     <string name="subs_import_text" formatted="true">Uvezi fontove tako da ih postavite u %s</string>
-    <string name="continue_watching">Nastavi gledati</string>
+    <string name="continue_watching">Nastavite s gledanjem</string>
     <string name="action_remove_watching">Makni</string>
     <string name="action_open_watching">Više informacija</string>
     <string name="action_open_play">@string/home_play </string>
@@ -218,7 +218,7 @@
     <string name="site">Stranica</string>
     <string name="synopsis">Sinopsis</string>
     <string name="queued">u redu čekanja</string>
-    <string name="no_subtitles">Nema titlova</string>
+    <string name="no_subtitles">Bez titlova</string>
     <string name="default_subtitles">Zadano</string>
     <string name="free_storage">Slobodno</string>
     <string name="used_storage">Iskorišteno</string>
@@ -380,7 +380,7 @@
     <string name="subtitles_example_text">The quick brown fox jumps over the lazy dog</string>
     <string name="recommended">Preporučeno</string>
     <string name="player_loaded_subtitles" formatted="true">Učitano %s</string>
-    <string name="player_load_subtitles">Učitaj iz datoteke</string>
+    <string name="player_load_subtitles">Učitaj datoteku titlova</string>
     <string name="player_load_subtitles_online">Učitaj sa interneta</string>
     <string name="downloaded_file">Preuzeta datoteka</string>
     <string name="actor_main">Glavno</string>
@@ -528,4 +528,5 @@
     <string name="season_format">%s %d%s</string>
     <string name="update_started">Aktualiziranje započeto</string>
     <string name="delayed_update_notice">Program če se aktualizirati tijekom zatvaranja programa</string>
+    <string name="plugin_downloaded">Dodatak preuzet</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 90306869..5b42fd6a 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -261,4 +261,18 @@
     <string name="apk_installer_settings">APK Telepítő</string>
     <string name="apk_installer_settings_des">Egyes telefonok nem támogatják az új csomag telepítőt. Ha a frissítések nem települnek, próbálja meg a régi opciót.</string>
     <string name="benene_des">Banán adva</string>
+    <string name="poster_ui_settings">A felhasználói felület elemeinek bekapcsolása a poszteren</string>
+    <string name="no_update_found">Nem található frissítés</string>
+    <string name="check_for_update">Frissítés keresése</string>
+    <string name="video_lock">Zárolás</string>
+    <string name="video_aspect_ratio_resize">Átméretezés</string>
+    <string name="video_source">Forrás</string>
+    <string name="video_skip_op">Bevezető intro átugrása</string>
+    <string name="dont_show_again">Ne mutasd újra</string>
+    <string name="next_episode_format" formatted="true">Az %d epizód ekkor jelenik meg:</string>
+    <string name="type_on_hold">Szüneteltetve</string>
+    <string name="type_dropped">Elvetve</string>
+    <string name="show_hd">Minőségi jelzés</string>
+    <string name="show_dub">Szinkroncímke</string>
+    <string name="show_sub">Alcímke</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 85e4f2c0..5e515c56 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -523,4 +523,7 @@
     <string name="apk_installer_legacy">Versi lama</string>
     <string name="skip_type_mixed_op">Sesi pembuka ganda</string>
     <string name="apk_installer_package_installer">Penginstal Paket</string>
+    <string name="plugin_downloaded">Plugin Terunduh</string>
+    <string name="delayed_update_notice">Aplikasi akan diperbaharui pada saat keluar</string>
+    <string name="update_started">Pembaharuan Dimulai</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 907ac76e..c1999697 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -487,4 +487,5 @@
     <string name="play_trailer_button">Odtwórz zwiastun</string>
     <string name="delayed_update_notice">Aplikacja zostanie zaktualizowana po wyjściu</string>
     <string name="update_started">Aktualizacja rozpoczęta</string>
+    <string name="plugin_downloaded">Wtyczka pobrana</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c374b4bc..dab140f0 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -9,12 +9,12 @@
     <string name="download">Скачать</string>
     <string name="search">Поиск</string>
     <string name="resize_fill">Заполнить</string>
-    <string name="download_failed">Ошибка загрузки</string>
+    <string name="download_failed">Скачать Неудачный</string>
     <string name="resize_fit">Подогнать</string>
     <string name="delete">Удалить</string>
     <string name="all">Всё</string>
     <string name="pause">Пауза</string>
-    <string name="cast_format" formatted="true">В ролях: %s</string>
+    <string name="cast_format" formatted="true">Актёрский состав: %s</string>
     <string name="show_title">Название источника</string>
     <string name="login">Вход</string>
     <string name="none">Нет</string>
@@ -22,4 +22,63 @@
     <string name="loading">Загрузка…</string>
     <string name="status">Статус</string>
     <string name="logout">Выйти</string>
+    <string name="next_episode_format" formatted="true">Эпизод %d будет выпущен в</string>
+    <string name="result_poster_img_des">Плакат</string>
+    <string name="search_poster_img_des">\@нить/результат_плокат_картинка_</string>
+    <string name="episode_poster_img_des">Эпизод Плакат</string>
+    <string name="home_main_poster_img_des">Главный Плакат</string>
+    <string name="home_next_random_img_des">Следующий Случайный</string>
+    <string name="go_back_img_des">Возвращаться</string>
+    <string name="home_change_provider_img_des">Смена Провайдер</string>
+    <string name="preview_background_img_des">Предпросмотр Фон</string>
+    <string name="player_speed_text_format" formatted="true">Скорость (%.2fx)</string>
+    <string name="rated_format" formatted="true">Оценили: %.1f</string>
+    <string name="new_update_format" formatted="true">Новое обновление найдено!
+\n%s -&gt; %s</string>
+    <string name="filler" formatted="true">Заполнитель</string>
+    <string name="app_name">ОблакоПоток</string>
+    <string name="action_remove_from_bookmarks">Убирать</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="play_with_app_name">Проиграть с ОблакоПоток</string>
+    <string name="title_home">Главная</string>
+    <string name="title_search">Поиск</string>
+    <string name="title_downloads">Загрузки</string>
+    <string name="title_settings">Настройки</string>
+    <string name="search_hint">Поиск…</string>
+    <string name="search_hint_site" formatted="true">Поиск %s…</string>
+    <string name="no_data">Нет Данных</string>
+    <string name="episode_more_options_des">Дополнительные Опции</string>
+    <string name="next_episode">Следующий эпизод</string>
+    <string name="result_tags">Жанры</string>
+    <string name="result_share">Делиться</string>
+    <string name="result_open_in_browser">Открывать В Браузер</string>
+    <string name="skip_loading">Скип Загрузка</string>
+    <string name="type_watching">Смотрю</string>
+    <string name="type_on_hold">Приостановленный</string>
+    <string name="type_completed">Завершено</string>
+    <string name="type_dropped">Брошенный</string>
+    <string name="type_plan_to_watch">План по Смотреть</string>
+    <string name="type_none">Никто</string>
+    <string name="type_re_watching">Пересмотрю</string>
+    <string name="play_movie_button">Проиграть Фильм</string>
+    <string name="play_trailer_button">Проиграть Трейлер</string>
+    <string name="play_livestream_button">Проиграть Livestream</string>
+    <string name="pick_source">Источники</string>
+    <string name="pick_subtitle">Субтитры</string>
+    <string name="play_episode">Проиграть Эпизод</string>
+    <string name="reload_error">Повторная попытка подключение…</string>
+    <string name="go_back">Вернуться</string>
+    <string name="downloaded">Скачали</string>
+    <string name="downloading">Скачивание</string>
+    <string name="download_paused">Скачать Приостановленный</string>
+    <string name="download_started">Скачать Начатый</string>
+    <string name="download_canceled">Скачать Отменено</string>
+    <string name="download_done">Скачать Выполнено</string>
+    <string name="home_info">Инфо</string>
+    <string name="update_started">Обновление Начатый</string>
+    <string name="home_expanded_hide">Прятать</string>
+    <string name="home_play">Проиграть</string>
+    <string name="home_more_info">Подробнее Инфо</string>
+    <string name="filter_bookmarks">Фильтр Закладки</string>
+    <string name="error_bookmarks_text">Закладки</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 82757560..969acd70 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -125,7 +125,7 @@
     <string name="action_open_play">@string/home_play </string>
     <string name="vpn_might_be_needed">Bu sağlayıcının düzgün çalışması için bir VPN gerekebilir</string>
     <string name="vpn_torrent">Bu sağlayıcı bir torrent. VPN önerilir</string>
-    <string name="provider_info_meta">Metadata verisi site tarafından sağlanmadı, video yüklemesi eğer sitede bulunmuyorsa oynatma başarısız olacak</string>
+    <string name="provider_info_meta">Metadata site tarafından sağlanmamış, veri site\'de bulunmuyorsa video yüklenmesi başarısız olacak.</string>
     <string name="torrent_plot">Açıklama</string>
     <string name="normal_no_plot">Konu bulunamadı</string>
     <string name="torrent_no_plot">Açıklama bulunamadı</string>
@@ -173,7 +173,7 @@
     <string name="show_fillers_settings">Anime için filler bölümleri gösterir</string>
     <string name="show_trailers_settings">Fragmanları göster</string>
     <string name="kitsu_settings">Kitsu\'dan posterleri göster</string>
-    <string name="pref_filter_search_quality">Arama sonuçlarında seçilen video kalitelerini gizle</string>
+    <string name="pref_filter_search_quality">Seçilen video kalitelerini arama sonuçlarında gizle</string>
     <string name="automatic_plugin_updates">Otomatik eklenti güncellemeleri</string>
     <string name="updates_settings">Uygulama güncellemelerini göster</string>
     <string name="updates_settings_des">Başlangıçta yeni güncellemeleri otomatik olarak ara</string>
@@ -289,15 +289,15 @@
     <string name="video_buffer_length_settings">Video arabelleği uzunluğu</string>
     <string name="video_buffer_disk_settings">Diskteki video önbelleği</string>
     <string name="video_buffer_clear_settings">Video ve resim önbelleğini temizle</string>
-    <string name="video_ram_description">Çok yükseğe ayarlanırsa rastgele çökmelere neden olur. Android TV veya eski bir telefon gibi ram miktarı düşük cihazlarda değiştirmeyin</string>
-    <string name="video_disk_description">Çok yükseğe ayarlanırsa, Android TV cihazları gibi düşük depolama alanına sahip sistemlerde sorunlara neden olabilir</string>
+    <string name="video_ram_description">Android TV gibi düşük belleğe sahip cihazlarda çok yükseğe ayarlanırsa çökmelere neden olur.</string>
+    <string name="video_disk_description">Çok yükseğe ayarlanırsa, Android TV cihazları gibi düşük depolama alanına sahip sistemlerde sorunlara neden olabilir.</string>
     <string name="dns_pref">HTTPS üzerinden DNS</string>
     <string name="dns_pref_summary">ISP bloklarını atlatmak için kullanışlıdır</string>
     <string name="add_site_pref">Klon site</string>
     <string name="remove_site_pref">Siteyi kaldır</string>
     <string name="add_site_summary">Farklı bir URL ile mevcut bir sitenin klonunu ekleyin</string>
     <string name="download_path_pref">İndirme konumu</string>
-    <string name="nginx_url_pref">Nginx sunucu URL\'i</string>
+    <string name="nginx_url_pref">NGINX sunucu URL\'si</string>
     <string name="display_subbed_dubbed_settings">Dublajlı/Alt yazılı animeleri göster</string>
     <string name="resize_fit">Ekrana sığdır</string>
     <string name="resize_fill">Uzat</string>
@@ -506,4 +506,19 @@
     <string name="redo_setup_process">Kurulum işlemini tekrarla</string>
     <string name="play_trailer_button">Fragmanı oynat</string>
     <string name="automatic_plugin_download_summary">Eklenen depolardan henüz yüklenmemiş tüm eklentileri otomatik olarak yükleyin.</string>
+    <string name="update_started">Güncelleme başladı</string>
+    <string name="apk_installer_settings_des">Bazı cihazlar yeni paket yükleyiciyi desteklemez.. Güncellemele yüklenmezse eski seçeneği deneyin.</string>
+    <string name="automatic_plugin_download">Eklentileri otomatik olarak indir</string>
+    <string name="apk_installer_settings">APK indirici</string>
+    <string name="pref_category_links">Linkler</string>
+    <string name="pref_category_app_updates">Uygulama güncellemeleri</string>
+    <string name="pref_category_backup">Yedek</string>
+    <string name="pref_category_player_features">Oynatıcı özellikleri</string>
+    <string name="pref_category_subtitles">Altyazılar</string>
+    <string name="pref_category_player_layout">Düzen</string>
+    <string name="pref_category_defaults">Varsayılanlar</string>
+    <string name="pref_category_extensions">Eklentiler</string>
+    <string name="pref_category_cache">Önbellek</string>
+    <string name="pref_category_looks">Görünüm</string>
+    <string name="pref_category_ui_features">Özellikler</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
new file mode 100644
index 00000000..93138278
--- /dev/null
+++ b/app/src/main/res/values-uk/strings.xml
@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="episode_poster_img_des">Постер епізоду</string>
+    <string name="download_canceled">Завантаження скасовано</string>
+    <string name="home_change_provider_img_des">Змінити постачальника</string>
+    <string name="go_back_img_des">Назад</string>
+    <string name="rated_format" formatted="true">Рейтинг: %.1f</string>
+    <string name="cast_format" formatted="true">Актори: %s</string>
+    <string name="next_episode_format" formatted="true">Епізод %d буде випущено в</string>
+    <string name="result_poster_img_des">Poster</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Еп. %d</string>
+    <string name="next_episode_time_day_format" formatted="true">%dд %dгод %dхв</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dгод %dхв</string>
+    <string name="next_episode_time_min_format" formatted="true">%dхв</string>
+    <string name="home_main_poster_img_des">Головний постер</string>
+    <string name="home_next_random_img_des">Наступний випадковий</string>
+    <string name="preview_background_img_des">Перегляд фону</string>
+    <string name="player_speed_text_format" formatted="true">Швидкість (%.2fx)</string>
+    <string name="new_update_format" formatted="true">Нове оновлення знайдено!
+\n%s -&gt; %s</string>
+    <string name="title_search">Пошук</string>
+    <string name="title_downloads">Завантаження</string>
+    <string name="duration_format" formatted="true">%d хв</string>
+    <string name="title_settings">Налаштування</string>
+    <string name="search_hint">Пошук…</string>
+    <string name="search_hint_site" formatted="true">Пошук %s…</string>
+    <string name="no_data">Дані відсутні</string>
+    <string name="episode_more_options_des">Більше опцій</string>
+    <string name="next_episode">Наступний епізод</string>
+    <string name="result_tags">Жанри</string>
+    <string name="result_open_in_browser">Відкрити в браузері</string>
+    <string name="skip_loading">Пропустити завантаження</string>
+    <string name="loading">Завантаження…</string>
+    <string name="type_completed">Завершено</string>
+    <string name="type_plan_to_watch">Заплановано</string>
+    <string name="type_dropped">Покинуто</string>
+    <string name="play_movie_button">Відтворити фільм</string>
+    <string name="play_trailer_button">Відтворити трейлер</string>
+    <string name="play_torrent_button">Відтворити торрент</string>
+    <string name="reload_error">Повторити підключення…</string>
+    <string name="go_back">Назад</string>
+    <string name="play_episode">Відтворити епізод</string>
+    <string name="downloaded">Завантажено</string>
+    <string name="downloading">Завантаження</string>
+    <string name="download_done">Завантаження завершено</string>
+    <string name="app_dubbed_text">Дубляж</string>
+    <string name="app_subbed_text">Субтитри</string>
+    <string name="popup_delete_file">Видалити файл</string>
+    <string name="popup_resume_download">Відновити завантаження</string>
+    <string name="pref_disable_acra">Вимкнути відправку повідомлень про помилки</string>
+    <string name="home_expanded_hide">Сховати</string>
+    <string name="home_play">Відтворити</string>
+    <string name="home_info">Інформація</string>
+    <string name="error_bookmarks_text">Закладки</string>
+    <string name="action_remove_from_bookmarks">Вилучити</string>
+    <string name="action_add_to_bookmarks">Змінити статус перегляду</string>
+    <string name="sort_apply">Застосувати</string>
+    <string name="sort_copy">Скопіювати</string>
+    <string name="sort_close">Закрити</string>
+    <string name="sort_save">Зберегти</string>
+    <string name="player_speed">Швидкість програвача</string>
+    <string name="subs_window_color">Колір вікна</string>
+    <string name="subs_edge_type">Тип краю</string>
+    <string name="subs_font">Шрифт</string>
+    <string name="subs_font_size">Розмір шрифту</string>
+    <string name="search_provider_text_providers">Пошук за допомогою постачальників</string>
+    <string name="search_provider_text_types">Пошук за типами</string>
+    <string name="benene_count_text_none">Бананів немає</string>
+    <string name="subs_auto_select_language">Автовибір мови</string>
+    <string name="subs_download_languages">Завантажити мови</string>
+    <string name="subs_subtitle_languages">Мова субтитрів</string>
+    <string name="subs_hold_to_reset_to_default">Утримуйте для скидання до налаштувань за замовчанням</string>
+    <string name="subs_import_text" formatted="true">Імпортуйте шрифти, помістивши їх у %s</string>
+    <string name="continue_watching">Продовжити перегляд</string>
+    <string name="action_remove_watching">Вилучити</string>
+    <string name="action_open_watching">Детальніше</string>
+    <string name="vpn_torrent">Цей постачальник є торрентом, рекомендується VPN</string>
+    <string name="torrent_plot">Опис</string>
+    <string name="normal_no_plot">Сюжет не знайдено</string>
+    <string name="torrent_no_plot">Опис не знайдено</string>
+    <string name="show_log_cat">Показати Logcat 🐈</string>
+    <string name="picture_in_picture_des">Продовження відтворення в мініатюрному плеєрі поверх інших програм</string>
+    <string name="player_size_settings_des">Прибирає чорні рамки</string>
+    <string name="player_subtitles_settings">Субтитри</string>
+    <string name="chromecast_subtitles_settings">Субтитри Chromecast</string>
+    <string name="chromecast_subtitles_settings_des">Налаштування субтитрів Chromecast</string>
+    <string name="eigengraumode_settings">Режим Eigengravy</string>
+    <string name="swipe_to_change_settings">Проведіть пальцем, щоб змінити налаштування</string>
+    <string name="swipe_to_change_settings_des">Проведіть пальцем ліворуч або праворуч, щоб змінити яскравість або гучність</string>
+    <string name="autoplay_next_settings_des">Відтворення наступного епізоду після закінчення поточного</string>
+    <string name="title_home">Головна</string>
+    <string name="app_name">CloudStream</string>
+    <string name="filler" formatted="true">Філер</string>
+    <string name="play_with_app_name">Програти в CloudStream</string>
+    <string name="stream">Потік</string>
+    <string name="type_watching">Переглянуто</string>
+    <string name="result_share">Поділитися</string>
+    <string name="type_on_hold">Призупинено</string>
+    <string name="type_re_watching">Повторний перегляд</string>
+    <string name="download">Завантажити</string>
+    <string name="play_livestream_button">Відтворити трансляцію</string>
+    <string name="pick_source">Джерела</string>
+    <string name="pick_subtitle">Субтитри</string>
+    <string name="download_storage_text">Внутрішнє сховище</string>
+    <string name="download_paused">Завантаження призупинено</string>
+    <string name="download_started">Завантаження розпочато</string>
+    <string name="download_failed">Помилка завантаження</string>
+    <string name="update_started">Оновлення розпочато</string>
+    <string name="error_loading_links_toast">Помилка завантаження посилань</string>
+    <string name="popup_pause_download">Призупинити завантаження</string>
+    <string name="popup_play_file">Відтворити файл</string>
+    <string name="home_more_info">Детальніше</string>
+    <string name="filter_bookmarks">Фільтр закладок</string>
+    <string name="type_none">Нічого</string>
+    <string name="sort_cancel">Скасувати</string>
+    <string name="sort_clear">Очистити</string>
+    <string name="subtitles_settings">Налаштування субтитрів</string>
+    <string name="subs_background_color">Колір фону</string>
+    <string name="subs_subtitle_elevation">Висота субтитрів</string>
+    <string name="subs_text_color">Колір тексту</string>
+    <string name="subs_outline_color">Колір контуру</string>
+    <string name="autoplay_next_settings">Автовідтворення наступного епізоду</string>
+    <string name="swipe_to_seek_settings_des">Проведіть пальцем ліворуч або праворуч, щоб керувати часом у відеоплеєрі</string>
+    <string name="benene_count_text">%d Бананів для розробників</string>
+    <string name="player_size_settings">Кнопка зміни розміру плеєра</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="vpn_might_be_needed">Для коректної роботи цього постачальника може знадобитися VPN</string>
+    <string name="provider_info_meta">Метадані не надаються сайтом, завантаження відео не відбудеться, якщо їх немає на сайті.</string>
+    <string name="picture_in_picture">Картинка в картинці</string>
+    <string name="player_subtitles_settings_des">Налаштування субтитрів плеєра</string>
+    <string name="eigengraumode_settings_des">Додає опцію швидкості в плеєрі</string>
+    <string name="swipe_to_seek_settings">Проведіть пальцем, щоб перемотати</string>
+    <string name="double_tap_to_seek_settings">Двічі торкніться, щоб перемотати</string>
+    <string name="double_tap_to_pause_settings">Двічі торкніться для паузи</string>
+    <string name="double_tap_to_seek_amount_settings">Крок перемотки</string>
+    <string name="double_tap_to_pause_settings_des">Натисніть посередині, щоб поставити на паузу</string>
+    <string name="use_system_brightness_settings">Використовувати яскравість системи</string>
+    <string name="episode_sync_settings">Оновити прогрес перегляду</string>
+    <string name="restore_settings">Відновлення даних з резервної копії</string>
+    <string name="backup_settings">Резервне копіювання даних</string>
+    <string name="restore_failed_format" formatted="true">Не вдалося відновити дані з файлу %s</string>
+    <string name="backup_success">Дані збережено</string>
+    <string name="backup_failed_error_format">Помилка резервного копіювання %s</string>
+    <string name="search">Пошук</string>
+    <string name="category_account">Облікові записи</string>
+    <string name="category_updates">Оновлення та резервне копіювання</string>
+    <string name="settings_info">Інформація</string>
+    <string name="advanced_search">Розширений пошук</string>
+    <string name="advanced_search_des">Надає результати пошуку, розділені за постачальниками</string>
+    <string name="bug_report_settings_off">Надсилає дані лише про збої</string>
+    <string name="bug_report_settings_on">Не надсилає даних</string>
+    <string name="show_fillers_settings">Показати заповнюючий епізод для аніме</string>
+    <string name="show_trailers_settings">Показати трейлери</string>
+    <string name="pref_filter_search_quality">Приховати вибрану якість відео в результатах пошуку</string>
+    <string name="automatic_plugin_download">Автоматичне завантаження плагінів</string>
+    <string name="updates_settings">Показати оновлення програми</string>
+    <string name="redo_setup_process">Повторний процес налаштування</string>
+    <string name="uprereleases_settings_des">Пошук лише попередніх оновлень, а не повних релізів</string>
+    <string name="apk_installer_settings">Встановлювач APK</string>
+    <string name="github">Github</string>
+    <string name="lightnovel">Легкий додаток для новел від тих же розробників</string>
+    <string name="anim">Додаток для аніме від тих же розробників</string>
+    <string name="benene">Дайте бананів розробникам</string>
+    <string name="app_language">Мова програми</string>
+    <string name="no_chromecast_support_toast">Цей постачальник не має підтримки Chromecast</string>
+    <string name="no_links_found_toast">Посилань не знайдено</string>
+    <string name="play_episode_toast">Відтворити епізод</string>
+    <string name="subs_default_reset_toast">Скинути до значення за замовчуванням</string>
+    <string name="no_season">Немає сезону</string>
+    <string name="episodes">Епізоди</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="season_short">С</string>
+    <string name="episode_short">Е</string>
+    <string name="delete_file">Видалити файл</string>
+    <string name="delete">Видалити</string>
+    <string name="resume">Відновити</string>
+    <string name="go_back_30">-30</string>
+    <string name="delete_message" formatted="true">Це назавжди видалить %s
+\nВи впевнені\?</string>
+    <string name="resume_time_left" formatted="true">%dхв
+\nзалишилося</string>
+    <string name="status_ongoing">Триває</string>
+    <string name="status_completed">Завершено</string>
+    <string name="rating">Рейтинг</string>
+    <string name="duration">Тривалість</string>
+    <string name="queued">у черзі</string>
+    <string name="no_subtitles">Без субтитрів</string>
+    <string name="default_subtitles">За замовчуванням</string>
+    <string name="free_storage">Вільне</string>
+    <string name="used_storage">Використовується</string>
+    <string name="app_storage">Програма</string>
+    <string name="tv_series">Телесеріали</string>
+    <string name="cartoons">Мультфільми</string>
+    <string name="anime">Аніме</string>
+    <string name="ova">ОВА</string>
+    <string name="asian_drama">Азіатські драми</string>
+    <string name="livestreams">Прямі трансляції</string>
+    <string name="others">Інше</string>
+    <string name="tv_series_singular">Серія</string>
+    <string name="cartoons_singular">Мультфільм</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="documentaries_singular">Документальний фільм</string>
+    <string name="asian_drama_singular">Азіатська драма</string>
+    <string name="live_singular">Пряма трансляція</string>
+    <string name="other_singular">Відео</string>
+    <string name="source_error">Помилка джерела</string>
+    <string name="remote_error">Віддалена помилка</string>
+    <string name="render_error">Помилка рендеринга</string>
+    <string name="episode_action_chromecast_mirror">Дзеркало Chromecast</string>
+    <string name="episode_action_play_in_app">Відтворити в програмі</string>
+    <string name="episode_action_play_in_format">Відтворити в %s</string>
+    <string name="episode_action_auto_download">Автозавантаження</string>
+    <string name="episode_action_download_mirror">Завантажити дзеркало</string>
+    <string name="check_for_update">Перевірити наявність оновлень</string>
+    <string name="video_lock">Заблокувати</string>
+    <string name="video_skip_op">Пропустити OP</string>
+    <string name="dont_show_again">Не показувати знову</string>
+    <string name="update">Оновити</string>
+    <string name="watch_quality_pref">Бажана якість перегляду</string>
+    <string name="show_title">Заголовок</string>
+    <string name="poster_ui_settings">Перемикання елементів інтерфейсу на плакаті</string>
+    <string name="no_update_found">Оновлення не знайдено</string>
+    <string name="double_tap_to_seek_settings_des">Двічі торкніться праворуч або ліворуч, щоб перейти вперед або назад</string>
+    <string name="use_system_brightness_settings_des">Використовуйте системну яскравість у плеєрі замість темної накладки</string>
+    <string name="restore_success">Завантажено файл резервної копії</string>
+    <string name="torrent">Торренти</string>
+    <string name="episode_sync_settings_des">Автоматична синхронізація прогресу поточного епізоду</string>
+    <string name="backup_failed">Відсутні дозволи на зберігання. Будь ласка, спробуйте ще раз.</string>
+    <string name="kitsu_settings">Показати постери від Kitsu</string>
+    <string name="automatic_plugin_updates">Автоматичне оновлення плагінів</string>
+    <string name="automatic_plugin_download_summary">Автоматично встановлювати всі ще не встановлені плагіни з доданих репозиторіїв.</string>
+    <string name="updates_settings_des">Автоматичний пошук нових оновлень при запуску</string>
+    <string name="uprereleases_settings">Оновлення до бета-версій</string>
+    <string name="copy_link_toast">Посилання скопійовано в буфер обміну</string>
+    <string name="apk_installer_settings_des">Деякі телефони не підтримують новий інсталятор пакетів. Спробуйте стару версію, якщо оновлення не встановлюються.</string>
+    <string name="discord">Приєднуйтесь до Discord</string>
+    <string name="benene_des">Дано бананів</string>
+    <string name="year">Рік</string>
+    <string name="go_forward_30">+30</string>
+    <string name="acra_report_toast">Вибачте, у додатку стався збій. Анонімне повідомлення про помилку буде відправлено розробникам</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="episode">Епізод</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="no_episodes_found">Епізодів не знайдено</string>
+    <string name="pause">Пауза</string>
+    <string name="season">Сезон</string>
+    <string name="status">Статус</string>
+    <string name="site">Сайт</string>
+    <string name="video_aspect_ratio_resize">Змінити розмір</string>
+    <string name="synopsis">Короткий зміст</string>
+    <string name="movies">Фільми</string>
+    <string name="episode_action_copy_link">Скопіювати посилання</string>
+    <string name="episode_action_reload_links">Перезавантажити посилання</string>
+    <string name="documentaries">Документальні фільми</string>
+    <string name="nsfw">NSFW</string>
+    <string name="movies_singular">Фільм</string>
+    <string name="ova_singular">\@string/ova</string>
+    <string name="torrent_singular">Торрент</string>
+    <string name="show_hd">Мітка якості</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="episode_action_play_in_browser">Відтворити в браузері</string>
+    <string name="unexpected_error">Несподівана помилка плеєра</string>
+    <string name="storage_error">Помилка завантаження, перевірте дозволи на зберігання</string>
+    <string name="episode_action_chromecast_episode">Епізод Chromecast</string>
+    <string name="show_sub">Мітка субтитрів</string>
+    <string name="video_source">Джерело</string>
+    <string name="episode_action_download_subtitle">Завантажити субтитри</string>
+    <string name="show_dub">Мітка дубляжу</string>
+    <string name="skip_update">Пропустити це оновлення</string>
+    <string name="all">Усе</string>
+    <string name="resize_fit">На весь екран</string>
+    <string name="resize_fill">Заповнити</string>
+    <string name="resize_zoom">Збільшити</string>
+    <string name="tracks">Доріжки</string>
+    <string name="pref_category_app_updates">Оновлення програми</string>
+    <string name="pref_category_cache">Кеш</string>
+    <string name="pref_category_gestures">Жести</string>
+    <string name="pref_category_player_features">Особливості плеєра</string>
+    <string name="pref_category_subtitles">Субтитри</string>
+    <string name="pref_category_defaults">За замовчуванням</string>
+    <string name="pref_category_looks">Вигляд</string>
+    <string name="pref_category_ui_features">Особливості</string>
+    <string name="category_general">Загальне</string>
+    <string name="random_button_settings">Випадкова кнопка</string>
+    <string name="random_button_settings_desc">Показати випадкову кнопку на Головній сторінці</string>
+    <string name="provider_lang_settings">Мови постачальника</string>
+    <string name="app_layout">Макет програми</string>
+    <string name="preferred_media_settings">Бажані медіа</string>
+    <string name="automatic">Авто</string>
+    <string name="tv_layout">Макет телевізора</string>
+    <string name="phone_layout">Макет телефону</string>
+    <string name="emulator_layout">Макет емулятора</string>
+    <string name="primary_color_settings">Основний колір</string>
+    <string name="app_theme_settings">Тема програми</string>
+    <string name="bottom_title_settings">Розташування назви постера</string>
+    <string name="bottom_title_settings_des">Розмістіть назву під постером</string>
+    <string name="example_password">пароль123</string>
+    <string name="example_username">Моє круте ім\'я</string>
+    <string name="example_email">hello@world.com</string>
+    <string name="example_site_name">Мій крутий сайт</string>
+    <string name="example_lang_name">Код мови (uk)</string>
+    <string name="logout">Вийти</string>
+    <string name="login">Увійти</string>
+    <string name="switch_account">Змінити обліковий запис</string>
+    <string name="add_account">Додати обліковий запис</string>
+    <string name="add_sync">Додати відстеження</string>
+    <string name="upload_sync">Синхронізація</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="authenticated_user" formatted="true">%s автентифіковано</string>
+    <string name="authenticated_user_fail" formatted="true">Не вдалося ввійти у %s</string>
+    <string name="none">Нічого</string>
+    <string name="normal">Нормальний</string>
+    <string name="min">Мін.</string>
+    <string name="subtitles_outline">Контур</string>
+    <string name="subtitles_shadow">Тінь</string>
+    <string name="subtitles_raised">Піднятий</string>
+    <string name="subtitle_offset">Синхронізувати субтитри</string>
+    <string name="subtitle_offset_title">Затримка субтитрів</string>
+    <string name="subtitle_offset_extra_hint_none_format">Без затримки субтитрів</string>
+    <string name="recommended">Рекомендовано</string>
+    <string name="player_load_subtitles_online">Завантажити з інтернету</string>
+    <string name="downloaded_file">Завантажений файл</string>
+    <string name="actor_main">Головна</string>
+    <string name="home_source">Джерело</string>
+    <string name="home_random">Випадковий</string>
+    <string name="coming_soon">Скоро буде…</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="quality_webrip">Web</string>
+    <string name="poster_image">Зображення постера</string>
+    <string name="category_player">Плеєр</string>
+    <string name="resolution_and_title">Роздільна здатність та назва</string>
+    <string name="error_invalid_id">Недійсний ID</string>
+    <string name="error_invalid_url">Недійсна URL-адреса</string>
+    <string name="pref_category_backup">Резервне копіювання</string>
+    <string name="limit_title">Макс. кількість символів у назві відеоплеєра</string>
+    <string name="video_buffer_size_settings">Розмір буфера відео</string>
+    <string name="video_buffer_disk_settings">Кеш відео на диску</string>
+    <string name="add_site_pref">Клон сайту</string>
+    <string name="remove_site_pref">Видалити сайт</string>
+    <string name="nginx_url_pref">URL-адреса сервера NGINX</string>
+    <string name="pref_category_links">Посилання</string>
+    <string name="limit_title_rez">Роздільна здатність відеоплеєра</string>
+    <string name="video_buffer_length_settings">Довжина буфера відео</string>
+    <string name="video_buffer_clear_settings">Очистити кеш відео та зображень</string>
+    <string name="video_ram_description">Спричиняє збої, якщо встановлено занадто високе значення на пристроях із малим об\'ємом пам\'яті, наприклад Android TV.</string>
+    <string name="dns_pref_summary">Корисно для обходу блокувань провайдера</string>
+    <string name="video_disk_description">Спричиняє збої, якщо встановлено занадто високе значення на пристроях із малим об\'ємом вільної пам\'яті, наприклад Android TV.</string>
+    <string name="dns_pref">DNS через HTTPS</string>
+    <string name="download_path_pref">Шлях завантаження</string>
+    <string name="add_site_summary">Додати клон існуючого сайту, з іншою URL-адресою</string>
+    <string name="display_subbed_dubbed_settings">Відображати Дубляж/Субтитри аніме</string>
+    <string name="legal_notice">Застереження</string>
+    <string name="pref_category_extensions">Розширення</string>
+    <string name="pref_category_actions">Дії</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="pref_category_player_layout">Макет</string>
+    <string name="subtitles_encoding">Кодування субтитрів</string>
+    <string name="enable_nsfw_on_providers">Включити NSFW на підтримуваних постачальників</string>
+    <string name="category_ui">Макет</string>
+    <string name="category_providers">Постачальники</string>
+    <string name="example_site_url">example.com</string>
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="subtitles_depressed">Депресивний</string>
+    <string name="account">обліковий запис</string>
+    <string name="create_account">Створити обліковий запис</string>
+    <string name="added_sync_format" formatted="true">Додано %s</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="sync_score">Оцінений</string>
+    <string name="player_load_subtitles">Завантажити з файлу</string>
+    <string name="max">Макс.</string>
+    <string name="subtitles_example_text">Гей, хлопці, не вспію - на ґанку ваша файна їжа знищується бурундучком</string>
+    <string name="subtitle_offset_hint">1000 мс</string>
+    <string name="subtitle_offset_extra_hint_later_format">Використовуйте цей параметр, якщо субтитри з\'являються на %d мс занадто рано</string>
+    <string name="subtitle_offset_extra_hint_before_format">Використовуйте це, якщо субтитри з\'являються із запізненням на %d мс</string>
+    <string name="player_loaded_subtitles" formatted="true">Завантажено %s</string>
+    <string name="actor_supporting">Підтримка</string>
+    <string name="actor_background">Фон</string>
+    <string name="quality_blueray">Blu-ray</string>
+    <string name="subtitles_remove_captions">Видалити закриті титри з субтитрів</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="error_invalid_data">Недійсні дані</string>
+    <string name="subtitles_filter_lang">Фільтрувати за бажаною мовою медіа</string>
+    <string name="quality_4k">4K</string>
+    <string name="title">Назва</string>
+    <string name="resolution">Роздільна здатність</string>
+    <string name="error">Помилка</string>
+    <string name="trailer">Трейлер</string>
+    <string name="extras">Додатково</string>
+    <string name="network_adress_example">Посилання на трансляцію</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 71bbbf7a..9545956e 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -551,4 +551,5 @@
     <string name="pref_category_looks">外观</string>
     <string name="update_started">更新开始</string>
     <string name="delayed_update_notice">应用退出后将会更新</string>
+    <string name="plugin_downloaded">插件已下载</string>
 </resources>
\ No newline at end of file

From 868bb8500f28a1b54c3cf1a8d09452bc04cf3740 Mon Sep 17 00:00:00 2001
From: "recloudstream[bot]"
 <111277985+recloudstream[bot]@users.noreply.github.com>
Date: Sat, 14 Jan 2023 12:08:00 +0000
Subject: [PATCH 168/273] update list of locales

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 78b028c2..939515ba 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -88,6 +88,7 @@ val appLanguages = arrayListOf(
     Triple("", "Tamil", "ta"),
     Triple("", "Tagalog", "tl"),
     Triple("", "Turkish", "tr"),
+    Triple("", "Ukrainian", "uk"),
     Triple("", "Urdu", "ur"),
     Triple("", "Viet Nam", "vi"),
     Triple("", "Chinese Simplified", "zh"),

From 2674d370a2da17bf4a963ade41904888ea53c928 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Sun, 15 Jan 2023 11:51:58 +0100
Subject: [PATCH 169/273] Translated using Weblate (Italian)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (566 of 566 strings)

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 46.8% (265 of 566 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 93.2% (528 of 566 strings)

Added translation using Weblate (Norwegian Nynorsk)

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Sandyran <sandyran@protonmail.com>
Co-authored-by: Translator-3000 <weblate.m1d0h@8shield.net>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nn/
Translation: Cloudstream/App
---
 app/src/main/res/values-it/strings.xml |   1 +
 app/src/main/res/values-nn/strings.xml | 186 +++++++++++++++++++++++++
 app/src/main/res/values-no/strings.xml |   5 +-
 3 files changed, 190 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/values-nn/strings.xml

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e3ac0e56..f27f7c13 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -506,4 +506,5 @@
     <string name="pref_category_ui_features">Funzionalità</string>
     <string name="delayed_update_notice">L\'app verrà aggiornata all\'uscita</string>
     <string name="update_started">Aggiornamento avviato</string>
+    <string name="plugin_downloaded">Plugin scaricato</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
new file mode 100644
index 00000000..b5132028
--- /dev/null
+++ b/app/src/main/res/values-nn/strings.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="episode_more_options_des">Fleire val</string>
+    <string name="title_home">Heim</string>
+    <string name="title_search">Søk</string>
+    <string name="title_downloads">Nedlastingar</string>
+    <string name="title_settings">Innstillingar</string>
+    <string name="search_hint">Søk…</string>
+    <string name="search_hint_site" formatted="true">Søk i %s…</string>
+    <string name="no_data">Ingen data tilgjengeleg</string>
+    <string name="next_episode">Neste episode</string>
+    <string name="episode_poster_img_des">Episodeminiatyrbilete</string>
+    <string name="home_next_random_img_des">Neste tilfeldig</string>
+    <string name="play_with_app_name">Spel av med CloudStream</string>
+    <string name="filler" formatted="true">Fyllstoff</string>
+    <string name="preview_background_img_des">Forhandsvis bakgrunnsbilete</string>
+    <string name="rated_format" formatted="true">Vurdert: %.1f</string>
+    <string name="new_update_format" formatted="true">Ny oppdatering tilgjengeleg!
+\n%s -&gt; %s</string>
+    <string name="duration_format" formatted="true">%d minutt</string>
+    <string name="result_poster_img_des">Miniatyrbilete</string>
+    <string name="next_episode_format" formatted="true">Episode %d vil bli sleppt om</string>
+    <string name="next_episode_time_day_format" formatted="true">%dd %dt %dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dt %dm</string>
+    <string name="cast_format" formatted="true">Rollebesetning: %s</string>
+    <string name="home_main_poster_img_des">Hovudminiatyrbilete</string>
+    <string name="home_change_provider_img_des">Endre leverandør</string>
+    <string name="result_open_in_browser">Opne i nettlesaren</string>
+    <string name="loading">Laster inn…</string>
+    <string name="skip_loading">Hopp over buffering</string>
+    <string name="type_watching">Ser på</string>
+    <string name="type_on_hold">På vent</string>
+    <string name="type_completed">Fullført</string>
+    <string name="type_plan_to_watch">Planlagt</string>
+    <string name="play_movie_button">Spel av film</string>
+    <string name="play_trailer_button">Spel av trailer</string>
+    <string name="play_livestream_button">Spel av direktesending</string>
+    <string name="pick_source">Kjelder</string>
+    <string name="pick_subtitle">Undertekstar</string>
+    <string name="go_back">Gå tilbake</string>
+    <string name="play_episode">Spel av episode</string>
+    <string name="download">Nedlasting</string>
+    <string name="downloaded">Lasta ned</string>
+    <string name="downloading">Nedlasting pågår</string>
+    <string name="download_paused">Nedlasting satt på vent</string>
+    <string name="download_started">Nedlasting starta</string>
+    <string name="download_failed">Nedlasting feila</string>
+    <string name="download_canceled">Nedlasting avbrote</string>
+    <string name="download_done">Nedlasting ferdig</string>
+    <string name="stream">Straum</string>
+    <string name="error_loading_links_toast">Feil ved innlasting av lenker</string>
+    <string name="download_storage_text">Internlagring</string>
+    <string name="app_dubbed_text">Dubb</string>
+    <string name="popup_delete_file">Slett fil</string>
+    <string name="popup_play_file">Spel av fil</string>
+    <string name="popup_pause_download">Sett nedlasting på vent</string>
+    <string name="pref_disable_acra">Deaktiver automatisk feilrapportering</string>
+    <string name="home_expanded_hide">Gøym</string>
+    <string name="home_play">Spel(e) av</string>
+    <string name="home_info">Informasjon</string>
+    <string name="filter_bookmarks">Filtrer bokmerker</string>
+    <string name="error_bookmarks_text">Bokmerker</string>
+    <string name="action_remove_from_bookmarks">Fjern</string>
+    <string name="action_add_to_bookmarks">Sett visingstatus</string>
+    <string name="sort_apply">Bruk</string>
+    <string name="sort_cancel">Avbryt</string>
+    <string name="sort_copy">Kopier</string>
+    <string name="sort_clear">Tøm</string>
+    <string name="sort_save">Lagre</string>
+    <string name="player_speed">Avspelinghastigheit</string>
+    <string name="subtitles_settings">Innstillingar for undertekstar</string>
+    <string name="subs_text_color">Tekstfarge</string>
+    <string name="subs_outline_color">Konturfarge</string>
+    <string name="subs_background_color">Bakgrunnfarge</string>
+    <string name="subs_window_color">Vindaugefarge</string>
+    <string name="subs_edge_type">Kanttype</string>
+    <string name="subs_subtitle_elevation">Underteksthøgde</string>
+    <string name="subs_font">Skrifttype</string>
+    <string name="subs_font_size">Skriftstorleik</string>
+    <string name="search_provider_text_providers">Søk basert på leverandør</string>
+    <string name="action_remove_watching">Fjern</string>
+    <string name="action_open_watching">Meir informasjon</string>
+    <string name="player_subtitles_settings">Undertekstar</string>
+    <string name="torrent_plot">Beskriving</string>
+    <string name="normal_no_plot">Fant ingen handling</string>
+    <string name="torrent_no_plot">Fant ingen beskriving</string>
+    <string name="player_size_settings_des">Fjern dei svarte kantane</string>
+    <string name="autoplay_next_settings">Spel av neste episode automatisk</string>
+    <string name="backup_settings">Sikkerheitskopier data</string>
+    <string name="restore_success">Lasta inn sikkerheitkopifil</string>
+    <string name="search">Søk</string>
+    <string name="category_account">Kontoar</string>
+    <string name="category_updates">Oppdateringar og sikkerheitskopiering av data</string>
+    <string name="settings_info">Informasjon</string>
+    <string name="advanced_search">Avansert søk</string>
+    <string name="show_trailers_settings">Vis trailerar</string>
+    <string name="kitsu_settings">Vis miniatyrbilete frå Kitsu</string>
+    <string name="updates_settings">Vis programoppdateringar</string>
+    <string name="github">Github</string>
+    <string name="lightnovel">Lysnovelleprogram av dei same utviklarane</string>
+    <string name="anim">Animeprogram av dei same utviklarane</string>
+    <string name="app_language">Programspråk</string>
+    <string name="no_links_found_toast">Ingen lenker funnen</string>
+    <string name="copy_link_toast">Kopiert lenke til utklipptavle</string>
+    <string name="play_episode_toast">Spel av episode</string>
+    <string name="subs_default_reset_toast">Tilbakestill til standardverdi</string>
+    <string name="acra_report_toast">Beklager, programmet har krasjet. Ein anonymisert feilrapport vil bli sendt til utviklarane</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="no_season">Ingen sesong</string>
+    <string name="episode">Episode</string>
+    <string name="season_short">S</string>
+    <string name="episode_short">E</string>
+    <string name="no_episodes_found">Ingen episodar blei funnen</string>
+    <string name="delete_file">Slett fil</string>
+    <string name="delete">Slett</string>
+    <string name="pause">Pause</string>
+    <string name="resume">Gjenoppta</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="delete_message" formatted="true">Dette vil slette %s permanent.
+\nEr du sikker på dette\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\ngjenstår</string>
+    <string name="status_ongoing">Pågåande</string>
+    <string name="status_completed">Fullført</string>
+    <string name="year">År</string>
+    <string name="rating">Vurdering</string>
+    <string name="site">Nettstad</string>
+    <string name="synopsis">Om</string>
+    <string name="queued">i kø</string>
+    <string name="no_subtitles">Ingen undertekstar</string>
+    <string name="default_subtitles">Standard</string>
+    <string name="used_storage">Brukt</string>
+    <string name="app_storage">Program</string>
+    <string name="movies">Filmar</string>
+    <string name="tv_series">TV-seriar</string>
+    <string name="free_storage">Tilgjengeleg</string>
+    <string name="cartoons">Teikneseriar</string>
+    <string name="anime">Anime</string>
+    <string name="documentaries">Dokumentarar</string>
+    <string name="others">Andre</string>
+    <string name="movies_singular">Film</string>
+    <string name="tv_series_singular">Serie</string>
+    <string name="cartoons_singular">Teiknefilm</string>
+    <string name="documentaries_singular">Dokumentar</string>
+    <string name="asian_drama_singular">Asiatisk drama</string>
+    <string name="live_singular">Direktesending</string>
+    <string name="other_singular">Video</string>
+    <string name="source_error">Kjeldefeil</string>
+    <string name="episode_action_play_in_app">Spel av i programmet</string>
+    <string name="episode_action_play_in_format">Spel av i %s</string>
+    <string name="episode_action_play_in_browser">Spel av i nettlesaren</string>
+    <string name="episode_action_copy_link">Kopier lenke</string>
+    <string name="episode_action_auto_download">Automatisk nedlasting</string>
+    <string name="episode_action_reload_links">Last inn lenker på nytt</string>
+    <string name="episode_action_download_subtitle">Last ned undertekstar</string>
+    <string name="update">Oppdater</string>
+    <string name="skip_update">Ignorer oppdatering</string>
+    <string name="dont_show_again">Ikkje vis igjen</string>
+    <string name="video_source">Kjelde</string>
+    <string name="video_skip_op">Hopp over intro</string>
+    <string name="video_aspect_ratio_resize">Endre storleik</string>
+    <string name="video_lock">Lås</string>
+    <string name="watch_quality_pref">Føretrekt oppløysing</string>
+    <string name="dns_pref">DNS over HTTPS</string>
+    <string name="go_back_img_des">Gå tilbake</string>
+    <string name="result_tags">Sjangrar</string>
+    <string name="result_share">Dele</string>
+    <string name="type_none">Ingen</string>
+    <string name="type_re_watching">Ser om igjen</string>
+    <string name="update_started">Oppdatering starta</string>
+    <string name="popup_resume_download">Fortsett nedlasting</string>
+    <string name="home_more_info">Meir informasjon</string>
+    <string name="sort_close">Lukk</string>
+    <string name="player_speed_text_format" formatted="true">Avspelinghastigheit (%.2fx)</string>
+    <string name="app_name">CloudStream</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="updates_settings_des">Sjå etter nye oppdateringar automatisk ved oppstart</string>
+    <string name="discord">Bli med i Discord</string>
+    <string name="no_chromecast_support_toast">Denne leverandøren støttar ikkje Chromecast</string>
+    <string name="season">Sesong</string>
+    <string name="episodes">Episodar</string>
+    <string name="duration">Varigheit</string>
+    <string name="livestreams">Direktesendingar</string>
+    <string name="pref_category_app_updates">Programoppdateringar</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 4068b7bb..e7ebc98f 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -19,7 +19,7 @@
     <string name="title_downloads">Nedlastinger</string>
     <string name="title_settings">Innstillinger</string>
     <string name="search_hint">Søk…</string>
-    <string name="no_data">Nei informasjon</string>
+    <string name="no_data">Ingen data tilgjengelig</string>
     <string name="episode_more_options_des">Flere valg</string>
     <string name="next_episode">Neste episode</string>
     <string name="result_tags">Sjangere</string>
@@ -90,7 +90,7 @@
     <string name="vpn_might_be_needed">En VPN kan være nødvendig for at denne leverandøren skal fungere</string>
     <string name="vpn_torrent">Denne leverandøren er en torrent, en VPN anbefales</string>
     <string name="torrent_plot">Beskrivelse</string>
-    <string name="normal_no_plot">Fant ikke tomt</string>
+    <string name="normal_no_plot">Fant ingen handling</string>
     <string name="torrent_no_plot">Ingen beskrivelse funnet</string>
     <string name="picture_in_picture">Bilde-i-bilde</string>
     <string name="picture_in_picture_des">Fortsetter avspilling i en miniatyr spiller på toppen av andre apper</string>
@@ -502,4 +502,5 @@
     <string name="pref_category_backup">Sikkerhetskopi</string>
     <string name="apk_installer_settings">APK-installatør</string>
     <string name="apk_installer_settings_des">Noen enheter støtter ikke den nye pakkeinstallatøren. Prøv gammeldags alternativ hvis ting ikke installeres.</string>
+    <string name="update_started">Oppdatering startet</string>
 </resources>
\ No newline at end of file

From 5c8a667e9e06ffa0026cd666acd75105fcc27dfa Mon Sep 17 00:00:00 2001
From: hexated <hexated@gmail.com>
Date: Sun, 15 Jan 2023 14:47:05 +0700
Subject: [PATCH 170/273] fixed StreamSB

---
 .../main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
index 3b6c5496..958d63fb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
@@ -130,7 +130,7 @@ open class StreamSB : ExtractorApi() {
             it.value.replace(Regex("(embed-|/e/)"), "")
         }.first()
 //        val master = "$mainUrl/sources48/6d6144797752744a454267617c7c${bytesToHex.lowercase()}7c7c4e61755a56456f34385243727c7c73747265616d7362/6b4a33767968506e4e71374f7c7c343837323439333133333462353935333633373836643638376337633462333634663539343137373761333635313533333835333763376333393636363133393635366136323733343435323332376137633763373337343732363536313664373336327c7c504d754478413835306633797c7c73747265616d7362"
-        val master = "$mainUrl/sources49/" + bytesToHex("||$id||||streamsb".toByteArray()) + "/"
+        val master = "$mainUrl/sources50/" + bytesToHex("||$id||||streamsb".toByteArray()) + "/"
         val headers = mapOf(
             "watchsb" to "sbstream",
         )

From 60c1eb2579ce2ea34896da6a6de8bf1ee875b616 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sun, 15 Jan 2023 12:04:57 +0100
Subject: [PATCH 171/273] Update update_locales.yml

---
 .github/workflows/update_locales.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/update_locales.yml b/.github/workflows/update_locales.yml
index 8764d721..93cdca44 100644
--- a/.github/workflows/update_locales.yml
+++ b/.github/workflows/update_locales.yml
@@ -1,6 +1,7 @@
 name: Update locale lists
 
 on:
+  workflow_dispatch:
   push:
     paths:
       - '**.xml'

From d606f84545e1dd08b799ae383125a01d7fab1f64 Mon Sep 17 00:00:00 2001
From: "recloudstream[bot]"
 <111277985+recloudstream[bot]@users.noreply.github.com>
Date: Sun, 15 Jan 2023 11:05:23 +0000
Subject: [PATCH 172/273] update list of locales

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 939515ba..4c73cd25 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -79,6 +79,7 @@ val appLanguages = arrayListOf(
     Triple("", "Malayalam", "ml"),
     Triple("", "Moldavian", "mo"),
     Triple("", "Dutch", "nl"),
+    Triple("", "nn", "nn"),
     Triple("", "Norsk", "no"),
     Triple("", "Polish", "pl"),
     Triple("\uD83C\uDDF5\uD83C\uDDF9", "Portuguese", "pt"),

From 307d4dd494b25fa5960115f1e8c3659d44f88292 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sun, 15 Jan 2023 12:07:54 +0100
Subject: [PATCH 173/273] Update SettingsGeneral.kt

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 4c73cd25..54c5bdb5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -79,8 +79,8 @@ val appLanguages = arrayListOf(
     Triple("", "Malayalam", "ml"),
     Triple("", "Moldavian", "mo"),
     Triple("", "Dutch", "nl"),
-    Triple("", "nn", "nn"),
-    Triple("", "Norsk", "no"),
+    Triple("", "Norwegian Nynorsk", "nn"),
+    Triple("", "Norwegian", "no"),
     Triple("", "Polish", "pl"),
     Triple("\uD83C\uDDF5\uD83C\uDDF9", "Portuguese", "pt"),
     Triple("", "Romanian", "ro"),

From cd8c5966e660aab714b8408551455f6af87feb86 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Mon, 16 Jan 2023 23:49:59 +0100
Subject: [PATCH 174/273] Made player_view unfocusable to prevent white overlay
 on Chromebooks

---
 app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt | 3 ++-
 app/src/main/res/layout/fragment_player.xml                  | 1 +
 app/src/main/res/layout/fragment_player_tv.xml               | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 0b0b787a..a5f3ff48 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -948,8 +948,9 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 //        Used to check current focus for TV
 //        main {
 //            while (true) {
-//                delay(1000)
+//                delay(5000)
 //                println("Current focus: $currentFocus")
+//                showToast(this, currentFocus.toString(), Toast.LENGTH_LONG)
 //            }
 //        }
 
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 412f7b5b..250551cb 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -18,6 +18,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@android:color/black"
+        android:focusable="false"
         app:auto_show="true"
         app:backgroundTint="@android:color/black"
         app:controller_layout_id="@layout/player_custom_layout"
diff --git a/app/src/main/res/layout/fragment_player_tv.xml b/app/src/main/res/layout/fragment_player_tv.xml
index fec649a8..a0826087 100644
--- a/app/src/main/res/layout/fragment_player_tv.xml
+++ b/app/src/main/res/layout/fragment_player_tv.xml
@@ -17,10 +17,10 @@
         android:id="@+id/player_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:focusable="false"
         app:auto_show="true"
         app:controller_layout_id="@layout/player_custom_layout_tv"
         app:hide_on_touch="false"
-
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From 42f90a79c4bb5c7d8b2d22a5c111476d333a061f Mon Sep 17 00:00:00 2001
From: Jace <54625750+Jacekun@users.noreply.github.com>
Date: Tue, 17 Jan 2023 23:11:49 +0800
Subject: [PATCH 175/273] [Feature] Allow input of Year on Subtitle search
 (#232)

* Use query text as default filename of subtitle instead of empty string.

* [Feature] Allow input of Year on Subtitle search
---
 .../providers/OpenSubtitlesApi.kt             |  2 +-
 .../cloudstream3/ui/player/GeneratorPlayer.kt | 17 ++++++++++++++++-
 .../res/layout/dialog_online_subtitles.xml    | 19 +++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
index d5d6400c..8f06c98e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
@@ -206,7 +206,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
                 }
                 //Use any valid name/title in hierarchy
                 val name = filename ?: featureDetails?.movieName ?: featureDetails?.title
-                ?: featureDetails?.parentTitle ?: attr.release ?: ""
+                ?: featureDetails?.parentTitle ?: attr.release ?: query.query
                 val lang = fixLanguageReverse(attr.language)?: ""
                 val resEpNum = featureDetails?.episodeNumber ?: query.epNumber
                 val resSeasonNum = featureDetails?.seasonNumber ?: query.seasonNumber
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index fa0a2a7f..37f13c6c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -11,7 +11,9 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
 import android.widget.*
+import android.widget.TextView.OnEditorActionListener
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.animation.addListener
@@ -330,17 +332,28 @@ class GeneratorPlayer : FullScreenPlayer() {
         dialog.search_loading_bar.progressTintList = color
         dialog.search_loading_bar.indeterminateTintList = color
 
+        //Automatically search after entering Year
+        dialog.subtitles_search_year.setOnEditorActionListener(OnEditorActionListener { v, actionId, event ->
+            if (actionId == EditorInfo.IME_ACTION_DONE) {
+                dialog.subtitles_search.setQuery(dialog.subtitles_search.query, true)
+                return@OnEditorActionListener true
+            }
+            false
+        })
+
         dialog.subtitles_search.setOnQueryTextListener(object :
             androidx.appcompat.widget.SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String?): Boolean {
                 dialog.search_loading_bar?.show()
                 ioSafe {
+                    val year = dialog.subtitles_search_year?.text?.toString()?.toIntOrNull()
                     val search =
                         AbstractSubtitleEntities.SubtitleSearch(query = query ?: return@ioSafe,
                             imdb = imdbId,
                             epNumber = currentTempMeta.episode,
                             seasonNumber = currentTempMeta.season,
-                            lang = currentLanguageTwoLetters.ifBlank { null })
+                            lang = currentLanguageTwoLetters.ifBlank { null },
+                            year = year)
                     val results = providers.amap {
                         try {
                             it.search(search)
@@ -414,6 +427,8 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         dialog.show()
         dialog.subtitles_search.setQuery(currentTempMeta.name, true)
+        //TODO: Set year text from currently loaded movie on Player
+        //dialog.subtitles_search_year?.setText(currentTempMeta.year)
     }
 
     private fun openSubPicker() {
diff --git a/app/src/main/res/layout/dialog_online_subtitles.xml b/app/src/main/res/layout/dialog_online_subtitles.xml
index 824d8089..4acd27be 100644
--- a/app/src/main/res/layout/dialog_online_subtitles.xml
+++ b/app/src/main/res/layout/dialog_online_subtitles.xml
@@ -99,6 +99,25 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/LinearLayout02"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_margin="10dp">
+                <EditText
+                    android:id="@+id/subtitles_search_year"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:textSize="18sp"
+                    android:hint="@string/year"
+                    android:gravity="start|center_vertical"
+                    android:textAlignment="gravity"
+                    android:maxLines="1"
+                    android:inputType="numberSigned"
+                    android:imeOptions="actionDone"/>
+            </LinearLayout>
+
             <ListView
                     android:id="@+id/subtitle_adapter"
                     android:layout_width="match_parent"

From a8352d3f6490f6c2c95b4b629eb4b4755ee66ca4 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Tue, 17 Jan 2023 16:57:46 +0100
Subject: [PATCH 176/273] Prettified the subtitle year dialog

---
 .../cloudstream3/mvvm/ArchComponentExt.kt     |   6 +-
 .../cloudstream3/ui/player/GeneratorPlayer.kt |  61 +++--
 .../ui/player/PlayerGeneratorViewModel.kt     |   7 +
 .../res/layout/dialog_online_subtitles.xml    | 225 +++++++++---------
 gradlew                                       |   0
 5 files changed, 166 insertions(+), 133 deletions(-)
 mode change 100644 => 100755 gradlew

diff --git a/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt b/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
index e5c03d64..afe956cc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
@@ -49,10 +49,14 @@ inline fun debugWarning(assert: () -> Boolean, message: () -> String) {
     }
 }
 
-fun <T> LifecycleOwner.observe(liveData: LiveData<T>, action: (t: T) -> Unit) {
+fun <T> LifecycleOwner.observe(liveData: LiveData<T>, action: (t:  T) -> Unit) {
     liveData.observe(this) { it?.let { t -> action(t) } }
 }
 
+fun <T> LifecycleOwner.observeNullable(liveData: LiveData<T>, action: (t: T) -> Unit) {
+    liveData.observe(this) { action(it) }
+}
+
 inline fun <reified T : Any> some(value: T?): Some<T> {
     return if (value == null) {
         Some.None
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 37f13c6c..bf39edc7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -28,19 +28,13 @@ import com.hippo.unifile.UniFile
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.mvvm.Resource
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
-import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.mvvm.*
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.subtitleProviders
 import com.lagradost.cloudstream3.ui.player.CS3IPlayer.Companion.preferredAudioTrackLanguage
 import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.updateForcedEncoding
 import com.lagradost.cloudstream3.ui.player.PlayerSubtitleHelper.Companion.toSubtitleMimeType
-import com.lagradost.cloudstream3.ui.result.ResultEpisode
-import com.lagradost.cloudstream3.ui.result.ResultFragment
-import com.lagradost.cloudstream3.ui.result.SyncViewModel
-import com.lagradost.cloudstream3.ui.result.setText
+import com.lagradost.cloudstream3.ui.result.*
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.getAutoSelectLanguageISO639_1
 import com.lagradost.cloudstream3.utils.*
@@ -63,6 +57,9 @@ import kotlinx.android.synthetic.main.player_select_source_and_subs.*
 import kotlinx.android.synthetic.main.player_select_source_and_subs.subtitles_click_settings
 import kotlinx.android.synthetic.main.player_select_tracks.*
 import kotlinx.coroutines.Job
+import java.util.*
+import kotlin.collections.ArrayList
+import kotlin.collections.HashMap
 
 class GeneratorPlayer : FullScreenPlayer() {
     companion object {
@@ -332,28 +329,54 @@ class GeneratorPlayer : FullScreenPlayer() {
         dialog.search_loading_bar.progressTintList = color
         dialog.search_loading_bar.indeterminateTintList = color
 
-        //Automatically search after entering Year
-        dialog.subtitles_search_year.setOnEditorActionListener(OnEditorActionListener { v, actionId, event ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                dialog.subtitles_search.setQuery(dialog.subtitles_search.query, true)
-                return@OnEditorActionListener true
+        observeNullable(viewModel.currentSubtitleYear) {
+            // When year is changed search again
+            dialog.subtitles_search.setQuery(dialog.subtitles_search.query, true)
+            dialog.year_btt.text = it?.toString() ?: txt(R.string.none).asString(context)
+        }
+
+        dialog.year_btt?.setOnClickListener {
+            val none = txt(R.string.none).asString(context)
+            val currentYear = Calendar.getInstance().get(Calendar.YEAR)
+            val earliestYear = 1900
+
+            val years = (currentYear downTo earliestYear).toList()
+            val options = listOf(none) + years.map {
+                it.toString()
             }
-            false
-        })
+
+            val selectedIndex = viewModel.currentSubtitleYear.value
+                ?.let {
+                    // + 1 since none also takes a space
+                    years.indexOf(it) + 1
+                }
+                ?.takeIf { it >= 0 } ?: 0
+
+            activity?.showDialog(
+                options,
+                selectedIndex,
+                txt(R.string.year).asString(context),
+                true, {
+                }, { index ->
+                    viewModel.setSubtitleYear(years.getOrNull(index - 1))
+                }
+            )
+        }
 
         dialog.subtitles_search.setOnQueryTextListener(object :
             androidx.appcompat.widget.SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String?): Boolean {
                 dialog.search_loading_bar?.show()
                 ioSafe {
-                    val year = dialog.subtitles_search_year?.text?.toString()?.toIntOrNull()
                     val search =
-                        AbstractSubtitleEntities.SubtitleSearch(query = query ?: return@ioSafe,
+                        AbstractSubtitleEntities.SubtitleSearch(
+                            query = query ?: return@ioSafe,
                             imdb = imdbId,
                             epNumber = currentTempMeta.episode,
                             seasonNumber = currentTempMeta.season,
                             lang = currentLanguageTwoLetters.ifBlank { null },
-                            year = year)
+                            year = viewModel.currentSubtitleYear.value
+                        )
                     val results = providers.amap {
                         try {
                             it.search(search)
@@ -361,7 +384,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                             null
                         }
                     }.filterNotNull()
-                    val max = results.map { it.size }.maxOrNull() ?: return@ioSafe
+                    val max = results.maxOfOrNull { it.size } ?: return@ioSafe
 
                     // very ugly
                     val items = ArrayList<AbstractSubtitleEntities.SubtitleEntity>()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
index dc33f67c..7faf0cf5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
@@ -35,6 +35,13 @@ class PlayerGeneratorViewModel : ViewModel() {
     private val _currentStamps = MutableLiveData<List<EpisodeSkip.SkipStamp>>(emptyList())
     val currentStamps: LiveData<List<EpisodeSkip.SkipStamp>> = _currentStamps
 
+    private val _currentSubtitleYear = MutableLiveData<Int?>(null)
+    val currentSubtitleYear: LiveData<Int?> = _currentSubtitleYear
+
+    fun setSubtitleYear(year: Int?) {
+        _currentSubtitleYear.postValue(year)
+    }
+
     fun getId(): Int? {
         return generator?.getCurrentId()
     }
diff --git a/app/src/main/res/layout/dialog_online_subtitles.xml b/app/src/main/res/layout/dialog_online_subtitles.xml
index 4acd27be..7803e261 100644
--- a/app/src/main/res/layout/dialog_online_subtitles.xml
+++ b/app/src/main/res/layout/dialog_online_subtitles.xml
@@ -1,159 +1,158 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@null"
-        android:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@null"
+    android:orientation="vertical">
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="60dp"
-            android:baselineAligned="false"
-            android:orientation="horizontal">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="60dp"
+        android:baselineAligned="false"
+        android:orientation="horizontal">
 
         <LinearLayout
-                android:id="@+id/sort_subtitles_holder"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="50"
-                android:orientation="vertical">
+            android:id="@+id/sort_subtitles_holder"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="50"
+            android:orientation="vertical">
 
             <!--   android:id="@+id/subs_settings"                 android:foreground="?android:attr/selectableItemBackgroundBorderless"
 -->
             <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    tools:ignore="UseCompoundDrawables">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                tools:ignore="UseCompoundDrawables">
 
                 <FrameLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="40dp"
-                        android:layout_margin="10dp"
-                        android:background="@drawable/search_background"
-                        android:visibility="visible">
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:layout_margin="10dp"
+                    android:background="@drawable/search_background"
+                    android:visibility="visible">
 
                     <FrameLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="30dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="30dp">
+                        android:layout_width="match_parent"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginEnd="30dp">
 
                         <androidx.appcompat.widget.SearchView
-                                android:id="@+id/subtitles_search"
-                                app:iconifiedByDefault="false"
-                                app:queryBackground="@color/transparent"
-                                app:queryHint="@string/search_hint"
+                            android:id="@+id/subtitles_search"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center_vertical"
 
-                                app:searchIcon="@drawable/search_icon"
-                                android:layout_width="match_parent"
+                            android:imeOptions="actionSearch"
+                            android:inputType="text"
 
-                                android:layout_height="match_parent"
-                                android:layout_gravity="center_vertical"
+                            android:paddingStart="-10dp"
+                            app:iconifiedByDefault="false"
 
-                                android:imeOptions="actionSearch"
-                                android:inputType="text"
-                                android:paddingStart="-10dp"
-                                tools:ignore="RtlSymmetry">
+                            app:queryBackground="@color/transparent"
+                            app:queryHint="@string/search_hint"
+                            app:searchIcon="@drawable/search_icon"
+                            tools:ignore="RtlSymmetry">
 
-                            <androidx.core.widget.ContentLoadingProgressBar
-                                    android:id="@+id/search_loading_bar"
-                                    style="@style/Widget.AppCompat.ProgressBar"
-                                    android:layout_width="20dp"
-                                    android:layout_height="20dp"
-                                    android:layout_gravity="center"
-                                    android:layout_marginStart="-70dp"
-                                    android:foregroundTint="@color/white"
-                                    android:visibility="visible"
-                                    tools:visibility="visible"
-                                    android:progressTint="@color/white">
-
-                            </androidx.core.widget.ContentLoadingProgressBar>
                             <!--app:queryHint="@string/search_hint"
                              android:background="@color/grayBackground" @color/itemBackground
                                         app:searchHintIcon="@drawable/search_white"
                                         -->
                         </androidx.appcompat.widget.SearchView>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="end"
+                            android:gravity="end">
+
+                            <androidx.core.widget.ContentLoadingProgressBar
+                                android:id="@+id/search_loading_bar"
+                                style="@style/Widget.AppCompat.ProgressBar"
+                                android:layout_width="20dp"
+                                android:layout_height="20dp"
+                                android:layout_gravity="center"
+                                android:layout_marginEnd="10dp"
+                                android:foregroundTint="@color/white"
+                                android:progressTint="@color/white"
+                                android:visibility="visible"
+                                tools:visibility="visible">
+
+                            </androidx.core.widget.ContentLoadingProgressBar>
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/year_btt"
+                                style="@style/WhiteButton"
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="center_vertical|end"
+                                android:layout_marginEnd="20dp"
+                                android:text="@string/none"
+                                />
+                        </LinearLayout>
                     </FrameLayout>
 
                     <ImageView
-                            android:id="@+id/search_filter"
-                            app:tint="?attr/textColor"
-                            android:layout_width="25dp"
-                            android:layout_height="25dp"
+                        android:id="@+id/search_filter"
+                        android:layout_width="25dp"
+                        android:layout_height="25dp"
+                        android:layout_gravity="end|center_vertical"
 
-                            android:layout_gravity="end|center_vertical"
-                            android:layout_margin="10dp"
-                            android:background="?selectableItemBackgroundBorderless"
-                            android:contentDescription="@string/change_providers_img_des"
-                            android:nextFocusLeft="@id/main_search"
-                            android:nextFocusRight="@id/main_search"
-                            android:nextFocusUp="@id/nav_rail_view"
-                            android:nextFocusDown="@id/search_autofit_results"
-                            android:src="@drawable/ic_baseline_tune_24" />
+                        android:layout_margin="10dp"
+                        android:background="?selectableItemBackgroundBorderless"
+                        android:contentDescription="@string/change_providers_img_des"
+                        android:nextFocusLeft="@id/main_search"
+                        android:nextFocusRight="@id/main_search"
+                        android:nextFocusUp="@id/nav_rail_view"
+                        android:nextFocusDown="@id/search_autofit_results"
+                        android:src="@drawable/ic_baseline_tune_24"
+                        app:tint="?attr/textColor" />
                 </FrameLayout>
 
 
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/LinearLayout02"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_margin="10dp">
-                <EditText
-                    android:id="@+id/subtitles_search_year"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:textSize="18sp"
-                    android:hint="@string/year"
-                    android:gravity="start|center_vertical"
-                    android:textAlignment="gravity"
-                    android:maxLines="1"
-                    android:inputType="numberSigned"
-                    android:imeOptions="actionDone"/>
-            </LinearLayout>
-
             <ListView
-                    android:id="@+id/subtitle_adapter"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                android:id="@+id/subtitle_adapter"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
 
-                    android:layout_rowWeight="1"
-                    android:background="?attr/primaryBlackBackground"
-                    android:nextFocusLeft="@id/sort_providers"
-                    android:nextFocusRight="@id/cancel_btt"
-                    android:requiresFadingEdge="vertical"
-                    tools:listfooter="@layout/sort_bottom_footer_add_choice"
-                    tools:listitem="@layout/sort_bottom_single_choice" />
+                android:layout_rowWeight="1"
+                android:background="?attr/primaryBlackBackground"
+                android:nextFocusLeft="@id/sort_providers"
+                android:nextFocusRight="@id/cancel_btt"
+                android:requiresFadingEdge="vertical"
+                tools:listfooter="@layout/sort_bottom_footer_add_choice"
+                tools:listitem="@layout/sort_bottom_single_choice" />
         </LinearLayout>
     </LinearLayout>
 
     <LinearLayout
-            android:id="@+id/apply_btt_holder"
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_gravity="bottom"
-            android:layout_marginTop="-60dp"
-            android:gravity="bottom|end"
-            android:orientation="horizontal">
+        android:id="@+id/apply_btt_holder"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_gravity="bottom"
+        android:layout_marginTop="-60dp"
+        android:gravity="bottom|end"
+        android:orientation="horizontal">
 
         <com.google.android.material.button.MaterialButton
-                android:id="@+id/apply_btt"
-                style="@style/WhiteButton"
-                android:layout_width="wrap_content"
-                android:layout_gravity="center_vertical|end"
-                android:text="@string/sort_apply" />
+            android:id="@+id/apply_btt"
+            style="@style/WhiteButton"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:text="@string/sort_apply" />
 
         <com.google.android.material.button.MaterialButton
-                android:id="@+id/cancel_btt"
-                style="@style/BlackButton"
-                android:layout_width="wrap_content"
-                android:layout_gravity="center_vertical|end"
-                android:text="@string/sort_cancel" />
+            android:id="@+id/cancel_btt"
+            style="@style/BlackButton"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:text="@string/sort_cancel" />
     </LinearLayout>
 </LinearLayout>
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755

From 49d672718d2a17b3f6ec0eca96b9780a3cb4e172 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Wed, 18 Jan 2023 19:03:50 +0100
Subject: [PATCH 177/273] Fix titles not showing in some cases

---
 app/src/main/res/layout/search_result_grid_expanded.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/search_result_grid_expanded.xml b/app/src/main/res/layout/search_result_grid_expanded.xml
index eb859af5..25b3f67d 100644
--- a/app/src/main/res/layout/search_result_grid_expanded.xml
+++ b/app/src/main/res/layout/search_result_grid_expanded.xml
@@ -14,7 +14,7 @@
     <androidx.cardview.widget.CardView
         android:id="@+id/background_card"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_margin="2dp"
         android:layout_marginBottom="2dp"
         android:elevation="10dp"

From 8e928a8a2b961df101c82eea8d36945aeaf81e53 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Wed, 18 Jan 2023 08:47:41 +0100
Subject: [PATCH 178/273] Translated using Weblate (Spanish)

Currently translated at 100.0% (566 of 566 strings)

Translated using Weblate (Russian)

Currently translated at 49.4% (280 of 566 strings)

Translated using Weblate (Bengali)

Currently translated at 40.8% (231 of 566 strings)

Translated using Weblate (Russian)

Currently translated at 40.4% (229 of 566 strings)

Translated using Weblate (Greek)

Currently translated at 100.0% (566 of 566 strings)

Translated using Weblate (Ukrainian)

Currently translated at 99.8% (565 of 566 strings)

Translated using Weblate (Russian)

Currently translated at 40.2% (228 of 566 strings)

Translated using Weblate (Russian)

Currently translated at 35.5% (201 of 566 strings)

Translated using Weblate (Russian)

Currently translated at 31.0% (176 of 566 strings)

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Kardi Demha <kardi.demha@gmail.com>
Co-authored-by: Skrripy <rozihrash.ya6w7@simplelogin.com>
Co-authored-by: SleepyOwl <artem726artem@gmail.com>
Co-authored-by: Walter H <walter75@gmail.com>
Co-authored-by: eightyy8 <oliver.kha@pm.me>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/el/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translation: Cloudstream/App
---
 app/src/main/res/values-bn/strings.xml |   5 +
 app/src/main/res/values-el/strings.xml |   3 +
 app/src/main/res/values-es/strings.xml |   4 +-
 app/src/main/res/values-ru/strings.xml | 171 +++++++++++++++++++++----
 app/src/main/res/values-uk/strings.xml |  95 ++++++++++++++
 5 files changed, 250 insertions(+), 28 deletions(-)

diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 2e11c3c8..7e0448d6 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -143,4 +143,9 @@
     <string name="category_updates">হালনাগাদ ও ব্যাকআপ</string>
     <string name="updates_settings">অ্যাপ এর হালনাগাদ দেখান</string>
     <string name="swipe_to_seek_settings">খুঁজতে সোয়াইপ করুন</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="double_tap_to_seek_settings">আগাতে ডবল ট্যাপ করুন</string>
+    <string name="eigengraumode_settings">আইজেনগ্রাভি মোড</string>
+    <string name="update_started">আপডেট শুরু হয়েছে</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 67b372ea..707069d1 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -486,4 +486,7 @@
     <string name="action_mark_as_watched">Σημείωσε το ως πλήρως παρακολουθημένο</string>
     <string name="confirm_exit_dialog">Είστε σίγουροι πως θέλετε να βγείτε;</string>
     <string name="redo_setup_process">Επανάληψη διαδικασίας διαμόρφωσης της εφαρμογής</string>
+    <string name="plugin_downloaded">Το πρόσθετο κατέβει</string>
+    <string name="update_started">Ενημέρωση ξεκίνησε</string>
+    <string name="delayed_update_notice">Η εφαρμογή θα ενημερωθεί κατά την έξοδο</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f1426317..18d20be6 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -288,9 +288,9 @@
     <string name="extension_language">Idioma</string>
     <string name="apk_installer_legacy">Legacy (método antiguo)</string>
     <string name="apk_installer_package_installer">Instalador de paquetes</string>
-    <string name="blank_repo_message">CloudStream no tiene sitios instalados de forma predeterminada. Necesita instalalos desde los repositorios.
+    <string name="blank_repo_message">CloudStream no tiene sitios instalados de forma predeterminada. Necesita instalarlos desde repositorios.
 \n
-\nDebido a la eliminación sin sentido de DMCA por parte de Sky UK Limited 🤮, no podemos vincular el sitio del repositorio en la aplicación.
+\nDebido a que dieron de baja el proyecto de manera arbitraria por infracción a la lay de derechos de autor (DMCA) de parte de Sky UK Limited 🤮, no podemos vincular el sitio del repositorio en la aplicación.
 \n
 \nÚnete a nuestro Discord o busca en línea.</string>
     <string name="download_all_plugins_from_repo">Descarga todos los plugins desde este repositorio\?</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index dab140f0..49ed0fb3 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -9,7 +9,7 @@
     <string name="download">Скачать</string>
     <string name="search">Поиск</string>
     <string name="resize_fill">Заполнить</string>
-    <string name="download_failed">Скачать Неудачный</string>
+    <string name="download_failed">Скачать неудачный</string>
     <string name="resize_fit">Подогнать</string>
     <string name="delete">Удалить</string>
     <string name="all">Всё</string>
@@ -22,63 +22,182 @@
     <string name="loading">Загрузка…</string>
     <string name="status">Статус</string>
     <string name="logout">Выйти</string>
-    <string name="next_episode_format" formatted="true">Эпизод %d будет выпущен в</string>
+    <string name="next_episode_format" formatted="true">Серия %d будет выпущен в</string>
     <string name="result_poster_img_des">Плакат</string>
     <string name="search_poster_img_des">\@нить/результат_плокат_картинка_</string>
-    <string name="episode_poster_img_des">Эпизод Плакат</string>
-    <string name="home_main_poster_img_des">Главный Плакат</string>
-    <string name="home_next_random_img_des">Следующий Случайный</string>
-    <string name="go_back_img_des">Возвращаться</string>
-    <string name="home_change_provider_img_des">Смена Провайдер</string>
-    <string name="preview_background_img_des">Предпросмотр Фон</string>
+    <string name="episode_poster_img_des">Серия плакат</string>
+    <string name="home_main_poster_img_des">Главный плакат</string>
+    <string name="home_next_random_img_des">Следующий случайный</string>
+    <string name="go_back_img_des">Вернуться</string>
+    <string name="home_change_provider_img_des">Сменить поставщика</string>
+    <string name="preview_background_img_des">Фон предпросмотр</string>
     <string name="player_speed_text_format" formatted="true">Скорость (%.2fx)</string>
     <string name="rated_format" formatted="true">Оценили: %.1f</string>
     <string name="new_update_format" formatted="true">Новое обновление найдено!
 \n%s -&gt; %s</string>
     <string name="filler" formatted="true">Заполнитель</string>
-    <string name="app_name">ОблакоПоток</string>
+    <string name="app_name">CloudStream</string>
     <string name="action_remove_from_bookmarks">Убирать</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
-    <string name="play_with_app_name">Проиграть с ОблакоПоток</string>
+    <string name="play_with_app_name">Проиграть с CloudStream</string>
     <string name="title_home">Главная</string>
     <string name="title_search">Поиск</string>
     <string name="title_downloads">Загрузки</string>
     <string name="title_settings">Настройки</string>
     <string name="search_hint">Поиск…</string>
     <string name="search_hint_site" formatted="true">Поиск %s…</string>
-    <string name="no_data">Нет Данных</string>
-    <string name="episode_more_options_des">Дополнительные Опции</string>
-    <string name="next_episode">Следующий эпизод</string>
+    <string name="no_data">Нет данных</string>
+    <string name="episode_more_options_des">Дополнительные опции</string>
+    <string name="next_episode">Следующий серия</string>
     <string name="result_tags">Жанры</string>
     <string name="result_share">Делиться</string>
-    <string name="result_open_in_browser">Открывать В Браузер</string>
-    <string name="skip_loading">Скип Загрузка</string>
+    <string name="result_open_in_browser">Открыть в браузер</string>
+    <string name="skip_loading">Скип загрузка</string>
     <string name="type_watching">Смотрю</string>
     <string name="type_on_hold">Приостановленный</string>
     <string name="type_completed">Завершено</string>
     <string name="type_dropped">Брошенный</string>
-    <string name="type_plan_to_watch">План по Смотреть</string>
+    <string name="type_plan_to_watch">План по смотреть</string>
     <string name="type_none">Никто</string>
     <string name="type_re_watching">Пересмотрю</string>
-    <string name="play_movie_button">Проиграть Фильм</string>
-    <string name="play_trailer_button">Проиграть Трейлер</string>
+    <string name="play_movie_button">Проиграть фильм</string>
+    <string name="play_trailer_button">Проиграть трейлер</string>
     <string name="play_livestream_button">Проиграть Livestream</string>
     <string name="pick_source">Источники</string>
     <string name="pick_subtitle">Субтитры</string>
-    <string name="play_episode">Проиграть Эпизод</string>
+    <string name="play_episode">Проиграть серия</string>
     <string name="reload_error">Повторная попытка подключение…</string>
     <string name="go_back">Вернуться</string>
     <string name="downloaded">Скачали</string>
     <string name="downloading">Скачивание</string>
-    <string name="download_paused">Скачать Приостановленный</string>
-    <string name="download_started">Скачать Начатый</string>
-    <string name="download_canceled">Скачать Отменено</string>
-    <string name="download_done">Скачать Выполнено</string>
+    <string name="download_paused">Скачать приостановленный</string>
+    <string name="download_started">Скачать начатый</string>
+    <string name="download_canceled">Скачать отменено</string>
+    <string name="download_done">Скачать выполнено</string>
     <string name="home_info">Инфо</string>
-    <string name="update_started">Обновление Начатый</string>
+    <string name="update_started">Обновление началось</string>
     <string name="home_expanded_hide">Прятать</string>
     <string name="home_play">Проиграть</string>
-    <string name="home_more_info">Подробнее Инфо</string>
-    <string name="filter_bookmarks">Фильтр Закладки</string>
+    <string name="home_more_info">Подробнее инфо</string>
+    <string name="filter_bookmarks">Фильтр закладки</string>
     <string name="error_bookmarks_text">Закладки</string>
+    <string name="sort_apply">Наносить</string>
+    <string name="sort_cancel">Прервать</string>
+    <string name="sort_copy">Копия</string>
+    <string name="sort_close">Закрыть</string>
+    <string name="sort_clear">Очистить</string>
+    <string name="sort_save">Сохранить</string>
+    <string name="player_speed">Скорость проигрыватель</string>
+    <string name="play_episode_toast">Проиграть Серия</string>
+    <string name="next_episode_time_day_format" formatted="true">%dд %dч %dм</string>
+    <string name="duration_format" formatted="true">%d мин</string>
+    <string name="app_dubbed_text">Dub</string>
+    <string name="app_subbed_text">Sub</string>
+    <string name="action_add_to_bookmarks">Установите смотреть состояние</string>
+    <string name="subs_outline_color">Цвет контура</string>
+    <string name="subs_text_color">Цвет текста</string>
+    <string name="subtitles_settings">Настройки субтитров</string>
+    <string name="subs_background_color">Цвет фона</string>
+    <string name="subs_window_color">Цвет окна</string>
+    <string name="subs_edge_type">Тип края</string>
+    <string name="subs_subtitle_elevation">Субтитр подъём</string>
+    <string name="search_provider_text_providers">Поиск с использованием поставщики</string>
+    <string name="search_provider_text_types">Поиск с использованием типов</string>
+    <string name="benene_count_text">%d Бенены данность на разрабы</string>
+    <string name="benene_count_text_none">Бенены не дают</string>
+    <string name="subs_auto_select_language">Автовыбор языка</string>
+    <string name="subs_download_languages">Скачать языки</string>
+    <string name="subs_subtitle_languages">Язык субтитров</string>
+    <string name="subs_hold_to_reset_to_default">Удерживайте чтобы сбросить по умолчанию</string>
+    <string name="error_loading_links_toast">Ошибка загрузки ссылок</string>
+    <string name="stream">Поток</string>
+    <string name="subs_font">Шрифт</string>
+    <string name="subs_font_size">Размер шрифта</string>
+    <string name="popup_delete_file">Удалить файл</string>
+    <string name="popup_play_file">Проиграть файл</string>
+    <string name="download_storage_text">Внутренняя память</string>
+    <string name="popup_resume_download">Скачать резюме</string>
+    <string name="popup_pause_download">Приостановить скачать</string>
+    <string name="pref_disable_acra">Отключить автоматическое информирование об ошибках</string>
+    <string name="subs_import_text" formatted="true">Импортируйте шрифты поместив их в %s</string>
+    <string name="continue_watching">Продолжать смотрю</string>
+    <string name="action_remove_watching">Удалите</string>
+    <string name="action_open_watching">Дополнительная инфо</string>
+    <string name="vpn_might_be_needed">Для корректной работы этого поставщика может потребоваться VPN</string>
+    <string name="vpn_torrent">Этот поставщика - торрент, рекомендуется VPN</string>
+    <string name="provider_info_meta">Метаданные не предоставляются сайтом, загрузка видео будет неудачной, если они не существуют на сайте.</string>
+    <string name="torrent_plot">Описание</string>
+    <string name="normal_no_plot">Сюжет не найден</string>
+    <string name="torrent_no_plot">Описание не найдено</string>
+    <string name="show_log_cat">Показать Logcat 🐈</string>
+    <string name="picture_in_picture">Картинка в картинке</string>
+    <string name="picture_in_picture_des">Продолжение воспроизведения в миниатюрном проигрывателе поверх других приложений</string>
+    <string name="player_size_settings">Кнопка изменения размера проигрывателя</string>
+    <string name="player_size_settings_des">Удалите черные границы</string>
+    <string name="player_subtitles_settings">Субтитры</string>
+    <string name="player_subtitles_settings_des">Настройки субтитров проигрывателя</string>
+    <string name="chromecast_subtitles_settings">Субтитры Chromecast</string>
+    <string name="chromecast_subtitles_settings_des">Настройки субтитров Chromecast</string>
+    <string name="eigengraumode_settings">Режим Eigengravy</string>
+    <string name="eigengraumode_settings_des">Добавляет опцию скорости в проигрывателе</string>
+    <string name="swipe_to_seek_settings">Проведите пальцем для поиска</string>
+    <string name="swipe_to_change_settings">Проведите пальцем для изменения настроек</string>
+    <string name="swipe_to_change_settings_des">Проведите пальцем по левой или правой стороне для изменения яркости или громкости</string>
+    <string name="autoplay_next_settings">Автопроиграть следующего серия</string>
+    <string name="play_torrent_button">Поток торрент</string>
+    <string name="swipe_to_seek_settings_des">Проведите пальцем влево или вправо, чтобы управлять временем в видеоплеере</string>
+    <string name="autoplay_next_settings_des">Начните следующий серию, когда закончится текущий</string>
+    <string name="restore_success">Загружена резервная копия</string>
+    <string name="restore_failed_format" formatted="true">Не удалось восстановить данные из %s</string>
+    <string name="backup_failed">Отсутствует разрешение на хранение. Пожалуйста попробуйте снова.</string>
+    <string name="category_account">Аккаунты</string>
+    <string name="category_updates">Обновления и резервное копирование</string>
+    <string name="settings_info">Информация</string>
+    <string name="advanced_search">Расширенный поиск</string>
+    <string name="show_trailers_settings">Показывать трейлеры</string>
+    <string name="pref_filter_search_quality">Скрыть выбранное качество видео в результатах поиска</string>
+    <string name="automatic_plugin_updates">Автоматическое обновление плагинов</string>
+    <string name="automatic_plugin_download">Автоматическая загрузка плагинов</string>
+    <string name="updates_settings">Показать обновления приложения</string>
+    <string name="updates_settings_des">Автоматически проверять обновления при старте</string>
+    <string name="uprereleases_settings">Обновится до пре-релиза</string>
+    <string name="apk_installer_settings">APK установщик</string>
+    <string name="github">Github</string>
+    <string name="app_language">Язык приложения</string>
+    <string name="no_links_found_toast">Ссылок не найдено</string>
+    <string name="copy_link_toast">Ссылка скопирована в буфер обмена</string>
+    <string name="subs_default_reset_toast">Восстановить к изначальному значению</string>
+    <string name="acra_report_toast">Извините, приложение прекратило работу. Анонимный отчет об ошибке был отправлен разработчикам</string>
+    <string name="episode">Эпизод</string>
+    <string name="episodes">Эпизоды</string>
+    <string name="season_short">С</string>
+    <string name="episode_short">Э</string>
+    <string name="no_episodes_found">Эпизоды не найдены</string>
+    <string name="delete_file">Удалить файл</string>
+    <string name="resume">Возобновить</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="delete_message" formatted="true">Это будет удалено безвозвратно%s
+\nВы уверены\?</string>
+    <string name="resume_time_left" formatted="true">%dм
+\nосталось</string>
+    <string name="status_completed">Завершено</string>
+    <string name="year">Год</string>
+    <string name="rating">Рейтинг</string>
+    <string name="duration">Продолжительность</string>
+    <string name="no_subtitles">Нет субтитров</string>
+    <string name="default_subtitles">По умолчанию</string>
+    <string name="app_storage">Приложение</string>
+    <string name="anime">Аниме</string>
+    <string name="torrent">Торренты</string>
+    <string name="others">Другое</string>
+    <string name="storage_error">Ошибка загрузки, проверьте разрешения хранилища</string>
+    <string name="episode_action_copy_link">Копировать ссылку</string>
+    <string name="episode_action_auto_download">Автоматическая загрузка</string>
+    <string name="episode_action_download_mirror">Загрузка. Зеркало</string>
+    <string name="season">Сезон</string>
+    <string name="anim">Аниме приложение от тех же разработчиков</string>
+    <string name="automatic_plugin_download_summary">Автоматически загружать еще не установленные плагины из добавленных репозиториев.</string>
+    <string name="discord">Присоединится в Discord</string>
+    <string name="free_storage">Бесплатно</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 93138278..3428deac 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -393,4 +393,99 @@
     <string name="trailer">Трейлер</string>
     <string name="extras">Додатково</string>
     <string name="network_adress_example">Посилання на трансляцію</string>
+    <string name="quality_cam">Cam</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
+    <string name="quality_hq">HQ</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_tc">TC</string>
+    <string name="subtitles_remove_bloat">Прибрати здуття субтитрів</string>
+    <string name="referer">Реферер</string>
+    <string name="next">Далі</string>
+    <string name="provider_languages_tip">Дивіться відео на цих мовах</string>
+    <string name="skip_setup">Пропустити налаштування</string>
+    <string name="crash_reporting_title">Звіт про збої</string>
+    <string name="preferred_media_subtext">Що ви хочете побачити</string>
+    <string name="setup_done">Готово</string>
+    <string name="extensions">Розширення</string>
+    <string name="add_repository">Додати репозиторій</string>
+    <string name="repository_name_hint">Назва репозиторію</string>
+    <string name="repository_url_hint">URL-адреса репозиторію</string>
+    <string name="plugin_loaded">Плагін завантажено</string>
+    <string name="plugin_downloaded">Плагін завантажено</string>
+    <string name="plugin_load_fail" formatted="true">Не вдалося завантажити %s</string>
+    <string name="batch_download_start_format" formatted="true">Почалося завантаження %d %s…</string>
+    <string name="batch_download_finish_format" formatted="true">Завантажено %d %s</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Всі %s вже завантажено</string>
+    <string name="batch_download">Пакетне завантаження</string>
+    <string name="plugin_singular">плагін</string>
+    <string name="plugin">плагіни</string>
+    <string name="delete_repository">Видалити репозиторій</string>
+    <string name="setup_extensions_subtext">Завантажте список сайтів, які ви бажаєте використовувати</string>
+    <string name="plugins_downloaded" formatted="true">Завантажено: %d</string>
+    <string name="plugins_disabled" formatted="true">Вимкнено: %d</string>
+    <string name="plugins_not_downloaded" formatted="true">Не завантажено: %d</string>
+    <string name="plugins_updated" formatted="true">Оновлено %d плагіни</string>
+    <string name="blank_repo_message">За замовчуванням в CloudStream не встановлені сайти. Вам потрібно встановити сайти з репозиторіїв.
+\n
+\nЧерез безмозкий DMCA від Sky UK Limited 🤮 ми не можемо прив\'язати сайт репозиторію в додатку.
+\n
+\nПриєднуйтесь до нашого Discord або шукайте в інтернеті.</string>
+    <string name="view_public_repositories_button">Переглянути репозиторії спільноти</string>
+    <string name="view_public_repositories_button_short">Публічний список</string>
+    <string name="uppercase_all_subtitles">Усі субтитри у верхньому регістрі</string>
+    <string name="single_plugin_disabled" formatted="true">%s (Вимкнено)</string>
+    <string name="video_tracks">Відео доріжки</string>
+    <string name="apply_on_restart">Застосувати при перезавантаженні</string>
+    <string name="safe_mode_crash_info">Переглянути інформацію про збій</string>
+    <string name="extension_rating" formatted="true">Рейтинг: %s</string>
+    <string name="extension_description">Опис</string>
+    <string name="extension_version">Версія</string>
+    <string name="extension_status">Статус</string>
+    <string name="extension_size">Розмір</string>
+    <string name="extension_types">Підтримується</string>
+    <string name="extension_language">Мова</string>
+    <string name="extension_install_first">Спочатку встановіть розширення</string>
+    <string name="hls_playlist">Список відтворення HLS</string>
+    <string name="player_settings_play_in_app">Вбудований плеєр</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">Відтворення веб-відео</string>
+    <string name="player_settings_play_in_browser">Веб-браузер</string>
+    <string name="skip_type_ed">Кінець</string>
+    <string name="skip_type_recap">Коротке повторення</string>
+    <string name="skip_type_format" formatted="true">Пропустити %s</string>
+    <string name="skip_type_mixed_ed">Змішаний кінець</string>
+    <string name="skip_type_creddits">Подяки</string>
+    <string name="skip_type_op">Опенінг</string>
+    <string name="skip_type_intro">Вступ</string>
+    <string name="clear_history">Очистити історію</string>
+    <string name="history">Історія</string>
+    <string name="enable_skip_op_from_database_des">Показувати спливаючі вікна для опенінгу/кінця</string>
+    <string name="clipboard_too_large">Забагато тексту. Не вдалося зберегти в буфер обміну.</string>
+    <string name="action_mark_as_watched">Позначити як переглянуте</string>
+    <string name="confirm_exit_dialog">Ви впевнені що хочете вийти\?</string>
+    <string name="yes">Так</string>
+    <string name="no">Ні</string>
+    <string name="update_notification_installing">Установлення оновлення програми…</string>
+    <string name="update_notification_failed">Не вдалося встановити нову версію програми</string>
+    <string name="apk_installer_legacy">Старий</string>
+    <string name="apk_installer_package_installer">Інсталятор пакетів</string>
+    <string name="delayed_update_notice">Програму буде оновлено після виходу</string>
+    <string name="delete_repository_plugins">Це також призведе до видалення всіх плагінів репозиторію</string>
+    <string name="all_languages_preference">Всі мови</string>
+    <string name="previous">Попередня</string>
+    <string name="app_layout_subtext">Змініть вигляд додатку відповідно до вашого пристрою</string>
+    <string name="plugin_deleted">Плагін видалено</string>
+    <string name="is_adult">18+</string>
+    <string name="audio_tracks">Аудіо доріжки</string>
+    <string name="download_all_plugins_from_repo">Завантажити всі плагіни з цього репозиторію\?</string>
+    <string name="player_pref">Бажаний відеоплеєр</string>
+    <string name="safe_mode_title">Увімкнено безпечний режим</string>
+    <string name="extension_authors">Автори</string>
+    <string name="update_notification_downloading">Завантаження оновлення програми…</string>
+    <string name="safe_mode_description">Усі розширення вимкнено через збій, щоб допомогти вам знайти те, що спричиняє проблеми.</string>
+    <string name="app_not_found_error">Програму не знайдено</string>
+    <string name="skip_type_mixed_op">Змішаний опенінг</string>
 </resources>
\ No newline at end of file

From 9fd2e84c7a15564936f0d4266e1bb8f200064250 Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Fri, 20 Jan 2023 06:44:26 +0700
Subject: [PATCH 179/273] fixed Linkbox (#319)

---
 .../lagradost/cloudstream3/extractors/Acefile.kt |  1 -
 .../lagradost/cloudstream3/extractors/Linkbox.kt | 16 +++++++++-------
 .../syncproviders/providers/IndexSubtitleApi.kt  |  7 +++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt
index 18198f44..c782b29d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt
@@ -27,7 +27,6 @@ open class Acefile : ExtractorApi() {
                                 res.substringAfter("\"file\":\"").substringBefore("\","),
                                 "$mainUrl/",
                                 Qualities.Unknown.value,
-                                headers = mapOf("range" to "bytes=0-")
                             )
                         )
                     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt
index 73734e2a..c28a8900 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt
@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -11,12 +12,15 @@ open class Linkbox : ExtractorApi() {
     override val mainUrl = "https://www.linkbox.to"
     override val requiresReferer = true
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val id = url.substringAfter("id=")
-        val sources = mutableListOf<ExtractorLink>()
-
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val id = Regex("""(/file/|id=)(\S+)[&/?]""").find(url)?.groupValues?.get(2)
         app.get("$mainUrl/api/open/get_url?itemId=$id", referer=url).parsedSafe<Responses>()?.data?.rList?.map { link ->
-            sources.add(
+            callback.invoke(
                 ExtractorLink(
                     name,
                     name,
@@ -26,8 +30,6 @@ open class Linkbox : ExtractorApi() {
                 )
             )
         }
-
-        return sources
     }
 
     data class RList(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/IndexSubtitleApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/IndexSubtitleApi.kt
index 2fc97477..668d10bd 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/IndexSubtitleApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/IndexSubtitleApi.kt
@@ -4,7 +4,6 @@ import android.util.Log
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.imdbUrlToIdNullable
-import com.lagradost.cloudstream3.network.CloudflareKiller
 import com.lagradost.cloudstream3.subtitles.AbstractSubApi
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
 import com.lagradost.cloudstream3.utils.SubtitleHelper
@@ -22,7 +21,7 @@ class IndexSubtitleApi : AbstractSubApi {
 
 
     companion object {
-        const val host = "https://subscene.cyou"
+        const val host = "https://indexsubtitle.com"
         const val TAG = "INDEXSUBS"
     }
 
@@ -242,7 +241,7 @@ class IndexSubtitleApi : AbstractSubApi {
                     document.selectFirst("div.my-3.p-3 div.media a")!!.attr("href")
                 )
             } else {
-                document.select("div.my-3.p-3 div.media").mapNotNull { block ->
+                document.select("div.my-3.p-3 div.media").firstNotNullOf { block ->
                     val name =
                         block.selectFirst("strong.d-block")?.text()?.trim().toString()
                     if (seasonNum!! > 0) {
@@ -254,7 +253,7 @@ class IndexSubtitleApi : AbstractSubApi {
                     } else {
                         fixUrl(block.selectFirst("a")!!.attr("href"))
                     }
-                }.first()
+                }
             }
             return link
         }

From 89c5cb8a46499cacf29659f085ae7d51037c64be Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 20 Jan 2023 01:16:05 +0100
Subject: [PATCH 180/273] Added better focus on dialogs on TV & fixed stream
 button on emulator layout

---
 .../com/lagradost/cloudstream3/MainActivity.kt   |  7 +++----
 .../ui/download/DownloadButtonSetup.kt           |  3 ++-
 .../cloudstream3/ui/download/DownloadFragment.kt |  5 ++++-
 .../cloudstream3/ui/home/HomeFragment.kt         |  3 ++-
 .../cloudstream3/ui/search/SearchFragment.kt     |  3 ++-
 .../ui/settings/extensions/ExtensionsFragment.kt |  3 ++-
 .../com/lagradost/cloudstream3/utils/AppUtils.kt | 16 ++++++++++++++--
 .../lagradost/cloudstream3/utils/InAppUpdater.kt |  3 ++-
 8 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index a5f3ff48..4907411f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -79,6 +79,7 @@ import com.lagradost.cloudstream3.utils.AppUtils.loadCache
 import com.lagradost.cloudstream3.utils.AppUtils.loadRepository
 import com.lagradost.cloudstream3.utils.AppUtils.loadResult
 import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
+import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.BackupUtils.setUpBackup
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DataStore.getKey
@@ -511,9 +512,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             setPositiveButton(R.string.yes) { _, _ -> exitProcess(0) }
             setNegativeButton(R.string.no) { _, _ -> }
         }
-        builder.show().also {
-            it.getButton(DialogInterface.BUTTON_NEGATIVE).requestFocus()
-        }
+        builder.show().setDefaultFocus()
     }
 
     private fun backPressed() {
@@ -706,7 +705,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
                 setNegativeButton("Ok") { _, _ -> }
             }
-            builder.show()
+            builder.show().setDefaultFocus()
         }
 
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt
index 0069be3a..add36f1a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt
@@ -11,6 +11,7 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.player.DownloadFileGenerator
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
 import com.lagradost.cloudstream3.utils.AppUtils.getNameFull
+import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE
 import com.lagradost.cloudstream3.utils.ExtractorUri
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
@@ -49,7 +50,7 @@ object DownloadButtonSetup {
                             )
                             .setPositiveButton(R.string.delete, dialogClickListener)
                             .setNegativeButton(R.string.cancel, dialogClickListener)
-                            .show()
+                            .show().setDefaultFocus()
                     } catch (e: Exception) {
                         logError(e)
                         // ye you somehow fucked up formatting did you?
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
index b2286c99..f0340845 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
@@ -40,6 +40,7 @@ import kotlinx.android.synthetic.main.stream_input.*
 import android.text.format.Formatter.formatShortFileSize
 import androidx.core.widget.doOnTextChanged
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import java.net.URI
 
 
@@ -178,7 +179,9 @@ class DownloadFragment : Fragment() {
 
         download_list?.adapter = adapter
         download_list?.layoutManager = GridLayoutManager(context, 1)
-        download_stream_button?.isGone = isTvSettings()
+
+        // Should be visible in emulator layout
+        download_stream_button?.isGone = isTrueTvSettings()
         download_stream_button?.setOnClickListener {
             val dialog =
                 Dialog(it.context ?: return@setOnClickListener, R.style.AlertDialogCustom)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 3e9f6810..bb183f12 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -51,6 +51,7 @@ import com.lagradost.cloudstream3.utils.AppUtils.loadResult
 import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.AppUtils.ownHide
 import com.lagradost.cloudstream3.utils.AppUtils.ownShow
+import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.setKey
@@ -182,7 +183,7 @@ class HomeFragment : Fragment() {
                             )
                             .setPositiveButton(R.string.delete, dialogClickListener)
                             .setNegativeButton(R.string.cancel, dialogClickListener)
-                            .show()
+                            .show().setDefaultFocus()
                     } catch (e: Exception) {
                         logError(e)
                         // ye you somehow fucked up formatting did you?
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 5c101246..1da30691 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -46,6 +46,7 @@ import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.ownShow
+import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.setKey
@@ -395,7 +396,7 @@ class SearchFragment : Fragment() {
                     )
                         .setPositiveButton(R.string.sort_clear, dialogClickListener)
                         .setNegativeButton(R.string.cancel, dialogClickListener)
-                        .show()
+                        .show().setDefaultFocus()
                 } catch (e: Exception) {
                     logError(e)
                     // ye you somehow fucked up formatting did you?
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
index fbf10499..7e60910d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
@@ -26,6 +26,7 @@ import com.lagradost.cloudstream3.ui.result.setText
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.utils.AppUtils.downloadAllPluginsDialog
+import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
@@ -107,7 +108,7 @@ class ExtensionsFragment : Fragment() {
                     )
                     .setPositiveButton(R.string.delete, dialogClickListener)
                     .setNegativeButton(R.string.cancel, dialogClickListener)
-                    .show()
+                    .show().setDefaultFocus()
             }
         })
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
index a3eb7362..d563bffa 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -49,6 +49,7 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStri
 import com.lagradost.cloudstream3.ui.WebviewFragment
 import com.lagradost.cloudstream3.ui.result.ResultFragment
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.ui.settings.extensions.PluginsViewModel.Companion.downloadAll
 import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
@@ -88,7 +89,7 @@ object AppUtils {
         this?.show()
         Handler(Looper.getMainLooper()).postDelayed({
             this?.window?.setWindowAnimations(R.style.Animation_Design_BottomSheetDialog)
-        },200)
+        }, 200)
     }
 
     //fun Context.deleteFavorite(data: SearchResponse) {
@@ -345,7 +346,7 @@ object AppUtils {
 
                 setNegativeButton(R.string.no) { _, _ -> }
             }
-            builder.show()
+            builder.show().setDefaultFocus()
         }
     }
 
@@ -568,6 +569,17 @@ object AppUtils {
         return false
     }
 
+    /**
+     * Sets the focus to the negative button when in TV and Emulator layout.
+     **/
+    fun AlertDialog.setDefaultFocus(buttonFocus: Int = DialogInterface.BUTTON_NEGATIVE) {
+        if (!isTvSettings()) return
+        this.getButton(buttonFocus).run {
+            isFocusableInTouchMode = true
+            requestFocus()
+        }
+    }
+
     // Copied from https://github.com/videolan/vlc-android/blob/master/application/vlc-android/src/org/videolan/vlc/util/FileUtils.kt
     @SuppressLint("Range")
     fun Context.getUri(data: Uri?): Uri? {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
index 3acfb9a1..8b516e8c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -23,6 +23,7 @@ import okio.buffer
 import okio.sink
 import java.io.File
 import android.text.TextUtils
+import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
 import java.io.BufferedReader
 import java.io.IOException
 import java.io.InputStreamReader
@@ -355,7 +356,7 @@ class InAppUpdater {
                                     }
                                 }
                             }
-                            builder.show()
+                            builder.show().setDefaultFocus()
                         } catch (e: Exception) {
                             logError(e)
                         }

From b8248d10530d199225a9dbf057ab3ebdafac550c Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 20 Jan 2023 23:26:46 +0100
Subject: [PATCH 181/273] Added Mark as watched and fixed clicking episode
 synopsis

---
 .../cloudstream3/ui/result/EpisodeAdapter.kt  | 16 +++++--
 .../cloudstream3/ui/result/ResultFragment.kt  | 29 ++++++++++++
 .../ui/result/ResultViewModel2.kt             | 44 +++++++++++++++++--
 .../cloudstream3/utils/DataStoreHelper.kt     | 18 ++++++++
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 100 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
index e5b839a8..0932b001 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
@@ -218,10 +218,18 @@ class EpisodeAdapter(
                 name//if(card.isFiller == true) episodeText.context.getString(R.string.filler).format(name) else name
             episodeText.isSelected = true // is needed for text repeating
 
-            val displayPos = card.getDisplayPosition()
-            episodeProgress?.max = (card.duration / 1000).toInt()
-            episodeProgress?.progress = (displayPos / 1000).toInt()
-            episodeProgress?.isVisible = displayPos > 0L
+            if (card.videoWatchState == VideoWatchState.Watched) {
+                // This cannot be done in getDisplayPosition() as when you have not watched something
+                // the duration and position is 0
+                episodeProgress?.max = 1
+                episodeProgress?.progress = 1
+                episodeProgress?.isVisible = true
+            } else {
+                val displayPos = card.getDisplayPosition()
+                episodeProgress?.max = (card.duration / 1000).toInt()
+                episodeProgress?.progress = (displayPos / 1000).toInt()
+                episodeProgress?.isVisible = displayPos > 0L
+            }
 
             episodePoster?.isVisible = episodePoster?.setImage(card.poster) == true
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 6e7e341f..68a57b7f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -49,6 +49,7 @@ import com.lagradost.cloudstream3.utils.AppUtils.loadCache
 import com.lagradost.cloudstream3.utils.AppUtils.openBrowser
 import com.lagradost.cloudstream3.utils.Coroutines.ioWorkSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getVideoWatchState
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
@@ -106,6 +107,15 @@ import kotlinx.coroutines.runBlocking
 const val START_ACTION_RESUME_LATEST = 1
 const val START_ACTION_LOAD_EP = 2
 
+/**
+ * Future proofed way to mark episodes as watched
+ **/
+enum class VideoWatchState {
+    /** Default value when no key is set */
+    None,
+    Watched
+}
+
 data class ResultEpisode(
     val headerName: String,
     val name: String?,
@@ -124,6 +134,10 @@ data class ResultEpisode(
     val isFiller: Boolean?,
     val tvType: TvType,
     val parentId: Int,
+    /**
+     * Conveys if the episode itself is marked as watched
+     **/
+    val videoWatchState: VideoWatchState
 )
 
 fun ResultEpisode.getRealPosition(): Long {
@@ -160,6 +174,7 @@ fun buildResultEpisode(
     parentId: Int,
 ): ResultEpisode {
     val posDur = getViewPos(id)
+    val videoWatchState = getVideoWatchState(id) ?: VideoWatchState.None
     return ResultEpisode(
         headerName,
         name,
@@ -178,6 +193,7 @@ fun buildResultEpisode(
         isFiller,
         tvType,
         parentId,
+        videoWatchState
     )
 }
 
@@ -559,6 +575,19 @@ open class ResultFragment : ResultTrailerPlayer() {
             )
 
 
+        observe(viewModel.episodeSynopsis) { description ->
+            view.context?.let { ctx ->
+                val builder: AlertDialog.Builder =
+                    AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
+                builder.setMessage(description.html())
+                    .setTitle(R.string.synopsis)
+                    .setOnDismissListener {
+                        viewModel.releaseEpisodeSynopsis()
+                    }
+                    .show()
+            }
+        }
+
         observe(viewModel.watchStatus) { watchType ->
             result_bookmark_button?.text = getString(watchType.stringRes)
             result_bookmark_fab?.text = getString(watchType.stringRes)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 994d4759..4bc7bc48 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -406,6 +406,9 @@ class ResultViewModel2 : ViewModel() {
         MutableLiveData(Some.None)
     val resumeWatching: LiveData<Some<ResumeWatchingStatus>> = _resumeWatching
 
+    private val _episodeSynopsis: MutableLiveData<String?> = MutableLiveData(null)
+    val episodeSynopsis: LiveData<String?> = _episodeSynopsis
+
     companion object {
         const val TAG = "RVM2"
         private const val EPISODE_RANGE_SIZE = 20
@@ -1113,6 +1116,10 @@ class ResultViewModel2 : ViewModel() {
         )
     )
 
+    fun releaseEpisodeSynopsis() {
+        _episodeSynopsis.postValue(null)
+    }
+
     private suspend fun handleEpisodeClickEvent(activity: Activity?, click: EpisodeClickEvent) {
         when (click.action) {
             ACTION_SHOW_OPTIONS -> {
@@ -1146,10 +1153,20 @@ class ResultViewModel2 : ViewModel() {
                         txt(R.string.episode_action_download_mirror) to ACTION_DOWNLOAD_MIRROR,
                         txt(R.string.episode_action_download_subtitle) to ACTION_DOWNLOAD_EPISODE_SUBTITLE_MIRROR,
                         txt(R.string.episode_action_reload_links) to ACTION_RELOAD_EPISODE,
-//                        txt(R.string.action_mark_as_watched) to ACTION_MARK_AS_WATCHED,
                     )
                 )
 
+                // Do not add mark as watched on movies
+                if (!listOf(TvType.Movie, TvType.AnimeMovie).contains(click.data.tvType)) {
+                    val isWatched =
+                        DataStoreHelper.getVideoWatchState(click.data.id) == VideoWatchState.Watched
+
+                    val watchedText = if (isWatched) R.string.action_remove_from_watched
+                    else R.string.action_mark_as_watched
+
+                    options.add(txt(watchedText) to ACTION_MARK_AS_WATCHED)
+                }
+
                 postPopup(
                     txt(
                         activity?.getNameFull(
@@ -1182,6 +1199,10 @@ class ResultViewModel2 : ViewModel() {
                     }
                 }
             }
+            ACTION_SHOW_DESCRIPTION -> {
+                _episodeSynopsis.postValue(click.data.description)
+            }
+
             /* not implemented, not used
             ACTION_DOWNLOAD_EPISODE_SUBTITLE -> {
                 loadLinks(click.data, isVisible =  false, isCasting = false) { links ->
@@ -1378,8 +1399,17 @@ class ResultViewModel2 : ViewModel() {
                 )
             }
             ACTION_MARK_AS_WATCHED -> {
-                // TODO FIX
-//                DataStoreHelper.setViewPos(click.data.id, 1, 1)
+                val isWatched =
+                    DataStoreHelper.getVideoWatchState(click.data.id) == VideoWatchState.Watched
+
+                if (isWatched) {
+                    DataStoreHelper.setVideoWatchState(click.data.id, VideoWatchState.None)
+                } else {
+                    DataStoreHelper.setVideoWatchState(click.data.id, VideoWatchState.Watched)
+                }
+
+                // Kinda dirty to reload all episodes :(
+                reloadEpisodes()
             }
         }
     }
@@ -1529,7 +1559,13 @@ class ResultViewModel2 : ViewModel() {
                 val end = minOf(list.size, start + length)
                 list.subList(start, end).map {
                     val posDur = getViewPos(it.id)
-                    it.copy(position = posDur?.position ?: 0, duration = posDur?.duration ?: 0)
+                    val watchState =
+                        DataStoreHelper.getVideoWatchState(it.id) ?: VideoWatchState.None
+                    it.copy(
+                        position = posDur?.position ?: 0,
+                        duration = posDur?.duration ?: 0,
+                        videoWatchState = watchState
+                    )
                 }
             }
             ?: emptyList()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
index 46c29e3f..9174c481 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
@@ -11,8 +11,10 @@ import com.lagradost.cloudstream3.SearchQuality
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.ui.result.VideoWatchState
 
 const val VIDEO_POS_DUR = "video_pos_dur"
+const val VIDEO_WATCH_STATE = "video_watch_state"
 const val RESULT_WATCH_STATE = "result_watch_state"
 const val RESULT_WATCH_STATE_DATA = "result_watch_state_data"
 const val RESULT_RESUME_WATCHING = "result_resume_watching_2" // changed due to id changes
@@ -193,6 +195,22 @@ object DataStoreHelper {
         return getKey("$currentAccount/$VIDEO_POS_DUR", id.toString(), null)
     }
 
+    fun getVideoWatchState(id: Int?): VideoWatchState? {
+        if (id == null) return null
+        return getKey("$currentAccount/$VIDEO_WATCH_STATE", id.toString(), null)
+    }
+
+    fun setVideoWatchState(id: Int?, watchState: VideoWatchState) {
+        if (id == null) return
+
+        // None == No key
+        if (watchState == VideoWatchState.None) {
+            removeKey("$currentAccount/$VIDEO_WATCH_STATE", id.toString())
+        } else {
+            setKey("$currentAccount/$VIDEO_WATCH_STATE", id.toString(), watchState)
+        }
+    }
+
     fun getDub(id: Int): DubStatus? {
         return DubStatus.values()
             .getOrNull(getKey("$currentAccount/$RESULT_DUB", id.toString(), -1) ?: -1)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e30abea3..6c10d865 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -605,6 +605,7 @@
     <string name="enable_skip_op_from_database_des">Show skip popups for opening/ending</string>
     <string name="clipboard_too_large">Too much text. Unable to save to clipboard.</string>
     <string name="action_mark_as_watched">Mark as watched</string>
+    <string name="action_remove_from_watched">Remove from watched</string>
     <string name="confirm_exit_dialog">Are you sure you want to exit\?</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>

From 3ecaf47c9e28d0908e7729617059f88ff69e5c1c Mon Sep 17 00:00:00 2001
From: Stormunblessed <86633626+Stormunblessed@users.noreply.github.com>
Date: Sat, 21 Jan 2023 03:25:06 -0600
Subject: [PATCH 182/273] fix fastream, tomatomatela, and added okrulink (#320)

---
 .../cloudstream3/extractors/Fastream.kt       | 45 ++++++++-----
 .../cloudstream3/extractors/Okrulink.kt       | 39 +++++++++++
 .../cloudstream3/extractors/Tomatomatela.kt   | 67 +++++++++++++------
 .../cloudstream3/utils/ExtractorApi.kt        |  2 +
 4 files changed, 116 insertions(+), 37 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/extractors/Okrulink.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Fastream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Fastream.kt
index f813d7ea..e8f8c49a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Fastream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Fastream.kt
@@ -5,35 +5,50 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
+import com.lagradost.cloudstream3.utils.getAndUnpack
+import org.jsoup.nodes.Document
 
 open class Fastream: ExtractorApi() {
     override var mainUrl = "https://fastream.to"
     override var name = "Fastream"
     override val requiresReferer = false
-
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val id = Regex("emb\\.html\\?(.*)\\=(enc|)").find(url)?.destructured?.component1() ?: return emptyList()
-        val sources = mutableListOf<ExtractorLink>()
-        val response = app.post("$mainUrl/dl",
-        data = mapOf(
-            Pair("op","embed"),
-            Pair("file_code",id),
-            Pair("auto","1")
-        )).document
+    suspend fun getstream(
+        response: Document,
+        sources: ArrayList<ExtractorLink>): Boolean{
         response.select("script").amap { script ->
-            if (script.data().contains("sources")) {
-                val m3u8regex = Regex("((https:|http:)\\/\\/.*\\.m3u8)")
-                val m3u8 = m3u8regex.find(script.data())?.value ?: return@amap
+            if (script.data().contains(Regex("eval\\(function\\(p,a,c,k,e,[rd]"))) {
+                val unpacked = getAndUnpack(script.data())
+                //val m3u8regex = Regex("((https:|http:)\\/\\/.*\\.m3u8)")
+                val newm3u8link = unpacked.substringAfter("file:\"").substringBefore("\"")
+                //val m3u8link = m3u8regex.find(unpacked)?.value ?: return@forEach
                 generateM3u8(
                     name,
-                    m3u8,
+                    newm3u8link,
                     mainUrl
                 ).forEach { link ->
                     sources.add(link)
                 }
             }
         }
+        return true
+    }
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
+        val sources = ArrayList<ExtractorLink>()
+        val idregex = Regex("emb.html\\?(.*)=")
+        if (url.contains(Regex("(emb.html.*fastream)"))) {
+            val id = idregex.find(url)?.destructured?.component1() ?: ""
+            val response = app.post("https://fastream.to/dl", allowRedirects = false,
+                data = mapOf(
+                    "op" to "embed",
+                    "file_code" to id,
+                    "auto" to "1"
+                )
+            ).document
+            getstream(response, sources)
+        }
+        val response = app.get(url, referer = url).document
+        getstream(response, sources)
         return sources
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Okrulink.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Okrulink.kt
new file mode 100644
index 00000000..37bb09e3
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Okrulink.kt
@@ -0,0 +1,39 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+
+data class Okrulinkdata (
+    @JsonProperty("status" ) var status : String? = null,
+    @JsonProperty("url"    ) var url    : String? = null
+)
+
+open class Okrulink: ExtractorApi() {
+    override var mainUrl = "https://okru.link"
+    override var name = "Okrulink"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
+        val sources = mutableListOf<ExtractorLink>()
+        val key = url.substringAfter("html?t=")
+        val request = app.post("https://apizz.okru.link/decoding", allowRedirects = false,
+            data = mapOf("video" to key)
+        ).parsedSafe<Okrulinkdata>()
+        if (request?.url != null) {
+            sources.add(
+                ExtractorLink(
+                    name,
+                    name,
+                    request.url!!,
+                    "",
+                    Qualities.Unknown.value,
+                    isM3u8 = false
+                )
+            )
+        }
+        return sources
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Tomatomatela.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Tomatomatela.kt
index 20bd69ba..28a2eb20 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Tomatomatela.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Tomatomatela.kt
@@ -1,41 +1,64 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.app
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.module.kotlin.readValue
+import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.mapper
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.Qualities
+
 
 class Cinestart: Tomatomatela() {
-    override var name = "Cinestart"
-    override var mainUrl = "https://cinestart.net"
+    override var name: String = "Cinestart"
+    override val mainUrl: String = "https://cinestart.net"
     override val details = "vr.php?v="
 }
 
+class TomatomatelalClub: Tomatomatela() {
+    override var name: String = "Tomatomatela"
+    override val mainUrl: String = "https://tomatomatela.club"
+}
+
 open class Tomatomatela : ExtractorApi() {
     override var name = "Tomatomatela"
-    override var mainUrl = "https://tomatomatela.com"
+    override val mainUrl = "https://tomatomatela.com"
     override val requiresReferer = false
     private data class Tomato (
         @JsonProperty("status") val status: Int,
-        @JsonProperty("file") val file: String
+        @JsonProperty("file") val file: String?
     )
     open val details = "details.php?v="
+    open val embeddetails = "/embed.html#"
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val link = url.replace("$mainUrl/embed.html#","$mainUrl/$details")
-        val server = app.get(link, allowRedirects = false).text
-        val json = parseJson<Tomato>(server)
-        if (json.status == 200) return listOf(
-            ExtractorLink(
-                name,
-                name,
-                json.file,
-                "",
-                Qualities.Unknown.value,
-                isM3u8 = false
+        val link = url.replace("$mainUrl$embeddetails","$mainUrl/$details")
+        val sources = ArrayList<ExtractorLink>()
+        val server = app.get(link, allowRedirects = false,
+            headers = mapOf(
+                "User-Agent" to USER_AGENT,
+                "Accept" to "application/json, text/javascript, */*; q=0.01",
+                "Accept-Language" to "en-US,en;q=0.5",
+                "X-Requested-With" to "XMLHttpRequest",
+                "DNT" to "1",
+                "Connection" to "keep-alive",
+                "Sec-Fetch-Dest" to "empty",
+                "Sec-Fetch-Mode" to "cors",
+                "Sec-Fetch-Site" to "same-origin"
+
             )
-        )
-        return null
+        ).parsedSafe<Tomato>()
+        if (server?.file != null) {
+            sources.add(
+                ExtractorLink(
+                    name,
+                    name,
+                    server.file,
+                    "",
+                    Qualities.Unknown.value,
+                    isM3u8 = false
+                )
+            )
+        }
+        return sources
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 3978eb62..73603964 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -260,9 +260,11 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     UpstreamExtractor(),
 
     Tomatomatela(),
+    TomatomatelalClub(),
     Cinestart(),
     OkRu(),
     OkRuHttps(),
+    Okrulink(),
 
     // dood extractors
     DoodCxExtractor(),

From c058409f9db78f7f9b69515bad71803240232389 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Sat, 21 Jan 2023 10:28:35 +0100
Subject: [PATCH 183/273] Translated using Weblate (Somali)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 17.9% (102 of 567 strings)

Translated using Weblate (Dutch)

Currently translated at 79.3% (450 of 567 strings)

Translated using Weblate (Ukrainian)

Currently translated at 99.8% (566 of 567 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Portuguese)

Currently translated at 16.6% (94 of 566 strings)

Translated using Weblate (Romanian)

Currently translated at 74.9% (424 of 566 strings)

Added translation using Weblate (Portuguese)

Translated using Weblate (Ukrainian)

Currently translated at 99.8% (565 of 566 strings)

Translated using Weblate (Somali)

Currently translated at 16.0% (91 of 566 strings)

Added translation using Weblate (Somali)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (566 of 566 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (566 of 566 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 93.6% (530 of 566 strings)

Translated using Weblate (German)

Currently translated at 100.0% (566 of 566 strings)

Translated using Weblate (Turkish)

Currently translated at 96.6% (547 of 566 strings)

Translated using Weblate (Dutch)

Currently translated at 79.5% (450 of 566 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (566 of 566 strings)

Translated using Weblate (Russian)

Currently translated at 49.4% (280 of 566 strings)

Translated using Weblate (Bengali)

Currently translated at 40.8% (231 of 566 strings)

Translated using Weblate (Russian)

Currently translated at 40.4% (229 of 566 strings)

Translated using Weblate (Greek)

Currently translated at 100.0% (566 of 566 strings)

Translated using Weblate (Ukrainian)

Currently translated at 99.8% (565 of 566 strings)

Translated using Weblate (Russian)

Currently translated at 40.2% (228 of 566 strings)

Translated using Weblate (Russian)

Currently translated at 35.5% (201 of 566 strings)

Translated using Weblate (Russian)

Currently translated at 31.0% (176 of 566 strings)

Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Ananas <dawidveimer@outlook.com>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Dan <denqwerta@gmail.com>
Co-authored-by: Feroli <feroli@tuta.io>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Inside <mihairobu123@gmail.com>
Co-authored-by: Jonas Kahnwald <elcan.osmanov123@gmail.com>
Co-authored-by: Kardi Demha <kardi.demha@gmail.com>
Co-authored-by: Martijn Slob <info@algebrakit.nl>
Co-authored-by: Michael <zuoyfxieglwgurqgic@tmmcv.net>
Co-authored-by: Shafici Isxariifshe <mega12xhaphiee@gmail.com>
Co-authored-by: Skrripy <rozihrash.ya6w7@simplelogin.com>
Co-authored-by: SleepyOwl <artem726artem@gmail.com>
Co-authored-by: Walter H <walter75@gmail.com>
Co-authored-by: eightyy8 <oliver.kha@pm.me>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/el/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ro/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/so/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translation: Cloudstream/App
---
 app/src/main/res/values-de/strings.xml |  1 +
 app/src/main/res/values-es/strings.xml |  1 +
 app/src/main/res/values-nl/strings.xml |  9 ++++---
 app/src/main/res/values-no/strings.xml |  2 ++
 app/src/main/res/values-pt/strings.xml | 15 +++++++++++
 app/src/main/res/values-ro/strings.xml |  4 +++
 app/src/main/res/values-so/strings.xml | 20 +++++++++++++++
 app/src/main/res/values-tr/strings.xml | 35 ++++++++++++++++++--------
 app/src/main/res/values-uk/strings.xml | 35 +++++++++++++-------------
 9 files changed, 92 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/res/values-pt/strings.xml
 create mode 100644 app/src/main/res/values-so/strings.xml

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9148a7a3..e2717e06 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -487,4 +487,5 @@
     <string name="apk_installer_package_installer">PackageInstaller</string>
     <string name="update_started">Aktualisierung gestartet</string>
     <string name="delayed_update_notice">Die Anwendung wird beim Beenden aktualisiert</string>
+    <string name="plugin_downloaded">Das Plugin wurde heruntergeladen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 18d20be6..d6b48cd7 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -488,4 +488,5 @@
     <string name="delayed_update_notice">La aplicación se actualizará al salir</string>
     <string name="update_started">Actualización iniciada</string>
     <string name="plugin_downloaded">Complemento descargado</string>
+    <string name="action_remove_from_watched">Quitar de visto</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0e69f9fc..60aa0bcf 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -143,8 +143,8 @@
     <string name="backup_settings">Back-up gegevens</string>
     <string name="restore_success">Geladen back-up bestand</string>
     <string name="restore_failed_format" formatted="true">Kan gegevens uit bestand niet herstellen %s</string>
-    <string name="backup_success">Gegevens succesvol opgeslagen</string>
-    <string name="backup_failed">Opslagrechten ontbreken, probeer het opnieuw</string>
+    <string name="backup_success">De gegevens zijn opgeslagen</string>
+    <string name="backup_failed">Opslagrechten ontbreken. Probeer het opnieuw.</string>
     <string name="backup_failed_error_format">Fout bij het maken van een back-up %s</string>
     <string name="search">Zoeken</string>
     <string name="category_account">Accounts</string>
@@ -156,7 +156,7 @@
     <string name="bug_report_settings_on">Verstuurt geen gegevens</string>
     <string name="show_fillers_settings">Toon filler episode voor anime</string>
     <string name="show_trailers_settings">Toon trailers</string>
-    <string name="kitsu_settings">Toon posters van kitsu</string>
+    <string name="kitsu_settings">Toon posters van Kitsu</string>
     <string name="updates_settings">App-updates tonen</string>
     <string name="updates_settings_des">Automatisch zoeken naar nieuwe updates bij het opstarten</string>
     <string name="uprereleases_settings">Update naar pre-releases</string>
@@ -399,4 +399,7 @@
     <string name="action_mark_as_watched">Markeer als bekeken</string>
     <string name="history">Geschiedenis</string>
     <string name="play_trailer_button">Speel Trailer</string>
+    <string name="autoplay_next_settings_des">Start de volgende episode wanneer deze afgelopen is</string>
+    <string name="autoplay_next_settings">Volgende episode automatisch afspelen</string>
+    <string name="update_started">De update is gestart</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index e7ebc98f..f3807952 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -503,4 +503,6 @@
     <string name="apk_installer_settings">APK-installatør</string>
     <string name="apk_installer_settings_des">Noen enheter støtter ikke den nye pakkeinstallatøren. Prøv gammeldags alternativ hvis ting ikke installeres.</string>
     <string name="update_started">Oppdatering startet</string>
+    <string name="plugin_downloaded">Programtillegg nedlastet</string>
+    <string name="delayed_update_notice">Programmet vil oppgraderes når du avslutter det</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
new file mode 100644
index 00000000..e90f37a8
--- /dev/null
+++ b/app/src/main/res/values-pt/strings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="next_episode_format" formatted="true">Episódio %d será lançado em</string>
+    <string name="result_poster_img_des">Poster</string>
+    <string name="episode_poster_img_des">Capa do Episódio</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="home_main_poster_img_des">Capa Principal</string>
+    <string name="home_next_random_img_des">Próximo Aleatório</string>
+    <string name="go_back_img_des">Voltar</string>
+    <string name="home_change_provider_img_des">Trocar Provedor</string>
+    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 9087f8d9..239d144e 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -388,4 +388,8 @@
     <string name="trailer">Trailer</string>
     <string name="history">Istoric</string>
     <string name="action_mark_as_watched">Marcare ca vizionat</string>
+    <string name="autoplay_next_settings">Redă automat următorul episod</string>
+    <string name="app_name">CloudStream</string>
+    <string name="play_trailer_button">Vizionează trailerul</string>
+    <string name="update_started">Actualizarea a început</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
new file mode 100644
index 00000000..3d062df9
--- /dev/null
+++ b/app/src/main/res/values-so/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="cast_format" formatted="true">Metalaya: %s</string>
+    <string name="next_episode_time_day_format" formatted="true">%dm %ds %dd</string>
+    <string name="next_episode_time_hour_format" formatted="true">%ds %dd</string>
+    <string name="next_episode_time_min_format" formatted="true">%dd</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">Xlq</string>
+    <string name="next_episode_format" formatted="true">Xalqadda %d waxa lasoo deyn doonaa</string>
+    <string name="download">Daji</string>
+    <string name="download_failed">Dajintii ma guulaysan</string>
+    <string name="search">Raadi</string>
+    <string name="delete">Tirtir</string>
+    <string name="pause">Qabo</string>
+    <string name="queued">la horay</string>
+    <string name="resize_fit">La ekaysii</string>
+    <string name="resize_fill">Ku buuxi</string>
+    <string name="resize_zoom">Soo dhawee</string>
+    <string name="all">Dhammaan</string>
+    <string name="tracks">Muusik</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 969acd70..2e3bddc6 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -20,11 +20,11 @@
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">@string/result_poster_img_des</string>
-    <string name="episode_poster_img_des">Episode Poster</string>
-    <string name="home_main_poster_img_des">Main Poster</string>
-    <string name="home_next_random_img_des">Next Random</string>
+    <string name="episode_poster_img_des">Bölüm Posteri</string>
+    <string name="home_main_poster_img_des">Ana Poster</string>
+    <string name="home_next_random_img_des">Sonraki Rastgele</string>
     <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
-    <string name="go_back_img_des">Go back</string>
+    <string name="go_back_img_des">Geri git</string>
     <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">Change Provider</string>
     <string name="preview_background_img_des">Preview Background</string>
@@ -386,10 +386,10 @@
     <string name="subtitles_shadow">Gölge</string>
     <string name="subtitles_raised">Yükseltilmiş</string>
     <string name="subtitle_offset">Alt yazı senkronu</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Alt yazı gecikmesi</string>
-    <string name="subtitle_offset_extra_hint_later_format">Alt yazılar %dms erken gözüküyorsa bunu kullanın</string>
-    <string name="subtitle_offset_extra_hint_before_format">Alt yazılar %dms geç gözüküyorsa bunu kullanın</string>
+    <string name="subtitle_offset_extra_hint_later_format">Alt yazılar %d ms erken gözüküyorsa bunu kullanın</string>
+    <string name="subtitle_offset_extra_hint_before_format">Alt yazılar %d ms geç gözüküyorsa bunu kullanın</string>
     <string name="subtitle_offset_extra_hint_none_format">Alt yazı gecikmesi yok</string>
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
@@ -480,8 +480,8 @@
     <string name="audio_tracks">Ses parçaları</string>
     <string name="video_tracks">Video parçaları</string>
     <string name="apply_on_restart">Yeniden başlatmada uygula</string>
-    <string name="safe_mode_title">Güvenli mod etkin</string>
-    <string name="safe_mode_description">Kurtarılamaz bir çökme meydana geldi ve soruna neden olan eklentiyi bulup kaldırabilmeniz için tüm eklentileri otomatik olarak devre dışı bıraktık.</string>
+    <string name="safe_mode_title">Güvenli mod açık</string>
+    <string name="safe_mode_description">Çöküşe neden olan eklentiyi bulmaya yardımcı olabilmek için tüm eklentiler kapatıldı.</string>
     <string name="safe_mode_crash_info">Çökme bilgisini göster</string>
     <string name="extension_rating" formatted="true">Puan: %s</string>
     <string name="extension_description">Açıklama</string>
@@ -498,7 +498,7 @@
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="player_settings_play_in_mpv">MPV</string>
     <string name="player_settings_play_in_web">Web Video Yayını</string>
-    <string name="player_settings_play_in_browser">Tarayıcı</string>
+    <string name="player_settings_play_in_browser">İnternet tarayıcısı</string>
     <string name="app_not_found_error">Uygulama bulunamadı</string>
     <string name="history">Geçmiş</string>
     <string name="action_mark_as_watched">İzlendi olarak imle</string>
@@ -521,4 +521,19 @@
     <string name="pref_category_cache">Önbellek</string>
     <string name="pref_category_looks">Görünüm</string>
     <string name="pref_category_ui_features">Özellikler</string>
+    <string name="delayed_update_notice">Uygulama çıkışta güncellenecektir</string>
+    <string name="skip_type_ed">Bitiş</string>
+    <string name="skip_type_op">Açılış</string>
+    <string name="no">Hayır</string>
+    <string name="skip_type_recap">Özet</string>
+    <string name="confirm_exit_dialog">Çıkmak istediğine emin misin\?</string>
+    <string name="yes">Evet</string>
+    <string name="update_notification_downloading">Uygulama güncellemesi indiriliyor…</string>
+    <string name="update_notification_failed">Uygulamanın yeni sürümü yüklenemedi.</string>
+    <string name="clear_history">Geçmişi temizle</string>
+    <string name="apk_installer_package_installer">Paket yükleyici</string>
+    <string name="apk_installer_legacy">Eski</string>
+    <string name="pref_category_gestures">Hareketler</string>
+    <string name="all_languages_preference">Tüm diller</string>
+    <string name="skip_type_format" formatted="true">Geç %s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 3428deac..d139144e 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -22,7 +22,7 @@
     <string name="title_search">Пошук</string>
     <string name="title_downloads">Завантаження</string>
     <string name="duration_format" formatted="true">%d хв</string>
-    <string name="title_settings">Налаштування</string>
+    <string name="title_settings">Параметри</string>
     <string name="search_hint">Пошук…</string>
     <string name="search_hint_site" formatted="true">Пошук %s…</string>
     <string name="no_data">Дані відсутні</string>
@@ -44,8 +44,8 @@
     <string name="downloaded">Завантажено</string>
     <string name="downloading">Завантаження</string>
     <string name="download_done">Завантаження завершено</string>
-    <string name="app_dubbed_text">Дубляж</string>
-    <string name="app_subbed_text">Субтитри</string>
+    <string name="app_dubbed_text">Дуб.</string>
+    <string name="app_subbed_text">Суб.</string>
     <string name="popup_delete_file">Видалити файл</string>
     <string name="popup_resume_download">Відновити завантаження</string>
     <string name="pref_disable_acra">Вимкнути відправку повідомлень про помилки</string>
@@ -61,7 +61,7 @@
     <string name="sort_save">Зберегти</string>
     <string name="player_speed">Швидкість програвача</string>
     <string name="subs_window_color">Колір вікна</string>
-    <string name="subs_edge_type">Тип краю</string>
+    <string name="subs_edge_type">Тип контуру</string>
     <string name="subs_font">Шрифт</string>
     <string name="subs_font_size">Розмір шрифту</string>
     <string name="search_provider_text_providers">Пошук за допомогою постачальників</string>
@@ -159,8 +159,8 @@
     <string name="uprereleases_settings_des">Пошук лише попередніх оновлень, а не повних релізів</string>
     <string name="apk_installer_settings">Встановлювач APK</string>
     <string name="github">Github</string>
-    <string name="lightnovel">Легкий додаток для новел від тих же розробників</string>
-    <string name="anim">Додаток для аніме від тих же розробників</string>
+    <string name="lightnovel">Застосунок для легких новел від тих же розробників</string>
+    <string name="anim">Застосунок для аніме від тих же розробників</string>
     <string name="benene">Дайте бананів розробникам</string>
     <string name="app_language">Мова програми</string>
     <string name="no_chromecast_support_toast">Цей постачальник не має підтримки Chromecast</string>
@@ -187,8 +187,8 @@
     <string name="queued">у черзі</string>
     <string name="no_subtitles">Без субтитрів</string>
     <string name="default_subtitles">За замовчуванням</string>
-    <string name="free_storage">Вільне</string>
-    <string name="used_storage">Використовується</string>
+    <string name="free_storage">Вільно</string>
+    <string name="used_storage">Зайнято</string>
     <string name="app_storage">Програма</string>
     <string name="tv_series">Телесеріали</string>
     <string name="cartoons">Мультфільми</string>
@@ -197,9 +197,9 @@
     <string name="asian_drama">Азіатські драми</string>
     <string name="livestreams">Прямі трансляції</string>
     <string name="others">Інше</string>
-    <string name="tv_series_singular">Серія</string>
+    <string name="tv_series_singular">Серіал</string>
     <string name="cartoons_singular">Мультфільм</string>
-    <string name="anime_singular">\@string/anime</string>
+    <string name="anime_singular">Аніме</string>
     <string name="documentaries_singular">Документальний фільм</string>
     <string name="asian_drama_singular">Азіатська драма</string>
     <string name="live_singular">Пряма трансляція</string>
@@ -238,7 +238,7 @@
     <string name="benene_des">Дано бананів</string>
     <string name="year">Рік</string>
     <string name="go_forward_30">+30</string>
-    <string name="acra_report_toast">Вибачте, у додатку стався збій. Анонімне повідомлення про помилку буде відправлено розробникам</string>
+    <string name="acra_report_toast">Вибачте, у застосунку стався збій. Анонімне повідомлення про помилку буде відправлено розробникам</string>
     <string name="season_format">%s %d%s</string>
     <string name="episode">Епізод</string>
     <string name="episodes_range">%d-%d</string>
@@ -353,7 +353,7 @@
     <string name="video_disk_description">Спричиняє збої, якщо встановлено занадто високе значення на пристроях із малим об\'ємом вільної пам\'яті, наприклад Android TV.</string>
     <string name="dns_pref">DNS через HTTPS</string>
     <string name="download_path_pref">Шлях завантаження</string>
-    <string name="add_site_summary">Додати клон існуючого сайту, з іншою URL-адресою</string>
+    <string name="add_site_summary">Додайте клон існуючого сайту, з іншою URL-адресою</string>
     <string name="display_subbed_dubbed_settings">Відображати Дубляж/Субтитри аніме</string>
     <string name="legal_notice">Застереження</string>
     <string name="pref_category_extensions">Розширення</string>
@@ -374,7 +374,7 @@
     <string name="sync_score">Оцінений</string>
     <string name="player_load_subtitles">Завантажити з файлу</string>
     <string name="max">Макс.</string>
-    <string name="subtitles_example_text">Гей, хлопці, не вспію - на ґанку ваша файна їжа знищується бурундучком</string>
+    <string name="subtitles_example_text">Щастям б\'єш жук їх глицю в фон й ґедзь пріч</string>
     <string name="subtitle_offset_hint">1000 мс</string>
     <string name="subtitle_offset_extra_hint_later_format">Використовуйте цей параметр, якщо субтитри з\'являються на %d мс занадто рано</string>
     <string name="subtitle_offset_extra_hint_before_format">Використовуйте це, якщо субтитри з\'являються із запізненням на %d мс</string>
@@ -400,7 +400,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="subtitles_remove_bloat">Прибрати здуття субтитрів</string>
+    <string name="subtitles_remove_bloat">Видалити роздуття субтитрів</string>
     <string name="referer">Реферер</string>
     <string name="next">Далі</string>
     <string name="provider_languages_tip">Дивіться відео на цих мовах</string>
@@ -429,7 +429,7 @@
     <string name="plugins_updated" formatted="true">Оновлено %d плагіни</string>
     <string name="blank_repo_message">За замовчуванням в CloudStream не встановлені сайти. Вам потрібно встановити сайти з репозиторіїв.
 \n
-\nЧерез безмозкий DMCA від Sky UK Limited 🤮 ми не можемо прив\'язати сайт репозиторію в додатку.
+\nЧерез безмозкий DMCA від Sky UK Limited 🤮 ми не можемо прив\'язати сайт репозиторію в застосунку.
 \n
 \nПриєднуйтесь до нашого Discord або шукайте в інтернеті.</string>
     <string name="view_public_repositories_button">Переглянути репозиторії спільноти</string>
@@ -475,8 +475,8 @@
     <string name="delayed_update_notice">Програму буде оновлено після виходу</string>
     <string name="delete_repository_plugins">Це також призведе до видалення всіх плагінів репозиторію</string>
     <string name="all_languages_preference">Всі мови</string>
-    <string name="previous">Попередня</string>
-    <string name="app_layout_subtext">Змініть вигляд додатку відповідно до вашого пристрою</string>
+    <string name="previous">Назад</string>
+    <string name="app_layout_subtext">Змініть вигляд застосунку відповідно до вашого пристрою</string>
     <string name="plugin_deleted">Плагін видалено</string>
     <string name="is_adult">18+</string>
     <string name="audio_tracks">Аудіо доріжки</string>
@@ -488,4 +488,5 @@
     <string name="safe_mode_description">Усі розширення вимкнено через збій, щоб допомогти вам знайти те, що спричиняє проблеми.</string>
     <string name="app_not_found_error">Програму не знайдено</string>
     <string name="skip_type_mixed_op">Змішаний опенінг</string>
+    <string name="action_remove_from_watched">Видалити з переглянутого</string>
 </resources>
\ No newline at end of file

From 1994edb96cff7f03e09561796c0da7a2b954959b Mon Sep 17 00:00:00 2001
From: "recloudstream[bot]"
 <111277985+recloudstream[bot]@users.noreply.github.com>
Date: Sat, 21 Jan 2023 09:29:07 +0000
Subject: [PATCH 184/273] update list of locales

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 54c5bdb5..1dcaf350 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -85,6 +85,7 @@ val appLanguages = arrayListOf(
     Triple("\uD83C\uDDF5\uD83C\uDDF9", "Portuguese", "pt"),
     Triple("", "Romanian", "ro"),
     Triple("", "Russian", "ru"),
+    Triple("", "Somali", "so"),
     Triple("", "Swedish", "sv"),
     Triple("", "Tamil", "ta"),
     Triple("", "Tagalog", "tl"),

From 9f18cbbc20e0d6fe59d333939f7dd7932bcac555 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Sat, 21 Jan 2023 13:03:33 +0100
Subject: [PATCH 185/273] Translated using Weblate (Portuguese)

Currently translated at 81.3% (461 of 567 strings)

Translated using Weblate (German)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (French)

Currently translated at 100.0% (567 of 567 strings)

Co-authored-by: Anarchydr <patrikpik879@gmail.com>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Julian <hello@apollo.moe>
Co-authored-by: tachyglossues <tachyglossues@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pt/
Translation: Cloudstream/App
---
 app/src/main/res/values-de/strings.xml |   1 +
 app/src/main/res/values-fr/strings.xml |   1 +
 app/src/main/res/values-hr/strings.xml |   1 +
 app/src/main/res/values-pt/strings.xml | 369 +++++++++++++++++++++++++
 4 files changed, 372 insertions(+)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e2717e06..33afd571 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -488,4 +488,5 @@
     <string name="update_started">Aktualisierung gestartet</string>
     <string name="delayed_update_notice">Die Anwendung wird beim Beenden aktualisiert</string>
     <string name="plugin_downloaded">Das Plugin wurde heruntergeladen</string>
+    <string name="action_remove_from_watched">Von geschaut entfernen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 218d7a3a..5402eabf 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -490,4 +490,5 @@
     <string name="update_started">Mise à jour commencée</string>
     <string name="delayed_update_notice">L\'application sera mise à jour dès la fin de la session</string>
     <string name="plugin_downloaded">Plugin Téléchargé</string>
+    <string name="action_remove_from_watched">Retirer de la vue</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index accb625d..2bbfaee6 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -529,4 +529,5 @@
     <string name="update_started">Aktualiziranje započeto</string>
     <string name="delayed_update_notice">Program če se aktualizirati tijekom zatvaranja programa</string>
     <string name="plugin_downloaded">Dodatak preuzet</string>
+    <string name="action_remove_from_watched">Ukloni iz pogledanog</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index e90f37a8..9353664e 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -12,4 +12,373 @@
     <string name="go_back_img_des">Voltar</string>
     <string name="home_change_provider_img_des">Trocar Provedor</string>
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="home_source">Fonte</string>
+    <string name="resolution">Resolução</string>
+    <string name="extras">Extras</string>
+    <string name="preview_background_img_des">Preview Background</string>
+    <string name="player_speed_text_format" formatted="true">Velocidade (%.2fx)</string>
+    <string name="rated_format" formatted="true">Classificado: %.1f</string>
+    <string name="new_update_format" formatted="true">Nova atualização encontrada!
+\n%s -&gt; %s</string>
+    <string name="filler" formatted="true">Enchimento</string>
+    <string name="app_name">CloudStream</string>
+    <string name="play_with_app_name">Reproduzir com CloudStream</string>
+    <string name="title_home">Início</string>
+    <string name="title_search">Pesquisa</string>
+    <string name="title_downloads">Transferências</string>
+    <string name="title_settings">Opções</string>
+    <string name="search_hint">Procurar…</string>
+    <string name="search_hint_site" formatted="true">Procurar em %s…</string>
+    <string name="no_data">Sem Dados</string>
+    <string name="episode_more_options_des">Mais Opções</string>
+    <string name="next_episode">Próximo episódio</string>
+    <string name="result_tags">Géneros</string>
+    <string name="result_share">Partilhar</string>
+    <string name="result_open_in_browser">Abrir no Navegador</string>
+    <string name="skip_loading">Saltar Carga</string>
+    <string name="loading">Carregando…</string>
+    <string name="type_watching">Assistindo</string>
+    <string name="type_on_hold">Em Espera</string>
+    <string name="type_completed">Concluído</string>
+    <string name="type_dropped">Abandonado</string>
+    <string name="type_plan_to_watch">Planeio Assistir</string>
+    <string name="type_none">Nenhuma</string>
+    <string name="type_re_watching">Assistindo de Novo</string>
+    <string name="play_movie_button">Reproduzir Filme</string>
+    <string name="play_livestream_button">Reproduzir Livestream</string>
+    <string name="play_torrent_button">Transmitir Torrent</string>
+    <string name="pick_source">Fontes</string>
+    <string name="pick_subtitle">Legendas</string>
+    <string name="reload_error">Voltar a tentar ligação…</string>
+    <string name="go_back">Voltar Atrás</string>
+    <string name="play_episode">Reproduzir Episódio</string>
+    <string name="download">Transferir</string>
+    <string name="downloaded">Transferido</string>
+    <string name="downloading">A Transferir</string>
+    <string name="download_paused">Transferência em Pausa</string>
+    <string name="download_started">Transferência Iniciada</string>
+    <string name="download_failed">Transferência Falhou</string>
+    <string name="download_canceled">Transferência Cancelada</string>
+    <string name="download_done">Transferência Completa</string>
+    <string name="stream">Stream</string>
+    <string name="error_loading_links_toast">Erro a Carregar Links</string>
+    <string name="download_storage_text">Armazenamento Interno</string>
+    <string name="app_dubbed_text">Dob</string>
+    <string name="app_subbed_text">Leg</string>
+    <string name="popup_delete_file">Eliminar Ficheiro</string>
+    <string name="popup_play_file">Reproduzir Ficheiro</string>
+    <string name="popup_resume_download">Retomar Transferência</string>
+    <string name="popup_pause_download">Pausar Transferência</string>
+    <string name="pref_disable_acra">Desativar relatório automático de erros</string>
+    <string name="home_more_info">Mais info</string>
+    <string name="home_expanded_hide">Esconder</string>
+    <string name="home_play">Reproduzir</string>
+    <string name="home_info">Info</string>
+    <string name="filter_bookmarks">Filtrar Marcadores</string>
+    <string name="error_bookmarks_text">Marcadores</string>
+    <string name="action_remove_from_bookmarks">Remover</string>
+    <string name="sort_apply">Aplicar</string>
+    <string name="sort_cancel">Cancelar</string>
+    <string name="sort_copy">Copiar</string>
+    <string name="sort_close">Fechar</string>
+    <string name="sort_clear">Limpar</string>
+    <string name="sort_save">Guardar</string>
+    <string name="player_speed">Velocidade de Reprodução</string>
+    <string name="subtitles_settings">Configurações de Legendas</string>
+    <string name="subs_text_color">Cor do Texto</string>
+    <string name="subs_outline_color">Cor do Delineado</string>
+    <string name="subs_background_color">Cor do Fundo</string>
+    <string name="subs_window_color">Cor da Janela</string>
+    <string name="subs_edge_type">Tipo de Borda</string>
+    <string name="subs_subtitle_elevation">Elevação da Legenda</string>
+    <string name="subs_font">Fonte</string>
+    <string name="subs_font_size">Tamanho da Fonte</string>
+    <string name="search_provider_text_providers">Procurar usando fornecedores</string>
+    <string name="search_provider_text_types">Procurar usando tipos</string>
+    <string name="benene_count_text">%d Benenes dadas aos devs</string>
+    <string name="benene_count_text_none">Nenhum Benene dada</string>
+    <string name="subs_auto_select_language">Auto-seleção de Idioma</string>
+    <string name="subs_download_languages">Transferir Idiomas</string>
+    <string name="subs_subtitle_languages">Idioma da Legenda</string>
+    <string name="subs_hold_to_reset_to_default">Segure para retornar para o padrão</string>
+    <string name="subs_import_text" formatted="true">Importar fontes colocando em %s</string>
+    <string name="continue_watching">Continuar a Assistir</string>
+    <string name="action_remove_watching">Remover</string>
+    <string name="action_open_watching">Mais info</string>
+    <string name="vpn_might_be_needed">Uma VPN pode ser necessária para que este fornecedor funcione corretamente</string>
+    <string name="vpn_torrent">Este fornecedor é um torrent, uma VPN é recomendada</string>
+    <string name="provider_info_meta">Metadados não são oferecidos pelo site, o carregamento do vídeo irá falhar se ele não existir no site.</string>
+    <string name="torrent_plot">Descrição</string>
+    <string name="normal_no_plot">Nenhum Enredo Encontrado</string>
+    <string name="torrent_no_plot">Nenhuma Descrição Encontrada</string>
+    <string name="show_log_cat">Mostrar logcat 🐈</string>
+    <string name="picture_in_picture">Picture-in-picture</string>
+    <string name="picture_in_picture_des">Continua a reprodução num player em miniatura em cima de outras apps</string>
+    <string name="player_size_settings">Botão de redimensionamento do player</string>
+    <string name="player_size_settings_des">Remover as bordas negras</string>
+    <string name="player_subtitles_settings">Legendas</string>
+    <string name="player_subtitles_settings_des">Configurações de legendas do player</string>
+    <string name="chromecast_subtitles_settings">Legendas do Chromecast</string>
+    <string name="chromecast_subtitles_settings_des">Configurações de legendas do Chromecast</string>
+    <string name="eigengraumode_settings">Modo Eigengravy</string>
+    <string name="eigengraumode_settings_des">Acrescenta uma opção de velocidade no player</string>
+    <string name="swipe_to_seek_settings">Deslize para andar</string>
+    <string name="swipe_to_seek_settings_des">Deslize para a esq. ou dir. para controlar o tempo no player</string>
+    <string name="swipe_to_change_settings">Deslize para mudar as configurações</string>
+    <string name="swipe_to_change_settings_des">Deslize do lado esq. ou dir. para ajustar brilho ou volume</string>
+    <string name="autoplay_next_settings">Reproduzir automaticamente próximo episódio</string>
+    <string name="autoplay_next_settings_des">Começa o próximo episódio quando o atual termina</string>
+    <string name="double_tap_to_seek_settings">Toque duplo para avançar</string>
+    <string name="double_tap_to_pause_settings">Toque duplo para pôr em pausa</string>
+    <string name="double_tap_to_seek_amount_settings">Segundos avançados no player</string>
+    <string name="double_tap_to_seek_settings_des">Toque duplo no lado esq. ou dir. para andar para trás ou para a frente</string>
+    <string name="double_tap_to_pause_settings_des">Toque no meio para pôr em pausa</string>
+    <string name="use_system_brightness_settings">Usar brilho da sistema</string>
+    <string name="use_system_brightness_settings_des">Usar brilho do sistema no player em vez de uma sobreposição escura</string>
+    <string name="episode_sync_settings">Atualizar progresso</string>
+    <string name="episode_sync_settings_des">Sincronizar automaticamente o progresso do seu episódio atual</string>
+    <string name="restore_settings">Restaurar dados a partir de backup</string>
+    <string name="backup_settings">Fazer backup</string>
+    <string name="restore_success">Arquivo de backup carregado</string>
+    <string name="restore_failed_format" formatted="true">Falha ao restaurar dados do ficheiro %s</string>
+    <string name="backup_success">Dados guardados com sucesso</string>
+    <string name="backup_failed">Permissões de armazenamento em falta, por favor tente de novo</string>
+    <string name="backup_failed_error_format">Erro no backup de %s</string>
+    <string name="search">Procurar</string>
+    <string name="category_account">Contas</string>
+    <string name="category_updates">Atualizações e backup</string>
+    <string name="settings_info">Info</string>
+    <string name="advanced_search">Procura Avançada</string>
+    <string name="advanced_search_des">Mostra resultados separados por fornecedor</string>
+    <string name="bug_report_settings_off">Só envia dados sobre falhas</string>
+    <string name="bug_report_settings_on">Não envia nenhum dado</string>
+    <string name="show_fillers_settings">Mostrar episódios de enchimento para anime</string>
+    <string name="show_trailers_settings">Mostrar trailers</string>
+    <string name="kitsu_settings">Mostrar posters do kitsu</string>
+    <string name="pref_filter_search_quality">Esconder qualidades de vídeo selecionadas nos resultados da Pesquisa</string>
+    <string name="automatic_plugin_updates">Atualizações de plugin automáticas</string>
+    <string name="updates_settings">Mostrar atualizações da app</string>
+    <string name="updates_settings_des">Procurar novas atualizações automaticamente ao iniciar</string>
+    <string name="uprereleases_settings">Atualizar para pré-lançamentos</string>
+    <string name="uprereleases_settings_des">Procura atualizações de pré-lançamento em vez de só lançamentos oficiais</string>
+    <string name="github">Github</string>
+    <string name="lightnovel">App light novel pelos mesmos devs</string>
+    <string name="discord">Junte-se ao Discord</string>
+    <string name="benene">Dar um benene aos devs</string>
+    <string name="benene_des">Benene dada</string>
+    <string name="app_language">Idioma da App</string>
+    <string name="no_chromecast_support_toast">Este fornecedor não tem suporte para Chromecast</string>
+    <string name="no_links_found_toast">Nenhum Link Encontrado</string>
+    <string name="copy_link_toast">Link copiado para a área de transferência</string>
+    <string name="play_episode_toast">Reproduzir episódio</string>
+    <string name="subs_default_reset_toast">Restaurar para o padrão</string>
+    <string name="acra_report_toast">Desculpe, a aplicação falhou. Um relatório de erro anónimo será enviado para os desenvolvedores</string>
+    <string name="season">Temporada</string>
+    <string name="no_season">Nenhuma Temporada</string>
+    <string name="episode">Episódio</string>
+    <string name="episodes">Episódios</string>
+    <string name="season_short">T</string>
+    <string name="episode_short">E</string>
+    <string name="no_episodes_found">Nenhum Episódio encontrado</string>
+    <string name="delete_file">Eliminar Ficheiro</string>
+    <string name="delete">Eliminar</string>
+    <string name="pause">Pôr em Pausa</string>
+    <string name="resume">Retomar</string>
+    <string name="delete_message" formatted="true">Isto apagará %s permanentemente
+\nTem a certeza\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nem falta</string>
+    <string name="status_ongoing">Em Curso</string>
+    <string name="status_completed">Concluído</string>
+    <string name="status">Estado</string>
+    <string name="year">Ano</string>
+    <string name="rating">Classificação</string>
+    <string name="duration">Duração</string>
+    <string name="site">Site</string>
+    <string name="synopsis">Sinopse</string>
+    <string name="queued">Na fila</string>
+    <string name="no_subtitles">Sem Legendas</string>
+    <string name="default_subtitles">Padrão</string>
+    <string name="free_storage">Livre</string>
+    <string name="used_storage">Usado</string>
+    <string name="app_storage">App</string>
+    <string name="movies">Filmes</string>
+    <string name="tv_series">Séries</string>
+    <string name="cartoons">Desenhos Animados</string>
+    <string name="anime">Anime</string>
+    <string name="torrent">Torrents</string>
+    <string name="documentaries">Documentários</string>
+    <string name="ova">OVA</string>
+    <string name="asian_drama">Dramas Asiáticos</string>
+    <string name="livestreams">Transmissões em Direto</string>
+    <string name="nsfw">NSFW</string>
+    <string name="others">Outros</string>
+    <string name="movies_singular">Filme</string>
+    <string name="tv_series_singular">Série</string>
+    <string name="cartoons_singular">Desenho Animado</string>
+    <string name="torrent_singular">Torrent</string>
+    <string name="documentaries_singular">Documentário</string>
+    <string name="asian_drama_singular">Drama Asiático</string>
+    <string name="live_singular">Transmissão em Direto</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="source_error">Erro de fonte</string>
+    <string name="remote_error">Erro remoto</string>
+    <string name="render_error">Erro de renderização</string>
+    <string name="unexpected_error">Erro inesperado do player</string>
+    <string name="storage_error">Erro de transferência, verifique permissões de armazenamento</string>
+    <string name="episode_action_chromecast_episode">Episódio pelo Chromecast</string>
+    <string name="episode_action_chromecast_mirror">Alternativa pelo Chromecast</string>
+    <string name="episode_action_play_in_app">Reproduzir na app</string>
+    <string name="episode_action_play_in_format">Reproduzir no %s</string>
+    <string name="episode_action_play_in_browser">Reproduzir no navegador</string>
+    <string name="episode_action_copy_link">Copiar link</string>
+    <string name="episode_action_auto_download">Transferência Automática</string>
+    <string name="episode_action_download_mirror">Transferir por servidor alternativo</string>
+    <string name="episode_action_reload_links">Recarregar links</string>
+    <string name="episode_action_download_subtitle">Transferir legendas</string>
+    <string name="show_hd">Etiqueta de qualidade</string>
+    <string name="show_dub">Etiqueta Dub</string>
+    <string name="show_sub">Etiqueta Sub</string>
+    <string name="show_title">Título</string>
+    <string name="poster_ui_settings">Alternar elementos da interface no póster</string>
+    <string name="no_update_found">Nenhuma Atualização Encontrada</string>
+    <string name="check_for_update">Procurar Atualização</string>
+    <string name="video_lock">Fixar</string>
+    <string name="video_aspect_ratio_resize">Mudar Tamanho</string>
+    <string name="video_source">Fonte</string>
+    <string name="video_skip_op">Saltar OP</string>
+    <string name="dont_show_again">Não mostrar de novo</string>
+    <string name="skip_update">Saltar esta Atualização</string>
+    <string name="update">Atualizar</string>
+    <string name="watch_quality_pref">Qualidade Preferida</string>
+    <string name="limit_title">Máximo de caracteres do título de vídeos</string>
+    <string name="limit_title_rez">Resolução do player de vídeo</string>
+    <string name="video_buffer_size_settings">Tamanho do buffer do vídeo</string>
+    <string name="video_buffer_length_settings">Comprimento do buffer do vídeo</string>
+    <string name="video_buffer_disk_settings">Cache do vídeo em disco</string>
+    <string name="video_buffer_clear_settings">Limpar cache de vídeo e imagem</string>
+    <string name="video_ram_description">Causará travamentos aleatórios se definido muito alto. Não mude se tiver pouca memória RAM, como um Android TV ou um telefone antigo</string>
+    <string name="video_disk_description">Pode causar problemas em sistemas com pouco espaço de armazenamento se definido muito alto, como em dispositivos Android TV</string>
+    <string name="dns_pref">DNS sobre HTTPS</string>
+    <string name="dns_pref_summary">Útil para contornar bloqueios do fornecedor de internet</string>
+    <string name="add_site_pref">Clonar site</string>
+    <string name="remove_site_pref">Remover site</string>
+    <string name="add_site_summary">Adiciona um clone de um site existente, com um url diferente</string>
+    <string name="download_path_pref">Caminho de transferência</string>
+    <string name="nginx_url_pref">Url do servidor Nginx</string>
+    <string name="display_subbed_dubbed_settings">Mostrar Anime Dobrado/Legendado</string>
+    <string name="resize_fit">Ajustar para a Tela</string>
+    <string name="resize_fill">Esticar</string>
+    <string name="resize_zoom">Aumentar</string>
+    <string name="legal_notice">Aviso Legal</string>
+    <string name="category_general">Geral</string>
+    <string name="random_button_settings">Botão Aleatório</string>
+    <string name="random_button_settings_desc">Mostra o botão Aleatório na página inicial</string>
+    <string name="provider_lang_settings">Idioma dos fornecedores</string>
+    <string name="app_layout">Layout da App</string>
+    <string name="preferred_media_settings">Mídia preferida</string>
+    <string name="enable_nsfw_on_providers">Ativar NSFW em fornecedores compatíveis</string>
+    <string name="subtitles_encoding">Codificação das legendas</string>
+    <string name="category_providers">Fornecedores</string>
+    <string name="category_ui">Layout</string>
+    <string name="automatic">Auto</string>
+    <string name="tv_layout">Layout de TV</string>
+    <string name="phone_layout">Layout de telemóvel</string>
+    <string name="emulator_layout">Layout de emulador</string>
+    <string name="primary_color_settings">Cor Primária</string>
+    <string name="app_theme_settings">Tema do App</string>
+    <string name="bottom_title_settings">Local do título do poster</string>
+    <string name="bottom_title_settings_des">Coloca o título debaixo do poster</string>
+    <string name="example_password">senha123</string>
+    <string name="example_username">MeuNomeFixe</string>
+    <string name="example_email">ola@mundo.com</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="example_site_name">MeuSiteFixe</string>
+    <string name="example_site_url">examplo.com</string>
+    <string name="example_lang_name">Codigo da Língua (pt)</string>
+    <string name="account">Conta</string>
+    <string name="logout">Sair</string>
+    <string name="login">Entrar</string>
+    <string name="switch_account">Mudar de conta</string>
+    <string name="add_account">Adicionar conta</string>
+    <string name="create_account">Criar conta</string>
+    <string name="add_sync">Adicionar sincronização</string>
+    <string name="added_sync_format" formatted="true">%s adicionado</string>
+    <string name="upload_sync">Sincronizar</string>
+    <string name="sync_score">Nota</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="authenticated_user" formatted="true">%s autenticado</string>
+    <string name="authenticated_user_fail" formatted="true">Falha em autenticar para %s</string>
+    <string name="none">Nenhuma</string>
+    <string name="normal">Normal</string>
+    <string name="all">Tudo</string>
+    <string name="max">Max</string>
+    <string name="min">Min</string>
+    <string name="subtitles_outline">Contornado</string>
+    <string name="subtitles_depressed">Deprimido</string>
+    <string name="subtitles_shadow">Sombreado</string>
+    <string name="subtitles_raised">Em Relevo</string>
+    <string name="subtitle_offset">Sincronizar legendas</string>
+    <string name="subtitle_offset_title">Atraso de legenda</string>
+    <string name="subtitle_offset_extra_hint_later_format">Use isto se as legendas forem mostradas %dms adiantadas</string>
+    <string name="subtitle_offset_extra_hint_before_format">Use isto se as legendas forem mostradas %dms atrasadas</string>
+    <string name="subtitle_offset_extra_hint_none_format">Sem atraso de legenda</string>
+    <string name="subtitles_example_text">Luís argüia à Júlia que «brações, fé, chá, óxido, pôr, zângão» eram palavras do português</string>
+    <string name="recommended">Recomendada</string>
+    <string name="player_loaded_subtitles" formatted="true">%s carregada</string>
+    <string name="player_load_subtitles">Carregar de arquivo</string>
+    <string name="player_load_subtitles_online">Carregar da Internet</string>
+    <string name="downloaded_file">Arquivo baixado</string>
+    <string name="actor_main">Protagonista</string>
+    <string name="actor_supporting">Coadjuvante</string>
+    <string name="actor_background">Figurante</string>
+    <string name="home_random">Aleatório</string>
+    <string name="coming_soon">Em breve…</string>
+    <string name="poster_image">Imagem de Poster</string>
+    <string name="category_player">Player</string>
+    <string name="resolution_and_title">Resolução e título</string>
+    <string name="title">Título</string>
+    <string name="error_invalid_id">Id inválida</string>
+    <string name="error_invalid_data">Dado inválido</string>
+    <string name="error_invalid_url">URL inválido</string>
+    <string name="error">Erro</string>
+    <string name="subtitles_remove_captions">Remover legendas ocultas(CC) das legendas</string>
+    <string name="subtitles_remove_bloat">Remover bloat das legendas</string>
+    <string name="subtitles_filter_lang">Filtrar por linguagem preferida</string>
+    <string name="trailer">Trailer</string>
+    <string name="next">Próximo</string>
+    <string name="provider_languages_tip">Ver vídeos nestas linguagens</string>
+    <string name="previous">Anterior</string>
+    <string name="skip_setup">Saltar setup</string>
+    <string name="app_layout_subtext">Change the look of the app to suit your device</string>
+    <string name="crash_reporting_title">Crash reporting</string>
+    <string name="preferred_media_subtext">What do you want to see</string>
+    <string name="setup_done">Feito</string>
+    <string name="extensions">Extensões</string>
+    <string name="add_repository">Adicionar repositório</string>
+    <string name="repository_name_hint">Nome do repositório</string>
+    <string name="repository_url_hint">URL do repositório</string>
+    <string name="plugin_loaded">Plugin Carregado</string>
+    <string name="plugin_deleted">Plugin Apagado</string>
+    <string name="plugin_load_fail" formatted="true">Falha ao carregar %s</string>
+    <string name="batch_download_start_format" formatted="true">Iniciada a transferência %d %s</string>
+    <string name="batch_download_finish_format" formatted="true">Transferido %d %s com sucesso</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Tudo %s já transferido</string>
+    <string name="batch_download">Transferência em batch</string>
+    <string name="plugin_singular">plugin</string>
+    <string name="plugin">plugins</string>
+    <string name="delete_repository_plugins">Isto irá apagar todos os repositórios de plugins</string>
+    <string name="delete_repository">Apagar repositório</string>
+    <string name="setup_extensions_subtext">Transferir lista de sites a usar</string>
+    <string name="plugins_downloaded" formatted="true">Transferido: %d</string>
+    <string name="plugins_disabled" formatted="true">Desativado: %d</string>
+    <string name="plugins_not_downloaded" formatted="true">Não transferido: %d</string>
+    <string name="blank_repo_message">Adicionar um repositório para instalar extensões de sites</string>
+    <string name="view_public_repositories_button">Ver repositórios da comunidade</string>
+    <string name="view_public_repositories_button_short">Lista pública</string>
+    <string name="uppercase_all_subtitles">Todas as legendas em maiúsculas</string>
+    <string name="download_all_plugins_from_repo">Transferir todos os plugins deste repositório\?</string>
+    <string name="single_plugin_disabled" formatted="true">%s (Desativado)</string>
 </resources>
\ No newline at end of file

From c7e2a19f5d195fcb069a3fceceb17393c30d1de9 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sat, 21 Jan 2023 13:04:53 +0100
Subject: [PATCH 186/273] fix build error

---
 app/src/main/res/values-pt/strings-pt.xml | 478 ----------------------
 1 file changed, 478 deletions(-)
 delete mode 100644 app/src/main/res/values-pt/strings-pt.xml

diff --git a/app/src/main/res/values-pt/strings-pt.xml b/app/src/main/res/values-pt/strings-pt.xml
deleted file mode 100644
index 375c3193..00000000
--- a/app/src/main/res/values-pt/strings-pt.xml
+++ /dev/null
@@ -1,478 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-<!--Created by The Translator <https://play.google.com/store/apps/details?id=com.sunilpaulmathew.translator>-->
-
-	<!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
-    <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
-    <string name="episode_poster_img_des">Episode Poster</string>
-    <string name="home_main_poster_img_des">Main Poster</string>
-    <string name="home_next_random_img_des">Next Random</string>
-    <string name="go_back_img_des">Go back</string>
-    <string name="home_change_provider_img_des">Change Provider</string>
-    <string name="preview_background_img_des">Preview Background</string>
-	
-	 <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
-    <string name="player_speed_text_format" formatted="true">Velocidade (%.2fx)</string>
-    <string name="rated_format" formatted="true">Classificado: %.1f</string>
-    <string name="new_update_format" formatted="true">Nova atualização encontrada!\n%s -> %s</string>
-    <string name="filler" formatted="true">Enchimento</string>
-	
-    <string name="app_name">CloudStream</string>
-	<string name="play_with_app_name">Reproduzir com CloudStream</string>
-    <string name="title_home">Início</string>
-    <string name="title_search">Pesquisa</string>
-    <string name="title_downloads">Transferências</string>
-    <string name="title_settings">Opções</string>
-	
-    <string name="search_hint">Procurar…</string>
-	<string name="search_hint_site" formatted="true">Procurar em %s…</string>
-	
-    <string name="no_data">Sem Dados</string>
-    <string name="episode_more_options_des">Mais Opções</string>
-    <string name="next_episode">Próximo episódio</string>
-    <string name="result_tags">Géneros</string>
-    <string name="result_share">Partilhar</string>
-    <string name="result_open_in_browser">Abrir no Navegador</string>
-    <string name="skip_loading">Saltar Carga</string>
-    <string name="loading">Carregando…</string>
-	
-    <string name="type_watching">Assistindo</string>
-    <string name="type_on_hold">Em Espera</string>
-    <string name="type_completed">Concluído</string>
-    <string name="type_dropped">Abandonado</string>
-    <string name="type_plan_to_watch">Planeio Assistir</string>
-	<string name="type_none">Nenhuma</string>
-	<string name="type_re_watching">Assistindo de Novo</string>
-	
-    <string name="play_movie_button">Reproduzir Filme</string>
-	<string name="play_livestream_button">Reproduzir Livestream</string>
-    <string name="play_torrent_button">Transmitir Torrent</string>
-    <string name="pick_source">Fontes</string>
-    <string name="pick_subtitle">Legendas</string>
-    <string name="reload_error">Voltar a tentar ligação…</string>
-    <string name="go_back">Voltar Atrás</string>
-    <string name="play_episode">Reproduzir Episódio</string>
-	
-    <string name="download">Transferir</string>
-    <string name="downloaded">Transferido</string>
-    <string name="downloading">A Transferir</string>
-    <string name="download_paused">Transferência em Pausa</string>
-    <string name="download_started">Transferência Iniciada</string>
-    <string name="download_failed">Transferência Falhou</string>
-    <string name="download_canceled">Transferência Cancelada</string>
-    <string name="download_done">Transferência Completa</string>
-	<string name="stream">Stream</string>
-	
-    <string name="error_loading_links_toast">Erro a Carregar Links</string>
-    <string name="download_storage_text">Armazenamento Interno</string>
-	
-    <string name="app_dubbed_text">Dob</string>
-    <string name="app_subbed_text">Leg</string>
-	
-    <string name="popup_delete_file">Eliminar Ficheiro</string>
-    <string name="popup_play_file">Reproduzir Ficheiro</string>
-    <string name="popup_resume_download">Retomar Transferência</string>
-    <string name="popup_pause_download">Pausar Transferência</string>
-	
-    <string name="pref_disable_acra">Desativar relatório automático de erros</string>
-    <string name="home_more_info">Mais info</string>
-    <string name="home_expanded_hide">Esconder</string>
-    <string name="home_play">Reproduzir</string>
-    <string name="home_info">Info</string>
-    <string name="filter_bookmarks">Filtrar Marcadores</string>
-    <string name="error_bookmarks_text">Marcadores</string>
-    <string name="action_remove_from_bookmarks">Remover</string>
-    <string name="sort_apply">Aplicar</string>
-    <string name="sort_cancel">Cancelar</string>
-	<string name="sort_copy">Copiar</string>
-    <string name="sort_close">Fechar</string>
-    <string name="sort_clear">Limpar</string>
-    <string name="sort_save">Guardar</string>
-	
-    <string name="player_speed">Velocidade de Reprodução</string>
-	
-    <string name="subtitles_settings">Configurações de Legendas</string>
-    <string name="subs_text_color">Cor do Texto</string>
-    <string name="subs_outline_color">Cor do Delineado</string>
-    <string name="subs_background_color">Cor do Fundo</string>
-    <string name="subs_window_color">Cor da Janela</string>
-    <string name="subs_edge_type">Tipo de Borda</string>
-    <string name="subs_subtitle_elevation">Elevação da Legenda</string>
-    <string name="subs_font">Fonte</string>
-    <string name="subs_font_size">Tamanho da Fonte</string>
-	
-    <string name="search_provider_text_providers">Procurar usando fornecedores</string>
-    <string name="search_provider_text_types">Procurar usando tipos</string>
-	
-    <string name="benene_count_text">%d Benenes dadas aos devs</string>
-    <string name="benene_count_text_none">Nenhum Benene dada</string>
-	
-    <string name="subs_auto_select_language">Auto-seleção de Idioma</string>
-    <string name="subs_download_languages">Transferir Idiomas</string>
-	<string name="subs_subtitle_languages">Idioma da Legenda</string>
-    <string name="subs_hold_to_reset_to_default">Segure para retornar para o padrão</string>
-	<string name="subs_import_text" formatted="true">Importar fontes colocando em %s</string>
-    <string name="continue_watching">Continuar a Assistir</string>
-	
-    <string name="action_remove_watching">Remover</string>
-    <string name="action_open_watching">Mais info</string>
-	
-    <string name="vpn_might_be_needed">Uma VPN pode ser necessária para que este fornecedor funcione corretamente</string>
-    <string name="vpn_torrent">Este fornecedor é um torrent, uma VPN é recomendada</string>
-    
-	<string name="provider_info_meta">Metadados não são oferecidos pelo site, o carregamento do vídeo irá falhar se ele não existir no site.</string>
-	
-	<string name="torrent_plot">Descrição</string>
-    <string name="normal_no_plot">Nenhum Enredo Encontrado</string>
-    <string name="torrent_no_plot">Nenhuma Descrição Encontrada</string>
-	
-	<string name="show_log_cat">Mostrar logcat 🐈</string>
-	
-    <string name="picture_in_picture">Picture-in-picture</string>
-    <string name="picture_in_picture_des">Continua a reprodução num player em miniatura em cima de outras apps</string>
-    <string name="player_size_settings">Botão de redimensionamento do player</string>
-    <string name="player_size_settings_des">Remover as bordas negras</string>
-    <string name="player_subtitles_settings">Legendas</string>
-    <string name="player_subtitles_settings_des">Configurações de legendas do player</string>
-	<string name="chromecast_subtitles_settings">Legendas do Chromecast</string>
-    <string name="chromecast_subtitles_settings_des">Configurações de legendas do Chromecast</string>
-	
-    <string name="eigengraumode_settings">Modo Eigengravy</string>
-    <string name="eigengraumode_settings_des">Acrescenta uma opção de velocidade no player</string>
-    <string name="swipe_to_seek_settings">Deslize para andar</string>
-    <string name="swipe_to_seek_settings_des">Deslize para a esq. ou dir. para controlar o tempo no player</string>
-    <string name="swipe_to_change_settings">Deslize para mudar as configurações</string>
-    <string name="swipe_to_change_settings_des">Deslize do lado esq. ou dir. para ajustar brilho ou volume</string>
-
-<string name="autoplay_next_settings">Reproduzir automaticamente próximo episódio</string>
-    <string name="autoplay_next_settings_des">Começa o próximo episódio quando o atual termina</string>
-
-    <string name="double_tap_to_seek_settings">Toque duplo para avançar</string>
-	<string name="double_tap_to_pause_settings">Toque duplo para pôr em pausa</string>
-	<string name="double_tap_to_seek_amount_settings">Segundos avançados no player</string>
-    <string name="double_tap_to_seek_settings_des">Toque duplo no lado esq. ou dir. para andar para trás ou para a frente</string>
-    <string name="double_tap_to_pause_settings_des">Toque no meio para pôr em pausa</string>
-    <string name="use_system_brightness_settings">Usar brilho da sistema</string>
-    <string name="use_system_brightness_settings_des">Usar brilho do sistema no player em vez de uma sobreposição escura</string>
-	
-	<string name="episode_sync_settings">Atualizar progresso</string>
-    <string name="episode_sync_settings_des">Sincronizar automaticamente o progresso do seu episódio atual</string>
-
-    <string name="restore_settings">Restaurar dados a partir de backup</string>
-
-    <string name="backup_settings">Fazer backup</string>
-    <string name="restore_success">Arquivo de backup carregado</string>
-    <string name="restore_failed_format" formatted="true">Falha ao restaurar dados do ficheiro %s</string>
-    <string name="backup_success">Dados guardados com sucesso</string>
-    <string name="backup_failed">Permissões de armazenamento em falta, por favor tente de novo</string>
-    <string name="backup_failed_error_format">Erro no backup de %s</string>
-	
-    <string name="search">Procurar</string>
-		<string name="category_account">Contas</string>
-    <string name="category_updates">Atualizações e backup</string>
-	
-    <string name="settings_info">Info</string>
-    <string name="advanced_search">Procura Avançada</string>
-    <string name="advanced_search_des">Mostra resultados separados por fornecedor</string>
-    <string name="bug_report_settings_off">Só envia dados sobre falhas</string>
-    <string name="bug_report_settings_on">Não envia nenhum dado</string>
-    <string name="show_fillers_settings">Mostrar episódios de enchimento para anime</string>
-	<string name="show_trailers_settings">Mostrar trailers</string>
-    <string name="kitsu_settings">Mostrar posters do kitsu</string>
-	
-	<string name="pref_filter_search_quality">Esconder qualidades de vídeo selecionadas nos resultados da Pesquisa</string>
-	<string name="automatic_plugin_updates">Atualizações de plugin automáticas</string>
-	
-    <string name="updates_settings">Mostrar atualizações da app</string>
-    <string name="updates_settings_des">Procurar novas atualizações automaticamente ao iniciar</string>
-    <string name="uprereleases_settings">Atualizar para pré-lançamentos</string>
-    <string name="uprereleases_settings_des">Procura atualizações de pré-lançamento em vez de só lançamentos oficiais</string>
-    <string name="github">Github</string>
-    <string name="lightnovel">App light novel pelos mesmos devs</string>
-    <string name="discord">Junte-se ao Discord</string>
-    <string name="benene">Dar um benene aos devs</string>
-    <string name="benene_des">Benene dada</string>
-	
-    <string name="app_language">Idioma da App</string>
-	
-    <string name="no_chromecast_support_toast">Este fornecedor não tem suporte para Chromecast</string>
-    <string name="no_links_found_toast">Nenhum Link Encontrado</string>
-    <string name="copy_link_toast">Link copiado para a área de transferência</string>
-    <string name="play_episode_toast">Reproduzir episódio</string>
-    <string name="subs_default_reset_toast">Restaurar para o padrão</string>
-	<string name="acra_report_toast">Desculpe, a aplicação falhou. Um relatório de erro anónimo será enviado para os
-       desenvolvedores
-    </string>
-	
-    <string name="season">Temporada</string>
-    <string name="no_season">Nenhuma Temporada</string>
-    <string name="episode">Episódio</string>
-    <string name="episodes">Episódios</string>
-    <string name="season_short">T</string>
-    <string name="episode_short">E</string>
-    <string name="no_episodes_found">Nenhum Episódio encontrado</string>
-	
-    <string name="delete_file">Eliminar Ficheiro</string>
-    <string name="delete">Eliminar</string>
-    <string name="pause">Pôr em Pausa</string>
-    <string name="resume">Retomar</string>
-    <string name="delete_message">Isto apagará %s permanentemente\nTem a certeza?</string>
-	<string name="resume_time_left" formatted="true">%dm\nem falta</string>
-	
-    <string name="status_ongoing">Em Curso</string>
-    <string name="status_completed">Concluído</string>
-    <string name="status">Estado</string>
-    <string name="year">Ano</string>
-    <string name="rating">Classificação</string>
-    <string name="duration">Duração</string>
-    <string name="site">Site</string>
-    <string name="synopsis">Sinopse</string>
-	
-    <string name="queued">Na fila</string>
-    <string name="no_subtitles">Sem Legendas</string>
-    <string name="default_subtitles">Padrão</string>
-	
-    <string name="free_storage">Livre</string>
-    <string name="used_storage">Usado</string>
-    <string name="app_storage">App</string>
-	
-	<!--plural-->
-    <string name="movies">Filmes</string>
-    <string name="tv_series">Séries</string>
-    <string name="cartoons">Desenhos Animados</string>
-    <string name="anime">Anime</string>
-    <string name="torrent">Torrents</string>
-	<string name="documentaries">Documentários</string>
-	<string name="ova">OVA</string>
-    <string name="asian_drama">Dramas Asiáticos</string>
-    <string name="livestreams">Transmissões em Direto</string>
-    <string name="nsfw">NSFW</string>
-    <string name="others">Outros</string>
-	
-	<!--singular-->
-	<string name="movies_singular">Filme</string>
-	<string name="tv_series_singular">Série</string>
-	<string name="cartoons_singular">Desenho Animado</string>
-	<string name="torrent_singular">Torrent</string>
-	<string name="documentaries_singular">Documentário</string>
-	<string name="asian_drama_singular">Drama Asiático</string>
-	<string name="live_singular">Transmissão em Direto</string>
-    <string name="nsfw_singular">NSFW</string>
-	
-    <string name="source_error">Erro de fonte</string>
-    <string name="remote_error">Erro remoto</string>
-    <string name="render_error">Erro de renderização</string>
-    <string name="unexpected_error">Erro inesperado do player</string>
-    <string name="storage_error">Erro de transferência, verifique permissões de armazenamento</string>
-	
-    <string name="episode_action_chromecast_episode">Episódio pelo Chromecast</string>
-    <string name="episode_action_chromecast_mirror">Alternativa pelo Chromecast</string>
-    <string name="episode_action_play_in_app">Reproduzir na app</string>
-    <string name="episode_action_play_in_format">Reproduzir no %s</string>
-    <string name="episode_action_play_in_browser">Reproduzir no navegador</string>
-    <string name="episode_action_copy_link">Copiar link</string>
-    <string name="episode_action_auto_download">Transferência Automática</string>
-    <string name="episode_action_download_mirror">Transferir por servidor alternativo</string>
-    <string name="episode_action_reload_links">Recarregar links</string>
-	<string name="episode_action_download_subtitle">Transferir legendas</string>
-	
-	<string name="show_hd">Etiqueta de qualidade</string>
-    <string name="show_dub">Etiqueta Dub</string>
-    <string name="show_sub">Etiqueta Sub</string>
-    <string name="show_title">Título</string>
-    <string name="poster_ui_settings">Alternar elementos da interface no póster</string>
-	
-    <string name="no_update_found">Nenhuma Atualização Encontrada</string>
-    <string name="check_for_update">Procurar Atualização</string>
-	
-    <string name="video_lock">Fixar</string>
-    <string name="video_aspect_ratio_resize">Mudar Tamanho</string>
-    <string name="video_source">Fonte</string>
-    <string name="video_skip_op">Saltar OP</string>
-	
-    <string name="dont_show_again">Não mostrar de novo</string>
-	<string name="skip_update">Saltar esta Atualização</string>
-    <string name="update">Atualizar</string>
-    <string name="watch_quality_pref">Qualidade Preferida</string>
-	<string name="limit_title">Máximo de caracteres do título de vídeos</string>
-    <string name="limit_title_rez">Resolução do player de vídeo</string>
-	
-	<string name="video_buffer_size_settings">Tamanho do buffer do vídeo</string>
-    <string name="video_buffer_length_settings">Comprimento do buffer do vídeo</string>
-    <string name="video_buffer_disk_settings">Cache do vídeo em disco</string>
-    <string name="video_buffer_clear_settings">Limpar cache de vídeo e imagem</string>
-	
-    <string name="video_ram_description">Causará travamentos aleatórios se definido muito alto. Não mude se tiver pouca memória RAM, como um Android TV ou um telefone antigo</string>
-    <string name="video_disk_description">Pode causar problemas em sistemas com pouco espaço de armazenamento se definido muito alto, como em dispositivos Android TV</string>
-
-    <string name="dns_pref">DNS sobre HTTPS</string>
-    <string name="dns_pref_summary">Útil para contornar bloqueios do fornecedor de internet</string>
-	
-	<string name="add_site_pref">Clonar site</string>
-    <string name="remove_site_pref">Remover site</string>
-    <string name="add_site_summary">Adiciona um clone de um site existente, com um url diferente</string>
-
-	<string name="download_path_pref">Caminho de transferência</string>	
-	
-    <string name="nginx_url_pref">Url do servidor Nginx</string>
-
-    <string name="display_subbed_dubbed_settings">Mostrar Anime Dobrado/Legendado</string>
-	
-    <string name="resize_fit">Ajustar para a Tela</string>
-    <string name="resize_fill">Esticar</string>
-    <string name="resize_zoom">Aumentar</string>
-	
-	<string name="legal_notice">Aviso Legal</string>
-    <string name="legal_notice_text" translatable="false">Quaisquer questões legais relativas ao conteúdo desta aplicação
-       devem ser levados em conta com os próprios anfitriões e fornecedores de arquivos, pois não somos afiliados a eles.
-
-       Em caso de violação de direitos autorais, favor contatar diretamente as partes responsáveis ou os sites de streaming.
-
-       O aplicativo é puramente para uso educacional e pessoal.
-
-       O CloudStream 3 não hospeda nenhum conteúdo no aplicativo, e não tem controle sobre qual mídia é colocada ou retirada.
-       O CloudStream 3 funciona como qualquer outro mecanismo de busca, como o Google. O CloudStream 3 não hospeda, não faz upload ou
-       gerenciar qualquer vídeo, filme ou conteúdo. Ele simplesmente rasteja, agrega e exibe links em um conveniente,
-       interface amigável para o usuário.
-
-       Ela apenas raspa sites de terceiros que podem ser acessados publicamente através de qualquer navegador web normal. É o
-       responsabilidade do usuário de evitar qualquer ação que possa violar as leis que regem sua localidade. Utilizar
-       CloudStream 3 por sua própria conta e risco.
-    </string>
-	<string name="category_general">Geral</string>
-	<string name="random_button_settings">Botão Aleatório</string>
-    <string name="random_button_settings_desc">Mostra o botão Aleatório na página inicial</string>
-    <string name="provider_lang_settings">Idioma dos fornecedores</string>
-    <string name="app_layout">Layout da App</string>
-    <string name="preferred_media_settings">Mídia preferida</string>
-<string name="enable_nsfw_on_providers">Ativar NSFW em fornecedores compatíveis</string>
-<string name="category_providers">Fornecedores</string>
-	<string name="subtitles_encoding">Codificação das legendas</string>
-    <string name="category_ui">Layout</string>
-
-    <string name="automatic">Auto</string>
-    <string name="tv_layout">Layout de TV</string>
-    <string name="phone_layout">Layout de telemóvel</string>
-	<string name="emulator_layout">Layout de emulador</string>
-
-    <string name="primary_color_settings">Cor Primária</string>
-    <string name="app_theme_settings">Tema do App</string>
-	<string name="bottom_title_settings">Local do título do poster</string>
-    <string name="bottom_title_settings_des">Coloca o título debaixo do poster</string>
-	
-	<!-- account stuff -->
-	<string name="example_password">senha123</string>
-    <string name="example_username">MeuNomeFixe</string>
-    <string name="example_email">ola@mundo.com</string>
-    <string name="example_ip">127.0.0.1</string>
-    <string name="example_site_name">MeuSiteFixe</string>
-    <string name="example_site_url">examplo.com</string>
-    <string name="example_lang_name">Codigo da Língua (pt)</string>
-	
-    <string name="account">Conta</string>
-    <string name="logout">Sair</string>
-    <string name="login">Entrar</string>
-    <string name="switch_account">Mudar de conta</string>
-    <string name="add_account">Adicionar conta</string>
-	<string name="create_account">Criar conta</string>
-    <string name="add_sync">Adicionar sincronização</string>
-    <string name="added_sync_format" formatted="true">%s adicionado</string>
-    <string name="upload_sync">Sincronizar</string>
-    <string name="sync_score">Nota</string>
-    <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
-    <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="authenticated_user" formatted="true">%s autenticado</string>
-    <string name="authenticated_user_fail" formatted="true">Falha em autenticar para %s</string>
-	
-    <!-- ============ -->
-    <string name="none">Nenhuma</string>
-    <string name="normal">Normal</string>
-    <string name="all">Tudo</string>
-    <string name="max">Max</string>
-    <string name="min">Min</string>
-    <string name="subtitles_outline">Contornado</string>
-    <string name="subtitles_depressed">Deprimido</string>
-    <string name="subtitles_shadow">Sombreado</string>
-    <string name="subtitles_raised">Em Relevo</string>
-	<string name="subtitle_offset">Sincronizar legendas</string>
-	<string name="subtitle_offset_title">Atraso de legenda</string>
-    <string name="subtitle_offset_extra_hint_later_format">Use isto se as legendas forem mostradas %dms adiantadas</string>
-    <string name="subtitle_offset_extra_hint_before_format">Use isto se as legendas forem mostradas %dms atrasadas</string>
-    <string name="subtitle_offset_extra_hint_none_format">Sem atraso de legenda</string>
-    <!--
-    Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
-    see: 
-	https://en.wikipedia.org/w/index.php?title=Pangram&oldid=225849300
-	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
-    -->
-    <string name="subtitles_example_text">Luís argüia à Júlia que «brações, fé, chá, óxido, pôr, zângão» eram palavras do português</string>
-	
-	<string name="recommended">Recomendada</string>
-    <string name="player_loaded_subtitles" formatted="true">%s carregada</string>
-    <string name="player_load_subtitles">Carregar de arquivo</string>
-    <string name="player_load_subtitles_online">Carregar da Internet</string>
-    <string name="downloaded_file">Arquivo baixado</string>
-    <string name="actor_main">Protagonista</string>
-    <string name="actor_supporting">Coadjuvante</string>
-    <string name="actor_background">Figurante</string>
-
-    <string name="home_source">Fonte</string>
-    <string name="home_random">Aleatório</string>
-
-    <string name="coming_soon">Em breve…</string>
-	
-	<string name="poster_image">Imagem de Poster</string>
-    <string name="category_player">Player</string>
-    <string name="resolution_and_title">Resolução e título</string>
-    <string name="title">Título</string>
-    <string name="resolution">Resolução</string>
-    <string name="error_invalid_id">Id inválida</string>
-    <string name="error_invalid_data">Dado inválido</string>
-
-<string name="error_invalid_url">URL inválido</string>
-    <string name="error">Erro</string>
-    <string name="subtitles_remove_captions">Remover legendas ocultas(CC) das legendas</string>
-    <string name="subtitles_remove_bloat">Remover bloat das legendas</string>
-
-<string name="subtitles_filter_lang">Filtrar por linguagem preferida</string>
-    <string name="extras">Extras</string>
-    <string name="trailer">Trailer</string>
-
-    <string name="next">Próximo</string>
-    <string name="provider_languages_tip">Ver vídeos nestas linguagens</string>
-    <string name="previous">Anterior</string>
-    <string name="skip_setup">Saltar setup</string>
-
-    <string name="app_layout_subtext">Change the look of the app to suit your device</string>
-    <string name="crash_reporting_title">Crash reporting</string>
-    <string name="preferred_media_subtext">What do you want to see</string>
-    <string name="setup_done">Feito</string>
-    <string name="extensions">Extensões</string>
-    <string name="add_repository">Adicionar repositório</string>
-    <string name="repository_name_hint">Nome do repositório</string>
-    <string name="repository_url_hint">URL do repositório</string>
-    <string name="plugin_loaded">Plugin Carregado</string>
-    <string name="plugin_deleted">Plugin Apagado</string>
-    <string name="plugin_load_fail" formatted="true">Falha ao carregar %s</string>
-
-    <string name="batch_download_start_format" formatted="true">Iniciada a transferência %d %s</string>
-    <string name="batch_download_finish_format" formatted="true">Transferido %d %s com sucesso</string>
-    <string name="batch_download_nothing_to_download_format" formatted="true">Tudo %s já transferido</string>
-    <string name="batch_download">Transferência em batch</string>
-    <string name="plugin_singular">plugin</string>
-    <string name="plugin">plugins</string>
-    <string name="delete_repository_plugins">Isto irá apagar todos os repositórios de plugins</string>
-    <string name="delete_repository">Apagar repositório</string>
-    <string name="setup_extensions_subtext">Transferir lista de sites a usar</string>
-    <string name="plugins_downloaded" formatted="true">Transferido: %d</string>
-    <string name="plugins_disabled" formatted="true">Desativado: %d</string>
-    <string name="plugins_not_downloaded" formatted="true">Não transferido: %d</string>
-    <string name="blank_repo_message">Adicionar um repositório para instalar extensões de sites</string>
-    <string name="view_public_repositories_button">Ver repositórios da comunidade</string>
-    <string name="view_public_repositories_button_short">Lista pública</string>
-    <string name="uppercase_all_subtitles">Todas as legendas em maiúsculas</string>
-
-    <string name="download_all_plugins_from_repo">Transferir todos os plugins deste repositório?</string>
-    <string name="single_plugin_disabled" formatted="true">%s (Desativado)</string>
-</resources>

From b2b894caa9cf50fbe84fe868a572b202e1ac37b4 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Sat, 21 Jan 2023 13:11:40 +0100
Subject: [PATCH 187/273] Translated using Weblate (Somali)

Currently translated at 17.9% (102 of 567 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (567 of 567 strings)

Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/so/
Translation: Cloudstream/App
---
 app/src/main/res/values-pl/strings.xml | 1 +
 app/src/main/res/values-so/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index c1999697..ed079c58 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -488,4 +488,5 @@
     <string name="delayed_update_notice">Aplikacja zostanie zaktualizowana po wyjściu</string>
     <string name="update_started">Aktualizacja rozpoczęta</string>
     <string name="plugin_downloaded">Wtyczka pobrana</string>
+    <string name="action_remove_from_watched">Usuń z obejrzanych</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
index 3d062df9..dd3aa432 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-so/strings.xml
@@ -4,7 +4,7 @@
     <string name="next_episode_time_day_format" formatted="true">%dm %ds %dd</string>
     <string name="next_episode_time_hour_format" formatted="true">%ds %dd</string>
     <string name="next_episode_time_min_format" formatted="true">%dd</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">Xlq</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="next_episode_format" formatted="true">Xalqadda %d waxa lasoo deyn doonaa</string>
     <string name="download">Daji</string>
     <string name="download_failed">Dajintii ma guulaysan</string>

From 65fda1889ce2e1f53eb3fbfa6f7e68b5331a5c43 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Sat, 21 Jan 2023 20:05:37 +0100
Subject: [PATCH 188/273] expandable resume watching go brrr

---
 .../ui/home/HomeParentItemAdapter.kt          |  10 +-
 .../ui/home/HomeParentItemAdapterPreview.kt   |  45 ++++-
 .../ui/result/ResultViewModel2.kt             |  15 +-
 .../main/res/layout/fragment_home_head.xml    | 154 ++++++++++--------
 app/src/main/res/layout/homepage_parent.xml   |  33 ++--
 .../main/res/layout/homepage_parent_tv.xml    |   2 +-
 6 files changed, 155 insertions(+), 104 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
index 8b7832e2..e6999c9e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
@@ -184,9 +184,8 @@ open class ParentItemAdapter(
         private val expandCallback: ((String) -> Unit)? = null,
     ) :
         RecyclerView.ViewHolder(itemView) {
-        val title: TextView = itemView.home_parent_item_title
+        val title: TextView = itemView.home_child_more_info
         val recyclerView: RecyclerView = itemView.home_child_recyclerview
-        private val moreInfo: FrameLayout? = itemView.home_child_more_info
 
         fun update(expand: HomeViewModel.ExpandableHomepageList) {
             val info = expand.list
@@ -248,9 +247,10 @@ open class ParentItemAdapter(
             })
 
             //(recyclerView.adapter as HomeChildItemAdapter).notifyDataSetChanged()
-
-            moreInfo?.setOnClickListener {
-                moreInfoClickCallback.invoke(expand)
+            if (!isTvSettings()) {
+                title.setOnClickListener {
+                    moreInfoClickCallback.invoke(expand)
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
index 7564a9de..94a1a526 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
@@ -14,6 +14,7 @@ import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
 import com.lagradost.cloudstream3.APIHolder.getId
 import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
+import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
@@ -31,9 +32,10 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectSt
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.activity_main_tv.view.*
+import kotlinx.android.synthetic.main.activity_main.view.*
 import kotlinx.android.synthetic.main.fragment_home_head.view.*
 import kotlinx.android.synthetic.main.fragment_home_head.view.home_bookmarked_child_recyclerview
+import kotlinx.android.synthetic.main.fragment_home_head.view.home_watch_parent_item_title
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.*
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_bookmarked_holder
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_none_padding
@@ -46,11 +48,12 @@ import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_on_ho
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_watching_btt
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_watch_child_recyclerview
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_watch_holder
+import kotlinx.android.synthetic.main.toast.view.*
 
 class HomeParentItemAdapterPreview(
     items: MutableList<HomeViewModel.ExpandableHomepageList>,
     val clickCallback: (SearchClickCallback) -> Unit,
-    moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit,
+    private val moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit,
     expandCallback: ((String) -> Unit)? = null,
     private val loadCallback: (LoadClickCallback) -> Unit,
     private val loadMoreCallback: (() -> Unit),
@@ -136,7 +139,8 @@ class HomeParentItemAdapterPreview(
                 clickCallback,
                 reloadStored,
                 loadStoredData,
-                searchQueryCallback
+                searchQueryCallback,
+                moreInfoClickCallback
             ).also {
                 this.holder = it
             }
@@ -182,7 +186,8 @@ class HomeParentItemAdapterPreview(
         private val searchClickCallback: (SearchClickCallback) -> Unit,
         private val reloadStored: () -> Unit,
         private val loadStoredData: ((Set<WatchType>) -> Unit),
-        private val searchQueryCallback: ((Pair<Boolean, String>) -> Unit)
+        private val searchQueryCallback: ((Pair<Boolean, String>) -> Unit),
+        private val moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit
     ) : RecyclerView.ViewHolder(itemView) {
         private var previewAdapter: HomeScrollAdapter? = null
         private val previewViewpager: ViewPager2? = itemView.home_preview_viewpager
@@ -602,11 +607,43 @@ class HomeParentItemAdapterPreview(
         fun updateResume(resumeWatching: List<SearchResponse>) {
             resumeHolder?.isVisible = resumeWatching.isNotEmpty()
             resumeAdapter?.updateList(resumeWatching)
+
+            if (!isTvSettings()) {
+                itemView.home_watch_parent_item_title?.setOnClickListener {
+                    moreInfoClickCallback.invoke(
+                        HomeViewModel.ExpandableHomepageList(
+                            HomePageList(
+                                itemView.home_watch_parent_item_title?.text.toString(),
+                                resumeWatching,
+                                false
+                            ), 1, false
+                        )
+                    )
+                }
+            }
         }
 
         fun updateBookmarks(data: Pair<Boolean, List<SearchResponse>>) {
             bookmarkHolder?.isVisible = data.first
             bookmarkAdapter?.updateList(data.second)
+            if (!isTvSettings()) {
+                itemView.home_bookmark_parent_item_title?.setOnClickListener {
+                    val items = toggleList.mapNotNull { it.first }.filter { it.isChecked }
+                    if (items.isEmpty()) return@setOnClickListener // we don't want to show an empty dialog
+                    val textSum = items
+                        .mapNotNull { it.text }.joinToString()
+
+                    moreInfoClickCallback.invoke(
+                        HomeViewModel.ExpandableHomepageList(
+                            HomePageList(
+                                textSum,
+                                data.second,
+                                false
+                            ), 1, false
+                        )
+                    )
+                }
+            }
         }
 
         fun setAvailableWatchStatusTypes(availableWatchStatusTypes: Pair<Set<WatchType>, Set<WatchType>>) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 4bc7bc48..6e249aa4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -421,7 +421,6 @@ class ResultViewModel2 : ViewModel() {
 
         fun updateWatchStatus(currentResponse: LoadResponse, status: WatchType) {
             val currentId = currentResponse.getId()
-            val resultPage = currentResponse
 
             DataStoreHelper.setResultWatchState(currentId, status.internalId)
             val current = DataStoreHelper.getBookmarkedData(currentId)
@@ -432,12 +431,12 @@ class ResultViewModel2 : ViewModel() {
                     currentId,
                     current?.bookmarkedTime ?: currentTime,
                     currentTime,
-                    resultPage.name,
-                    resultPage.url,
-                    resultPage.apiName,
-                    resultPage.type,
-                    resultPage.posterUrl,
-                    resultPage.year
+                    currentResponse.name,
+                    currentResponse.url,
+                    currentResponse.apiName,
+                    currentResponse.type,
+                    currentResponse.posterUrl,
+                    currentResponse.year
                 )
             )
         }
@@ -1628,7 +1627,7 @@ class ResultViewModel2 : ViewModel() {
         if (ranges?.contains(range) != true) {
             // if the current ranges does not include the range then select the range with the closest matching start episode
             // this usually happends when dub has less episodes then sub -> the range does not exist
-            ranges?.minByOrNull { abs(it.startEpisode - range.startEpisode) }?.let { r ->
+            ranges?.minByOrNull { kotlin.math.abs(it.startEpisode - range.startEpisode) }?.let { r ->
                 postEpisodeRange(indexer, r)
                 return
             }
diff --git a/app/src/main/res/layout/fragment_home_head.xml b/app/src/main/res/layout/fragment_home_head.xml
index 28d7ca2f..da3a3bbd 100644
--- a/app/src/main/res/layout/fragment_home_head.xml
+++ b/app/src/main/res/layout/fragment_home_head.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:orientation="vertical"
-    android:id="@+id/home_header"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
 
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/home_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/primaryBlackBackground"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:orientation="vertical">
 
     <View
         android:id="@+id/home_none_padding"
@@ -16,8 +16,10 @@
 
     <FrameLayout
         android:id="@+id/home_preview"
+
         android:layout_width="match_parent"
-        android:layout_height="500dp">
+        android:layout_height="500dp"
+        tools:visibility="gone">
 
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/home_preview_viewpager"
@@ -52,10 +54,10 @@
                 android:iconifiedByDefault="true"
                 android:textColor="@color/white"
                 android:textColorHint="@color/white"
+                app:closeIcon="@drawable/ic_baseline_close_24"
                 app:iconifiedByDefault="true"
                 app:queryBackground="@color/transparent"
                 app:queryHint="@string/search_hint"
-                app:closeIcon="@drawable/ic_baseline_close_24"
 
                 app:searchIcon="@drawable/search_icon"
                 tools:ignore="RtlSymmetry" />
@@ -80,7 +82,6 @@
         -->
 
         <LinearLayout
-
             android:id="@+id/home_preview_title_holder"
             android:layout_width="match_parent"
             android:layout_height="100dp"
@@ -156,7 +157,11 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="0dp"
             android:padding="12dp"
-            android:text="@string/continue_watching" />
+            android:text="@string/continue_watching"
+            app:drawableRightCompat="@drawable/ic_baseline_arrow_forward_24"
+            app:drawableTint="?attr/white"
+            android:background="?android:attr/selectableItemBackground"
+            android:contentDescription="@string/home_more_info"/>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/home_watch_child_recyclerview"
@@ -179,77 +184,96 @@
         android:visibility="gone"
         tools:visibility="visible">
 
-        <HorizontalScrollView
+        <FrameLayout
+            android:id="@+id/home_bookmark_parent_item_title"
+
+            android:background="?android:attr/selectableItemBackground"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fadingEdge="horizontal"
+            android:layout_height="wrap_content">
 
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:nextFocusLeft="@id/nav_rail_view"
-            android:nextFocusUp="@id/home_watch_child_recyclerview"
-            android:nextFocusForward="@id/home_bookmarked_child_recyclerview"
-            android:paddingStart="12dp"
-            android:paddingTop="5dp"
-            android:paddingEnd="12dp"
-
-            android:paddingBottom="5dp"
-            android:requiresFadingEdge="horizontal">
-
-            <com.google.android.material.chip.ChipGroup
-                android:layout_width="wrap_content"
+            <HorizontalScrollView
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:layout_marginEnd="50dp"
+                android:fadingEdge="horizontal"
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/home_type_watching_btt"
-                    style="@style/ChipFilled"
+                android:nextFocusLeft="@id/nav_rail_view"
+                android:nextFocusUp="@id/home_watch_child_recyclerview"
+                android:nextFocusForward="@id/home_bookmarked_child_recyclerview"
+                android:paddingStart="12dp"
+                android:paddingTop="5dp"
+                android:paddingEnd="12dp"
+
+                android:paddingBottom="5dp"
+                android:requiresFadingEdge="horizontal">
+
+                <com.google.android.material.chip.ChipGroup
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
-                    android:nextFocusLeft="@id/nav_rail_view"
-                    android:nextFocusRight="@id/home_plan_to_watch_btt"
-                    android:text="@string/type_watching" />
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/home_type_watching_btt"
+                        style="@style/ChipFilled"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/home_plan_to_watch_btt"
-                    style="@style/ChipFilled"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                        android:nextFocusLeft="@id/nav_rail_view"
+                        android:nextFocusRight="@id/home_plan_to_watch_btt"
+                        android:text="@string/type_watching" />
 
-                    android:nextFocusLeft="@id/home_type_watching_btt"
-                    android:nextFocusRight="@id/home_type_on_hold_btt"
-                    android:text="@string/type_plan_to_watch" />
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/home_plan_to_watch_btt"
+                        style="@style/ChipFilled"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/home_type_on_hold_btt"
-                    style="@style/ChipFilled"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                        android:nextFocusLeft="@id/home_type_watching_btt"
+                        android:nextFocusRight="@id/home_type_on_hold_btt"
+                        android:text="@string/type_plan_to_watch" />
 
-                    android:nextFocusLeft="@id/home_plan_to_watch_btt"
-                    android:nextFocusRight="@id/home_type_dropped_btt"
-                    android:text="@string/type_on_hold" />
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/home_type_on_hold_btt"
+                        style="@style/ChipFilled"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/home_type_dropped_btt"
-                    style="@style/ChipFilled"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                        android:nextFocusLeft="@id/home_plan_to_watch_btt"
+                        android:nextFocusRight="@id/home_type_dropped_btt"
+                        android:text="@string/type_on_hold" />
 
-                    android:nextFocusLeft="@id/home_type_on_hold_btt"
-                    android:nextFocusRight="@id/home_type_completed_btt"
-                    android:text="@string/type_dropped" />
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/home_type_dropped_btt"
+                        style="@style/ChipFilled"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/home_type_completed_btt"
-                    style="@style/ChipFilled"
-                    android:layout_width="wrap_content"
+                        android:nextFocusLeft="@id/home_type_on_hold_btt"
+                        android:nextFocusRight="@id/home_type_completed_btt"
+                        android:text="@string/type_dropped" />
 
-                    android:layout_height="wrap_content"
-                    android:nextFocusLeft="@id/home_type_dropped_btt"
-                    android:text="@string/type_completed" />
-            </com.google.android.material.chip.ChipGroup>
-        </HorizontalScrollView>
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/home_type_completed_btt"
+                        style="@style/ChipFilled"
+                        android:layout_width="wrap_content"
+
+                        android:layout_height="wrap_content"
+                        android:nextFocusLeft="@id/home_type_dropped_btt"
+                        android:text="@string/type_completed" />
+                </com.google.android.material.chip.ChipGroup>
+
+            </HorizontalScrollView>
+
+            <ImageView
+                android:layout_marginEnd="12dp"
+                android:layout_gravity="end"
+
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:src="@drawable/ic_baseline_arrow_forward_24"
+                app:drawableTint="?attr/white"
+                android:contentDescription="@string/home_more_info"/>
+        </FrameLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/home_bookmarked_child_recyclerview"
diff --git a/app/src/main/res/layout/homepage_parent.xml b/app/src/main/res/layout/homepage_parent.xml
index e982c81a..b2f3e0a7 100644
--- a/app/src/main/res/layout/homepage_parent.xml
+++ b/app/src/main/res/layout/homepage_parent.xml
@@ -6,27 +6,18 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-    <FrameLayout
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:id="@+id/home_child_more_info"
-            android:padding="12dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-        <TextView
-                android:id="@+id/home_parent_item_title"
-                style="@style/WatchHeaderText"
-                tools:text="Trending" />
-
-        <ImageView
-                app:tint="?attr/textColor"
-                android:layout_marginEnd="5dp"
-                android:layout_gravity="end|center_vertical"
-                android:src="@drawable/ic_baseline_arrow_forward_24"
-                android:layout_width="30dp"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/home_more_info" />
-    </FrameLayout>
+    <TextView
+        android:id="@+id/home_child_more_info"
+        style="@style/WatchHeaderText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="0dp"
+        android:padding="12dp"
+        tools:text="@string/continue_watching"
+        app:drawableRightCompat="@drawable/ic_baseline_arrow_forward_24"
+        app:drawableTint="?attr/white"
+        android:background="?android:attr/selectableItemBackground"
+        android:contentDescription="@string/home_more_info"/>
 
     <androidx.recyclerview.widget.RecyclerView
             android:nextFocusUp="@id/home_child_more_info"
diff --git a/app/src/main/res/layout/homepage_parent_tv.xml b/app/src/main/res/layout/homepage_parent_tv.xml
index f9adf1c1..d0c88c39 100644
--- a/app/src/main/res/layout/homepage_parent_tv.xml
+++ b/app/src/main/res/layout/homepage_parent_tv.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:layout_marginStart="@dimen/navbar_width"
-        android:id="@+id/home_parent_item_title"
+        android:id="@+id/home_child_more_info"
         android:padding="12dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

From 60aca3ebdc12ffdb9663f2bed1cc7c03a207e069 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Sat, 21 Jan 2023 23:22:48 +0100
Subject: [PATCH 189/273] very nice long hold popups

---
 .../lagradost/cloudstream3/MainActivity.kt    | 138 +++++++++++-
 .../cloudstream3/ui/home/HomeFragment.kt      |  12 ++
 .../cloudstream3/ui/result/ResultFragment.kt  |   1 +
 .../ui/result/ResultViewModel2.kt             |  27 ++-
 .../cloudstream3/ui/search/SearchFragment.kt  |   2 +
 .../cloudstream3/ui/search/SearchHelper.kt    |  12 +-
 .../res/layout/bottom_resultview_preview.xml  | 197 ++++++++++++++++++
 app/src/main/res/layout/loading_list.xml      |  44 ++--
 8 files changed, 392 insertions(+), 41 deletions(-)
 create mode 100644 app/src/main/res/layout/bottom_resultview_preview.xml

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 4907411f..857eaa6a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -1,16 +1,14 @@
 package com.lagradost.cloudstream3
 
 import android.content.ComponentName
-import android.content.DialogInterface
+import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.os.Bundle
+import android.util.AttributeSet
 import android.util.Log
-import android.view.KeyEvent
-import android.view.Menu
-import android.view.MenuItem
-import android.view.WindowManager
+import android.view.*
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IdRes
@@ -19,6 +17,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy
@@ -31,6 +30,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.google.android.gms.cast.framework.*
+import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.navigationrail.NavigationRailView
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
 import com.lagradost.cloudstream3.APIHolder.allProviders
@@ -46,8 +46,7 @@ import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent
 import com.lagradost.cloudstream3.CommonActivity.onUserLeaveHint
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.CommonActivity.updateLocale
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.mvvm.*
 import com.lagradost.cloudstream3.network.initClient
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.PluginManager.loadAllOnlinePlugins
@@ -61,9 +60,13 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStri
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringSearch
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.inAppAuths
 import com.lagradost.cloudstream3.ui.APIRepository
+import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_NAVIGATE_TO
 import com.lagradost.cloudstream3.ui.home.HomeViewModel
+import com.lagradost.cloudstream3.ui.result.ResultViewModel2
 import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
+import com.lagradost.cloudstream3.ui.result.setImage
+import com.lagradost.cloudstream3.ui.result.setText
 import com.lagradost.cloudstream3.ui.search.SearchFragment
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isEmulatorSettings
@@ -74,6 +77,7 @@ import com.lagradost.cloudstream3.ui.settings.SettingsGeneral
 import com.lagradost.cloudstream3.ui.setup.HAS_DONE_SETUP_KEY
 import com.lagradost.cloudstream3.ui.setup.SetupFragmentExtensions
 import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.AppUtils.html
 import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
 import com.lagradost.cloudstream3.utils.AppUtils.loadCache
 import com.lagradost.cloudstream3.utils.AppUtils.loadRepository
@@ -86,9 +90,11 @@ import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.DataStoreHelper.migrateResumeWatching
 import com.lagradost.cloudstream3.utils.InAppUpdater.Companion.runAutoUpdate
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.changeStatusBarState
 import com.lagradost.cloudstream3.utils.UIHelper.checkWrite
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
@@ -96,6 +102,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.requestRW
 import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.ResponseParser
 import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.bottom_resultview_preview.*
 import kotlinx.android.synthetic.main.fragment_result_swipe.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -244,6 +251,10 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             Event<Boolean>() // homepage api, used to speed up time to load for homepage
         val afterRepositoryLoadedEvent = Event<Boolean>()
 
+        // kinda shitty solution, but cant com main->home otherwise for popups
+        val bookmarksUpdatedEvent = Event<Boolean>()
+
+
         /**
          * @return true if the str has launched an app task (be it successful or not)
          * @param isWebview does not handle providers and opening download page if true. Can still add repos and login.
@@ -336,6 +347,16 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             }
     }
 
+    var lastPopup : SearchResponse? = null
+    fun loadPopup(result: SearchResponse) {
+        lastPopup = result
+        viewModel.load(
+            this, result.url, result.apiName, false, if (getApiDubstatusSettings()
+                    .contains(DubStatus.Dubbed)
+            ) DubStatus.Dubbed else DubStatus.Subbed, null
+        )
+    }
+
     override fun onColorSelected(dialogId: Int, color: Int) {
         onColorSelectedEvent.invoke(Pair(dialogId, color))
     }
@@ -619,6 +640,37 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         }
     }
 
+    lateinit var viewModel: ResultViewModel2
+
+    override fun onCreateView(name: String, context: Context, attrs: AttributeSet): View? {
+        viewModel =
+            ViewModelProvider(this)[ResultViewModel2::class.java]
+
+        return super.onCreateView(name, context, attrs)
+    }
+
+    private fun hidePreviewPopupDialog() {
+        viewModel.clear()
+        bottomPreviewPopup.dismissSafe(this)
+    }
+
+    var bottomPreviewPopup: BottomSheetDialog? = null
+    private fun showPreviewPopupDialog(): BottomSheetDialog {
+        val ret = (bottomPreviewPopup ?: run {
+            val builder =
+                BottomSheetDialog(this)
+            builder.setContentView(R.layout.bottom_resultview_preview)
+            builder.setOnDismissListener {
+                bottomPreviewPopup = null
+                viewModel.clear()
+            }
+            builder.setCanceledOnTouchOutside(true)
+            builder.show()
+            builder
+        })
+        bottomPreviewPopup = ret
+        return ret
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         app.initClient(this)
@@ -708,6 +760,78 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             builder.show().setDefaultFocus()
         }
 
+        observeNullable(viewModel.page) { resource ->
+            if (resource == null) {
+                bottomPreviewPopup.dismissSafe(this)
+                return@observeNullable
+            }
+            when (resource) {
+                is Resource.Failure -> {
+                    showToast(this, R.string.error)
+                    hidePreviewPopupDialog()
+                }
+                is Resource.Loading -> {
+                    showPreviewPopupDialog().apply {
+                        resultview_preview_loading?.isVisible = true
+                        resultview_preview_result?.isVisible = false
+                        resultview_preview_loading_shimmer?.startShimmer()
+                    }
+                }
+                is Resource.Success -> {
+                    val d = resource.value
+                    showPreviewPopupDialog().apply {
+                        resultview_preview_loading?.isVisible = false
+                        resultview_preview_result?.isVisible = true
+                        resultview_preview_loading_shimmer?.stopShimmer()
+
+                        resultview_preview_title?.text = d.title
+
+                        resultview_preview_meta_type.setText(d.typeText)
+                        resultview_preview_meta_year.setText(d.yearText)
+                        resultview_preview_meta_duration.setText(d.durationText)
+                        resultview_preview_meta_rating.setText(d.ratingText)
+
+                        resultview_preview_description?.setText(d.plotText)
+                        resultview_preview_poster?.setImage(
+                            d.posterImage ?: d.posterBackgroundImage
+                        )
+
+                        resultview_preview_poster?.setOnClickListener {
+                            //viewModel.updateWatchStatus(WatchType.PLANTOWATCH)
+                            val value = viewModel.watchStatus.value ?: WatchType.NONE
+
+                            this@MainActivity.showBottomDialog(
+                                WatchType.values().map { getString(it.stringRes) }.toList(),
+                                value.ordinal,
+                                this@MainActivity.getString(R.string.action_add_to_bookmarks),
+                                showApply = false,
+                                {}) {
+                                viewModel.updateWatchStatus(WatchType.values()[it])
+                                bookmarksUpdatedEvent(true)
+                            }
+                        }
+
+                        if (!isTvSettings()) // dont want this clickable on tv layout
+                            resultview_preview_description?.setOnClickListener { view ->
+                                view.context?.let { ctx ->
+                                    val builder: AlertDialog.Builder =
+                                        AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
+                                    builder.setMessage(d.plotText.asString(ctx).html())
+                                        .setTitle(d.plotHeaderText.asString(ctx))
+                                        .show()
+                                }
+                            }
+
+                        resultview_preview_more_info?.setOnClickListener {
+                            hidePreviewPopupDialog()
+                            lastPopup?.let {
+                                loadSearchResult(it)
+                            }
+                        }
+                    }
+                }
+            }
+        }
 
 //        ioSafe {
 //            val plugins =
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index bb183f12..8a8f90b4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -32,6 +32,7 @@ import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
+import com.lagradost.cloudstream3.MainActivity.Companion.bookmarksUpdatedEvent
 import com.lagradost.cloudstream3.MainActivity.Companion.mainPluginsLoadedEvent
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
@@ -435,6 +436,11 @@ class HomeFragment : Fragment() {
         return inflater.inflate(layout, container, false)
     }
 
+    override fun onDestroyView() {
+        bottomSheetDialog?.ownHide()
+        super.onDestroyView()
+    }
+
     private fun fixGrid() {
         activity?.getSpanCount()?.let {
             currentSpan = it
@@ -461,14 +467,20 @@ class HomeFragment : Fragment() {
         fixGrid()
     }
 
+    fun bookmarksUpdated(_data : Boolean) {
+        reloadStored()
+    }
+
     override fun onResume() {
         super.onResume()
         reloadStored()
+        bookmarksUpdatedEvent += ::bookmarksUpdated
         afterPluginsLoadedEvent += ::afterPluginsLoaded
         mainPluginsLoadedEvent += ::afterMainPluginsLoaded
     }
 
     override fun onStop() {
+        bookmarksUpdatedEvent -= ::bookmarksUpdated
         afterPluginsLoadedEvent -= ::afterPluginsLoaded
         mainPluginsLoadedEvent -= ::afterMainPluginsLoaded
         super.onStop()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 68a57b7f..9cfbf45c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -850,6 +850,7 @@ open class ResultFragment : ResultTrailerPlayer() {
         }
 
         observe(viewModel.page) { data ->
+            if(data == null) return@observe
             when (data) {
                 is Resource.Success -> {
                     val d = data.value
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 6e249aa4..6ed32b15 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -55,7 +55,6 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.setResultSeason
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import kotlinx.coroutines.*
 import java.io.File
-import java.lang.Math.abs
 import java.util.concurrent.TimeUnit
 
 
@@ -314,6 +313,11 @@ data class ExtractedTrailerData(
 class ResultViewModel2 : ViewModel() {
     private var currentResponse: LoadResponse? = null
 
+    fun clear() {
+        currentResponse = null
+        _page.postValue(null)
+    }
+
     data class EpisodeIndexer(
         val dubStatus: DubStatus,
         val season: Int,
@@ -340,9 +344,9 @@ class ResultViewModel2 : ViewModel() {
     //private val currentHeaderName get() = currentResponse?.name
 
 
-    private val _page: MutableLiveData<Resource<ResultData>> =
-        MutableLiveData(Resource.Loading())
-    val page: LiveData<Resource<ResultData>> = _page
+    private val _page: MutableLiveData<Resource<ResultData>?> =
+        MutableLiveData(null)
+    val page: LiveData<Resource<ResultData>?> = _page
 
     private val _episodes: MutableLiveData<ResourceSome<List<ResultEpisode>>> =
         MutableLiveData(ResourceSome.Loading())
@@ -398,7 +402,6 @@ class ResultViewModel2 : ViewModel() {
     private val _selectedDubStatusIndex: MutableLiveData<Int> = MutableLiveData(-1)
     val selectedDubStatusIndex: LiveData<Int> = _selectedDubStatusIndex
 
-
     private val _loadedLinks: MutableLiveData<Some<LinkProgress>> = MutableLiveData(Some.None)
     val loadedLinks: LiveData<Some<LinkProgress>> = _loadedLinks
 
@@ -1627,10 +1630,11 @@ class ResultViewModel2 : ViewModel() {
         if (ranges?.contains(range) != true) {
             // if the current ranges does not include the range then select the range with the closest matching start episode
             // this usually happends when dub has less episodes then sub -> the range does not exist
-            ranges?.minByOrNull { kotlin.math.abs(it.startEpisode - range.startEpisode) }?.let { r ->
-                postEpisodeRange(indexer, r)
-                return
-            }
+            ranges?.minByOrNull { kotlin.math.abs(it.startEpisode - range.startEpisode) }
+                ?.let { r ->
+                    postEpisodeRange(indexer, r)
+                    return
+                }
         }
 
         val isMovie = currentResponse?.isMovie() == true
@@ -2111,6 +2115,7 @@ class ResultViewModel2 : ViewModel() {
         showFillers: Boolean,
         dubStatus: DubStatus,
         autostart: AutoResume?,
+        loadTrailers: Boolean = true,
     ) =
         viewModelScope.launchSafe {
             _page.postValue(Resource.Loading(url))
@@ -2189,8 +2194,8 @@ class ResultViewModel2 : ViewModel() {
                             System.currentTimeMillis(),
                         )
                     )
-
-                    loadTrailers(data.value)
+                    if (loadTrailers)
+                        loadTrailers(data.value)
                     postSuccessful(
                         data.value,
                         updateEpisodes = true,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 1da30691..4144a042 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -45,6 +45,7 @@ import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.updateChips
 import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
+import com.lagradost.cloudstream3.utils.AppUtils.ownHide
 import com.lagradost.cloudstream3.utils.AppUtils.ownShow
 import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.Coroutines.main
@@ -121,6 +122,7 @@ class SearchFragment : Fragment() {
 
     override fun onDestroyView() {
         hideKeyboard()
+        bottomSheetDialog?.ownHide()
         super.onDestroyView()
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt
index 1de89809..45336d5b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt
@@ -3,11 +3,13 @@ package com.lagradost.cloudstream3.ui.search
 import android.app.Activity
 import android.widget.Toast
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_PLAY_FILE
 import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick
 import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
 import com.lagradost.cloudstream3.ui.result.START_ACTION_LOAD_EP
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
@@ -54,7 +56,15 @@ object SearchHelper {
                 }
             }
             SEARCH_ACTION_SHOW_METADATA -> {
-                showToast(activity, callback.card.name, Toast.LENGTH_SHORT)
+                if(!isTvSettings()) { // we only want this on phone as UI is not done yet on tv
+                    (activity as? MainActivity?)?.apply {
+                        loadPopup(callback.card)
+                    } ?: kotlin.run {
+                        showToast(activity, callback.card.name, Toast.LENGTH_SHORT)
+                    }
+                } else {
+                    showToast(activity, callback.card.name, Toast.LENGTH_SHORT)
+                }
             }
         }
     }
diff --git a/app/src/main/res/layout/bottom_resultview_preview.xml b/app/src/main/res/layout/bottom_resultview_preview.xml
new file mode 100644
index 00000000..ce41cb65
--- /dev/null
+++ b/app/src/main/res/layout/bottom_resultview_preview.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <LinearLayout
+        android:id="@+id/resultview_preview_result"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="12dp">
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:cardCornerRadius="@dimen/rounded_image_radius">
+
+                <ImageView
+                    android:id="@+id/resultview_preview_poster"
+                    android:layout_width="88dp"
+                    android:layout_height="138dp"
+                    android:contentDescription="@string/poster_image"
+                    android:scaleType="centerCrop"
+                    tools:src="@drawable/example_poster" />
+            </androidx.cardview.widget.CardView>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="138dp"
+                android:layout_marginStart="10dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/resultview_preview_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/textColor"
+                    android:textSize="16sp"
+
+                    android:textStyle="bold"
+                    tools:text="The Perfect Run">
+
+                </TextView>
+
+                <com.lagradost.cloudstream3.widget.FlowLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:itemSpacing="10dp">
+
+                    <TextView
+                        android:id="@+id/resultview_preview_meta_type"
+                        style="@style/ResultInfoText"
+                        tools:text="Movie" />
+
+                    <TextView
+                        android:id="@+id/resultview_preview_meta_year"
+                        style="@style/ResultInfoText"
+                        tools:text="2022" />
+
+                    <TextView
+                        android:id="@+id/resultview_preview_meta_rating"
+                        style="@style/ResultInfoText"
+                        tools:text="Rated: 8.5/10.0" />
+
+                    <TextView
+                        android:id="@+id/resultview_preview_meta_status"
+                        style="@style/ResultInfoText"
+                        tools:text="Ongoing" />
+
+                    <TextView
+                        android:id="@+id/resultview_preview_meta_duration"
+                        style="@style/ResultInfoText"
+                        tools:text="121min" />
+                </com.lagradost.cloudstream3.widget.FlowLayout>
+
+                <!-- <TextView
+                     android:id="@+id/resultview_preview_year"
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+
+                     android:textColor="?attr/grayTextColor"
+                     tools:text="2023" />-->
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:id="@+id/resultview_preview_description"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+
+                        android:ellipsize="end"
+                        android:textColor="?attr/textColor"
+                        tools:text="Ryan Quicksave Romano is an eccentric adventurer with a strange power: he can create a save-point in time and redo his life whenever he dies. Arriving in New Rome, the glitzy capital of sin of a rebuilding Europe, he finds the city torn between mega-corporations, sponsored heroes, superpowered criminals, and true monsters. It's a time of chaos, where potions can grant the power to rule the world and dangers lurk everywhere. " />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="20dp"
+                        android:layout_gravity="bottom"
+                        android:background="@drawable/background_shadow" />
+                </FrameLayout>
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/resultview_preview_more_info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?android:attr/selectableItemBackground"
+            android:gravity="start|center_vertical"
+            android:padding="12dp"
+            android:text="@string/home_more_info"
+            android:textColor="?attr/textColor"
+            app:drawableRightCompat="@drawable/ic_baseline_arrow_forward_24"
+            app:drawableTint="?attr/white" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/resultview_preview_loading"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <com.facebook.shimmer.ShimmerFrameLayout
+            android:id="@+id/resultview_preview_loading_shimmer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:orientation="vertical"
+            app:shimmer_auto_start="true"
+            app:shimmer_base_alpha="0.2"
+            app:shimmer_duration="@integer/loading_time"
+            app:shimmer_highlight_alpha="0.3">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/result_padding"
+                    android:layout_marginTop="@dimen/result_padding"
+
+                    android:layout_marginEnd="@dimen/result_padding"
+                    android:orientation="horizontal">
+
+                    <include layout="@layout/loading_poster" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical"
+                        android:paddingStart="10dp"
+                        android:paddingEnd="10dp">
+
+                        <include layout="@layout/loading_line" />
+
+                        <include layout="@layout/loading_line_short" />
+
+                        <include layout="@layout/loading_line" />
+
+                        <include layout="@layout/loading_line" />
+
+                        <include layout="@layout/loading_line" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="match_parent"
+                    android:layout_height="26dp"
+                    android:layout_margin="@dimen/result_padding"
+                    android:layout_marginBottom="@dimen/loading_margin"
+                    android:background="@color/grayShimmer"
+                    app:cardCornerRadius="@dimen/loading_radius"
+                    tools:ignore="ContentDescription" />
+            </LinearLayout>
+        </com.facebook.shimmer.ShimmerFrameLayout>
+    </FrameLayout>
+</FrameLayout>
+
+
+
diff --git a/app/src/main/res/layout/loading_list.xml b/app/src/main/res/layout/loading_list.xml
index ccd4a8d6..1ed01c8e 100644
--- a/app/src/main/res/layout/loading_list.xml
+++ b/app/src/main/res/layout/loading_list.xml
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/loading_margin"
-        android:paddingBottom="@dimen/loading_margin"
-        android:layout_height="200dp"
-        android:layout_width="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="200dp"
+    android:orientation="vertical"
+    android:paddingTop="@dimen/loading_margin"
+    android:paddingBottom="@dimen/loading_margin">
 
     <include layout="@layout/loading_line_short" />
 
     <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
 
         <include layout="@layout/loading_poster" />
 
         <View
-                android:layout_height="wrap_content"
-                android:layout_width="@dimen/loading_margin" />
+            android:layout_width="@dimen/loading_margin"
+            android:layout_height="wrap_content" />
 
         <include layout="@layout/loading_poster" />
 
         <View
-                android:layout_height="wrap_content"
-                android:layout_width="@dimen/loading_margin" />
+            android:layout_width="@dimen/loading_margin"
+            android:layout_height="wrap_content" />
 
         <include layout="@layout/loading_poster" />
 
         <View
-                android:layout_height="wrap_content"
-                android:layout_width="@dimen/loading_margin" />
+            android:layout_width="@dimen/loading_margin"
+            android:layout_height="wrap_content" />
 
         <include layout="@layout/loading_poster" />
 
         <View
-                android:layout_height="wrap_content"
-                android:layout_width="@dimen/loading_margin" />
+            android:layout_width="@dimen/loading_margin"
+            android:layout_height="wrap_content" />
 
         <include layout="@layout/loading_poster" />
 
         <View
-                android:layout_height="wrap_content"
-                android:layout_width="@dimen/loading_margin" />
+            android:layout_width="@dimen/loading_margin"
+            android:layout_height="wrap_content" />
 
         <include layout="@layout/loading_poster" />
 
         <View
-                android:layout_height="match_parent"
-                android:layout_width="@dimen/loading_margin" />
+            android:layout_width="@dimen/loading_margin"
+            android:layout_height="match_parent" />
 
         <include layout="@layout/loading_poster" />
 
         <View
-                android:layout_height="wrap_content"
-                android:layout_width="@dimen/loading_margin" />
+            android:layout_width="@dimen/loading_margin"
+            android:layout_height="wrap_content" />
 
         <include layout="@layout/loading_poster" />
     </LinearLayout>

From 0b4de8181159e31ded92a90c8f91bc20a745564e Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Mon, 23 Jan 2023 00:29:14 +0100
Subject: [PATCH 190/273] (hopefully) Fix home search and OpenSubtitles

---
 .../syncproviders/providers/OpenSubtitlesApi.kt            | 4 ++--
 app/src/main/res/layout/fragment_home_head.xml             | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
index 8f06c98e..3e372c2d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
@@ -166,7 +166,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         val fixedLang = fixLanguage(query.lang)
 
         val imdbId = query.imdb ?: 0
-        val queryText = query.query.replace(" ", "+")
+        val queryText = query.query
         val epNum = query.epNumber ?: 0
         val seasonNum = query.seasonNumber ?: 0
         val yearNum = query.year ?: 0
@@ -177,7 +177,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         val searchQueryUrl = when (imdbId > 0) {
             //Use imdb_id to search if its valid
             true -> "$host/subtitles?imdb_id=$imdbId&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
-            false -> "$host/subtitles?query=${URLEncoder.encode(queryText.lowercase(), StandardCharsets.UTF_8.toString())}&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
+            false -> "$host/subtitles?query=${queryText}&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
         }
 
         val req = app.get(
diff --git a/app/src/main/res/layout/fragment_home_head.xml b/app/src/main/res/layout/fragment_home_head.xml
index da3a3bbd..0ee50042 100644
--- a/app/src/main/res/layout/fragment_home_head.xml
+++ b/app/src/main/res/layout/fragment_home_head.xml
@@ -16,10 +16,8 @@
 
     <FrameLayout
         android:id="@+id/home_preview"
-
         android:layout_width="match_parent"
-        android:layout_height="500dp"
-        tools:visibility="gone">
+        android:layout_height="500dp">
 
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/home_preview_viewpager"
@@ -47,7 +45,7 @@
             <androidx.appcompat.widget.SearchView
                 android:id="@+id/home_search"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="60dp"
                 android:layout_gravity="start"
                 android:editTextColor="@color/white"
                 android:gravity="start"
@@ -58,7 +56,6 @@
                 app:iconifiedByDefault="true"
                 app:queryBackground="@color/transparent"
                 app:queryHint="@string/search_hint"
-
                 app:searchIcon="@drawable/search_icon"
                 tools:ignore="RtlSymmetry" />
         </LinearLayout>

From de720983a6065b37e7d7a42b5d1b35289648177f Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Tue, 24 Jan 2023 19:15:33 +0100
Subject: [PATCH 191/273] Translated using Weblate (Russian)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 83.7% (475 of 567 strings)

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translated using Weblate (Portuguese)

Currently translated at 81.3% (461 of 567 strings)

Translated using Weblate (Somali)

Currently translated at 99.6% (565 of 567 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 46.7% (265 of 567 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 46.7% (265 of 567 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Esperanto)

Currently translated at 28.7% (163 of 567 strings)

Translated using Weblate (Persian)

Currently translated at 19.0% (108 of 567 strings)

Translated using Weblate (Hungarian)

Currently translated at 58.7% (333 of 567 strings)

Translated using Weblate (German)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 83.5% (474 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 83.5% (474 of 567 strings)

Translated using Weblate (Kannada)

Currently translated at 14.9% (85 of 567 strings)

Translated using Weblate (Urdu)

Currently translated at 76.3% (433 of 567 strings)

Translated using Weblate (Tamil)

Currently translated at 18.8% (107 of 567 strings)

Translated using Weblate (Hebrew)

Currently translated at 37.5% (213 of 567 strings)

Translated using Weblate (Bengali)

Currently translated at 40.7% (231 of 567 strings)

Translated using Weblate (Bengali)

Currently translated at 40.7% (231 of 567 strings)

Translated using Weblate (Bengali)

Currently translated at 40.7% (231 of 567 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 99.2% (563 of 567 strings)

Translated using Weblate (Vietnamese)

Currently translated at 87.6% (497 of 567 strings)

Translated using Weblate (Vietnamese)

Currently translated at 87.6% (497 of 567 strings)

Translated using Weblate (Vietnamese)

Currently translated at 87.6% (497 of 567 strings)

Translated using Weblate (Turkish)

Currently translated at 97.0% (550 of 567 strings)

Translated using Weblate (Tagalog)

Currently translated at 59.2% (336 of 567 strings)

Translated using Weblate (Tagalog)

Currently translated at 59.2% (336 of 567 strings)

Translated using Weblate (Tagalog)

Currently translated at 59.2% (336 of 567 strings)

Translated using Weblate (Swedish)

Currently translated at 79.1% (449 of 567 strings)

Translated using Weblate (Swedish)

Currently translated at 79.1% (449 of 567 strings)

Translated using Weblate (Swedish)

Currently translated at 79.1% (449 of 567 strings)

Translated using Weblate (Romanian)

Currently translated at 74.7% (424 of 567 strings)

Translated using Weblate (Romanian)

Currently translated at 74.7% (424 of 567 strings)

Translated using Weblate (Romanian)

Currently translated at 74.7% (424 of 567 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 93.4% (530 of 567 strings)

Translated using Weblate (Dutch)

Currently translated at 79.3% (450 of 567 strings)

Translated using Weblate (Dutch)

Currently translated at 79.3% (450 of 567 strings)

Translated using Weblate (Dutch)

Currently translated at 79.3% (450 of 567 strings)

Translated using Weblate (Malayalam)

Currently translated at 38.9% (221 of 567 strings)

Translated using Weblate (Malayalam)

Currently translated at 38.9% (221 of 567 strings)

Translated using Weblate (Malayalam)

Currently translated at 38.9% (221 of 567 strings)

Translated using Weblate (Macedonian)

Currently translated at 51.1% (290 of 567 strings)

Translated using Weblate (Macedonian)

Currently translated at 51.1% (290 of 567 strings)

Translated using Weblate (Macedonian)

Currently translated at 51.1% (290 of 567 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Indonesian)

Currently translated at 99.6% (565 of 567 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Hindi)

Currently translated at 39.5% (224 of 567 strings)

Translated using Weblate (Hindi)

Currently translated at 39.5% (224 of 567 strings)

Translated using Weblate (Hindi)

Currently translated at 39.5% (224 of 567 strings)

Translated using Weblate (French)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Greek)

Currently translated at 99.8% (566 of 567 strings)

Translated using Weblate (Czech)

Currently translated at 72.6% (412 of 567 strings)

Translated using Weblate (Czech)

Currently translated at 72.6% (412 of 567 strings)

Translated using Weblate (Czech)

Currently translated at 72.6% (412 of 567 strings)

Translated using Weblate (bp (generated) (bp))

Currently translated at 81.8% (464 of 567 strings)

Translated using Weblate (bp (generated) (bp))

Currently translated at 81.8% (464 of 567 strings)

Translated using Weblate (bp (generated) (bp))

Currently translated at 81.8% (464 of 567 strings)

Translated using Weblate (Bulgarian)

Currently translated at 99.8% (566 of 567 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 83.4% (473 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 83.2% (472 of 567 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 81.6% (463 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 81.6% (463 of 567 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Indonesian)

Currently translated at 99.6% (565 of 567 strings)

Translated using Weblate (Somali)

Currently translated at 99.6% (565 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 60.4% (343 of 567 strings)

Translated using Weblate (Vietnamese)

Currently translated at 87.6% (497 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 55.9% (317 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 55.9% (317 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 55.9% (317 of 567 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 53.2% (302 of 567 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Turkish)

Currently translated at 97.0% (550 of 567 strings)

Translated using Weblate (Somali)

Currently translated at 69.6% (395 of 567 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (567 of 567 strings)

new string translations

Co-authored-by: Alexey <aleksejfedorov963@gmail.com>
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Anonymous <noreply@weblate.org>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Dan <denqwerta@gmail.com>
Co-authored-by: Fikri Akbar <akbarfikri1221@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Jonas Kahnwald <elcan.osmanov123@gmail.com>
Co-authored-by: Piotr Z <pzdanowiczp@gmail.com>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Sandyran <sandyran@protonmail.com>
Co-authored-by: Sdarfeesh <Sdarfeesh@protonmail.com>
Co-authored-by: Shafici Isxariifshe <mega12xhaphiee@gmail.com>
Co-authored-by: Sina Sharifkazemi <negatics@gmail.com>
Co-authored-by: SleepyOwl <artem726artem@gmail.com>
Co-authored-by: Translator-3000 <weblate.m1d0h@8shield.net>
Co-authored-by: Walter H <walter75@gmail.com>
Co-authored-by: eightyy8 <oliver.kha@pm.me>
Co-authored-by: kaajjo <claymanoff@gmail.com>
Co-authored-by: tuan041 <tuananh163025ttt@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bg/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bp/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/el/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/eo/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fa/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/he/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hu/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/kn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/mk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ml/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ro/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/so/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sv/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ta/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ur/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hant/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml     |  34 +-
 app/src/main/res/values-bg/strings.xml     |  25 +-
 app/src/main/res/values-bp/strings.xml     |  42 +-
 app/src/main/res/values-cs/strings.xml     |  47 +-
 app/src/main/res/values-el/strings.xml     |   3 +-
 app/src/main/res/values-es/strings.xml     |   2 +-
 app/src/main/res/values-fa/strings.xml     |   4 +
 app/src/main/res/values-fr/strings.xml     |   9 +-
 app/src/main/res/values-hi/strings.xml     |  16 +-
 app/src/main/res/values-hr/strings.xml     |  48 +--
 app/src/main/res/values-in/strings.xml     |  48 +--
 app/src/main/res/values-it/strings.xml     |  18 +-
 app/src/main/res/values-kn/strings.xml     |   3 +-
 app/src/main/res/values-mk/strings.xml     |   6 +-
 app/src/main/res/values-ml/strings.xml     |  14 +-
 app/src/main/res/values-nl/strings.xml     |  25 +-
 app/src/main/res/values-no/strings.xml     |  25 +-
 app/src/main/res/values-pl/strings.xml     | 175 ++++----
 app/src/main/res/values-ro/strings.xml     |  32 +-
 app/src/main/res/values-ru/strings.xml     | 248 ++++++++++-
 app/src/main/res/values-so/strings.xml     | 480 ++++++++++++++++++++-
 app/src/main/res/values-sv/strings.xml     |  10 +-
 app/src/main/res/values-tl/strings.xml     |   8 +-
 app/src/main/res/values-tr/strings.xml     |  59 ++-
 app/src/main/res/values-uk/strings.xml     |   4 +-
 app/src/main/res/values-vi/strings.xml     |  34 +-
 app/src/main/res/values-zh-rTW/strings.xml |  46 +-
 app/src/main/res/values-zh/strings.xml     |  53 +--
 28 files changed, 1047 insertions(+), 471 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index ecb15f78..3a0c97e7 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -102,7 +102,7 @@
     <string name="action_remove_watching">حذف</string>
     <string name="action_open_watching">مزيد من المعلومات</string>
     <string name="vpn_might_be_needed">قد تكون هناك حاجة إلى VPN لكي يعمل هذا المزود بشكل صحيح</string>
-    <string name="vpn_torrent">هذا المزود هو تورنت ، يوصى باستخدام  شبكة ظاهرية خاصة</string>
+    <string name="vpn_torrent">هذا المزود هو تورنت ، يوصى باستخدام شبكة ظاهرية خاصة</string>
     <string name="provider_info_meta">لا يتم توفير البيانات الوصفية بواسطة الموقع ، وسيفشل تحميل الفيديو إذا لم يكن موجودًا في الموقع.</string>
     <string name="torrent_plot">الوصف</string>
     <string name="normal_no_plot">لم يتم العثور على وصف</string>
@@ -184,8 +184,10 @@
     <string name="resume">إستئناف</string>
     <string name="go_back_30">-٣٠</string>
     <string name="go_forward_30">+٣٠</string>
-    <string name="delete_message">سوف يتم الحذف نهائيا %s\nهل أنت متأكد?</string>
-    <string name="resume_time_left" formatted="true">%dm\nمتبقية</string>
+    <string name="delete_message">سوف يتم الحذف نهائيا %s
+\nهل أنت متأكد\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nمتبقية</string>
     <string name="status_ongoing">جاري التنفيذ</string>
     <string name="status_completed">اكتمل</string>
     <string name="status">الحالة</string>
@@ -233,7 +235,7 @@
     <string name="episode_action_chromecast_mirror">مرآة كروم كاست</string>
     <string name="episode_action_play_in_app">تشغيل في التطبيق</string>
     <string name="episode_action_play_in_format">%s تشغيل في</string>
-    <string name="episode_action_play_in_browser">تشغيل في الويب </string>
+    <string name="episode_action_play_in_browser">تشغيل في الويب</string>
     <string name="episode_action_copy_link">نسخ الرابط</string>
     <string name="episode_action_auto_download">التحميل التلقائي</string>
     <string name="episode_action_download_mirror">تحميل بجودات مختلفة</string>
@@ -279,22 +281,7 @@
     <string name="resize_zoom">تكبير</string>
     <string name="legal_notice">إخلاء مسؤولية</string>
     <string name="legal_notice_key" translatable="false">legal_notice_key</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
-        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
-
-        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
-
-        The app is purely for educational and personal use.
-
-        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down.
-        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or
-        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
-        user-friendly interface.
-
-        It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the
-        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
-        CloudStream 3 at your own risk.
-    </string>
+    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">عام</string>
     <string name="random_button_settings">زر العشوائي</string>
     <string name="random_button_settings_desc">إظهار زر العشوائي على الصفحة الرئيسية</string>
@@ -345,7 +332,7 @@
     <string name="upload_sync">مزامنة</string>
     <string name="sync_score">تقييم</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s تم التوثيق</string>
     <string name="authenticated_user_fail" formatted="true">تعذر تسجيل الدخول في %s</string>
@@ -355,7 +342,7 @@
     <string name="all">الكل</string>
     <string name="max">الحد الاقصي</string>
     <string name="min">الحد الأدنى</string>
-    <string name="subtitles_none" translatable="false">@string/none</string>
+    <string name="subtitles_none" translatable="false">\@string/none</string>
     <string name="subtitles_outline">الخطوط المحيطة</string>
     <string name="subtitles_depressed">النمط المنخفض</string>
     <string name="subtitles_shadow">ظل</string>
@@ -452,7 +439,7 @@
     <string name="view_public_repositories_button">عرض مستودعات المجتمع</string>
     <string name="view_public_repositories_button_short">قائمة عامة</string>
     <string name="uppercase_all_subtitles">جميع الترجمات حروف كبيرة</string>
-    <string name="download_all_plugins_from_repo">تحميل جميع الإضافات من هذا المستودع?</string>
+    <string name="download_all_plugins_from_repo">تحميل جميع الإضافات من هذا المستودع\?</string>
     <string name="single_plugin_disabled" formatted="true">%s (معطل)</string>
     <string name="tracks">المسارات</string>
     <string name="audio_tracks">مسار الصوت</string>
@@ -533,4 +520,5 @@
     <string name="delayed_update_notice">سيتم تحديث التطبيق عند الخروج</string>
     <string name="update_started">بدأ التحديث</string>
     <string name="plugin_downloaded">تم تنزيل الإضافة</string>
+    <string name="action_remove_from_watched">إزالة من المشاهدة</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 0fdda385..324f44bc 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -17,7 +17,8 @@
     <string name="preview_background_img_des">Визуализация на фона</string>
     <string formatted="true" name="player_speed_text_format">Скорост (%.2fx)</string>
     <string formatted="true" name="rated_format">Оценка: %.1f</string>
-    <string formatted="true" name="new_update_format">Намерена е нова актуализация!\n%s -&gt; %s</string>
+    <string formatted="true" name="new_update_format">Намерена е нова актуализация!
+\n%s -&gt; %s</string>
     <string formatted="true" name="filler">Шаблон</string>
     <string formatted="true" name="duration_format">%d мин</string>
     <string name="app_name">CloudStream</string>
@@ -105,7 +106,7 @@
     <string name="continue_watching">Продължете да гледате</string>
     <string name="action_remove_watching">Премахване</string>
     <string name="action_open_watching">Повече информация</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Може да е необходим VPN, за да работи правилно този доставчик</string>
     <string name="vpn_torrent">Този доставчик е торент, препоръчва се VPN</string>
     <string name="provider_info_meta">Метаданните не се предоставят от сайта, зареждането на видео ще бъде неуспешно, ако не съществува на сайта.</string>
@@ -135,8 +136,7 @@
     <string name="double_tap_to_seek_settings_des">Докоснете два пъти от дясната или лявата страна, за да превъртите напред или назад</string>
     <string name="double_tap_to_pause_settings_des">Докоснете в средата, за да направите пауза</string>
     <string name="use_system_brightness_settings">Използвайте яркостта на системата</string>
-    <string name="use_system_brightness_settings_des">Използвайте системна яркост в плейъра на приложението вместо тъмно
-        наслагване</string>
+    <string name="use_system_brightness_settings_des">Използвайте системна яркост в плейъра на приложението вместо тъмно наслагване</string>
     <string name="episode_sync_settings">Актуализирайте прогреса на гледане</string>
     <string name="episode_sync_settings_des">Автоматично синхронизирайте прогреса на текущия си епизод</string>
     <string name="restore_settings">Възстановете данните от архив</string>
@@ -175,8 +175,7 @@
     <string name="copy_link_toast">Връзката е копирана в клипборда</string>
     <string name="play_episode_toast">Пусни епизода</string>
     <string name="subs_default_reset_toast">Възстановяване на стойността по подразбиране</string>
-    <string name="acra_report_toast">За съжаление приложението се срина. Анонимен доклад за грешка ще бъде изпратен до
-        разработчиците</string>
+    <string name="acra_report_toast">За съжаление приложението се срина. Анонимен доклад за грешка ще бъде изпратен до разработчиците</string>
     <string name="season">Сезон</string>
     <string name="season_format">%s %d%s</string>
     <string name="no_season">Без сезон</string>
@@ -193,8 +192,10 @@
     <string name="resume">Продължи</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">30</string>
-    <string formatted="true" name="delete_message">Това ще изтрие за постоянно %s\nСигурни ли сте?</string>
-    <string formatted="true" name="resume_time_left">%dm\nостава</string>
+    <string formatted="true" name="delete_message">Това ще изтрие за постоянно %s
+\nСигурни ли сте\?</string>
+    <string formatted="true" name="resume_time_left">%dm
+\nостава</string>
     <string name="status_ongoing">Продължава</string>
     <string name="status_completed">Завършен</string>
     <string name="status">Статус</string>
@@ -223,8 +224,8 @@
     <string name="movies_singular">Филм</string>
     <string name="tv_series_singular">Серия</string>
     <string name="cartoons_singular">Анимационен филм</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
     <string name="torrent_singular">Торент</string>
     <string name="documentaries_singular">Документален филм</string>
     <string name="asian_drama_singular">Азиатска драма</string>
@@ -320,7 +321,7 @@
     <string name="upload_sync">Синхронизиране</string>
     <string name="sync_score">Оценен</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string formatted="true" name="authenticated_user">%s удостоверен</string>
     <string formatted="true" name="authenticated_user_fail">Не можах да вляза в %s</string>
@@ -426,7 +427,7 @@
     <string name="view_public_repositories_button">Вижте хранилищата на общността</string>
     <string name="view_public_repositories_button_short">Публичен списък</string>
     <string name="uppercase_all_subtitles">Всички субтитри с главни букви</string>
-    <string name="download_all_plugins_from_repo">Изтегляне на всички добавки от това хранилище?</string>
+    <string name="download_all_plugins_from_repo">Изтегляне на всички добавки от това хранилище\?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Деактивиран)</string>
     <string name="tracks">Потоци</string>
     <string name="audio_tracks">Аудио потоци</string>
diff --git a/app/src/main/res/values-bp/strings.xml b/app/src/main/res/values-bp/strings.xml
index ebc3ecd2..2c2e1303 100644
--- a/app/src/main/res/values-bp/strings.xml
+++ b/app/src/main/res/values-bp/strings.xml
@@ -10,7 +10,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
@@ -20,7 +20,8 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Velocidade (%.2fx)</string>
     <string name="rated_format" formatted="true">Nota: %.1f</string>
-    <string name="new_update_format" formatted="true">Nova atualização encontrada!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Nova atualização encontrada!
+\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
@@ -107,7 +108,7 @@
     <string name="continue_watching">Continue Assistindo</string>
     <string name="action_remove_watching">Remover</string>
     <string name="action_open_watching">Mais Info</string>
-    <string name="action_open_play">@string/home_play </string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Uma VPN pode ser necessária para esse fornecedor funcionar corretamente</string>
     <string name="vpn_torrent">Esse fornecedor é um torrent, uma VPN é recomendada</string>
     <string name="provider_info_meta">Metadados não são oferecidas pelo site, o carregamento do video pode falhar se ele não existir no site.</string>
@@ -174,9 +175,7 @@
     <string name="copy_link_toast">Link copiado para área de transferência</string>
     <string name="play_episode_toast">Assistir Episódio</string>
     <string name="subs_default_reset_toast">Restaurar para o padrão</string>
-    <string name="acra_report_toast">Desculpe, a aplicação travou. Um relatório de erro anônimo será enviado para os
-       desenvolvedores
-    </string>
+    <string name="acra_report_toast">Desculpe, a aplicação travou. Um relatório de erro anônimo será enviado para os desenvolvedores</string>
     <string name="season">Temporada</string>
     <string name="no_season">Nenhuma Temporada</string>
     <string name="episode">Episódio</string>
@@ -190,8 +189,10 @@
     <string name="resume">Retomar</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Isso apagará %s permanentemente\nVocê tem certeza?</string>
-    <string name="resume_time_left" formatted="true">%dm\nsobrando</string>
+    <string name="delete_message" formatted="true">Isso apagará %s permanentemente
+\nVocê tem certeza\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nsobrando</string>
     <string name="status_ongoing">Em andamento</string>
     <string name="status_completed">Concluído</string>
     <string name="status">Estado</string>
@@ -221,8 +222,8 @@
     <string name="movies_singular">Filme</string>
     <string name="tv_series_singular">Série</string>
     <string name="cartoons_singular">Desenho Animado</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Documentário</string>
     <string name="asian_drama_singular">Drama Asiático</string>
@@ -277,22 +278,7 @@
     <string name="resize_fill">Esticar</string>
     <string name="resize_zoom">Zoom</string>
     <string name="legal_notice">Aviso Legal</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
-        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
-
-        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
-
-        The app is purely for educational and personal use.
-
-        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down.
-        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or
-        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
-        user-friendly interface.
-
-        It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the
-        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
-        CloudStream 3 at your own risk.
-    </string>
+    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Geral</string>
     <string name="random_button_settings">Botão Aleatório</string>
     <string name="random_button_settings_desc">Mostra o botão Aleatório na página inicial</string>
@@ -337,7 +323,7 @@
     <string name="upload_sync">Sincronizar</string>
     <string name="sync_score">Nota</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s autenticado</string>
     <string name="authenticated_user_fail" formatted="true">Falha em autenticar para %s</string>
@@ -436,7 +422,7 @@
     <string name="view_public_repositories_button">Ver repositórios da comunidade</string>
     <string name="view_public_repositories_button_short">Lista pública</string>
     <string name="uppercase_all_subtitles">Todas as legendas em maiúsculas</string>
-    <string name="download_all_plugins_from_repo">Transferir todos os plugins deste repositório?</string>
+    <string name="download_all_plugins_from_repo">Transferir todos os plugins deste repositório\?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Desativado)</string>
     <string name="autoplay_next_settings">Reproduzir automaticamente próximo episódio</string>
     <string name="autoplay_next_settings_des">Começa o próximo episódio quando o atual termina</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 5a2d44d4..87d5195e 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -6,7 +6,7 @@
     <string name="cast_format" formatted="true">Hrají: %s</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Plakát</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
@@ -16,7 +16,8 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Rychlost (%.2fx)</string>
     <string name="rated_format" formatted="true">Hodnocení: %.1f</string>
-    <string name="new_update_format" formatted="true">Nalezena nová aktualizace!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Nalezena nová aktualizace!
+\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Výplň</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
@@ -102,7 +103,7 @@
     <string name="continue_watching">Pokračovat ve sledování</string>
     <string name="action_remove_watching">Odebrat</string>
     <string name="action_open_watching">Další informace</string>
-    <string name="action_open_play">@string/home_play </string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Aby tento poskytovatel fungoval správně, budete možná potřebovat VPN</string>
     <string name="vpn_torrent">Tento poskytovatel je torrent, je doporučená VPN</string>
     <string name="provider_info_meta">Web neposkytnul žádná metadata, načítání videa selže, pokud na webu neexistuje.</string>
@@ -127,13 +128,10 @@
     <string name="double_tap_to_seek_settings">Dvojité klepnutí pro posun</string>
     <string name="double_tap_to_pause_settings">Dvojité klepnutí pro pozastavení</string>
     <string name="double_tap_to_seek_amount_settings">Množství času k posunu</string>
-    <string name="double_tap_to_seek_settings_des">Klepněte dvakrát vpravo nebo vlevo pro posun vpřed nebo vzad
-    </string>
+    <string name="double_tap_to_seek_settings_des">Klepněte dvakrát vpravo nebo vlevo pro posun vpřed nebo vzad</string>
     <string name="double_tap_to_pause_settings_des">Klepněte doprostřed pro pozastavení</string>
     <string name="use_system_brightness_settings">Použít systémový jas</string>
-    <string name="use_system_brightness_settings_des">V přehrávači použít systémov
-        překrytí
-    </string>
+    <string name="use_system_brightness_settings_des">V přehrávači použít systémov překrytí</string>
     <string name="episode_sync_settings">Aktualizovat postup sledování</string>
     <string name="episode_sync_settings_des">Automaticky synchronizovat postup sledování současné epizody</string>
     <string name="restore_settings">Obnovit data ze zálohy</string>
@@ -168,9 +166,7 @@
     <string name="copy_link_toast">Odkaz zkopírován do schránky</string>
     <string name="play_episode_toast">Přehrát epizodu</string>
     <string name="subs_default_reset_toast">Obnovit na výchozí hodnoty</string>
-    <string name="acra_report_toast">Omlouváme se, aplikace spadla. Vývojářům bude odesláno anonymní hlášení
-        o pádu
-    </string>
+    <string name="acra_report_toast">Omlouváme se, aplikace spadla. Vývojářům bude odesláno anonymní hlášení o pádu</string>
     <string name="season">Sezóna</string>
     <string name="no_season">Žádná sezóna</string>
     <string name="episode">Epizoda</string>
@@ -184,8 +180,10 @@
     <string name="resume">Pokračovat</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Toto nevratně smaže %s\nJste si jisti?</string>
-    <string name="resume_time_left" formatted="true">%dm\nzbývá</string>
+    <string name="delete_message" formatted="true">Toto nevratně smaže %s
+\nJste si jisti\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nzbývá</string>
     <string name="status_ongoing">Probíhající</string>
     <string name="status_completed">Dokončena</string>
     <string name="status">Stav</string>
@@ -213,8 +211,8 @@
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Seriál</string>
     <string name="cartoons_singular">Animovaný</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Dokument</string>
     <string name="asian_drama_singular">Asijské drama</string>
@@ -265,22 +263,7 @@
     <string name="resize_fill">Roztáhnout</string>
     <string name="resize_zoom">Přiblížit</string>
     <string name="legal_notice">Odmítnutí odpovědnosti</string>
-    <string name="legal_notice_text" translatable="false">Jakékoli právní otázky týkající se obsahu této aplikace
-        je třeba řešit se samotnými hostiteli a poskytovateli souborů, protože s nimi nejsme nijak spojeni.
-
-        V případě porušení autorských práv se obraťte přímo na odpovědné strany nebo na webové stránky, na kterých se streamování odehrává.
-
-        Aplikace je určena výhradně pro vzdělávací a osobní účely.
-
-        CloudStream 3 v aplikaci nehostuje žádný obsah a nemá žádnou kontrolu nad tím, jaká média jsou v aplikaci umístěna nebo odstraněna.
-        CloudStream 3 funguje jako jakýkoli jiný vyhledávač, například Google. Služba CloudStream 3 nehostuje, nenahrává ani
-        nespravuje žádná videa, filmy ani obsah. Pouze vyhledává, agreguje a zobrazuje odkazy v pohodlném,
-        uživatelsky přívětivém rozhraní.
-
-        Pouze shromažďuje webové stránky třetích stran, které jsou veřejně přístupné prostřednictvím jakéhokoli běžného webového prohlížeče. Je
-        odpovědností uživatele, aby se vyvaroval jakýchkoli akcí, které by mohly porušovat zákony platné v jeho lokalitě. Použijte
-        CloudStream 3 na vlastní nebezpečí.
-    </string>
+    <string name="legal_notice_text" translatable="false">Jakékoli právní otázky týkající se obsahu této aplikace je třeba řešit se samotnými hostiteli a poskytovateli souborů, protože s nimi nejsme nijak spojeni. V případě porušení autorských práv se obraťte přímo na odpovědné strany nebo na webové stránky, na kterých se streamování odehrává. Aplikace je určena výhradně pro vzdělávací a osobní účely. CloudStream 3 v aplikaci nehostuje žádný obsah a nemá žádnou kontrolu nad tím, jaká média jsou v aplikaci umístěna nebo odstraněna. CloudStream 3 funguje jako jakýkoli jiný vyhledávač, například Google. Služba CloudStream 3 nehostuje, nenahrává ani nespravuje žádná videa, filmy ani obsah. Pouze vyhledává, agreguje a zobrazuje odkazy v pohodlném, uživatelsky přívětivém rozhraní. Pouze shromažďuje webové stránky třetích stran, které jsou veřejně přístupné prostřednictvím jakéhokoli běžného webového prohlížeče. Je odpovědností uživatele, aby se vyvaroval jakýchkoli akcí, které by mohly porušovat zákony platné v jeho lokalitě. Použijte CloudStream 3 na vlastní nebezpečí.</string>
     <string name="category_general">Obecné</string>
     <string name="random_button_settings">Náhodné tlačítko</string>
     <string name="random_button_settings_desc">Zobrazit na domovské stránce náhodné tlačítko</string>
@@ -322,7 +305,7 @@
     <string name="upload_sync">Synchronizovat</string>
     <string name="sync_score">Hodnoceno</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">Přihlášeno k %s</string>
     <string name="authenticated_user_fail" formatted="true">Nepodařilo se přihlásit k %s</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 707069d1..dc7088cc 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -159,7 +159,8 @@
     <string name="resume">Συνέχιση</string>
     <string name="delete_message" formatted="true">Αυτό θα διαγράψει μόνιμα το %s
 \nΕίστε σίγουροι πως θέλετε να προχωρήσετε;</string>
-    <string name="resume_time_left" formatted="true">%dm\nαπομένουν</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nαπομένουν</string>
     <string name="status_ongoing">Σε εξέλιξη</string>
     <string name="status">Κατάσταση</string>
     <string name="year">Έτος</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d6b48cd7..08ae5bf1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -86,7 +86,7 @@
     <string name="episode_action_reload_links">Recargar enlaces</string>
     <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="delete_message" formatted="true">Esto eliminará %s permanentemente 
+    <string name="delete_message" formatted="true">Esto eliminará %s permanentemente
 \nEstá seguro\?</string>
     <string name="confirm_exit_dialog">Está seguro que quiere salir\?</string>
     <string name="popup_resume_download">Continuar Descarga</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index b1303012..a34c5a05 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -4,7 +4,11 @@
     <string name="pause">مکث</string>
     <string name="queued">در صف</string>
     <string name="download">بارگیری</string>
+    <string name="downloading">در حال بارگیری</string>
+    <string name="download_done">اتمام بارگیری</string>
+    <string name="stream">پخش آنلاین</string>
     <string name="download_failed">بارگیری ناموفق بود</string>
+    <string name="filter_bookmarks">فیلتر کردن علاقه مندی ها</string>
     <string name="search">جست‌وجو</string>
     <string name="resize_fit">اندازه‌کردن</string>
     <string name="resize_fill">پر کردن</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5402eabf..f0e112a8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -82,7 +82,8 @@
     <string name="delete">Supprimer</string>
     <string name="pause">Pause</string>
     <string name="resume">Reprendre</string>
-    <string name="delete_message">Cela va supprimer définitivement %s\nÊtes-vous sûr ?</string>
+    <string name="delete_message">Cela va supprimer définitivement %s
+\nÊtes-vous sûr \?</string>
     <string name="status_ongoing">En cours</string>
     <string name="status_completed">Terminé</string>
     <string name="status">Statut</string>
@@ -239,7 +240,7 @@
     <string name="continue_watching">Continuer à regarder</string>
     <string name="action_remove_watching">Retirer</string>
     <string name="action_open_watching">Plus d\'informations</string>
-    <string name="action_open_play">@string/home_play </string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Un VPN peut être nécessaire pour que ce fournisseur fonctionne correctement</string>
     <string name="vpn_torrent">Ce fournisseur est un torrent, un VPN est recommandé</string>
     <string name="provider_info_meta">Les métadonnées ne sont pas fournies par le site, le chargement de la vidéo échouera si elles n\'existent pas sur le site.</string>
@@ -269,9 +270,7 @@
     <string name="double_tap_to_seek_settings_des">Tapez deux fois sur le côté droit ou gauche pour aller en avant ou en arrière</string>
     <string name="double_tap_to_pause_settings_des">Tapez au milieu pour mettre en pause</string>
     <string name="use_system_brightness_settings">Utiliser la luminosité du système</string>
-    <string name="use_system_brightness_settings_des">Utiliser la luminosité du système dans le lecteur d\'applications au lieu du
-        sombre
-    </string>
+    <string name="use_system_brightness_settings_des">Utiliser la luminosité du système dans le lecteur d\'applications au lieu du sombre</string>
     <string name="episode_sync_settings">Mise à jour de la progression de la veille</string>
     <string name="episode_sync_settings_des">Synchronisation automatique de la progression de votre épisode en cours</string>
     <string name="restore_settings">Restaurer des données à partir d\'une sauvegarde</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index a8816ce8..f33a2336 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -2,7 +2,8 @@
 <!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">रफ्तार (%.2fx)</string>
-    <string name="new_update_format" formatted="true">नया अपडेट आया है!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">नया अपडेट आया है!
+\n%s -&gt; %s</string>
     <string name="title_home">होम</string>
     <string name="title_search">खोजें</string>
     <string name="title_downloads">डाउनलोड</string>
@@ -69,8 +70,7 @@
     <string name="eigengraumode_settings_des">प्लेयर में वीडियो की रफ्तार धिमी या तेज़ करता है</string>
     <string name="swipe_to_seek_settings_des">दाएं या बाएं तरफ स्वाइप करने से वीडियो को आगे पीछे करता है</string>
     <string name="swipe_to_change_settings_des">दाएं तरफ या बाएं तरफ स्वाइप करने से रोशिनी और आवाज़ को ऊपर नीचे करता है</string>
-    <string name="double_tap_to_seek_settings_des">दो बार दाएं या बाएं तरफ दबाने से वीडियो को आगे या पीछे करा जा सकता है
-    </string>
+    <string name="double_tap_to_seek_settings_des">दो बार दाएं या बाएं तरफ दबाने से वीडियो को आगे या पीछे करा जा सकता है</string>
     <string name="search">खोजें</string>
     <string name="settings_info">जानकारी</string>
     <string name="advanced_search_des">नतीजों को सूत्रों के हिसाब से बांटकर दिखता है</string>
@@ -88,13 +88,13 @@
     <string name="no_links_found_toast">कोई लिंक नही मिले</string>
     <string name="copy_link_toast">लिंक को क्लिपबोर्ड पे कॉपी करदिया गया</string>
     <string name="play_episode_toast">चलाये</string>
-    <string name="acra_report_toast">असुविधा के लिए खेद है, यह एप्प क्रैश हो गया है । एक गुमनाम रिपोर्ट निर्माताओं को भेज दी गयी है ।
-    </string>
+    <string name="acra_report_toast">असुविधा के लिए खेद है, यह एप्प क्रैश हो गया है । एक गुमनाम रिपोर्ट निर्माताओं को भेज दी गयी है ।</string>
     <string name="delete_file">फ़ाइल डिलीट करें</string>
     <string name="delete">डिलीट</string>
     <string name="pause">रोके</string>
     <string name="resume">वापिस चलाये</string>
-    <string name="delete_message">एज इस चीज़ को हमेशा के लिए नष्ट कर देगा %s\nक्या आपका निर्णय निश्चित है ?</string>
+    <string name="delete_message">एज इस चीज़ को हमेशा के लिए नष्ट कर देगा %s
+\nक्या आपका निर्णय निश्चित है \?</string>
     <string name="status_ongoing">अभी चालू है</string>
     <string name="status_completed">खत्म हो गया है</string>
     <string name="status">स्तिथि</string>
@@ -132,8 +132,8 @@
     <string name="dns_pref_summary">ISP ब्लॉक से छुटकारा पाएं</string>
     <string name="provider_lang_settings">सूत्र की भाषाएं</string>
     <string name="app_layout">ऐप का लेआउट</string>
-    <string name="preferred_media_settings">पसंदीदा मीडिया </string>
-    <string name="download_path_pref"> डाउनलोड करने का मार्ग</string>
+    <string name="preferred_media_settings">पसंदीदा मीडिया</string>
+    <string name="download_path_pref">डाउनलोड करने का मार्ग</string>
     <string name="display_subbed_dubbed_settings">Dubbed या Subbed Anime दिखाये</string>
     <string name="tv_layout">टीवी लेआउट</string>
     <string name="phone_layout">फ़ोन लेआउट</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 2bbfaee6..837a2201 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -19,7 +19,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
@@ -29,7 +29,8 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Brzina (%.2fx)</string>
     <string name="rated_format" formatted="true">Ocijenjeno: %.1f</string>
-    <string name="new_update_format" formatted="true">Pronađeno novo ažuriranje!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Pronađeno novo ažuriranje!
+\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Umetak</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
@@ -118,7 +119,7 @@
     <string name="continue_watching">Nastavite s gledanjem</string>
     <string name="action_remove_watching">Makni</string>
     <string name="action_open_watching">Više informacija</string>
-    <string name="action_open_play">@string/home_play </string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Za ispravan rad ovog pružatelja usluga može biti potreban VPN</string>
     <string name="vpn_torrent">Ovaj pružatelj usluga je torrent, preporučuje se VPN</string>
     <string name="provider_info_meta">Stranica ne daje metapodatke, učitavanje videozapisa neće uspjeti ako ne postoji na stranici.</string>
@@ -145,13 +146,10 @@
     <string name="double_tap_to_seek_settings">Dodirni dvaput za traženje</string>
     <string name="double_tap_to_pause_settings">Dodirni dvaput za pauziranje</string>
     <string name="double_tap_to_seek_amount_settings">Iznos preskakanja u playeru</string>
-    <string name="double_tap_to_seek_settings_des">Dvaput dodirni desnu ili lijevu stranu ekrana za pomicanje naprijed ili natrag
-    </string>
+    <string name="double_tap_to_seek_settings_des">Dvaput dodirni desnu ili lijevu stranu ekrana za pomicanje naprijed ili natrag</string>
     <string name="double_tap_to_pause_settings_des">Dodirni u sredinu zaslona za pauziranje</string>
     <string name="use_system_brightness_settings">Koristi svijetlinu u sustavu</string>
-    <string name="use_system_brightness_settings_des">Koristi svjetlinu sustava u playeru aplikacija umjesto tamnog
-        preklopa
-    </string>
+    <string name="use_system_brightness_settings_des">Koristi svjetlinu sustava u playeru aplikacija umjesto tamnog preklopa</string>
     <string name="episode_sync_settings">Ažuriraj napredak gledanja</string>
     <string name="episode_sync_settings_des">Automatski sinkroniziraj svoj trenutni napredak u epizodi</string>
     <string name="restore_settings">Vraćanje podataka iz sigurnosne kopije</string>
@@ -190,8 +188,7 @@
     <string name="copy_link_toast">Veza je kopirana u međuspremnik</string>
     <string name="play_episode_toast">Pokreni epizodu</string>
     <string name="subs_default_reset_toast">Vrati na zadanu vrijednost</string>
-    <string name="acra_report_toast">Nažalost, aplikacija se srušila. Anonimno izvješće o bugu bit će poslano developerima
-    </string>
+    <string name="acra_report_toast">Nažalost, aplikacija se srušila. Anonimno izvješće o bugu bit će poslano developerima</string>
     <string name="season">Sezona</string>
     <string name="no_season">Nema sezone</string>
     <string name="episode">Epizoda</string>
@@ -207,8 +204,10 @@
     <string name="resume">Nastavi</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Ovo će trajno izbrisati %s\nJeste li sigurni?</string>
-    <string name="resume_time_left" formatted="true">%dm\npreostalo</string>
+    <string name="delete_message" formatted="true">Ovo će trajno izbrisati %s
+\nJeste li sigurni\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\npreostalo</string>
     <string name="status_ongoing">U tijeku</string>
     <string name="status_completed">Završeno</string>
     <string name="status">Status</string>
@@ -239,8 +238,8 @@
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Serija</string>
     <string name="cartoons_singular">Crtić</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Dokumentarac</string>
     <string name="asian_drama_singular">Azijska drama</string>
@@ -297,22 +296,7 @@
     <string name="resize_fill">Rastegni</string>
     <string name="resize_zoom">Zoom</string>
     <string name="legal_notice">Obavijest</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
-        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
-
-        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
-
-        The app is purely for educational and personal use.
-
-        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down.
-        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or
-        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
-        user-friendly interface.
-
-        It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the
-        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
-        CloudStream 3 at your own risk.
-    </string>
+    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Općenito</string>
     <string name="random_button_settings">Random gumb</string>
     <string name="random_button_settings_desc">Prikaži random gumb na početnoj stranici</string>
@@ -351,7 +335,7 @@
     <string name="upload_sync">Sinkroniziraj</string>
     <string name="sync_score">Ocijenjeno</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">Ovjereno%s</string>
     <string name="authenticated_user_fail" formatted="true">Nije moguće prijaviti se na %s</string>
@@ -457,7 +441,7 @@
     <string name="view_public_repositories_button">Pregledajte repozitorije zajednice</string>
     <string name="view_public_repositories_button_short">Javni popis</string>
     <string name="uppercase_all_subtitles">Svi titlovi pisani velikim slovima</string>
-    <string name="download_all_plugins_from_repo">Preuzeti sve dodatke iz ovog repozitorija?</string>
+    <string name="download_all_plugins_from_repo">Preuzeti sve dodatke iz ovog repozitorija\?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Onemogućeno)</string>
     <string name="tracks">Zapis</string>
     <string name="audio_tracks">Audio zapis</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 5e515c56..83dc6ee9 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -5,7 +5,7 @@
     <string name="cast_format" formatted="true">Pemeran: %s</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
@@ -15,7 +15,8 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Kecepatan (%.2fx)</string>
     <string name="rated_format" formatted="true">Dinilai: %.1f</string>
-    <string name="new_update_format" formatted="true">Update baru ditemukan!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Update baru ditemukan!
+\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d mnt</string>
     <string name="app_name">CloudStream</string>
@@ -100,7 +101,7 @@
     <string name="continue_watching">Lanjutkan Menonton</string>
     <string name="action_remove_watching">Hapus</string>
     <string name="action_open_watching">Info lebih lanjut</string>
-    <string name="action_open_play">@string/home_play </string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Sebuah VPN mungkin diperlukan agar provider ini bisa bekerja dengan benar</string>
     <string name="vpn_torrent">Provider ini adalah sebuah torrent, VPN direkomendasikan</string>
     <string name="provider_info_meta">Metadata tidak disediakan oleh situs, loading video akan gagal jika tidak ada di situs.</string>
@@ -125,12 +126,10 @@
     <string name="double_tap_to_seek_settings">Tekan dua kali untuk mengubah waktu</string>
     <string name="double_tap_to_pause_settings">Tekan dua kali untuk menjeda</string>
     <string name="double_tap_to_seek_amount_settings">Jumlah pengubah waktu pemutar</string>
-    <string name="double_tap_to_seek_settings_des">Tekan dua kali di sisi kanan atau kiri untuk mengubah waktu ke depan atau ke belakang
-    </string>
+    <string name="double_tap_to_seek_settings_des">Tekan dua kali di sisi kanan atau kiri untuk mengubah waktu ke depan atau ke belakang</string>
     <string name="double_tap_to_pause_settings_des">Tekan di tengah untuk menjeda</string>
     <string name="use_system_brightness_settings">Gunakan pencerahan sistem</string>
-    <string name="use_system_brightness_settings_des">Gunakan pencerahan sistem di pemutar aplikasi dari pada hamparan gelap
-    </string>
+    <string name="use_system_brightness_settings_des">Gunakan pencerahan sistem di pemutar aplikasi dari pada hamparan gelap</string>
     <string name="episode_sync_settings">Update progres tontonan</string>
     <string name="episode_sync_settings_des">Sinkronisasikan progres episode saat ini secara otomatis</string>
     <string name="restore_settings">Pulihkan data dari cadangan</string>
@@ -165,8 +164,7 @@
     <string name="copy_link_toast">Tautan disalin ke papan klip</string>
     <string name="play_episode_toast">Putar Episode</string>
     <string name="subs_default_reset_toast">Ulang ke pengaturan default</string>
-    <string name="acra_report_toast">Maaf, aplikasi ngecrash. Laporan bug anonim akan dikirim ke developer
-    </string>
+    <string name="acra_report_toast">Maaf, aplikasi ngecrash. Laporan bug anonim akan dikirim ke developer</string>
     <string name="season">Season</string>
     <string name="no_season">Tidak Ada Season</string>
     <string name="episode">Episode</string>
@@ -180,8 +178,10 @@
     <string name="resume">Lanjutkan</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Ini akan secara permanen menghapus %s\nApakah anda yakin?</string>
-    <string name="resume_time_left" formatted="true">%dm\ntersisa</string>
+    <string name="delete_message" formatted="true">Ini akan secara permanen menghapus %s
+\nApakah anda yakin\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\ntersisa</string>
     <string name="status_ongoing">Masih Berlanjut</string>
     <string name="status_completed">Tamat</string>
     <string name="status">Status</string>
@@ -209,8 +209,8 @@
     <string name="movies_singular">Movie</string>
     <string name="tv_series_singular">Seri</string>
     <string name="cartoons_singular">Kartun</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Film Dokumenter</string>
     <string name="asian_drama_singular">Drama Asia</string>
@@ -261,22 +261,7 @@
     <string name="resize_fill">Regang</string>
     <string name="resize_zoom">Zoom</string>
     <string name="legal_notice">Peringatan</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
-        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
-
-        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
-
-        The app is purely for educational and personal use.
-
-        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down.
-        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or
-        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
-        user-friendly interface.
-
-        It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the
-        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
-        CloudStream 3 at your own risk.
-    </string>
+    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Umum</string>
     <string name="random_button_settings">Tombol Acak</string>
     <string name="random_button_settings_desc">Tampilkan tombol acak di Beranda</string>
@@ -312,7 +297,7 @@
     <string name="upload_sync">Sinkronisasi</string>
     <string name="sync_score">Skor</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s terautentikasi</string>
     <string name="authenticated_user_fail" formatted="true">Gagal masuk ke %s</string>
@@ -498,7 +483,7 @@
     <string name="pref_category_gestures">Gerakan</string>
     <string name="apk_installer_settings_des">Beberapa perangkat tidak mendukung penginstal paket mode baru. Coba mode lama jika pembaruan tidak dapat diinstal.</string>
     <string name="pref_category_actions">Aksi</string>
-    <string name="referer">Sumber</string>
+    <string name="referer">Referensi</string>
     <string name="yes">Ya</string>
     <string name="extension_install_first">Pasang dulu fitur tambahan</string>
     <string name="all_languages_preference">Semua Bahasa</string>
@@ -526,4 +511,5 @@
     <string name="plugin_downloaded">Plugin Terunduh</string>
     <string name="delayed_update_notice">Aplikasi akan diperbaharui pada saat keluar</string>
     <string name="update_started">Pembaharuan Dimulai</string>
+    <string name="action_remove_from_watched">Hapus dari tontonan</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f27f7c13..b4ba292e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -9,7 +9,7 @@
     <string name="next_episode_time_min_format" formatted="true">%d min</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Poster episodio</string>
     <string name="home_main_poster_img_des">Poster principale</string>
     <string name="home_next_random_img_des">Prossimo casuale</string>
@@ -19,7 +19,8 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Velocità (%.2fx)</string>
     <string name="rated_format" formatted="true">Valutato: %.1f</string>
-    <string name="new_update_format" formatted="true">Nuovo aggiornamento trovato!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Nuovo aggiornamento trovato!
+\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <!-- <string name="app_name">CloudStream</string> -->
@@ -107,7 +108,7 @@
     <string name="continue_watching">Continua a guardare</string>
     <string name="action_remove_watching">Rimuovi</string>
     <string name="action_open_watching">Più info</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Potrebbe essere necessaria una VPN per far funzionare correttamente questo provider</string>
     <string name="vpn_torrent">Questo provider è un torrent, si raccomanda una VPN</string>
     <string name="provider_info_meta">I metadati non sono forniti dal sito, il caricamento del video fallirà se non esiste sul sito.</string>
@@ -193,8 +194,10 @@
     <string name="resume">Riprendi</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Stai per eliminare permanentemente %s\nSei sicuro?</string>
-    <string name="resume_time_left" formatted="true">%dm\nrimanenti</string>
+    <string name="delete_message" formatted="true">Stai per eliminare permanentemente %s
+\nSei sicuro\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nrimanenti</string>
     <string name="status_ongoing">In corso</string>
     <string name="status_completed">Completato</string>
     <string name="status">Stato</string>
@@ -321,7 +324,7 @@
     <string name="upload_sync">Sincronizza</string>
     <string name="sync_score">Valutato</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s autenticato</string>
     <string name="authenticated_user_fail" formatted="true">Impossibile autenticarsi a %s</string>
@@ -428,7 +431,7 @@
     <string name="view_public_repositories_button">Vedi le repository della community</string>
     <string name="view_public_repositories_button_short">Lista pubblica</string>
     <string name="uppercase_all_subtitles">Tutti i sottotitoli in maiuscolo</string>
-    <string name="download_all_plugins_from_repo">Scaricare tutti i plugin da questa repository?</string>
+    <string name="download_all_plugins_from_repo">Scaricare tutti i plugin da questa repository\?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Disabilitato)</string>
     <string name="tracks">Tracce</string>
     <string name="audio_tracks">Traccia audio</string>
@@ -507,4 +510,5 @@
     <string name="delayed_update_notice">L\'app verrà aggiornata all\'uscita</string>
     <string name="update_started">Aggiornamento avviato</string>
     <string name="plugin_downloaded">Plugin scaricato</string>
+    <string name="action_remove_from_watched">Rimuovi dai già visti</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index a6b3daec..efe0a1d8 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -1,2 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 19d1bc6e..7251d0d7 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -3,7 +3,8 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Брзина (%.2fx)</string>
     <string name="rated_format" formatted="true">Оценето: %.1f</string>
-    <string name="new_update_format" formatted="true">Пронајдена нова верзија на апликацијата!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Пронајдена нова верзија на апликацијата!
+\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Филтер</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Дома</string>
@@ -134,7 +135,8 @@
     <string name="delete">Избриши</string>
     <string name="pause">Паузирај</string>
     <string name="resume">Продолжи</string>
-    <string name="delete_message">Ова трајно ќе го избрише %s\nДали си сигурен?</string>
+    <string name="delete_message">Ова трајно ќе го избрише %s
+\nДали си сигурен\?</string>
     <string name="status_ongoing">Во тек</string>
     <string name="status_completed">Завршени</string>
     <string name="status">Статус</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index b60aadae..b6ad3a80 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -3,7 +3,8 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">വേഗം (%.2fx)</string>
     <string name="rated_format" formatted="true">റേറ്റിംഗ്: %.1f</string>
-    <string name="new_update_format" formatted="true">പുതിയ അപ്ഡേറ്റ്\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">പുതിയ അപ്ഡേറ്റ്
+\n%s -&gt; %s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">ഹോം</string>
     <string name="title_search">തിരയുക</string>
@@ -66,14 +67,14 @@
     <string name="search_provider_text_providers">സ്രോതസ് അടിസ്ഥാനത്തിൽ തിരയുക</string>
     <string name="search_provider_text_types">തരം അടിസ്ഥാനത്തിൽ തിരയുക</string>
     <string name="benene_count_text">%d പഴം കൊടുത്തു</string>
-    <string name="benene_count_text_none">പഴം കൊടുത്തിട്ടില്ല </string>
+    <string name="benene_count_text_none">പഴം കൊടുത്തിട്ടില്ല</string>
     <!-- <string name="subs_auto_select_language">Auto Select Language</string>
     <string name="subs_download_languages">Download Languages</string> -->
     <string name="subs_hold_to_reset_to_default">റീസെറ് ചെയ്യാൻ അമർത്തിപ്പിടിക്കുക</string>
     <string name="continue_watching">തുടർന്നു കാണുക</string>
     <string name="action_remove_watching">നീക്കം ചെയ്യുക</string>
     <string name="action_open_watching">കൂടുതൽ വിവരം</string>
-    <string name="vpn_might_be_needed">ഈ സ്രോതസ് പ്രവൃത്തിക്കാൻ  VPN ഉപയോഗിക്കേണ്ടിവന്നേക്കാം</string>
+    <string name="vpn_might_be_needed">ഈ സ്രോതസ് പ്രവൃത്തിക്കാൻ VPN ഉപയോഗിക്കേണ്ടിവന്നേക്കാം</string>
     <string name="vpn_torrent">ഈ ടോറന്റ് സ്രോതസ് ഉപയോഗിക്കാൻ VPN ശുപാർശചെയ്യുന്നു</string>
     <string name="torrent_plot">വിവരണം</string>
     <string name="normal_no_plot">വിവരണം ലഭ്യമല്ല</string>
@@ -109,7 +110,7 @@
     <string name="benene">പഴം കൊടുക്കു</string>
     <string name="benene_des">പഴം കൊടുത്ത എണ്ണം</string>
     <string name="app_language">ആപ്പിന്റെ ഭാഷ</string>
-    <string name="no_chromecast_support_toast">ഈ സ്രോതസ് ക്രോംകാസ്റ് അനുവദിക്കുന്നില്ല </string>
+    <string name="no_chromecast_support_toast">ഈ സ്രോതസ് ക്രോംകാസ്റ് അനുവദിക്കുന്നില്ല</string>
     <string name="no_links_found_toast">ലിങ്കുകൾ ലഭ്യമല്ല</string>
     <string name="copy_link_toast">ലിങ്ക് പകർത്തിയിരിക്കുന്നു</string>
     <string name="play_episode_toast">എപ്പിസോഡ് പ്ലേയ് ചെയ്യുക</string>
@@ -122,7 +123,8 @@
     <string name="delete">ഡിലീറ്റ്</string>
     <string name="pause">നിർത്തുക</string>
     <string name="resume">തുടരുക</string>
-    <string name="delete_message">സ്ഥിരമായി %sനെ ഡിലീറ്റ് ചെയ്യുക\nഉറപ്പാണോ?</string>
+    <string name="delete_message">സ്ഥിരമായി %sനെ ഡിലീറ്റ് ചെയ്യുക
+\nഉറപ്പാണോ\?</string>
     <string name="status_ongoing">തുടരുന്നു</string>
     <string name="status_completed">പൂർത്തിയായി</string>
     <string name="status">അവസ്ഥ</string>
@@ -162,7 +164,7 @@
     <string name="video_aspect_ratio_resize">വലുപ്പം മാറ്റുക</string>
     <string name="video_source">സ്രോതസ്</string>
     <string name="video_skip_op">OP ഒഴിവാക്കു</string>
-    <string name="dont_show_again">ഇനിയും  കാണിക്കരുത്</string>
+    <string name="dont_show_again">ഇനിയും കാണിക്കരുത്</string>
     <string name="update">അപ്ഡേറ്റ്</string>
     <string name="watch_quality_pref">ഔചിത്യ വീഡിയോ ക്വാളിറ്റി</string>
     <string name="history">ചരിത്രം</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 60aa0bcf..c2561914 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -9,7 +9,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Aflevering Poster</string>
     <string name="home_main_poster_img_des">Hoofdposter</string>
     <string name="home_next_random_img_des">Volgende willekeurig</string>
@@ -19,7 +19,8 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Snelheid (%.2fx)</string>
     <string name="rated_format" formatted="true">Beoordeeld: %.1fAls</string>
-    <string name="new_update_format" formatted="true">Nieuwe update gevonden!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Nieuwe update gevonden!
+\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
@@ -108,7 +109,7 @@
     <string name="continue_watching">Doorgaan met kijken</string>
     <string name="action_remove_watching">Verwijder</string>
     <string name="action_open_watching">Meer Info</string>
-    <string name="action_open_play">@string/home_play </string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Een VPN kan nodig zijn om deze provider correct te laten werken</string>
     <string name="vpn_torrent">Deze provider is een torrent, een VPN wordt aanbevolen</string>
     <string name="provider_info_meta">Metadata wordt niet geleverd door de site, het laden van video\'s zal mislukken als deze niet op de site bestaat.</string>
@@ -173,7 +174,7 @@
     <string name="copy_link_toast">Link gekopieerd naar klembord</string>
     <string name="play_episode_toast">Aflevering afspelen</string>
     <string name="subs_default_reset_toast">Reset naar standaardwaarde</string>
-    <string name="acra_report_toast">Sorry, de applicatie is gecrasht. Er wordt een anoniem bugrapport naar de ontwikkelaars gestuurd </string>
+    <string name="acra_report_toast">Sorry, de applicatie is gecrasht. Er wordt een anoniem bugrapport naar de ontwikkelaars gestuurd</string>
     <string name="season">Seizoen</string>
     <string name="no_season">Geen seizoen</string>
     <string name="episode">Aflevering</string>
@@ -189,8 +190,10 @@
     <string name="resume">Hervatten</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Dit wordt zeker permanent verwijderd %s\nWeet u het zeker?</string>
-    <string name="resume_time_left" formatted="true">%dm\nremaining</string>
+    <string name="delete_message" formatted="true">Dit wordt zeker permanent verwijderd %s
+\nWeet u het zeker\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nremaining</string>
     <string name="status_ongoing">Voortdurende</string>
     <string name="status_completed">Voltooid</string>
     <string name="status">Status</string>
@@ -219,8 +222,8 @@
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Serie</string>
     <string name="cartoons_singular">Tekenfilm</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Documentaire</string>
     <string name="asian_drama_singular">Aziatisch drama</string>
@@ -256,7 +259,7 @@
     <string name="update">Update</string>
     <string name="watch_quality_pref">Gewenste kijkwaliteit</string>
     <string name="limit_title">Maximaal aantal tekens voor titel van videospeler</string>
-    <string name="limit_title_rez">Videospeler Resolutie </string>
+    <string name="limit_title_rez">Videospeler Resolutie</string>
     <string name="video_buffer_size_settings">Grootte videobuffer</string>
     <string name="video_buffer_length_settings">Lengte videobuffer</string>
     <string name="video_buffer_disk_settings">Video cache op schijf</string>
@@ -319,7 +322,7 @@
     <string name="upload_sync">Sync</string>
     <string name="sync_score">gewaardeerd</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">Geauthenticeerd %s</string>
     <string name="authenticated_user_fail" formatted="true">Mislukt om te verifiëren aan %s</string>
@@ -394,7 +397,7 @@
     <string name="skip_setup">Instelling overslaan</string>
     <string name="app_layout_subtext">Pas het uiterlijk van de app aan uw apparaat aan</string>
     <string name="crash_reporting_title">Crashrapportage</string>
-    <string name="preferred_media_subtext">Wat wil je zien?</string>
+    <string name="preferred_media_subtext">Wat wil je zien\?</string>
     <string name="setup_done">Klaar</string>
     <string name="action_mark_as_watched">Markeer als bekeken</string>
     <string name="history">Geschiedenis</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index f3807952..41bf704d 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Plakat</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Episode Plakat</string>
     <string name="home_main_poster_img_des">Main Plakat</string>
     <string name="home_next_random_img_des">Neste tilfeldig</string>
@@ -12,7 +12,8 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Avspillingshastighet (%.2fx)</string>
     <string name="rated_format" formatted="true">Vurdert: %.1f</string>
-    <string name="new_update_format" formatted="true">Ny oppdatering funnet!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Ny oppdatering funnet!
+\n%s -&gt; %s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Hjem</string>
     <string name="title_search">Søk</string>
@@ -142,7 +143,8 @@
     <string name="delete">Slett</string>
     <string name="pause">Stopp</string>
     <string name="resume">Gjenoppta</string>
-    <string name="delete_message">Dette vil slette %s\nEr du sikker?</string>
+    <string name="delete_message">Dette vil slette %s
+\nEr du sikker\?</string>
     <string name="status_ongoing">Pågående</string>
     <string name="status_completed">Fullført</string>
     <string name="status">Posisjon</string>
@@ -201,22 +203,7 @@
     <string name="app_theme_settings">App Tema</string>
     <string name="preferred_media_settings">Foretrukket Videoinnhold</string>
     <string name="legal_notice" translatable="false">Disclaimer</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
-        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
-
-        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
-
-        The app is purely for educational and personal use.
-
-        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down.
-        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or
-        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
-        user-friendly interface.
-
-        It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the
-        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
-        CloudStream 3 at your own risk.
-    </string>
+    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="cast_format" formatted="true">Besetning: %s</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="sort_clear">Tøm</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ed079c58..244ae2e1 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2,16 +2,17 @@
 <!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <string name="player_speed_text_format" formatted="true">Prędkość (%.2fx)</string>
     <string name="rated_format" formatted="true">Ocena: %.1f</string>
-    <string name="new_update_format" formatted="true">Znaleziono nową aktualizację!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Znaleziono nową aktualizację!
+\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_dub_sub_episode_text_format">%s Odc. %d</string>
-    <string name="result_poster_img_des">Plakat</string>
-    <string name="episode_poster_img_des">Plakat odcinka</string>
-    <string name="home_main_poster_img_des">Główny plakat</string>
+    <string name="result_poster_img_des">Obrazek</string>
+    <string name="episode_poster_img_des">Obrazek odcinka</string>
+    <string name="home_main_poster_img_des">Główny obrazek</string>
     <string name="home_next_random_img_des">Następny losowy</string>
     <string name="go_back_img_des">Wstecz</string>
-    <string name="home_change_provider_img_des">Zmień dostawcę</string>
+    <string name="home_change_provider_img_des">Zmień źródło</string>
     <string name="preview_background_img_des">Pogląd tła</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Główna</string>
@@ -23,7 +24,7 @@
     <string name="no_data">Brak danych</string>
     <string name="episode_more_options_des">Więcej opcji</string>
     <string name="next_episode">Następny odcinek</string>
-    <string name="next_episode_format">Odcinek %d będzie udostępniony</string>
+    <string name="next_episode_format">Odcinek %d wyjdzie za</string>
     <string name="result_tags">Gatunki</string>
     <string name="result_share">Udostępnij</string>
     <string name="result_open_in_browser">Otwórz w przeglądarce</string>
@@ -52,11 +53,11 @@
     <string name="download_failed">Błąd przy pobieraniu</string>
     <string name="download_canceled">Anulowano pobieranie</string>
     <string name="download_done">Zakończono pobieranie</string>
-    <string name="stream">Stream</string>
+    <string name="stream">Odtwórz</string>
     <string name="error_loading_links_toast">Błąd przy ładowaniu linków</string>
     <string name="download_storage_text">Pamięć wewnętrzna</string>
     <string name="app_dubbed_text">Dub</string>
-    <string name="app_subbed_text">Sub</string>
+    <string name="app_subbed_text">Nap</string>
     <string name="popup_delete_file">Usuń plik</string>
     <string name="popup_play_file">Odtwórz plik</string>
     <string name="popup_resume_download">Wznów pobieranie</string>
@@ -86,7 +87,7 @@
     <string name="subs_subtitle_elevation">Wzniesienie napisów</string>
     <string name="subs_font">Czcionka</string>
     <string name="subs_font_size">Rozmiar czcionki</string>
-    <string name="search_provider_text_providers">Szukaj według dostawców</string>
+    <string name="search_provider_text_providers">Szukaj według źródeł</string>
     <string name="search_provider_text_types">Szukaj według typów</string>
     <string name="benene_count_text">Dano %d bananów</string>
     <string name="benene_count_text_none">Brak bananów</string>
@@ -94,12 +95,12 @@
     <string name="subs_download_languages">Pobieranie języków</string>
     <string name="subs_subtitle_languages">Język napisów</string>
     <string name="subs_hold_to_reset_to_default">Przytrzymaj, aby zresetować</string>
-    <string name="subs_import_text" formatted="true">Importuj czcionki umieszczając je w %s</string>
+    <string name="subs_import_text" formatted="true">Importuj czcionki, umieszczając je w %s</string>
     <string name="continue_watching">Kontyntynuj oglądanie</string>
     <string name="action_remove_watching">Usuń</string>
     <string name="action_open_watching">Więcej informacji</string>
     <string name="vpn_might_be_needed">Połączenie przez VPN może być wymagane</string>
-    <string name="vpn_torrent">Ten dostawca jest torrentem, wskazane jest użycie połączenia VPN</string>
+    <string name="vpn_torrent">To źródło jest torrentem, wskazane jest użycie połączenia VPN</string>
     <string name="provider_info_meta">Metadane nie są dostarczane przez witrynę, ładowanie filmu nie powiedzie się, jeśli nie ma ich w witrynie.</string>
     <string name="torrent_plot">Opis</string>
     <string name="normal_no_plot">Nie znaleziono opisu</string>
@@ -107,25 +108,25 @@
     <string name="show_log_cat">Pokaż Logcat 🐈</string>
     <string name="picture_in_picture">Obraz-w-obrazie</string>
     <string name="picture_in_picture_des">Oglądaj w małym, pływającym okienku</string>
-    <string name="player_size_settings">Przycisk zmiany rozmiaru</string>
+    <string name="player_size_settings">Zmień rozmiar odtwarzacza</string>
     <string name="player_size_settings_des">Usuwanie czarnych ramek</string>
     <string name="player_subtitles_settings">Napisy</string>
     <string name="player_subtitles_settings_des">Ustawienia napisów</string>
     <string name="chromecast_subtitles_settings">Napisy Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Ustawienia napisów Chromecast</string>
-    <string name="eigengraumode_settings">Tryb Eigengrau</string>
+    <string name="eigengraumode_settings">Tryb Eigengravy</string>
     <string name="eigengraumode_settings_des">Ustawienia prędkości</string>
-    <string name="swipe_to_seek_settings">Przesuwaj aby przeglądać</string>
-    <string name="swipe_to_seek_settings_des">Przesuwaj w lewo lub prawo aby kontrolować czas</string>
-    <string name="swipe_to_change_settings">Przesuwaj aby zmienić ustawienia</string>
-    <string name="swipe_to_change_settings_des">Przesuwaj po lewej lub prawej stronie aby zmienić jasność i głośność</string>
+    <string name="swipe_to_seek_settings">Przesuń aby przewinąć</string>
+    <string name="swipe_to_seek_settings_des">Przesuń w lewo lub prawo aby kontrolować czas</string>
+    <string name="swipe_to_change_settings">Przesuń aby zmienić ustawienia</string>
+    <string name="swipe_to_change_settings_des">Przesuń góra-dół z lewej lub prawej aby zmienić jasność i głośność</string>
     <string name="autoplay_next_settings">Autoodtwarzanie następnego odcinka</string>
-    <string name="autoplay_next_settings_des">Rozpocznij następny odcinek po zakończeniu bieżącego</string>
-    <string name="double_tap_to_seek_amount_settings">Wielkość skoku przy podwójnym stuknięciu</string>
-    <string name="double_tap_to_seek_settings">Podwójne stuknięcie aby przeglądać</string>
-    <string name="double_tap_to_seek_settings_des">Stuknij 2 razy z prawej lub lewej strony aby przeglądać</string>
-    <string name="double_tap_to_pause_settings">Stuknij dwukrotnie, aby wstrzymać</string>
-    <string name="double_tap_to_pause_settings_des">Stuknij na środku, aby wstrzymać</string>
+    <string name="autoplay_next_settings_des">Rozpocznij następny odcinek po skończeniu bieżącego</string>
+    <string name="double_tap_to_seek_amount_settings">Czas przewinięcia przy podwójnym kliknięciu</string>
+    <string name="double_tap_to_seek_settings">Podwójne kliknięcie aby przewinąć</string>
+    <string name="double_tap_to_seek_settings_des">Kliknij 2 razy z prawej lub lewej strony aby przewinąć</string>
+    <string name="double_tap_to_pause_settings">Kliknij dwukrotnie aby wstrzymać</string>
+    <string name="double_tap_to_pause_settings_des">Kliknij na środku, aby zatrzymać wideo</string>
     <string name="use_system_brightness_settings">Użyj jasności systemowej</string>
     <string name="use_system_brightness_settings_des">Użyj jasności systemowej w odtwarzaczu aplikacji zamiast ciemnej nakładki</string>
     <string name="episode_sync_settings">Aktualizuj postęp oglądania</string>
@@ -142,23 +143,23 @@
     <string name="category_updates">Aktualizacje i kopia zapasowa</string>
     <string name="settings_info">Informacje</string>
     <string name="advanced_search">Zaawansowane wyszukiwanie</string>
-    <string name="advanced_search_des">Szukaj z podziałem na dostawców</string>
+    <string name="advanced_search_des">Szukaj z podziałem na źródła</string>
     <string name="bug_report_settings_off">Wysyłaj dane tylko przy awariach</string>
     <string name="bug_report_settings_on">Nie wysyłaj żadnych danych</string>
-    <string name="show_fillers_settings">Pokaż odcinek wypełniający dla anime</string>
+    <string name="show_fillers_settings">Pokaż fillery dla anime</string>
     <string name="show_trailers_settings">Pokaż zwiastuny</string>
-    <string name="kitsu_settings">Pokaż plakaty z Kitsu</string>
+    <string name="kitsu_settings">Pokaż obrazki z Kitsu</string>
     <string name="pref_filter_search_quality">Ukryj wybraną jakość wideo w wynikach wyszukiwania</string>
     <string name="automatic_plugin_updates">Automatyczne aktualizacje rozszerzeń</string>
     <string name="automatic_plugin_download">Automatyczne pobieranie rozszerzeń</string>
     <string name="updates_settings">Pokazuj aktualizacje</string>
-    <string name="updates_settings_des">Automatycznie wyszukuj aktualizacji przy starcie</string>
+    <string name="updates_settings_des">Automatycznie wyszukuj aktualizacje przy starcie</string>
     <string name="uprereleases_settings">Aktualizuj do wersji beta</string>
-    <string name="uprereleases_settings_des">Wyszukuj wersji beta, zamiast pełnych wydań</string>
+    <string name="uprereleases_settings_des">Wyszukuj wersji beta, zamiast oficjalnych wydań</string>
     <string name="github">Github</string>
-    <string name="lightnovel">Aplikacja do noweli</string>
-    <string name="anim">Aplikacja do anime</string>
-    <string name="discord">Discord</string>
+    <string name="lightnovel">Aplikacja do light novel od nas</string>
+    <string name="anim">Aplikacja do anime od nas</string>
+    <string name="discord">Serwer Discord</string>
     <string name="benene">Daj banana programistom</string>
     <string name="benene_des">Dano banana</string>
     <string name="app_language">Język aplikacji</string>
@@ -167,7 +168,7 @@
     <string name="copy_link_toast">Skopiowano do schowka</string>
     <string name="play_episode_toast">Odtwórz odcinek</string>
     <string name="subs_default_reset_toast">Zresetowano</string>
-    <string name="acra_report_toast">Awaria aplikacji. Anonimowe zgłoszenie błedu zostanie wysłane programistom</string>
+    <string name="acra_report_toast">Awaria aplikacji. Anonimowe zgłoszenie błędu zostanie wysłane programistom</string>
     <string name="season">Sezon</string>
     <string name="season_format">%s %d%s</string>
     <string name="no_season">Brak sezonu</string>
@@ -184,9 +185,11 @@
     <string name="resume">Odtwórz</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Spowoduje to trwałe usunięcie %s\nCzy jesteś pewien?</string>
-    <string name="resume_time_left" formatted="true">%dm\npozostało</string>
-    <string name="status_ongoing">Bierzący</string>
+    <string name="delete_message" formatted="true">Spowoduje to trwałe usunięcie %s
+\nCzy jesteś pewien\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\npozostało</string>
+    <string name="status_ongoing">Bieżący</string>
     <string name="status_completed">Zakończone</string>
     <string name="status">Status</string>
     <string name="year">Rok</string>
@@ -202,13 +205,13 @@
     <string name="app_storage">Aplikacja</string>
     <!--plural-->
     <string name="movies">Filmy</string>
-    <string name="tv_series">Serial telewizyjny</string>
+    <string name="tv_series">Seriale telewizyjne</string>
     <string name="cartoons">Kreskówki</string>
     <string name="anime">Anime</string>
     <string name="torrent">Torrenty</string>
     <string name="documentaries">Filmy dokumentalne</string>
     <string name="ova">OVA</string>
-    <string name="asian_drama">Filmy azjatyckie</string>
+    <string name="asian_drama">Dramy azjatyckie</string>
     <string name="livestreams">Transmisje na żywo</string>
     <string name="nsfw">NSFW</string>
     <string name="others">Inne</string>
@@ -218,7 +221,7 @@
     <string name="cartoons_singular">Kreskówka</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Film dokumentalny</string>
-    <string name="asian_drama_singular">Film azjatycki</string>
+    <string name="asian_drama_singular">Drama azjatycka</string>
     <string name="live_singular">Transmisja na żywo</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Inne</string>
@@ -226,48 +229,48 @@
     <string name="remote_error">Zdalny błąd</string>
     <string name="render_error">Błąd renderowania</string>
     <string name="unexpected_error">Nieoczekiwany błąd odtwarzacza</string>
-    <string name="storage_error">Błąd pobierania, sprawdź uprawnienia</string>
-    <string name="episode_action_chromecast_episode">Chromecast odcinka</string>
-    <string name="episode_action_chromecast_mirror">Chromecast mirroru</string>
+    <string name="storage_error">Błąd pobierania, sprawdź uprawnienia aplikacji</string>
+    <string name="episode_action_chromecast_episode">odcinek Chromecast</string>
+    <string name="episode_action_chromecast_mirror">mirror dla Chromecast</string>
     <string name="episode_action_play_in_app">Odtwórz w aplikacji</string>
     <string name="episode_action_play_in_format">Odtwórz w %s</string>
     <string name="episode_action_play_in_browser">Odtwórz w przeglądarce</string>
     <string name="episode_action_copy_link">Kopiuj link</string>
     <string name="episode_action_auto_download">Automatyczne pobieranie</string>
     <string name="episode_action_download_mirror">Pobierz mirror</string>
-    <string name="episode_action_reload_links">Odświerz linki</string>
+    <string name="episode_action_reload_links">Odśwież linki</string>
     <string name="episode_action_download_subtitle">Pobierz napisy</string>
     <string name="show_hd">Etykieta jakości</string>
     <string name="show_dub">Etykieta dubbingu</string>
     <string name="show_sub">Etykieta napisów</string>
     <string name="show_title">Tytuł</string>
-    <string name="poster_ui_settings">Włącz elementy interfejsu na plakatach</string>
+    <string name="poster_ui_settings">Pokaż elementy interfejsu na obrazkach</string>
     <string name="no_update_found">Nie znaleziono aktualizacji</string>
-    <string name="check_for_update">Sprawdź czy jest aktualizacja</string>
+    <string name="check_for_update">Sprawdź, czy jest aktualizacja</string>
     <string name="video_lock">Zablokuj</string>
-    <string name="video_aspect_ratio_resize">Rozmiar</string>
-    <string name="video_source">Źródlo</string>
+    <string name="video_aspect_ratio_resize">Zmień rozmiar</string>
+    <string name="video_source">Źródło</string>
     <string name="video_skip_op">Pomiń OP</string>
     <string name="dont_show_again">Nie pokazuj ponownie</string>
     <string name="skip_update">Pomiń tę aktualizację</string>
     <string name="update">Aktualizacja</string>
     <string name="watch_quality_pref">Domyślna jakość</string>
-    <string name="limit_title">Maksymalna ilość znaków tytułu w odtwarzaczu</string>
-    <string name="limit_title_rez">Zawartość tytułu w odtwarzaczu</string>
+    <string name="limit_title">Maksymalna ilość znaków w tytule odtwarzacza</string>
+    <string name="limit_title_rez">Rozdzielczość odtwarzacza wideo</string>
     <string name="video_buffer_size_settings">Rozmiar bufora wideo</string>
     <string name="video_buffer_length_settings">Długość bufora wideo</string>
     <string name="video_buffer_disk_settings">Pamięć podręczna wideo na dysku</string>
     <string name="video_buffer_clear_settings">Wyczyść pamięć podręczną wideo i obrazów</string>
-    <string name="video_ram_description">Ustawienie zbyt wysokiej wartości może powodować problemy w systemach z małą ilością pamięci RAM, takich jak urządzenia Android TV lub stare telefony.</string>
-    <string name="video_disk_description">Zbyt wysokie ustawienie może powodować problemy w systemach z małą ilością miejsca w pamięci, takich jak urządzenia Android TV.</string>
-    <string name="dns_pref">DNS przez HTTPS</string>
+    <string name="video_ram_description">Ustawienie zbyt wysokiej wartości może powodować problemy na urządzeniach z małą ilością pamięci RAM, takich jak urządzenia Android TV lub stare telefony.</string>
+    <string name="video_disk_description">Zbyt wysokie ustawienie może powodować problemy na urządzeniach z małą ilością dostęponej pamięci, takich jak urządzenia Android TV.</string>
+    <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Przydatne w pomijaniu blokad dostawców internetu</string>
     <string name="add_site_pref">Sklonuj stronę</string>
     <string name="remove_site_pref">Usuń stronę</string>
     <string name="add_site_summary">Dodaj klona istniejącej strony z innym adresem URL</string>
     <string name="download_path_pref">Ścieżka pobierania</string>
     <string name="nginx_url_pref">URL serwera Nginx</string>
-    <string name="display_subbed_dubbed_settings">Wyświetlanie Anime z dubbingiem/subbingiem</string>
+    <string name="display_subbed_dubbed_settings">Wyświetlanie Anime z dubbingiem/napisami</string>
     <string name="resize_fit">Dopasuj do ekranu</string>
     <string name="resize_fill">Rozciągnij</string>
     <string name="resize_zoom">Powiększ</string>
@@ -275,12 +278,12 @@
     <string name="category_general">Ogólne</string>
     <string name="random_button_settings">Przycisk do losowania</string>
     <string name="random_button_settings_desc">Pokaż przycisk do losowania na stronie głównej</string>
-    <string name="provider_lang_settings">Języki dostawców</string>
+    <string name="provider_lang_settings">Języki źródeł</string>
     <string name="app_layout">Układ aplikacji</string>
     <string name="preferred_media_settings">Preferowane media</string>
-    <string name="enable_nsfw_on_providers">Włącz NSFW u obsługiwanych dostawców</string>
+    <string name="enable_nsfw_on_providers">Włącz NSFW w obsługiwanych źródłach</string>
     <string name="subtitles_encoding">Kodowanie napisów</string>
-    <string name="category_providers">Dostawcy</string>
+    <string name="category_providers">Źródła</string>
     <string name="category_ui">Układ interfejsu</string>
     <string name="automatic">Automatyczny</string>
     <string name="tv_layout">Układ dla telewizorów</string>
@@ -288,8 +291,8 @@
     <string name="emulator_layout">Układ dla emulatorów</string>
     <string name="primary_color_settings">Kolor podstawowy</string>
     <string name="app_theme_settings">Motyw aplikacji</string>
-    <string name="bottom_title_settings">Pozycja tytułu względem plakatu</string>
-    <string name="bottom_title_settings_des">Ustaw tytuł pod plakatem</string>
+    <string name="bottom_title_settings">Pozycja tytułu względem obrazka</string>
+    <string name="bottom_title_settings_des">Ustaw tytuł pod obrazkiem</string>
     <string name="example_lang_name">Kod języka (pl)</string>
     <string name="login_format" formatted="true">%s %s</string>
     <string name="account">konto</string>
@@ -301,7 +304,7 @@
     <string name="add_sync">Dodaj synchronizację</string>
     <string name="added_sync_format" formatted="true">Dodano %s</string>
     <string name="upload_sync">Synchronizacja</string>
-    <string name="sync_score">Ocenione</string>
+    <string name="sync_score">Oceniono</string>
     <string name="sync_score_format" formatted="true">%d na 10</string>
     <string name="authenticated_user" formatted="true">Uwierzytelniono %s</string>
     <string name="authenticated_user_fail" formatted="true">Nie udało się uwierzytelnić %s</string>
@@ -312,9 +315,9 @@
     <string name="max">Maks</string>
     <string name="min">Min</string>
     <string name="subtitles_outline">Kontur</string>
-    <string name="subtitles_depressed">Wciśnięte</string>
+    <string name="subtitles_depressed">Obniżone</string>
     <string name="subtitles_shadow">Cień</string>
-    <string name="subtitles_raised">Zniesione</string>
+    <string name="subtitles_raised">Wzniesione</string>
     <string name="subtitle_offset">Synchronizacja napisów</string>
     <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Opóźnienie napisów</string>
@@ -327,7 +330,7 @@
     <string name="player_load_subtitles">Wczytaj z pliku</string>
     <string name="player_load_subtitles_online">Wczytaj z Internetu</string>
     <string name="downloaded_file">Pobrano plik</string>
-    <string name="actor_main">Główna</string>
+    <string name="actor_main">Główny</string>
     <string name="actor_supporting">Drugoplanowy</string>
     <string name="actor_background">Pomocniczy</string>
     <string name="home_source">Źródło</string>
@@ -349,7 +352,7 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-    <string name="poster_image">Obraz plakatu</string>
+    <string name="poster_image">Obrazek</string>
     <string name="category_player">Odtwarzacz</string>
     <string name="resolution_and_title">Rozdzielczość i tytuł</string>
     <string name="title">Tytuł</string>
@@ -358,26 +361,26 @@
     <string name="error_invalid_data">Niepoprawne dane</string>
     <string name="error_invalid_url">Niepoprawny URL</string>
     <string name="error">Błąd</string>
-    <string name="subtitles_remove_captions">Usuń informacje dla niesłyszących z napisów</string>
+    <string name="subtitles_remove_captions">Usuń CC z napisów</string>
     <string name="subtitles_remove_bloat">Usuń nadmiarowe informacje z napisów</string>
-    <string name="subtitles_filter_lang">Filtrowanie wg preferowanego języka mediów</string>
+    <string name="subtitles_filter_lang">Filtrowanie wg preferowanego języka</string>
     <string name="extras">Dodatki</string>
     <string name="trailer">Zwiastun</string>
     <string name="referer">Odsyłacz</string>
-    <string name="next">Dalej</string>
-    <string name="provider_languages_tip">Wyświetlaj filmy w wybranych językach</string>
-    <string name="previous">Cofnij</string>
-    <string name="skip_setup">Pomiń</string>
+    <string name="next">Następny</string>
+    <string name="provider_languages_tip">Wyświetlaj filmy w tych językach</string>
+    <string name="previous">Poprzedni</string>
+    <string name="skip_setup">Pomiń setup</string>
     <string name="app_layout_subtext">Dostosuj wygląd aplikacji do urządzenia</string>
-    <string name="crash_reporting_title">Przekazywanie błędów</string>
-    <string name="preferred_media_subtext">Preferowany rodzaj filmów</string>
+    <string name="crash_reporting_title">Zgłaszanie błędów</string>
+    <string name="preferred_media_subtext">Co chciałbyś obejrzeć\?</string>
     <string name="setup_done">Gotowe</string>
-    <string name="extensions">Dodatki</string>
+    <string name="extensions">Rozszerzenia</string>
     <string name="add_repository">Dodaj repozytorium</string>
     <string name="repository_name_hint">Nazwa repozytorium</string>
     <string name="repository_url_hint">Adres URL repozytorium</string>
-    <string name="plugin_loaded">Rozszerzenie załadowane</string>
-    <string name="plugin_deleted">Rozszerzenie usunięte</string>
+    <string name="plugin_loaded">Załadowano rozszerzenie</string>
+    <string name="plugin_deleted">Usunięto rozszerzenie</string>
     <string name="plugin_load_fail" formatted="true">Błąd ładowania %s</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">Rozpoczęto pobieranie %d %s…</string>
@@ -395,24 +398,24 @@
     <string name="plugins_updated">Zaaktualizowano %d rozszerzeń</string>
     <string name="blank_repo_message">CloudStream nie ma domyślnie zainstalowanych żadnych witryn. Musisz zainstalować witryny z repozytoriów.
 \n
-\nZ powodu bezmyślnego usunięcia DMCA przez Sky UK Limited 🤮 nie możemy zamieścić linku dowitryny z repozytoriami.
+\nZ powodu bezmyślnego usunięcia DMCA przez Sky UK Limited 🤮 nie możemy zamieścić linku do witryny z repozytoriami.
 \n
-\nDołącz do naszego Discorda lub szukaj online.</string>
+\nDołącz do naszego Discorda lub poszukaj online.</string>
     <string name="view_public_repositories_button">Zobacz repozytoria społeczności</string>
     <string name="view_public_repositories_button_short">Publiczna lista</string>
     <string name="uppercase_all_subtitles">Wszystkie napisy wielką literą</string>
-    <string name="download_all_plugins_from_repo">Pobrać wszystkie rozszerzenia z tego repozytorium?</string>
+    <string name="download_all_plugins_from_repo">Pobrać wszystkie rozszerzenia z tego repozytorium\?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Wyłączone)</string>
     <string name="tracks">Ścieżki</string>
     <string name="audio_tracks">Ścieżki audio</string>
     <string name="video_tracks">Ścieżki wideo</string>
     <string name="apply_on_restart">Zastosuj po ponownym uruchomieniu</string>
     <string name="safe_mode_title">Tryb bezpieczny włączony</string>
-    <string name="safe_mode_description">Wszystkie rozszerzenia zostały wyłączone z powodu awarii, aby pomóc Ci znaleźć ten, który powoduje problemy.</string>
-    <string name="safe_mode_crash_info">Wyświetl informacje o awarii</string>
+    <string name="safe_mode_description">Z powodu wystąpienia błędu wszystkie rozszerzenia zostały wyłączone, aby ułatwić wykrycie tego wadliwego.</string>
+    <string name="safe_mode_crash_info">Wyświetl informacje o błędzie</string>
     <string name="extension_rating" formatted="true">Ocena: %s</string>
     <string name="extension_description">Opis</string>
-    <string name="extension_version">Versja</string>
+    <string name="extension_version">Wersja</string>
     <string name="extension_status">Status</string>
     <string name="extension_size">Rozmiar</string>
     <string name="extension_authors">Autorzy</string>
@@ -431,7 +434,7 @@
     <string name="clear_history">Wyczyść historię</string>
     <string name="history">Historia</string>
     <string name="clipboard_too_large">Za dużo tekstu. Nie można skopiować do schowka.</string>
-    <string name="network_adress_example">Link do transmisji</string>
+    <string name="network_adress_example">Link do odtwarzania</string>
     <string name="play_with_app_name">Odtwórz w CloudStream</string>
     <string name="skip_type_format" formatted="true">Pomiń %s</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
@@ -446,11 +449,11 @@
     <string name="update_notification_downloading">Pobieranie aktualizacji aplikacji…</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="cast_format" formatted="true">Obsada: %s</string>
-    <string name="automatic_plugin_download_summary">Automatycznie instaluj wszystkie jeszcze nie zainstalowane wtyczki z dodanych repozytoriów.</string>
+    <string name="automatic_plugin_download_summary">Automatycznie instaluj wszystkie jeszcze niezainstalowane wtyczki z dodanych repozytoriów.</string>
     <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="skip_type_recap">Podsumowanie</string>
     <string name="apk_installer_settings">Instalator APK</string>
-    <string name="apk_installer_settings_des">Niektóre telefony nie obsługują nowego instalatora pakietów. Wypróbuj tryb kompatybilności, jeśli aktualizacje nie zostaną zainstalowane.</string>
+    <string name="apk_installer_settings_des">Niektóre telefony nie obsługują nowego instalatora pakietów. Wypróbuj tryb legacy, jeśli aktualizacje nie zostaną zainstalowane.</string>
     <string name="example_password">password123</string>
     <string name="ova_singular">\@string/ova</string>
     <string name="example_site_name">MojaFajnaWitryna</string>
@@ -470,12 +473,12 @@
     <string name="skip_type_intro">Intro</string>
     <string name="skip_type_mixed_ed">Mixed ending</string>
     <string name="enable_skip_op_from_database_des">Pokaż wyskakujące okienka pomijania dla niektórych segmentów</string>
-    <string name="pref_category_extensions">Dodatki</string>
+    <string name="pref_category_extensions">Rozszerzenia</string>
     <string name="pref_category_actions">Działania</string>
     <string name="pref_category_cache">Pamięć podręczna</string>
     <string name="redo_setup_process">Powtórz proces konfiguracji</string>
     <string name="pref_category_links">Linki</string>
-    <string name="pref_category_app_updates">Aktualizacje aplikacji</string>
+    <string name="pref_category_app_updates">Aktualizacje</string>
     <string name="pref_category_backup">Kopia zapasowa</string>
     <string name="pref_category_subtitles">Napisy</string>
     <string name="pref_category_gestures">Gesty</string>
@@ -486,7 +489,7 @@
     <string name="pref_category_looks">Wygląd</string>
     <string name="play_trailer_button">Odtwórz zwiastun</string>
     <string name="delayed_update_notice">Aplikacja zostanie zaktualizowana po wyjściu</string>
-    <string name="update_started">Aktualizacja rozpoczęta</string>
-    <string name="plugin_downloaded">Wtyczka pobrana</string>
+    <string name="update_started">Rozpoczęto aktualizację</string>
+    <string name="plugin_downloaded">Pobrano rozszerzenie</string>
     <string name="action_remove_from_watched">Usuń z obejrzanych</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 239d144e..28673fe2 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -9,7 +9,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Poster Episod</string>
     <string name="home_main_poster_img_des">Poster Principal</string>
     <string name="home_next_random_img_des">Următorul la Întâmplare</string>
@@ -19,7 +19,8 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Viteză (%.2fx)</string>
     <string name="rated_format" formatted="true">Evaluare: %.1f</string>
-    <string name="new_update_format" formatted="true">Actualizare nouă găsită!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Actualizare nouă găsită!
+\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <!-- <string name="app_name">CloudStream</string> -->
@@ -105,7 +106,7 @@
     <string name="continue_watching">Continuați să urmăriți</string>
     <string name="action_remove_watching">Eliminați</string>
     <string name="action_open_watching">Mai multe informații</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Există probabilitatea necesitații unui VPN pentru ca acest furnizor să funcționeze corespunzător</string>
     <string name="vpn_torrent">Acest furnizor este un torrent, se recomandă un VPN</string>
     <string name="provider_info_meta">Metadatele nu sunt furnizate de către site, există posibilitatea ca încărcarea videoclipului să eșueze.</string>
@@ -184,8 +185,10 @@
     <string name="resume">Continuă</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Sunteți pe cale să ștergeți definitiv %s\nSunteți sigur?</string>
-    <string name="resume_time_left" formatted="true">%dm\nrămas</string>
+    <string name="delete_message" formatted="true">Sunteți pe cale să ștergeți definitiv %s
+\nSunteți sigur\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nrămas</string>
     <string name="status_ongoing">În curs de desfășurare</string>
     <string name="status_completed">Finalizat</string>
     <string name="status">Status</string>
@@ -268,22 +271,7 @@
     <string name="resize_fill">Întindere</string>
     <string name="resize_zoom">Mărire</string>
     <string name="legal_notice">Aviz juridic (declinarea responsabilității și drepturi de autor)</string>
-    <string name="legal_notice_text">Orice probleme legale privind conținutul acestei aplicații ar trebui
-        să fie rezolvate cu furnizorii și gazdele actuale de fișiere, întrucât noi nu suntem afiliați cu aceștia.
-	    
-        În caz de încălcare a drepturilor de autor, vă rugăm să contactați direct părțile responsabile sau site-urile de streaming.
-
-        Aplicația este destinată exclusiv utilizării educaționale și personale.
-
-        CloudStream 3 nu găzduiește niciun fel de conținut în aplicație și nu are niciun control asupra conținutului media care este pus sau retras.
-        CloudStream 3 funcționează ca orice alt motor de căutare, cum ar fi Google. CloudStream 3 nu găzduiește, nu încarcă și
-        nu gestionează niciun videoclip, film sau conținut. Pur și simplu navighează, adună și afișează linkuri într-o interfață convenabilă
-        și ușor de utilizat.
-
-        Pur și simplu, acesta extrage paginile web ale unor terțe părți care sunt accesibile publicului prin intermediul oricărui browser web obișnuit.  Este
-        responsabilitatea utilizatorului de a evita orice acțiune care ar putea încălca legile care guvernează locația sa. Utilizați 
-        CloudStream 3 pe propria răspundere.
-    </string>
+    <string name="legal_notice_text">Orice probleme legale privind conținutul acestei aplicații ar trebui să fie rezolvate cu furnizorii și gazdele actuale de fișiere, întrucât noi nu suntem afiliați cu aceștia. În caz de încălcare a drepturilor de autor, vă rugăm să contactați direct părțile responsabile sau site-urile de streaming. Aplicația este destinată exclusiv utilizării educaționale și personale. CloudStream 3 nu găzduiește niciun fel de conținut în aplicație și nu are niciun control asupra conținutului media care este pus sau retras. CloudStream 3 funcționează ca orice alt motor de căutare, cum ar fi Google. CloudStream 3 nu găzduiește, nu încarcă și nu gestionează niciun videoclip, film sau conținut. Pur și simplu navighează, adună și afișează linkuri într-o interfață convenabilă și ușor de utilizat. Pur și simplu, acesta extrage paginile web ale unor terțe părți care sunt accesibile publicului prin intermediul oricărui browser web obișnuit. Este responsabilitatea utilizatorului de a evita orice acțiune care ar putea încălca legile care guvernează locația sa. Utilizați CloudStream 3 pe propria răspundere.</string>
     <string name="category_general">General</string>
     <string name="random_button_settings">Aleatoriu</string>
     <string name="random_button_settings_desc">Afișați butonul Aleatoriu pe pagina de start</string>
@@ -320,7 +308,7 @@
     <string name="upload_sync">Sincronizare</string>
     <string name="sync_score">Recenzie</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s autentificat</string>
     <string name="authenticated_user_fail" formatted="true">Imposibil de autentificat la %s</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 49ed0fb3..930437c7 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -4,9 +4,9 @@
     <string name="no">Нет</string>
     <string name="yes">Да</string>
     <string name="tracks">Треки</string>
-    <string name="queued">в очереди</string>
+    <string name="queued">В очереди</string>
     <string name="resize_zoom">Приблизить</string>
-    <string name="download">Скачать</string>
+    <string name="download">Загрузить</string>
     <string name="search">Поиск</string>
     <string name="resize_fill">Заполнить</string>
     <string name="download_failed">Скачать неудачный</string>
@@ -16,7 +16,7 @@
     <string name="pause">Пауза</string>
     <string name="cast_format" formatted="true">Актёрский состав: %s</string>
     <string name="show_title">Название источника</string>
-    <string name="login">Вход</string>
+    <string name="login">Войти</string>
     <string name="none">Нет</string>
     <string name="title">Название</string>
     <string name="loading">Загрузка…</string>
@@ -29,7 +29,7 @@
     <string name="home_main_poster_img_des">Главный плакат</string>
     <string name="home_next_random_img_des">Следующий случайный</string>
     <string name="go_back_img_des">Вернуться</string>
-    <string name="home_change_provider_img_des">Сменить поставщика</string>
+    <string name="home_change_provider_img_des">Изменить поставщика</string>
     <string name="preview_background_img_des">Фон предпросмотр</string>
     <string name="player_speed_text_format" formatted="true">Скорость (%.2fx)</string>
     <string name="rated_format" formatted="true">Оценили: %.1f</string>
@@ -39,7 +39,7 @@
     <string name="app_name">CloudStream</string>
     <string name="action_remove_from_bookmarks">Убирать</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
-    <string name="play_with_app_name">Проиграть с CloudStream</string>
+    <string name="play_with_app_name">Смотреть с CloudStream</string>
     <string name="title_home">Главная</string>
     <string name="title_search">Поиск</string>
     <string name="title_downloads">Загрузки</string>
@@ -50,19 +50,19 @@
     <string name="episode_more_options_des">Дополнительные опции</string>
     <string name="next_episode">Следующий серия</string>
     <string name="result_tags">Жанры</string>
-    <string name="result_share">Делиться</string>
+    <string name="result_share">Поделиться</string>
     <string name="result_open_in_browser">Открыть в браузер</string>
-    <string name="skip_loading">Скип загрузка</string>
+    <string name="skip_loading">Пропустить загрузку</string>
     <string name="type_watching">Смотрю</string>
-    <string name="type_on_hold">Приостановленный</string>
+    <string name="type_on_hold">Приостановленно</string>
     <string name="type_completed">Завершено</string>
     <string name="type_dropped">Брошенный</string>
     <string name="type_plan_to_watch">План по смотреть</string>
     <string name="type_none">Никто</string>
     <string name="type_re_watching">Пересмотрю</string>
-    <string name="play_movie_button">Проиграть фильм</string>
+    <string name="play_movie_button">Смотреть фильм</string>
     <string name="play_trailer_button">Проиграть трейлер</string>
-    <string name="play_livestream_button">Проиграть Livestream</string>
+    <string name="play_livestream_button">Воспроизвести Livestream</string>
     <string name="pick_source">Источники</string>
     <string name="pick_subtitle">Субтитры</string>
     <string name="play_episode">Проиграть серия</string>
@@ -77,8 +77,8 @@
     <string name="home_info">Инфо</string>
     <string name="update_started">Обновление началось</string>
     <string name="home_expanded_hide">Прятать</string>
-    <string name="home_play">Проиграть</string>
-    <string name="home_more_info">Подробнее инфо</string>
+    <string name="home_play">Смотреть</string>
+    <string name="home_more_info">Подробнее</string>
     <string name="filter_bookmarks">Фильтр закладки</string>
     <string name="error_bookmarks_text">Закладки</string>
     <string name="sort_apply">Наносить</string>
@@ -88,7 +88,7 @@
     <string name="sort_clear">Очистить</string>
     <string name="sort_save">Сохранить</string>
     <string name="player_speed">Скорость проигрыватель</string>
-    <string name="play_episode_toast">Проиграть Серия</string>
+    <string name="play_episode_toast">Воспроизвести Эпизод</string>
     <string name="next_episode_time_day_format" formatted="true">%dд %dч %dм</string>
     <string name="duration_format" formatted="true">%d мин</string>
     <string name="app_dubbed_text">Dub</string>
@@ -101,14 +101,14 @@
     <string name="subs_window_color">Цвет окна</string>
     <string name="subs_edge_type">Тип края</string>
     <string name="subs_subtitle_elevation">Субтитр подъём</string>
-    <string name="search_provider_text_providers">Поиск с использованием поставщики</string>
+    <string name="search_provider_text_providers">Поиск с использованием поставщиков</string>
     <string name="search_provider_text_types">Поиск с использованием типов</string>
     <string name="benene_count_text">%d Бенены данность на разрабы</string>
     <string name="benene_count_text_none">Бенены не дают</string>
     <string name="subs_auto_select_language">Автовыбор языка</string>
     <string name="subs_download_languages">Скачать языки</string>
     <string name="subs_subtitle_languages">Язык субтитров</string>
-    <string name="subs_hold_to_reset_to_default">Удерживайте чтобы сбросить по умолчанию</string>
+    <string name="subs_hold_to_reset_to_default">Удерживайте, чтобы сбросить по умолчанию</string>
     <string name="error_loading_links_toast">Ошибка загрузки ссылок</string>
     <string name="stream">Поток</string>
     <string name="subs_font">Шрифт</string>
@@ -120,9 +120,9 @@
     <string name="popup_pause_download">Приостановить скачать</string>
     <string name="pref_disable_acra">Отключить автоматическое информирование об ошибках</string>
     <string name="subs_import_text" formatted="true">Импортируйте шрифты поместив их в %s</string>
-    <string name="continue_watching">Продолжать смотрю</string>
+    <string name="continue_watching">Продолжить смотреть</string>
     <string name="action_remove_watching">Удалите</string>
-    <string name="action_open_watching">Дополнительная инфо</string>
+    <string name="action_open_watching">Подробнее</string>
     <string name="vpn_might_be_needed">Для корректной работы этого поставщика может потребоваться VPN</string>
     <string name="vpn_torrent">Этот поставщика - торрент, рекомендуется VPN</string>
     <string name="provider_info_meta">Метаданные не предоставляются сайтом, загрузка видео будет неудачной, если они не существуют на сайте.</string>
@@ -151,7 +151,7 @@
     <string name="restore_failed_format" formatted="true">Не удалось восстановить данные из %s</string>
     <string name="backup_failed">Отсутствует разрешение на хранение. Пожалуйста попробуйте снова.</string>
     <string name="category_account">Аккаунты</string>
-    <string name="category_updates">Обновления и резервное копирование</string>
+    <string name="category_updates">Обновления и резервное</string>
     <string name="settings_info">Информация</string>
     <string name="advanced_search">Расширенный поиск</string>
     <string name="show_trailers_settings">Показывать трейлеры</string>
@@ -166,8 +166,8 @@
     <string name="app_language">Язык приложения</string>
     <string name="no_links_found_toast">Ссылок не найдено</string>
     <string name="copy_link_toast">Ссылка скопирована в буфер обмена</string>
-    <string name="subs_default_reset_toast">Восстановить к изначальному значению</string>
-    <string name="acra_report_toast">Извините, приложение прекратило работу. Анонимный отчет об ошибке был отправлен разработчикам</string>
+    <string name="subs_default_reset_toast">Восстановить по умолчанию</string>
+    <string name="acra_report_toast">Извините, приложение прекратило работу. Анонимный отчет об ошибке будет отправлен разработчикам</string>
     <string name="episode">Эпизод</string>
     <string name="episodes">Эпизоды</string>
     <string name="season_short">С</string>
@@ -200,4 +200,212 @@
     <string name="automatic_plugin_download_summary">Автоматически загружать еще не установленные плагины из добавленных репозиториев.</string>
     <string name="discord">Присоединится в Discord</string>
     <string name="free_storage">Бесплатно</string>
+    <string name="next_episode_time_min_format" formatted="true">%d мин.</string>
+    <string name="next_episode_time_hour_format" formatted="true">%d ч. %d мин.</string>
+    <string name="movies">Фильмы</string>
+    <string name="cartoons_singular">Мультфильм</string>
+    <string name="tv_series">Сериалы</string>
+    <string name="asian_drama">Азиатские драмы</string>
+    <string name="other_singular">Видео</string>
+    <string name="cartoons">Мультфильмы</string>
+    <string name="documentaries">Документальные фильмы</string>
+    <string name="ova">OVA</string>
+    <string name="nsfw">NSFW</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="movies_singular">Фильм</string>
+    <string name="tv_series_singular">Серия</string>
+    <string name="torrent_singular">Торрент</string>
+    <string name="documentaries_singular">Документальный</string>
+    <string name="asian_drama_singular">Азиатская драма</string>
+    <string name="category_general">Общий</string>
+    <string name="category_providers">Провайдеры</string>
+    <string name="category_ui">Макет</string>
+    <string name="pref_category_extensions">Расширения</string>
+    <string name="category_player">Плеер</string>
+    <string name="backup_settings">Резервное копирование данных</string>
+    <string name="bug_report_settings_off">Отправлять данные только при вылетах</string>
+    <string name="used_storage">Использовано</string>
+    <string name="double_tap_to_pause_settings">Двойное нажатие для паузы</string>
+    <string name="double_tap_to_seek_settings_des">Коснитесь дважды правой или левой стороны для поиска вперед или назад</string>
+    <string name="double_tap_to_pause_settings_des">Нажмите в центре для паузы</string>
+    <string name="use_system_brightness_settings">Использовать системную яркость</string>
+    <string name="episode_sync_settings_des">Автоматически синхронизировать текущий прогресс эпизода</string>
+    <string name="backup_failed_error_format">Ошибка резервного копирования %s</string>
+    <string name="restore_settings">Восстановить данные из резервной копии</string>
+    <string name="show_fillers_settings">Показывать Филлер эпизоды для аниме</string>
+    <string name="kitsu_settings">Показывать афиши из Kitsu</string>
+    <string name="apk_installer_settings_des">Некоторые телефоны не поддерживают новые установщики. Попробуйте использовать legacy (старый) вариант, если обновления не устанавливаются.</string>
+    <string name="status_ongoing">Выходит</string>
+    <string name="video_lock">Блокировка</string>
+    <string name="no_update_found">Обновление не найдено</string>
+    <string name="video_aspect_ratio_resize">Изменить размер</string>
+    <string name="video_source">Источник</string>
+    <string name="check_for_update">Проверьте наличие обновления</string>
+    <string name="add_site_pref">Клон сайта</string>
+    <string name="dns_pref">DNS через HTTPS</string>
+    <string name="remove_site_pref">Удалить сайт</string>
+    <string name="legal_notice">Оговорка</string>
+    <string name="subtitle_offset">Синхронизация субтитров</string>
+    <string name="add_site_summary">Добавить клон существующего сайта с другим URL-адресом</string>
+    <string name="dns_pref_summary">Используется для обхода блокировок интернет провайдера</string>
+    <string name="download_path_pref">Путь загрузки</string>
+    <string name="benene_des">учитывая бенен</string>
+    <string name="update">Обновить</string>
+    <string name="primary_color_settings">Основной цвет</string>
+    <string name="provider_lang_settings">Языки поставщиков</string>
+    <string name="repository_name_hint">Название репозитория</string>
+    <string name="clear_history">Очистить историю</string>
+    <string name="referer">Referer</string>
+    <string name="benene">Дайте бенен разрабам</string>
+    <string name="pref_category_links">Ссылки</string>
+    <string name="pref_category_player_layout">Макет</string>
+    <string name="app_layout">Макет приложения</string>
+    <string name="app_theme_settings">Тема приложения</string>
+    <string name="add_repository">Добавить репозиторий</string>
+    <string name="action_remove_from_watched">Убрать отметку</string>
+    <string name="confirm_exit_dialog">Вы уверены, что хотите выйти\?</string>
+    <string name="plugin_downloaded">Плагин скачан</string>
+    <string name="plugin_deleted">Плагин удалён</string>
+    <string name="extension_description">Описание</string>
+    <string name="extension_version">Версия</string>
+    <string name="extension_status">Состояние</string>
+    <string name="extension_size">Размер</string>
+    <string name="extension_authors">Авторы</string>
+    <string name="extension_types">Поддерживается</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="skip_type_format" formatted="true">Пропустить %s</string>
+    <string name="skip_type_ed">Концовка</string>
+    <string name="use_system_brightness_settings_des">Используйте яркость системы в проигрывателе приложения вместо темного наложения</string>
+    <string name="episode_sync_settings">Обновить состояние хода просмотра</string>
+    <string name="backup_success">Данные сохранены</string>
+    <string name="advanced_search_des">Дает вам результаты поиска, разделенные по провайдеру</string>
+    <string name="uprereleases_settings_des">Поиск предварительных обновлений вместо полных выпусков</string>
+    <string name="redo_setup_process">Повторить процесс настройки</string>
+    <string name="no_chromecast_support_toast">Этот провайдер не поддерживает Chromecast</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="no_season">Нет сезона</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="livestreams">Прямые трансляции</string>
+    <string name="live_singular">Прямая трансляция</string>
+    <string name="source_error">Ошибка источника</string>
+    <string name="remote_error">Ошибка пульта</string>
+    <string name="render_error">Ошибка рендера</string>
+    <string name="unexpected_error">Неожиданная ошибка плеера</string>
+    <string name="episode_action_chromecast_episode">Эпизод Chromecast</string>
+    <string name="episode_action_play_in_format">Воспроизведение на %s</string>
+    <string name="episode_action_play_in_browser">Воспроизвести в браузере</string>
+    <string name="episode_action_download_subtitle">Скачать субтитры</string>
+    <string name="show_hd">Знак качества</string>
+    <string name="poster_ui_settings">Переключение элементов интерфейса на плакате</string>
+    <string name="video_skip_op">Пропустить OP</string>
+    <string name="dont_show_again">Больше не показывать</string>
+    <string name="skip_update">Пропустить это обновление</string>
+    <string name="nginx_url_pref">URL-адрес NGINX-сервера</string>
+    <string name="create_account">Создать учётную запись</string>
+    <string name="add_sync">Добавить трекинг</string>
+    <string name="added_sync_format" formatted="true">Добавлено %s</string>
+    <string name="upload_sync">Синхронизировать</string>
+    <string name="sync_score">Оценено</string>
+    <string name="sync_score_format" formatted="true">%d из 10</string>
+    <string name="safe_mode_crash_info">Посмотреть информацию о сбое</string>
+    <string name="player_pref">Предпочитаемый видео-проигрыватель</string>
+    <string name="player_settings_play_in_browser">Веб-браузер</string>
+    <string name="app_not_found_error">Приложение не найдено</string>
+    <string name="all_languages_preference">Все языки</string>
+    <string name="skip_type_op">Вступление</string>
+    <string name="skip_type_creddits">Титры</string>
+    <string name="action_mark_as_watched">Отметить как просмотренное</string>
+    <string name="limit_title_rez">Разрешение видеоплеера</string>
+    <string name="watch_quality_pref">Желаемое качество видео</string>
+    <string name="limit_title">Максимум символов</string>
+    <string name="video_buffer_length_settings">Длинна буфера</string>
+    <string name="video_buffer_disk_settings">Кеш видео на диске</string>
+    <string name="video_buffer_size_settings">Размер буфера</string>
+    <string name="video_buffer_clear_settings">Отчистить кеш видео и изображений</string>
+    <string name="video_ram_description">Вызывает сбои, если установлено слишком высокое значение на устройствах с небольшим объемом памяти, таких как Android TV.</string>
+    <string name="video_disk_description">Вызывает проблемы, если установлено слишком высокое значение на устройствах с небольшим объемом памяти, таких как Android TV.</string>
+    <string name="lightnovel">Легкая новелла от тех же разработчиков</string>
+    <string name="extension_language">Язык</string>
+    <string name="hls_playlist">HLS Плейлист</string>
+    <string name="extension_install_first">Сначала установить расширение</string>
+    <string name="player_settings_play_in_app">Внутренний проигрыватель</string>
+    <string name="synopsis">Синопсис</string>
+    <string name="skip_type_intro">Интро</string>
+    <string name="example_email">hello@world.com</string>
+    <string name="episode_action_chromecast_mirror">Зеркало Chromecast</string>
+    <string name="episode_action_play_in_app">Воспроизвести в приложении</string>
+    <string name="pref_category_defaults">По умолчанию</string>
+    <string name="pref_category_player_features">Возможности плеера</string>
+    <string name="pref_category_subtitles">Субтитры</string>
+    <string name="bottom_title_settings">Расположение названия плаката</string>
+    <string name="tv_layout">TV</string>
+    <string name="phone_layout">Телефон</string>
+    <string name="emulator_layout">Эмулятор</string>
+    <string name="bottom_title_settings_des">Под плакатом</string>
+    <string name="example_password">parol123</string>
+    <string name="example_username">МоёИмяПользователя</string>
+    <string name="switch_account">Сменить учётную запись</string>
+    <string name="add_account">Добавить учётную запись</string>
+    <string name="example_site_name">МойКрутойСайт</string>
+    <string name="example_site_url">example.com</string>
+    <string name="example_lang_name">Язык (en)</string>
+    <string name="account">учётная запись</string>
+    <string name="automatic">Автоматически</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="pref_category_app_updates">Обновления приложения</string>
+    <string name="pref_category_backup">Резервная копия</string>
+    <string name="pref_category_actions">Действия</string>
+    <string name="pref_category_cache">Кэш</string>
+    <string name="pref_category_gestures">Жесты</string>
+    <string name="setup_done">Готово</string>
+    <string name="extensions">Расширения</string>
+    <string name="repository_url_hint">URL репозитория</string>
+    <string name="plugin_loaded">Плагин загружен</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="double_tap_to_seek_settings">Перемотка двойным касанием</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="is_adult">18+</string>
+    <string name="plugin_load_fail" formatted="true">Не удалось загрузить %s</string>
+    <string name="plugin">плагины</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="quality_ts">TS</string>
+    <string name="delete_repository">Удалить репозиторий</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_4k">4K</string>
+    <string name="quality_webrip">Web</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="plugin_singular">плагин</string>
+    <string name="skip_setup">Пропустить настройку</string>
+    <string name="error">Ошибка</string>
+    <string name="quality_cam_hd">Cam</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_tc">TC</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_blueray">Blu-ray</string>
+    <string name="quality_cam">Cam</string>
+    <string name="quality_hq">HQ</string>
+    <string name="plugins_disabled" formatted="true">Отключено: %d</string>
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="authenticated_user" formatted="true">%s аутентифицировано</string>
+    <string name="authenticated_user_fail" formatted="true">Не удалось перейти к %s</string>
+    <string name="max">Максимум</string>
+    <string name="min">Минимум</string>
+    <string name="subtitles_outline">Очертание</string>
+    <string name="subtitles_shadow">Тень</string>
+    <string name="subtitle_offset_hint">1000 мс</string>
+    <string name="subtitle_offset_title">Задержка субтитров</string>
+    <string name="subtitle_offset_extra_hint_none_format">Без задержки субтитров</string>
+    <string name="subtitle_offset_extra_hint_later_format">Используйте, если субтитры отображаются на %d мс слишком рано</string>
+    <string name="subtitle_offset_extra_hint_before_format">Используйте, если субтитры отображаются %d мс слишком поздно</string>
+    <string name="normal">Нормально</string>
+    <string name="subtitles_raised">Поднятие</string>
+    <string name="subtitles_example_text">Съешь ещё этих мягких французских булок, да выпей же чаю</string>
+    <string name="recommended">Рекомендуется</string>
+    <string name="player_loaded_subtitles" formatted="true">Загружено %s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
index dd3aa432..8bb22e66 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-so/strings.xml
@@ -7,14 +7,484 @@
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="next_episode_format" formatted="true">Xalqadda %d waxa lasoo deyn doonaa</string>
     <string name="download">Daji</string>
-    <string name="download_failed">Dajintii ma guulaysan</string>
+    <string name="download_failed">Dejintii ma guulaysan</string>
     <string name="search">Raadi</string>
     <string name="delete">Tirtir</string>
-    <string name="pause">Qabo</string>
-    <string name="queued">la horay</string>
-    <string name="resize_fit">La ekaysii</string>
-    <string name="resize_fill">Ku buuxi</string>
+    <string name="pause">Haki</string>
+    <string name="queued">Horran</string>
+    <string name="resize_fit">Le-ekaysii shaashadda</string>
+    <string name="resize_fill">Kala jiid</string>
     <string name="resize_zoom">Soo dhawee</string>
     <string name="all">Dhammaan</string>
     <string name="tracks">Muusik</string>
+    <string name="play_with_app_name">Ku daawo CloudStream</string>
+    <string name="title_settings">Habaynta</string>
+    <string name="filler" formatted="true">Buuxiye</string>
+    <string name="home_change_provider_img_des">Beddel qaybiyaha</string>
+    <string name="app_name">Cloudstream</string>
+    <string name="player_speed_text_format" formatted="true">Xawaaraha (%.2fx)</string>
+    <string name="duration_format" formatted="true">%d dqq</string>
+    <string name="title_home">Kadinka</string>
+    <string name="rated_format" formatted="true">Qiimaysan: %.1f</string>
+    <string name="new_update_format" formatted="true">App cusub baa soo baxay!
+\n%s -&gt; %s</string>
+    <string name="title_downloads">Soo dejinta</string>
+    <string name="title_search">Raadi</string>
+    <string name="episode_more_options_des">Dookhyo kale</string>
+    <string name="no_data">Xog ma leh</string>
+    <string name="next_episode">Xalqadda xigta</string>
+    <string name="type_watching">Daawanaysid</string>
+    <string name="search_hint_site" formatted="true">Raadi %s…</string>
+    <string name="result_tags">Caynadda</string>
+    <string name="result_share">Faafi</string>
+    <string name="result_open_in_browser">Ku fur barawsarka</string>
+    <string name="skip_loading">Is dhaafi soo kicitaanka</string>
+    <string name="loading">Soo kacaya…</string>
+    <string name="search_hint">Raadi…</string>
+    <string name="type_on_hold">Kor u hay</string>
+    <string name="type_re_watching">Dib u daawasho</string>
+    <string name="type_completed">Dhamaystirmay</string>
+    <string name="type_dropped">Soo dhacay</string>
+    <string name="type_plan_to_watch">Ku talo jira</string>
+    <string name="type_none">Midna</string>
+    <string name="play_movie_button">Daaro filinka</string>
+    <string name="play_trailer_button">Daar goos-gooska</string>
+    <string name="subs_window_color">Midabka daaqadda</string>
+    <string name="popup_delete_file">Saar faylka</string>
+    <string name="popup_play_file">Daar faylka</string>
+    <string name="play_livestream_button">Si toos u daawo</string>
+    <string name="play_torrent_button">Daalaco toorentiga</string>
+    <string name="pick_subtitle">Qrl-hoosaadka</string>
+    <string name="popup_resume_download">Dib u bilow dejinta</string>
+    <string name="sort_cancel">Jooji</string>
+    <string name="subs_background_color">Midabka dambeedka</string>
+    <string name="pick_source">Xigashooyinka</string>
+    <string name="reload_error">Dib u xidhiidhinaya…</string>
+    <string name="go_back">Dib u noqo</string>
+    <string name="play_episode">Xalqadda daaro</string>
+    <string name="download_paused">Waad hakisey la degista</string>
+    <string name="download_done">Way dhamaatay dejintu</string>
+    <string name="download_storage_text">Kaydka gudaha</string>
+    <string name="app_dubbed_text">Trj</string>
+    <string name="download_started">Way bilaabmatay soo dejintu</string>
+    <string name="stream">Daalaco</string>
+    <string name="pref_disable_acra">Jooji cillad gudbinta iskeed ah</string>
+    <string name="download_canceled">Waa la joojiyey dejintan</string>
+    <string name="update_started">Way bilaabantay cuaboonaysiintu</string>
+    <string name="error_loading_links_toast">Soo raridda lifaaqyadu way fashilantay</string>
+    <string name="app_subbed_text">Qrl</string>
+    <string name="home_expanded_hide">Qari</string>
+    <string name="home_info">Warbixin</string>
+    <string name="home_more_info">Warbixin dheeraad ah</string>
+    <string name="subtitles_settings">Habaynta Qoraal-hoosaadka</string>
+    <string name="subs_outline_color">Midabka lakabka sare</string>
+    <string name="home_play">Daar</string>
+    <string name="filter_bookmarks">Shaandhee caalamad-sanayaasha</string>
+    <string name="error_bookmarks_text">Calaamad-sanayaasha</string>
+    <string name="action_add_to_bookmarks">Xagee marinaysaa</string>
+    <string name="sort_save">Kaydi</string>
+    <string name="player_speed">Xawaaraha daaraha</string>
+    <string name="subs_font_size">Xajmiga farta</string>
+    <string name="popup_pause_download">Haki dejinta</string>
+    <string name="sort_apply">Ka dhig</string>
+    <string name="subs_text_color">Midabka farta</string>
+    <string name="subs_hold_to_reset_to_default">Xeji si aad asalkiisa ugu soo celiso</string>
+    <string name="sort_copy">Koobi/ka reeb</string>
+    <string name="sort_close">Xidh</string>
+    <string name="sort_clear">Tirtir</string>
+    <string name="subs_edge_type">Nooca cidhifyada</string>
+    <string name="use_system_brightness_settings_des">Isticmaal xaddiga iftiinka ee moobilkaaga halkii aad adigu habayn lahayd ugu horreynba</string>
+    <string name="category_updates">Gurmadka iyo cusbooneysiinta</string>
+    <string name="restore_success">Waa la kaydiyet xogta gurmadka</string>
+    <string name="advanced_search_des">Raadinta waxay kuugu kala qaybinaysaa mid kasta iyo qaybiyihiisa</string>
+    <string name="bug_report_settings_on">Ma jirto xog la dirayo</string>
+    <string name="restore_failed_format" formatted="true">Way fashilantay in xogta laga soo celiyo faylka gurmadka%s</string>
+    <string name="apk_installer_settings_des">Moobillada qaar ayaa awoodin iney Rakibaha cusub een isticmaalnay, kan ku day haddii cusbooneysiintu kuu shaqayn weydo.</string>
+    <string name="go_forward_30">+30</string>
+    <string name="backup_success">Xogta waa la kaydiyey</string>
+    <string name="status">Heerka</string>
+    <string name="backup_failed">Ogolaanshaha lagu kaydinayo ma hayno. Fadlan isku day mar kale.</string>
+    <string name="category_account">Koontooyinka</string>
+    <string name="settings_info">Xog</string>
+    <string name="automatic_plugin_download">Si iskii ah usoo deji sidkanaha</string>
+    <string name="pref_filter_search_quality">Qari tayada muqaalka aad dooratay natiijada waxa aad raadiso</string>
+    <string name="advanced_search">Raadin heer-sare ah</string>
+    <string name="bug_report_settings_off">Keliya xogta waxaa ka dirayaa marka appku duqeeyo</string>
+    <string name="show_fillers_settings">Xalqad buuxis ah tusi anemiga</string>
+    <string name="benene">Dhiseyaasha appka sii beniin</string>
+    <string name="storage_error">Way fashilantay dejintu, hubi ogolaanshaha isticmaalka kaydka</string>
+    <string name="episode_action_chromecast_episode">Xalqadda koromakaastiga</string>
+    <string name="episode_action_download_subtitle">Soo dejiso Qoraal-hoosaadyada</string>
+    <string name="show_hd">Summadda Tayada</string>
+    <string name="episode_action_chromecast_mirror">Humaagga-bixinta koromokaastiga</string>
+    <string name="pref_category_defaults">Asalkiisa</string>
+    <string name="episode_action_play_in_app">Isla appkan ku daawo</string>
+    <string name="episode_action_play_in_format">Ku daawo %s</string>
+    <string name="episode_action_play_in_browser">Ku daawo barawsarka</string>
+    <string name="episode_action_auto_download">Dejinta iskeed ah</string>
+    <string name="episode_action_download_mirror">Deji toorentiga(mirror)</string>
+    <string name="episode_action_reload_links">Cusbooneysii lifaaqyada</string>
+    <string name="check_for_update">Eeg iney jirto cusbooneysiin</string>
+    <string name="show_dub">Summadda codeynta</string>
+    <string name="show_sub">Sumadda Qrl-hoosaadka</string>
+    <string name="show_title">Ciwaanka</string>
+    <string name="poster_ui_settings">Maxaa ka muuqan doona boodhka filinka</string>
+    <string name="no_update_found">Ma jiro wax ku cusub Appka</string>
+    <string name="video_lock">Quful</string>
+    <string name="video_aspect_ratio_resize">Cabbirka</string>
+    <string name="video_source">isha</string>
+    <string name="video_skip_op">Is dhaafi</string>
+    <string name="dont_show_again">Mar dambe ha i tusin</string>
+    <string name="skip_update">Is dhaafi</string>
+    <string name="update">Cusbooneysii</string>
+    <string name="watch_quality_pref">Tayada aad doorbiddo</string>
+    <string name="pref_category_player_layout">Qaabka</string>
+    <string name="emulator_layout">Qaab emulator</string>
+    <string name="random_button_settings_desc">Waxa uu ku tusayaa badhin aad si xukasho la\'aan ah ugu dooran kartid</string>
+    <string name="subs_subtitle_elevation">Kor-u-baxa Qrl-hoosaadka</string>
+    <string name="subs_font">Farta</string>
+    <string name="preview_background_img_des">Muuq dambeedka</string>
+    <string name="search_provider_text_providers">Ku raadi qaybiyeyaasha</string>
+    <string name="search_provider_text_types">Ku raadi noocyada</string>
+    <string name="benene_count_text">%d oo beniin ayaad siisey dhiseyaasha</string>
+    <string name="benene_count_text_none">Wax beniin ah maad bixin</string>
+    <string name="subs_auto_select_language">Iskeed-u-doorashada luuqadda</string>
+    <string name="subs_download_languages">Luuqadda dejinta</string>
+    <string name="subs_subtitle_languages">Luuqadda Qoraal-hoosaadka</string>
+    <string name="provider_info_meta">Xogta muqaalkan ma bixinno, ma shaqayn doonto haddii aannu weyno xogta muqaalka.</string>
+    <string name="subs_import_text" formatted="true">Dhig nooca farta aad dooneyso %s</string>
+    <string name="continue_watching">Sii wado daawashada</string>
+    <string name="action_remove_watching">Ka saar</string>
+    <string name="action_open_watching">Xog dheeri ah</string>
+    <string name="kitsu_settings">Tusi Boodhka Kitsu</string>
+    <string name="uprereleases_settings_des">Waxa laa raadinayaa haddii ay wax jiraan baahin-horaad ah, halkii la sugi lahaa baahin buuxda</string>
+    <string name="automatic_plugin_updates">Si iskii ah u cusbooneysii sidkanaha</string>
+    <string name="automatic_plugin_download_summary">Si iskii ah usoo deji dhamaan sidkanayaasha aan weli lasoo dejin ee ku jira kaydka aad keentay.</string>
+    <string name="updates_settings_des">Marka ugu horreysa ee aad appka furto ayaad arkaysaa haddii wax cusub yihiin</string>
+    <string name="lightnovel">Light novel app, isla dhiseyaasha appkan baa leh</string>
+    <string name="updates_settings">Tus wixii appka ku cusub</string>
+    <string name="redo_setup_process">Dib uso bilow fadhiisinta appka</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="uprereleases_settings">Ku cusbooneysii baahinta ugu horreysa</string>
+    <string name="apk_installer_settings">Rakibaha APKga</string>
+    <string name="status_ongoing">Socda</string>
+    <string name="github">Github</string>
+    <string name="movies_singular">Filin</string>
+    <string name="anim">Anime app, isla dhiseyaashan appkan baa leh</string>
+    <string name="no_season">Kal ma leh</string>
+    <string name="discord">Discord naga soo qabo</string>
+    <string name="benene_des">Beeniinyada aad bixisey</string>
+    <string name="app_language">Luuqadda</string>
+    <string name="no_chromecast_support_toast">Bixiyahan kuma shaqeeyo koromakaastiga</string>
+    <string name="subs_default_reset_toast">Asalkiisii hore kusoo celi</string>
+    <string name="synopsis">Dulucuda</string>
+    <string name="acra_report_toast">Raalliahow, wuu duqeeyey appku, waxa warbixin cillad-saarka ka caawisa loo direy dhiseyaasha</string>
+    <string name="season">Kalka</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="episode">Xalqad</string>
+    <string name="episodes">Xalqado</string>
+    <string name="episodes_range">%d illaa %d</string>
+    <string name="season_short">K</string>
+    <string name="episode_short">X</string>
+    <string name="cartoons">Kartoon</string>
+    <string name="asian_drama_singular">Daraamada eeshiyaanka</string>
+    <string name="delete_file">Tirtir faylka</string>
+    <string name="resume">Sii wado</string>
+    <string name="go_back_30">-30</string>
+    <string name="delete_message" formatted="true">Dhamaantii waa la saari doona %s
+\nSow ma hubtid\?</string>
+    <string name="source_error">Fashil ka yimi xigashada</string>
+    <string name="resume_time_left" formatted="true">%ddq
+\nAyaa hadhsan</string>
+    <string name="status_completed">Dhamaystirmay</string>
+    <string name="year">Sannadka</string>
+    <string name="rating">Qiimaynta</string>
+    <string name="duration">Muddada</string>
+    <string name="used_storage">La isticmaalay</string>
+    <string name="no_subtitles">Qrl-hoosaad ma leh</string>
+    <string name="default_subtitles">Sidiisaa</string>
+    <string name="free_storage">Bilaash</string>
+    <string name="app_storage">Appka</string>
+    <string name="cartoons_singular">Kartoob</string>
+    <string name="anime">Anemi</string>
+    <string name="unexpected_error">Daaraha ayaa ku fashilmay</string>
+    <string name="ova">OVA</string>
+    <string name="torrent_singular">Toorenti</string>
+    <string name="livestreams">Tooska</string>
+    <string name="ova_singular">OVA</string>
+    <string name="asian_drama">Daraamada Eeshiyaanka</string>
+    <string name="limit_title_rez">Daaraha korkiisa</string>
+    <string name="video_buffer_size_settings">kaydka kumeelgaadhka</string>
+    <string name="add_site_pref">Ka reebo fadhigan</string>
+    <string name="others">Kuwa kale</string>
+    <string name="tv_series_singular">Taxane</string>
+    <string name="anime_singular">Anemi</string>
+    <string name="documentaries_singular">Dhokumentari</string>
+    <string name="torrent">Toorentiyo</string>
+    <string name="documentaries">Dhokumentariyo</string>
+    <string name="live_singular">Toos</string>
+    <string name="nsfw_singular">CEEB</string>
+    <string name="other_singular">Kuwa kale</string>
+    <string name="remote_error">Fashil fog</string>
+    <string name="dns_pref">DNS ka horreysi HTTPS</string>
+    <string name="pref_category_app_updates">Maxaa ku cusub appka</string>
+    <string name="pref_category_backup">Gurmad</string>
+    <string name="pref_category_extensions">Kordhiyeyaal</string>
+    <string name="pref_category_subtitles">Qoraal-hoosaadyada</string>
+    <string name="pref_category_looks">Muqaal</string>
+    <string name="swipe_to_change_settings">Jiid si aad u habaysato</string>
+    <string name="vpn_might_be_needed">Laga yaabaa inaad u baahato VPN si qaybiyahan kuugu shaqeeyo</string>
+    <string name="vpn_torrent">Qaybiyahan waa toorenti, inaad VPN isticmaasho ayaa wanaagsan</string>
+    <string name="picture_in_picture_des">Ka sii wado daawashada daaqad yar oo appska kale dul istaagi doonta</string>
+    <string name="swipe_to_seek_settings">Jiid si aad u dhaafiso</string>
+    <string name="show_log_cat">Eeg xogaha hoose 🐈</string>
+    <string name="player_size_settings">Badhinka xajmiga daaraha</string>
+    <string name="render_error">Fashil ka yimi dhiibaha</string>
+    <string name="episode_action_copy_link">Koobu garee lifaaqa</string>
+    <string name="torrent_no_plot">Sharraxaad ma leh</string>
+    <string name="torrent_plot">Sharraxaadda</string>
+    <string name="normal_no_plot">Duluc ma leh</string>
+    <string name="picture_in_picture">Sawir-daaqadlaha</string>
+    <string name="player_subtitles_settings_des">Habaynta Qrl-hoosaadka daaraha</string>
+    <string name="chromecast_subtitles_settings">Qrl-hoosaadka koromakaastiga</string>
+    <string name="player_size_settings_des">Hareeraha madow ka saar markaad daawanayso</string>
+    <string name="player_subtitles_settings">Qoraal-hoosaadka</string>
+    <string name="chromecast_subtitles_settings_des">Habaynta Qrl-hoosaadka Koromakaastiga</string>
+    <string name="eigengraumode_settings">Habka Xawaare-kordhinta</string>
+    <string name="eigengraumode_settings_des">Waxaad kordhin karta xawaaraha aad ku daawanayso</string>
+    <string name="swipe_to_seek_settings_des">Midig iyo bidix u jiid si aad marba dhinac ugu dhaafiso muqaalka</string>
+    <string name="double_tap_to_seek_settings_des">Laba jeer taabo midig ama bidix si aad u dhaafiso ama ku ceshato</string>
+    <string name="double_tap_to_seek_settings">Laba jeer taabo si aad u dhaafiso</string>
+    <string name="double_tap_to_seek_amount_settings">Inta aad is dhaafinayso</string>
+    <string name="double_tap_to_pause_settings">Laba jeer taabo si aad u qallajiso</string>
+    <string name="double_tap_to_pause_settings_des">Dhexda taabo si aad u qallajisato</string>
+    <string name="backup_settings">Gurmad u samee xogta</string>
+    <string name="use_system_brightness_settings">Iftiinka moobilka istcimaal</string>
+    <string name="episode_sync_settings">Cusbooneysii marba halkaad marayso daawashada</string>
+    <string name="show_trailers_settings">Tus goos-gooska</string>
+    <string name="backup_failed_error_format">Waa fashilmay kaydinta gurmadku %s</string>
+    <string name="restore_settings">Kasoo celi Xogta gurmadka aad kaydsatay</string>
+    <string name="video_buffer_length_settings">Dhererka K. kumeelgaadhka ah</string>
+    <string name="preferred_media_settings">Noocyada muqaal eed doorbiddo</string>
+    <string name="tv_layout">Qaab TV</string>
+    <string name="video_buffer_disk_settings">Heerka Kayd-yaraha</string>
+    <string name="video_buffer_clear_settings">Masax kayd yaraha sawirrada/muqaalka</string>
+    <string name="video_ram_description">Laga yaaba inuu appku duqeeyo haddii aad badiso.</string>
+    <string name="video_disk_description">Laga yaabaa inuu wax xumeeyo haddii aad badiso, weliba aaladaha qaadka yar, sida Androyd tiifiiga.</string>
+    <string name="dns_pref_summary">Wuxuu muhiim u yahay inaad dhaafto Xannibaadaha ISPga</string>
+    <string name="remove_site_pref">Ka saar fadhigan</string>
+    <string name="add_site_summary">Ku dar ka-reeb fadhi hore u jirey, laakiin hayb cusub wata</string>
+    <string name="legal_notice">Aaraar</string>
+    <string name="nginx_url_pref">Haybta Seerfarka NGINX</string>
+    <string name="display_subbed_dubbed_settings">Tusi Anemaha Turjuman/Leh Qrl-hoosaad</string>
+    <string name="pref_category_links">Lifaaqyada</string>
+    <string name="download_path_pref">Barta kaydka</string>
+    <string name="pref_category_ui_features">Astaamaha</string>
+    <string name="random_button_settings">Badhinka X. la\'aanta</string>
+    <string name="category_providers">Qaybiyeyaasha</string>
+    <string name="automatic">Iskii</string>
+    <string name="phone_layout">Qaab moobil</string>
+    <string name="pref_category_actions">Falal</string>
+    <string name="pref_category_cache">Kayd-yare</string>
+    <string name="pref_category_gestures">Ishaarooyinka</string>
+    <string name="pref_category_player_features">Astaamaha daaraha</string>
+    <string name="category_general">Guud</string>
+    <string name="enable_nsfw_on_providers">Tusi CEEBta qaybiyayaasha ku shaqeeya</string>
+    <string name="category_ui">Qaabka</string>
+    <string name="primary_color_settings">Midab asaaska</string>
+    <string name="subtitles_encoding">Horidda Qoraal-hoosaadka</string>
+    <string name="app_theme_settings">Nashqadda Appka</string>
+    <string name="bottom_title_settings">Goobta Cinwaanka boodhka</string>
+    <string name="downloaded">La degtay</string>
+    <string name="downloading">Soo degaya</string>
+    <string name="action_remove_from_bookmarks">Ka Saar</string>
+    <string name="swipe_to_change_settings_des">Kor ama hoos u jiid labada dhinaca ee daaraha si aad u maamusho codka ama iftiinka</string>
+    <string name="autoplay_next_settings">Iskii-u-daarka xalqadda xigta</string>
+    <string name="autoplay_next_settings_des">Si iskii ah ayuu u daarayaa xalqadda xigta marka aad dhamaysato kaad daawanayso</string>
+    <string name="episode_sync_settings_des">Si iskii ah ha ula socdo appku hadba xalqadda aad marayso</string>
+    <string name="no_links_found_toast">Lifaaq lagama helin</string>
+    <string name="copy_link_toast">Waad koobiyeysay lifaaqa</string>
+    <string name="play_episode_toast">Daari xalqaddan</string>
+    <string name="no_episodes_found">Xalqado ma leh</string>
+    <string name="site">Wabsaydka</string>
+    <string name="movies">Filimaan</string>
+    <string name="tv_series">Taxanayaal</string>
+    <string name="nsfw">CEEB</string>
+    <string name="limit_title">Tirada inta ka muuqanaysa magaca filinka</string>
+    <string name="provider_lang_settings">Luuqadda bixiyaha</string>
+    <string name="app_layout">Qaabka Appka</string>
+    <string name="action_remove_from_watched">Ka saar kuwa la daawaday</string>
+    <string name="view_public_repositories_button">Eeg Kuwa Dadka kale Rakibeen</string>
+    <string name="audio_tracks">Codad kale</string>
+    <string name="uppercase_all_subtitles">Far weyn ka dhig Qrl-hoosaadka</string>
+    <string name="extension_description">Sharraxaad</string>
+    <string name="extension_status">Xaaladda</string>
+    <string name="extension_size">Xajmiga</string>
+    <string name="safe_mode_title">Safe mode ayaa daaran</string>
+    <string name="safe_mode_description">Dhammaan Kordhiyeyaasha waa la wada demiyey cillad timi aawadeed si aad u ogaato ka cillada sababaya.</string>
+    <string name="single_plugin_disabled" formatted="true">%s (La xayiray)</string>
+    <string name="apply_on_restart">Marka dambe eed gasho isticmaal</string>
+    <string name="safe_mode_crash_info">Eeg warbixinra Cilladda</string>
+    <string name="extension_rating" formatted="true">Qiimeynta: %s</string>
+    <string name="extension_authors">Lahaanshaha</string>
+    <string name="extension_version">Qaybtii</string>
+    <string name="hls_playlist">HLS playlist</string>
+    <string name="extension_types">Ku shaqeeya</string>
+    <string name="extension_language">Luuqadda</string>
+    <string name="extension_install_first">Rakib kordhiyahan ugu horreyn</string>
+    <string name="player_pref">Muqaal daaraha aad doorbiddo</string>
+    <string name="clear_history">Masax taariikhda</string>
+    <string name="history">Taariikhda</string>
+    <string name="skip_type_intro">Furitaanka</string>
+    <string name="clipboard_too_large">Qoraalku wuu dheeryahay. Ma koobi garayn kartid.</string>
+    <string name="yes">Haa</string>
+    <string name="enable_skip_op_from_database_des">Tusi badhin aad iska dhaafin karto bilowga/dhamaadka</string>
+    <string name="action_mark_as_watched">Ku caalamadi in la daawaday</string>
+    <string name="update_notification_downloading">Dejinaya cusbooneysiinta appka…</string>
+    <string name="confirm_exit_dialog">Ma hubtaa inaad ka baxdid\?</string>
+    <string name="no">May</string>
+    <string name="apk_installer_package_installer">PackageInstaller</string>
+    <string name="update_notification_installing">Rakibaya cusbooneysiinta…</string>
+    <string name="update_notification_failed">Waa la rakibi kari waayay qaybtan cusub ee appka</string>
+    <string name="apk_installer_legacy">Lagama-maarmaanka</string>
+    <string name="delayed_update_notice">Marka aad ka baxdo baa ka cusbooneysiin doona appka</string>
+    <string name="bottom_title_settings_des">Dhig ciwaanka boodhka hoostiisa</string>
+    <string name="account">Akoonka</string>
+    <string name="login">Soo gal</string>
+    <string name="add_account">Akoon geli</string>
+    <string name="authenticated_user" formatted="true">%s xaqiijisan</string>
+    <string name="example_email">iiwarran@sxb.com</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="example_username">MagacKaYaabAh</string>
+    <string name="logout">Ka bax</string>
+    <string name="example_site_url">Tusaale.com</string>
+    <string name="added_sync_format" formatted="true">Waxa lagu daray %s</string>
+    <string name="none">Midna</string>
+    <string name="example_site_name">Websaydkayga.com</string>
+    <string name="example_lang_name">Koodhka Luuqadda (en)</string>
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="create_account">Akoon samee</string>
+    <string name="upload_sync">Talantaalli</string>
+    <string name="sync_score">Qiimaysan</string>
+    <string name="switch_account">Beddel akoonka</string>
+    <string name="add_sync">Ku dar raad-raace</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="authenticated_user_fail" formatted="true">Waa lagu guuldarraystey inaad ku gasho %s</string>
+    <string name="normal">Caadi</string>
+    <string name="max">Ugu weyn</string>
+    <string name="min">Ugu yar</string>
+    <string name="subtitles_depressed">Hoos u degsan</string>
+    <string name="subtitles_outline">Lakabka sare</string>
+    <string name="subtitle_offset">Hagaaji Qrl-hosaadka</string>
+    <string name="subtitle_offset_extra_hint_before_format">Isticmaal intan haddii Qrl-hoosaadku ay %d ms soo habsaanayaan</string>
+    <string name="quality_4k">4K</string>
+    <string name="go_back_img_des">Dib u noqo</string>
+    <string name="subtitles_shadow">Hadhka</string>
+    <string name="subtitles_raised">Kor-u-qaadan</string>
+    <string name="subtitle_offset_extra_hint_later_format">Isticmaal intan haddii Qrl-hoosaadku ay %d ms soo hordhacayaan</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
+    <string name="actor_main">Ka guud</string>
+    <string name="actor_supporting">La jilaya</string>
+    <string name="subtitles_example_text">Sheekheenna wiilkiisa curad, gabadhiisu foox la\'aan ma heesi karto</string>
+    <string name="quality_hq">HQ</string>
+    <string name="recommended">Lagugula taliyey</string>
+    <string name="player_loaded_subtitles" formatted="true">Waxa laso kiciyey %s</string>
+    <string name="player_load_subtitles">Faylashaada ka keen</string>
+    <string name="player_load_subtitles_online">Internetka ka keen</string>
+    <string name="downloaded_file">Waa ka dejiyey faylka</string>
+    <string name="actor_background">Wajhadda dambe</string>
+    <string name="quality_cam">Cam</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="category_player">Daaraha</string>
+    <string name="title">Ciwaanka</string>
+    <string name="subtitles_remove_captions">Ka saar Qrl-hoosaadka asalka ah</string>
+    <string name="subtitles_remove_bloat">Ka saar bararsanaanta Qrl-hoosaadka</string>
+    <string name="coming_soon">Goor dhow…</string>
+    <string name="home_source">Xigashada</string>
+    <string name="home_random">Xulasho la\'aan</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
+    <string name="quality_tc">TC</string>
+    <string name="quality_blueray">Blu-ray</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="poster_image">Sawirka Boodhka</string>
+    <string name="quality_webrip">Web</string>
+    <string name="error_invalid_url">Hayb aan sax ahayn</string>
+    <string name="resolution_and_title">Tayada iyo ciwaanka</string>
+    <string name="resolution">Tayada</string>
+    <string name="error_invalid_id">Aqoonsi aan sax ahayn</string>
+    <string name="error_invalid_data">Xog ana sax ahayn</string>
+    <string name="error">Xumaaday</string>
+    <string name="video_tracks">Noocyada Muqaalka</string>
+    <string name="subtitle_offset_extra_hint_none_format">Waxba kamaad bedelin daahitaanka Qrl-hoosaadka</string>
+    <string name="subtitles_filter_lang">U kala hor sida luuqadaha aad doorbidday</string>
+    <string name="home_next_random_img_des">X.la\'aanta xigta</string>
+    <string name="plugin_singular">Sidkane</string>
+    <string name="plugin">Sidkanayaasha</string>
+    <string name="delete_repository">Saar kayd-weynaha</string>
+    <string name="setup_extensions_subtext">Dejiso liiska websaydyada aad dooneyso</string>
+    <string name="plugins_downloaded" formatted="true">Waxa la dejiyey: %d</string>
+    <string name="batch_download">Dejin xidhmeed</string>
+    <string name="delete_repository_plugins">Waxa la saarayaa dhammaan sidkanayaasha kayd-weynaha</string>
+    <string name="plugins_disabled" formatted="true">Xayiran: %d</string>
+    <string name="plugins_not_downloaded" formatted="true">Aan dejinayn: %d</string>
+    <string name="plugins_updated" formatted="true">Waxa la cusbooneysiiyey %d sidkane</string>
+    <string name="blank_repo_message">Ugu horreyn cloudstream ma laha wax websaydyo uu filimaanta kasoo xigto, waxay noqonaysaa inaad adigu rakibato reboositarradooda...
+\n
+\nSababtuna waa in mar dhexdaas ah na dacweeyeen shirkadda Sky UK Limited🤮, markaa si aan mar dambe taasi u dhicin anagu kuma rakibi karno...
+\n
+\nDiscord naga soo qabo ama internetka ka baadh.</string>
+    <string name="download_all_plugins_from_repo">Soo deji dhamaan sidkanayaasha reboositarkan\?</string>
+    <string name="result_poster_img_des">Boodhka</string>
+    <string name="episode_poster_img_des">Boodhka xalqadda</string>
+    <string name="home_main_poster_img_des">Boodhka weyn</string>
+    <string name="example_password">Lambarkasirta123</string>
+    <string name="subtitle_offset_title">Dib-u-dhaca Qrl-hoosaadka</string>
+    <string name="extras">Dheeraadka</string>
+    <string name="trailer">Goo-gooska</string>
+    <string name="network_adress_example">Lifaaqa daalacashada</string>
+    <string name="referer">Tixraacaha</string>
+    <string name="next">Xiga</string>
+    <string name="provider_languages_tip">Ku daawo muuqaallada luuqadahan</string>
+    <string name="previous">Kii hore</string>
+    <string name="skip_setup">Is dhaafi fadhiisintan</string>
+    <string name="app_layout_subtext">Beddel sida appku u muuqdo si uu ugu habboonaado moobilekaaga</string>
+    <string name="crash_reporting_title">Warbixinra cillad-saarka</string>
+    <string name="preferred_media_subtext">Maxaad rabtaa inaad daawato</string>
+    <string name="setup_done">Dhan</string>
+    <string name="add_repository">Ku dar kayd-weyne</string>
+    <string name="repository_name_hint">Magaca kayd-weynaha</string>
+    <string name="repository_url_hint">Haybta kayd-weynaha</string>
+    <string name="plugin_loaded">Waa la keenay sidkanaha</string>
+    <string name="plugin_downloaded">Waa ka dejiyey sidkanaha</string>
+    <string name="plugin_deleted">Waa la tiray sidkanahan</string>
+    <string name="plugin_load_fail" formatted="true">Waa ka keeni kari waayey %s</string>
+    <string name="is_adult">18+</string>
+    <string name="batch_download_start_format" formatted="true">Waa la dejinayaa %d %s…</string>
+    <string name="batch_download_finish_format" formatted="true">Waa la dejiyey %d %s</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Dhammaan %s way dejisan yihiin</string>
+    <string name="extensions">Kordhiyeyaasha</string>
+    <string name="view_public_repositories_button_short">Liiska bulshada kale</string>
+    <string name="player_settings_play_in_app">Muqaal daaraha appka</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="player_settings_play_in_browser">Barawsarka</string>
+    <string name="app_not_found_error">Kuuguma jiro appkaasi</string>
+    <string name="all_languages_preference">Dhammaan luuqadaha</string>
+    <string name="skip_type_format" formatted="true">Is dhaafi %s</string>
+    <string name="skip_type_ed">Dhamaadka</string>
+    <string name="skip_type_recap">Soo koobidda</string>
+    <string name="skip_type_mixed_ed">Dhamaad isku qasan</string>
+    <string name="skip_type_op">Bilowga</string>
+    <string name="skip_type_mixed_op">Bilow isku qasan</string>
+    <string name="skip_type_creddits">Qoraalka dhamaadka</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 7e83f840..32336b66 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -2,7 +2,8 @@
 <!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <string name="rated_format">Betygsatt: %.1f</string>
     <string name="player_speed_text_format">Hastighet (%.2fx)</string>
-    <string name="new_update_format">Ny uppdatering hittad!\n%s -&gt; %s</string>
+    <string name="new_update_format">Ny uppdatering hittad!
+\n%s -&gt; %s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Hem</string>
     <string name="title_search">Sök</string>
@@ -32,7 +33,7 @@
     <string name="pick_subtitle">Undertexter</string>
     <string name="reload_error">Försök ansluta igen…</string>
     <string name="go_back">Gå tillbaka</string>
-    <string name="episode_poster_img_des">@string/result_poster_img_des</string>
+    <string name="episode_poster_img_des">\@string/result_poster_img_des</string>
     <string name="play_episode">Spela Avsnitt</string>
     <string name="download">Ladda ner</string>
     <string name="download_storage_text">Intern lagring</string>
@@ -43,7 +44,7 @@
     <string name="pref_disable_acra">Inaktivera automatisk felrapportering</string>
     <string name="home_more_info">Mer information</string>
     <string name="home_expanded_hide">Hide</string>
-    <string name="home_main_poster_img_des">@string/result_poster_img_des</string>
+    <string name="home_main_poster_img_des">\@string/result_poster_img_des</string>
     <string name="home_play">Spela upp</string>
     <string name="home_info">Info</string>
     <string name="home_next_random_img_des">Nästa</string>
@@ -124,7 +125,8 @@
     <string name="episode_short">A</string>
     <string name="delete_file">Ta bort nerladdad fil</string>
     <string name="delete">Ta bort</string>
-    <string name="delete_message">%s kommer att raderas permanent\nÄr du helt säker?</string>
+    <string name="delete_message">%s kommer att raderas permanent
+\nÄr du helt säker\?</string>
     <string name="status_ongoing">Pågående</string>
     <string name="status_completed">Färdig</string>
     <string name="status">Status</string>
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 12b4e96c..9e5b29d4 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -5,7 +5,7 @@
     <string name="app_dub_sub_episode_text_format">%s Ep %d</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
@@ -15,7 +15,8 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Bilis (%.2fx)</string>
     <string name="rated_format" formatted="true">Rated: %.1f</string>
-    <string name="new_update_format" formatted="true">Bagong update!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Bagong update!
+\n%s -&gt; %s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Home</string>
     <string name="title_search">Maghanap</string>
@@ -145,7 +146,8 @@
     <string name="delete">Tanggalin</string>
     <string name="pause">I-pause</string>
     <string name="resume">I-resume</string>
-    <string name="delete_message">This will permanently delete %s\nAre you sure?</string>
+    <string name="delete_message">This will permanently delete %s
+\nAre you sure\?</string>
     <string name="status_ongoing">Patuloy</string>
     <string name="status_completed">Tapos na</string>
     <string name="status">Katayuan</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2e3bddc6..03eee72b 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -13,25 +13,26 @@
     <string name="year_format" formatted="true" translatable="false">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
-    <string name="next_episode_format" formatted="true">Bölüm %d şu tarihte yayınlanacak: </string>
+    <string name="next_episode_format" formatted="true">Bölüm %d şu tarihte yayınlanacak:</string>
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Bölüm Posteri</string>
     <string name="home_main_poster_img_des">Ana Poster</string>
     <string name="home_next_random_img_des">Sonraki Rastgele</string>
-    <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
+    <string name="episode_play_img_des" translatable="false">\@string/play_episode</string>
     <string name="go_back_img_des">Geri git</string>
-    <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
+    <string name="change_providers_img_des" translatable="false">\@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">Change Provider</string>
     <string name="preview_background_img_des">Preview Background</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Hız (%.2fx)</string>
     <string name="rated_format" formatted="true">Puan: %.1f</string>
-    <string name="new_update_format" formatted="true">Yeni güncelleme bulundu!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Yeni güncelleme bulundu!
+\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d dakika</string>
     <string name="app_name">CloudStream</string>
@@ -45,7 +46,7 @@
     <string name="no_data">Veri yok</string>
     <string name="episode_more_options_des">Daha fazla seçenek</string>
     <string name="next_episode">Sonraki bölüm</string>
-    <string name="result_plot" translatable="false">@string/synopsis</string>
+    <string name="result_plot" translatable="false">\@string/synopsis</string>
     <string name="result_tags">Türler</string>
     <string name="result_share">Paylaş</string>
     <string name="result_open_in_browser">Tarayıcıda aç</string>
@@ -122,7 +123,7 @@
     <string name="continue_watching">İzlemeye devam et</string>
     <string name="action_remove_watching">Kaldır</string>
     <string name="action_open_watching">Daha fazla bilgi</string>
-    <string name="action_open_play">@string/home_play </string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Bu sağlayıcının düzgün çalışması için bir VPN gerekebilir</string>
     <string name="vpn_torrent">Bu sağlayıcı bir torrent. VPN önerilir</string>
     <string name="provider_info_meta">Metadata site tarafından sağlanmamış, veri site\'de bulunmuyorsa video yüklenmesi başarısız olacak.</string>
@@ -204,13 +205,15 @@
     <string name="no_episodes_found">Bölüm bulunamadı</string>
     <string name="delete_file">Dosyayı sil</string>
     <string name="delete">Sil</string>
-    <string name="cancel" translatable="false">@string/sort_cancel</string>
+    <string name="cancel" translatable="false">\@string/sort_cancel</string>
     <string name="pause">Durdur</string>
     <string name="resume">Sürdür</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">%s dosyası tamamen silinecek\nEmins misiniz?</string>
-    <string name="resume_time_left" formatted="true">%dm\nkaldı</string>
+    <string name="delete_message" formatted="true">%s dosyası tamamen silinecek
+\nEmins misiniz\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\nkaldı</string>
     <string name="status_ongoing">Devam ediyor</string>
     <string name="status_completed">Tamamlandı</string>
     <string name="status">Durum</string>
@@ -241,8 +244,8 @@
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Dizi</string>
     <string name="cartoons_singular">Çizgi film</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Belgesel</string>
     <string name="asian_drama_singular">Asya draması</string>
@@ -257,7 +260,7 @@
     <string name="episode_action_chromecast_episode">Bölümü Chromecast ile yayınla</string>
     <string name="episode_action_chromecast_mirror">Bağlantıyı Chromecast ile yayınla</string>
     <string name="episode_action_play_in_app">Uygulamada oynat</string>
-    <string name="episode_action_play_in_format">%s\'de\/da oynat</string>
+    <string name="episode_action_play_in_format">%s\'deda oynat</string>
     <string name="episode_action_play_in_browser">Tarayıcıda oynat</string>
     <string name="episode_action_copy_link">Linki kopyala</string>
     <string name="episode_action_auto_download">Otomatik indir</string>
@@ -304,22 +307,7 @@
     <string name="resize_zoom">Yakınlaştır</string>
     <string name="legal_notice">Disclaimer</string>
     <string name="legal_notice_key" translatable="false">legal_notice_key</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
-        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
-
-        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
-
-        The app is purely for educational and personal use.
-
-        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down.
-        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or
-        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
-        user-friendly interface.
-
-        It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the
-        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
-        CloudStream 3 at your own risk.
-    </string>
+    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Genel</string>
     <string name="random_button_settings">Rastgele butonu</string>
     <string name="random_button_settings_desc">Ana sayfada rastgele butonunu göster</string>
@@ -370,7 +358,7 @@
     <string name="upload_sync">Senkronize et</string>
     <string name="sync_score">Puan</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s için doğrulama başarılı</string>
     <string name="authenticated_user_fail" formatted="true">%s için doğrulama başarısız</string>
@@ -380,7 +368,7 @@
     <string name="all">Hepsi</string>
     <string name="max">Maksimum</string>
     <string name="min">Minimum</string>
-    <string name="subtitles_none" translatable="false">@string/none</string>
+    <string name="subtitles_none" translatable="false">\@string/none</string>
     <string name="subtitles_outline">Dış hat</string>
     <string name="subtitles_depressed">Çökmüş</string>
     <string name="subtitles_shadow">Gölge</string>
@@ -447,7 +435,7 @@
     <string name="skip_setup">Kurulumu atla</string>
     <string name="app_layout_subtext">Cihazınıza uygun görünümü seçin</string>
     <string name="crash_reporting_title">Çökme raporları</string>
-    <string name="preferred_media_subtext">Ne izlemek istiyorsunuz?</string>
+    <string name="preferred_media_subtext">Ne izlemek istiyorsunuz\?</string>
     <string name="setup_done">Bitti</string>
     <string name="extensions">Eklentiler</string>
     <string name="add_repository">Depo ekle</string>
@@ -474,7 +462,7 @@
     <string name="view_public_repositories_button">Topluluk depolarını görüntüle</string>
     <string name="view_public_repositories_button_short">Herkese açık liste</string>
     <string name="uppercase_all_subtitles">Tüm alt yazılar büyük harf</string>
-    <string name="download_all_plugins_from_repo">Bu depodaki tüm eklentiler indirilsin mi?</string>
+    <string name="download_all_plugins_from_repo">Bu depodaki tüm eklentiler indirilsin mi\?</string>
     <string name="single_plugin_disabled" formatted="true">%s devre dışı bırakıldı</string>
     <string name="tracks">Parçalar</string>
     <string name="audio_tracks">Ses parçaları</string>
@@ -501,7 +489,7 @@
     <string name="player_settings_play_in_browser">İnternet tarayıcısı</string>
     <string name="app_not_found_error">Uygulama bulunamadı</string>
     <string name="history">Geçmiş</string>
-    <string name="action_mark_as_watched">İzlendi olarak imle</string>
+    <string name="action_mark_as_watched">İzlendi olarak işaretle</string>
     <string name="update_notification_installing">Uygulama güncellemesi yükleniyor…</string>
     <string name="redo_setup_process">Kurulum işlemini tekrarla</string>
     <string name="play_trailer_button">Fragmanı oynat</string>
@@ -529,11 +517,12 @@
     <string name="confirm_exit_dialog">Çıkmak istediğine emin misin\?</string>
     <string name="yes">Evet</string>
     <string name="update_notification_downloading">Uygulama güncellemesi indiriliyor…</string>
-    <string name="update_notification_failed">Uygulamanın yeni sürümü yüklenemedi.</string>
+    <string name="update_notification_failed">Uygulamanın yeni sürümü yüklenemedi</string>
     <string name="clear_history">Geçmişi temizle</string>
     <string name="apk_installer_package_installer">Paket yükleyici</string>
     <string name="apk_installer_legacy">Eski</string>
     <string name="pref_category_gestures">Hareketler</string>
     <string name="all_languages_preference">Tüm diller</string>
     <string name="skip_type_format" formatted="true">Geç %s</string>
+    <string name="action_remove_from_watched">İzlenenlerden kaldır</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index d139144e..93e51c84 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -94,9 +94,9 @@
     <string name="filler" formatted="true">Філер</string>
     <string name="play_with_app_name">Програти в CloudStream</string>
     <string name="stream">Потік</string>
-    <string name="type_watching">Переглянуто</string>
+    <string name="type_watching">Переглядаю</string>
     <string name="result_share">Поділитися</string>
-    <string name="type_on_hold">Призупинено</string>
+    <string name="type_on_hold">Відкладено</string>
     <string name="type_re_watching">Повторний перегляд</string>
     <string name="download">Завантажити</string>
     <string name="play_livestream_button">Відтворити трансляцію</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 64b2c0a5..8b70569a 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -10,7 +10,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
@@ -20,7 +20,8 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Tốc độ (%.2fx)</string>
     <string name="rated_format" formatted="true">Đánh giá: %.1f</string>
-    <string name="new_update_format" formatted="true">Đã có bản cập nhật mới!\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">Đã có bản cập nhật mới!
+\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Bộ lọc</string>
     <string name="duration_format" formatted="true">%d phút</string>
     <string name="app_name">CloudStream</string>
@@ -109,7 +110,7 @@
     <string name="continue_watching">Tiếp tục xem</string>
     <string name="action_remove_watching">Loại bỏ</string>
     <string name="action_open_watching">Thông tin thêm</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Bạn có thể sẽ cần sử dụng VPN để xem phim này</string>
     <string name="vpn_torrent">Phim này được chiếu dưới dạng Torrent. Hãy sử dụng VPN để xem</string>
     <string name="provider_info_meta">Siêu dữ liệu không được cung cấp bởi trang web, quá trình tải video sẽ không thành công nếu nó không tồn tại trên trang web.</string>
@@ -147,7 +148,7 @@
     <string name="restore_success">Đã tải dữ liệu sao lưu</string>
     <string name="restore_failed_format" formatted="true">Không thể khôi phục dữ liệu từ %s</string>
     <string name="backup_success">Khôi phục dữ liệu thành công</string>
-    <string name="backup_failed">Thiếu quyền truy cập bộ nhớ, hãy thử lại</string>
+    <string name="backup_failed">Thiếu quyền truy cập bộ nhớ, hãy thử lại.</string>
     <string name="backup_failed_error_format">Lỗi khi sao lưu %s</string>
     <string name="search">Tìm kiếm</string>
     <string name="category_account">Tài khoản</string>
@@ -160,7 +161,7 @@
     <string name="show_fillers_settings">Hiển thị tập phụ cho anime</string>
     <string name="show_trailers_settings">Hiển thị trailer</string>
     <string name="kitsu_settings">Hiển thị poster từ kitsu</string>
-    <string name="pref_filter_search_quality">Ẩn chất lượng Video khi tìm kiếm</string>
+    <string name="pref_filter_search_quality">Ẩn chất lượng video khi tìm kiếm</string>
     <string name="automatic_plugin_updates">Tự động cập nhật plugin</string>
     <string name="updates_settings">Hiển thị thông báo cập nhật App</string>
     <string name="updates_settings_des">Tự động tìm kiếm và thông báo khi có bản cập nhật mới</string>
@@ -194,8 +195,10 @@
     <string name="resume">Tiếp Tục</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message">%s sẽ bị xoá vĩnh viễn\nBạn có chắc chắn muốn xóa?</string>
-    <string name="resume_time_left" formatted="true">%dm\ncòn lại</string>
+    <string name="delete_message">%s sẽ bị xoá vĩnh viễn
+\nBạn có chắc chắn muốn xóa\?</string>
+    <string name="resume_time_left" formatted="true">%dm
+\ncòn lại</string>
     <string name="status_ongoing">Đang Chiếu</string>
     <string name="status_completed">Hoàn Thành</string>
     <string name="status">Trạng Thái</string>
@@ -226,8 +229,8 @@
     <string name="movies_singular">Phim Lẻ</string>
     <string name="tv_series_singular">Phim Bộ</string>
     <string name="cartoons_singular">Hoạt Hình</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Phim Tài Liệu</string>
     <string name="asian_drama_singular">Truyền Hình Châu Á</string>
@@ -322,7 +325,7 @@
     <string name="upload_sync">Đồng bộ</string>
     <string name="sync_score">Đánh giá</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">Đã xác thực %s</string>
     <string name="authenticated_user_fail" formatted="true">Không thể xác thực %s</string>
@@ -424,7 +427,7 @@
     <string name="view_public_repositories_button">Xem kho lưu trữ của cộng đồng</string>
     <string name="view_public_repositories_button_short">Danh sách công khai</string>
     <string name="uppercase_all_subtitles">In hoa toàn bộ phụ đề</string>
-    <string name="download_all_plugins_from_repo">Tải toàn bộ plugin từ kho lưu trữ này?</string>
+    <string name="download_all_plugins_from_repo">Tải toàn bộ plugin từ kho lưu trữ này\?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Đã vô hiệu)</string>
     <string name="tracks">Thêm</string>
     <string name="audio_tracks">Âm thanh</string>
@@ -435,4 +438,13 @@
     <string name="safe_mode_crash_info">Xem thông tin sự cố</string>
     <string name="history">Lịch sử</string>
     <string name="action_mark_as_watched">Đánh dấu là đã xem</string>
+    <string name="automatic_plugin_download">Tự động tải plugin</string>
+    <string name="redo_setup_process">Thiết lập lại</string>
+    <string name="apk_installer_settings">Bộ cài APK</string>
+    <string name="apk_installer_settings_des">Một số máy không hỗ trợ trình cài đặt gói mới. Hãy thử tùy chọn cũ nếu các bản cập nhật không cài đặt.</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="play_trailer_button">Xem Trailer</string>
+    <string name="automatic_plugin_download_summary">Tự động tải plugins còn thiếu.</string>
+    <string name="update_started">Bắt đầu cập nhật</string>
+    <string name="pref_category_links">Liên kết</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 764304d7..a8341d46 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -19,19 +19,20 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">封面</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">劇集封面</string>
     <string name="home_main_poster_img_des">主封面</string>
     <string name="home_next_random_img_des">隨機下一個</string>
-    <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
+    <string name="episode_play_img_des" translatable="false">\@string/play_episode</string>
     <string name="go_back_img_des">返回</string>
-    <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
+    <string name="change_providers_img_des" translatable="false">\@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">更改片源</string>
     <string name="preview_background_img_des">預覽背景</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">速度（%.2fx）</string>
     <string name="rated_format" formatted="true">評分：%.1f</string>
-    <string name="new_update_format" formatted="true">發現新版本！\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">發現新版本！
+\n%s -&gt; %s</string>
     <string name="filler" formatted="true">填充</string>
     <string name="duration_format" formatted="true">%d 分鐘</string>
     <string name="app_name">CloudStream</string>
@@ -45,7 +46,7 @@
     <string name="no_data">無資料</string>
     <string name="episode_more_options_des">更多選項</string>
     <string name="next_episode">下一集</string>
-    <string name="result_plot" translatable="false">@string/synopsis</string>
+    <string name="result_plot" translatable="false">\@string/synopsis</string>
     <string name="result_tags">類型</string>
     <string name="result_share">分享</string>
     <string name="result_open_in_browser">在瀏覽器中打開</string>
@@ -122,7 +123,7 @@
     <string name="continue_watching">繼續觀看</string>
     <string name="action_remove_watching">移除</string>
     <string name="action_open_watching">更多資訊</string>
-    <string name="action_open_play">@string/home_play </string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">此片源可能需要 VPN 才能正常使用</string>
     <string name="vpn_torrent">此片源是種子，建議使用 VPN</string>
     <string name="provider_info_meta">站點不提供元數據，如果站點上不存在元數據，影片載入將失敗。</string>
@@ -149,8 +150,7 @@
     <string name="double_tap_to_seek_settings">輕按兩下以控制進度</string>
     <string name="double_tap_to_pause_settings">輕按兩下以暫停</string>
     <string name="double_tap_to_seek_amount_settings">輕按兩下以控制進度時間</string>
-    <string name="double_tap_to_seek_settings_des">在右側或左側輕按兩次以向前或向後快轉
-    </string>
+    <string name="double_tap_to_seek_settings_des">在右側或左側輕按兩次以向前或向後快轉</string>
     <string name="double_tap_to_pause_settings_des">輕按兩下中間以暫停</string>
     <string name="use_system_brightness_settings">使用系統亮度</string>
     <string name="use_system_brightness_settings_des">在應用程序播放器中使用系統亮度替代黑色遮罩</string>
@@ -205,12 +205,13 @@
     <string name="no_episodes_found">未找到劇集</string>
     <string name="delete_file">刪除文件</string>
     <string name="delete">刪除</string>
-    <string name="cancel" translatable="false">@string/sort_cancel</string>
+    <string name="cancel" translatable="false">\@string/sort_cancel</string>
     <string name="pause">暫停</string>
     <string name="resume">繼續</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">這將永遠刪除 %s\n你確定嗎?</string>
+    <string name="delete_message" formatted="true">這將永遠刪除 %s
+\n你確定嗎\?</string>
     <string name="resume_time_left" formatted="true">%d 分鐘
 \n剩餘的</string>
     <string name="status_ongoing">連載中</string>
@@ -243,8 +244,8 @@
     <string name="movies_singular">電影</string>
     <string name="tv_series_singular">電視劇</string>
     <string name="cartoons_singular">卡通</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
     <string name="torrent_singular">種子</string>
     <string name="documentaries_singular">紀錄片</string>
     <string name="asian_drama_singular">亞洲劇</string>
@@ -306,22 +307,7 @@
     <string name="resize_zoom">縮放</string>
     <string name="legal_notice">免責聲明</string>
     <string name="legal_notice_key" translatable="false">legal_notice_key</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
-        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
-
-        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
-
-        The app is purely for educational and personal use.
-
-        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down.
-        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or
-        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
-        user-friendly interface.
-
-        It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the
-        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
-        CloudStream 3 at your own risk.
-    </string>
+    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">通用</string>
     <string name="random_button_settings">隨機按鈕</string>
     <string name="random_button_settings_desc">在主頁中顯示隨機按鈕</string>
@@ -372,7 +358,7 @@
     <string name="upload_sync">同步</string>
     <string name="sync_score">評分</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s 已驗證</string>
     <string name="authenticated_user_fail" formatted="true">無法在 %s 登入</string>
@@ -382,7 +368,7 @@
     <string name="all">全部</string>
     <string name="max">最大</string>
     <string name="min">最小</string>
-    <string name="subtitles_none" translatable="false">@string/none</string>
+    <string name="subtitles_none" translatable="false">\@string/none</string>
     <string name="subtitles_outline">輪廓</string>
     <string name="subtitles_depressed">凹陷</string>
     <string name="subtitles_shadow">陰影</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 9545956e..97a48597 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -19,19 +19,20 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">封面</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">剧集封面</string>
     <string name="home_main_poster_img_des">主封面</string>
     <string name="home_next_random_img_des">随机下一个</string>
-    <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
+    <string name="episode_play_img_des" translatable="false">\@string/play_episode</string>
     <string name="go_back_img_des">返回</string>
-    <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
+    <string name="change_providers_img_des" translatable="false">\@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">更改片源</string>
     <string name="preview_background_img_des">预览背景</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">速度（%.2fx）</string>
     <string name="rated_format" formatted="true">评分：%.1f</string>
-    <string name="new_update_format" formatted="true">发现新版本！\n%s -&gt; %s</string>
+    <string name="new_update_format" formatted="true">发现新版本！
+\n%s -&gt; %s</string>
     <string name="filler" formatted="true">填充</string>
     <string name="duration_format" formatted="true">%d 分钟</string>
     <string name="app_name">CloudStream</string>
@@ -45,7 +46,7 @@
     <string name="no_data">无数据</string>
     <string name="episode_more_options_des">更多选项</string>
     <string name="next_episode">下一集</string>
-    <string name="result_plot" translatable="false">@string/synopsis</string>
+    <string name="result_plot" translatable="false">\@string/synopsis</string>
     <string name="result_tags">类型</string>
     <string name="result_share">分享</string>
     <string name="result_open_in_browser">在浏览器中打开</string>
@@ -122,7 +123,7 @@
     <string name="continue_watching">继续观看</string>
     <string name="action_remove_watching">移除</string>
     <string name="action_open_watching">更多信息</string>
-    <string name="action_open_play">@string/home_play </string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">此片源可能需要 VPN 才能正常使用</string>
     <string name="vpn_torrent">此片源为种子文件，建议使用 VPN</string>
     <string name="provider_info_meta">站点不提供元数据，如果站点上不存在元数据，视频加载将失败。</string>
@@ -149,12 +150,10 @@
     <string name="double_tap_to_seek_settings">双击控制进度</string>
     <string name="double_tap_to_pause_settings">双击暂停</string>
     <string name="double_tap_to_seek_amount_settings">双击控制进度时间</string>
-    <string name="double_tap_to_seek_settings_des">在左右侧双击快进或快退
-    </string>
+    <string name="double_tap_to_seek_settings_des">在左右侧双击快进或快退</string>
     <string name="double_tap_to_pause_settings_des">双击中间暂停</string>
     <string name="use_system_brightness_settings">使用系统亮度</string>
-    <string name="use_system_brightness_settings_des">在应用播放器中使用系统亮度替代黑色遮罩
-    </string>
+    <string name="use_system_brightness_settings_des">在应用播放器中使用系统亮度替代黑色遮罩</string>
     <string name="episode_sync_settings">更新观看进度</string>
     <string name="episode_sync_settings_des">自动同步当前剧集进度</string>
     <string name="restore_settings">从备份中恢复数据</string>
@@ -194,8 +193,7 @@
     <string name="copy_link_toast">链接已复制到剪贴板</string>
     <string name="play_episode_toast">播放剧集</string>
     <string name="subs_default_reset_toast">重置为默认值</string>
-    <string name="acra_report_toast">抱歉，应用崩溃了，将发送一份匿名错误报告给开发者
-    </string>
+    <string name="acra_report_toast">抱歉，应用崩溃了，将发送一份匿名错误报告给开发者</string>
     <string name="season">季</string>
     <string name="season_format">%s %d%s</string>
     <string name="no_season">无季</string>
@@ -208,12 +206,13 @@
     <string name="no_episodes_found">未找到剧集</string>
     <string name="delete_file">删除文件</string>
     <string name="delete">删除</string>
-    <string name="cancel" translatable="false">@string/sort_cancel</string>
+    <string name="cancel" translatable="false">\@string/sort_cancel</string>
     <string name="pause">暂停</string>
     <string name="resume">继续</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">这将永久删除 %s\n您确定吗?</string>
+    <string name="delete_message" formatted="true">这将永久删除 %s
+\n您确定吗\?</string>
     <string name="resume_time_left" formatted="true">%d 分钟
 \n剩余</string>
     <string name="status_ongoing">连载中</string>
@@ -246,8 +245,8 @@
     <string name="movies_singular">电影</string>
     <string name="tv_series_singular">电视剧</string>
     <string name="cartoons_singular">卡通</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
     <string name="torrent_singular">种子</string>
     <string name="documentaries_singular">纪录片</string>
     <string name="asian_drama_singular">亚洲剧</string>
@@ -309,22 +308,7 @@
     <string name="resize_zoom">缩放</string>
     <string name="legal_notice">免责声明</string>
     <string name="legal_notice_key" translatable="false">legal_notice_key</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
-        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
-
-        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
-
-        The app is purely for educational and personal use.
-
-        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down.
-        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or
-        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
-        user-friendly interface.
-
-        It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the
-        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
-        CloudStream 3 at your own risk.
-    </string>
+    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">通用</string>
     <string name="random_button_settings">随机按钮</string>
     <string name="random_button_settings_desc">在主页中显示随机按钮</string>
@@ -375,7 +359,7 @@
     <string name="upload_sync">同步</string>
     <string name="sync_score">评分</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">已验证 %s</string>
     <string name="authenticated_user_fail" formatted="true">无法登录到 %s</string>
@@ -385,7 +369,7 @@
     <string name="all">全部</string>
     <string name="max">最大</string>
     <string name="min">最小</string>
-    <string name="subtitles_none" translatable="false">@string/none</string>
+    <string name="subtitles_none" translatable="false">\@string/none</string>
     <string name="subtitles_outline">轮廓</string>
     <string name="subtitles_depressed">凹陷</string>
     <string name="subtitles_shadow">阴影</string>
@@ -552,4 +536,5 @@
     <string name="update_started">更新开始</string>
     <string name="delayed_update_notice">应用退出后将会更新</string>
     <string name="plugin_downloaded">插件已下载</string>
+    <string name="action_remove_from_watched">从已观看中移除</string>
 </resources>
\ No newline at end of file

From 5050ff65c06a8cb1bdef74561ee9ef3ae77f1ff9 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Wed, 25 Jan 2023 15:06:48 +0100
Subject: [PATCH 192/273] disabled crash reporting because yall keep crashing

---
 app/build.gradle.kts                          |  4 +-
 .../lagradost/cloudstream3/AcraApplication.kt |  4 +-
 .../com/lagradost/cloudstream3/MainAPI.kt     | 55 ++++++++++++++++++-
 .../ui/setup/SetupFragmentLayout.kt           |  2 +-
 app/src/main/res/xml/settings_updates.xml     |  2 +-
 5 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f8e0091c..1cbcec68 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -47,8 +47,8 @@ android {
         minSdk = 21
         targetSdk = 33
 
-        versionCode = 55
-        versionName = "3.4.0"
+        versionCode = 56
+        versionName = "3.5.0"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
index 198f0f4c..0351b1ff 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
@@ -43,9 +43,9 @@ class CustomReportSender : ReportSender {
     override fun send(context: Context, errorContent: CrashReportData) {
         println("Sending report")
         val url =
-            "https://docs.google.com/forms/u/0/d/e/1FAIpQLSe9Vff8oHGMRXcjgCXZwkjvx3eBdNpn4DzjO0FkcWEU1gEQpA/formResponse"
+            "https://docs.google.com/forms/d/e/1FAIpQLSdOlbgCx7NeaxjvEGyEQlqdh2nCvwjm2vwpP1VwW7REj9Ri3Q/formResponse"
         val data = mapOf(
-            "entry.1586460852" to errorContent.toJSON()
+            "entry.753293084" to errorContent.toJSON()
         )
 
         thread { // to not run it on main thread
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 6565b144..8c818027 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -14,7 +14,7 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
 import com.lagradost.cloudstream3.ui.player.SubtitleData
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
+import com.lagradost.cloudstream3.ui.result.UiText
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -81,7 +81,7 @@ object APIHolder {
         synchronized(allProviders) {
             initMap()
             return apiMap?.get(apiName)?.let { apis.getOrNull(it) }
-                // Leave the ?. null check, it can crash regardless
+            // Leave the ?. null check, it can crash regardless
                 ?: allProviders.firstOrNull { it?.name == apiName }
         }
     }
@@ -318,6 +318,57 @@ object APIHolder {
     }
 }
 
+/*
+// THIS IS WORK IN PROGRESS API
+interface ITag {
+    val name: UiText
+}
+
+data class SimpleTag(override val name: UiText, val data: String) : ITag
+
+enum class SelectType {
+    SingleSelect,
+    MultiSelect,
+    MultiSelectAndExclude,
+}
+
+enum class SelectValue {
+    Selected,
+    Excluded,
+}
+
+interface GenreSelector {
+    val title: UiText
+    val id : Int
+}
+
+data class TagSelector(
+    override val title: UiText,
+    override val id : Int,
+    val tags: Set<ITag>,
+    val defaultTags : Set<ITag> = setOf(),
+    val selectType: SelectType = SelectType.SingleSelect,
+) : GenreSelector
+
+data class BoolSelector(
+    override val title: UiText,
+    override val id : Int,
+
+    val defaultValue : Boolean = false,
+) : GenreSelector
+
+data class InputField(
+    override val title: UiText,
+    override val id : Int,
+
+    val hint : UiText? = null,
+) : GenreSelector
+
+// This response describes how a user might filter the homepage or search results
+data class GenreResponse(
+    val searchSelectors : List<GenreSelector>,
+    val filterSelectors: List<GenreSelector> = searchSelectors
+) */
 
 /*
 0 = Site not good
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt
index bc9bfb1f..50fb37d6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt
@@ -67,7 +67,7 @@ class SetupFragmentLayout : Fragment() {
                 crash_reporting_text?.text = getText(text)
             }
 
-            val enableCrashReporting = !settingsManager.getBoolean(ACRA.PREF_DISABLE_ACRA, false)
+            val enableCrashReporting = !settingsManager.getBoolean(ACRA.PREF_DISABLE_ACRA, true)
             acra_switch.isChecked = enableCrashReporting
             crash_reporting_text.text =
                 getText(
diff --git a/app/src/main/res/xml/settings_updates.xml b/app/src/main/res/xml/settings_updates.xml
index ba098c8c..f2ec6747 100644
--- a/app/src/main/res/xml/settings_updates.xml
+++ b/app/src/main/res/xml/settings_updates.xml
@@ -2,7 +2,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <SwitchPreference
-        android:defaultValue="false"
+        android:defaultValue="true"
         android:icon="@drawable/ic_baseline_bug_report_24"
         android:key="acra.disable"
         android:summaryOff="@string/bug_report_settings_off"

From 01f1edab3c955d1e2f35c06c5b27695377c6c935 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Thu, 26 Jan 2023 00:34:55 +0100
Subject: [PATCH 193/273] webview crash fix

---
 .../com/lagradost/cloudstream3/network/CloudflareKiller.kt    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt b/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt
index 068cb968..6950d961 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt
@@ -64,7 +64,9 @@ class CloudflareKiller : Interceptor {
     }
 
     private fun getWebViewCookie(url: String): String? {
-        return CookieManager.getInstance()?.getCookie(url)
+        return normalSafeApiCall {
+            CookieManager.getInstance()?.getCookie(url)
+        }
     }
 
     /**

From b2b16fccc529e9bd44ed4c2267f41fb3e72bb0c6 Mon Sep 17 00:00:00 2001
From: LiJu09 <40698774+LiJu09@users.noreply.github.com>
Date: Fri, 27 Jan 2023 23:44:00 +0000
Subject: [PATCH 194/273] [extractor] added ByteShare (#337)

* add byteshare extractor

* reformat code

* make it simple

* no regex
---
 .../cloudstream3/extractors/ByteShare.kt      | 23 +++++++++++++++++++
 .../cloudstream3/utils/ExtractorApi.kt        |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/extractors/ByteShare.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/ByteShare.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/ByteShare.kt
new file mode 100644
index 00000000..3e0a03c0
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/ByteShare.kt
@@ -0,0 +1,23 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.utils.*
+
+open class ByteShare : ExtractorApi() {
+    override val name = "ByteShare"
+    override val mainUrl = "https://byteshare.net"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
+        val sources = mutableListOf<ExtractorLink>()
+        sources.add(
+            ExtractorLink(
+                name,
+                name,
+                url.replace("/embed/", "/download/"),
+                "",
+                Qualities.Unknown.value,
+            )
+        )
+        return sources
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 73603964..bd4f8705 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -361,6 +361,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
 
     Cda(),
     Dailymotion(),
+    ByteShare(),
 )
 
 

From b2389bf14cfcedd17b9a5c73c22d25e985530d62 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sat, 28 Jan 2023 19:00:10 +0100
Subject: [PATCH 195/273] Add padding in info & download to remove obtrusion by
 FAB

---
 app/src/main/res/layout/fragment_downloads.xml | 4 ++--
 app/src/main/res/layout/fragment_result.xml    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/fragment_downloads.xml b/app/src/main/res/layout/fragment_downloads.xml
index f88e39d0..65f36209 100644
--- a/app/src/main/res/layout/fragment_downloads.xml
+++ b/app/src/main/res/layout/fragment_downloads.xml
@@ -5,7 +5,6 @@
     android:id="@+id/download_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/primaryGrayBackground"
     android:orientation="vertical"
     tools:context=".ui.download.DownloadFragment">
 
@@ -132,7 +131,8 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/download_list"
         android:layout_width="match_parent"
-
+        android:paddingBottom="100dp"
+        android:clipToPadding="false"
         android:layout_height="match_parent"
         android:background="?attr/primaryBlackBackground"
         android:descendantFocusability="afterDescendants"
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index 8b9b9e36..afbf735d 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -129,9 +129,9 @@
         <androidx.core.widget.NestedScrollView
             android:id="@+id/result_scroll"
             android:layout_width="match_parent"
-
-            android:layout_height="wrap_content"
-            android:background="?attr/primaryGrayBackground">
+            android:paddingBottom="100dp"
+            android:clipToPadding="false"
+            android:layout_height="wrap_content">
 
             <LinearLayout
                 android:layout_width="match_parent"

From 83d2e692e045f1f68af3c6818d8d8db5d4547880 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sat, 28 Jan 2023 19:39:12 +0100
Subject: [PATCH 196/273] Made player_video_title_rez disappear if blank

---
 .../ui/player/FullScreenPlayer.kt             |  2 +-
 .../cloudstream3/ui/player/GeneratorPlayer.kt |  4 +-
 .../main/res/layout/player_custom_layout.xml  | 53 ++++++++++---------
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index c79cdd76..2dad05ef 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -605,7 +605,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         player_top_holder?.isGone = isGone
         //player_episodes_button?.isVisible = !isGone && hasEpisodes
         player_video_title?.isGone = togglePlayerTitleGone
-        player_video_title_rez?.isGone = isGone
+//        player_video_title_rez?.isGone = isGone
         player_episode_filler?.isGone = isGone
         player_center_menu?.isGone = isGone
         player_lock?.isGone = !isShowing
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index bf39edc7..e15dcee6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -1149,13 +1149,15 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         val source = currentSelectedLink?.first?.name ?: currentSelectedLink?.second?.name ?: "NULL"
 
-        player_video_title_rez?.text = when (titleRez) {
+         val title = when (titleRez) {
             0 -> ""
             1 -> extra
             2 -> source
             3 -> "$source - $extra"
             else -> ""
         }
+        player_video_title_rez?.text = title
+        player_video_title_rez?.isVisible = title.isNotBlank()
     }
 
     override fun playerDimensionsLoaded(widthHeight: Pair<Int, Int>) {
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 691795d3..683a1077 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -96,33 +96,36 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <TextView
-                android:id="@+id/player_video_title"
+            <LinearLayout
+                android:clipToPadding="false"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="80dp"
-                android:layout_marginTop="35dp"
+                android:paddingTop="20dp"
                 android:layout_marginEnd="80dp"
-                android:gravity="center"
-                android:textColor="@color/white"
-                android:textStyle="bold"
-                android:visibility="visible"
+                android:orientation="vertical"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="Hello world" />
+                app:layout_constraintTop_toTopOf="parent">
 
-            <TextView
-                android:id="@+id/player_video_title_rez"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="80dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginEnd="80dp"
-                android:gravity="center"
-                android:textColor="@color/white"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/player_video_title"
-                tools:text="1920x1080" />
+                <TextView
+                    android:id="@+id/player_video_title_rez"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="2.5dp"
+                    android:gravity="center"
+                    android:textColor="@color/white"
+                    tools:text="1920x1080" />
+
+                <TextView
+                    android:id="@+id/player_video_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    android:visibility="visible"
+                    tools:text="Hello world" />
+            </LinearLayout>
 
 
             <!-- Removed as it has no use anymore-->
@@ -319,23 +322,23 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.button.MaterialButton
-            tools:visibility="visible"
             android:id="@+id/skip_chapter_button"
             style="@style/NiceButton"
             android:layout_width="150dp"
             android:layout_height="40dp"
             android:layout_marginEnd="100dp"
-            android:visibility="gone"
-            android:maxLines="1"
             android:backgroundTint="@color/skipOpTransparent"
+            android:maxLines="1"
             android:padding="10dp"
             android:textColor="@color/white"
+            android:visibility="gone"
             app:cornerRadius="@dimen/rounded_button_radius"
             app:layout_constraintBottom_toTopOf="@+id/bottom_player_bar"
             app:layout_constraintEnd_toEndOf="parent"
             app:strokeColor="@color/white"
             app:strokeWidth="1dp"
-            tools:text="Skip Opening" />
+            tools:text="Skip Opening"
+            tools:visibility="visible" />
 
         <LinearLayout
             android:layout_width="match_parent"

From 2a1311673a1c8326578d5f2467da14882670417b Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Sat, 28 Jan 2023 05:23:06 +0100
Subject: [PATCH 197/273] Translated using Weblate (Russian)

Currently translated at 88.0% (499 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 86.7% (492 of 567 strings)

Translated using Weblate (Romanian)

Currently translated at 75.6% (429 of 567 strings)

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translated using Weblate (Russian)

Currently translated at 86.5% (491 of 567 strings)

Translated using Weblate (Vietnamese)

Currently translated at 99.2% (563 of 567 strings)

Translated using Weblate (Slovak)

Currently translated at 33.1% (188 of 567 strings)

Translated using Weblate (Somali)

Currently translated at 99.6% (565 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 84.1% (477 of 567 strings)

Translated using Weblate (German)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 84.1% (477 of 567 strings)

Translated using Weblate (Russian)

Currently translated at 84.1% (477 of 567 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (567 of 567 strings)

Translated using Weblate (Bulgarian)

Currently translated at 100.0% (567 of 567 strings)

Added translation using Weblate (Slovak)

Translated using Weblate (Vietnamese)

Currently translated at 99.4% (564 of 567 strings)

Co-authored-by: Alexey <aleksejfedorov963@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: John Doe <vj4ud1mc@sonofdavid.anonaddy.me>
Co-authored-by: Juraj Liso <lisojuraj@gmail.com>
Co-authored-by: Shafici Isxariifshe <mega12xhaphiee@gmail.com>
Co-authored-by: alex <hdhdhfhfbbffhhfhfjfjf@gmail.com>
Co-authored-by: eightyy8 <oliver.kha@pm.me>
Co-authored-by: kaajjo <claymanoff@gmail.com>
Co-authored-by: tuan041 <30403510+tuan041@users.noreply.github.com>
Co-authored-by: tuan041 <tuananh163025ttt@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bg/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ro/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/so/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translation: Cloudstream/App
---
 app/src/main/res/values-bg/strings.xml |   1 +
 app/src/main/res/values-de/strings.xml |   2 +-
 app/src/main/res/values-ro/strings.xml |   6 +-
 app/src/main/res/values-ru/strings.xml |  38 +++++++--
 app/src/main/res/values-sk/strings.xml | 107 +++++++++++++++++++++++++
 app/src/main/res/values-so/strings.xml |   2 +-
 app/src/main/res/values-tr/strings.xml |  24 ++++--
 app/src/main/res/values-vi/strings.xml |  51 +++++++++++-
 8 files changed, 214 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/values-sk/strings.xml

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 324f44bc..9f95eb3f 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -497,4 +497,5 @@
     <string name="plugin_downloaded">Приставката е изтеглена</string>
     <string name="delayed_update_notice">Приложението ще се актуализира при изход от него</string>
     <string name="update_started">Започна Актуализация</string>
+    <string name="action_remove_from_watched">Премахване от гледани</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 33afd571..00aa5b97 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -17,7 +17,7 @@
     <string name="skip_type_intro">Intro</string>
     <string name="clear_history">Verlauf löschen</string>
     <string name="history">Verlauf</string>
-    <string name="enable_skip_op_from_database_des">Überspringen Button für Openings/Endings anzeigen</string>
+    <string name="enable_skip_op_from_database_des">Überspringen Knopf für Openings/Endings anzeigen</string>
     <string name="clipboard_too_large">Zu viel Text. Kann nicht in der Zwischenablage gespeichert werden.</string>
     <string name="episode_poster_img_des">Episodenvorschaubild</string>
     <string name="home_main_poster_img_des">Medienvorschaubild</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 28673fe2..982546bc 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -141,7 +141,7 @@
     <string name="backup_settings">Copie de rezervă a datelor</string>
     <string name="restore_success">Fișier de rezervă încărcat</string>
     <string name="restore_failed_format" formatted="true">Imposibilitatea de a restaura datele din %s</string>
-    <string name="backup_success">Datele au fost salvate cu succes</string>
+    <string name="backup_success">Date stocate</string>
     <string name="backup_failed">Permisiuni de arhivare lipsă, vă rugăm să încercați din nou</string>
     <string name="backup_failed_error_format">Eroare de backup %s</string>
     <string name="search">Căutare</string>
@@ -380,4 +380,8 @@
     <string name="app_name">CloudStream</string>
     <string name="play_trailer_button">Vizionează trailerul</string>
     <string name="update_started">Actualizarea a început</string>
+    <string name="episode_sync_settings">Actualizați progresul ceasului</string>
+    <string name="autoplay_next_settings_des">Începe următorul episod când se termină episodul curent</string>
+    <string name="pref_filter_search_quality">Ascundeți calitatea video selectată în rezultatele căutării</string>
+    <string name="play_livestream_button">Redare Livestream</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 930437c7..39e74794 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -12,7 +12,7 @@
     <string name="download_failed">Скачать неудачный</string>
     <string name="resize_fit">Подогнать</string>
     <string name="delete">Удалить</string>
-    <string name="all">Всё</string>
+    <string name="all">Все</string>
     <string name="pause">Пауза</string>
     <string name="cast_format" formatted="true">Актёрский состав: %s</string>
     <string name="show_title">Название источника</string>
@@ -53,7 +53,7 @@
     <string name="result_share">Поделиться</string>
     <string name="result_open_in_browser">Открыть в браузер</string>
     <string name="skip_loading">Пропустить загрузку</string>
-    <string name="type_watching">Смотрю</string>
+    <string name="type_watching">Просмотр</string>
     <string name="type_on_hold">Приостановленно</string>
     <string name="type_completed">Завершено</string>
     <string name="type_dropped">Брошенный</string>
@@ -81,8 +81,8 @@
     <string name="home_more_info">Подробнее</string>
     <string name="filter_bookmarks">Фильтр закладки</string>
     <string name="error_bookmarks_text">Закладки</string>
-    <string name="sort_apply">Наносить</string>
-    <string name="sort_cancel">Прервать</string>
+    <string name="sort_apply">Применить</string>
+    <string name="sort_cancel">Отмена</string>
     <string name="sort_copy">Копия</string>
     <string name="sort_close">Закрыть</string>
     <string name="sort_clear">Очистить</string>
@@ -279,7 +279,7 @@
     <string name="use_system_brightness_settings_des">Используйте яркость системы в проигрывателе приложения вместо темного наложения</string>
     <string name="episode_sync_settings">Обновить состояние хода просмотра</string>
     <string name="backup_success">Данные сохранены</string>
-    <string name="advanced_search_des">Дает вам результаты поиска, разделенные по провайдеру</string>
+    <string name="advanced_search_des">Показывает результаты поиска, разделенные по провайдеру</string>
     <string name="uprereleases_settings_des">Поиск предварительных обновлений вместо полных выпусков</string>
     <string name="redo_setup_process">Повторить процесс настройки</string>
     <string name="no_chromecast_support_toast">Этот провайдер не поддерживает Chromecast</string>
@@ -350,7 +350,7 @@
     <string name="add_account">Добавить учётную запись</string>
     <string name="example_site_name">МойКрутойСайт</string>
     <string name="example_site_url">example.com</string>
-    <string name="example_lang_name">Язык (en)</string>
+    <string name="example_lang_name">Код языка (ru)</string>
     <string name="account">учётная запись</string>
     <string name="automatic">Автоматически</string>
     <string name="example_ip">127.0.0.1</string>
@@ -394,7 +394,7 @@
     <string name="login_format" formatted="true">%s %s</string>
     <string name="authenticated_user" formatted="true">%s аутентифицировано</string>
     <string name="authenticated_user_fail" formatted="true">Не удалось перейти к %s</string>
-    <string name="max">Максимум</string>
+    <string name="max">Макс</string>
     <string name="min">Минимум</string>
     <string name="subtitles_outline">Очертание</string>
     <string name="subtitles_shadow">Тень</string>
@@ -408,4 +408,28 @@
     <string name="subtitles_example_text">Съешь ещё этих мягких французских булок, да выпей же чаю</string>
     <string name="recommended">Рекомендуется</string>
     <string name="player_loaded_subtitles" formatted="true">Загружено %s</string>
+    <string name="anime_singular">\@нить/аниме</string>
+    <string name="ova_singular">\@нить/ova</string>
+    <string name="show_dub">Этикетка Dub</string>
+    <string name="site">Сайт</string>
+    <string name="pref_category_ui_features">Функции</string>
+    <string name="actor_main">Главное</string>
+    <string name="home_source">Источник</string>
+    <string name="home_random">Случайный</string>
+    <string name="coming_soon">Скоро будет…</string>
+    <string name="show_sub">Этикетка Sub</string>
+    <string name="actor_background">Фон</string>
+    <string name="pref_category_looks">Вид</string>
+    <string name="trailer">Трейлер</string>
+    <string name="single_plugin_disabled" formatted="true">%s (отключено)</string>
+    <string name="next">Следующий</string>
+    <string name="blank_repo_message">В CloudStream по умолчанию не установлены сайты. Вам необходимо установить сайты из репозиториев.
+\n
+\nИз-за безмозглой DMCA-атаки со стороны Sky UK Limited 🤮 мы не можем связать сайт репозитория в приложении.
+\n
+\nПрисоединяйтесь к нашему Discord или ищите в интернете.</string>
+    <string name="error_invalid_data">Недопустимые данные</string>
+    <string name="resolution_and_title">Разрешение и название</string>
+    <string name="previous">Предыдущий</string>
+    <string name="resolution">Разрешение</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
new file mode 100644
index 00000000..97039233
--- /dev/null
+++ b/app/src/main/res/values-sk/strings.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="new_update_format" formatted="true">Našla sa nová aktualizácia!
+\n%s -&gt; %s</string>
+    <string name="filler" formatted="true">Výplň</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="next_episode_format" formatted="true">Epizóda %d bude vydaná za</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="next_episode">Ďalšia epizóda</string>
+    <string name="result_tags">Žánre</string>
+    <string name="result_share">Zdielať</string>
+    <string name="result_open_in_browser">Otvoriť v prehliadači</string>
+    <string name="skip_loading">Preskočiť načítavanie</string>
+    <string name="cast_format" formatted="true">Hrajú: %s</string>
+    <string name="app_name">CloudStream</string>
+    <string name="result_poster_img_des">Plagát</string>
+    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="duration_format" formatted="true">%d min</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="episode_poster_img_des">Plagát epizódy</string>
+    <string name="home_main_poster_img_des">Hlavný plagát</string>
+    <string name="play_with_app_name">Prehrať s CloudStream</string>
+    <string name="title_settings">Nastavenia</string>
+    <string name="search_hint_site" formatted="true">Hľadať %s…</string>
+    <string name="popup_resume_download">Pokračovať v sťahovaní</string>
+    <string name="rated_format" formatted="true">Hodnotenie: %.1f</string>
+    <string name="go_back_img_des">Ísť späť</string>
+    <string name="player_speed_text_format" formatted="true">Rýchlosť (%.2fx)</string>
+    <string name="home_change_provider_img_des">Zmeniť poskytovateľa</string>
+    <string name="title_home">Domov</string>
+    <string name="title_search">Hľadať</string>
+    <string name="search_hint">Hľadať…</string>
+    <string name="title_downloads">Sťahovanie</string>
+    <string name="no_data">Žiadne dáta</string>
+    <string name="sort_cancel">Zrušiť</string>
+    <string name="sort_copy">Kopírovať</string>
+    <string name="sort_close">Zavrieť</string>
+    <string name="sort_save">Uložiť</string>
+    <string name="download">Stiahnuť</string>
+    <string name="downloaded">Stiahnuté</string>
+    <string name="episode_more_options_des">Ďalšie možnosti</string>
+    <string name="pick_source">Zdroje</string>
+    <string name="go_back">Ísť späť</string>
+    <string name="download_failed">Sťahovanie zlyhalo</string>
+    <string name="download_paused">Sťahovanie pozastavené</string>
+    <string name="download_done">Sťahovanie dokončené</string>
+    <string name="error_loading_links_toast">Chyba pri načítavaní odkazov</string>
+    <string name="update_started">Aktualizácia spustená</string>
+    <string name="download_storage_text">Interné úložisko</string>
+    <string name="loading">Načítavanie…</string>
+    <string name="type_completed">Dokončené</string>
+    <string name="type_plan_to_watch">Plánujem pozerať</string>
+    <string name="pref_disable_acra">Zakázať automatické nahlasovanie chýb</string>
+    <string name="home_more_info">Viac informácií</string>
+    <string name="error_bookmarks_text">Záložky</string>
+    <string name="play_movie_button">Prehrať film</string>
+    <string name="play_trailer_button">Prehrať upútavku</string>
+    <string name="downloading">Sťahovanie</string>
+    <string name="download_canceled">Sťahovanie zrušené</string>
+    <string name="app_dubbed_text">Dab</string>
+    <string name="popup_delete_file">Zmazať súbor</string>
+    <string name="type_none">Žiadny</string>
+    <string name="app_subbed_text">Tit</string>
+    <string name="type_re_watching">Opätovné sledovanie</string>
+    <string name="popup_play_file">Prehrať súbor</string>
+    <string name="home_info">Info</string>
+    <string name="play_livestream_button">Prehrať živý prenos</string>
+    <string name="pick_subtitle">Titulky</string>
+    <string name="play_episode">Prehrať epizódu</string>
+    <string name="popup_pause_download">Pozastaviť sťahovanie</string>
+    <string name="home_expanded_hide">Skryť</string>
+    <string name="filter_bookmarks">Filtrovať záložky</string>
+    <string name="action_remove_from_bookmarks">Odstrániť</string>
+    <string name="sort_apply">Použiť</string>
+    <string name="download_started">Sťahovanie spustené</string>
+    <string name="sort_clear">Vyčistiť</string>
+    <string name="home_play">Prehrať</string>
+    <string name="action_add_to_bookmarks">Nastaviť stav sledovania</string>
+    <string name="player_speed">Rýchlosť prehrávania</string>
+    <string name="subs_outline_color">Farba obrysu</string>
+    <string name="subs_window_color">Farba okna</string>
+    <string name="subs_edge_type">Typ hrany</string>
+    <string name="subtitles_settings">Nastavenia titulkov</string>
+    <string name="subs_background_color">Farba pozadia</string>
+    <string name="subs_text_color">Farba textu</string>
+    <string name="subs_subtitle_elevation">Vyvýšenie titulkov</string>
+    <string name="search_provider_text_providers">Hľadať pomocou poskytovateľov</string>
+    <string name="subs_font">Písmo</string>
+    <string name="search_provider_text_types">Hľadať pomocou typov</string>
+    <string name="subs_auto_select_language">Automaticky vybrať jazyk</string>
+    <string name="subs_subtitle_languages">Jazyk titulkov</string>
+    <string name="subs_font_size">Veľkosť písma</string>
+    <string name="benene_count_text_none">Nedarovali ste žiadne benény</string>
+    <string name="subs_hold_to_reset_to_default">Podržaním obnovíte predvolené nastavenia</string>
+    <string name="benene_count_text">%d benénov darovaných vývojárom</string>
+    <string name="subs_download_languages">Stiahnuť jazyky</string>
+    <string name="action_remove_watching">Odstrániť</string>
+    <string name="vpn_torrent">Tento poskytovateľ je torrent, odporúča sa VPN</string>
+    <string name="subs_import_text" formatted="true">Importovať písma ich umiestnením do %s</string>
+    <string name="action_open_watching">Viac informácií</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="continue_watching">Pokračovať v sledovaní</string>
+    <string name="vpn_might_be_needed">Na správne fungovanie tohto poskytovateľa môže byť potrebná VPN</string>
+    <string name="provider_info_meta">Stránka neposkytla žiadne metadáta, načítanie videa zlyhá, ak na stránke neexistuje.</string>
+    <string name="torrent_plot">Popis</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
index 8bb22e66..b944b6b3 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-so/strings.xml
@@ -4,7 +4,7 @@
     <string name="next_episode_time_day_format" formatted="true">%dm %ds %dd</string>
     <string name="next_episode_time_hour_format" formatted="true">%ds %dd</string>
     <string name="next_episode_time_min_format" formatted="true">%dd</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Xlq %d</string>
     <string name="next_episode_format" formatted="true">Xalqadda %d waxa lasoo deyn doonaa</string>
     <string name="download">Daji</string>
     <string name="download_failed">Dejintii ma guulaysan</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 03eee72b..bd245a61 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -13,7 +13,7 @@
     <string name="year_format" formatted="true" translatable="false">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
-    <string name="next_episode_format" formatted="true">Bölüm %d şu tarihte yayınlanacak:</string>
+    <string name="next_episode_format" formatted="true">Bölüm %d şu tarihte yayınlanacak</string>
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
@@ -435,18 +435,18 @@
     <string name="skip_setup">Kurulumu atla</string>
     <string name="app_layout_subtext">Cihazınıza uygun görünümü seçin</string>
     <string name="crash_reporting_title">Çökme raporları</string>
-    <string name="preferred_media_subtext">Ne izlemek istiyorsunuz\?</string>
+    <string name="preferred_media_subtext">Ne izlemek istiyorsunuz</string>
     <string name="setup_done">Bitti</string>
     <string name="extensions">Eklentiler</string>
     <string name="add_repository">Depo ekle</string>
     <string name="repository_name_hint">Depo ismi</string>
-    <string name="repository_url_hint">Depo URL\'i</string>
+    <string name="repository_url_hint">Depo URL\'si</string>
     <string name="plugin_loaded">Eklenti yüklendi</string>
     <string name="plugin_deleted">Eklenti silindi</string>
     <string name="plugin_load_fail" formatted="true">%s yüklenemedi</string>
     <string name="is_adult">+18</string>
-    <string name="batch_download_start_format" formatted="true">%d %s indirilmeye başlandı</string>
-    <string name="batch_download_finish_format" formatted="true">%d %s başarıyla indirildi</string>
+    <string name="batch_download_start_format" formatted="true">%d %s … indirilmeye başlandı</string>
+    <string name="batch_download_finish_format" formatted="true">%d %s indirildi</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">%s\'nin tamamı zaten indirildi</string>
     <string name="batch_download">Toplu indir</string>
     <string name="plugin_singular">eklenti</string>
@@ -458,7 +458,11 @@
     <string name="plugins_disabled" formatted="true">Devre dışı: %d</string>
     <string name="plugins_not_downloaded" formatted="true">İndirilmeyen: %d</string>
     <string name="plugins_updated" formatted="true">%d eklenti(ler) güncellendi</string>
-    <string name="blank_repo_message">Site eklentilerini yüklemek için bir depo ekleyin</string>
+    <string name="blank_repo_message">CloudStream\'in varsayılan olarak yüklü sitesi yoktur. Siteleri depolardan kurmanız gerekir.
+\n
+\nSky UK Limited tarafından beyinsiz bir DMCA yayından kaldırma 🤮 nedeniyle uygulama içinde depo linklerini bulunduramıyoruz.
+\n
+\nDiscord\'umuza katılın veya çevrimiçi arama yapın.</string>
     <string name="view_public_repositories_button">Topluluk depolarını görüntüle</string>
     <string name="view_public_repositories_button_short">Herkese açık liste</string>
     <string name="uppercase_all_subtitles">Tüm alt yazılar büyük harf</string>
@@ -525,4 +529,12 @@
     <string name="all_languages_preference">Tüm diller</string>
     <string name="skip_type_format" formatted="true">Geç %s</string>
     <string name="action_remove_from_watched">İzlenenlerden kaldır</string>
+    <string name="skip_type_mixed_ed">Karışık son</string>
+    <string name="skip_type_mixed_op">Karışık başlangıç</string>
+    <string name="skip_type_creddits">Kredi</string>
+    <string name="skip_type_intro">Giriş</string>
+    <string name="plugin_downloaded">Eklenti İndirildi</string>
+    <string name="pref_category_actions">Aksiyonlar</string>
+    <string name="enable_skip_op_from_database_des">Açma/bitiş için atlama açılır pencerelerini göster</string>
+    <string name="clipboard_too_large">Çok fazla metin. Panoya kaydedilemiyor.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 8b70569a..3aa5cf69 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -113,7 +113,6 @@
     <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Bạn có thể sẽ cần sử dụng VPN để xem phim này</string>
     <string name="vpn_torrent">Phim này được chiếu dưới dạng Torrent. Hãy sử dụng VPN để xem</string>
-    <string name="provider_info_meta">Siêu dữ liệu không được cung cấp bởi trang web, quá trình tải video sẽ không thành công nếu nó không tồn tại trên trang web.</string>
     <string name="torrent_plot">Thông tin phim</string>
     <string name="normal_no_plot">Đang cập nhật</string>
     <string name="torrent_no_plot">Không tìm thấy thông tin</string>
@@ -447,4 +446,54 @@
     <string name="automatic_plugin_download_summary">Tự động tải plugins còn thiếu.</string>
     <string name="update_started">Bắt đầu cập nhật</string>
     <string name="pref_category_links">Liên kết</string>
+    <string name="hls_playlist">Danh sách HLS</string>
+    <string name="player_pref">Trình phát ưu tiên</string>
+    <string name="player_settings_play_in_app">Trình phát mặc địng</string>
+    <string name="extension_rating" formatted="true">Đánh giá: %s</string>
+    <string name="no">Không</string>
+    <string name="extension_version">Phiên bản</string>
+    <string name="extension_authors">Tác giả</string>
+    <string name="pref_category_app_updates">Cập nhật ứng dụng</string>
+    <string name="pref_category_backup">Sao lưu</string>
+    <string name="pref_category_extensions">Tiện ích</string>
+    <string name="pref_category_actions">Hành động</string>
+    <string name="pref_category_cache">Cache</string>
+    <string name="pref_category_gestures">Cử chỉ</string>
+    <string name="pref_category_player_features">Tính năng trình phát</string>
+    <string name="pref_category_subtitles">Phụ đề</string>
+    <string name="pref_category_player_layout">Bố cục</string>
+    <string name="pref_category_defaults">Mặc định</string>
+    <string name="pref_category_looks">Giao diện</string>
+    <string name="pref_category_ui_features">Tính năng</string>
+    <string name="plugins_updated" formatted="true">Đã cập nhật %d plugin</string>
+    <string name="extension_description">Mô tả</string>
+    <string name="extension_status">Trạng thái</string>
+    <string name="extension_size">Kích thước</string>
+    <string name="extension_types">Hỗ trợ</string>
+    <string name="extension_language">Ngôn ngữ</string>
+    <string name="extension_install_first">Cài đặt tiện ích trước</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="player_settings_play_in_browser">Trình duyệt web</string>
+    <string name="app_not_found_error">Không thấy ứng dụng</string>
+    <string name="all_languages_preference">Tất cả ngôn ngữ</string>
+    <string name="skip_type_format" formatted="true">Tua %s</string>
+    <string name="skip_type_op">Mở đầu</string>
+    <string name="skip_type_ed">Kết thúc</string>
+    <string name="skip_type_recap">Tóm tắt</string>
+    <string name="skip_type_mixed_ed">Mở đầu tuỳ chọn</string>
+    <string name="skip_type_mixed_op">Kết thúc tuỳ chọn</string>
+    <string name="skip_type_creddits">Danh đề</string>
+    <string name="skip_type_intro">Giới thiệu</string>
+    <string name="clear_history">Xoá lịch sử</string>
+    <string name="enable_skip_op_from_database_des">Hiển thị cửa sổ tua cho mở đầu/kết thúc</string>
+    <string name="clipboard_too_large">Văn bản quá dài. Không thể lưu vào bộ nhớ tạm.</string>
+    <string name="action_remove_from_watched">Xoá khỏi đã xem</string>
+    <string name="confirm_exit_dialog">Bạn có chắc muốn thoát\?</string>
+    <string name="yes">Có</string>
+    <string name="update_notification_downloading">Đang tải bản cập nhật…</string>
+    <string name="update_notification_installing">Đang cài bản cập nhật…</string>
+    <string name="update_notification_failed">Không thể cài đặt phiên bản mới</string>
+    <string name="delayed_update_notice">Ứng dụng sẽ được cập nhật khi thoát</string>
 </resources>
\ No newline at end of file

From 9d11dc76a104bdd0aaff06335955b3083aed076e Mon Sep 17 00:00:00 2001
From: "recloudstream[bot]"
 <111277985+recloudstream[bot]@users.noreply.github.com>
Date: Sat, 28 Jan 2023 18:43:31 +0000
Subject: [PATCH 198/273] update list of locales

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 1dcaf350..3f1c781a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -85,6 +85,7 @@ val appLanguages = arrayListOf(
     Triple("\uD83C\uDDF5\uD83C\uDDF9", "Portuguese", "pt"),
     Triple("", "Romanian", "ro"),
     Triple("", "Russian", "ru"),
+    Triple("", "Slovak", "sk"),
     Triple("", "Somali", "so"),
     Triple("", "Swedish", "sv"),
     Triple("", "Tamil", "ta"),

From 3c82548c20a1ba523e8a5a76e4734c1620565bfb Mon Sep 17 00:00:00 2001
From: LagradOst <46196380+Blatzar@users.noreply.github.com>
Date: Sat, 28 Jan 2023 22:38:02 +0000
Subject: [PATCH 199/273] Library merge (#343)

---
 app/build.gradle.kts                          |   3 +
 .../com/lagradost/cloudstream3/MainAPI.kt     |  25 ++
 .../lagradost/cloudstream3/MainActivity.kt    |   6 +
 .../metaproviders/AnilistRedirector.kt        |  30 --
 .../metaproviders/SyncRedirector.kt           |  56 +++
 .../syncproviders/AccountManager.kt           |   3 +-
 .../cloudstream3/syncproviders/SyncAPI.kt     |  88 +++-
 .../cloudstream3/syncproviders/SyncRepo.kt    |  22 +-
 .../syncproviders/providers/AniListApi.kt     | 133 ++++--
 .../syncproviders/providers/LocalList.kt      | 100 +++++
 .../syncproviders/providers/MALApi.kt         | 135 ++++--
 .../cloudstream3/ui/AutofitRecyclerView.kt    |   5 +-
 .../cloudstream3/ui/home/HomeFragment.kt      |   4 +-
 .../ui/library/LibraryFragment.kt             | 393 ++++++++++++++++++
 .../ui/library/LibraryScrollTransformer.kt    |  17 +
 .../ui/library/LibraryViewModel.kt            | 104 +++++
 .../ui/library/LoadingPosterAdapter.kt        |  37 ++
 .../cloudstream3/ui/library/PageAdapter.kt    | 130 ++++++
 .../ui/library/ViewpagerAdapter.kt            |  90 ++++
 .../ui/quicksearch/QuickSearchFragment.kt     |   2 +-
 .../cloudstream3/ui/result/ResultFragment.kt  |   8 +-
 .../ui/result/ResultFragmentPhone.kt          |   2 +-
 .../ui/result/ResultFragmentTv.kt             |   2 +-
 .../ui/result/ResultViewModel2.kt             |  21 +-
 .../cloudstream3/ui/search/SearchAdaptor.kt   |   4 +
 .../cloudstream3/ui/search/SearchFragment.kt  |   2 +-
 .../ui/search/SearchResultBuilder.kt          |   5 +-
 .../ui/settings/extensions/PluginsFragment.kt |   2 +-
 .../lagradost/cloudstream3/utils/AppUtils.kt  |  55 +++
 .../cloudstream3/utils/BackupUtils.kt         |   4 -
 .../cloudstream3/utils/DataStoreHelper.kt     |  22 +-
 .../lagradost/cloudstream3/utils/SyncUtil.kt  |  27 +-
 .../lagradost/cloudstream3/utils/UIHelper.kt  |  54 ++-
 app/src/main/res/color/item_select_color.xml  |   2 +
 .../ic_baseline_collections_bookmark_24.xml   |   6 +
 .../main/res/drawable/ic_baseline_sort_24.xml |   5 +
 .../main/res/drawable/ic_baseline_star_24.xml |   4 +-
 .../drawable/ic_outline_account_circle_24.xml |   6 +
 .../res/drawable/indicator_background.xml     |   6 +
 app/src/main/res/drawable/rating_bg_color.xml |   6 +
 app/src/main/res/layout/activity_main.xml     |   4 +-
 app/src/main/res/layout/fragment_library.xml  | 177 ++++++++
 .../res/layout/library_viewpager_page.xml     |  11 +
 .../res/layout/loading_poster_dynamic.xml     |  37 ++
 .../layout/search_result_grid_expanded.xml    | 131 ++++--
 app/src/main/res/menu/bottom_nav_menu.xml     |  29 +-
 app/src/main/res/menu/library_menu.xml        |  17 +
 .../main/res/navigation/mobile_navigation.xml |   9 +
 app/src/main/res/values/colors.xml            |   2 +
 app/src/main/res/values/strings.xml           |  15 +-
 app/src/main/res/values/styles.xml            |  15 +
 51 files changed, 1855 insertions(+), 218 deletions(-)
 delete mode 100644 app/src/main/java/com/lagradost/cloudstream3/metaproviders/AnilistRedirector.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryScrollTransformer.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/library/LoadingPosterAdapter.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt
 create mode 100644 app/src/main/res/drawable/ic_baseline_collections_bookmark_24.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_sort_24.xml
 create mode 100644 app/src/main/res/drawable/ic_outline_account_circle_24.xml
 create mode 100644 app/src/main/res/drawable/indicator_background.xml
 create mode 100644 app/src/main/res/drawable/rating_bg_color.xml
 create mode 100644 app/src/main/res/layout/fragment_library.xml
 create mode 100644 app/src/main/res/layout/library_viewpager_page.xml
 create mode 100644 app/src/main/res/layout/loading_poster_dynamic.xml
 create mode 100644 app/src/main/res/menu/library_menu.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1cbcec68..808c0cc3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -220,6 +220,9 @@ dependencies {
 
     // Library/extensions searching with Levenshtein distance
     implementation("me.xdrop:fuzzywuzzy:1.4.0")
+
+    // color pallette for images -> colors
+    implementation("androidx.palette:palette-ktx:1.0.0")
 }
 
 tasks.register("androidSourcesJar", Jar::class) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 8c818027..73859021 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -13,7 +13,10 @@ import com.fasterxml.jackson.module.kotlin.KotlinModule
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
+import com.lagradost.cloudstream3.syncproviders.SyncIdName
 import com.lagradost.cloudstream3.ui.player.SubtitleData
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
+import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.ui.result.UiText
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
@@ -510,6 +513,20 @@ abstract class MainAPI {
     open val hasMainPage = false
     open val hasQuickSearch = false
 
+    /**
+     * A set of which ids the provider can open with getLoadUrl()
+     * If the set contains SyncIdName.Imdb then getLoadUrl() can be started with
+     * an Imdb class which inherits from SyncId.
+     *
+     * getLoadUrl() is then used to get page url based on that ID.
+     *
+     * Example:
+     * "tt6723592" -> getLoadUrl(ImdbSyncId("tt6723592")) -> "mainUrl/imdb/tt6723592" -> load("mainUrl/imdb/tt6723592")
+     *
+     * This is used to launch pages from personal lists or recommendations using IDs.
+     **/
+    open val supportedSyncNames = setOf<SyncIdName>()
+
     open val supportedTypes = setOf(
         TvType.Movie,
         TvType.TvSeries,
@@ -580,6 +597,14 @@ abstract class MainAPI {
     open fun getVideoInterceptor(extractorLink: ExtractorLink): Interceptor? {
         return null
     }
+
+    /**
+     * Get the load() url based on a sync ID like IMDb or MAL.
+     * Only contains SyncIds based on supportedSyncUrls.
+     **/
+    open suspend fun getLoadUrl(name: SyncIdName, id: String): String? {
+        return null
+    }
 }
 
 /** Might need a different implementation for desktop*/
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 857eaa6a..5720b7a7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -388,6 +388,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         val isNavVisible = listOf(
             R.id.navigation_home,
             R.id.navigation_search,
+            R.id.navigation_library,
             R.id.navigation_downloads,
             R.id.navigation_settings,
             R.id.navigation_download_child,
@@ -438,6 +439,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
         nav_view?.isVisible = isNavVisible && !landscape
         nav_rail_view?.isVisible = isNavVisible && landscape
+
+        // Hide library on TV since it is not supported yet :(
+        val isTrueTv = isTrueTvSettings()
+        nav_view?.menu?.findItem(R.id.navigation_library)?.isVisible = !isTrueTv
+        nav_rail_view?.menu?.findItem(R.id.navigation_library)?.isVisible = !isTrueTv
     }
 
     //private var mCastSession: CastSession? = null
diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/AnilistRedirector.kt b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/AnilistRedirector.kt
deleted file mode 100644
index 208db14b..00000000
--- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/AnilistRedirector.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.lagradost.cloudstream3.metaproviders
-
-import com.lagradost.cloudstream3.ErrorLoadingException
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
-import com.lagradost.cloudstream3.utils.SyncUtil
-
-object SyncRedirector {
-    val syncApis = SyncApis
-
-    suspend fun redirect(url: String, preferredUrl: String): String {
-        for (api in syncApis) {
-            if (url.contains(api.mainUrl)) {
-                val otherApi = when (api.name) {
-                    aniListApi.name -> "anilist"
-                    malApi.name -> "myanimelist"
-                    else -> return url
-                }
-
-                return SyncUtil.getUrlsFromId(api.getIdFromUrl(url), otherApi).firstOrNull { realUrl ->
-                    realUrl.contains(preferredUrl)
-                } ?: run {
-                    throw ErrorLoadingException("Page does not exist on $preferredUrl")
-                }
-            }
-        }
-        return url
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt
new file mode 100644
index 00000000..75e96bec
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt
@@ -0,0 +1,56 @@
+package com.lagradost.cloudstream3.metaproviders
+
+import com.lagradost.cloudstream3.MainAPI
+import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis
+import com.lagradost.cloudstream3.syncproviders.SyncIdName
+
+object SyncRedirector {
+    val syncApis = SyncApis
+    private val syncIds =
+        listOf(
+            SyncIdName.MyAnimeList to Regex("""myanimelist\.net\/anime\/(\d+)"""),
+            SyncIdName.Anilist to Regex("""anilist\.co\/anime\/(\d+)""")
+        )
+
+    suspend fun redirect(
+        url: String,
+        providerApi: MainAPI
+    ): String {
+        // Deprecated since providers should do this instead!
+
+        // Tries built in ID -> ProviderUrl
+        /*
+        for (api in syncApis) {
+            if (url.contains(api.mainUrl)) {
+                val otherApi = when (api.name) {
+                    aniListApi.name -> "anilist"
+                    malApi.name -> "myanimelist"
+                    else -> return url
+                }
+
+                SyncUtil.getUrlsFromId(api.getIdFromUrl(url), otherApi).firstOrNull { realUrl ->
+                    realUrl.contains(providerApi.mainUrl)
+                }?.let {
+                    return it
+                }
+//                ?: run {
+//                    throw ErrorLoadingException("Page does not exist on $preferredUrl")
+//                }
+            }
+        }
+        */
+
+        // Tries provider solution
+        // This goes through all sync ids and finds supported id by said provider
+        return syncIds.firstNotNullOfOrNull { (syncName, syncRegex) ->
+            if (providerApi.supportedSyncNames.contains(syncName)) {
+                syncRegex.find(url)?.value?.let {
+                    suspendSafeApiCall {
+                        providerApi.getLoadUrl(syncName, it)
+                    }
+                }
+            } else null
+        } ?: url
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
index f09bf8fe..f17086c1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
@@ -13,6 +13,7 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI {
         val openSubtitlesApi = OpenSubtitlesApi(0)
         val indexSubtitlesApi = IndexSubtitleApi()
         val addic7ed = Addic7ed()
+        val localListApi = LocalList()
 
         // used to login via app intent
         val OAuth2Apis
@@ -29,7 +30,7 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI {
         // used for active syncing
         val SyncApis
             get() = listOf(
-                SyncRepo(malApi), SyncRepo(aniListApi)
+                SyncRepo(malApi), SyncRepo(aniListApi), SyncRepo(localListApi)
             )
 
         val inAppAuths
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
index 5aa56a02..8c76c5bf 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
@@ -1,10 +1,31 @@
 package com.lagradost.cloudstream3.syncproviders
 
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.ui.library.ListSorting
+import com.lagradost.cloudstream3.ui.result.UiText
+import me.xdrop.fuzzywuzzy.FuzzySearch
+
+enum class SyncIdName {
+    Anilist,
+    MyAnimeList,
+    Trakt,
+    Imdb,
+    LocalList
+}
 
 interface SyncAPI : OAuth2API {
+    /**
+     * Set this to true if the user updates something on the list like watch status or score
+     **/
+    var requireLibraryRefresh: Boolean
     val mainUrl: String
 
+    /**
+     * Allows certain providers to open pages from
+     * library links.
+     **/
+    val syncIdName: SyncIdName
+
     /**
     -1 -> None
     0 -> Watching
@@ -22,7 +43,9 @@ interface SyncAPI : OAuth2API {
 
     suspend fun search(name: String): List<SyncSearchResult>?
 
-    fun getIdFromUrl(url : String) : String
+    suspend fun getPersonalLibrary(): LibraryMetadata?
+
+    fun getIdFromUrl(url: String): String
 
     data class SyncSearchResult(
         override val name: String,
@@ -42,7 +65,7 @@ interface SyncAPI : OAuth2API {
         val score: Int?,
         val watchedEpisodes: Int?,
         var isFavorite: Boolean? = null,
-        var maxEpisodes : Int? = null,
+        var maxEpisodes: Int? = null,
     )
 
     data class SyncResult(
@@ -63,9 +86,9 @@ interface SyncAPI : OAuth2API {
         var genres: List<String>? = null,
         var synonyms: List<String>? = null,
         var trailers: List<String>? = null,
-        var isAdult : Boolean? = null,
+        var isAdult: Boolean? = null,
         var posterUrl: String? = null,
-        var backgroundPosterUrl : String? = null,
+        var backgroundPosterUrl: String? = null,
 
         /** In unixtime */
         var startDate: Long? = null,
@@ -76,4 +99,61 @@ interface SyncAPI : OAuth2API {
         var prevSeason: SyncSearchResult? = null,
         var actors: List<ActorData>? = null,
     )
+
+
+    data class Page(
+        val title: UiText, var items: List<LibraryItem>
+    ) {
+        fun sort(method: ListSorting?, query: String? = null) {
+            items = when (method) {
+                ListSorting.Query ->
+                    if (query != null) {
+                        items.sortedBy {
+                            -FuzzySearch.partialRatio(
+                                query.lowercase(), it.name.lowercase()
+                            )
+                        }
+                    } else items
+                ListSorting.RatingHigh -> items.sortedBy { -(it.personalRating ?: 0) }
+                ListSorting.RatingLow -> items.sortedBy { (it.personalRating ?: 0) }
+                ListSorting.AlphabeticalA -> items.sortedBy { it.name }
+                ListSorting.AlphabeticalZ -> items.sortedBy { it.name }.reversed()
+                ListSorting.UpdatedNew -> items.sortedBy { it.lastUpdatedUnixTime?.times(-1) }
+                ListSorting.UpdatedOld -> items.sortedBy { it.lastUpdatedUnixTime }
+                else -> items
+            }
+        }
+    }
+
+    data class LibraryMetadata(
+        val allLibraryLists: List<LibraryList>,
+        val supportedListSorting: Set<ListSorting>
+    )
+
+    data class LibraryList(
+        val name: UiText,
+        val items: List<LibraryItem>
+    )
+
+    data class LibraryItem(
+        override val name: String,
+        override val url: String,
+        /**
+         * Unique unchanging string used for data storage.
+         * This should be the actual id when you change scores and status
+         * since score changes from library might get added in the future.
+         **/
+        val syncId: String,
+        val episodesCompleted: Int?,
+        val episodesTotal: Int?,
+        /** Out of 100 */
+        val personalRating: Int?,
+        val lastUpdatedUnixTime: Long?,
+        override val apiName: String,
+        override var type: TvType?,
+        override var posterUrl: String?,
+        override var posterHeaders: Map<String, String>?,
+        override var quality: SearchQuality?,
+        override var id: Int? = null,
+    ) : SearchResponse
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncRepo.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncRepo.kt
index b621e81a..85b877e0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncRepo.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncRepo.kt
@@ -11,26 +11,38 @@ class SyncRepo(private val repo: SyncAPI) {
     val icon = repo.icon
     val mainUrl = repo.mainUrl
     val requiresLogin = repo.requiresLogin
+    val syncIdName = repo.syncIdName
+    var requireLibraryRefresh: Boolean
+        get() = repo.requireLibraryRefresh
+        set(value) {
+            repo.requireLibraryRefresh = value
+        }
 
     suspend fun score(id: String, status: SyncAPI.SyncStatus): Resource<Boolean> {
         return safeApiCall { repo.score(id, status) }
     }
 
-    suspend fun getStatus(id : String) : Resource<SyncAPI.SyncStatus>  {
+    suspend fun getStatus(id: String): Resource<SyncAPI.SyncStatus> {
         return safeApiCall { repo.getStatus(id) ?: throw ErrorLoadingException("No data") }
     }
 
-    suspend fun getResult(id : String) : Resource<SyncAPI.SyncResult>  {
+    suspend fun getResult(id: String): Resource<SyncAPI.SyncResult> {
         return safeApiCall { repo.getResult(id) ?: throw ErrorLoadingException("No data") }
     }
 
-    suspend fun search(query : String) : Resource<List<SyncAPI.SyncSearchResult>> {
+    suspend fun search(query: String): Resource<List<SyncAPI.SyncSearchResult>> {
         return safeApiCall { repo.search(query) ?: throw ErrorLoadingException() }
     }
 
-    fun hasAccount() : Boolean {
+    suspend fun getPersonalLibrary(): Resource<SyncAPI.LibraryMetadata> {
+        return safeApiCall { repo.getPersonalLibrary() ?: throw ErrorLoadingException() }
+    }
+
+    fun hasAccount(): Boolean {
         return normalSafeApiCall { repo.loginInfo() != null } ?: false
     }
 
-    fun getIdFromUrl(url : String) : String = repo.getIdFromUrl(url)
+    fun getIdFromUrl(url: String): String? = normalSafeApiCall {
+        repo.getIdFromUrl(url)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
index d4742d94..7d9de43a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
@@ -1,10 +1,10 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
+import androidx.annotation.StringRes
 import androidx.fragment.app.FragmentActivity
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys
 import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.mvvm.logError
@@ -12,6 +12,9 @@ import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
 import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
+import com.lagradost.cloudstream3.syncproviders.SyncIdName
+import com.lagradost.cloudstream3.ui.library.ListSorting
+import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.splitQuery
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
@@ -27,10 +30,12 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     override val key = "6871"
     override val redirectUrl = "anilistlogin"
     override val idPrefix = "anilist"
+    override var requireLibraryRefresh = true
     override var mainUrl = "https://anilist.co"
     override val icon = R.drawable.ic_anilist_icon
     override val requiresLogin = false
     override val createAccountUrl = "$mainUrl/signup"
+    override val syncIdName = SyncIdName.Anilist
 
     override fun loginInfo(): AuthAPI.LoginInfo? {
         // context.getUser(true)?.
@@ -45,6 +50,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     }
 
     override fun logOut() {
+        requireLibraryRefresh = true
         removeAccountKeys()
     }
 
@@ -64,8 +70,8 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         switchToNewAccount()
         setKey(accountId, ANILIST_UNIXTIME_KEY, endTime)
         setKey(accountId, ANILIST_TOKEN_KEY, token)
-        setKey(ANILIST_SHOULD_UPDATE_LIST, true)
         val user = getUser()
+        requireLibraryRefresh = true
         return user != null
     }
 
@@ -140,7 +146,8 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                     this.name,
                     recMedia.id?.toString() ?: return@mapNotNull null,
                     getUrlFromId(recMedia.id),
-                    recMedia.coverImage?.large ?: recMedia.coverImage?.medium
+                    recMedia.coverImage?.extraLarge ?: recMedia.coverImage?.large
+                    ?: recMedia.coverImage?.medium
                 )
             },
             trailers = when (season.trailer?.site?.lowercase()?.trim()) {
@@ -170,7 +177,9 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
             fromIntToAnimeStatus(status.status),
             status.score,
             status.watchedEpisodes
-        )
+        ).also {
+            requireLibraryRefresh = requireLibraryRefresh || it
+        }
     }
 
     companion object {
@@ -181,7 +190,6 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         const val ANILIST_TOKEN_KEY: String = "anilist_token" // anilist token for api
         const val ANILIST_USER_KEY: String = "anilist_user" // user data like profile
         const val ANILIST_CACHED_LIST: String = "anilist_cached_list"
-        const val ANILIST_SHOULD_UPDATE_LIST: String = "anilist_should_update_list"
 
         private fun fixName(name: String): String {
             return name.lowercase(Locale.ROOT).replace(" ", "")
@@ -219,7 +227,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                                             romaji
                                         }
                                         idMal
-                                        coverImage { medium large }
+                                        coverImage { medium large extraLarge }
                                         averageScore
                                     }
                                 }
@@ -232,7 +240,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                                         format
                                         id
                                         idMal
-                                        coverImage { medium large }
+                                        coverImage { medium large extraLarge }
                                         averageScore
                                         title {
                                             english
@@ -292,15 +300,13 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
             val shows = searchShows(name.replace(blackListRegex, ""))
 
             shows?.data?.Page?.media?.find {
-                malId ?: "NONE" == it.idMal.toString()
+                (malId ?: "NONE") == it.idMal.toString()
             }?.let { return it }
 
             val filtered =
                 shows?.data?.Page?.media?.filter {
-                    (
-                            it.startDate.year ?: year.toString() == year.toString()
-                                    || year == null
-                            )
+                    (((it.startDate.year ?: year.toString()) == year.toString()
+                            || year == null))
                 }
             filtered?.forEach {
                 it.title.romaji?.let { romaji ->
@@ -312,14 +318,14 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         }
 
         // Changing names of these will show up in UI
-        enum class AniListStatusType(var value: Int) {
-            Watching(0),
-            Completed(1),
-            Paused(2),
-            Dropped(3),
-            Planning(4),
-            ReWatching(5),
-            None(-1)
+        enum class AniListStatusType(var value: Int, @StringRes val stringRes: Int) {
+            Watching(0, R.string.type_watching),
+            Completed(1, R.string.type_completed),
+            Paused(2, R.string.type_on_hold),
+            Dropped(3, R.string.type_dropped),
+            Planning(4, R.string.type_plan_to_watch),
+            ReWatching(5, R.string.type_re_watching),
+            None(-1, R.string.none)
         }
 
         fun fromIntToAnimeStatus(inp: Int): AniListStatusType {//= AniListStatusType.values().first { it.value == inp }
@@ -335,7 +341,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
             }
         }
 
-        fun convertAnilistStringToStatus(string: String): AniListStatusType {
+        fun convertAniListStringToStatus(string: String): AniListStatusType {
             return fromIntToAnimeStatus(aniListStatusString.indexOf(string))
         }
 
@@ -526,7 +532,8 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                 app.post(
                     "https://graphql.anilist.co/",
                     headers = mapOf(
-                        "Authorization" to "Bearer " + (getAuth() ?: return@suspendSafeApiCall null),
+                        "Authorization" to "Bearer " + (getAuth()
+                            ?: return@suspendSafeApiCall null),
                         if (cache) "Cache-Control" to "max-stale=$maxStale" else "Cache-Control" to "no-cache"
                     ),
                     cacheTime = 0,
@@ -575,7 +582,8 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
 
     data class CoverImage(
         @JsonProperty("medium") val medium: String?,
-        @JsonProperty("large") val large: String?
+        @JsonProperty("large") val large: String?,
+        @JsonProperty("extraLarge") val extraLarge: String?
     )
 
     data class Media(
@@ -602,7 +610,29 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         @JsonProperty("score") val score: Int,
         @JsonProperty("private") val private: Boolean,
         @JsonProperty("media") val media: Media
-    )
+    ) {
+        fun toLibraryItem(): SyncAPI.LibraryItem {
+            return SyncAPI.LibraryItem(
+                // English title first
+                this.media.title.english ?: this.media.title.romaji
+                ?: this.media.synonyms.firstOrNull()
+                ?: "",
+                "https://anilist.co/anime/${this.media.id}/",
+                this.media.id.toString(),
+                this.progress,
+                this.media.episodes,
+                this.score,
+                this.updatedAt.toLong(),
+                "AniList",
+                TvType.Anime,
+                this.media.coverImage.extraLarge ?: this.media.coverImage.large
+                ?: this.media.coverImage.medium,
+                null,
+                null,
+                null
+            )
+        }
+    }
 
     data class Lists(
         @JsonProperty("status") val status: String?,
@@ -617,40 +647,59 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         @JsonProperty("MediaListCollection") val MediaListCollection: MediaListCollection
     )
 
-    fun getAnilistListCached(): Array<Lists>? {
+    private fun getAniListListCached(): Array<Lists>? {
         return getKey(ANILIST_CACHED_LIST) as? Array<Lists>
     }
 
-    suspend fun getAnilistAnimeListSmart(): Array<Lists>? {
+    private suspend fun getAniListAnimeListSmart(): Array<Lists>? {
         if (getAuth() == null) return null
 
         if (checkToken()) return null
-        return if (getKey(ANILIST_SHOULD_UPDATE_LIST, true) == true) {
-            val list = getFullAnilistList()?.data?.MediaListCollection?.lists?.toTypedArray()
+        return if (requireLibraryRefresh) {
+            val list = getFullAniListList()?.data?.MediaListCollection?.lists?.toTypedArray()
             if (list != null) {
                 setKey(ANILIST_CACHED_LIST, list)
-                setKey(ANILIST_SHOULD_UPDATE_LIST, false)
             }
             list
         } else {
-            getAnilistListCached()
+            getAniListListCached()
         }
     }
 
-    private suspend fun getFullAnilistList(): FullAnilistList? {
-        var userID: Int? = null
-        /** WARNING ASSUMES ONE USER! **/
-        getKeys(ANILIST_USER_KEY)?.forEach { key ->
-            getKey<AniListUser>(key, null)?.let {
-                userID = it.id
-            }
-        }
+    override suspend fun getPersonalLibrary(): SyncAPI.LibraryMetadata {
+        val list = getAniListAnimeListSmart()?.groupBy {
+            convertAniListStringToStatus(it.status ?: "").stringRes
+        }?.mapValues { group ->
+            group.value.map { it.entries.map { entry -> entry.toLibraryItem() } }.flatten()
+        } ?: emptyMap()
 
-        val fixedUserID = userID ?: return null
+        // To fill empty lists when AniList does not return them
+        val baseMap =
+            AniListStatusType.values().filter { it.value >= 0 }.associate {
+                it.stringRes to emptyList<SyncAPI.LibraryItem>()
+            }
+
+        return SyncAPI.LibraryMetadata(
+            (baseMap + list).map { SyncAPI.LibraryList(txt(it.key), it.value) },
+            setOf(
+                ListSorting.AlphabeticalA,
+                ListSorting.AlphabeticalZ,
+                ListSorting.UpdatedNew,
+                ListSorting.UpdatedOld,
+                ListSorting.RatingHigh,
+                ListSorting.RatingLow,
+            )
+        )
+    }
+
+    private suspend fun getFullAniListList(): FullAnilistList? {
+        /** WARNING ASSUMES ONE USER! **/
+
+        val userID = getKey<AniListUser>(accountId, ANILIST_USER_KEY)?.id ?: return null
         val mediaType = "ANIME"
 
         val query = """
-                query (${'$'}userID: Int = $fixedUserID, ${'$'}MEDIA: MediaType = $mediaType) {
+                query (${'$'}userID: Int = $userID, ${'$'}MEDIA: MediaType = $mediaType) {
                     MediaListCollection (userId: ${'$'}userID, type: ${'$'}MEDIA) { 
                         lists {
                             status
@@ -661,7 +710,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                                 startedAt { year month day }
                                 updatedAt
                                 progress
-                                score
+                                score (format: POINT_100)
                                 private
                                 media
                                 {
@@ -677,7 +726,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                                         english
                                         romaji
                                     }
-                                    coverImage { medium }
+                                    coverImage { extraLarge large medium }
                                     synonyms
                                     nextAiringEpisode {
                                         timeUntilAiring
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt
new file mode 100644
index 00000000..0b081220
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt
@@ -0,0 +1,100 @@
+package com.lagradost.cloudstream3.syncproviders.providers
+
+import androidx.fragment.app.FragmentActivity
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.syncproviders.AuthAPI
+import com.lagradost.cloudstream3.syncproviders.SyncAPI
+import com.lagradost.cloudstream3.syncproviders.SyncIdName
+import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.ui.library.ListSorting
+import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.utils.Coroutines.ioWork
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllWatchStateIds
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getBookmarkedData
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getResultWatchState
+
+class LocalList : SyncAPI {
+    override val name = "Local"
+    override val icon: Int = R.drawable.ic_baseline_storage_24
+    override val requiresLogin = false
+    override val createAccountUrl: Nothing? = null
+    override val idPrefix = "local"
+    override var requireLibraryRefresh = true
+
+    override fun loginInfo(): AuthAPI.LoginInfo {
+        return AuthAPI.LoginInfo(
+            null,
+            null,
+            0
+        )
+    }
+
+    override fun logOut() {
+
+    }
+
+    override val key: String = ""
+    override val redirectUrl = ""
+    override suspend fun handleRedirect(url: String): Boolean {
+        return true
+    }
+
+    override fun authenticate(activity: FragmentActivity?) {
+    }
+
+    override val mainUrl = ""
+    override val syncIdName = SyncIdName.LocalList
+    override suspend fun score(id: String, status: SyncAPI.SyncStatus): Boolean {
+        return true
+    }
+
+    override suspend fun getStatus(id: String): SyncAPI.SyncStatus? {
+        return null
+    }
+
+    override suspend fun getResult(id: String): SyncAPI.SyncResult? {
+        return null
+    }
+
+    override suspend fun search(name: String): List<SyncAPI.SyncSearchResult>? {
+        return null
+    }
+
+    override suspend fun getPersonalLibrary(): SyncAPI.LibraryMetadata? {
+        val watchStatusIds = ioWork {
+            getAllWatchStateIds()?.map { id ->
+                Pair(id, getResultWatchState(id))
+            }
+        }?.distinctBy { it.first } ?: return null
+
+        val list = ioWork {
+            watchStatusIds.groupBy {
+                it.second.stringRes
+            }.mapValues { group ->
+                group.value.mapNotNull {
+                    getBookmarkedData(it.first)?.toLibraryItem(it.first.toString())
+                }
+            }
+        }
+
+        val baseMap = WatchType.values().filter { it != WatchType.NONE }.associate {
+            // None is not something to display
+            it.stringRes to emptyList<SyncAPI.LibraryItem>()
+        }
+        return SyncAPI.LibraryMetadata(
+            (baseMap + list).map { SyncAPI.LibraryList(txt(it.key), it.value) },
+            setOf(
+                ListSorting.AlphabeticalA,
+                ListSorting.AlphabeticalZ,
+//                ListSorting.UpdatedNew,
+//                ListSorting.UpdatedOld,
+//                ListSorting.RatingHigh,
+//                ListSorting.RatingLow,
+            )
+        )
+    }
+
+    override fun getIdFromUrl(url: String): String {
+        return url
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt
index c08958ce..5164b606 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt
@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
 import android.util.Base64
+import androidx.annotation.StringRes
 import androidx.fragment.app.FragmentActivity
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
@@ -8,11 +9,15 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.ShowStatus
+import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
+import com.lagradost.cloudstream3.syncproviders.SyncIdName
+import com.lagradost.cloudstream3.ui.library.ListSorting
+import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.splitQuery
 import com.lagradost.cloudstream3.utils.DataStore.toKotlinObject
@@ -31,13 +36,15 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
     override val redirectUrl = "mallogin"
     override val idPrefix = "mal"
     override var mainUrl = "https://myanimelist.net"
-    val apiUrl = "https://api.myanimelist.net"
+    private val apiUrl = "https://api.myanimelist.net"
     override val icon = R.drawable.mal_logo
     override val requiresLogin = false
-
+    override val syncIdName = SyncIdName.MyAnimeList
+    override var requireLibraryRefresh = true
     override val createAccountUrl = "$mainUrl/register.php"
 
     override fun logOut() {
+        requireLibraryRefresh = true
         removeAccountKeys()
     }
 
@@ -90,7 +97,9 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
             fromIntToAnimeStatus(status.status),
             status.score,
             status.watchedEpisodes
-        )
+        ).also {
+            requireLibraryRefresh = requireLibraryRefresh || it
+        }
     }
 
     data class MalAnime(
@@ -248,10 +257,45 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
 
         const val MAL_USER_KEY: String = "mal_user" // user data like profile
         const val MAL_CACHED_LIST: String = "mal_cached_list"
-        const val MAL_SHOULD_UPDATE_LIST: String = "mal_should_update_list"
         const val MAL_UNIXTIME_KEY: String = "mal_unixtime" // When token expires
         const val MAL_REFRESH_TOKEN_KEY: String = "mal_refresh_token" // refresh token
         const val MAL_TOKEN_KEY: String = "mal_token" // anilist token for api
+
+        fun convertToStatus(string: String): MalStatusType {
+            return fromIntToAnimeStatus(malStatusAsString.indexOf(string))
+        }
+
+        enum class MalStatusType(var value: Int, @StringRes val stringRes: Int) {
+            Watching(0, R.string.type_watching),
+            Completed(1, R.string.type_completed),
+            OnHold(2, R.string.type_on_hold),
+            Dropped(3, R.string.type_dropped),
+            PlanToWatch(4, R.string.type_plan_to_watch),
+            None(-1, R.string.type_none)
+        }
+
+        private fun fromIntToAnimeStatus(inp: Int): MalStatusType {//= AniListStatusType.values().first { it.value == inp }
+            return when (inp) {
+                -1 -> MalStatusType.None
+                0 -> MalStatusType.Watching
+                1 -> MalStatusType.Completed
+                2 -> MalStatusType.OnHold
+                3 -> MalStatusType.Dropped
+                4 -> MalStatusType.PlanToWatch
+                5 -> MalStatusType.Watching
+                else -> MalStatusType.None
+            }
+        }
+
+        private fun parseDateLong(string: String?): Long? {
+            return try {
+                SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").parse(
+                    string ?: return null
+                )?.time?.div(1000)
+            } catch (e: Exception) {
+                null
+            }
+        }
     }
 
     override suspend fun handleRedirect(url: String): Boolean {
@@ -275,7 +319,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
                 switchToNewAccount()
                 storeToken(res)
                 val user = getMalUser()
-                setKey(MAL_SHOULD_UPDATE_LIST, true)
+                requireLibraryRefresh = true
                 return user != null
             }
         }
@@ -308,9 +352,10 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
                 setKey(accountId, MAL_UNIXTIME_KEY, (token.expires_in + unixTime))
                 setKey(accountId, MAL_REFRESH_TOKEN_KEY, token.refresh_token)
                 setKey(accountId, MAL_TOKEN_KEY, token.access_token)
+                requireLibraryRefresh = true
             }
         } catch (e: Exception) {
-            e.printStackTrace()
+            logError(e)
         }
     }
 
@@ -329,7 +374,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
             ).text
             storeToken(res)
         } catch (e: Exception) {
-            e.printStackTrace()
+            logError(e)
         }
     }
 
@@ -382,7 +427,24 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
     data class Data(
         @JsonProperty("node") val node: Node,
         @JsonProperty("list_status") val list_status: ListStatus?,
-    )
+    ) {
+        fun toLibraryItem(): SyncAPI.LibraryItem {
+            return SyncAPI.LibraryItem(
+                this.node.title,
+                "https://myanimelist.net/anime/${this.node.id}/",
+                this.node.id.toString(),
+                this.list_status?.num_episodes_watched,
+                this.node.num_episodes,
+                this.list_status?.score?.times(10),
+                parseDateLong(this.list_status?.updated_at),
+                "MAL",
+                TvType.Anime,
+                this.node.main_picture?.large ?: this.node.main_picture?.medium,
+                null,
+                null,
+            )
+        }
+    }
 
     data class Paging(
         @JsonProperty("next") val next: String?
@@ -413,18 +475,43 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         return getKey(MAL_CACHED_LIST) as? Array<Data>
     }
 
-    suspend fun getMalAnimeListSmart(): Array<Data>? {
+    private suspend fun getMalAnimeListSmart(): Array<Data>? {
         if (getAuth() == null) return null
-        return if (getKey(MAL_SHOULD_UPDATE_LIST, true) == true) {
+        return if (requireLibraryRefresh) {
             val list = getMalAnimeList()
             setKey(MAL_CACHED_LIST, list)
-            setKey(MAL_SHOULD_UPDATE_LIST, false)
             list
         } else {
             getMalAnimeListCached()
         }
     }
 
+    override suspend fun getPersonalLibrary(): SyncAPI.LibraryMetadata {
+        val list = getMalAnimeListSmart()?.groupBy {
+            convertToStatus(it.list_status?.status ?: "").stringRes
+        }?.mapValues { group ->
+            group.value.map { it.toLibraryItem() }
+        } ?: emptyMap()
+
+        // To fill empty lists when MAL does not return them
+        val baseMap =
+            MalStatusType.values().filter { it.value >= 0 }.associate {
+                it.stringRes to emptyList<SyncAPI.LibraryItem>()
+            }
+
+        return SyncAPI.LibraryMetadata(
+            (baseMap + list).map { SyncAPI.LibraryList(txt(it.key), it.value) },
+            setOf(
+                ListSorting.AlphabeticalA,
+                ListSorting.AlphabeticalZ,
+                ListSorting.UpdatedNew,
+                ListSorting.UpdatedOld,
+                ListSorting.RatingHigh,
+                ListSorting.RatingLow,
+            )
+        )
+    }
+
     private suspend fun getMalAnimeList(): Array<Data> {
         checkMalToken()
         var offset = 0
@@ -440,10 +527,6 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         return fullList.toTypedArray()
     }
 
-    fun convertToStatus(string: String): MalStatusType {
-        return fromIntToAnimeStatus(malStatusAsString.indexOf(string))
-    }
-
     private suspend fun getMalAnimeListSlice(offset: Int = 0): MalList? {
         val user = "@me"
         val auth = getAuth() ?: return null
@@ -557,28 +640,6 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         return user
     }
 
-    enum class MalStatusType(var value: Int) {
-        Watching(0),
-        Completed(1),
-        OnHold(2),
-        Dropped(3),
-        PlanToWatch(4),
-        None(-1)
-    }
-
-    private fun fromIntToAnimeStatus(inp: Int): MalStatusType {//= AniListStatusType.values().first { it.value == inp }
-        return when (inp) {
-            -1 -> MalStatusType.None
-            0 -> MalStatusType.Watching
-            1 -> MalStatusType.Completed
-            2 -> MalStatusType.OnHold
-            3 -> MalStatusType.Dropped
-            4 -> MalStatusType.PlanToWatch
-            5 -> MalStatusType.Watching
-            else -> MalStatusType.None
-        }
-    }
-
     private suspend fun setScoreRequest(
         id: Int,
         status: MalStatusType? = null,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/AutofitRecyclerView.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/AutofitRecyclerView.kt
index 138084fc..b4c07792 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/AutofitRecyclerView.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/AutofitRecyclerView.kt
@@ -7,7 +7,8 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import kotlin.math.abs
 
-class GrdLayoutManager(val context: Context, _spanCount: Int) : GridLayoutManager(context, _spanCount) {
+class GrdLayoutManager(val context: Context, _spanCount: Int) :
+    GridLayoutManager(context, _spanCount) {
     override fun onFocusSearchFailed(
         focused: View,
         focusDirection: Int,
@@ -34,7 +35,7 @@ class GrdLayoutManager(val context: Context, _spanCount: Int) : GridLayoutManage
             val pos = maxOf(0, getPosition(focused!!) - 2)
             parent.scrollToPosition(pos)
             super.onRequestChildFocus(parent, state, child, focused)
-        } catch (e: Exception){
+        } catch (e: Exception) {
             false
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 8a8f90b4..5cf6fc8e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -569,7 +569,7 @@ class HomeFragment : Fragment() {
                     val mutableListOfResponse = mutableListOf<SearchResponse>()
                     listHomepageItems.clear()
 
-                    (home_master_recycler?.adapter as? ParentItemAdapter?)?.updateList(
+                    (home_master_recycler?.adapter as? ParentItemAdapter)?.updateList(
                         d.values.toMutableList(),
                         home_master_recycler
                     )
@@ -621,7 +621,7 @@ class HomeFragment : Fragment() {
                     //home_loaded?.isVisible = false
                 }
                 is Resource.Loading -> {
-                    (home_master_recycler?.adapter as? ParentItemAdapter?)?.updateList(listOf())
+                    (home_master_recycler?.adapter as? ParentItemAdapter)?.updateList(listOf())
                     home_loading_shimmer?.startShimmer()
                     home_loading?.isVisible = true
                     home_loading_error?.isVisible = false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
new file mode 100644
index 00000000..1c6af447
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
@@ -0,0 +1,393 @@
+package com.lagradost.cloudstream3.ui.library
+
+import android.app.Activity
+import android.content.Context
+import android.content.res.Configuration
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.AlphaAnimation
+import androidx.annotation.StringRes
+import androidx.appcompat.widget.SearchView
+import androidx.core.view.isVisible
+import androidx.fragment.app.activityViewModels
+import com.google.android.material.tabs.TabLayoutMediator
+import com.lagradost.cloudstream3.APIHolder
+import com.lagradost.cloudstream3.APIHolder.allProviders
+import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
+import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.debugAssert
+import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.syncproviders.SyncAPI
+import com.lagradost.cloudstream3.syncproviders.SyncIdName
+import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
+import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
+import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_SHOW_METADATA
+import com.lagradost.cloudstream3.utils.AppUtils.loadResult
+import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
+import com.lagradost.cloudstream3.utils.AppUtils.reduceDragSensitivity
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
+import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
+import kotlinx.android.synthetic.main.fragment_library.*
+import kotlin.math.abs
+
+const val LIBRARY_FOLDER = "library_folder"
+
+
+enum class LibraryOpenerType(@StringRes val stringRes: Int) {
+    Default(R.string.default_subtitles), // TODO FIX AFTER MERGE
+    Provider(R.string.none),
+    Browser(R.string.browser),
+    Search(R.string.search),
+    None(R.string.none),
+}
+
+/** Used to store how the user wants to open said poster */
+data class LibraryOpener(
+    val openType: LibraryOpenerType,
+    val providerData: ProviderLibraryData?,
+)
+
+data class ProviderLibraryData(
+    val apiName: String
+)
+
+class LibraryFragment : Fragment() {
+    companion object {
+        fun newInstance() = LibraryFragment()
+
+        /**
+         * Store which page was last seen when exiting the fragment and returning
+         **/
+        const val VIEWPAGER_ITEM_KEY = "viewpager_item"
+    }
+
+    private val libraryViewModel: LibraryViewModel by activityViewModels()
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.fragment_library, container, false)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        viewpager?.currentItem?.let { currentItem ->
+            outState.putInt(VIEWPAGER_ITEM_KEY, currentItem)
+        }
+        super.onSaveInstanceState(outState)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        context?.fixPaddingStatusbar(search_status_bar_padding)
+
+        sort_fab?.setOnClickListener {
+            val methods = libraryViewModel.sortingMethods.map {
+                txt(it.stringRes).asString(view.context)
+            }
+
+            activity?.showBottomDialog(methods,
+                libraryViewModel.sortingMethods.indexOf(libraryViewModel.currentSortingMethod),
+                txt(R.string.sort_by).asString(view.context),
+                false,
+                {},
+                {
+                    val method = libraryViewModel.sortingMethods[it]
+                    libraryViewModel.sort(method)
+                })
+        }
+
+        main_search?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+            override fun onQueryTextSubmit(query: String?): Boolean {
+                libraryViewModel.sort(ListSorting.Query, query)
+                return true
+            }
+
+            // This is required to prevent the first text change
+            // When this is attached it'll immediately send a onQueryTextChange("")
+            // Which we do not want
+            var hasInitialized = false
+            override fun onQueryTextChange(newText: String?): Boolean {
+                if (!hasInitialized) {
+                    hasInitialized = true
+                    return true
+                }
+
+                libraryViewModel.sort(ListSorting.Query, newText)
+                return true
+            }
+        })
+
+        libraryViewModel.reloadPages(false)
+
+        list_selector?.setOnClickListener {
+            val items = libraryViewModel.availableApiNames
+            val currentItem = libraryViewModel.currentApiName.value
+
+            activity?.showBottomDialog(items,
+                items.indexOf(currentItem),
+                txt(R.string.select_library).asString(it.context),
+                false,
+                {}) { index ->
+                val selectedItem = items.getOrNull(index) ?: return@showBottomDialog
+                libraryViewModel.switchList(selectedItem)
+            }
+        }
+
+
+        /**
+         * Shows a plugin selection dialogue and saves the response
+         **/
+        fun Activity.showPluginSelectionDialog(
+            key: String,
+            syncId: SyncIdName,
+            apiName: String? = null,
+        ) {
+            val availableProviders = allProviders.filter {
+                it.supportedSyncNames.contains(syncId)
+            }.map { it.name } +
+                    // Add the api if it exists
+                    (APIHolder.getApiFromNameNull(apiName)?.let { listOf(it.name) } ?: emptyList())
+
+            val baseOptions = listOf(
+                LibraryOpenerType.Default,
+                LibraryOpenerType.None,
+                LibraryOpenerType.Browser,
+                LibraryOpenerType.Search
+            )
+
+            val items = baseOptions.map { txt(it.stringRes).asString(this) } + availableProviders
+
+            val savedSelection = getKey<LibraryOpener>(LIBRARY_FOLDER, key)
+            val selectedIndex =
+                when {
+                    savedSelection == null -> 0
+                    // If provider
+                    savedSelection.openType == LibraryOpenerType.Provider
+                            && savedSelection.providerData?.apiName != null -> {
+                        availableProviders.indexOf(savedSelection.providerData.apiName)
+                            .takeIf { it != -1 }
+                            ?.plus(baseOptions.size) ?: 0
+                    }
+                    // Else base option
+                    else -> baseOptions.indexOf(savedSelection.openType)
+                }
+
+            this.showBottomDialog(
+                items,
+                selectedIndex,
+                txt(R.string.open_with).asString(this),
+                false,
+                {},
+            ) {
+                val savedData = if (it < baseOptions.size) {
+                    LibraryOpener(
+                        baseOptions[it],
+                        null
+                    )
+                } else {
+                    LibraryOpener(
+                        LibraryOpenerType.Provider,
+                        ProviderLibraryData(items[it])
+                    )
+                }
+
+                setKey(
+                    LIBRARY_FOLDER,
+                    key,
+                    savedData,
+                )
+            }
+        }
+
+        provider_selector?.setOnClickListener {
+            val syncName = libraryViewModel.currentSyncApi?.syncIdName ?: return@setOnClickListener
+            activity?.showPluginSelectionDialog(syncName.name, syncName)
+        }
+
+        viewpager?.setPageTransformer(LibraryScrollTransformer())
+        viewpager?.adapter =
+            viewpager.adapter ?: ViewpagerAdapter(mutableListOf(), { isScrollingDown: Boolean ->
+                if (isScrollingDown) {
+                    sort_fab?.shrink()
+                } else {
+                    sort_fab?.extend()
+                }
+            }) callback@{ searchClickCallback ->
+                // To prevent future accidents
+                debugAssert({
+                    searchClickCallback.card !is SyncAPI.LibraryItem
+                }, {
+                    "searchClickCallback ${searchClickCallback.card} is not a LibraryItem"
+                })
+
+                val syncId = (searchClickCallback.card as SyncAPI.LibraryItem).syncId
+                val syncName =
+                    libraryViewModel.currentSyncApi?.syncIdName ?: return@callback
+
+                when (searchClickCallback.action) {
+                    SEARCH_ACTION_SHOW_METADATA -> {
+                        activity?.showPluginSelectionDialog(
+                            syncId,
+                            syncName,
+                            searchClickCallback.card.apiName
+                        )
+                    }
+
+                    SEARCH_ACTION_LOAD -> {
+                        // This basically first selects the individual opener and if that is default then
+                        // selects the whole list opener
+                        val savedListSelection =
+                            getKey<LibraryOpener>(LIBRARY_FOLDER, syncName.name)
+                        val savedSelection = getKey<LibraryOpener>(LIBRARY_FOLDER, syncId).takeIf {
+                            it?.openType != LibraryOpenerType.Default
+                        } ?: savedListSelection
+
+                        when (savedSelection?.openType) {
+                            null, LibraryOpenerType.Default -> {
+                                // Prevents opening MAL/AniList as a provider
+                                if (APIHolder.getApiFromNameNull(searchClickCallback.card.apiName) != null) {
+                                    activity?.loadSearchResult(
+                                        searchClickCallback.card
+                                    )
+                                } else {
+                                    // Search when no provider can open
+                                    QuickSearchFragment.pushSearch(
+                                        activity,
+                                        searchClickCallback.card.name
+                                    )
+                                }
+                            }
+                            LibraryOpenerType.None -> {}
+                            LibraryOpenerType.Provider ->
+                                savedSelection.providerData?.apiName?.let { apiName ->
+                                    activity?.loadResult(
+                                        searchClickCallback.card.url,
+                                        apiName,
+                                    )
+                                }
+                            LibraryOpenerType.Browser ->
+                                openBrowser(searchClickCallback.card.url)
+                            LibraryOpenerType.Search -> {
+                                QuickSearchFragment.pushSearch(
+                                    activity,
+                                    searchClickCallback.card.name
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+
+        viewpager?.offscreenPageLimit = 2
+        viewpager?.reduceDragSensitivity()
+
+        val startLoading = Runnable {
+            gridview?.numColumns = context?.getSpanCount() ?: 3
+            gridview?.adapter =
+                context?.let { LoadingPosterAdapter(it, 6 * 3) }
+            library_loading_overlay?.isVisible = true
+            library_loading_shimmer?.startShimmer()
+            empty_list_textview?.isVisible = false
+        }
+
+        val stopLoading = Runnable {
+            gridview?.adapter = null
+            library_loading_overlay?.isVisible = false
+            library_loading_shimmer?.stopShimmer()
+        }
+
+        val handler = Handler(Looper.getMainLooper())
+
+        observe(libraryViewModel.pages) { resource ->
+            when (resource) {
+                is Resource.Success -> {
+                    handler.removeCallbacks(startLoading)
+                    val pages = resource.value
+                    val showNotice = pages.all { it.items.isEmpty() }
+                    empty_list_textview?.isVisible = showNotice
+                    if (showNotice) {
+                        if (libraryViewModel.availableApiNames.size > 1) {
+                            empty_list_textview?.setText(R.string.empty_library_logged_in_message)
+                        } else {
+                            empty_list_textview?.setText(R.string.empty_library_no_accounts_message)
+                        }
+                    }
+
+                    (viewpager.adapter as? ViewpagerAdapter)?.pages = pages
+                    // Using notifyItemRangeChanged keeps the animations when sorting
+                    viewpager.adapter?.notifyItemRangeChanged(0, viewpager.adapter?.itemCount ?: 0)
+
+                    // Only stop loading after 300ms to hide the fade effect the viewpager produces when updating
+                    // Without this there would be a flashing effect:
+                    // loading -> show old viewpager -> black screen -> show new viewpager
+                    handler.postDelayed(stopLoading, 300)
+
+                    savedInstanceState?.getInt(VIEWPAGER_ITEM_KEY)?.let { currentPos ->
+                        viewpager?.setCurrentItem(currentPos, false)
+                        savedInstanceState.remove(VIEWPAGER_ITEM_KEY)
+                    }
+
+                    // Since the animation to scroll multiple items is so much its better to just hide
+                    // the viewpager a bit while the fastest animation is running
+                    fun hideViewpager(distance: Int) {
+                        if (distance < 3) return
+
+                        val hideAnimation = AlphaAnimation(1f, 0f).apply {
+                            duration = distance * 50L
+                            fillAfter = true
+                        }
+                        val showAnimation = AlphaAnimation(0f, 1f).apply {
+                            duration = distance * 50L
+                            startOffset = distance * 100L
+                            fillAfter = true
+                        }
+                        viewpager?.startAnimation(hideAnimation)
+                        viewpager?.startAnimation(showAnimation)
+                    }
+
+                    TabLayoutMediator(
+                        library_tab_layout,
+                        viewpager,
+                    ) { tab, position ->
+                        tab.text = pages.getOrNull(position)?.title?.asStringNull(context)
+                        tab.view.setOnClickListener {
+                            val currentItem = viewpager?.currentItem ?: return@setOnClickListener
+                            val distance = abs(position - currentItem)
+                            hideViewpager(distance)
+                        }
+                    }.attach()
+                }
+                is Resource.Loading -> {
+                    // Only start loading after 200ms to prevent loading cached lists
+                    handler.postDelayed(startLoading, 200)
+                }
+                is Resource.Failure -> {
+                    stopLoading.run()
+                    // No user indication it failed :(
+                    // TODO
+                }
+            }
+        }
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        (viewpager.adapter as? ViewpagerAdapter)?.rebind()
+        super.onConfigurationChanged(newConfig)
+    }
+}
+
+class MenuSearchView(context: Context) : SearchView(context) {
+    override fun onActionViewCollapsed() {
+        super.onActionViewCollapsed()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryScrollTransformer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryScrollTransformer.kt
new file mode 100644
index 00000000..8aafbdd6
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryScrollTransformer.kt
@@ -0,0 +1,17 @@
+package com.lagradost.cloudstream3.ui.library
+
+import android.view.View
+import androidx.viewpager2.widget.ViewPager2
+import kotlinx.android.synthetic.main.library_viewpager_page.view.*
+import kotlin.math.roundToInt
+
+class LibraryScrollTransformer : ViewPager2.PageTransformer {
+    override fun transformPage(page: View, position: Float) {
+        val padding = (-position * page.width).roundToInt()
+        page.page_recyclerview.setPadding(
+            padding, 0,
+            -padding, 0
+        )
+    }
+}
+
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt
new file mode 100644
index 00000000..5f64880c
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt
@@ -0,0 +1,104 @@
+package com.lagradost.cloudstream3.ui.library
+
+import androidx.annotation.StringRes
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis
+import com.lagradost.cloudstream3.syncproviders.SyncAPI
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import kotlinx.coroutines.delay
+
+enum class ListSorting(@StringRes val stringRes: Int) {
+    Query(R.string.none),
+    RatingHigh(R.string.sort_rating_desc),
+    RatingLow(R.string.sort_rating_asc),
+    UpdatedNew(R.string.sort_updated_new),
+    UpdatedOld(R.string.sort_updated_old),
+    AlphabeticalA(R.string.sort_alphabetical_a),
+    AlphabeticalZ(R.string.sort_alphabetical_z),
+}
+
+const val LAST_SYNC_API_KEY = "last_sync_api"
+
+class LibraryViewModel : ViewModel() {
+    private val _pages: MutableLiveData<Resource<List<SyncAPI.Page>>> = MutableLiveData(null)
+    val pages: LiveData<Resource<List<SyncAPI.Page>>> = _pages
+
+    private val _currentApiName: MutableLiveData<String> = MutableLiveData("")
+    val currentApiName: LiveData<String> = _currentApiName
+
+    private val availableSyncApis
+        get() = SyncApis.filter { it.hasAccount() }
+
+    var currentSyncApi = availableSyncApis.let { allApis ->
+        val lastSelection = getKey<String>(LAST_SYNC_API_KEY)
+        availableSyncApis.firstOrNull { it.name == lastSelection } ?: allApis.firstOrNull()
+    }
+        private set(value) {
+            field = value
+            setKey(LAST_SYNC_API_KEY, field?.name)
+        }
+
+    val availableApiNames: List<String>
+        get() = availableSyncApis.map { it.name }
+
+    var sortingMethods = emptyList<ListSorting>()
+        private set
+
+    var currentSortingMethod: ListSorting? = sortingMethods.firstOrNull()
+        private set
+
+    fun switchList(name: String) {
+        currentSyncApi = availableSyncApis[availableApiNames.indexOf(name)]
+        _currentApiName.postValue(currentSyncApi?.name)
+        reloadPages(true)
+    }
+
+    fun sort(method: ListSorting, query: String? = null) {
+        val currentList = pages.value ?: return
+        currentSortingMethod = method
+        (currentList as? Resource.Success)?.value?.forEachIndexed { _, page ->
+            page.sort(method, query)
+        }
+        _pages.postValue(currentList)
+    }
+
+    fun reloadPages(forceReload: Boolean) {
+        // Only skip loading if its not forced and pages is not empty
+        if (!forceReload && (pages.value as? Resource.Success)?.value?.isNotEmpty() == true &&
+            currentSyncApi?.requireLibraryRefresh != true
+        ) return
+
+        ioSafe {
+            currentSyncApi?.let { repo ->
+                _currentApiName.postValue(repo.name)
+                _pages.postValue(Resource.Loading())
+                val libraryResource = repo.getPersonalLibrary()
+                if (libraryResource is Resource.Failure) {
+                    _pages.postValue(libraryResource)
+                    return@let
+                }
+                val library = (libraryResource as? Resource.Success)?.value ?: return@let
+
+                sortingMethods = library.supportedListSorting.toList()
+                currentSortingMethod = null
+
+                repo.requireLibraryRefresh = false
+
+                val pages = library.allLibraryLists.map {
+                    SyncAPI.Page(
+                        it.name,
+                        it.items
+                    )
+                }
+
+                _pages.postValue(Resource.Success(pages))
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LoadingPosterAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LoadingPosterAdapter.kt
new file mode 100644
index 00000000..a637133b
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LoadingPosterAdapter.kt
@@ -0,0 +1,37 @@
+package com.lagradost.cloudstream3.ui.library
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import android.widget.ListPopupWindow.MATCH_PARENT
+import android.widget.RelativeLayout
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.utils.UIHelper.toPx
+import kotlinx.android.synthetic.main.loading_poster_dynamic.view.*
+import kotlin.math.roundToInt
+import kotlin.math.sqrt
+
+class LoadingPosterAdapter(context: Context, private val itemCount: Int) :
+    BaseAdapter() {
+    private val inflater: LayoutInflater = LayoutInflater.from(context)
+
+    override fun getCount(): Int {
+        return itemCount
+    }
+
+    override fun getItem(position: Int): Any? {
+        return null
+    }
+
+    override fun getItemId(position: Int): Long {
+        return position.toLong()
+    }
+
+    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+        return convertView ?: inflater.inflate(R.layout.loading_poster_dynamic, parent, false)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt
new file mode 100644
index 00000000..2435f8be
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt
@@ -0,0 +1,130 @@
+package com.lagradost.cloudstream3.ui.library
+
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ImageView
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import com.lagradost.cloudstream3.AcraApplication
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.syncproviders.SyncAPI
+import com.lagradost.cloudstream3.ui.AutofitRecyclerView
+import com.lagradost.cloudstream3.ui.search.SearchClickCallback
+import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
+import com.lagradost.cloudstream3.utils.AppUtils
+import com.lagradost.cloudstream3.utils.UIHelper.toPx
+import kotlinx.android.synthetic.main.search_result_grid_expanded.view.*
+import kotlin.math.roundToInt
+
+
+class PageAdapter(
+    override val items: MutableList<SyncAPI.LibraryItem>,
+    private val resView: AutofitRecyclerView,
+    val clickCallback: (SearchClickCallback) -> Unit
+) :
+    AppUtils.DiffAdapter<SyncAPI.LibraryItem>(items) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        return LibraryItemViewHolder(
+            LayoutInflater.from(parent.context)
+                .inflate(R.layout.search_result_grid_expanded, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is LibraryItemViewHolder -> {
+                holder.bind(items[position], position)
+            }
+        }
+    }
+
+    private fun isDark(color: Int): Boolean {
+        return ColorUtils.calculateLuminance(color) < 0.5
+    }
+
+    fun getDifferentColor(color: Int, ratio: Float = 0.7f): Int {
+        return if (isDark(color)) {
+            ColorUtils.blendARGB(color, Color.WHITE, ratio)
+        } else {
+            ColorUtils.blendARGB(color, Color.BLACK, ratio)
+        }
+    }
+
+    inner class LibraryItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val cardView: ImageView = itemView.imageView
+
+        private val compactView = false//itemView.context.getGridIsCompact()
+        private val coverHeight: Int =
+            if (compactView) 80.toPx else (resView.itemWidth / 0.68).roundToInt()
+
+        fun bind(item: SyncAPI.LibraryItem, position: Int) {
+            /** https://stackoverflow.com/questions/8817522/how-to-get-color-code-of-image-view */
+
+            SearchResultBuilder.bind(
+                this@PageAdapter.clickCallback,
+                item,
+                position,
+                itemView,
+                colorCallback = { palette ->
+                    AcraApplication.context?.let { ctx ->
+                        val defColor = ContextCompat.getColor(ctx, R.color.ratingColorBg)
+                        var bg = palette.getDarkVibrantColor(defColor)
+                        if (bg == defColor) {
+                            bg = palette.getDarkMutedColor(defColor)
+                        }
+                        if (bg == defColor) {
+                            bg = palette.getVibrantColor(defColor)
+                        }
+
+                        val fg =
+                            getDifferentColor(bg)//palette.getVibrantColor(ContextCompat.getColor(ctx,R.color.ratingColor))
+                        itemView.text_rating.apply {
+                            setTextColor(ColorStateList.valueOf(fg))
+                        }
+                        itemView.text_rating_holder?.backgroundTintList = ColorStateList.valueOf(bg)
+                        itemView.watchProgress?.apply {
+                            progressTintList = ColorStateList.valueOf(fg)
+                            progressBackgroundTintList = ColorStateList.valueOf(bg)
+                        }
+                    }
+                }
+            )
+
+            // See searchAdaptor for this, it basically fixes the height
+            if (!compactView) {
+                cardView.apply {
+                    layoutParams = FrameLayout.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        coverHeight
+                    )
+                }
+            }
+
+            val showProgress = item.episodesCompleted != null && item.episodesTotal != null
+            itemView.watchProgress.isVisible = showProgress
+            if (showProgress) {
+                itemView.watchProgress.max = item.episodesTotal!!
+                itemView.watchProgress.progress = item.episodesCompleted!!
+            }
+
+            itemView.imageText.text = item.name
+
+            val showRating = (item.personalRating ?: 0) != 0
+            itemView.text_rating_holder.isVisible = showRating
+            if (showRating) {
+                // We want to show 8.5 but not 8.0 hence the replace
+                val rating = ((item.personalRating ?: 0).toDouble() / 10).toString()
+                    .replace(".0", "")
+
+                itemView.text_rating.text = "★ $rating"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt
new file mode 100644
index 00000000..33a40386
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt
@@ -0,0 +1,90 @@
+package com.lagradost.cloudstream3.ui.library
+
+import android.os.Build
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.doOnAttach
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.OnFlingListener
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.syncproviders.SyncAPI
+import com.lagradost.cloudstream3.ui.search.SearchClickCallback
+import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
+import kotlinx.android.synthetic.main.library_viewpager_page.view.*
+
+class ViewpagerAdapter(
+    var pages: List<SyncAPI.Page>,
+    val scrollCallback: (isScrollingDown: Boolean) -> Unit,
+    val clickCallback: (SearchClickCallback) -> Unit
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        return PageViewHolder(
+            LayoutInflater.from(parent.context)
+                .inflate(R.layout.library_viewpager_page, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is PageViewHolder -> {
+                holder.bind(pages[position], unbound.remove(position))
+            }
+        }
+    }
+
+    private val unbound = mutableSetOf<Int>()
+    /**
+     * Used to mark all pages for re-binding and forces all items to be refreshed
+     * Without this the pages will still use the same adapters
+     **/
+    fun rebind() {
+        unbound.addAll(0..pages.size)
+        this.notifyItemRangeChanged(0, pages.size)
+    }
+
+    inner class PageViewHolder(private val itemViewTest: View) :
+        RecyclerView.ViewHolder(itemViewTest) {
+        fun bind(page: SyncAPI.Page, rebind: Boolean) {
+            itemView.page_recyclerview?.spanCount =
+                this@PageViewHolder.itemView.context.getSpanCount() ?: 3
+
+            if (itemViewTest.page_recyclerview?.adapter == null || rebind) {
+                // Only add the items after it has been attached since the items rely on ItemWidth
+                // Which is only determined after the recyclerview is attached.
+                // If this fails then item height becomes 0 when there is only one item
+                itemViewTest.page_recyclerview?.doOnAttach {
+                    itemViewTest.page_recyclerview?.adapter = PageAdapter(
+                        page.items.toMutableList(),
+                        itemViewTest.page_recyclerview,
+                        clickCallback
+                    )
+                }
+            } else {
+                (itemViewTest.page_recyclerview?.adapter as? PageAdapter)?.updateList(page.items)
+                itemViewTest.page_recyclerview?.scrollToPosition(0)
+            }
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                itemViewTest.page_recyclerview.setOnScrollChangeListener { v, scrollX, scrollY, oldScrollX, oldScrollY ->
+                    val diff = scrollY - oldScrollY
+                    if (diff == 0) return@setOnScrollChangeListener
+
+                    scrollCallback.invoke(diff > 0)
+                }
+            } else {
+                itemViewTest.page_recyclerview.onFlingListener = object : OnFlingListener() {
+                    override fun onFling(velocityX: Int, velocityY: Int): Boolean {
+                        scrollCallback.invoke(velocityY > 0)
+                        return false
+                    }
+                }
+            }
+
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return pages.size
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
index ad3d9eb8..ba57d2de 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
@@ -220,7 +220,7 @@ class QuickSearchFragment : Fragment() {
             when (it) {
                 is Resource.Success -> {
                     it.value.let { data ->
-                        (quick_search_autofit_results?.adapter as? SearchAdapter?)?.updateList(
+                        (quick_search_autofit_results?.adapter as? SearchAdapter)?.updateList(
                             context?.filterSearchResultByFilmQuality(data) ?: data
                         )
                     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 9cfbf45c..2e2e46b7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -277,7 +277,7 @@ open class ResultFragment : ResultTrailerPlayer() {
     private var downloadButton: EasyDownloadButton? = null
     override fun onDestroyView() {
         updateUIListener = null
-        (result_episodes?.adapter as EpisodeAdapter?)?.killAdapter()
+        (result_episodes?.adapter as? EpisodeAdapter)?.killAdapter()
         downloadButton?.dispose()
 
         super.onDestroyView()
@@ -458,7 +458,7 @@ open class ResultFragment : ResultTrailerPlayer() {
                     temporary_no_focus?.requestFocus()
                 }
 
-                (result_episodes?.adapter as? EpisodeAdapter?)?.updateList(episodes.value)
+                (result_episodes?.adapter as? EpisodeAdapter)?.updateList(episodes.value)
 
                 if (isTv && hasEpisodes) main {
                     delay(500)
@@ -687,7 +687,7 @@ open class ResultFragment : ResultTrailerPlayer() {
             val newList = list.filter { it.isSynced && it.hasAccount }
 
             result_mini_sync?.isVisible = newList.isNotEmpty()
-            (result_mini_sync?.adapter as? ImageAdapter?)?.updateList(newList.mapNotNull { it.icon })
+            (result_mini_sync?.adapter as? ImageAdapter)?.updateList(newList.mapNotNull { it.icon })
         }
 
         var currentSyncProgress = 0
@@ -900,7 +900,7 @@ open class ResultFragment : ResultTrailerPlayer() {
 
 
                     result_cast_items?.isVisible = d.actors != null
-                    (result_cast_items?.adapter as ActorAdaptor?)?.apply {
+                    (result_cast_items?.adapter as? ActorAdaptor)?.apply {
                         updateList(d.actors ?: emptyList())
                     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index 9bae8753..b38e1765 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -485,7 +485,7 @@ class ResultFragmentPhone : ResultFragment() {
 
         result_recommendations?.post {
             rec?.let { list ->
-                (result_recommendations?.adapter as SearchAdapter?)?.updateList(list.filter { it.apiName == matchAgainst })
+                (result_recommendations?.adapter as? SearchAdapter)?.updateList(list.filter { it.apiName == matchAgainst })
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
index d5cab1a6..2bd8ff0f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
@@ -107,7 +107,7 @@ class ResultFragmentTv : ResultFragment() {
         result_recommendations?.isGone = isInvalid
         result_recommendations_holder?.isGone = isInvalid
         val matchAgainst = validApiName ?: rec?.firstOrNull()?.apiName
-        (result_recommendations?.adapter as SearchAdapter?)?.updateList(rec?.filter { it.apiName == matchAgainst }
+        (result_recommendations?.adapter as? SearchAdapter)?.updateList(rec?.filter { it.apiName == matchAgainst }
             ?: emptyList())
 
         rec?.map { it.apiName }?.distinct()?.let { apiNames ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 6ed32b15..6817af6a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -13,6 +13,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.getId
 import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
@@ -1443,12 +1444,18 @@ class ResultViewModel2 : ViewModel() {
 
             val realRecommendations = ArrayList<SearchResponse>()
             // TODO: fix
-            //val apiNames = listOf(GogoanimeProvider().name, NineAnimeProvider().name)
-            // meta.recommendations?.forEach { rec ->
-            //     apiNames.forEach { name ->
-            //         realRecommendations.add(rec.copy(apiName = name))
-            //     }
-            // }
+            val apiNames = apis.filter {
+                it.name.contains("gogoanime", true) ||
+                        it.name.contains("9anime", true)
+            }.map {
+                it.name
+            }
+
+            meta.recommendations?.forEach { rec ->
+                apiNames.forEach { name ->
+                    realRecommendations.add(rec.copy(apiName = name))
+                }
+            }
 
             recommendations = recommendations?.union(realRecommendations)?.toList()
                 ?: realRecommendations
@@ -2143,7 +2150,7 @@ class ResultViewModel2 : ViewModel() {
             val validUrlResource = safeApiCall {
                 SyncRedirector.redirect(
                     url,
-                    api.mainUrl
+                    api
                 )
             }
             // TODO: fix
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
index ddf559fc..649641c8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
@@ -10,12 +10,16 @@ import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.ui.AutofitRecyclerView
+import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.UIHelper.IsBottomLayout
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import kotlinx.android.synthetic.main.search_result_compact.view.*
 import kotlin.math.roundToInt
 
+/** Click */
 const val SEARCH_ACTION_LOAD = 0
+
+/** Long press */
 const val SEARCH_ACTION_SHOW_METADATA = 1
 const val SEARCH_ACTION_PLAY_FILE = 2
 const val SEARCH_ACTION_FOCUSED = 4
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 4144a042..b4a38216 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -420,7 +420,7 @@ class SearchFragment : Fragment() {
                 is Resource.Success -> {
                     it.value.let { data ->
                         if (data.isNotEmpty()) {
-                            (search_autofit_results?.adapter as SearchAdapter?)?.updateList(data)
+                            (search_autofit_results?.adapter as? SearchAdapter)?.updateList(data)
                         }
                     }
                     searchExitIcon.alpha = 1f
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
index 3afbb8c0..3447ee32 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
@@ -1,12 +1,14 @@
 package com.lagradost.cloudstream3.ui.search
 
 import android.content.Context
+import android.graphics.drawable.Drawable
 import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.cardview.widget.CardView
 import androidx.core.view.isVisible
+import androidx.palette.graphics.Palette
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
@@ -41,6 +43,7 @@ object SearchResultBuilder {
         nextFocusBehavior: Boolean? = null,
         nextFocusUp: Int? = null,
         nextFocusDown: Int? = null,
+        colorCallback : ((Palette) -> Unit)? = null
     ) {
         val cardView: ImageView = itemView.imageView
         val cardText: TextView? = itemView.imageText
@@ -100,7 +103,7 @@ object SearchResultBuilder {
         cardText?.isVisible = showTitle
         cardView.isVisible = true
 
-        if (!cardView.setImage(card.posterUrl, card.posterHeaders)) {
+        if (!cardView.setImage(card.posterUrl, card.posterHeaders, colorCallback = colorCallback)) {
             cardView.setImageResource(R.drawable.default_cover)
         }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
index bd44a058..d328d226 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
@@ -143,7 +143,7 @@ class PluginsFragment : Fragment() {
         }
 
         observe(pluginViewModel.filteredPlugins) { (scrollToTop, list) ->
-            (plugin_recycler_view?.adapter as? PluginAdapter?)?.updateList(list)
+            (plugin_recycler_view?.adapter as? PluginAdapter)?.updateList(list)
 
             if (scrollToTop)
                 plugin_recycler_view?.scrollToPosition(0)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
index d563bffa..00dee9b2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -28,10 +28,12 @@ import androidx.core.text.toSpanned
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.tvprovider.media.tv.*
 import androidx.tvprovider.media.tv.WatchNextProgram.fromCursor
+import androidx.viewpager2.widget.ViewPager2
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.google.android.gms.cast.framework.CastContext
 import com.google.android.gms.cast.framework.CastState
@@ -65,6 +67,7 @@ import okhttp3.Cache
 import java.io.*
 import java.net.URL
 import java.net.URLDecoder
+import kotlin.system.measureTimeMillis
 
 object AppUtils {
     fun RecyclerView.setMaxViewPoolSize(maxViewTypeId: Int, maxPoolSize: Int) {
@@ -164,6 +167,18 @@ object AppUtils {
         return builder.build()
     }
 
+    // https://stackoverflow.com/a/67441735/13746422
+    fun ViewPager2.reduceDragSensitivity(f: Int = 4) {
+        val recyclerViewField = ViewPager2::class.java.getDeclaredField("mRecyclerView")
+        recyclerViewField.isAccessible = true
+        val recyclerView = recyclerViewField.get(this) as RecyclerView
+
+        val touchSlopField = RecyclerView::class.java.getDeclaredField("mTouchSlop")
+        touchSlopField.isAccessible = true
+        val touchSlop = touchSlopField.get(recyclerView) as Int
+        touchSlopField.set(recyclerView, touchSlop * f)       // "8" was obtained experimentally
+    }
+
     @SuppressLint("RestrictedApi")
     fun getAllWatchNextPrograms(context: Context): Set<Long> {
         val COLUMN_WATCH_NEXT_ID_INDEX = 0
@@ -329,6 +344,46 @@ object AppUtils {
         }
     }
 
+    abstract class DiffAdapter<T>(
+        open val items: MutableList<T>,
+        val comparison: (first: T, second: T) -> Boolean = { first, second ->
+            first.hashCode() == second.hashCode()
+        }
+    ) :
+        RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+        override fun getItemCount(): Int {
+            return items.size
+        }
+
+        fun updateList(newList: List<T>) {
+            val diffResult = DiffUtil.calculateDiff(
+                GenericDiffCallback(this.items, newList)
+            )
+
+            items.clear()
+            items.addAll(newList)
+
+            diffResult.dispatchUpdatesTo(this)
+        }
+
+        inner class GenericDiffCallback(
+            private val oldList: List<T>,
+            private val newList: List<T>
+        ) :
+            DiffUtil.Callback() {
+            override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+                comparison(oldList[oldItemPosition], newList[newItemPosition])
+
+            override fun getOldListSize() = oldList.size
+
+            override fun getNewListSize() = newList.size
+
+            override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+                oldList[oldItemPosition] == newList[newItemPosition]
+        }
+    }
+
+
     fun Activity.downloadAllPluginsDialog(repositoryUrl: String, repositoryName: String) {
         runOnUiThread {
             val context = this
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
index 80e5d64a..8d51e5ef 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
@@ -18,13 +18,11 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.plugins.PLUGINS_KEY
 import com.lagradost.cloudstream3.plugins.PLUGINS_KEY_LOCAL
 import com.lagradost.cloudstream3.syncproviders.providers.AniListApi.Companion.ANILIST_CACHED_LIST
-import com.lagradost.cloudstream3.syncproviders.providers.AniListApi.Companion.ANILIST_SHOULD_UPDATE_LIST
 import com.lagradost.cloudstream3.syncproviders.providers.AniListApi.Companion.ANILIST_TOKEN_KEY
 import com.lagradost.cloudstream3.syncproviders.providers.AniListApi.Companion.ANILIST_UNIXTIME_KEY
 import com.lagradost.cloudstream3.syncproviders.providers.AniListApi.Companion.ANILIST_USER_KEY
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_CACHED_LIST
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_REFRESH_TOKEN_KEY
-import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_SHOULD_UPDATE_LIST
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_TOKEN_KEY
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_UNIXTIME_KEY
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_USER_KEY
@@ -52,12 +50,10 @@ object BackupUtils {
         // When sharing backup we do not want to transfer what is essentially the password
         ANILIST_TOKEN_KEY,
         ANILIST_CACHED_LIST,
-        ANILIST_SHOULD_UPDATE_LIST,
         ANILIST_UNIXTIME_KEY,
         ANILIST_USER_KEY,
         MAL_TOKEN_KEY,
         MAL_REFRESH_TOKEN_KEY,
-        MAL_SHOULD_UPDATE_LIST,
         MAL_CACHED_LIST,
         MAL_UNIXTIME_KEY,
         MAL_USER_KEY,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
index 9174c481..281c9c44 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.utils
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.APIHolder.capitalize
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
@@ -10,6 +11,8 @@ import com.lagradost.cloudstream3.DubStatus
 import com.lagradost.cloudstream3.SearchQuality
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.syncproviders.AccountManager
+import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.result.VideoWatchState
 
@@ -51,7 +54,20 @@ object DataStoreHelper {
         @JsonProperty("year") val year: Int?,
         @JsonProperty("quality") override var quality: SearchQuality? = null,
         @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-    ) : SearchResponse
+    ) : SearchResponse {
+        fun toLibraryItem(id: String): SyncAPI.LibraryItem {
+            return SyncAPI.LibraryItem(
+                name,
+                url,
+                id,
+                null,
+                null,
+                null,
+                null,
+                apiName, type, posterUrl, posterHeaders, quality, this.id
+            )
+        }
+    }
 
     data class ResumeWatchingResult(
         @JsonProperty("name") override val name: String,
@@ -71,6 +87,9 @@ object DataStoreHelper {
         @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>? = null,
     ) : SearchResponse
 
+    /**
+     * A datastore wide account for future implementations of a multiple account system
+     **/
     private var currentAccount: String = "0" //TODO ACCOUNT IMPLEMENTATION
 
     fun getAllWatchStateIds(): List<Int>? {
@@ -177,6 +196,7 @@ object DataStoreHelper {
     fun setBookmarkedData(id: Int?, data: BookmarkedData) {
         if (id == null) return
         setKey("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString(), data)
+        AccountManager.localListApi.requireLibraryRefresh = true
     }
 
     fun getBookmarkedData(id: Int?): BookmarkedData? {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
index 7dda3e18..e5f2f2dc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
@@ -4,6 +4,7 @@ package com.lagradost.cloudstream3.utils
 
 import android.util.Log
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.APIHolder.apis
 //import com.lagradost.cloudstream3.animeproviders.AniflixProvider
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
@@ -78,17 +79,21 @@ object SyncUtil {
         return null
     }
 
-    suspend fun getUrlsFromId(id: String, type: String = "anilist") : List<String> {
-        return arrayListOf()
-        // val url =
-        //     "https://raw.githubusercontent.com/MALSync/MAL-Sync-Backup/master/data/$type/anime/$id.json"
-        // val response = app.get(url, cacheTime = 1, cacheUnit = TimeUnit.DAYS).parsed<SyncPage>()
-        // val pages = response.pages ?: return emptyList()
-        // val current = pages.gogoanime.values.union(pages.nineanime.values).union(pages.twistmoe.values).mapNotNull { it.url }.toMutableList()
-        // if(type == "anilist") { // TODO MAKE BETTER
-        //     current.add("${AniflixProvider().mainUrl}/anime/$id")
-        // }
-        // return current
+    suspend fun getUrlsFromId(id: String, type: String = "anilist"): List<String> {
+        val url =
+            "https://raw.githubusercontent.com/MALSync/MAL-Sync-Backup/master/data/$type/anime/$id.json"
+        val response = app.get(url, cacheTime = 1, cacheUnit = TimeUnit.DAYS).parsed<SyncPage>()
+        val pages = response.pages ?: return emptyList()
+        val current =
+            pages.gogoanime.values.union(pages.nineanime.values).union(pages.twistmoe.values)
+                .mapNotNull { it.url }.toMutableList()
+
+        if (type == "anilist") { // TODO MAKE BETTER
+            apis.filter { it.name.contains("Aniflix", ignoreCase = true) }.forEach {
+                current.add("${it.mainUrl}/anime/$id")
+            }
+        }
+        return current
     }
 
     data class SyncPage(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
index 63b3623d..c300d615 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
@@ -9,7 +9,9 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.content.res.Resources
+import android.graphics.Bitmap
 import android.graphics.Color
+import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
 import android.view.*
@@ -28,15 +30,21 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.alpha
 import androidx.core.graphics.blue
+import androidx.core.graphics.drawable.toBitmapOrNull
 import androidx.core.graphics.green
 import androidx.core.graphics.red
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.fragment.NavHostFragment
+import androidx.palette.graphics.Palette
 import androidx.preference.PreferenceManager
+import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.load.model.GlideUrl
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.Target
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isEmulatorSettings
@@ -105,7 +113,7 @@ object UIHelper {
         listView.requestLayout()
     }
 
-    fun Activity?.getSpanCount(): Int? {
+    fun Context?.getSpanCount(): Int? {
         val compactView = false
         val spanCountLandscape = if (compactView) 2 else 6
         val spanCountPortrait = if (compactView) 1 else 3
@@ -158,12 +166,27 @@ object UIHelper {
         return color
     }
 
+    var createPaletteAsyncCache: HashMap<String, Palette> = hashMapOf()
+    fun createPaletteAsync(url: String, bitmap: Bitmap, callback: (Palette) -> Unit) {
+        createPaletteAsyncCache[url]?.let { palette ->
+            callback.invoke(palette)
+            return
+        }
+        Palette.from(bitmap).generate { paletteNull ->
+            paletteNull?.let { palette ->
+                createPaletteAsyncCache[url] = palette
+                callback(palette)
+            }
+        }
+    }
+
     fun ImageView?.setImage(
         url: String?,
         headers: Map<String, String>? = null,
         @DrawableRes
         errorImageDrawable: Int? = null,
-        fadeIn: Boolean = true
+        fadeIn: Boolean = true,
+        colorCallback: ((Palette) -> Unit)? = null
     ): Boolean {
         if (this == null || url.isNullOrBlank()) return false
 
@@ -177,6 +200,33 @@ object UIHelper {
                     else req
                 }
 
+            if (colorCallback != null) {
+                builder.listener(object : RequestListener<Drawable> {
+                    @SuppressLint("CheckResult")
+                    override fun onResourceReady(
+                        resource: Drawable?,
+                        model: Any?,
+                        target: Target<Drawable>?,
+                        dataSource: DataSource?,
+                        isFirstResource: Boolean
+                    ): Boolean {
+                        resource?.toBitmapOrNull()
+                            ?.let { bitmap -> createPaletteAsync(url, bitmap, colorCallback) }
+                        return false
+                    }
+
+                    @SuppressLint("CheckResult")
+                    override fun onLoadFailed(
+                        e: GlideException?,
+                        model: Any?,
+                        target: Target<Drawable>?,
+                        isFirstResource: Boolean
+                    ): Boolean {
+                        return false
+                    }
+                })
+            }
+
             val res = if (errorImageDrawable != null)
                 builder.error(errorImageDrawable).into(this)
             else
diff --git a/app/src/main/res/color/item_select_color.xml b/app/src/main/res/color/item_select_color.xml
index 0d2834dd..3d69c540 100644
--- a/app/src/main/res/color/item_select_color.xml
+++ b/app/src/main/res/color/item_select_color.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="?attr/colorPrimary" android:state_checked="true"/>
+    <item android:color="?attr/colorPrimary" android:state_focused="true"/>
+    <item android:color="?attr/colorPrimary" android:state_selected="true"/>
     <item android:color="?attr/grayTextColor" android:state_checked="false"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_collections_bookmark_24.xml b/app/src/main/res/drawable/ic_baseline_collections_bookmark_24.xml
new file mode 100644
index 00000000..fc90e300
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_collections_bookmark_24.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,12l-2.5,-1.5L15,12L15,4h5v8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_sort_24.xml b/app/src/main/res/drawable/ic_baseline_sort_24.xml
new file mode 100644
index 00000000..96d46231
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_sort_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="?attr/white" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_star_24.xml b/app/src/main/res/drawable/ic_baseline_star_24.xml
index ab099425..2dcadb7f 100644
--- a/app/src/main/res/drawable/ic_baseline_star_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_star_24.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="?attr/white"
+<vector android:height="12dp" android:tint="?attr/white"
     android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_account_circle_24.xml b/app/src/main/res/drawable/ic_outline_account_circle_24.xml
new file mode 100644
index 00000000..cc564471
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_account_circle_24.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM7.35,18.5C8.66,17.56 10.26,17 12,17s3.34,0.56 4.65,1.5C15.34,19.44 13.74,20 12,20S8.66,19.44 7.35,18.5zM18.14,17.12L18.14,17.12C16.45,15.8 14.32,15 12,15s-4.45,0.8 -6.14,2.12l0,0C4.7,15.73 4,13.95 4,12c0,-4.42 3.58,-8 8,-8s8,3.58 8,8C20,13.95 19.3,15.73 18.14,17.12z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M12,6c-1.93,0 -3.5,1.57 -3.5,3.5S10.07,13 12,13s3.5,-1.57 3.5,-3.5S13.93,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5S11.17,8 12,8s1.5,0.67 1.5,1.5S12.83,11 12,11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/indicator_background.xml b/app/src/main/res/drawable/indicator_background.xml
new file mode 100644
index 00000000..ef44fb7c
--- /dev/null
+++ b/app/src/main/res/drawable/indicator_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid android:color="@color/textColor"/>
+    <corners android:radius="16dp" />
+</shape>
diff --git a/app/src/main/res/drawable/rating_bg_color.xml b/app/src/main/res/drawable/rating_bg_color.xml
new file mode 100644
index 00000000..60e62bab
--- /dev/null
+++ b/app/src/main/res/drawable/rating_bg_color.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/ratingColorBg"/>
+    <corners android:radius="@dimen/rounded_image_radius"/>
+   <!-- <stroke android:color="@color/subColor" android:width="2dp"/>-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ad29d22a..b6290865 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -35,9 +35,9 @@
                   -->
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/nav_view"
-            android:layout_height="wrap_content"
+            android:layout_height="70dp"
             android:layout_width="0dp"
-            app:labelVisibilityMode="labeled"
+            app:labelVisibilityMode="unlabeled"
             android:background="?attr/primaryGrayBackground"
 
             app:itemIconTint="@color/item_select_color"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
new file mode 100644
index 00000000..f9012148
--- /dev/null
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/library_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/empty_list_textview"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_margin="30dp"
+        android:gravity="center"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/search_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/primaryGrayBackground">
+
+        <LinearLayout
+            android:id="@+id/search_status_bar_padding"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_scrollFlags="scroll|enterAlways">
+
+            <ImageView
+                android:id="@+id/provider_selector"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_gravity="end|center_vertical"
+                android:layout_marginStart="10dp"
+                android:background="?selectableItemBackgroundBorderless"
+                android:contentDescription="@string/change_providers_img_des"
+                android:src="@drawable/ic_baseline_extension_24"
+                app:tint="?attr/textColor" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_margin="10dp"
+                android:background="@drawable/search_background"
+                android:visibility="visible"
+                app:layout_scrollFlags="scroll|enterAlways">
+
+                <androidx.appcompat.widget.SearchView
+                    android:id="@+id/main_search"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_vertical"
+
+                    android:iconifiedByDefault="false"
+                    android:imeOptions="actionSearch"
+
+                    android:inputType="text"
+                    android:nextFocusLeft="@id/nav_rail_view"
+
+                    android:nextFocusRight="@id/search_filter"
+                    android:paddingStart="-10dp"
+                    app:iconifiedByDefault="false"
+                    app:queryBackground="@color/transparent"
+                    app:queryHint="@string/search_hint"
+                    app:searchIcon="@drawable/search_icon"
+                    tools:ignore="RtlSymmetry">
+
+                </androidx.appcompat.widget.SearchView>
+
+
+                <ImageView
+                    android:id="@+id/list_selector"
+                    android:layout_width="45dp"
+                    android:layout_height="45dp"
+                    android:layout_gravity="end|center_vertical"
+                    android:background="?selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/change_providers_img_des"
+                    android:nextFocusLeft="@id/main_search"
+                    android:nextFocusRight="@id/main_search"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_baseline_filter_list_24"
+                    app:tint="?attr/textColor" />
+
+            </FrameLayout>
+        </LinearLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:animateLayoutChanges="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/viewpager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:paddingBottom="40dp"
+            tools:listitem="@layout/library_viewpager_page" />
+
+        <LinearLayout
+            android:id="@+id/library_loading_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?attr/primaryBlackBackground"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <com.facebook.shimmer.ShimmerFrameLayout
+                android:id="@+id/library_loading_shimmer"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_margin="2dp"
+                app:shimmer_auto_start="true"
+                app:shimmer_base_alpha="0.2"
+                app:shimmer_duration="@integer/loading_time"
+                app:shimmer_highlight_alpha="0.3">
+
+                <GridView
+                    android:id="@+id/gridview"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:clipToPadding="false"
+                    android:gravity="center"
+                    android:horizontalSpacing="10dp"
+                    android:numColumns="3"
+                    android:paddingBottom="120dp"
+                    android:verticalSpacing="10dp"
+                    tools:listitem="@layout/loading_poster_dynamic" />
+            </com.facebook.shimmer.ShimmerFrameLayout>
+        </LinearLayout>
+
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="40dp">
+
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/sort_fab"
+            style="@style/ExtendedFloatingActionButton"
+            android:text="@string/sort"
+            android:textColor="?attr/textColor"
+            app:icon="@drawable/ic_baseline_sort_24"
+            tools:ignore="ContentDescription" />
+    </FrameLayout>
+
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/library_tab_layout"
+        style="@style/Theme.Widget.Tabs"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_gravity="bottom"
+        android:background="?attr/primaryGrayBackground"
+        android:descendantFocusability="blocksDescendants"
+        android:focusable="false"
+        android:paddingHorizontal="5dp"
+        app:layout_scrollFlags="noScroll"
+        app:tabGravity="center"
+        app:tabIndicator="@drawable/indicator_background"
+        app:tabIndicatorColor="@color/textColor"
+        app:tabIndicatorGravity="center"
+        app:tabIndicatorHeight="30dp"
+        app:tabMode="scrollable"
+        app:tabSelectedTextColor="@color/lightTextColor"
+        app:tabTextAppearance="@style/TabNoCaps"
+        app:tabTextColor="@color/textColor" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/library_viewpager_page.xml b/app/src/main/res/layout/library_viewpager_page.xml
new file mode 100644
index 00000000..f69f68b5
--- /dev/null
+++ b/app/src/main/res/layout/library_viewpager_page.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<com.lagradost.cloudstream3.ui.AutofitRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/page_recyclerview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    tools:listitem="@layout/home_result_grid_expanded" />
+
diff --git a/app/src/main/res/layout/loading_poster_dynamic.xml b/app/src/main/res/layout/loading_poster_dynamic.xml
new file mode 100644
index 00000000..11855acb
--- /dev/null
+++ b/app/src/main/res/layout/loading_poster_dynamic.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:orientation="vertical">
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/card_view"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginBottom="10dp"
+            android:background="@color/grayShimmer"
+            app:cardCornerRadius="@dimen/loading_radius"
+            app:layout_constraintDimensionRatio="1:1.414"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="ContentDescription" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <include
+        layout="@layout/loading_line_short_center"
+        android:layout_width="match_parent"
+        android:layout_height="15dp"
+        android:layout_marginHorizontal="20dp"
+        android:layout_marginVertical="10dp" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/search_result_grid_expanded.xml b/app/src/main/res/layout/search_result_grid_expanded.xml
index 25b3f67d..47fd7cd3 100644
--- a/app/src/main/res/layout/search_result_grid_expanded.xml
+++ b/app/src/main/res/layout/search_result_grid_expanded.xml
@@ -5,62 +5,109 @@
     android:id="@+id/search_result_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-
     android:clickable="true"
     android:focusable="true"
     android:foreground="@drawable/outline_drawable"
     android:orientation="vertical">
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/background_card"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="2dp"
-        android:layout_marginBottom="2dp"
-        android:elevation="10dp"
-        app:cardBackgroundColor="?attr/primaryGrayBackground"
-        app:cardCornerRadius="@dimen/rounded_image_radius">
+        android:layout_height="wrap_content">
 
-        <ImageView
-            android:id="@+id/imageView"
+        <androidx.cardview.widget.CardView
+            android:id="@+id/background_card"
             android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_margin="2dp"
+            android:layout_marginBottom="2dp"
+            android:elevation="10dp"
+            app:cardBackgroundColor="?attr/primaryGrayBackground"
+            app:cardCornerRadius="@dimen/rounded_image_radius"
+            app:layout_constraintDimensionRatio="1:1.414"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
-            android:layout_height="match_parent"
-            android:contentDescription="@string/search_poster_img_des"
-            android:duplicateParentState="true"
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:scaleType="centerCrop"
-            tools:src="@drawable/example_poster" />
-
-        <TextView android:id="@+id/text_quality" style="@style/TypeButton" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="end"
-            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/imageView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/search_poster_img_des"
+                android:duplicateParentState="true"
+                android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                android:scaleType="centerCrop"
+                tools:src="@drawable/example_poster" />
 
             <TextView
-                android:id="@+id/text_is_dub"
-                style="@style/DubButton"
-                android:layout_gravity="end" />
+                android:id="@+id/text_quality"
+                style="@style/TypeButton" />
 
-            <TextView
-                android:id="@+id/text_is_sub"
-                style="@style/SubButton"
-                android:layout_gravity="end" />
-
-            <TextView
-                android:id="@+id/text_flag"
-                style="@style/SearchBox"
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:layout_gravity="end"
-                android:background="@color/transparent"
-                android:textSize="20sp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/text_is_dub"
+                    style="@style/DubButton"
+                    android:layout_gravity="end" />
+
+                <TextView
+                    android:id="@+id/text_is_sub"
+                    style="@style/SubButton"
+                    android:layout_gravity="end" />
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/text_rating_holder"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_margin="2dp"
+                    android:backgroundTint="@color/ratingColorBg"
+                    android:elevation="0dp"
+                    android:visibility="gone"
+                    app:cardCornerRadius="@dimen/rounded_image_radius"
+                    app:cardElevation="0dp"
+                    tools:visibility="visible">
+
+                    <TextView
+                        android:id="@+id/text_rating"
+                        style="@style/SearchBox"
+                        android:layout_margin="0dp"
+                        android:minWidth="40dp"
+                        android:textColor="@color/ratingColor"
+
+                        tools:text="★ 7.7" />
+                </androidx.cardview.widget.CardView>
+
+
+                <TextView
+                    android:id="@+id/text_flag"
+                    style="@style/SearchBox"
+                    android:layout_gravity="end"
+                    android:background="@color/transparent"
+                    android:textSize="20sp"
+                    android:visibility="gone"
+                    tools:text="🇸🇪"
+                    tools:visibility="visible" />
+            </LinearLayout>
+
+
+            <androidx.core.widget.ContentLoadingProgressBar
+                android:id="@+id/watchProgress"
+                style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="5dp"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="-1.5dp"
+                android:progressBackgroundTint="?attr/colorPrimary"
+                android:progressTint="?attr/colorPrimary"
                 android:visibility="gone"
-                tools:text="🇸🇪"
+                tools:progress="50"
                 tools:visibility="visible" />
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
+        </androidx.cardview.widget.CardView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
         android:id="@+id/imageText"
@@ -78,4 +125,4 @@
         android:textColor="?attr/textColor"
         android:textSize="13sp"
         tools:text="The Perfect Run\nThe Perfect Run" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
index 3a5e0929..cb620bb8 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item
-            android:id="@+id/navigation_home"
-            android:icon="@drawable/home_alt"
-            android:title="@string/title_home"/>
+        android:id="@+id/navigation_home"
+        android:icon="@drawable/home_alt"
+        android:title="@string/title_home" />
     <item
-            android:id="@+id/navigation_search"
-            android:icon="@drawable/search_icon"
-            android:title="@string/title_search"/>
+        android:id="@+id/navigation_search"
+        android:icon="@drawable/search_icon"
+        android:title="@string/title_search" />
     <item
-            android:id="@+id/navigation_downloads"
-            android:icon="@drawable/netflix_download"
-            android:title="@string/title_downloads"/>
+        android:id="@+id/navigation_library"
+        android:icon="@drawable/ic_outline_account_circle_24"
+        android:title="@string/library" />
     <item
-            android:id="@+id/navigation_settings"
-            android:icon="@drawable/settings_alt"
-            android:title="@string/title_settings"/>
+        android:id="@+id/navigation_downloads"
+        android:icon="@drawable/netflix_download"
+        android:title="@string/title_downloads" />
+    <item
+        android:id="@+id/navigation_settings"
+        android:icon="@drawable/ic_outline_settings_24"
+        android:title="@string/title_settings" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/library_menu.xml b/app/src/main/res/menu/library_menu.xml
new file mode 100644
index 00000000..f21d998d
--- /dev/null
+++ b/app/src/main/res/menu/library_menu.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/search_button"
+        android:icon="@drawable/search_icon"
+        android:title="@string/title_search"
+        app:searchHintIcon="@drawable/search_icon"
+        app:showAsAction="collapseActionView|ifRoom"
+        app:actionViewClass="com.lagradost.cloudstream3.ui.library.MenuSearchView" />
+    <item
+        android:id="@+id/sort_button"
+        android:icon="@drawable/ic_baseline_sort_24"
+        android:title="Sort"
+        app:showAsAction="collapseActionView|ifRoom" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 14d750a0..d71eeb06 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -144,6 +144,15 @@
         app:popEnterAnim="@anim/enter_anim"
         app:popExitAnim="@anim/exit_anim" />
 
+    <fragment
+        android:id="@+id/navigation_library"
+        android:name="com.lagradost.cloudstream3.ui.library.LibraryFragment"
+        android:label="@string/library"
+        app:enterAnim="@anim/enter_anim"
+        app:exitAnim="@anim/exit_anim"
+        app:popEnterAnim="@anim/enter_anim"
+        app:popExitAnim="@anim/exit_anim" />
+
     <fragment
         android:id="@+id/navigation_settings_general"
         android:name="com.lagradost.cloudstream3.ui.settings.SettingsGeneral"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 85eb3a48..61ff0c2b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -36,6 +36,8 @@
     <color name="subColorBg">#F53B66</color>
     <color name="typeColorText">#BEC8FF</color>
     <color name="typeColorBg">?attr/colorPrimaryDark</color>
+    <color name="ratingColor">#4C3115</color>
+    <color name="ratingColorBg">#FFA662</color>
 
     <color name="adultColor">#FF6F63</color> <!-- same as sub color -->
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6c10d865..cee6bccc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -110,6 +110,7 @@
     <string name="result_tags">Genres</string>
     <string name="result_share">Share</string>
     <string name="result_open_in_browser">Open In Browser</string>
+    <string name="browser">Browser</string>
     <string name="skip_loading">Skip Loading</string>
     <string name="loading">Loading…</string>
     <string name="type_watching">Watching</string>
@@ -229,6 +230,7 @@
     <string name="backup_failed">Storage permissions missing. Please try again.</string>
     <string name="backup_failed_error_format">Error backing up %s</string>
     <string name="search">Search</string>
+    <string name="library">Library</string>
     <string name="category_account">Accounts</string>
     <string name="category_updates">Updates and backup</string>
     <string name="settings_info">Info</string>
@@ -616,5 +618,16 @@
     <string name="apk_installer_legacy">Legacy</string>
     <string name="apk_installer_package_installer">PackageInstaller</string>
     <string name="delayed_update_notice">App will be updated upon exit</string>
-
+    <string name="sort_by">Sort by</string>
+    <string name="sort">Sort</string>
+    <string name="sort_rating_desc">Rating (High to Low)</string>
+    <string name="sort_rating_asc">Rating (Low to High)</string>
+    <string name="sort_updated_new">Updated (New to Old)</string>
+    <string name="sort_updated_old">Updated (Old to New)</string>
+    <string name="sort_alphabetical_a">Alphabetical (A to Z)</string>
+    <string name="sort_alphabetical_z">Alphabetical (Z to A)</string>
+    <string name="select_library">Select Library</string>
+    <string name="open_with">Open with</string>
+    <string name="empty_library_no_accounts_message">Looks like your library is empty :(\nLogin to a library account or add shows to your local library</string>
+    <string name="empty_library_logged_in_message">Looks like this list is empty, try switching to another one</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b14cd189..2540bf34 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -90,11 +90,13 @@
         <item name="android:fontFamily">@font/google_sans</item>
         <item name="chipMinTouchTargetSize">0dp</item>
     </style>
+
     <style name="ChipFilledSemiTransparent" parent="@style/ChipFilled">
         <item name="chipBackgroundColor">@color/transparent</item>
         <item name="chipSurfaceColor">@color/semiWhite</item>
         <item name="backgroundColor">@color/transparent</item>
     </style>
+
     <style name="ChipParent">
         <item name="chipSpacingVertical">5dp</item>
         <item name="chipSpacingHorizontal">5dp</item>
@@ -123,6 +125,14 @@
         <item name="android:textColor">@color/subColorText</item>
     </style>
 
+    <style name="RatingButton" parent="@style/SearchBox">
+        <item name="android:minWidth">30dp</item>
+        <item name="android:background">@drawable/rating_bg_color</item>
+        <item name="drawableTint">@color/ratingColor</item>
+        <item name="android:textColor">@color/ratingColor</item>
+        <item name="drawableStartCompat">@drawable/ic_baseline_star_24</item>
+    </style>
+
     <style name="TypeButton" parent="@style/SearchBox">
         <item name="android:background">@drawable/type_bg_color</item>
         <item name="android:text">@string/quality_hd</item>
@@ -375,6 +385,11 @@
         <item name="textAllCaps">false</item>
     </style>
 
+    <style name="TabNoCaps" parent="TextAppearance.Design.Tab">
+        <item name="textAllCaps">false</item>
+        <item name="fontFamily">@font/google_sans</item>
+    </style>
+
     <style name="AppTextViewStyle" parent="android:Widget.TextView">
         <item name="android:fontFamily">@font/google_sans</item>
     </style>

From 2771dcb6124726ade7aec8a9e46655f5ff6987f9 Mon Sep 17 00:00:00 2001
From: LagradOst <46196380+Blatzar@users.noreply.github.com>
Date: Sat, 28 Jan 2023 22:38:55 +0000
Subject: [PATCH 200/273] update version code

---
 app/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 808c0cc3..93e386b6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -47,8 +47,8 @@ android {
         minSdk = 21
         targetSdk = 33
 
-        versionCode = 56
-        versionName = "3.5.0"
+        versionCode = 57
+        versionName = "4.0.0"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
 
@@ -253,4 +253,4 @@ tasks.withType<DokkaTask>().configureEach {
             }
         }
     }
-}
\ No newline at end of file
+}

From 9905618a47d9f3d47abe5a4f627fce0733e1f072 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sun, 29 Jan 2023 16:15:28 +0100
Subject: [PATCH 201/273] Added safe mode file as a last resort

---
 .../lagradost/cloudstream3/MainActivity.kt    |  9 +++++++--
 .../cloudstream3/plugins/PluginManager.kt     | 19 +++++++++++++++++--
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 5720b7a7..eddec15e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -347,7 +347,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             }
     }
 
-    var lastPopup : SearchResponse? = null
+    var lastPopup: SearchResponse? = null
     fun loadPopup(result: SearchResponse) {
         lastPopup = result
         viewModel.load(
@@ -716,7 +716,12 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
         changeStatusBarState(isEmulatorSettings())
 
-        if (lastError == null) {
+
+        if (PluginManager.checkSafeModeFile()) {
+            normalSafeApiCall {
+                showToast(this, R.string.safe_mode_file, Toast.LENGTH_LONG)
+            }
+        } else if (lastError == null) {
             ioSafe {
                 getKey<String>(USER_SELECTED_HOMEPAGE_API)?.let { homeApi ->
                     mainPluginsLoadedEvent.invoke(loadSinglePlugin(this@MainActivity, homeApi))
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index 54fe5d75..28dfc092 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -144,8 +144,10 @@ object PluginManager {
         return getKey(PLUGINS_KEY_LOCAL) ?: emptyArray()
     }
 
-    private val LOCAL_PLUGINS_PATH =
-        Environment.getExternalStorageDirectory().absolutePath + "/Cloudstream3/plugins"
+    private val CLOUD_STREAM_FOLDER =
+        Environment.getExternalStorageDirectory().absolutePath + "/Cloudstream3/"
+
+    private val LOCAL_PLUGINS_PATH = CLOUD_STREAM_FOLDER + "plugins"
 
     public var currentlyLoading: String? = null
 
@@ -421,6 +423,19 @@ object PluginManager {
         afterPluginsLoadedEvent.invoke(forceReload)
     }
 
+    /**
+     * This can be used to override any extension loading to fix crashes!
+     * @return true if safe mode file is present
+     **/
+    fun checkSafeModeFile(): Boolean {
+        val folder = File(CLOUD_STREAM_FOLDER)
+        if (!folder.exists()) return false
+        val files = folder.listFiles { _, name ->
+            name.equals("safe", ignoreCase = true)
+        }
+        return files?.any() ?: false
+    }
+
     /**
      * @return True if successful, false if not
      * */
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cee6bccc..a4375ce3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -630,4 +630,5 @@
     <string name="open_with">Open with</string>
     <string name="empty_library_no_accounts_message">Looks like your library is empty :(\nLogin to a library account or add shows to your local library</string>
     <string name="empty_library_logged_in_message">Looks like this list is empty, try switching to another one</string>
+    <string name="safe_mode_file">Safe mode file found!\nNot loading any extensions on startup until file is removed.</string>
 </resources>

From fd2648df459e4cdc0089ea5119de6da349d211c5 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sun, 29 Jan 2023 16:31:16 +0100
Subject: [PATCH 202/273] made the checkSafeModeFile() crash-proof

---
 .../cloudstream3/plugins/PluginManager.kt          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index 28dfc092..3533d6a8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -428,12 +428,14 @@ object PluginManager {
      * @return true if safe mode file is present
      **/
     fun checkSafeModeFile(): Boolean {
-        val folder = File(CLOUD_STREAM_FOLDER)
-        if (!folder.exists()) return false
-        val files = folder.listFiles { _, name ->
-            name.equals("safe", ignoreCase = true)
-        }
-        return files?.any() ?: false
+        return normalSafeApiCall {
+            val folder = File(CLOUD_STREAM_FOLDER)
+            if (!folder.exists()) return@normalSafeApiCall false
+            val files = folder.listFiles { _, name ->
+                name.equals("safe", ignoreCase = true)
+            }
+            files?.any()
+        } ?: false
     }
 
     /**

From 6e9b1cb855fa298f0df3c8b015a4cd8583821ddc Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sun, 29 Jan 2023 23:51:25 +0100
Subject: [PATCH 203/273] Made source dialog fullscreen and added some
 Extractors

---
 .../cloudstream3/extractors/Filesim.kt        | 41 ++++++++++++++-----
 .../cloudstream3/extractors/GuardareStream.kt |  5 +++
 .../cloudstream3/ui/player/GeneratorPlayer.kt | 10 ++---
 .../cloudstream3/utils/ExtractorApi.kt        |  2 +
 .../layout/player_select_source_and_subs.xml  |  2 +
 5 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
index 8e3dc730..bc910a7e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
@@ -1,32 +1,51 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import java.net.URI
+
+class FileMoon : Filesim() {
+    override val mainUrl = "https://filemoon.to"
+    override val name = "FileMoon"
+}
 
 open class Filesim : ExtractorApi() {
     override val name = "Filesim"
     override val mainUrl = "https://files.im"
     override val requiresReferer = false
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val sources = mutableListOf<ExtractorLink>()
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         with(app.get(url).document) {
-            this.select("script").map { script ->
+            this.select("script").forEach { script ->
                 if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
-                    val data = getAndUnpack(script.data()).substringAfter("sources:[").substringBefore("]")
-                    tryParseJson<List<ResponseSource>>("[$data]")?.map {
-                        M3u8Helper.generateM3u8(
-                            name,
-                            it.file,
-                            "$mainUrl/",
-                        ).forEach { m3uData -> sources.add(m3uData) }
+                    val data = getAndUnpack(script.data())
+                    val foundData = Regex("""sources:\[(.*?)]""").find(data)?.groupValues?.get(1) ?: return@forEach
+                    val fixedData = foundData.replace("file:", """"file":""")
+
+                    parseJson<List<ResponseSource>>("[$fixedData]").forEach {
+                        callback.invoke(
+                            ExtractorLink(
+                                name,
+                                name,
+                                it.file,
+                                "$mainUrl/",
+                                Qualities.Unknown.value,
+                                URI(it.file).path.endsWith(".m3u8")
+                            )
+                        )
                     }
                 }
             }
         }
-        return sources
     }
 
     private data class ResponseSource(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/GuardareStream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/GuardareStream.kt
index f25cb5ba..2adc00d5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/GuardareStream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/GuardareStream.kt
@@ -6,6 +6,11 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 
+class Vanfem : GuardareStream() {
+    override var name = "Vanfem"
+    override var mainUrl = "https://vanfem.com/"
+}
+
 class CineGrabber : GuardareStream() {
     override var name = "CineGrabber"
     override var mainUrl = "https://cinegrabber.com"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index e15dcee6..67f58195 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -11,9 +11,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo
 import android.widget.*
-import android.widget.TextView.OnEditorActionListener
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.animation.addListener
@@ -528,7 +526,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         }
 
-    var selectSourceDialog: AlertDialog? = null
+    var selectSourceDialog: Dialog? = null
 //    var selectTracksDialog: AlertDialog? = null
 
     override fun showMirrorsDialogue() {
@@ -540,10 +538,8 @@ class GeneratorPlayer : FullScreenPlayer() {
                 player.handleEvent(CSPlayerEvent.Pause)
                 val currentSubtitles = sortSubs(currentSubs)
 
-                val sourceBuilder = AlertDialog.Builder(ctx, R.style.AlertDialogCustomBlack)
-                    .setView(R.layout.player_select_source_and_subs)
-
-                val sourceDialog = sourceBuilder.create()
+                val sourceDialog = Dialog(ctx, R.style.AlertDialogCustomBlack)
+                sourceDialog.setContentView(R.layout.player_select_source_and_subs)
 
                 selectSourceDialog = sourceDialog
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index bd4f8705..1ad3639b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -291,6 +291,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Supervideo(),
     GuardareStream(),
     CineGrabber(),
+    Vanfem(),
 
     // StreamSB.kt works
     //  SBPlay(),
@@ -321,6 +322,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     DesuDrive(),
 
     Filesim(),
+    FileMoon(),
     Linkbox(),
     Acefile(),
     SpeedoStream(),
diff --git a/app/src/main/res/layout/player_select_source_and_subs.xml b/app/src/main/res/layout/player_select_source_and_subs.xml
index 369f6776..067e4ad5 100644
--- a/app/src/main/res/layout/player_select_source_and_subs.xml
+++ b/app/src/main/res/layout/player_select_source_and_subs.xml
@@ -44,6 +44,7 @@
                 android:nextFocusLeft="@id/sort_subtitles"
                 android:nextFocusRight="@id/apply_btt"
                 android:requiresFadingEdge="vertical"
+                tools:layout_height="100dp"
                 tools:listitem="@layout/sort_bottom_single_choice" />
         </LinearLayout>
 
@@ -117,6 +118,7 @@
                 android:nextFocusLeft="@id/sort_providers"
                 android:nextFocusRight="@id/cancel_btt"
                 android:requiresFadingEdge="vertical"
+                tools:layout_height="200dp"
                 tools:listfooter="@layout/sort_bottom_footer_add_choice"
                 tools:listitem="@layout/sort_bottom_single_choice" />
         </LinearLayout>

From c7c5fa250e177dbf22a9ea463c721c63f3feb79a Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Tue, 31 Jan 2023 09:12:25 +0100
Subject: [PATCH 204/273] Translated using Weblate (Polish)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 96.5% (562 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 91.4% (532 of 582 strings)

Translated using Weblate (Greek)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 90.3% (526 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 90.3% (526 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 88.3% (514 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 87.9% (512 of 582 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (German)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (581 of 581 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (581 of 581 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (581 of 581 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (581 of 581 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (581 of 581 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (581 of 581 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (581 of 581 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (581 of 581 strings)

Co-authored-by: Aitor Salaberria <trslbrr@gmail.com>
Co-authored-by: Alex Georgiou <alexandrosgeorgiou35@gmail.com>
Co-authored-by: Cliff Heraldo <cliffkbrt11@gmail.com>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: JL Pilgram <twich_89@hotmail.it>
Co-authored-by: Julian <hello@apollo.moe>
Co-authored-by: NickSkier <nikita.vasiliev.02@gmail.com>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Sdarfeesh <Sdarfeesh@protonmail.com>
Co-authored-by: Skrripy <rozihrash.ya6w7@simplelogin.com>
Co-authored-by: Translator-3000 <weblate.m1d0h@8shield.net>
Co-authored-by: eightyy8 <oliver.kha@pm.me>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: gnu-ewm <gnu.ewm@protonmail.com>
Co-authored-by: kaajjo <claymanoff@gmail.com>
Co-authored-by: tuan041 <tuananh163025ttt@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/el/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml |  17 ++++
 app/src/main/res/values-de/strings.xml |  17 ++++
 app/src/main/res/values-el/strings.xml |  20 ++++-
 app/src/main/res/values-es/strings.xml |  17 ++++
 app/src/main/res/values-in/strings.xml |  21 ++++-
 app/src/main/res/values-it/strings.xml |  17 ++++
 app/src/main/res/values-pl/strings.xml |  17 ++++
 app/src/main/res/values-ru/strings.xml | 107 ++++++++++++++++++++-----
 app/src/main/res/values-uk/strings.xml |  15 ++++
 app/src/main/res/values-vi/strings.xml |  53 ++++++++----
 app/src/main/res/values-zh/strings.xml |  17 ++++
 11 files changed, 278 insertions(+), 40 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 3a0c97e7..f318478e 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -521,4 +521,21 @@
     <string name="update_started">بدأ التحديث</string>
     <string name="plugin_downloaded">تم تنزيل الإضافة</string>
     <string name="action_remove_from_watched">إزالة من المشاهدة</string>
+    <string name="sort_alphabetical_a">الترتيب الأبجدي (من الألف إلى الياء)</string>
+    <string name="select_library">اختر المكتبة</string>
+    <string name="browser">المتصفح</string>
+    <string name="sort_updated_new">محدث (من الأحدث إلى الأقدم)</string>
+    <string name="empty_library_logged_in_message">يبدو أن هذه القائمة فارغة ، حاول التبديل إلى قائمة أخرى</string>
+    <string name="sort_rating_desc">التقييم (من الأعلى إلى الأدنى)</string>
+    <string name="sort_rating_asc">التقييم (من الأدنى إلى الأعلى)</string>
+    <string name="sort_alphabetical_z">الترتيب الأبجدي (من ي إلى أ)</string>
+    <string name="empty_library_no_accounts_message">يبدو أن مكتبتك فارغة :(
+\nتسجيل الدخول إلى حساب مكتبة أو إضافة عروض إلى مكتبتك المحلية</string>
+    <string name="sort_updated_old">محدث (من القديم إلى الجديد)</string>
+    <string name="sort_by">فرز حسب</string>
+    <string name="sort">افرز</string>
+    <string name="open_with">فتح بواسطة</string>
+    <string name="library">المكتبة</string>
+    <string name="safe_mode_file">تم العثور على ملف الوضع الآمن!
+\nلا يتم تحميل أي ملحقات عند بدء التشغيل حتى تتم إزالة الملف.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 00aa5b97..63ed5444 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -489,4 +489,21 @@
     <string name="delayed_update_notice">Die Anwendung wird beim Beenden aktualisiert</string>
     <string name="plugin_downloaded">Das Plugin wurde heruntergeladen</string>
     <string name="action_remove_from_watched">Von geschaut entfernen</string>
+    <string name="library">Bibliothek</string>
+    <string name="browser">Browser</string>
+    <string name="sort_by">Sortieren nach</string>
+    <string name="sort">Sortieren</string>
+    <string name="sort_rating_desc">Bewertung (gut bis schlecht)</string>
+    <string name="sort_rating_asc">Bewertung (schlecht bis gut)</string>
+    <string name="sort_updated_new">Aktualisiert (neu bis alt)</string>
+    <string name="sort_updated_old">Aktualisiert (alt bis neu)</string>
+    <string name="sort_alphabetical_a">Alphabetisch (A bis Z)</string>
+    <string name="sort_alphabetical_z">Alphabetisch (Z bis A)</string>
+    <string name="select_library">Bibliothek auswählen</string>
+    <string name="open_with">Öffnen mit</string>
+    <string name="empty_library_no_accounts_message">Sieht aus, als wäre deine Bibliothek leer :(
+\nMelde dich mit einem Bibliothekskonto an oder füge Titel zu deiner lokalen Bibliothek hinzu</string>
+    <string name="empty_library_logged_in_message">Diese Liste scheint leer zu sein. Versuche, zu einer anderen Liste zu wechseln.</string>
+    <string name="safe_mode_file">Datei für abgesicherten Modus gefunden!
+\nBeim Start werden keine Erweiterungen geladen, bis die Datei entfernt wird.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index dc7088cc..0d0b7fb2 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -314,7 +314,7 @@
     <string name="crash_reporting_title">Αναφορά κατάρρευσης</string>
     <string name="preferred_media_subtext">Τι θα θέλατε να δείτε</string>
     <string name="setup_done">Έγινε</string>
-    <string name="extensions">Πρόσθετα</string>
+    <string name="extensions">Extensions</string>
     <string name="add_repository">Προσθήκη αποθετηρίου</string>
     <string name="repository_name_hint">Όνομα αποθετηρίου</string>
     <string name="repository_url_hint">Σύνδεσμος αποθετηρίου</string>
@@ -490,4 +490,22 @@
     <string name="plugin_downloaded">Το πρόσθετο κατέβει</string>
     <string name="update_started">Ενημέρωση ξεκίνησε</string>
     <string name="delayed_update_notice">Η εφαρμογή θα ενημερωθεί κατά την έξοδο</string>
+    <string name="sort_alphabetical_z">Αλφαβητικά (Ω προς Α)</string>
+    <string name="sort">Ταξινόμηση</string>
+    <string name="sort_rating_asc">Κριτική (Χαμηλή προς Υψηλή)</string>
+    <string name="sort_updated_new">Ενημερωμένο (Καινούριο προς παλιό)</string>
+    <string name="sort_updated_old">Ενημερωμένο (Παλιό προς Καινούργιο)</string>
+    <string name="library">Βιβλιοθήκη</string>
+    <string name="sort_rating_desc">Κριτική (Υψηλή προς χαμηλή)</string>
+    <string name="sort_by">Ταξινόμηση με βάση</string>
+    <string name="sort_alphabetical_a">Αλφαβητικά (Α προς Ω)</string>
+    <string name="select_library">Διάλεξε βιβλιοθήκη</string>
+    <string name="empty_library_logged_in_message">Φαίνεται πως η λίστα είναι άδεια, δοκίμασε να μεταβείς σε μία άλλη</string>
+    <string name="action_remove_from_watched">Αφαίρεση από παρακολουθημένα</string>
+    <string name="browser">Περιηγητής</string>
+    <string name="open_with">Άνοιγμα με</string>
+    <string name="empty_library_no_accounts_message">Φαίνεται πως η βιβλιοθήκη σου είναι άδεια :(
+\nΣυνδέσου σε έναν λογαριασμό που έχει βιβλιοθήκη, ή πρόσθεσε σειρές στην τοπική βιβλιοθήκη σου</string>
+    <string name="safe_mode_file">Βρέθηκε αρχείο Ασφαλούς Λειτουργίας!
+\nΔεν πρόκειται να φορτωθούν extensions κατά το ξεκίνημα μέχρι να διαγραφεί το αρχείο.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 08ae5bf1..37e5c431 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -489,4 +489,21 @@
     <string name="update_started">Actualización iniciada</string>
     <string name="plugin_downloaded">Complemento descargado</string>
     <string name="action_remove_from_watched">Quitar de visto</string>
+    <string name="sort_by">Ordenar por</string>
+    <string name="sort">Ordenar</string>
+    <string name="sort_rating_desc">Valoración (más a menos)</string>
+    <string name="sort_rating_asc">Valoración (menos a más)</string>
+    <string name="sort_updated_new">Actualizado (nuevo a viejo)</string>
+    <string name="sort_updated_old">Actualizado (viejo a nuevo)</string>
+    <string name="sort_alphabetical_a">Alfabéticamente (A a Z)</string>
+    <string name="browser">Navegador</string>
+    <string name="library">Biblioteca</string>
+    <string name="empty_library_logged_in_message">Parece que esta lista está vacía, intenta cambiar a otra</string>
+    <string name="sort_alphabetical_z">Alfabéticamente (Z a A)</string>
+    <string name="select_library">Seleccionar biblioteca</string>
+    <string name="open_with">Abrir con</string>
+    <string name="empty_library_no_accounts_message">Parece que tu biblioteca está vacía :(
+\nInicia sesión en una cuenta de biblioteca o añade series desde tu biblioteca local</string>
+    <string name="safe_mode_file">¡Se encontró un archivo en modo seguro!
+\nNo cargar ninguna extensión al inicio hasta que se elimine el archivo.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 83dc6ee9..96c5950b 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -453,7 +453,7 @@
     <string name="safe_mode_description">Semua fitur tambahkan dimatikan karena crash, untuk memudahkanmu mencari penyebab crash.</string>
     <string name="example_lang_name">Kode bahasa (en)</string>
     <string name="player_load_subtitles_online">Ambil dari internet</string>
-    <string name="provider_languages_tip">Putar vidio di bahasa ini</string>
+    <string name="provider_languages_tip">Putar video di bahasa ini</string>
     <string name="add_repository">Tambah Repositori</string>
     <string name="delete_repository_plugins">Pilih ini untuk menghapus semua repositori plugin</string>
     <string name="skip_setup">Lewati pengaturan</string>
@@ -483,7 +483,7 @@
     <string name="pref_category_gestures">Gerakan</string>
     <string name="apk_installer_settings_des">Beberapa perangkat tidak mendukung penginstal paket mode baru. Coba mode lama jika pembaruan tidak dapat diinstal.</string>
     <string name="pref_category_actions">Aksi</string>
-    <string name="referer">Referensi</string>
+    <string name="referer">Referer</string>
     <string name="yes">Ya</string>
     <string name="extension_install_first">Pasang dulu fitur tambahan</string>
     <string name="all_languages_preference">Semua Bahasa</string>
@@ -512,4 +512,21 @@
     <string name="delayed_update_notice">Aplikasi akan diperbaharui pada saat keluar</string>
     <string name="update_started">Pembaharuan Dimulai</string>
     <string name="action_remove_from_watched">Hapus dari tontonan</string>
+    <string name="browser">Browser</string>
+    <string name="select_library">Pilih pustaka</string>
+    <string name="empty_library_no_accounts_message">Yahh daftar pustaka kamu kosong :(
+\nMasuk ke akun pustaka atau tambah perlihatkan ke lokal pustaka kamu</string>
+    <string name="library">Pustaka</string>
+    <string name="sort_by">Urutkan berdasar</string>
+    <string name="sort">Urutkan</string>
+    <string name="sort_rating_asc">Peringkat (Rendah ke Tinggi)</string>
+    <string name="sort_updated_old">Update (Lama ke Terbaru)</string>
+    <string name="sort_rating_desc">Peringkat (Tinggi ke Rendah)</string>
+    <string name="sort_updated_new">Update (Terbaru ke Lama)</string>
+    <string name="sort_alphabetical_a">Abjad (A ke Z)</string>
+    <string name="sort_alphabetical_z">Abjad (Z ke A)</string>
+    <string name="open_with">Buka dengan</string>
+    <string name="empty_library_logged_in_message">Yahh daftar ini kosong, coba ganti ke yang lain</string>
+    <string name="safe_mode_file">Mode aman file ditemukan!
+\nTidak memuat ekstensi pada startup sampai berkas dihapus.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b4ba292e..419818a2 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -511,4 +511,21 @@
     <string name="update_started">Aggiornamento avviato</string>
     <string name="plugin_downloaded">Plugin scaricato</string>
     <string name="action_remove_from_watched">Rimuovi dai già visti</string>
+    <string name="browser">Browser</string>
+    <string name="sort_by">Ordina per</string>
+    <string name="sort_rating_desc">Punteggio (Decrescente)</string>
+    <string name="sort_rating_asc">Punteggio (Crescente)</string>
+    <string name="sort_updated_new">Aggiornato (Da nuovo a vecchio)</string>
+    <string name="sort_updated_old">Aggiornato (Da vecchio a nuovo)</string>
+    <string name="sort_alphabetical_a">Alfabetico (A - Z)</string>
+    <string name="sort_alphabetical_z">Alfabetico (Z - A)</string>
+    <string name="empty_library_no_accounts_message">Sembra che la tua libreria sia vuota :(
+\nAccedi a un account di libreria o aggiungi degli show alla tua libreria locale</string>
+    <string name="select_library">Seleziona libreria</string>
+    <string name="open_with">Apri con</string>
+    <string name="library">Libreria</string>
+    <string name="sort">Ordina</string>
+    <string name="empty_library_logged_in_message">Sembra che questa lista sia vuota, prova a passare a un\'altra</string>
+    <string name="safe_mode_file">File \"safe mode\" trovato!
+\nAll\'avvio non sarà caricata alcuna estensione finchè il file non verrà rimosso.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 244ae2e1..e4b74300 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -492,4 +492,21 @@
     <string name="update_started">Rozpoczęto aktualizację</string>
     <string name="plugin_downloaded">Pobrano rozszerzenie</string>
     <string name="action_remove_from_watched">Usuń z obejrzanych</string>
+    <string name="browser">Przeglądarka</string>
+    <string name="sort_updated_new">Data aktualizacji (od nowego do starego)</string>
+    <string name="sort_by">Sortuj według</string>
+    <string name="sort">Sortuj</string>
+    <string name="open_with">Otwórz za pomocą</string>
+    <string name="sort_rating_desc">Ocena (od najwyższej do najniższej)</string>
+    <string name="sort_rating_asc">Ocena (od najniższej do najwyższej)</string>
+    <string name="sort_updated_old">Data aktualizacji (od starego do nowego)</string>
+    <string name="sort_alphabetical_a">Alfabetycznie (od A do Z)</string>
+    <string name="sort_alphabetical_z">Alfabetycznie (od Z do A)</string>
+    <string name="select_library">Wybierz bibliotekę</string>
+    <string name="library">Biblioteka</string>
+    <string name="empty_library_no_accounts_message">Wygląda na to, że twoja biblioteka jest pusta :(
+\nZaloguj się na swoje konto lub dodaj programy do swojej lokalnej biblioteki</string>
+    <string name="empty_library_logged_in_message">Wygląda na to, że ta lista jest pusta, spróbuj przełączyć się na inną</string>
+    <string name="safe_mode_file">Znaleziono plik trybu bezpiecznego.
+\nRozszerzenia nie zostaną wczytane, dopóki plik nie zostanie usunięty.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 39e74794..537bdb7d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -25,12 +25,12 @@
     <string name="next_episode_format" formatted="true">Серия %d будет выпущен в</string>
     <string name="result_poster_img_des">Плакат</string>
     <string name="search_poster_img_des">\@нить/результат_плокат_картинка_</string>
-    <string name="episode_poster_img_des">Серия плакат</string>
-    <string name="home_main_poster_img_des">Главный плакат</string>
+    <string name="episode_poster_img_des">Постер Эпизода</string>
+    <string name="home_main_poster_img_des">Главный постер</string>
     <string name="home_next_random_img_des">Следующий случайный</string>
     <string name="go_back_img_des">Вернуться</string>
     <string name="home_change_provider_img_des">Изменить поставщика</string>
-    <string name="preview_background_img_des">Фон предпросмотр</string>
+    <string name="preview_background_img_des">Предпросмотр фона</string>
     <string name="player_speed_text_format" formatted="true">Скорость (%.2fx)</string>
     <string name="rated_format" formatted="true">Оценили: %.1f</string>
     <string name="new_update_format" formatted="true">Новое обновление найдено!
@@ -48,31 +48,31 @@
     <string name="search_hint_site" formatted="true">Поиск %s…</string>
     <string name="no_data">Нет данных</string>
     <string name="episode_more_options_des">Дополнительные опции</string>
-    <string name="next_episode">Следующий серия</string>
+    <string name="next_episode">Следующий эпизод</string>
     <string name="result_tags">Жанры</string>
     <string name="result_share">Поделиться</string>
-    <string name="result_open_in_browser">Открыть в браузер</string>
+    <string name="result_open_in_browser">Открыть в браузере</string>
     <string name="skip_loading">Пропустить загрузку</string>
     <string name="type_watching">Просмотр</string>
     <string name="type_on_hold">Приостановленно</string>
     <string name="type_completed">Завершено</string>
     <string name="type_dropped">Брошенный</string>
-    <string name="type_plan_to_watch">План по смотреть</string>
+    <string name="type_plan_to_watch">План посмотреть</string>
     <string name="type_none">Никто</string>
     <string name="type_re_watching">Пересмотрю</string>
     <string name="play_movie_button">Смотреть фильм</string>
-    <string name="play_trailer_button">Проиграть трейлер</string>
+    <string name="play_trailer_button">Воспроизвести трейлер</string>
     <string name="play_livestream_button">Воспроизвести Livestream</string>
     <string name="pick_source">Источники</string>
     <string name="pick_subtitle">Субтитры</string>
-    <string name="play_episode">Проиграть серия</string>
+    <string name="play_episode">Воспроизвести эпизод</string>
     <string name="reload_error">Повторная попытка подключение…</string>
     <string name="go_back">Вернуться</string>
-    <string name="downloaded">Скачали</string>
+    <string name="downloaded">Скачано</string>
     <string name="downloading">Скачивание</string>
     <string name="download_paused">Скачать приостановленный</string>
     <string name="download_started">Скачать начатый</string>
-    <string name="download_canceled">Скачать отменено</string>
+    <string name="download_canceled">Скачать отменённый</string>
     <string name="download_done">Скачать выполнено</string>
     <string name="home_info">Инфо</string>
     <string name="update_started">Обновление началось</string>
@@ -116,8 +116,8 @@
     <string name="popup_delete_file">Удалить файл</string>
     <string name="popup_play_file">Проиграть файл</string>
     <string name="download_storage_text">Внутренняя память</string>
-    <string name="popup_resume_download">Скачать резюме</string>
-    <string name="popup_pause_download">Приостановить скачать</string>
+    <string name="popup_resume_download">Продолжить Скачать</string>
+    <string name="popup_pause_download">Приостановить скачивание</string>
     <string name="pref_disable_acra">Отключить автоматическое информирование об ошибках</string>
     <string name="subs_import_text" formatted="true">Импортируйте шрифты поместив их в %s</string>
     <string name="continue_watching">Продолжить смотреть</string>
@@ -174,7 +174,7 @@
     <string name="episode_short">Э</string>
     <string name="no_episodes_found">Эпизоды не найдены</string>
     <string name="delete_file">Удалить файл</string>
-    <string name="resume">Возобновить</string>
+    <string name="resume">Продолжить</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">Это будет удалено безвозвратно%s
@@ -193,7 +193,7 @@
     <string name="others">Другое</string>
     <string name="storage_error">Ошибка загрузки, проверьте разрешения хранилища</string>
     <string name="episode_action_copy_link">Копировать ссылку</string>
-    <string name="episode_action_auto_download">Автоматическая загрузка</string>
+    <string name="episode_action_auto_download">Автоскачивание</string>
     <string name="episode_action_download_mirror">Загрузка. Зеркало</string>
     <string name="season">Сезон</string>
     <string name="anim">Аниме приложение от тех же разработчиков</string>
@@ -217,7 +217,7 @@
     <string name="torrent_singular">Торрент</string>
     <string name="documentaries_singular">Документальный</string>
     <string name="asian_drama_singular">Азиатская драма</string>
-    <string name="category_general">Общий</string>
+    <string name="category_general">Основные</string>
     <string name="category_providers">Провайдеры</string>
     <string name="category_ui">Макет</string>
     <string name="pref_category_extensions">Расширения</string>
@@ -240,7 +240,7 @@
     <string name="no_update_found">Обновление не найдено</string>
     <string name="video_aspect_ratio_resize">Изменить размер</string>
     <string name="video_source">Источник</string>
-    <string name="check_for_update">Проверьте наличие обновления</string>
+    <string name="check_for_update">Проверить обновления</string>
     <string name="add_site_pref">Клон сайта</string>
     <string name="dns_pref">DNS через HTTPS</string>
     <string name="remove_site_pref">Удалить сайт</string>
@@ -248,7 +248,7 @@
     <string name="subtitle_offset">Синхронизация субтитров</string>
     <string name="add_site_summary">Добавить клон существующего сайта с другим URL-адресом</string>
     <string name="dns_pref_summary">Используется для обхода блокировок интернет провайдера</string>
-    <string name="download_path_pref">Путь загрузки</string>
+    <string name="download_path_pref">Путь скачивания</string>
     <string name="benene_des">учитывая бенен</string>
     <string name="update">Обновить</string>
     <string name="primary_color_settings">Основной цвет</string>
@@ -304,7 +304,7 @@
     <string name="skip_update">Пропустить это обновление</string>
     <string name="nginx_url_pref">URL-адрес NGINX-сервера</string>
     <string name="create_account">Создать учётную запись</string>
-    <string name="add_sync">Добавить трекинг</string>
+    <string name="add_sync">Добавить слежение</string>
     <string name="added_sync_format" formatted="true">Добавлено %s</string>
     <string name="upload_sync">Синхронизировать</string>
     <string name="sync_score">Оценено</string>
@@ -393,7 +393,7 @@
     <string name="plugins_disabled" formatted="true">Отключено: %d</string>
     <string name="login_format" formatted="true">%s %s</string>
     <string name="authenticated_user" formatted="true">%s аутентифицировано</string>
-    <string name="authenticated_user_fail" formatted="true">Не удалось перейти к %s</string>
+    <string name="authenticated_user_fail" formatted="true">Не удается логин на %s</string>
     <string name="max">Макс</string>
     <string name="min">Минимум</string>
     <string name="subtitles_outline">Очертание</string>
@@ -416,20 +416,83 @@
     <string name="actor_main">Главное</string>
     <string name="home_source">Источник</string>
     <string name="home_random">Случайный</string>
-    <string name="coming_soon">Скоро будет…</string>
+    <string name="coming_soon">Скоро…</string>
     <string name="show_sub">Этикетка Sub</string>
     <string name="actor_background">Фон</string>
-    <string name="pref_category_looks">Вид</string>
+    <string name="pref_category_looks">Oтoбpaжeниe</string>
     <string name="trailer">Трейлер</string>
     <string name="single_plugin_disabled" formatted="true">%s (отключено)</string>
     <string name="next">Следующий</string>
     <string name="blank_repo_message">В CloudStream по умолчанию не установлены сайты. Вам необходимо установить сайты из репозиториев.
 \n
-\nИз-за безмозглой DMCA-атаки со стороны Sky UK Limited 🤮 мы не можем связать сайт репозитория в приложении.
+\nИз-за безмозглой DMCA-атаки со стороны Sky UK Limited 🤮 мы не можем привязать сайт репозитория в приложении.
 \n
 \nПрисоединяйтесь к нашему Discord или ищите в интернете.</string>
     <string name="error_invalid_data">Недопустимые данные</string>
     <string name="resolution_and_title">Разрешение и название</string>
     <string name="previous">Предыдущий</string>
     <string name="resolution">Разрешение</string>
+    <string name="browser">Браузер</string>
+    <string name="library">Библиотека</string>
+    <string name="sort_updated_old">Обновленный (старый - новый)</string>
+    <string name="sort_alphabetical_a">Алфавитный (А - Я)</string>
+    <string name="sort_alphabetical_z">Алфавитный (Я - А)</string>
+    <string name="select_library">Выбрать библиотеку</string>
+    <string name="open_with">Открыть с</string>
+    <string name="empty_library_no_accounts_message">Похоже, ваша библиотека пуста :(
+\nВойдите в аккаунт с библиотекой или добавьте сериалы в локальную библиотеку</string>
+    <string name="sort">Сортировка</string>
+    <string name="view_public_repositories_button_short">Открытый список</string>
+    <string name="sort_rating_desc">Рейтинг (высокий - низкий)</string>
+    <string name="sort_rating_asc">Рейтинг (низкий - высокий)</string>
+    <string name="sort_updated_new">Обновленный (новый - старый)</string>
+    <string name="sort_by">Сортировать по</string>
+    <string name="apk_installer_package_installer">PackageInstaller</string>
+    <string name="subtitles_encoding">Кодировка субтитров</string>
+    <string name="player_load_subtitles">Загрузить из файла</string>
+    <string name="extension_rating" formatted="true">Рейтинг: %s</string>
+    <string name="batch_download_finish_format" formatted="true">Скачано %d %s</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Все %s уже скачаны</string>
+    <string name="batch_download_start_format" formatted="true">Начата загрузка %d %s…</string>
+    <string name="plugins_not_downloaded" formatted="true">Не скачано: %d</string>
+    <string name="download_all_plugins_from_repo">Скачать все плагины из этого репозитория\?</string>
+    <string name="safe_mode_title">Включен безопасный режим</string>
+    <string name="plugins_downloaded" formatted="true">Скачано: %d</string>
+    <string name="plugins_updated" formatted="true">Обновлено %d плагинов</string>
+    <string name="player_load_subtitles_online">Загрузить из интернета</string>
+    <string name="update_notification_downloading">Загрузка обновления приложения…</string>
+    <string name="error_invalid_url">Недопустимый URL</string>
+    <string name="apply_on_restart">Применить при перезапуске</string>
+    <string name="crash_reporting_title">Отчеты ошибках</string>
+    <string name="preferred_media_subtext">Что вы хотите увидеть</string>
+    <string name="provider_languages_tip">Смотрите видео на этих языках</string>
+    <string name="downloaded_file">Скачано файл</string>
+    <string name="poster_image">Изображение постера</string>
+    <string name="batch_download">Пакетная загрузка</string>
+    <string name="setup_extensions_subtext">Скачайте список сайтов, который вы хотите использовать</string>
+    <string name="display_subbed_dubbed_settings">Отображать Аниме с Дубляжом/Субтитрами</string>
+    <string name="enable_nsfw_on_providers">Включить NSFW на поддерживаемых провайдерах</string>
+    <string name="subtitles_remove_captions">Убрать скрытые субтитры из субтитров</string>
+    <string name="extras">Дополнительно</string>
+    <string name="app_layout_subtext">Изменить вид интерфейса, чтобы соответствовать устройству</string>
+    <string name="audio_tracks">Аудио дорожки</string>
+    <string name="delete_repository_plugins">Это также удалит все плагины репозитория</string>
+    <string name="view_public_repositories_button">Просмотреть репозитории сообщества</string>
+    <string name="video_tracks">Видео дорожки</string>
+    <string name="safe_mode_description">Все расширения были отключены из-за сбоя, чтобы помочь вам найти то, которое вызывает проблемы.</string>
+    <string name="skip_type_recap">Повтор</string>
+    <string name="clipboard_too_large">Слишком много текста. Не удалось сохранить в буфер обмена.</string>
+    <string name="update_notification_installing">Установка обновления приложения…</string>
+    <string name="update_notification_failed">Не удалось установить новую версию приложения</string>
+    <string name="safe_mode_file">Файл безопасного режима найден!
+\nНе загружаются никакие расширения при запуске, пока файл не будет удален.</string>
+    <string name="delayed_update_notice">Приложение будет обновлено после выхода</string>
+    <string name="empty_library_logged_in_message">Похоже, этот список пуст, попробуйте переключиться на другой</string>
+    <string name="uppercase_all_subtitles">Все субтитры заглавными</string>
+    <string name="enable_skip_op_from_database_des">Показывать всплывающие окна для пропуска вступления/заключения</string>
+    <string name="subtitles_filter_lang">Фильтровать по предпочитаемому языку медиа</string>
+    <string name="error_invalid_id">Неверный ID</string>
+    <string name="network_adress_example">Ссылка на стрим</string>
+    <string name="random_button_settings_desc">Отображать рандомную кнопку на Главной странице</string>
+    <string name="random_button_settings">Рандомная кнопка</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 93e51c84..821d062a 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -489,4 +489,19 @@
     <string name="app_not_found_error">Програму не знайдено</string>
     <string name="skip_type_mixed_op">Змішаний опенінг</string>
     <string name="action_remove_from_watched">Видалити з переглянутого</string>
+    <string name="sort_updated_old">За оновленням (від старого до нового)</string>
+    <string name="sort_updated_new">За оновленням (від нового до старого)</string>
+    <string name="library">Бібліотека</string>
+    <string name="sort">Сортувати</string>
+    <string name="sort_rating_desc">За рейтингом (від високого до низького)</string>
+    <string name="sort_by">Сортувати за</string>
+    <string name="sort_alphabetical_a">За алфавітом (від А до Я)</string>
+    <string name="sort_rating_asc">За рейтингом (від низького до високого)</string>
+    <string name="empty_library_no_accounts_message">Схоже, ваша бібліотека порожня :(
+\nУвійдіть в обліковий запис бібліотеки або додайте серіали до вашої локальної бібліотеки</string>
+    <string name="sort_alphabetical_z">За алфавітом (від Я до А)</string>
+    <string name="select_library">Виберіть бібліотеку</string>
+    <string name="open_with">Відкрити з</string>
+    <string name="browser">Браузер</string>
+    <string name="empty_library_logged_in_message">Схоже, цей список порожній, спробуйте перейти до іншого</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 3aa5cf69..db647b5d 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -66,7 +66,7 @@
     <string name="download_done">Tải thành công</string>
     <string name="stream">Trực tiếp</string>
     <string name="error_loading_links_toast">Đã có lỗi xảy ra</string>
-    <string name="download_storage_text">Bộ nhớ máy</string>
+    <string name="download_storage_text">Bộ nhớ trong</string>
     <string name="app_dubbed_text">Lồng Tiếng</string>
     <string name="app_subbed_text">Phụ Đề</string>
     <string name="popup_delete_file">Xóa Tệp</string>
@@ -118,7 +118,7 @@
     <string name="torrent_no_plot">Không tìm thấy thông tin</string>
     <string name="show_log_cat">Hiển thị Logcat 🐈</string>
     <string name="picture_in_picture">Chế độ cửa sổ nhỏ</string>
-    <string name="picture_in_picture_des">Tiếp tục xem phim khi thoát app hoặc đang tìm kiếm</string>
+    <string name="picture_in_picture_des">Tiếp tục xem phim khi thoát ứng dụng hoặc khi tìm kiếm</string>
     <string name="player_size_settings">Bật nút thu phóng khi xem</string>
     <string name="player_size_settings_des">Xóa khoảng đen của phim</string>
     <string name="player_subtitles_settings">Phụ đề</string>
@@ -159,7 +159,7 @@
     <string name="bug_report_settings_on">Không gửi dữ liệu</string>
     <string name="show_fillers_settings">Hiển thị tập phụ cho anime</string>
     <string name="show_trailers_settings">Hiển thị trailer</string>
-    <string name="kitsu_settings">Hiển thị poster từ kitsu</string>
+    <string name="kitsu_settings">Hiển thị poster từ Kitsu</string>
     <string name="pref_filter_search_quality">Ẩn chất lượng video khi tìm kiếm</string>
     <string name="automatic_plugin_updates">Tự động cập nhật plugin</string>
     <string name="updates_settings">Hiển thị thông báo cập nhật App</string>
@@ -210,7 +210,7 @@
     <string name="no_subtitles">Không có phụ đề</string>
     <string name="default_subtitles">Mặc Định</string>
     <string name="free_storage">Còn trống</string>
-    <string name="used_storage">Đã dùng</string>
+    <string name="used_storage">Đã sử dụng</string>
     <string name="app_storage">App</string>
     <!--plural-->
     <string name="movies">Phim Lẻ</string>
@@ -228,7 +228,7 @@
     <string name="movies_singular">Phim Lẻ</string>
     <string name="tv_series_singular">Phim Bộ</string>
     <string name="cartoons_singular">Hoạt Hình</string>
-    <string name="anime_singular">\@string/anime</string>
+    <string name="anime_singular">Anime</string>
     <string name="ova_singular">\@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Phim Tài Liệu</string>
@@ -261,7 +261,7 @@
     <string name="video_lock">Khóa</string>
     <string name="video_aspect_ratio_resize">Thu Phóng</string>
     <string name="video_source">Tuỳ chọn</string>
-    <string name="video_skip_op">Tập tiếp</string>
+    <string name="video_skip_op">Tua nhanh</string>
     <string name="dont_show_again">Không hiện lại</string>
     <string name="skip_update">Bỏ qua</string>
     <string name="update">Cập nhật</string>
@@ -272,8 +272,8 @@
     <string name="video_buffer_length_settings">Thời lượng bộ nhớ đệm</string>
     <string name="video_buffer_disk_settings">Dung lượng video cache</string>
     <string name="video_buffer_clear_settings">Xoá hình ảnh và video</string>
-    <string name="video_ram_description">Sẽ gây lỗi nếu đặt quá cao. Không thay đổi nếu máy có dung lượng ram thấp, chẳng hạn như Android TV hoặc điện thoại cũ</string>
-    <string name="video_disk_description">Sẽ thể gây lỗi trên các máy có dung lượng lưu trữ thấp, chẳng hạn như thiết bị Android TV nếu bạn đặt nó quá cao</string>
+    <string name="video_ram_description">Sẽ gây lỗi nếu đặt quá cao trên máy có dung lượng ram thấp như Android TV.</string>
+    <string name="video_disk_description">Sẽ gây lỗi nếu đặt quá cao trên máy có dung lượng lưu trữ thấp như Android TV.</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Rất hữu ích để bỏ chặn ISP</string>
     <string name="add_site_pref">Sao chép trang web</string>
@@ -410,7 +410,7 @@
     <string name="plugin_deleted">Đã xoá plugin</string>
     <string name="plugin_load_fail" formatted="true">Không tải được %s</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Bắt đầu tải %d %s</string>
+    <string name="batch_download_start_format" formatted="true">Bắt đầu tải %d %s…</string>
     <string name="batch_download_finish_format" formatted="true">Tải xuống %d %s thành công</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Toàn bộ %s đã được tải xuống</string>
     <string name="batch_download">Tải hàng loạt</string>
@@ -422,7 +422,11 @@
     <string name="plugins_downloaded" formatted="true">Đã tải: %d</string>
     <string name="plugins_disabled" formatted="true">Đã vô hiệu: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Không tải: %d</string>
-    <string name="blank_repo_message">Thêm kho lưu trữ để cài tiện ích</string>
+    <string name="blank_repo_message">CloudStream không có sẵn trang web nào. Bạn cần cài đặt các trang web từ kho lưu trữ.
+\n
+\nDo Sky UK Limited đã gỡ xuống theo DMCA một cách thiếu suy nghĩ 🤮 chúng tôi không thể cài sẵn trang web.
+\n
+\nHãy tham gia Discord của chúng tôi hoặc tìm kiếm trực tuyến.</string>
     <string name="view_public_repositories_button">Xem kho lưu trữ của cộng đồng</string>
     <string name="view_public_repositories_button_short">Danh sách công khai</string>
     <string name="uppercase_all_subtitles">In hoa toàn bộ phụ đề</string>
@@ -437,18 +441,18 @@
     <string name="safe_mode_crash_info">Xem thông tin sự cố</string>
     <string name="history">Lịch sử</string>
     <string name="action_mark_as_watched">Đánh dấu là đã xem</string>
-    <string name="automatic_plugin_download">Tự động tải plugin</string>
+    <string name="automatic_plugin_download">Tự động tải xuống plugin</string>
     <string name="redo_setup_process">Thiết lập lại</string>
     <string name="apk_installer_settings">Bộ cài APK</string>
     <string name="apk_installer_settings_des">Một số máy không hỗ trợ trình cài đặt gói mới. Hãy thử tùy chọn cũ nếu các bản cập nhật không cài đặt.</string>
     <string name="season_format">%s %d%s</string>
-    <string name="play_trailer_button">Xem Trailer</string>
-    <string name="automatic_plugin_download_summary">Tự động tải plugins còn thiếu.</string>
+    <string name="play_trailer_button">Xem giới thiệu</string>
+    <string name="automatic_plugin_download_summary">Tự động tải plugin còn thiếu.</string>
     <string name="update_started">Bắt đầu cập nhật</string>
     <string name="pref_category_links">Liên kết</string>
     <string name="hls_playlist">Danh sách HLS</string>
     <string name="player_pref">Trình phát ưu tiên</string>
-    <string name="player_settings_play_in_app">Trình phát mặc địng</string>
+    <string name="player_settings_play_in_app">Trình phát mặc định</string>
     <string name="extension_rating" formatted="true">Đánh giá: %s</string>
     <string name="no">Không</string>
     <string name="extension_version">Phiên bản</string>
@@ -487,7 +491,7 @@
     <string name="skip_type_creddits">Danh đề</string>
     <string name="skip_type_intro">Giới thiệu</string>
     <string name="clear_history">Xoá lịch sử</string>
-    <string name="enable_skip_op_from_database_des">Hiển thị cửa sổ tua cho mở đầu/kết thúc</string>
+    <string name="enable_skip_op_from_database_des">Hiển thị nút tua nhanh cho mở đầu/kết thúc</string>
     <string name="clipboard_too_large">Văn bản quá dài. Không thể lưu vào bộ nhớ tạm.</string>
     <string name="action_remove_from_watched">Xoá khỏi đã xem</string>
     <string name="confirm_exit_dialog">Bạn có chắc muốn thoát\?</string>
@@ -496,4 +500,23 @@
     <string name="update_notification_installing">Đang cài bản cập nhật…</string>
     <string name="update_notification_failed">Không thể cài đặt phiên bản mới</string>
     <string name="delayed_update_notice">Ứng dụng sẽ được cập nhật khi thoát</string>
+    <string name="library">Thư viện</string>
+    <string name="browser">Trình duyệt</string>
+    <string name="plugin_downloaded">Plugin đã tải</string>
+    <string name="apk_installer_legacy">Mặc định</string>
+    <string name="sort_updated_new">Tải lên (Mới đến Cũ)</string>
+    <string name="sort_updated_old">Tải lên (Cũ đến Mới)</string>
+    <string name="empty_library_no_accounts_message">Thư viện của bạn đang trống :(
+\nHãy đăng nhập vào thư viện hoặc thêm phim vào thư viện cục bộ</string>
+    <string name="open_with">Mở với</string>
+    <string name="provider_info_meta">Siêu dữ liệu không có sẵn, video sẽ không được tải nếu nó không tồn tại trên trang web.</string>
+    <string name="apk_installer_package_installer">PackageInstaller</string>
+    <string name="sort">Sắp xếp</string>
+    <string name="sort_rating_desc">Xếp hạng (Cao đến Thấp)</string>
+    <string name="sort_rating_asc">Xếp hạng (Thấp đến Cao)</string>
+    <string name="sort_alphabetical_z">Chữ cái (Z đến A)</string>
+    <string name="sort_by">Sắp xếp</string>
+    <string name="empty_library_logged_in_message">Có vẻ như danh sách này trống, hãy thử chuyển sang danh sách khác</string>
+    <string name="sort_alphabetical_a">Chữ cái (A đến Z)</string>
+    <string name="select_library">Chọn Thư viện</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 97a48597..ece917d9 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -537,4 +537,21 @@
     <string name="delayed_update_notice">应用退出后将会更新</string>
     <string name="plugin_downloaded">插件已下载</string>
     <string name="action_remove_from_watched">从已观看中移除</string>
+    <string name="safe_mode_file">发现安全模式文件！
+\n启动时不加载任何扩展，直到文件被删除。</string>
+    <string name="browser">浏览器</string>
+    <string name="library">库</string>
+    <string name="sort_by">排序方式</string>
+    <string name="sort">排序</string>
+    <string name="sort_rating_desc">评分（从高到低）</string>
+    <string name="sort_rating_asc">评分（从低到高）</string>
+    <string name="sort_updated_new">更新（从新到旧）</string>
+    <string name="sort_updated_old">更新（从旧到新）</string>
+    <string name="sort_alphabetical_a">字母排序（从 A 到 Z）</string>
+    <string name="sort_alphabetical_z">字母排序（从 Z 到 A）</string>
+    <string name="select_library">选择库</string>
+    <string name="open_with">打开方式</string>
+    <string name="empty_library_no_accounts_message">看来您的库是空的 :(
+\n登录库账户或添加节目到您的本地库</string>
+    <string name="empty_library_logged_in_message">看来此列表是空的，请尝试切换到另一个</string>
 </resources>
\ No newline at end of file

From b26a41bdaf8aeab10a7038c991327747bdd74cf5 Mon Sep 17 00:00:00 2001
From: hexated <hexated@gmail.com>
Date: Tue, 31 Jan 2023 14:26:34 +0700
Subject: [PATCH 205/273] fixed VidSrcExtractor

---
 .../lagradost/cloudstream3/extractors/VidSrcExtractor.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
index b910f9dd..a27bf188 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
@@ -59,8 +59,8 @@ open class VidSrcExtractor : ExtractorApi() {
                 if (datahash.isNotBlank()) {
                     val links = try {
                         app.get(
-                            "$absoluteUrl/src/$datahash",
-                            referer = "https://source.vidsrc.me/"
+                            "$absoluteUrl/srcrcp/$datahash",
+                            referer = "https://rcp.vidsrc.me/"
                         ).url
                     } catch (e: Exception) {
                         ""
@@ -71,7 +71,7 @@ open class VidSrcExtractor : ExtractorApi() {
 
         serverslist.amap { server ->
             val linkfixed = server.replace("https://vidsrc.xyz/", "https://embedsito.com/")
-            if (linkfixed.contains("/pro")) {
+            if (linkfixed.contains("/prorcp")) {
                 val srcresponse = app.get(server, referer = absoluteUrl).text
                 val m3u8Regex = Regex("((https:|http:)//.*\\.m3u8)")
                 val srcm3u8 = m3u8Regex.find(srcresponse)?.value ?: return@amap

From 490381451b28473fcfc41002856e5daa4c1ec131 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Tue, 31 Jan 2023 10:57:11 +0100
Subject: [PATCH 206/273] [skip ci] label issues if provider mentioned

---
 .github/workflows/issue_action.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/issue_action.yml b/.github/workflows/issue_action.yml
index 28b737b3..2a54857c 100644
--- a/.github/workflows/issue_action.yml
+++ b/.github/workflows/issue_action.yml
@@ -53,6 +53,18 @@ jobs:
             Please do not report any provider bugs here. This repository does not contain any providers. Please find the appropriate repository and report your issue there or join the [discord](https://discord.gg/5Hus6fM).
             
             Found provider name: `${{ steps.provider_check.outputs.name }}`
+      - name: Label if mentions provider
+        if: steps.provider_check.outputs.name != 'none'
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ["possible provider issue"]
+            })
       - name: Add eyes reaction to all issues
         uses: actions-cool/emoji-helper@v1.0.0
         with:

From b0921161a3c31c46079c4791f575e538c0b1e153 Mon Sep 17 00:00:00 2001
From: LagradOst <46196380+Blatzar@users.noreply.github.com>
Date: Tue, 31 Jan 2023 23:43:29 +0100
Subject: [PATCH 207/273] Nicehttp version bump

---
 app/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 93e386b6..3c855d28 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -190,7 +190,7 @@ dependencies {
     // Networking
 //    implementation("com.squareup.okhttp3:okhttp:4.9.2")
 //    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1")
-    implementation("com.github.Blatzar:NiceHttp:0.4.1")
+    implementation("com.github.Blatzar:NiceHttp:0.4.2")
     // To fix SSL fuckery on android 9
     implementation("org.conscrypt:conscrypt-android:2.2.1")
     // Util to skip the URI file fuckery 🙏

From 99887534327c86bcc653dfbc84a24917d34b0fe5 Mon Sep 17 00:00:00 2001
From: no-commit <>
Date: Thu, 2 Feb 2023 01:15:24 +0100
Subject: [PATCH 208/273] Library and Light mode improvements.

---
 .../lagradost/cloudstream3/ui/library/LibraryFragment.kt    | 4 +++-
 .../com/lagradost/cloudstream3/ui/result/ResultFragment.kt  | 1 +
 app/src/main/res/layout/fragment_library.xml                | 6 +++---
 app/src/main/res/layout/search_result_grid_expanded.xml     | 2 +-
 app/src/main/res/values/styles.xml                          | 1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
index 1c6af447..d7c06c4e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
@@ -333,8 +333,10 @@ class LibraryFragment : Fragment() {
                     handler.postDelayed(stopLoading, 300)
 
                     savedInstanceState?.getInt(VIEWPAGER_ITEM_KEY)?.let { currentPos ->
+                        if (currentPos < 0) return@let
                         viewpager?.setCurrentItem(currentPos, false)
-                        savedInstanceState.remove(VIEWPAGER_ITEM_KEY)
+                        // Using remove() sets the key to 0 instead of removing it
+                        savedInstanceState.putInt(VIEWPAGER_ITEM_KEY, -1)
                     }
 
                     // Since the animation to scroll multiple items is so much its better to just hide
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 2e2e46b7..68dd1c0e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -974,6 +974,7 @@ open class ResultFragment : ResultTrailerPlayer() {
                             chip.isCheckable = false
                             chip.isFocusable = false
                             chip.isClickable = false
+                            chip.setTextColor(context.colorFromAttribute(R.attr.textColor))
                             addView(chip)
                         }
                     }
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index f9012148..985d055d 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -166,12 +166,12 @@
         app:layout_scrollFlags="noScroll"
         app:tabGravity="center"
         app:tabIndicator="@drawable/indicator_background"
-        app:tabIndicatorColor="@color/textColor"
+        app:tabIndicatorColor="?attr/white"
         app:tabIndicatorGravity="center"
         app:tabIndicatorHeight="30dp"
         app:tabMode="scrollable"
-        app:tabSelectedTextColor="@color/lightTextColor"
+        app:tabSelectedTextColor="?attr/primaryBlackBackground"
         app:tabTextAppearance="@style/TabNoCaps"
-        app:tabTextColor="@color/textColor" />
+        app:tabTextColor="?attr/textColor" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/search_result_grid_expanded.xml b/app/src/main/res/layout/search_result_grid_expanded.xml
index 47fd7cd3..cf6ab3b2 100644
--- a/app/src/main/res/layout/search_result_grid_expanded.xml
+++ b/app/src/main/res/layout/search_result_grid_expanded.xml
@@ -23,7 +23,7 @@
             android:elevation="10dp"
             app:cardBackgroundColor="?attr/primaryGrayBackground"
             app:cardCornerRadius="@dimen/rounded_image_radius"
-            app:layout_constraintDimensionRatio="1:1.414"
+            app:layout_constraintDimensionRatio="1:1.5"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2540bf34..78c62c69 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -100,6 +100,7 @@
     <style name="ChipParent">
         <item name="chipSpacingVertical">5dp</item>
         <item name="chipSpacingHorizontal">5dp</item>
+        <item name="textColor">?attr/textColor</item>
     </style>
 
     <style name="AmoledMode">

From 2ff90c03cadb97741b0cc08d3ff91b03aa8aad7a Mon Sep 17 00:00:00 2001
From: no-commit <>
Date: Sat, 4 Feb 2023 15:32:04 +0100
Subject: [PATCH 209/273] Moved backup restore to IO thread.

---
 .../cloudstream3/utils/BackupUtils.kt         | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
index 8d51e5ef..2318fda6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
@@ -9,6 +9,7 @@ import android.provider.MediaStore
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.WorkerThread
 import androidx.fragment.app.FragmentActivity
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.module.kotlin.readValue
@@ -27,6 +28,8 @@ import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_T
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_UNIXTIME_KEY
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_USER_KEY
 import com.lagradost.cloudstream3.syncproviders.providers.OpenSubtitlesApi.Companion.OPEN_SUBTITLES_USER_KEY
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getDefaultSharedPrefs
 import com.lagradost.cloudstream3.utils.DataStore.getSharedPrefs
 import com.lagradost.cloudstream3.utils.DataStore.mapper
@@ -117,6 +120,7 @@ object BackupUtils {
         )
     }
 
+    @WorkerThread
     fun Context.restore(
         backupFile: BackupFile,
         restoreSettings: Boolean,
@@ -219,31 +223,29 @@ object BackupUtils {
         try {
             restoreFileSelector =
                 registerForActivityResult(ActivityResultContracts.OpenDocument()) { uri: Uri? ->
-                    this.let { activity ->
-                        uri?.let {
-                            try {
-                                val input =
-                                    activity.contentResolver.openInputStream(uri)
-                                        ?: return@registerForActivityResult
+                    if (uri == null) return@registerForActivityResult
+                    val activity = this
+                    ioSafe {
+                        try {
+                            val input = activity.contentResolver.openInputStream(uri)
+                                ?: return@ioSafe
 
-                                val restoredValue =
-                                    mapper.readValue<BackupFile>(input)
-                                activity.restore(
-                                    restoredValue,
-                                    restoreSettings = true,
-                                    restoreDataStore = true
+                            val restoredValue =
+                                mapper.readValue<BackupFile>(input)
+
+                            activity.restore(
+                                restoredValue,
+                                restoreSettings = true,
+                                restoreDataStore = true
+                            )
+                            activity.runOnUiThread { activity.recreate() }
+                        } catch (e: Exception) {
+                            logError(e)
+                            main { // smth can fail in .format
+                                showToast(
+                                    activity,
+                                    getString(R.string.restore_failed_format).format(e.toString())
                                 )
-                                activity.recreate()
-                            } catch (e: Exception) {
-                                logError(e)
-                                try { // smth can fail in .format
-                                    showToast(
-                                        activity,
-                                        getString(R.string.restore_failed_format).format(e.toString())
-                                    )
-                                } catch (e: Exception) {
-                                    logError(e)
-                                }
                             }
                         }
                     }

From f939e4cff2538af7e861026acd055a1e34589cee Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Tue, 7 Feb 2023 10:04:27 +0000
Subject: [PATCH 210/273] update langs to use native names fix #339

---
 .github/locales.py                            |  5 +-
 .../ui/settings/SettingsGeneral.kt            | 73 +++++++++----------
 .../res/values-mo/{string.xml => strings.xml} |  0
 3 files changed, 39 insertions(+), 39 deletions(-)
 rename app/src/main/res/values-mo/{string.xml => strings.xml} (100%)

diff --git a/.github/locales.py b/.github/locales.py
index e95ec902..1c79c093 100644
--- a/.github/locales.py
+++ b/.github/locales.py
@@ -7,7 +7,7 @@ SETTINGS_PATH = "app/src/main/java/com/lagradost/cloudstream3/ui/settings/Settin
 START_MARKER = "/* begin language list */"
 END_MARKER = "/* end language list */"
 XML_NAME = "app/src/main/res/values-"
-ISO_MAP_URL = "https://gist.githubusercontent.com/Josantonius/b455e315bc7f790d14b136d61d9ae469/raw"
+ISO_MAP_URL = "https://raw.githubusercontent.com/haliaeetus/iso-639/master/data/iso_639-1.min.json"
 INDENT = " "*4
 
 iso_map = requests.get(ISO_MAP_URL, timeout=300).json()
@@ -27,7 +27,8 @@ for lang in re.finditer(r'Triple\("(.*)", "(.*)", "(.*)"\)', rest):
 for folder in glob.glob(f"{XML_NAME}*"):
     iso = folder[len(XML_NAME):]
     if iso not in languages.keys():
-        languages[iso] = ("", iso_map.get(iso.lower(),iso))
+        entry = iso_map.get(iso.lower(),{'nativeName':iso})
+        languages[iso] = ("", entry['nativeName'].split(',')[0])
 
 # Create triples
 triples = []
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 3f1c781a..b5a0a689 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -56,45 +56,44 @@ fun getCurrentLocale(context: Context): String {
 // https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes leave blank for auto
 val appLanguages = arrayListOf(
     /* begin language list */
-    Triple("", "Arabic", "ar"),
-    Triple("", "Bulgarian", "bg"),
-    Triple("", "Bengali", "bn"),
+    Triple("", "العربية", "ar"),
+    Triple("", "български език", "bg"),
+    Triple("", "বাংলা", "bn"),
     Triple("\uD83C\uDDE7\uD83C\uDDF7", "Brazilian Portuguese", "bp"),
-    Triple("", "Czech", "cs"),
-    Triple("", "German", "de"),
-    Triple("", "Greek", "el"),
-    Triple("", "English", "en"),
+    Triple("", "čeština", "cs"),
+    Triple("", "Deutsch", "de"),
+    Triple("", "ελληνικά", "el"),
     Triple("", "Esperanto", "eo"),
-    Triple("", "Spanish", "es"),
-    Triple("", "Farsi", "fa"),
-    Triple("", "French", "fr"),
-    Triple("", "Hindi", "hi"),
-    Triple("", "Croatian", "hr"),
-    Triple("", "Hungarian", "hu"),
-    Triple("\uD83C\uDDEE\uD83C\uDDE9", "Indonesian", "in"),
-    Triple("", "Italian", "it"),
-    Triple("\uD83C\uDDEE\uD83C\uDDF1", "Hebrew", "iw"),
-    Triple("", "Kannada", "kn"),
-    Triple("", "Macedonian", "mk"),
-    Triple("", "Malayalam", "ml"),
-    Triple("", "Moldavian", "mo"),
-    Triple("", "Dutch", "nl"),
-    Triple("", "Norwegian Nynorsk", "nn"),
-    Triple("", "Norwegian", "no"),
-    Triple("", "Polish", "pl"),
-    Triple("\uD83C\uDDF5\uD83C\uDDF9", "Portuguese", "pt"),
-    Triple("", "Romanian", "ro"),
-    Triple("", "Russian", "ru"),
-    Triple("", "Slovak", "sk"),
-    Triple("", "Somali", "so"),
-    Triple("", "Swedish", "sv"),
-    Triple("", "Tamil", "ta"),
-    Triple("", "Tagalog", "tl"),
-    Triple("", "Turkish", "tr"),
-    Triple("", "Ukrainian", "uk"),
-    Triple("", "Urdu", "ur"),
-    Triple("", "Viet Nam", "vi"),
-    Triple("", "Chinese Simplified", "zh"),
+    Triple("", "Español", "es"),
+    Triple("", "فارسی", "fa"),
+    Triple("", "français", "fr"),
+    Triple("", "हिन्दी", "hi"),
+    Triple("", "hrvatski jezik", "hr"),
+    Triple("", "magyar", "hu"),
+    Triple("", "in", "in"),
+    Triple("", "Italiano", "it"),
+    Triple("\uD83C\uDDEE\uD83C\uDDF1", "עִברִית", "iw"),
+    Triple("", "ಕನ್ನಡ", "kn"),
+    Triple("", "македонски јазик", "mk"),
+    Triple("", "മലയാളം", "ml"),
+    Triple("🦍", "Monke", "mo"),
+    Triple("", "Nederlands", "nl"),
+    Triple("", "Norsk nynorsk", "nn"),
+    Triple("", "Norsk", "no"),
+    Triple("", "język polski", "pl"),
+    Triple("\uD83C\uDDF5\uD83C\uDDF9", "Português", "pt"),
+    Triple("", "Română", "ro"),
+    Triple("", "Русский", "ru"),
+    Triple("", "slovenčina", "sk"),
+    Triple("", "Soomaaliga", "so"),
+    Triple("", "svenska", "sv"),
+    Triple("", "தமிழ்", "ta"),
+    Triple("", "Wikang Tagalog", "tl"),
+    Triple("", "Türkçe", "tr"),
+    Triple("", "Українська", "uk"),
+    Triple("", "اردو", "ur"),
+    Triple("", "Tiếng Việt", "vi"),
+    Triple("", "中文 (Zhōngwén)", "zh"),
     Triple("\uD83C\uDDF9\uD83C\uDDFC", "Chinese Traditional", "zh-rTW"),
 /* end language list */
 ).sortedBy { it.second } //ye, we go alphabetical, so ppl don't put their lang on top
diff --git a/app/src/main/res/values-mo/string.xml b/app/src/main/res/values-mo/strings.xml
similarity index 100%
rename from app/src/main/res/values-mo/string.xml
rename to app/src/main/res/values-mo/strings.xml

From 0ea624ff14515cd26e35b1fa8b08713d4c9fdf86 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Tue, 7 Feb 2023 10:54:00 +0100
Subject: [PATCH 211/273] Translated using Weblate (Russian)

Currently translated at 98.9% (576 of 582 strings)

Translated using Weblate (Hebrew)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 98.7% (575 of 582 strings)

Translated using Weblate (Hebrew)

Currently translated at 87.4% (509 of 582 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 98.4% (573 of 582 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 98.4% (573 of 582 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (German)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 98.2% (572 of 582 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 97.9% (570 of 582 strings)

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Bulgarian)

Currently translated at 97.2% (566 of 582 strings)

Translated using Weblate (English)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 97.9% (570 of 582 strings)

Translated using Weblate (German)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 97.9% (570 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 97.9% (570 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 97.9% (570 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 97.9% (570 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 97.9% (570 of 582 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 97.5% (568 of 582 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (582 of 582 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (582 of 582 strings)

Co-authored-by: Alexey <aleksejfedorov963@gmail.com>
Co-authored-by: Anarchydr <patrikpik879@gmail.com>
Co-authored-by: Cliff Heraldo <cliffkbrt11@gmail.com>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Fjuro <ifjuro@proton.me>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Joel Brink <joel.brink.handy@gmail.com>
Co-authored-by: Julian <hello@apollo.moe>
Co-authored-by: Massimo Pissarello <mapi68@gmail.com>
Co-authored-by: Muhammet <zumruduanka0013@gmail.com>
Co-authored-by: Sdarfeesh <Sdarfeesh@protonmail.com>
Co-authored-by: Skrripy <rozihrash.ya6w7@simplelogin.com>
Co-authored-by: The Initiator <eithansten@gmail.com>
Co-authored-by: eightyy8 <oliver.kha@pm.me>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: kaajjo <claymanoff@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bg/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/en/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/he/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translation: Cloudstream/App
---
 app/src/main/res/values-bg/strings.xml |   1 -
 app/src/main/res/values-cs/strings.xml | 178 ++++++++++-
 app/src/main/res/values-de/strings.xml |   6 +-
 app/src/main/res/values-es/strings.xml |   2 +-
 app/src/main/res/values-hr/strings.xml |  19 +-
 app/src/main/res/values-in/strings.xml |   2 +-
 app/src/main/res/values-it/strings.xml |   2 +-
 app/src/main/res/values-iw/strings.xml | 393 ++++++++++++++++++++++++-
 app/src/main/res/values-pl/strings.xml |   2 +-
 app/src/main/res/values-ru/strings.xml |  47 +--
 app/src/main/res/values-tr/strings.xml |  19 +-
 app/src/main/res/values-uk/strings.xml |  32 +-
 app/src/main/res/values-zh/strings.xml |   2 +-
 app/src/main/res/values/strings.xml    |   8 +-
 14 files changed, 645 insertions(+), 68 deletions(-)

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 9f95eb3f..f1f512a1 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -8,7 +8,6 @@
     <string formatted="true" name="next_episode_time_hour_format">%dh %dm</string>
     <string formatted="true" name="next_episode_time_min_format">%dm</string>
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Следващ произволен</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 87d5195e..214cb86d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -6,7 +6,7 @@
     <string name="cast_format" formatted="true">Hrají: %s</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Plakát</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Plakát</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
@@ -138,8 +138,8 @@
     <string name="backup_settings">Zálohovat data</string>
     <string name="restore_success">Načten soubor zálohy</string>
     <string name="restore_failed_format" formatted="true">Nepodařilo se obnovit data ze soubory %s</string>
-    <string name="backup_success">Data úspěšně uložena</string>
-    <string name="backup_failed">Chybí oprávnění k úložišti, zkuste to prosím znovu</string>
+    <string name="backup_success">Data uložena</string>
+    <string name="backup_failed">Chybí oprávnění k úložišti. Zkuste to prosím znovu.</string>
     <string name="backup_failed_error_format">Chyba při zálohování %s</string>
     <string name="search">Search</string>
     <string name="category_account">Účty</string>
@@ -252,12 +252,12 @@
     <string name="video_buffer_length_settings">Délka vyrovnávací paměti videa</string>
     <string name="video_buffer_disk_settings">Mezipaměť videa na disku</string>
     <string name="video_buffer_clear_settings">Vymazat mezipamět videí a obrázků</string>
-    <string name="video_ram_description">Při nastavení příliš vysoké hodnoty způsobí náhodné pády. Neměňte, pokud máte málo paměti RAM, například u televize s Androidem nebo starého telefonu.</string>
-    <string name="video_disk_description">Pokud ji nastavíte příliš vysoko, může způsobit problémy v systémech s malým úložným prostorem, například v zařízeních Android TV.</string>
+    <string name="video_ram_description">Při nastavení příliš vysoké hodnoty na zařízeních s malou pamětí, jako je například Android TV, může způsobit pády.</string>
+    <string name="video_disk_description">Při nastavení příliš vysoké hodnoty na zařízeních s malým dostupným úložištěm, jako je například Android TV, může způsobit pády.</string>
     <string name="dns_pref">DNS přes HTTPS</string>
     <string name="dns_pref_summary">Užitečné pro obcházení blokací ISP</string>
     <string name="download_path_pref">Cesta stahování</string>
-    <string name="nginx_url_pref">URL serveru Nginx</string>
+    <string name="nginx_url_pref">URL serveru NGINX</string>
     <string name="display_subbed_dubbed_settings">Zobrazit dabované anime/anime s titulky</string>
     <string name="resize_fit">Vyplnit na obrazovku</string>
     <string name="resize_fill">Roztáhnout</string>
@@ -320,10 +320,10 @@
     <string name="subtitles_shadow">Stín</string>
     <string name="subtitles_raised">Vyvýšené</string>
     <string name="subtitle_offset">Synch. titulky</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Zpoždění titulků</string>
-    <string name="subtitle_offset_extra_hint_later_format">Toto použijte, pokud jsou titulky zobrazeny o %dms dříve</string>
-    <string name="subtitle_offset_extra_hint_before_format">Toto použijte, pokud jsou titulky zobrazeny o %dms později</string>
+    <string name="subtitle_offset_extra_hint_later_format">Toto použijte, pokud jsou titulky zobrazeny o %d ms dříve</string>
+    <string name="subtitle_offset_extra_hint_before_format">Toto použijte, pokud jsou titulky zobrazeny o %d ms později</string>
     <string name="subtitle_offset_extra_hint_none_format">Žádné zpoždění titulků</string>
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
@@ -370,4 +370,164 @@
     <string name="extras">Extra</string>
     <string name="action_mark_as_watched">Označit jako zhlédnuté</string>
     <string name="history">Historie</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="play_with_app_name">Přehrát s CloudStream</string>
+    <string name="autoplay_next_settings_des">Přehrát další epizodu po skončení aktuální</string>
+    <string name="show_trailers_settings">Zobrazit trailery</string>
+    <string name="pref_filter_search_quality">Skrýt vybranou kvalitu videa ve výsledcích vyhledávání</string>
+    <string name="automatic_plugin_updates">Automatické aktualizace doplňků</string>
+    <string name="remove_site_pref">Odebrat web</string>
+    <string name="error_invalid_data">Neplatné údaje</string>
+    <string name="error">Chyba</string>
+    <string name="repository_name_hint">Název repozitáře</string>
+    <string name="plugin_loaded">Doplněk načten</string>
+    <string name="setup_extensions_subtext">Stáhněte si seznam webů, které chcete používat</string>
+    <string name="plugins_downloaded" formatted="true">Staženo: %d</string>
+    <string name="audio_tracks">Zvukové stopy</string>
+    <string name="video_tracks">Videostopy</string>
+    <string name="apply_on_restart">Použít při restartu</string>
+    <string name="safe_mode_title">Bezpečný režim povolen</string>
+    <string name="extension_size">Velikost</string>
+    <string name="extension_authors">Autoři</string>
+    <string name="repository_url_hint">Adresa URL repozitáře</string>
+    <string name="error_invalid_url">Neplatná adresa URL</string>
+    <string name="automatic_plugin_download_summary">Automaticky instalovat všechny dosud nenainstalované doplňky z přidaných repozitářů.</string>
+    <string name="others">Ostatní</string>
+    <string name="trailer">Trailer</string>
+    <string name="network_adress_example">Odkaz na stream</string>
+    <string name="skip_setup">Přeskočit nastavení</string>
+    <string name="add_repository">Přidat repozitář</string>
+    <string name="plugin_deleted">Doplněk odstraněn</string>
+    <string name="plugin_load_fail" formatted="true">Nepodařilo se načíst %s</string>
+    <string name="view_public_repositories_button_short">Veřejný seznam</string>
+    <string name="uppercase_all_subtitles">Velká písmena u všech titulků</string>
+    <string name="hls_playlist">Playlist HLS</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">Webové vysílání videa</string>
+    <string name="app_not_found_error">Aplikace nenalezena</string>
+    <string name="skip_type_format" formatted="true">Přeskočit %s</string>
+    <string name="skip_type_op">Úvod</string>
+    <string name="skip_type_ed">Konec</string>
+    <string name="clipboard_too_large">Příliš mnoho textu. Nepodařilo se uložit do schránky.</string>
+    <string name="yes">Ano</string>
+    <string name="browser">Prohlížeč</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="library">Knihovna</string>
+    <string name="kitsu_settings">Zobrazit plakáty z Kitsu</string>
+    <string name="automatic_plugin_download">Automaticky stahovat doplňky</string>
+    <string name="redo_setup_process">Znovu provést proces nastavení</string>
+    <string name="apk_installer_settings">Instalátor APK</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="apk_installer_settings_des">Některé telefony nepodporují nový instalátor balíčků. Pokud se aktualizace nenainstalují, zkuste použít starší možnost.</string>
+    <string name="pref_category_cache">Mezipaměť</string>
+    <string name="next_episode_format" formatted="true">Epizoda %d bude vydána za</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="play_livestream_button">Přehrát přímý přenos</string>
+    <string name="pref_category_extensions">Rozšíření</string>
+    <string name="pref_category_actions">Akce</string>
+    <string name="pref_category_looks">Vzhled</string>
+    <string name="pref_category_links">Odkazy</string>
+    <string name="pref_category_ui_features">Funkce</string>
+    <string name="example_site_name">MůjSuperWeb</string>
+    <string name="enable_nsfw_on_providers">Povolit NSFW u podporovaných poskytovatelů</string>
+    <string name="category_providers">Poskytovatelé</string>
+    <string name="crash_reporting_title">Hlášení pádů</string>
+    <string name="previous">Předchozí</string>
+    <string name="app_layout_subtext">Změnit vzhled aplikace tak, aby vám vyhovoval</string>
+    <string name="preferred_media_subtext">Co chcete vidět</string>
+    <string name="plugin_downloaded">Doplněk stažen</string>
+    <string name="is_adult">18+</string>
+    <string name="batch_download_start_format" formatted="true">Spuštěno stahování %d %s…</string>
+    <string name="blank_repo_message">CloudStream nemá ve výchozím nastavení nainstalované žádné weby. Stránky je třeba nainstalovat z úložišť.
+\n
+\nKvůli nesmyslnému podání stížnosti DMCA společností Sky UK Limited 🤮 nemůžeme v aplikaci propojit stránky repozitářů.
+\n
+\nPřipojte se k našemu Discordu nebo hledejte na internetu.</string>
+    <string name="plugins_disabled" formatted="true">Zakázáno: %d</string>
+    <string name="plugins_updated" formatted="true">Aktualizováno %d doplňků</string>
+    <string name="safe_mode_crash_info">Zobrazit informace o pádu</string>
+    <string name="extension_rating" formatted="true">Hodnocení: %s</string>
+    <string name="action_remove_from_watched">Odebrat ze zhlédnutých</string>
+    <string name="update_notification_installing">Instalace aktualizace aplikace…</string>
+    <string name="safe_mode_description">Všechna rozšíření byla vypnuta z důvodu pádu, abyste mohli najít to, které způsobuje potíže.</string>
+    <string name="extension_version">Verze</string>
+    <string name="player_pref">Preferovaný přehrávač videí</string>
+    <string name="extension_description">Popis</string>
+    <string name="extension_status">Stav</string>
+    <string name="extension_install_first">Nejprve nainstalujte rozšíření</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="skip_type_mixed_ed">Smíšený konec</string>
+    <string name="extension_language">Jazyk</string>
+    <string name="player_settings_play_in_app">Interní přehrávač</string>
+    <string name="skip_type_recap">Rekapitulace</string>
+    <string name="clear_history">Vymazat historii</string>
+    <string name="player_settings_play_in_browser">Webový prohlížeč</string>
+    <string name="all_languages_preference">Všechny jazyky</string>
+    <string name="skip_type_mixed_op">Smíšený úvod</string>
+    <string name="skip_type_creddits">Poděkování</string>
+    <string name="skip_type_intro">Znělka</string>
+    <string name="enable_skip_op_from_database_des">Zobrazit vyskakovací okna pro přeskočení úvodu/konce</string>
+    <string name="update_notification_downloading">Stahování aktualizace aplikace…</string>
+    <string name="confirm_exit_dialog">Opravdu chcete opustit aplikaci\?</string>
+    <string name="update_notification_failed">Nepodařilo se nainstalovat novou verzi aplikace</string>
+    <string name="apk_installer_legacy">Původní</string>
+    <string name="delayed_update_notice">Aplikace bude po ukončení aktualizována</string>
+    <string name="empty_library_no_accounts_message">Vypadá to, že vaše knihovna je prázdná :(
+\nPřihlaste se k účtu v knihovně nebo přidejte pořady do místní knihovny</string>
+    <string name="select_library">Vybrat knihovnu</string>
+    <string name="sort_rating_desc">Hodnocení (od nejvyššího)</string>
+    <string name="sort_rating_asc">Hodnocení (od nejnižšího)</string>
+    <string name="sort_alphabetical_z">Abecedně (od Z do A)</string>
+    <string name="sort_by">Seřadit podle</string>
+    <string name="sort">Řazení</string>
+    <string name="empty_library_logged_in_message">Vypadá to, že tento seznam je prázdný, zkuste přepnout na jiný</string>
+    <string name="safe_mode_file">Nalezen soubor bezpečného režimu!
+\nDo odebrání souboru nebudeme načítat žádná rozšíření.</string>
+    <string name="sort_updated_new">Aktualizováno (od nejnovějšího)</string>
+    <string name="sort_updated_old">Aktualizováno (od nejstaršího)</string>
+    <string name="sort_alphabetical_a">Abecedně (od A do Z)</string>
+    <string name="open_with">Otevřít pomocí</string>
+    <string name="pref_category_backup">Záloha</string>
+    <string name="pref_category_gestures">Gesta</string>
+    <string name="add_site_pref">Klonovat web</string>
+    <string name="add_site_summary">Přidat klon existujícího webu s jinou adresou URL</string>
+    <string name="example_site_url">example.com</string>
+    <string name="example_lang_name">Kód jazyka (cs)</string>
+    <string name="download_all_plugins_from_repo">Stáhnout všechny doplňky z tohoto repozitáře\?</string>
+    <string name="single_plugin_disabled" formatted="true">%s (zakázáno)</string>
+    <string name="tracks">Stopy</string>
+    <string name="nsfw">NSFW</string>
+    <string name="other_singular">Video</string>
+    <string name="pref_category_player_features">Funkce přehrávače</string>
+    <string name="pref_category_subtitles">Titulky</string>
+    <string name="pref_category_player_layout">Rozložení</string>
+    <string name="pref_category_defaults">Výchozí hodnoty</string>
+    <string name="apk_installer_package_installer">Instalátor balíčků</string>
+    <string name="pref_category_app_updates">Aktualizace aplikace</string>
+    <string name="setup_done">Hotovo</string>
+    <string name="extension_types">Podporováno</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="live_singular">Živý přenos</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="extensions">Rozšíření</string>
+    <string name="play_trailer_button">Přehrát trailer</string>
+    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="view_public_repositories_button">Zobrazit komunitní repozitáře</string>
+    <string name="update_started">Aktualizace zahájena</string>
+    <string name="stream">Stream</string>
+    <string name="autoplay_next_settings">Automaticky přehrát další epizodu</string>
+    <string name="livestreams">Živé přenosy</string>
+    <string name="subtitles_filter_lang">Filtrování podle preferovaného jazyka médií</string>
+    <string name="referer">Referent</string>
+    <string name="next">Další</string>
+    <string name="provider_languages_tip">Sledovat videa v těchto jazycích</string>
+    <string name="batch_download_finish_format" formatted="true">Staženo %d %s</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Všechny %s jsou již staženy</string>
+    <string name="batch_download">Hromadné stahování</string>
+    <string name="plugin_singular">doplněk</string>
+    <string name="plugin">doplňků</string>
+    <string name="delete_repository_plugins">Tímto také odstraníte všechny doplňky repozitářů</string>
+    <string name="delete_repository">Odstranit repozitář</string>
+    <string name="plugins_not_downloaded" formatted="true">Nestaženo: %d</string>
+    <string name="no">Ne</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 63ed5444..e190aa9c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -4,7 +4,7 @@
     <string name="cast_format" formatted="true">Besetzung: %s</string>
     <string name="next_episode_format" formatted="true">Episode %d wird veröffentlicht in</string>
     <string name="result_poster_img_des">Vorschaubild</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Vorschaubild</string>
     <string name="subs_hold_to_reset_to_default">Halten, um auf die Standardeinstellungen zurückzusetzen</string>
     <string name="restore_failed_format" formatted="true">Wiederherstellung der Daten aus der Datei %s fehlgeschlagen</string>
     <string name="backup_success">Daten erfolgreich gesichert</string>
@@ -228,8 +228,8 @@
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Serie</string>
     <string name="cartoons_singular">Trickfilm</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">Anime</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Dokumentation</string>
     <string name="asian_drama_singular">Asiatisches Drama</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 37e5c431..5b6f6f55 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -94,7 +94,7 @@
     <string name="home_main_poster_img_des">Poster Principal</string>
     <string name="app_language">Idioma de la aplicación</string>
     <string name="provider_languages_tip">Ver videos en estos idiomas</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Cartel</string>
     <string name="home_next_random_img_des">Siguiente al azar</string>
     <string name="all_languages_preference">Todos los Idiomas</string>
     <string name="go_back_img_des">Volver</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 837a2201..0f3e36bc 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -19,7 +19,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Poster</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
@@ -514,4 +514,21 @@
     <string name="delayed_update_notice">Program če se aktualizirati tijekom zatvaranja programa</string>
     <string name="plugin_downloaded">Dodatak preuzet</string>
     <string name="action_remove_from_watched">Ukloni iz pogledanog</string>
+    <string name="browser">Preglednik</string>
+    <string name="library">Biblioteka</string>
+    <string name="sort_rating_desc">Ocjena (Veća do manje)</string>
+    <string name="sort_by">Sortiraj prema</string>
+    <string name="sort">Sortiraj</string>
+    <string name="sort_rating_asc">Ocjena (Manja do veće)</string>
+    <string name="sort_updated_new">Ažurirano (Od novog do starog)</string>
+    <string name="sort_updated_old">Ažurirano (Od starog do novog)</string>
+    <string name="sort_alphabetical_a">Abecedno (A do Ž)</string>
+    <string name="sort_alphabetical_z">Abecedno (Ž do A)</string>
+    <string name="select_library">Odaberite biblioteku</string>
+    <string name="open_with">Otvori sa</string>
+    <string name="empty_library_no_accounts_message">Čini se da vam je biblioteka prazna :(
+\nPrijavite se na račun biblioteke ili dodajte serije u svoju lokalnu biblioteku</string>
+    <string name="empty_library_logged_in_message">Čini se da je ova lista prazna, pokušajte se prebaciti na drugu</string>
+    <string name="safe_mode_file">Pronađena datoteka sigurnog načina rada!
+\nNe učitavaju se ekstenzije pri pokretanju dok se datoteka ne ukloni.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 96c5950b..d54e4fa9 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -5,7 +5,7 @@
     <string name="cast_format" formatted="true">Pemeran: %s</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Poster</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 419818a2..9dbc627f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -9,7 +9,7 @@
     <string name="next_episode_time_min_format" formatted="true">%d min</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Poster</string>
     <string name="episode_poster_img_des">Poster episodio</string>
     <string name="home_main_poster_img_des">Poster principale</string>
     <string name="home_next_random_img_des">Prossimo casuale</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index cb8d5945..11cf77ce 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -34,13 +34,13 @@
     <string name="type_completed">הושלם</string>
     <string name="type_plan_to_watch">בתכנון לצפייה</string>
     <string name="type_re_watching">צופה מחדש</string>
-    <string name="play_movie_button">נגן סרט</string>
-    <string name="play_trailer_button">נגן קדימון</string>
-    <string name="play_livestream_button">נגן שידור חי</string>
+    <string name="play_movie_button">הפעל סרט</string>
+    <string name="play_trailer_button">הפעל טריילר</string>
+    <string name="play_livestream_button">הפעל שידור חי</string>
     <string name="pick_source">מקורות</string>
     <string name="reload_error">נסיון חדש לחיבור…</string>
-    <string name="type_dropped">נעצר</string>
-    <string name="play_torrent_button">שידור טורנט</string>
+    <string name="type_dropped">הפסיק</string>
+    <string name="play_torrent_button">שדר טורנט</string>
     <string name="go_back">חזרה</string>
     <string name="play_episode">נגן פרק</string>
     <string name="downloaded">הורד</string>
@@ -75,7 +75,7 @@
     <string name="play_with_app_name">נגן עם קלאודסטרים</string>
     <string name="next_episode">פרק הבא</string>
     <string name="loading">טוען…</string>
-    <string name="type_watching">צופה ב</string>
+    <string name="type_watching">צופה</string>
     <string name="pick_subtitle">כתוביות</string>
     <string name="type_on_hold">בהמתנה</string>
     <string name="type_none">ללא</string>
@@ -102,11 +102,11 @@
     <string name="vpn_torrent">הספק הזה הוא טורנט, שימוש ב-VPN הוא מומלץ</string>
     <string name="torrent_plot">תיאור</string>
     <string name="normal_no_plot">עלילה לא נמצאה</string>
-    <string name="torrent_no_plot">העלילה לא נמצאה</string>
+    <string name="torrent_no_plot">התיאור לא נמצאה</string>
     <string name="picture_in_picture">מצב תמונה בתמונה</string>
     <string name="player_size_settings">כפתור שינוי גודל הנגן</string>
     <string name="player_size_settings_des">הסר את הגבולות השחורים</string>
-    <string name="benene_count_text">%d ניתן למפתחים</string>
+    <string name="benene_count_text">%d בנינים שניתנו למפתחים</string>
     <string name="player_subtitles_settings_des">הגדרות כתוביות הנגן</string>
     <string name="chromecast_subtitles_settings_des">הגדרות כתוביות כרומקאסט</string>
     <string name="subs_font">גופן</string>
@@ -129,4 +129,381 @@
     <string name="none">אין</string>
     <string name="all">הכל</string>
     <string name="title">כותרת</string>
+    <string name="update_started">העדכון התחיל</string>
+    <string name="settings_info">מידע</string>
+    <string name="automatic_plugin_download_summary">התקן אוטומטית את כל התוספים שטרם הותקנו ממאגרים שנוספו.</string>
+    <string name="updates_settings_des">חפש אוטומטית עדכונים חדשים בפתיחת האפליקציה</string>
+    <string name="updates_settings">הצג עדכונים לאפליקציה</string>
+    <string name="redo_setup_process">בצע מחדש את תהליך ההגדרה</string>
+    <string name="uprereleases_settings">עדכן למהדורות מוקדמות</string>
+    <string name="uprereleases_settings_des">חפש עדכוני מהדרות מוקדמות במקום מהדורות מלאות בלבד</string>
+    <string name="episodes">פרקים</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode">פרק</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="season_short">עו</string>
+    <string name="episode_short">פר</string>
+    <string name="no_episodes_found">לא נמצאו פרקים</string>
+    <string name="delete_file">מחק קובץ</string>
+    <string name="delete">מחק</string>
+    <string name="pause">עצור</string>
+    <string name="resume">המשך</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="resume_time_left" formatted="true">%dדקות
+\nנותרו</string>
+    <string name="delete_message" formatted="true">‬פעולה זאת תמחק לצמיתות את %s
+\nהאם אתם בטוחים\?</string>
+    <string name="status_ongoing">מתמשך</string>
+    <string name="duration">משך זמן</string>
+    <string name="rating">דירוג</string>
+    <string name="year">שנה</string>
+    <string name="no_subtitles">ללא כתוביות</string>
+    <string name="default_subtitles">ברירת מחדל</string>
+    <string name="free_storage">חינם</string>
+    <string name="used_storage">משומש</string>
+    <string name="tv_series">סדרת טלוויזיה</string>
+    <string name="cartoons">סדרות/סרטים מצוירים</string>
+    <string name="anime_singular">\@string/אנימה</string>
+    <string name="ova_singular">\@string/אנימציית וידאו מקורית</string>
+    <string name="asian_drama_singular">דרמה אסייתית</string>
+    <string name="episode_action_chromecast_episode">כרומקאסט את הפרק</string>
+    <string name="episode_action_chromecast_mirror">כרומקאסט את המראה</string>
+    <string name="episode_action_play_in_browser">נגן בדפדפן</string>
+    <string name="show_sub">תווית כתוביות</string>
+    <string name="poster_ui_settings">החלף רכיבי ממשק משתמש בפוסטר</string>
+    <string name="video_skip_op">דלג על הפתיח</string>
+    <string name="dont_show_again">אל תראה שוב</string>
+    <string name="skip_update">דלג על עדכון זה</string>
+    <string name="update">עדכון</string>
+    <string name="watch_quality_pref">איכות צפייה מועדפת</string>
+    <string name="limit_title">נגן וידאו כותרת מקסימום תווים</string>
+    <string name="limit_title_rez">רזולוציית נגן וידאו</string>
+    <string name="add_sync">הוסף מעקב</string>
+    <string name="create_account">צור חשבון</string>
+    <string name="next">הבא</string>
+    <string name="library">ספריה</string>
+    <string name="provider_info_meta">מטא-דאטה לא מסופק על ידי האתר, טעינת הסרטון תיכשל אם הוא לא קיים באתר.</string>
+    <string name="swipe_to_change_settings_des">החלק על הצד השמאלי או הימני כדי לשנות את הבהירות או עוצמת הקול</string>
+    <string name="restore_failed_format" formatted="true">שחזור הנתונים מהקובץ נכשל %s</string>
+    <string name="category_updates">עדכונים וגיבויים</string>
+    <string name="advanced_search_des">נותן לך את תוצאות החיפוש מופרדות לפי ספק</string>
+    <string name="show_fillers_settings">הצג פרק פילר (לא הכרחי לעלילה) לאנימה</string>
+    <string name="automatic_plugin_download">הורדה אוטומטית של תוספים</string>
+    <string name="automatic_plugin_updates">עדכוני תוספים אוטומטיים</string>
+    <string name="benene_des">כמות בנינים שניתנו</string>
+    <string name="season">עונה</string>
+    <string name="acra_report_toast">מצטערים, האפליקציה קרסה. דוח באג אנונימי יישלח למפתחים</string>
+    <string name="torrent">טורנט</string>
+    <string name="nsfw">NSFW</string>
+    <string name="render_error">שגיאת מעבד</string>
+    <string name="episode_action_download_mirror">הורד מראה</string>
+    <string name="episode_action_download_subtitle">הורד כתוביות</string>
+    <string name="random_button_settings_desc">הצג כפתור אקראי בדף הבית</string>
+    <string name="show_dub">תווית דיבוב</string>
+    <string name="video_ram_description">גורם לקריסות אם מוגדר גבוה מדי במכשירים עם זיכרון נמוך, כגון Android TV.</string>
+    <string name="video_source">מקור</string>
+    <string name="category_providers">ספקים</string>
+    <string name="remove_site_pref">הסר אתר</string>
+    <string name="download_path_pref">נתיב הורדה</string>
+    <string name="pref_category_looks">נראה</string>
+    <string name="automatic">אוטומטי</string>
+    <string name="tv_layout">פריסת טלוויזיה</string>
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="subtitles_filter_lang">סנן לפי שפת מדיה מועדפת</string>
+    <string name="app_theme_settings">נושא אפליקציה</string>
+    <string name="bottom_title_settings">מיקום כותרת פוסטר</string>
+    <string name="preferred_media_subtext">מה אתם רוצים לראות</string>
+    <string name="quality_hq">איכות גבוהה</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="plugin_loaded">תוסף טעון</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="pref_category_app_updates">עדכוני אפליקציה</string>
+    <string name="quality_4k">4K</string>
+    <string name="quality_workprint">WP</string>
+    <string name="skip_setup">דלג על ההגדרה</string>
+    <string name="pref_category_player_features">תכונות נגן</string>
+    <string name="episode_sync_settings">עדכן התקדמות צפייה</string>
+    <string name="dns_pref">DNS מעל HTTPS</string>
+    <string name="double_tap_to_pause_settings_des">לחץ באמצע כדי לעצור</string>
+    <string name="swipe_to_seek_settings_des">החלק שמאלה או ימינה כדי לשלוט על זמן בנגן הסרטונים</string>
+    <string name="autoplay_next_settings">נגן אוטומטית את הפרק הבא</string>
+    <string name="autoplay_next_settings_des">התחל את הפרק הבא כאשר הפרק הנוכחי נגמר</string>
+    <string name="double_tap_to_seek_settings_des">לחץ פעמיים על צד ימין או שמאל כדי להציץ קדימה או אחורה</string>
+    <string name="use_system_brightness_settings">השתמש בבהירות המערכת</string>
+    <string name="backup_settings">גבה נתונים</string>
+    <string name="subtitle_offset">סנכרן את הכתוביות</string>
+    <string name="subtitle_offset_title">עיכוב כתוביות</string>
+    <string name="subtitle_offset_extra_hint_none_format">אין עיכוב בכתוביות</string>
+    <string name="recommended">מומלץ</string>
+    <string name="player_loaded_subtitles" formatted="true">נטען %s</string>
+    <string name="subtitle_offset_extra_hint_later_format">השתמש בזה אם הכתוביות מוצגות %d מילישניות מוקדם יותר</string>
+    <string name="home_random">אקראי</string>
+    <string name="resolution">רזולוציה</string>
+    <string name="quality_cam_hd">איכות מצלמה</string>
+    <string name="error_invalid_url">כתובת אתר לא מזוהה</string>
+    <string name="network_adress_example">קישור לשידור</string>
+    <string name="referer">המפנה</string>
+    <string name="quality_tc">TC</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="repository_url_hint">כתובת אתר למאגר</string>
+    <string name="preferred_media_settings">מדיה מועדפת</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="play_episode_toast">נגן את הפרק</string>
+    <string name="no_links_found_toast">לא נמצאו קישורים</string>
+    <string name="example_lang_name">קוד שפה (אנגלית)</string>
+    <string name="error">שגיאה</string>
+    <string name="provider_lang_settings">שפות ספק</string>
+    <string name="pref_category_links">קישורים</string>
+    <string name="app_layout">פריסת אפליקציה</string>
+    <string name="advanced_search">חיפוש מתקדם</string>
+    <string name="is_adult">18+</string>
+    <string name="search_poster_img_des">פוסטר</string>
+    <string name="quality_cam">איכות מצלמה</string>
+    <string name="swipe_to_seek_settings">החלק כדי להציץ</string>
+    <string name="pref_category_backup">גיבוי</string>
+    <string name="double_tap_to_seek_amount_settings">כמות הצצת הנגן</string>
+    <string name="other_singular">סרטון</string>
+    <string name="github">גיטהאב</string>
+    <string name="quality_cam_rip">מצלמה</string>
+    <string name="swipe_to_change_settings">החלק לשינוי ההגדרות</string>
+    <string name="browser">‪דפדפן</string>
+    <string name="subs_window_color">צבע חלון</string>
+    <string name="show_log_cat">הצג לוג</string>
+    <string name="eigengraumode_settings_des">הוסף אפשרות מהירות בנגן</string>
+    <string name="double_tap_to_seek_settings">לחץ פעמיים כדי להציץ</string>
+    <string name="double_tap_to_pause_settings">לחץ פעמיים כדי לעצור</string>
+    <string name="use_system_brightness_settings_des">התשתמש בבהירות המערכת בנגן האפליקציה במקום שכבת-על כהה</string>
+    <string name="episode_sync_settings_des">סנכרן אוטומטית את התקדמות הפרק הנוכחית שלך</string>
+    <string name="restore_settings">שחזר נתונים מגיבוי</string>
+    <string name="restore_success">קובץ הגיבוי נטען</string>
+    <string name="backup_success">נתונים מאוחסנים</string>
+    <string name="backup_failed">חסרות הרשאות אחסון. אנא נסה שוב.</string>
+    <string name="backup_failed_error_format">שגיאה בגיבוי %s</string>
+    <string name="search">חיפוש</string>
+    <string name="category_account">חשבונות</string>
+    <string name="benene_count_text_none">לא ניתנו בנינים</string>
+    <string name="eigengraumode_settings">מצב איגנגראבי</string>
+    <string name="bug_report_settings_off">שולח נתונים רק בקריסות</string>
+    <string name="bug_report_settings_on">לא שולח נתונים</string>
+    <string name="show_trailers_settings">הצג טריילרים</string>
+    <string name="kitsu_settings">הצג פוסטרים מKitsu</string>
+    <string name="pref_filter_search_quality">הסתר את איכות הסרטון שנבחרה בתוצאות החיפוש</string>
+    <string name="apk_installer_settings">מתקין APK</string>
+    <string name="apk_installer_settings_des">חלק מהטלפונים אינם תומכים במתקין החבילות החדש. נסו את האפשרות מדור קודם אם העדכונים לא מתקינים.</string>
+    <string name="lightnovel">אפליקצית רומנים קלים על ידי אותו מפתחים</string>
+    <string name="anim">אפליקצית אנימה על ידי אותו מפתחים</string>
+    <string name="discord">הצטרפות לדיסקורד</string>
+    <string name="app_language">שפת האפליקציה</string>
+    <string name="no_chromecast_support_toast">לספק זה אין תמיכה בכרומקאסט</string>
+    <string name="copy_link_toast">הקישור הועתק ללוח</string>
+    <string name="subs_default_reset_toast">אפס לערך ברירת המחדל</string>
+    <string name="no_season">אין עונה</string>
+    <string name="status_completed">הושלם</string>
+    <string name="site">אתר</string>
+    <string name="synopsis">תקציר</string>
+    <string name="queued">בתור</string>
+    <string name="benene">לתת בניני למפתחים</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="app_storage">אפליקציה</string>
+    <string name="movies">סרטים</string>
+    <string name="anime">אנימה</string>
+    <string name="documentaries">סרטים תיעודיים</string>
+    <string name="ova">אנימציית וידאו מקורית</string>
+    <string name="asian_drama">דרמות אסייתיות</string>
+    <string name="livestreams">שידורי חי</string>
+    <string name="others">אחר</string>
+    <string name="movies_singular">סרט</string>
+    <string name="tv_series_singular">סדרה</string>
+    <string name="cartoons_singular">סדרה/סרט מצויר</string>
+    <string name="torrent_singular">טורנט</string>
+    <string name="documentaries_singular">דוקומנטרי</string>
+    <string name="live_singular">שידור חי</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="source_error">שגיאת מקור</string>
+    <string name="remote_error">שגיאה מרחוק</string>
+    <string name="unexpected_error">שגיאת נגן לא צפויה</string>
+    <string name="storage_error">שגיאת הורדה, בדוק הרשאות אחסון</string>
+    <string name="episode_action_play_in_app">נגן באפליקציה</string>
+    <string name="episode_action_play_in_format">נגן ב %s</string>
+    <string name="episode_action_copy_link">העתק קישור</string>
+    <string name="episode_action_auto_download">הורדה אוטומטית</string>
+    <string name="episode_action_reload_links">טען מחדש קישורים</string>
+    <string name="show_hd">תווית איכות</string>
+    <string name="no_update_found">לא נמצא עדכון</string>
+    <string name="check_for_update">בדוק אם יש עדכון</string>
+    <string name="video_lock">נעל</string>
+    <string name="video_aspect_ratio_resize">שינוי גודל</string>
+    <string name="video_buffer_size_settings">גודל מאגר וידאו</string>
+    <string name="video_buffer_length_settings">אורך מאגר וידאו</string>
+    <string name="video_buffer_disk_settings">מטמון וידאו בכונן</string>
+    <string name="video_buffer_clear_settings">נקה מטמון וידאו ותמונה</string>
+    <string name="video_disk_description">גורם לקריסות אם מוגדר גבוה מדי במכשירים עם מקום נמוך, כגון Android TV.</string>
+    <string name="dns_pref_summary">שימושי עבור עקיפת מחסומי ספק שירותי אינטרנט</string>
+    <string name="add_site_pref">אתר העתק</string>
+    <string name="add_site_summary">הוסף העתק של אתר קיים, עם כתובת אתר אחרת</string>
+    <string name="nginx_url_pref">NGINX שרת כתובת אתר</string>
+    <string name="display_subbed_dubbed_settings">הצג אנימות מדובבות/מתורגמות</string>
+    <string name="resize_fit">התאם למסך</string>
+    <string name="resize_fill">מתוח</string>
+    <string name="resize_zoom">זום</string>
+    <string name="legal_notice">כתב ויתור</string>
+    <string name="pref_category_extensions">הרחבות</string>
+    <string name="pref_category_actions">פעולות</string>
+    <string name="pref_category_cache">מטמון</string>
+    <string name="pref_category_gestures">מחוות</string>
+    <string name="pref_category_subtitles">כתוביות</string>
+    <string name="pref_category_player_layout">פריסה</string>
+    <string name="pref_category_defaults">ברירות מחדל</string>
+    <string name="pref_category_ui_features">תכונות</string>
+    <string name="category_general">כללי</string>
+    <string name="random_button_settings">כפתור אקראי</string>
+    <string name="enable_nsfw_on_providers">הרשה NSFW בספקים נתמכים</string>
+    <string name="subtitles_encoding">קידוד כתוביות</string>
+    <string name="category_ui">פריסה</string>
+    <string name="phone_layout">פריסת טלפון</string>
+    <string name="emulator_layout">פריסת אמולטור</string>
+    <string name="primary_color_settings">צבע ראשוני</string>
+    <string name="bottom_title_settings_des">שים את הכותרת מתחת לפוסטר</string>
+    <string name="example_password">סיסמה123</string>
+    <string name="example_username">שםהמשתמשהמגניבשלי</string>
+    <string name="example_email">hello@world.com</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="example_site_name">האתרהמגניבשלי</string>
+    <string name="example_site_url">דוגמה.com</string>
+    <string name="account">חשבון</string>
+    <string name="switch_account">החלף חשבון</string>
+    <string name="add_account">הוסף חשבון</string>
+    <string name="added_sync_format" formatted="true">נוסף %s</string>
+    <string name="upload_sync">סנכרן</string>
+    <string name="sync_score">מדורג</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="authenticated_user" formatted="true">%s מאומת</string>
+    <string name="authenticated_user_fail" formatted="true">לא ניתן להתחבר ב %s</string>
+    <string name="normal">רגיל</string>
+    <string name="max">מקסימום</string>
+    <string name="min">מינימום</string>
+    <string name="subtitles_outline">מתאר</string>
+    <string name="subtitles_depressed">מדוכא</string>
+    <string name="subtitles_shadow">צל</string>
+    <string name="subtitles_raised">הורם</string>
+    <string name="subtitle_offset_hint">1000 מילישניות</string>
+    <string name="subtitle_offset_extra_hint_before_format">השתמש בזה אם הכתוביות מוצגות %d מילישניות מאוחר יותר</string>
+    <string name="subtitles_example_text">השועל החום המהיר קופץ מעל הכלב העצלן</string>
+    <string name="player_load_subtitles">טען מקובץ</string>
+    <string name="player_load_subtitles_online">טען מהאינטרנט</string>
+    <string name="downloaded_file">קובץ שהורד</string>
+    <string name="actor_main">ראשי</string>
+    <string name="actor_supporting">משנה</string>
+    <string name="actor_background">רקע</string>
+    <string name="home_source">מקור</string>
+    <string name="coming_soon">בקרוב…</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_blueray">Blu-ray</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_webrip">Web</string>
+    <string name="poster_image">תמונת פוסטר</string>
+    <string name="category_player">נגן</string>
+    <string name="resolution_and_title">רזולוציה וכותרת</string>
+    <string name="error_invalid_id">לא מזוהה ID</string>
+    <string name="error_invalid_data">נתונים לא מזוהים</string>
+    <string name="subtitles_remove_captions">הסר כיתובים סגורים מהכתוביות</string>
+    <string name="subtitles_remove_bloat">הסר נפיחות מכתוביות</string>
+    <string name="extras">תוספות</string>
+    <string name="trailer">טריילר</string>
+    <string name="provider_languages_tip">צפה בסרטונים בשפות אלה</string>
+    <string name="previous">קודם</string>
+    <string name="app_layout_subtext">שנה את מראה האפליקציה כך שיתאים למכשירך</string>
+    <string name="crash_reporting_title">דיווח על קריסה</string>
+    <string name="setup_done">סוים</string>
+    <string name="extensions">הרחבות</string>
+    <string name="add_repository">הוסף מאגר</string>
+    <string name="repository_name_hint">שם מאגר</string>
+    <string name="plugin_downloaded">תוסף הורד</string>
+    <string name="plugin_deleted">התוסף נמחק</string>
+    <string name="plugin_load_fail" formatted="true">לא יכול לטעון %s</string>
+    <string name="batch_download_start_format" formatted="true">התחיל להוריד %d %s…</string>
+    <string name="batch_download_finish_format" formatted="true">הוריד %d %s</string>
+    <string name="enable_skip_op_from_database_des">הצג חלונות קופצים של דילוג בשביל פתיח/שיר סיום</string>
+    <string name="delete_repository">מחק מאגר</string>
+    <string name="skip_type_mixed_op">פתיח מעורב</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">כל %s כבר הורד</string>
+    <string name="extension_authors">מחברים</string>
+    <string name="extension_language">שפה</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="skip_type_creddits">קרדיטים</string>
+    <string name="sort">מיין</string>
+    <string name="select_library">בחר ספרייה</string>
+    <string name="empty_library_no_accounts_message">נראה שהספרייה שלכם ריקה :(
+\nהתחברו לחשבון ספריה או הוסף סדרות לספרייה המקומית שלך</string>
+    <string name="safe_mode_file">קובץ מצב בטוח נמצא!
+\nלא טוען שום תוספות בהפעלה עד להסרת הקובץ.</string>
+    <string name="update_notification_failed">לא ניתן להתקין את הגרסה החדשה של האפליקציה</string>
+    <string name="batch_download">הורדת אצווה</string>
+    <string name="plugin_singular">תוסף</string>
+    <string name="download_all_plugins_from_repo">הורד את כל התוספים ממאגר זה\?</string>
+    <string name="audio_tracks">רצועות שמע</string>
+    <string name="tracks">מסלולים</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="player_settings_play_in_browser">דפדפן אינטרנט</string>
+    <string name="safe_mode_description">כל התוספים נכבו עקב התרסקות כדי לעזור לך למצוא את האחד הגורם לצרות.</string>
+    <string name="apk_installer_package_installer">מוריד החבילות</string>
+    <string name="plugins_updated" formatted="true">עודכן %d תוספים</string>
+    <string name="plugin">תוספים</string>
+    <string name="delete_repository_plugins">פעולה זו תמחק גם את כל תוספי המאגר</string>
+    <string name="setup_extensions_subtext">הורד את רשימת האתרים שבהם ברצונך להשתמש</string>
+    <string name="plugins_downloaded" formatted="true">הורד: %d</string>
+    <string name="plugins_disabled" formatted="true">מוגבל: %d</string>
+    <string name="plugins_not_downloaded" formatted="true">לא מורד: %d</string>
+    <string name="blank_repo_message">לקלאודסטרים אין אתרים מותקנים כברירת מחדל. עליכם להתקין את האתרים ממאגרים.
+\n
+\nבגלל הסרת DMCA על ידי Sky UK LImited 🤮 אנחנו לא יכולים לקשר את אתר המאגרים באפליקציה.
+\n
+\nתצטרפו לדיסקורד שלנו או תחפשו באינטרנט.</string>
+    <string name="view_public_repositories_button">הצג מאגרים קהילתיים</string>
+    <string name="view_public_repositories_button_short">רשימה ציבורית</string>
+    <string name="uppercase_all_subtitles">לשים את הכתוביות באותיות רישיות</string>
+    <string name="single_plugin_disabled" formatted="true">%s (מוגבל)</string>
+    <string name="video_tracks">רצועות וידאו</string>
+    <string name="apply_on_restart">החל על הפעלה מחדש</string>
+    <string name="safe_mode_title">מצב בטוח מופעל</string>
+    <string name="safe_mode_crash_info">הצג מידע על ההתרסקות</string>
+    <string name="extension_rating" formatted="true">דירוג: %s</string>
+    <string name="extension_description">תיאור</string>
+    <string name="extension_version">גרסה</string>
+    <string name="extension_status">מצב</string>
+    <string name="extension_size">גודל</string>
+    <string name="extension_types">תומך</string>
+    <string name="extension_install_first">התקן תחילה את התוסף</string>
+    <string name="hls_playlist">פלייליסט HLS</string>
+    <string name="player_pref">נגן וידאו מועדף</string>
+    <string name="player_settings_play_in_app">נגן פנימי</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="app_not_found_error">האפליקציה לא נמצאה</string>
+    <string name="all_languages_preference">כל השפות</string>
+    <string name="skip_type_format" formatted="true">דלג %s</string>
+    <string name="skip_type_op">פתיח</string>
+    <string name="skip_type_ed">שיר סיום</string>
+    <string name="skip_type_recap">סיכום</string>
+    <string name="skip_type_mixed_ed">שיר סיום מעורב</string>
+    <string name="skip_type_intro">מבוא</string>
+    <string name="clear_history">נקה היסטוריה</string>
+    <string name="clipboard_too_large">יותר מדי טקסט. לא ניתן לשמור ללוח.</string>
+    <string name="action_remove_from_watched">הסר מצפייה</string>
+    <string name="confirm_exit_dialog">האם אתם בטוחים שאתם רוצים לצאת\?</string>
+    <string name="update_notification_downloading">מוריד עדכון אפליקציה…</string>
+    <string name="update_notification_installing">מתקין עדכון אפליקציה…</string>
+    <string name="delayed_update_notice">האפליקציה תעודכן עם היציאה</string>
+    <string name="sort_by">מיין לפי</string>
+    <string name="sort_rating_desc">דירוג (גבוה לנמוך)</string>
+    <string name="sort_rating_asc">דירוג (נמוך לגבוה)</string>
+    <string name="sort_updated_new">מעודכן (חדש לישן)</string>
+    <string name="sort_updated_old">מעודכן (ישן לחדש)</string>
+    <string name="sort_alphabetical_a">אלפביתי (א \'עד ת\')</string>
+    <string name="sort_alphabetical_z">אלפביתי (ת\' עד א\')</string>
+    <string name="open_with">פתח עם</string>
+    <string name="empty_library_logged_in_message">נראה שהרשימה הזו ריקה, נסו לעבור לרשימה אחרת</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e4b74300..c709f124 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -450,7 +450,7 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="cast_format" formatted="true">Obsada: %s</string>
     <string name="automatic_plugin_download_summary">Automatycznie instaluj wszystkie jeszcze niezainstalowane wtyczki z dodanych repozytoriów.</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Poster</string>
     <string name="skip_type_recap">Podsumowanie</string>
     <string name="apk_installer_settings">Instalator APK</string>
     <string name="apk_installer_settings_des">Niektóre telefony nie obsługują nowego instalatora pakietów. Wypróbuj tryb legacy, jeśli aktualizacje nie zostaną zainstalowane.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 537bdb7d..29e98598 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -24,7 +24,7 @@
     <string name="logout">Выйти</string>
     <string name="next_episode_format" formatted="true">Серия %d будет выпущен в</string>
     <string name="result_poster_img_des">Плакат</string>
-    <string name="search_poster_img_des">\@нить/результат_плокат_картинка_</string>
+    <string name="search_poster_img_des">Плакат</string>
     <string name="episode_poster_img_des">Постер Эпизода</string>
     <string name="home_main_poster_img_des">Главный постер</string>
     <string name="home_next_random_img_des">Следующий случайный</string>
@@ -58,7 +58,7 @@
     <string name="type_completed">Завершено</string>
     <string name="type_dropped">Брошенный</string>
     <string name="type_plan_to_watch">План посмотреть</string>
-    <string name="type_none">Никто</string>
+    <string name="type_none">Нет</string>
     <string name="type_re_watching">Пересмотрю</string>
     <string name="play_movie_button">Смотреть фильм</string>
     <string name="play_trailer_button">Воспроизвести трейлер</string>
@@ -70,7 +70,7 @@
     <string name="go_back">Вернуться</string>
     <string name="downloaded">Скачано</string>
     <string name="downloading">Скачивание</string>
-    <string name="download_paused">Скачать приостановленный</string>
+    <string name="download_paused">Скачать остановлена</string>
     <string name="download_started">Скачать начатый</string>
     <string name="download_canceled">Скачать отменённый</string>
     <string name="download_done">Скачать выполнено</string>
@@ -117,7 +117,7 @@
     <string name="popup_play_file">Проиграть файл</string>
     <string name="download_storage_text">Внутренняя память</string>
     <string name="popup_resume_download">Продолжить Скачать</string>
-    <string name="popup_pause_download">Приостановить скачивание</string>
+    <string name="popup_pause_download">Остановить скачивание</string>
     <string name="pref_disable_acra">Отключить автоматическое информирование об ошибках</string>
     <string name="subs_import_text" formatted="true">Импортируйте шрифты поместив их в %s</string>
     <string name="continue_watching">Продолжить смотреть</string>
@@ -169,7 +169,7 @@
     <string name="subs_default_reset_toast">Восстановить по умолчанию</string>
     <string name="acra_report_toast">Извините, приложение прекратило работу. Анонимный отчет об ошибке будет отправлен разработчикам</string>
     <string name="episode">Эпизод</string>
-    <string name="episodes">Эпизоды</string>
+    <string name="episodes">Эпизодов</string>
     <string name="season_short">С</string>
     <string name="episode_short">Э</string>
     <string name="no_episodes_found">Эпизоды не найдены</string>
@@ -179,7 +179,7 @@
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">Это будет удалено безвозвратно%s
 \nВы уверены\?</string>
-    <string name="resume_time_left" formatted="true">%dм
+    <string name="resume_time_left" formatted="true">%d мин.
 \nосталось</string>
     <string name="status_completed">Завершено</string>
     <string name="year">Год</string>
@@ -217,7 +217,7 @@
     <string name="torrent_singular">Торрент</string>
     <string name="documentaries_singular">Документальный</string>
     <string name="asian_drama_singular">Азиатская драма</string>
-    <string name="category_general">Основные</string>
+    <string name="category_general">Общие</string>
     <string name="category_providers">Провайдеры</string>
     <string name="category_ui">Макет</string>
     <string name="pref_category_extensions">Расширения</string>
@@ -249,7 +249,7 @@
     <string name="add_site_summary">Добавить клон существующего сайта с другим URL-адресом</string>
     <string name="dns_pref_summary">Используется для обхода блокировок интернет провайдера</string>
     <string name="download_path_pref">Путь скачивания</string>
-    <string name="benene_des">учитывая бенен</string>
+    <string name="benene_des">Давал бенен</string>
     <string name="update">Обновить</string>
     <string name="primary_color_settings">Основной цвет</string>
     <string name="provider_lang_settings">Языки поставщиков</string>
@@ -268,7 +268,7 @@
     <string name="plugin_deleted">Плагин удалён</string>
     <string name="extension_description">Описание</string>
     <string name="extension_version">Версия</string>
-    <string name="extension_status">Состояние</string>
+    <string name="extension_status">Статус</string>
     <string name="extension_size">Размер</string>
     <string name="extension_authors">Авторы</string>
     <string name="extension_types">Поддерживается</string>
@@ -302,7 +302,7 @@
     <string name="video_skip_op">Пропустить OP</string>
     <string name="dont_show_again">Больше не показывать</string>
     <string name="skip_update">Пропустить это обновление</string>
-    <string name="nginx_url_pref">URL-адрес NGINX-сервера</string>
+    <string name="nginx_url_pref">URL сервера NGINX</string>
     <string name="create_account">Создать учётную запись</string>
     <string name="add_sync">Добавить слежение</string>
     <string name="added_sync_format" formatted="true">Добавлено %s</string>
@@ -310,7 +310,7 @@
     <string name="sync_score">Оценено</string>
     <string name="sync_score_format" formatted="true">%d из 10</string>
     <string name="safe_mode_crash_info">Посмотреть информацию о сбое</string>
-    <string name="player_pref">Предпочитаемый видео-проигрыватель</string>
+    <string name="player_pref">Предпочитаемый видеоплеер</string>
     <string name="player_settings_play_in_browser">Веб-браузер</string>
     <string name="app_not_found_error">Приложение не найдено</string>
     <string name="all_languages_preference">Все языки</string>
@@ -328,7 +328,7 @@
     <string name="video_disk_description">Вызывает проблемы, если установлено слишком высокое значение на устройствах с небольшим объемом памяти, таких как Android TV.</string>
     <string name="lightnovel">Легкая новелла от тех же разработчиков</string>
     <string name="extension_language">Язык</string>
-    <string name="hls_playlist">HLS Плейлист</string>
+    <string name="hls_playlist">Плейлист HLS</string>
     <string name="extension_install_first">Сначала установить расширение</string>
     <string name="player_settings_play_in_app">Внутренний проигрыватель</string>
     <string name="synopsis">Синопсис</string>
@@ -340,7 +340,7 @@
     <string name="pref_category_player_features">Возможности плеера</string>
     <string name="pref_category_subtitles">Субтитры</string>
     <string name="bottom_title_settings">Расположение названия плаката</string>
-    <string name="tv_layout">TV</string>
+    <string name="tv_layout">ТV (телевидение)</string>
     <string name="phone_layout">Телефон</string>
     <string name="emulator_layout">Эмулятор</string>
     <string name="bottom_title_settings_des">Под плакатом</string>
@@ -364,7 +364,7 @@
     <string name="repository_url_hint">URL репозитория</string>
     <string name="plugin_loaded">Плагин загружен</string>
     <string name="action_open_play">\@string/home_play</string>
-    <string name="double_tap_to_seek_settings">Перемотка двойным касанием</string>
+    <string name="double_tap_to_seek_settings">Перемотка двойным нажатием</string>
     <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="is_adult">18+</string>
@@ -395,16 +395,16 @@
     <string name="authenticated_user" formatted="true">%s аутентифицировано</string>
     <string name="authenticated_user_fail" formatted="true">Не удается логин на %s</string>
     <string name="max">Макс</string>
-    <string name="min">Минимум</string>
-    <string name="subtitles_outline">Очертание</string>
-    <string name="subtitles_shadow">Тень</string>
+    <string name="min">Мин</string>
+    <string name="subtitles_outline">Контурный</string>
+    <string name="subtitles_shadow">С тенью</string>
     <string name="subtitle_offset_hint">1000 мс</string>
     <string name="subtitle_offset_title">Задержка субтитров</string>
     <string name="subtitle_offset_extra_hint_none_format">Без задержки субтитров</string>
     <string name="subtitle_offset_extra_hint_later_format">Используйте, если субтитры отображаются на %d мс слишком рано</string>
     <string name="subtitle_offset_extra_hint_before_format">Используйте, если субтитры отображаются %d мс слишком поздно</string>
     <string name="normal">Нормально</string>
-    <string name="subtitles_raised">Поднятие</string>
+    <string name="subtitles_raised">Поднятые</string>
     <string name="subtitles_example_text">Съешь ещё этих мягких французских булок, да выпей же чаю</string>
     <string name="recommended">Рекомендуется</string>
     <string name="player_loaded_subtitles" formatted="true">Загружено %s</string>
@@ -435,8 +435,8 @@
     <string name="browser">Браузер</string>
     <string name="library">Библиотека</string>
     <string name="sort_updated_old">Обновленный (старый - новый)</string>
-    <string name="sort_alphabetical_a">Алфавитный (А - Я)</string>
-    <string name="sort_alphabetical_z">Алфавитный (Я - А)</string>
+    <string name="sort_alphabetical_a">Алфавитный (А до Я)</string>
+    <string name="sort_alphabetical_z">Алфавитный (Я до А)</string>
     <string name="select_library">Выбрать библиотеку</string>
     <string name="open_with">Открыть с</string>
     <string name="empty_library_no_accounts_message">Похоже, ваша библиотека пуста :(
@@ -495,4 +495,11 @@
     <string name="network_adress_example">Ссылка на стрим</string>
     <string name="random_button_settings_desc">Отображать рандомную кнопку на Главной странице</string>
     <string name="random_button_settings">Рандомная кнопка</string>
+    <string name="apk_installer_legacy">Legacy (старый)</string>
+    <string name="player_settings_play_in_web">Веб видеокаст</string>
+    <string name="bug_report_settings_on">Не отправляет данные</string>
+    <string name="episode_action_reload_links">Перезагрузить ссылки</string>
+    <string name="preferred_media_settings">Предпочтительные медиа</string>
+    <string name="subtitles_depressed">Опущенные</string>
+    <string name="double_tap_to_seek_amount_settings">Объем перемотки плеера</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index bd245a61..807716d8 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -19,7 +19,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Afiş</string>
     <string name="episode_poster_img_des">Bölüm Posteri</string>
     <string name="home_main_poster_img_des">Ana Poster</string>
     <string name="home_next_random_img_des">Sonraki Rastgele</string>
@@ -537,4 +537,21 @@
     <string name="pref_category_actions">Aksiyonlar</string>
     <string name="enable_skip_op_from_database_des">Açma/bitiş için atlama açılır pencerelerini göster</string>
     <string name="clipboard_too_large">Çok fazla metin. Panoya kaydedilemiyor.</string>
+    <string name="library">Kütüphane</string>
+    <string name="browser">Tarayıcı</string>
+    <string name="empty_library_no_accounts_message">Görünüşe göre kütüphaneniz boş :(
+\nBir kütüphane hesabına giriş yapın veya yerel kütüphanenize gösteri ekleyin</string>
+    <string name="safe_mode_file">Güvenli mod dosyası bulundu!
+\nDosya kaldırılana kadar başlangıçta herhangi bir uzantı yüklenmiyor.</string>
+    <string name="sort_by">Sırala</string>
+    <string name="sort">Sırala</string>
+    <string name="sort_updated_new">Güncel (Yeniden Eskiye)</string>
+    <string name="sort_updated_old">Güncel (Eskiden Yeniye)</string>
+    <string name="sort_alphabetical_a">Alfabetik (A\'dan Z’ye)</string>
+    <string name="sort_alphabetical_z">Alfabetik (Z - A)</string>
+    <string name="select_library">Kütüphane Seçin</string>
+    <string name="open_with">Şununla aç</string>
+    <string name="empty_library_logged_in_message">Görünüşe göre bu liste boş, başka bir listeye geçmeyi deneyin</string>
+    <string name="sort_rating_desc">Derecelendirme (Yüksekten Düşüğe)</string>
+    <string name="sort_rating_asc">Derecelendirme (Düşükten Yükseğe)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 821d062a..82baa6b4 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Постер</string>
     <string name="episode_poster_img_des">Постер епізоду</string>
     <string name="download_canceled">Завантаження скасовано</string>
     <string name="home_change_provider_img_des">Змінити постачальника</string>
     <string name="go_back_img_des">Назад</string>
     <string name="rated_format" formatted="true">Рейтинг: %.1f</string>
     <string name="cast_format" formatted="true">Актори: %s</string>
-    <string name="next_episode_format" formatted="true">Епізод %d буде випущено в</string>
+    <string name="next_episode_format" formatted="true">Епізод %d буде випущено через</string>
     <string name="result_poster_img_des">Poster</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Еп. %d</string>
     <string name="next_episode_time_day_format" formatted="true">%dд %dгод %dхв</string>
@@ -35,12 +35,12 @@
     <string name="type_completed">Завершено</string>
     <string name="type_plan_to_watch">Заплановано</string>
     <string name="type_dropped">Покинуто</string>
-    <string name="play_movie_button">Відтворити фільм</string>
-    <string name="play_trailer_button">Відтворити трейлер</string>
-    <string name="play_torrent_button">Відтворити торрент</string>
+    <string name="play_movie_button">Переглянути фільм</string>
+    <string name="play_trailer_button">Переглянути трейлер</string>
+    <string name="play_torrent_button">Переглянути торрент</string>
     <string name="reload_error">Повторити підключення…</string>
     <string name="go_back">Назад</string>
-    <string name="play_episode">Відтворити епізод</string>
+    <string name="play_episode">Переглянути епізод</string>
     <string name="downloaded">Завантажено</string>
     <string name="downloading">Завантаження</string>
     <string name="download_done">Завантаження завершено</string>
@@ -50,8 +50,8 @@
     <string name="popup_resume_download">Відновити завантаження</string>
     <string name="pref_disable_acra">Вимкнути відправку повідомлень про помилки</string>
     <string name="home_expanded_hide">Сховати</string>
-    <string name="home_play">Відтворити</string>
-    <string name="home_info">Інформація</string>
+    <string name="home_play">Переглянути</string>
+    <string name="home_info">Інфо</string>
     <string name="error_bookmarks_text">Закладки</string>
     <string name="action_remove_from_bookmarks">Вилучити</string>
     <string name="action_add_to_bookmarks">Змінити статус перегляду</string>
@@ -99,7 +99,7 @@
     <string name="type_on_hold">Відкладено</string>
     <string name="type_re_watching">Повторний перегляд</string>
     <string name="download">Завантажити</string>
-    <string name="play_livestream_button">Відтворити трансляцію</string>
+    <string name="play_livestream_button">Переглянути трансляцію</string>
     <string name="pick_source">Джерела</string>
     <string name="pick_subtitle">Субтитри</string>
     <string name="download_storage_text">Внутрішнє сховище</string>
@@ -109,7 +109,7 @@
     <string name="update_started">Оновлення розпочато</string>
     <string name="error_loading_links_toast">Помилка завантаження посилань</string>
     <string name="popup_pause_download">Призупинити завантаження</string>
-    <string name="popup_play_file">Відтворити файл</string>
+    <string name="popup_play_file">Переглянути файл</string>
     <string name="home_more_info">Детальніше</string>
     <string name="filter_bookmarks">Фільтр закладок</string>
     <string name="type_none">Нічого</string>
@@ -165,10 +165,10 @@
     <string name="app_language">Мова програми</string>
     <string name="no_chromecast_support_toast">Цей постачальник не має підтримки Chromecast</string>
     <string name="no_links_found_toast">Посилань не знайдено</string>
-    <string name="play_episode_toast">Відтворити епізод</string>
+    <string name="play_episode_toast">Переглянути епізод</string>
     <string name="subs_default_reset_toast">Скинути до значення за замовчуванням</string>
     <string name="no_season">Немає сезону</string>
-    <string name="episodes">Епізоди</string>
+    <string name="episodes">епізодів</string>
     <string name="episode_format" formatted="true">%d %s</string>
     <string name="season_short">С</string>
     <string name="episode_short">Е</string>
@@ -208,8 +208,8 @@
     <string name="remote_error">Віддалена помилка</string>
     <string name="render_error">Помилка рендеринга</string>
     <string name="episode_action_chromecast_mirror">Дзеркало Chromecast</string>
-    <string name="episode_action_play_in_app">Відтворити в програмі</string>
-    <string name="episode_action_play_in_format">Відтворити в %s</string>
+    <string name="episode_action_play_in_app">Переглянути в програмі</string>
+    <string name="episode_action_play_in_format">Переглянути в %s</string>
     <string name="episode_action_auto_download">Автозавантаження</string>
     <string name="episode_action_download_mirror">Завантажити дзеркало</string>
     <string name="check_for_update">Перевірити наявність оновлень</string>
@@ -259,7 +259,7 @@
     <string name="torrent_singular">Торрент</string>
     <string name="show_hd">Мітка якості</string>
     <string name="nsfw_singular">NSFW</string>
-    <string name="episode_action_play_in_browser">Відтворити в браузері</string>
+    <string name="episode_action_play_in_browser">Переглянути в браузері</string>
     <string name="unexpected_error">Несподівана помилка плеєра</string>
     <string name="storage_error">Помилка завантаження, перевірте дозволи на зберігання</string>
     <string name="episode_action_chromecast_episode">Епізод Chromecast</string>
@@ -504,4 +504,6 @@
     <string name="open_with">Відкрити з</string>
     <string name="browser">Браузер</string>
     <string name="empty_library_logged_in_message">Схоже, цей список порожній, спробуйте перейти до іншого</string>
+    <string name="safe_mode_file">Файл безпечного режиму знайдено!
+\nРозширеня не завантажуються під час запуску, доки файл не буде видалено.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index ece917d9..c57e3ca1 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -19,7 +19,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">封面</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">封面</string>
     <string name="episode_poster_img_des">剧集封面</string>
     <string name="home_main_poster_img_des">主封面</string>
     <string name="home_next_random_img_des">随机下一个</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a4375ce3..3158a7a2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
-<resources>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
     <!-- KEYS DON'T TRANSLATE -->
     <string name="search_providers_list_key" translatable="false">search_providers_list</string>
     <string name="locale_key" translatable="false">app_locale</string>
@@ -80,7 +79,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Poster</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
@@ -614,7 +613,6 @@
     <string name="update_notification_downloading">Downloading app update…</string>
     <string name="update_notification_installing">Installing app update…</string>
     <string name="update_notification_failed">Could not install the new version of the app</string>
-
     <string name="apk_installer_legacy">Legacy</string>
     <string name="apk_installer_package_installer">PackageInstaller</string>
     <string name="delayed_update_notice">App will be updated upon exit</string>
@@ -631,4 +629,4 @@
     <string name="empty_library_no_accounts_message">Looks like your library is empty :(\nLogin to a library account or add shows to your local library</string>
     <string name="empty_library_logged_in_message">Looks like this list is empty, try switching to another one</string>
     <string name="safe_mode_file">Safe mode file found!\nNot loading any extensions on startup until file is removed.</string>
-</resources>
+</resources>
\ No newline at end of file

From ff9942407b83851dd6c71b9ed4217ecba06e2f2a Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Tue, 7 Feb 2023 10:11:23 +0000
Subject: [PATCH 212/273] use language a better language code for the easter
 egg

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt   | 2 +-
 app/src/main/res/{values-mo => values-monke}/strings.xml        | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename app/src/main/res/{values-mo => values-monke}/strings.xml (100%)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index b5a0a689..4f3924d4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -76,7 +76,7 @@ val appLanguages = arrayListOf(
     Triple("", "ಕನ್ನಡ", "kn"),
     Triple("", "македонски јазик", "mk"),
     Triple("", "മലയാളം", "ml"),
-    Triple("🦍", "Monke", "mo"),
+    Triple("🦍", "mmmm... monke", "monke"),
     Triple("", "Nederlands", "nl"),
     Triple("", "Norsk nynorsk", "nn"),
     Triple("", "Norsk", "no"),
diff --git a/app/src/main/res/values-mo/strings.xml b/app/src/main/res/values-monke/strings.xml
similarity index 100%
rename from app/src/main/res/values-mo/strings.xml
rename to app/src/main/res/values-monke/strings.xml

From a148f347cd086d648a12d6c7782937e97780e281 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Tue, 7 Feb 2023 11:15:00 +0100
Subject: [PATCH 213/273] [skip ci] issue action.yml

---
 .github/workflows/issue_action.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/issue_action.yml b/.github/workflows/issue_action.yml
index 2a54857c..108cec82 100644
--- a/.github/workflows/issue_action.yml
+++ b/.github/workflows/issue_action.yml
@@ -15,6 +15,7 @@ jobs:
           app_id: ${{ secrets.GH_APP_ID }}
           private_key: ${{ secrets.GH_APP_KEY }}
       - name: Similarity analysis
+        id: similarity
         uses: actions-cool/issues-similarity-analysis@v1
         with:
           token: ${{ steps.generate_token.outputs.token }}
@@ -24,6 +25,18 @@ jobs:
             ### Your issue looks similar to these issues:
             Please close if duplicate.
           comment-body: '${index}. ${similarity} #${number}'
+      - name: Label if possible duplicate
+        if: steps.similarity.outputs.similar-issues-found =='true'
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ["possible duplicate"]
+            })
       - uses: actions/checkout@v2
       - name: Automatically close issues that dont follow the issue template
         uses: lucasbento/auto-close-issues@v1.0.2

From bf78fc95c2512628f28eb41ffefe143fc0100340 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Tue, 7 Feb 2023 10:21:07 +0000
Subject: [PATCH 214/273] use en-rMO

---
 .../lagradost/cloudstream3/ui/settings/SettingsGeneral.kt    | 5 +++--
 app/src/main/res/{values-monke => values-en-rMO}/strings.xml | 0
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename app/src/main/res/{values-monke => values-en-rMO}/strings.xml (100%)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 4f3924d4..c8ae3d35 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -63,6 +63,7 @@ val appLanguages = arrayListOf(
     Triple("", "čeština", "cs"),
     Triple("", "Deutsch", "de"),
     Triple("", "ελληνικά", "el"),
+    Triple("", "English", "en"),
     Triple("", "Esperanto", "eo"),
     Triple("", "Español", "es"),
     Triple("", "فارسی", "fa"),
@@ -70,13 +71,13 @@ val appLanguages = arrayListOf(
     Triple("", "हिन्दी", "hi"),
     Triple("", "hrvatski jezik", "hr"),
     Triple("", "magyar", "hu"),
-    Triple("", "in", "in"),
+    Triple("\uD83C\uDDEE\uD83C\uDDE9", "Indonesian", "in"),
     Triple("", "Italiano", "it"),
     Triple("\uD83C\uDDEE\uD83C\uDDF1", "עִברִית", "iw"),
     Triple("", "ಕನ್ನಡ", "kn"),
     Triple("", "македонски јазик", "mk"),
     Triple("", "മലയാളം", "ml"),
-    Triple("🦍", "mmmm... monke", "monke"),
+    Triple("🦍", "mmmm... monke", "en-rMO"),
     Triple("", "Nederlands", "nl"),
     Triple("", "Norsk nynorsk", "nn"),
     Triple("", "Norsk", "no"),
diff --git a/app/src/main/res/values-monke/strings.xml b/app/src/main/res/values-en-rMO/strings.xml
similarity index 100%
rename from app/src/main/res/values-monke/strings.xml
rename to app/src/main/res/values-en-rMO/strings.xml

From 80f22cea167eddf22993a7ce06045f21aa7da488 Mon Sep 17 00:00:00 2001
From: "recloudstream[bot]"
 <111277985+recloudstream[bot]@users.noreply.github.com>
Date: Tue, 7 Feb 2023 10:21:26 +0000
Subject: [PATCH 215/273] update list of locales

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index c8ae3d35..06c50131 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -64,6 +64,7 @@ val appLanguages = arrayListOf(
     Triple("", "Deutsch", "de"),
     Triple("", "ελληνικά", "el"),
     Triple("", "English", "en"),
+    Triple("🦍", "mmmm... monke", "en-rMO"),
     Triple("", "Esperanto", "eo"),
     Triple("", "Español", "es"),
     Triple("", "فارسی", "fa"),
@@ -77,7 +78,6 @@ val appLanguages = arrayListOf(
     Triple("", "ಕನ್ನಡ", "kn"),
     Triple("", "македонски јазик", "mk"),
     Triple("", "മലയാളം", "ml"),
-    Triple("🦍", "mmmm... monke", "en-rMO"),
     Triple("", "Nederlands", "nl"),
     Triple("", "Norsk nynorsk", "nn"),
     Triple("", "Norsk", "no"),

From f6be6081dc822fc1cd98c19b86d2a061cede426d Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Tue, 7 Feb 2023 11:52:02 +0000
Subject: [PATCH 216/273] use qt for monke language

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt   | 2 +-
 app/src/main/res/{values-en-rMO => values-qt}/strings.xml       | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename app/src/main/res/{values-en-rMO => values-qt}/strings.xml (100%)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 06c50131..af49060b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -64,7 +64,7 @@ val appLanguages = arrayListOf(
     Triple("", "Deutsch", "de"),
     Triple("", "ελληνικά", "el"),
     Triple("", "English", "en"),
-    Triple("🦍", "mmmm... monke", "en-rMO"),
+    Triple("🦍", "mmmm... monke", "qt"),
     Triple("", "Esperanto", "eo"),
     Triple("", "Español", "es"),
     Triple("", "فارسی", "fa"),
diff --git a/app/src/main/res/values-en-rMO/strings.xml b/app/src/main/res/values-qt/strings.xml
similarity index 100%
rename from app/src/main/res/values-en-rMO/strings.xml
rename to app/src/main/res/values-qt/strings.xml

From 45eb9758e3ba33839ef9206883f01fbda5709d28 Mon Sep 17 00:00:00 2001
From: "recloudstream[bot]"
 <111277985+recloudstream[bot]@users.noreply.github.com>
Date: Tue, 7 Feb 2023 11:52:20 +0000
Subject: [PATCH 217/273] update list of locales

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index af49060b..649aa634 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -64,7 +64,6 @@ val appLanguages = arrayListOf(
     Triple("", "Deutsch", "de"),
     Triple("", "ελληνικά", "el"),
     Triple("", "English", "en"),
-    Triple("🦍", "mmmm... monke", "qt"),
     Triple("", "Esperanto", "eo"),
     Triple("", "Español", "es"),
     Triple("", "فارسی", "fa"),
@@ -83,6 +82,7 @@ val appLanguages = arrayListOf(
     Triple("", "Norsk", "no"),
     Triple("", "język polski", "pl"),
     Triple("\uD83C\uDDF5\uD83C\uDDF9", "Português", "pt"),
+    Triple("🦍", "mmmm... monke", "qt"),
     Triple("", "Română", "ro"),
     Triple("", "Русский", "ru"),
     Triple("", "slovenčina", "sk"),

From 19b2cae851e309a5fa2b4aca3520bbfa60a3c0ba Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Tue, 7 Feb 2023 12:52:11 +0100
Subject: [PATCH 218/273] Translated using Weblate (English (en_MO))

Currently translated at 47.9% (279 of 582 strings)

Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/en_MO/
Translation: Cloudstream/App
---
 app/src/main/res/values-qt/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-qt/strings.xml b/app/src/main/res/values-qt/strings.xml
index 361aaf56..24c51a05 100644
--- a/app/src/main/res/values-qt/strings.xml
+++ b/app/src/main/res/values-qt/strings.xml
@@ -122,7 +122,7 @@
     <string name="episode_short">A</string>
     <string name="delete_file">ooha ohahaaahoooa ahahooo</string>
     <string name="delete">oooooah</string>
-    <string name="delete_message">aahhaaaaaahooo aauuh aaahhuaooo-ahahoooohh aoouuhoohoohooo-ahah</string>
+    <string name="delete_message">aahhaaaaaahooo aauuh aaahhuaooo-ahahoooohh aoouuhoohoohooo-ahah %s</string>
     <string name="status_ongoing">aaaghhaaaaa</string>
     <string name="status_completed">aauuhaauuh</string>
     <string name="status">ahhhaaaaa</string>
@@ -145,7 +145,7 @@
     <string name="episode_action_chromecast_episode">aauugghhooo-ahah ohaaauugghh</string>
     <string name="episode_action_chromecast_mirror">aoohaaahhu ahouuhhh</string>
     <string name="episode_action_play_in_app">ooo-ahahaauuh aaahhu</string>
-    <string name="episode_action_play_in_format">ooo-ahah ohaauuh</string>
+    <string name="episode_action_play_in_format">ooo-ahah ohaauuh %s</string>
     <string name="episode_action_play_in_browser">ahoha ooo-ahahohoohah oooohh</string>
     <string name="episode_action_copy_link">aauugghhahhaauugghh</string>
     <string name="episode_action_auto_download">aaaghhoooohh aaahhu ahooo</string>
@@ -195,5 +195,5 @@
     <string name="phone_layout">u ooah uo ahauao huhuu hauu h</string>
     <string name="primary_color_settings">a ou oh ouhuouhoaaha</string>
     <string name="show_fillers_settings">aaooohhouhhha hauauuu</string>
-    <string name="new_update_format">aaaaaaa uuuuuu\n%s -> %s</string>
+    <string name="new_update_format">aaaaaaa uuuuuu\n%s -&gt; %s</string>
 </resources>
\ No newline at end of file

From 329966732f9ffaaae4e8e3079d642a502bcc0b48 Mon Sep 17 00:00:00 2001
From: LagradOst <46196380+Blatzar@users.noreply.github.com>
Date: Tue, 7 Feb 2023 16:01:14 +0000
Subject: [PATCH 219/273] increased app update buffer size

---
 .../java/com/lagradost/cloudstream3/utils/PackageInstaller.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt
index 6b6d3928..bc81a5b9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt
@@ -91,7 +91,7 @@ class ApkInstaller(private val service: PackageInstallerService) {
 
             session.openWrite(context.packageName, 0, size)
                 .use { outputStream ->
-                    val buffer = ByteArray(1024)
+                    val buffer = ByteArray(4 * 1024)
                     var bytesRead = inputStream.read(buffer)
 
                     while (bytesRead >= 0) {
@@ -100,6 +100,7 @@ class ApkInstaller(private val service: PackageInstallerService) {
                         installProgress.invoke(bytesRead)
                     }
 
+                    session.fsync(outputStream)
                     inputStream.close()
                 }
 

From 6c646d65a82fdc9f6e74e58c5539aec78a286ffa Mon Sep 17 00:00:00 2001
From: Terry Hanoman <TerHano@users.noreply.github.com>
Date: Wed, 8 Feb 2023 10:46:39 -0500
Subject: [PATCH 220/273] Use user setting for seeking on Android TV (#342)

* Use user setting for seeking on Android TV

* Fixed left dpad seeking

* Added a Android TV section for seeking

* Fixed text

* Removed semi-colons
---
 .../ui/player/FullScreenPlayer.kt             | 17 +++++++++---
 app/src/main/res/values-es/strings.xml        |  4 +++
 app/src/main/res/values/strings.xml           |  7 +++++
 app/src/main/res/xml/settings_player.xml      | 27 +++++++++++++++++++
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 2dad05ef..8d28fd9d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -109,6 +109,8 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     protected var currentPrefQuality =
         Qualities.P2160.value // preferred maximum quality, used for ppl w bad internet or on cell
     protected var fastForwardTime = 10000L
+    protected var androidTVInterfaceOffSeekTime = 10000L;
+    protected var androidTVInterfaceOnSeekTime = 30000L;
     protected var swipeHorizontalEnabled = false
     protected var swipeVerticalEnabled = false
     protected var playBackSpeedEnabled = false
@@ -1051,19 +1053,19 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                             }
                             KeyEvent.KEYCODE_DPAD_LEFT -> {
                                 if (!isShowing && !isLocked) {
-                                    player.seekTime(-10000L)
+                                    player.seekTime(-androidTVInterfaceOffSeekTime)
                                     return true
                                 } else if (player_pause_play?.isFocused == true) {
-                                    player.seekTime(-30000L)
+                                    player.seekTime(-androidTVInterfaceOnSeekTime)
                                     return true
                                 }
                             }
                             KeyEvent.KEYCODE_DPAD_RIGHT -> {
                                 if (!isShowing && !isLocked) {
-                                    player.seekTime(10000L)
+                                    player.seekTime(androidTVInterfaceOffSeekTime)
                                     return true
                                 } else if (player_pause_play?.isFocused == true) {
-                                    player.seekTime(30000L)
+                                    player.seekTime(androidTVInterfaceOnSeekTime)
                                     return true
                                 }
                             }
@@ -1207,6 +1209,13 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                     settingsManager.getInt(ctx.getString(R.string.double_tap_seek_time_key), 10)
                         .toLong() * 1000L
 
+                androidTVInterfaceOffSeekTime =
+                    settingsManager.getInt(ctx.getString(R.string.android_tv_interface_off_seek_key), 10)
+                        .toLong() * 1000L
+                androidTVInterfaceOnSeekTime =
+                    settingsManager.getInt(ctx.getString(R.string.android_tv_interface_on_seek_key), 10)
+                        .toLong() * 1000L
+
                 navigationBarHeight = ctx.getNavigationBarHeight()
                 statusBarHeight = ctx.getStatusBarHeight()
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5b6f6f55..d253e256 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -506,4 +506,8 @@
 \nInicia sesión en una cuenta de biblioteca o añade series desde tu biblioteca local</string>
     <string name="safe_mode_file">¡Se encontró un archivo en modo seguro!
 \nNo cargar ninguna extensión al inicio hasta que se elimine el archivo.</string>
+    <string name="android_tv_interface_on_seek_settings">Jugadora mostrada - buscar cantidad</string>
+    <string name="android_tv_interface_off_seek_settings">Jugadora oculta - buscar cantidad</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="android_tv_interface_on_seek_settings_summary">La cantidad de búsqueda utilizada cuando la jugadora es visible.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3158a7a2..778f34c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,6 +31,8 @@
     <string name="double_tap_enabled_key" translatable="false">double_tap_enabled_key</string>
     <string name="double_tap_pause_enabled_key" translatable="false">double_tap_pause_enabled_key</string>
     <string name="double_tap_seek_time_key" translatable="false">double_tap_seek_time_key2</string>
+    <string name="android_tv_interface_off_seek_key" translatable="false">android_tv_interface_off_seek_key</string>
+    <string name="android_tv_interface_on_seek_key" translatable="false">android_tv_interface_on_seek_key</string>
     <string name="swipe_vertical_enabled_key" translatable="false">swipe_vertical_enabled_key</string>
     <string name="autoplay_next_key" translatable="false">autoplay_next_key</string>
     <string name="display_sub_key" translatable="false">display_sub_key</string>
@@ -363,6 +365,10 @@
     <string name="video_buffer_length_settings">Video buffer length</string>
     <string name="video_buffer_disk_settings">Video cache on disk</string>
     <string name="video_buffer_clear_settings">Clear video and image cache</string>
+    <string name="android_tv_interface_on_seek_settings">Player Shown - Seek Amount</string>
+    <string name="android_tv_interface_on_seek_settings_summary">The seek amount used when the player is visible</string>
+    <string name="android_tv_interface_off_seek_settings">Player Hidden - Seek Amount</string>
+    <string name="android_tv_interface_off_seek_settings_summary">The seek amount used when the player is hidden</string>
     <string name="video_ram_description">Causes crashes if set too high on devices with low memory, such as Android TV.</string>
     <string name="video_disk_description">Causes problems if set too high on devices with low storage space, such as Android TV.</string>
     <string name="dns_pref">DNS over HTTPS</string>
@@ -400,6 +406,7 @@
     <string name="pref_category_extensions">Extensions</string>
     <string name="pref_category_actions">Actions</string>
     <string name="pref_category_cache">Cache</string>
+    <string name="pref_category_android_tv">Android TV</string>
     <string name="pref_category_gestures">Gestures</string>
     <string name="pref_category_player_features">Player features</string>
     <string name="pref_category_subtitles">Subtitles</string>
diff --git a/app/src/main/res/xml/settings_player.xml b/app/src/main/res/xml/settings_player.xml
index d9b7e247..0e5bd84f 100644
--- a/app/src/main/res/xml/settings_player.xml
+++ b/app/src/main/res/xml/settings_player.xml
@@ -149,4 +149,31 @@
             android:key="@string/video_buffer_clear_key"
             android:title="@string/video_buffer_clear_settings" />
     </PreferenceCategory>
+    <PreferenceCategory
+        android:title="@string/pref_category_android_tv">
+        <SeekBarPreference
+            android:defaultValue="10"
+            android:max="60"
+            android:title="@string/android_tv_interface_on_seek_settings"
+            android:summary="@string/android_tv_interface_on_seek_settings_summary"
+            app:adjustable="true"
+            app:defaultValue="30"
+            app:icon="@drawable/go_forward_30"
+            app:key="@string/android_tv_interface_on_seek_key"
+            app:min="5"
+            app:seekBarIncrement="5"
+            app:showSeekBarValue="true" />
+        <SeekBarPreference
+            android:defaultValue="10"
+            android:max="60"
+            android:title="@string/android_tv_interface_off_seek_settings"
+            android:summary="@string/android_tv_interface_off_seek_settings_summary"
+            app:adjustable="true"
+            app:defaultValue="10"
+            app:icon="@drawable/go_forward_30"
+            app:key="@string/android_tv_interface_off_seek_key"
+            app:min="5"
+            app:seekBarIncrement="5"
+            app:showSeekBarValue="true" />
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file

From 3e2c2a5c86b93b9cd29ff1b8fd27a4a32a163a86 Mon Sep 17 00:00:00 2001
From: Sir Aguacata <87155550+KillerDogeEmpire@users.noreply.github.com>
Date: Wed, 8 Feb 2023 15:58:15 -0800
Subject: [PATCH 221/273] Added a way for easy mal and anilist tracker (#359)

* Added a way for easy mal and anilist tracker, All credit gos to Hexated for helping me

* Made CodeFactor Fucking Happy

* prettified the getTracker method

* remove parenthesis

* fixed

---------

Co-authored-by: Blatzar <46196380+Blatzar@users.noreply.github.com>
Co-authored-by: reduplicated <110570621+reduplicated@users.noreply.github.com>
---
 .../com/lagradost/cloudstream3/MainAPI.kt     | 108 +++++++++++++++++-
 1 file changed, 105 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 73859021..4014e34d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -15,12 +15,9 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniList
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
 import com.lagradost.cloudstream3.ui.player.SubtitleData
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.ui.result.UiText
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
-import com.lagradost.cloudstream3.utils.ExtractorLink
 import okhttp3.Interceptor
 import java.text.SimpleDateFormat
 import java.util.*
@@ -163,6 +160,53 @@ object APIHolder {
         return null
     }
 
+    private var trackerCache: HashMap<String, AniSearch> = hashMapOf()
+
+    /**
+     * Get anime tracker information based on title, year and type.
+     * Both titles are attempted to be matched with both Romaji and English title.
+     * Uses the consumet api.
+     *
+     * @param titles uses first index to search, but if you have multiple titles and want extra guarantee to match you can also have that
+     * @param types Optional parameter to narrow down the scope to Movies, TV, etc. See TrackerType.getTypes()
+     * @param year Optional parameter to only get anime with a specific year
+     **/
+    suspend fun getTracker(
+        titles: List<String>,
+        types: Set<TrackerType>?,
+        year: Int?
+    ): Tracker? {
+        return try {
+            require(titles.isNotEmpty()) { "titles must no be empty when calling getTracker" }
+
+            val mainTitle = titles[0]
+            val search =
+                trackerCache[mainTitle]
+                    ?: app.get("https://api.consumet.org/meta/anilist/$mainTitle")
+                        .parsedSafe<AniSearch>()?.also {
+                            trackerCache[mainTitle] = it
+                        } ?: return null
+
+            val res = search.results?.find { media ->
+                val matchingYears = year == null || media.releaseDate == year
+                val matchingTitles = media.title?.let { title ->
+                    titles.any { userTitle ->
+                        title.isMatchingTitles(userTitle)
+                    }
+                } ?: false
+
+                val matchingTypes = types?.any { it.name.equals(media.type, true) } == true
+                matchingTitles && matchingTypes && matchingYears
+            } ?: return null
+
+            Tracker(res.malId, res.aniId, res.image, res.cover)
+        } catch (t: Throwable) {
+            logError(t)
+            null
+        }
+    }
+
+
     fun Context.getApiSettings(): HashSet<String> {
         //val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
 
@@ -1590,3 +1634,61 @@ fun fetchUrls(text: String?): List<String> {
 
 fun String?.toRatingInt(): Int? =
     this?.replace(" ", "")?.trim()?.toDoubleOrNull()?.absoluteValue?.times(1000f)?.toInt()
+
+data class Tracker(
+    val malId: Int? = null,
+    val aniId: String? = null,
+    val image: String? = null,
+    val cover: String? = null,
+)
+
+data class Title(
+    @JsonProperty("romaji") val romaji: String? = null,
+    @JsonProperty("english") val english: String? = null,
+) {
+    fun isMatchingTitles(title: String?): Boolean {
+        if (title == null) return false
+        return english.equals(title, true) || romaji.equals(title, true)
+    }
+}
+
+data class Results(
+    @JsonProperty("id") val aniId: String? = null,
+    @JsonProperty("malId") val malId: Int? = null,
+    @JsonProperty("title") val title: Title? = null,
+    @JsonProperty("releaseDate") val releaseDate: Int? = null,
+    @JsonProperty("type") val type: String? = null,
+    @JsonProperty("image") val image: String? = null,
+    @JsonProperty("cover") val cover: String? = null,
+)
+
+data class AniSearch(
+    @JsonProperty("results") val results: ArrayList<Results>? = arrayListOf()
+)
+
+/**
+ * used for the getTracker() method
+ **/
+enum class TrackerType {
+    MOVIE,
+    TV,
+    TV_SHORT,
+    ONA,
+    OVA,
+    SPECIAL,
+    MUSIC;
+
+    companion object {
+        fun getTypes(type: TvType): Set<TrackerType> {
+            return when (type) {
+                TvType.Movie -> setOf(MOVIE)
+                TvType.AnimeMovie -> setOf(MOVIE)
+                TvType.TvSeries -> setOf(TV, TV_SHORT)
+                TvType.Anime -> setOf(TV, TV_SHORT, ONA, OVA)
+                TvType.OVA -> setOf(OVA, SPECIAL, ONA)
+                TvType.Others -> setOf(MUSIC)
+                else -> emptySet()
+            }
+        }
+    }
+}

From 4596afee06a4c8b95423c9f406bc4e912823c484 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Thu, 9 Feb 2023 01:32:48 +0100
Subject: [PATCH 222/273] auto track anilist/mal

---
 .../ui/result/ResultViewModel2.kt             | 166 +++++++++++-------
 1 file changed, 102 insertions(+), 64 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 6817af6a..26237771 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -25,6 +25,7 @@ import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
 import com.lagradost.cloudstream3.LoadResponse.Companion.isMovie
 import com.lagradost.cloudstream3.metaproviders.SyncRedirector
 import com.lagradost.cloudstream3.mvvm.*
+import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.providers.Kitsu
 import com.lagradost.cloudstream3.ui.APIRepository
@@ -1422,85 +1423,122 @@ class ResultViewModel2 : ViewModel() {
         meta: SyncAPI.SyncResult?,
         syncs: Map<String, String>? = null
     ): Pair<LoadResponse, Boolean> {
-        if (meta == null) return resp to false
+        //if (meta == null) return resp to false
         var updateEpisodes = false
         val out = resp.apply {
             Log.i(TAG, "applyMeta")
 
-            duration = duration ?: meta.duration
-            rating = rating ?: meta.publicScore
-            tags = tags ?: meta.genres
-            plot = if (plot.isNullOrBlank()) meta.synopsis else plot
-            posterUrl = posterUrl ?: meta.posterUrl ?: meta.backgroundPosterUrl
-            actors = actors ?: meta.actors
+            if (meta != null) {
+                duration = duration ?: meta.duration
+                rating = rating ?: meta.publicScore
+                tags = tags ?: meta.genres
+                plot = if (plot.isNullOrBlank()) meta.synopsis else plot
+                posterUrl = posterUrl ?: meta.posterUrl ?: meta.backgroundPosterUrl
+                actors = actors ?: meta.actors
 
-            if (this is EpisodeResponse) {
-                nextAiring = nextAiring ?: meta.nextAiring
+                if (this is EpisodeResponse) {
+                    nextAiring = nextAiring ?: meta.nextAiring
+                }
+
+                val realRecommendations = ArrayList<SearchResponse>()
+                val apiNames = apis.filter {
+                    it.name.contains("gogoanime", true) ||
+                            it.name.contains("9anime", true)
+                }.map {
+                    it.name
+                }
+
+                meta.recommendations?.forEach { rec ->
+                    apiNames.forEach { name ->
+                        realRecommendations.add(rec.copy(apiName = name))
+                    }
+                }
+
+                recommendations = recommendations?.union(realRecommendations)?.toList()
+                    ?: realRecommendations
             }
 
             for ((k, v) in syncs ?: emptyMap()) {
                 syncData[k] = v
             }
 
-            val realRecommendations = ArrayList<SearchResponse>()
-            // TODO: fix
-            val apiNames = apis.filter {
-                it.name.contains("gogoanime", true) ||
-                        it.name.contains("9anime", true)
-            }.map {
-                it.name
-            }
-
-            meta.recommendations?.forEach { rec ->
-                apiNames.forEach { name ->
-                    realRecommendations.add(rec.copy(apiName = name))
-                }
-            }
-
-            recommendations = recommendations?.union(realRecommendations)?.toList()
-                ?: realRecommendations
-
-            argamap({
-                addTrailer(meta.trailers)
-            }, {
-                if (this !is AnimeLoadResponse) return@argamap
-                val map =
-                    Kitsu.getEpisodesDetails(
-                        getMalId(),
-                        getAniListId(),
-                        isResponseRequired = false
+            argamap(
+                {
+                    if (this !is AnimeLoadResponse) return@argamap
+                    val res = APIHolder.getTracker(
+                        listOfNotNull(
+                            this.engName,
+                            this.name,
+                            this.japName
+                        ).distinct(), TrackerType.getTypes(this.type), this.year
                     )
-                if (map.isNullOrEmpty()) return@argamap
-                updateEpisodes = DubStatus.values().map { dubStatus ->
-                    val current =
-                        this.episodes[dubStatus]?.mapIndexed { index, episode ->
-                            episode.apply {
-                                this.episode = this.episode ?: (index + 1)
-                            }
-                        }?.sortedBy { it.episode ?: 0 }?.toMutableList()
-                    if (current.isNullOrEmpty()) return@map false
-                    val episodeNumbers = current.map { ep -> ep.episode!! }
-                    var updateCount = 0
-                    map.forEach { (episode, node) ->
-                        episodeNumbers.binarySearch(episode).let { index ->
-                            current.getOrNull(index)?.let { currentEp ->
-                                current[index] = currentEp.apply {
-                                    updateCount++
-                                    val currentBack = this
-                                    this.description = this.description ?: node.description?.en
-                                    this.name = this.name ?: node.titles?.canonical
-                                    this.episode =
-                                        this.episode ?: node.num ?: episodeNumbers[index]
-                                    this.posterUrl =
-                                        this.posterUrl ?: node.thumbnail?.original?.url
+
+                    val ids = arrayOf(
+                        AccountManager.malApi.idPrefix to res?.malId?.toString(),
+                        AccountManager.aniListApi.idPrefix to res?.aniId
+                    )
+
+                    if (ids.any { (id, new) ->
+                            val current = syncData[id]
+                            new != null && current != null && current != new
+                        }
+                    ) {
+                        // getTracker fucked up as it conflicts with current implementation
+                        return@argamap
+                    }
+
+                    // set all the new data, prioritise old correct data
+                    ids.forEach { (id, new) ->
+                        new?.let {
+                            syncData[id] = syncData[id] ?: it
+                        }
+                    }
+
+                    // set posters, might fuck up due to headers idk
+                    posterUrl = posterUrl ?: res?.image
+                    backgroundPosterUrl = backgroundPosterUrl ?: res?.cover
+                },
+                {
+                    if(meta == null) return@argamap
+                    addTrailer(meta.trailers)
+                }, {
+                    if (this !is AnimeLoadResponse) return@argamap
+                    val map =
+                        Kitsu.getEpisodesDetails(
+                            getMalId(),
+                            getAniListId(),
+                            isResponseRequired = false
+                        )
+                    if (map.isNullOrEmpty()) return@argamap
+                    updateEpisodes = DubStatus.values().map { dubStatus ->
+                        val current =
+                            this.episodes[dubStatus]?.mapIndexed { index, episode ->
+                                episode.apply {
+                                    this.episode = this.episode ?: (index + 1)
+                                }
+                            }?.sortedBy { it.episode ?: 0 }?.toMutableList()
+                        if (current.isNullOrEmpty()) return@map false
+                        val episodeNumbers = current.map { ep -> ep.episode!! }
+                        var updateCount = 0
+                        map.forEach { (episode, node) ->
+                            episodeNumbers.binarySearch(episode).let { index ->
+                                current.getOrNull(index)?.let { currentEp ->
+                                    current[index] = currentEp.apply {
+                                        updateCount++
+                                        this.description = this.description ?: node.description?.en
+                                        this.name = this.name ?: node.titles?.canonical
+                                        this.episode =
+                                            this.episode ?: node.num ?: episodeNumbers[index]
+                                        this.posterUrl =
+                                            this.posterUrl ?: node.thumbnail?.original?.url
+                                    }
                                 }
                             }
                         }
-                    }
-                    this.episodes[dubStatus] = current
-                    updateCount > 0
-                }.any { it }
-            })
+                        this.episodes[dubStatus] = current
+                        updateCount > 0
+                    }.any { it }
+                })
         }
         return out to updateEpisodes
     }

From 84493b7f3bc2095a2a706c1f9341df36fd422519 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Thu, 9 Feb 2023 01:46:07 +0100
Subject: [PATCH 223/273] mini fix

---
 .../com/lagradost/cloudstream3/MainAPI.kt     |  2 +-
 .../ui/result/ResultViewModel2.kt             | 31 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 4014e34d..a277f622 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -82,7 +82,7 @@ object APIHolder {
             initMap()
             return apiMap?.get(apiName)?.let { apis.getOrNull(it) }
             // Leave the ?. null check, it can crash regardless
-                ?: allProviders.firstOrNull { it?.name == apiName }
+                ?: allProviders.firstOrNull { it.name == apiName }
         }
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 26237771..afaaeef9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -1465,12 +1465,17 @@ class ResultViewModel2 : ViewModel() {
             argamap(
                 {
                     if (this !is AnimeLoadResponse) return@argamap
+                    // already exist, no need to run getTracker
+                    if (this.getAniListId() != null && this.getMalId() != null) return@argamap
+
                     val res = APIHolder.getTracker(
                         listOfNotNull(
                             this.engName,
                             this.name,
                             this.japName
-                        ).distinct(), TrackerType.getTypes(this.type), this.year
+                        ).filter { it.length > 2 }.distinct(), // the reason why we filter is due to not wanting smth like " " or "?"
+                        TrackerType.getTypes(this.type),
+                        this.year
                     )
 
                     val ids = arrayOf(
@@ -1499,7 +1504,7 @@ class ResultViewModel2 : ViewModel() {
                     backgroundPosterUrl = backgroundPosterUrl ?: res?.cover
                 },
                 {
-                    if(meta == null) return@argamap
+                    if (meta == null) return@argamap
                     addTrailer(meta.trailers)
                 }, {
                     if (this !is AnimeLoadResponse) return@argamap
@@ -2162,7 +2167,7 @@ class ResultViewModel2 : ViewModel() {
         autostart: AutoResume?,
         loadTrailers: Boolean = true,
     ) =
-        viewModelScope.launchSafe {
+        ioSafe {
             _page.postValue(Resource.Loading(url))
             _episodes.postValue(ResourceSome.Loading())
 
@@ -2180,7 +2185,7 @@ class ResultViewModel2 : ViewModel() {
                         "This provider does not exist"
                     )
                 )
-                return@launchSafe
+                return@ioSafe
             }
 
 
@@ -2191,21 +2196,15 @@ class ResultViewModel2 : ViewModel() {
                     api
                 )
             }
-            // TODO: fix
-            // val validUrlResource = safeApiCall {
-            //     SyncRedirector.redirect(
-            //         url,
-            //         api.mainUrl.replace(NineAnimeProvider().mainUrl, "9anime")
-            //             .replace(GogoanimeProvider().mainUrl, "gogoanime")
-            //     )
-            // }
+
             if (validUrlResource !is Resource.Success) {
                 if (validUrlResource is Resource.Failure) {
                     _page.postValue(validUrlResource)
                 }
 
-                return@launchSafe
+                return@ioSafe
             }
+
             val validUrl = validUrlResource.value
             val repo = APIRepository(api)
             currentRepo = repo
@@ -2215,11 +2214,11 @@ class ResultViewModel2 : ViewModel() {
                     _page.postValue(data)
                 }
                 is Resource.Success -> {
-                    if (!isActive) return@launchSafe
+                    if (!isActive) return@ioSafe
                     val loadResponse = ioWork {
                         applyMeta(data.value, currentMeta, currentSync).first
                     }
-                    if (!isActive) return@launchSafe
+                    if (!isActive) return@ioSafe
                     val mainId = loadResponse.getId()
 
                     preferDubStatus = getDub(mainId) ?: preferDubStatus
@@ -2247,7 +2246,7 @@ class ResultViewModel2 : ViewModel() {
                         updateFillers = showFillers,
                         apiRepository = repo
                     )
-                    if (!isActive) return@launchSafe
+                    if (!isActive) return@ioSafe
                     handleAutoStart(activity, autostart)
                 }
                 is Resource.Loading -> {

From dd385561025dd2098944c21ae8b515e2e389b61b Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Thu, 9 Feb 2023 20:25:00 +0100
Subject: [PATCH 224/273] address issue #339

Co-authored-by: eightyy8 <64216434+eightyy8@users.noreply.github.com>
---
 .../ui/settings/SettingsGeneral.kt            | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 649aa634..45bd8bd6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -57,47 +57,47 @@ fun getCurrentLocale(context: Context): String {
 val appLanguages = arrayListOf(
     /* begin language list */
     Triple("", "العربية", "ar"),
-    Triple("", "български език", "bg"),
+    Triple("", "български", "bg"),
     Triple("", "বাংলা", "bn"),
     Triple("\uD83C\uDDE7\uD83C\uDDF7", "Brazilian Portuguese", "bp"),
     Triple("", "čeština", "cs"),
     Triple("", "Deutsch", "de"),
-    Triple("", "ελληνικά", "el"),
+    Triple("", "Ελληνικά", "el"),
     Triple("", "English", "en"),
     Triple("", "Esperanto", "eo"),
-    Triple("", "Español", "es"),
+    Triple("", "español", "es"),
     Triple("", "فارسی", "fa"),
     Triple("", "français", "fr"),
+    Triple("\uD83C\uDDEE\uD83C\uDDF1", "עברית", "he"),
     Triple("", "हिन्दी", "hi"),
-    Triple("", "hrvatski jezik", "hr"),
+    Triple("", "hrvatski", "hr"),
     Triple("", "magyar", "hu"),
-    Triple("\uD83C\uDDEE\uD83C\uDDE9", "Indonesian", "in"),
-    Triple("", "Italiano", "it"),
-    Triple("\uD83C\uDDEE\uD83C\uDDF1", "עִברִית", "iw"),
+    Triple("\uD83C\uDDEE\uD83C\uDDE9", "Bahasa Indonesia", "in"),
+    Triple("", "italiano", "it"),
     Triple("", "ಕನ್ನಡ", "kn"),
-    Triple("", "македонски јазик", "mk"),
+    Triple("", "македонски", "mk"),
     Triple("", "മലയാളം", "ml"),
     Triple("", "Nederlands", "nl"),
-    Triple("", "Norsk nynorsk", "nn"),
-    Triple("", "Norsk", "no"),
-    Triple("", "język polski", "pl"),
-    Triple("\uD83C\uDDF5\uD83C\uDDF9", "Português", "pt"),
+    Triple("", "norsk nynorsk", "nn"),
+    Triple("", "norsk bokmål", "no"),
+    Triple("", "polski", "pl"),
+    Triple("\uD83C\uDDF5\uD83C\uDDF9", "português", "pt"),
     Triple("🦍", "mmmm... monke", "qt"),
-    Triple("", "Română", "ro"),
-    Triple("", "Русский", "ru"),
+    Triple("", "română", "ro"),
+    Triple("", "русский", "ru"),
     Triple("", "slovenčina", "sk"),
     Triple("", "Soomaaliga", "so"),
     Triple("", "svenska", "sv"),
     Triple("", "தமிழ்", "ta"),
-    Triple("", "Wikang Tagalog", "tl"),
+    Triple("", "Tagalog", "tl"),
     Triple("", "Türkçe", "tr"),
-    Triple("", "Українська", "uk"),
+    Triple("", "українська", "uk"),
     Triple("", "اردو", "ur"),
     Triple("", "Tiếng Việt", "vi"),
-    Triple("", "中文 (Zhōngwén)", "zh"),
-    Triple("\uD83C\uDDF9\uD83C\uDDFC", "Chinese Traditional", "zh-rTW"),
+    Triple("", "中文", "zh"),
+    Triple("\uD83C\uDDF9\uD83C\uDDFC", "文言", "zh-rTW"),
 /* end language list */
-).sortedBy { it.second } //ye, we go alphabetical, so ppl don't put their lang on top
+).sortedBy { it.second?.toLowerCase() } //ye, we go alphabetical, so ppl don't put their lang on top
 
 class SettingsGeneral : PreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

From 0d2613d183f016e84bdec850d703294aa3343929 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Thu, 9 Feb 2023 20:20:04 +0100
Subject: [PATCH 225/273] Translated using Weblate (qt (generated) (qt))

Currently translated at 51.4% (303 of 589 strings)

Translated using Weblate (Ukrainian)

Currently translated at 99.3% (585 of 589 strings)

Translated using Weblate (Persian)

Currently translated at 20.3% (120 of 589 strings)

Translated using Weblate (Russian)

Currently translated at 98.9% (583 of 589 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (589 of 589 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (589 of 589 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (589 of 589 strings)

Translated using Weblate (qt (generated) (qt))

Currently translated at 50.3% (293 of 582 strings)

Translated using Weblate (Persian)

Currently translated at 18.7% (109 of 582 strings)

Translated using Weblate (Russian)

Currently translated at 99.1% (577 of 582 strings)

Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Fjuro <ifjuro@proton.me>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Skrripy <rozihrash.ya6w7@simplelogin.com>
Co-authored-by: Soroush <skaveh1384@gmail.com>
Co-authored-by: eightyy8 <oliver.kha@pm.me>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: sina <cnababaie@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fa/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/qt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml |  5 +++++
 app/src/main/res/values-cs/strings.xml |  5 +++++
 app/src/main/res/values-es/strings.xml |  3 ++-
 app/src/main/res/values-fa/strings.xml | 10 +++++++++
 app/src/main/res/values-qt/strings.xml | 28 +++++++++++++++++++++++---
 app/src/main/res/values-ru/strings.xml | 22 +++++++++++---------
 app/src/main/res/values-uk/strings.xml |  1 +
 7 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index f318478e..652df937 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -538,4 +538,9 @@
     <string name="library">المكتبة</string>
     <string name="safe_mode_file">تم العثور على ملف الوضع الآمن!
 \nلا يتم تحميل أي ملحقات عند بدء التشغيل حتى تتم إزالة الملف.</string>
+    <string name="android_tv_interface_off_seek_settings_summary">مدة التقديم عنما يكون المشغل مخفيا</string>
+    <string name="android_tv_interface_off_seek_settings">مدة التقديم - المشغل مخفي</string>
+    <string name="pref_category_android_tv">تلفزيون أندرويد</string>
+    <string name="android_tv_interface_on_seek_settings_summary">مدة التقديم عنما يكون المشغل مرئيا</string>
+    <string name="android_tv_interface_on_seek_settings">مدة التقديم- المشغل المرئي</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 214cb86d..a78da8a4 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -530,4 +530,9 @@
     <string name="delete_repository">Odstranit repozitář</string>
     <string name="plugins_not_downloaded" formatted="true">Nestaženo: %d</string>
     <string name="no">Ne</string>
+    <string name="android_tv_interface_off_seek_settings">Skrytý přehrávač - doba hledání</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Množství vyhledávané doby při skrytém přehrávači</string>
+    <string name="android_tv_interface_on_seek_settings">Zobrazený přehrávač - doba hledání</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Množství vyhledávané doby při zobrazeném přehrávači</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d253e256..8366b294 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -509,5 +509,6 @@
     <string name="android_tv_interface_on_seek_settings">Jugadora mostrada - buscar cantidad</string>
     <string name="android_tv_interface_off_seek_settings">Jugadora oculta - buscar cantidad</string>
     <string name="pref_category_android_tv">Android TV</string>
-    <string name="android_tv_interface_on_seek_settings_summary">La cantidad de búsqueda utilizada cuando la jugadora es visible.</string>
+    <string name="android_tv_interface_on_seek_settings_summary">La cantidad de búsqueda utilizada cuando la jugadora es visible</string>
+    <string name="android_tv_interface_off_seek_settings_summary">La cantidad de búsqueda utilizada cuando el jugador está oculto</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index a34c5a05..81853674 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -23,4 +23,14 @@
     <string name="none">هیچ‌کدام</string>
     <string name="title">عنوان</string>
     <string name="history">تاریخچه</string>
+    <string name="search_poster_img_des">پوستر</string>
+    <string name="result_poster_img_des">پوستر</string>
+    <string name="episode_poster_img_des">پوستر قسمت</string>
+    <string name="next_episode_time_day_format" formatted="true">%dروز %dساعت %dدقیقه</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s قسمت %d</string>
+    <string name="cast_format" formatted="true">بازیگران: %s</string>
+    <string name="next_episode_format" formatted="true">قسمت %d پخش خواهد شد</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dساعت %dدقیقه</string>
+    <string name="next_episode_time_min_format" formatted="true">%dدقیقه</string>
+    <string name="home_main_poster_img_des">پوستر اصلی</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-qt/strings.xml b/app/src/main/res/values-qt/strings.xml
index 24c51a05..b36f3b16 100644
--- a/app/src/main/res/values-qt/strings.xml
+++ b/app/src/main/res/values-qt/strings.xml
@@ -4,12 +4,12 @@
     <string name="app_name">aauugghhaauuh</string>
     <string name="title_home">ooh</string>
     <string name="title_search">oouuh</string>
-    <string name="title_downloads">ouuhhhooh ooh</string>
+    <string name="title_downloads">ouuhhuhooh ooh</string>
     <string name="title_settings">aaaghhoh aauugghh</string>
-    <string name="search_hint">haaooh</string>
+    <string name="search_hint">haaooh ooo</string>
     <string name="search_poster_img_des">aaaaaah</string>
     <string name="no_data">oooohhoouuh</string>
-    <string name="episode_more_options_des">aaaaaoouuhahhh ahh</string>
+    <string name="episode_more_options_des">aaaaoouuuhahhh ahh</string>
     <string name="go_back_img_des">oooohh aauuh</string>
     <string name="next_episode">ahhhaaaghh aaaaa</string>
     <string name="result_poster_img_des">ahaauugghh</string>
@@ -196,4 +196,26 @@
     <string name="primary_color_settings">a ou oh ouhuouhoaaha</string>
     <string name="show_fillers_settings">aaooohhouhhha hauauuu</string>
     <string name="new_update_format">aaaaaaa uuuuuu\n%s -&gt; %s</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s aaou %d</string>
+    <string name="cast_format" formatted="true">oouaaahh %s</string>
+    <string name="next_episode_format" formatted="true">aaaaaaugh ouh %d uuoogahaaah ooua-h-ha</string>
+    <string name="next_episode_time_day_format" formatted="true">%daaa %duuu %dhhhg</string>
+    <string name="next_episode_time_hour_format" formatted="true">%daaaaaaauuhh %doouuahaaha</string>
+    <string name="next_episode_time_min_format" formatted="true">%dmmmm...</string>
+    <string name="player_speed_text_format" formatted="true">aaaaaaaaaaaaahh (%.2foouo)</string>
+    <string name="rated_format" formatted="true">aghaaaooo-ough %.1f</string>
+    <string name="filler" formatted="true">aaaaaaaaaaaaaaaaaaaaaaaaaaaaaooooohhuhuhuhuhuhhuhuhhhaaagaha-agagaoooo</string>
+    <string name="duration_format" formatted="true">%d ooaaaugha</string>
+    <string name="play_with_app_name">oooooh aaah aauuuggghauuh</string>
+    <string name="search_hint_site" formatted="true">aaoohhu %s aoouu</string>
+    <string name="browser">oooaaaauhgaaaa</string>
+    <string name="type_re_watching">aaaaaah-ooooooooouuagh</string>
+    <string name="action_add_to_bookmarks">auugggguuuuuuhhh uuuu hhhhhhhhuhggghggg</string>
+    <string name="play_trailer_button">ggaaaahhhhhhh gaauuuuuuuaaaau</string>
+    <string name="play_livestream_button">aaauuuuggggguu</string>
+    <string name="update_started">ooo aagg hhhh</string>
+    <string name="stream">ooo aagg hhhh</string>
+    <string name="sort_copy">uuuuhhhoouuooog ooaaahhhh</string>
+    <string name="sort_close">uuu ugggg</string>
+    <string name="sort_clear">ooo guggg ooh</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 29e98598..6e9fb394 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -25,8 +25,8 @@
     <string name="next_episode_format" formatted="true">Серия %d будет выпущен в</string>
     <string name="result_poster_img_des">Плакат</string>
     <string name="search_poster_img_des">Плакат</string>
-    <string name="episode_poster_img_des">Постер Эпизода</string>
-    <string name="home_main_poster_img_des">Главный постер</string>
+    <string name="episode_poster_img_des">Плакат эпизода</string>
+    <string name="home_main_poster_img_des">Главный плакат</string>
     <string name="home_next_random_img_des">Следующий случайный</string>
     <string name="go_back_img_des">Вернуться</string>
     <string name="home_change_provider_img_des">Изменить поставщика</string>
@@ -61,11 +61,11 @@
     <string name="type_none">Нет</string>
     <string name="type_re_watching">Пересмотрю</string>
     <string name="play_movie_button">Смотреть фильм</string>
-    <string name="play_trailer_button">Воспроизвести трейлер</string>
-    <string name="play_livestream_button">Воспроизвести Livestream</string>
+    <string name="play_trailer_button">Смотреть трейлер</string>
+    <string name="play_livestream_button">Смотреть Livestream</string>
     <string name="pick_source">Источники</string>
     <string name="pick_subtitle">Субтитры</string>
-    <string name="play_episode">Воспроизвести эпизод</string>
+    <string name="play_episode">Смотреть эпизод</string>
     <string name="reload_error">Повторная попытка подключение…</string>
     <string name="go_back">Вернуться</string>
     <string name="downloaded">Скачано</string>
@@ -90,7 +90,7 @@
     <string name="player_speed">Скорость проигрыватель</string>
     <string name="play_episode_toast">Воспроизвести Эпизод</string>
     <string name="next_episode_time_day_format" formatted="true">%dд %dч %dм</string>
-    <string name="duration_format" formatted="true">%d мин</string>
+    <string name="duration_format" formatted="true">%d мин.</string>
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Sub</string>
     <string name="action_add_to_bookmarks">Установите смотреть состояние</string>
@@ -114,7 +114,7 @@
     <string name="subs_font">Шрифт</string>
     <string name="subs_font_size">Размер шрифта</string>
     <string name="popup_delete_file">Удалить файл</string>
-    <string name="popup_play_file">Проиграть файл</string>
+    <string name="popup_play_file">Воспроизвести файл</string>
     <string name="download_storage_text">Внутренняя память</string>
     <string name="popup_resume_download">Продолжить Скачать</string>
     <string name="popup_pause_download">Остановить скачивание</string>
@@ -213,7 +213,7 @@
     <string name="nsfw">NSFW</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="movies_singular">Фильм</string>
-    <string name="tv_series_singular">Серия</string>
+    <string name="tv_series_singular">Сериал</string>
     <string name="torrent_singular">Торрент</string>
     <string name="documentaries_singular">Документальный</string>
     <string name="asian_drama_singular">Азиатская драма</string>
@@ -472,7 +472,7 @@
     <string name="setup_extensions_subtext">Скачайте список сайтов, который вы хотите использовать</string>
     <string name="display_subbed_dubbed_settings">Отображать Аниме с Дубляжом/Субтитрами</string>
     <string name="enable_nsfw_on_providers">Включить NSFW на поддерживаемых провайдерах</string>
-    <string name="subtitles_remove_captions">Убрать скрытые субтитры из субтитров</string>
+    <string name="subtitles_remove_captions">Удалять скрытые субтитры из субтитров</string>
     <string name="extras">Дополнительно</string>
     <string name="app_layout_subtext">Изменить вид интерфейса, чтобы соответствовать устройству</string>
     <string name="audio_tracks">Аудио дорожки</string>
@@ -502,4 +502,8 @@
     <string name="preferred_media_settings">Предпочтительные медиа</string>
     <string name="subtitles_depressed">Опущенные</string>
     <string name="double_tap_to_seek_amount_settings">Объем перемотки плеера</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Объем перемотка, используемый, когда плеер виден</string>
+    <string name="android_tv_interface_on_seek_settings">Плеер показан - Перемотки объем</string>
+    <string name="android_tv_interface_off_seek_settings">Плеер спрятан - Перемотки объем</string>
+    <string name="subtitles_remove_bloat">Удалять лишнее из субтитров</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 82baa6b4..871e0a28 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -506,4 +506,5 @@
     <string name="empty_library_logged_in_message">Схоже, цей список порожній, спробуйте перейти до іншого</string>
     <string name="safe_mode_file">Файл безпечного режиму знайдено!
 \nРозширеня не завантажуються під час запуску, доки файл не буде видалено.</string>
+    <string name="pref_category_android_tv">Android TV</string>
 </resources>
\ No newline at end of file

From 5c20b479e56c5d574d0e7e3bdc542e787b93a172 Mon Sep 17 00:00:00 2001
From: "recloudstream[bot]"
 <111277985+recloudstream[bot]@users.noreply.github.com>
Date: Thu, 9 Feb 2023 19:25:34 +0000
Subject: [PATCH 226/273] update list of locales

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 45bd8bd6..ae37675f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -74,6 +74,7 @@ val appLanguages = arrayListOf(
     Triple("", "magyar", "hu"),
     Triple("\uD83C\uDDEE\uD83C\uDDE9", "Bahasa Indonesia", "in"),
     Triple("", "italiano", "it"),
+    Triple("", "iw", "iw"),
     Triple("", "ಕನ್ನಡ", "kn"),
     Triple("", "македонски", "mk"),
     Triple("", "മലയാളം", "ml"),

From 7b11b9b585a030de02a52c964e43433485f8b870 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Thu, 9 Feb 2023 20:27:37 +0100
Subject: [PATCH 227/273] fix wrong hebrew lang code

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index ae37675f..2c6b6d47 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -68,13 +68,12 @@ val appLanguages = arrayListOf(
     Triple("", "español", "es"),
     Triple("", "فارسی", "fa"),
     Triple("", "français", "fr"),
-    Triple("\uD83C\uDDEE\uD83C\uDDF1", "עברית", "he"),
+    Triple("\uD83C\uDDEE\uD83C\uDDF1", "עברית", "iw"),
     Triple("", "हिन्दी", "hi"),
     Triple("", "hrvatski", "hr"),
     Triple("", "magyar", "hu"),
     Triple("\uD83C\uDDEE\uD83C\uDDE9", "Bahasa Indonesia", "in"),
     Triple("", "italiano", "it"),
-    Triple("", "iw", "iw"),
     Triple("", "ಕನ್ನಡ", "kn"),
     Triple("", "македонски", "mk"),
     Triple("", "മലയാളം", "ml"),

From 1117271a715ba181615ddad7e4f941fb2d674a1b Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Fri, 10 Feb 2023 15:16:58 +0100
Subject: [PATCH 228/273] =?UTF-8?q?[skip=20ci]=20portugu=C3=AAs=20brasilei?=
 =?UTF-8?q?ro?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 2c6b6d47..2e249948 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -59,7 +59,7 @@ val appLanguages = arrayListOf(
     Triple("", "العربية", "ar"),
     Triple("", "български", "bg"),
     Triple("", "বাংলা", "bn"),
-    Triple("\uD83C\uDDE7\uD83C\uDDF7", "Brazilian Portuguese", "bp"),
+    Triple("\uD83C\uDDE7\uD83C\uDDF7", "português brasileiro", "bp"),
     Triple("", "čeština", "cs"),
     Triple("", "Deutsch", "de"),
     Triple("", "Ελληνικά", "el"),

From df6c395acb3a939636d2b818edc1ff8b9d109991 Mon Sep 17 00:00:00 2001
From: Stormunblessed <86633626+Stormunblessed@users.noreply.github.com>
Date: Tue, 14 Feb 2023 09:11:20 -0600
Subject: [PATCH 229/273] Sendvid extractor (#365)

* fix fastream, tomatomatela, and added okrulink

* forgot this

* sendvid extractor

* sendvid extractor

* fixes
---
 .../cloudstream3/extractors/Sendvid.kt        | 28 +++++++++++++++++++
 .../cloudstream3/utils/ExtractorApi.kt        |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/extractors/Sendvid.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Sendvid.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Sendvid.kt
new file mode 100644
index 00000000..514b802d
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Sendvid.kt
@@ -0,0 +1,28 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
+
+open class Sendvid : ExtractorApi() {
+    override var name = "Sendvid"
+    override val mainUrl = "https://sendvid.com"
+    override val requiresReferer = false
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val doc = app.get(url).document
+        val urlString = doc.select("head meta[property=og:video:secure_url]").attr("content")
+        if (urlString.contains("m3u8"))  {
+            generateM3u8(
+                name,
+                urlString,
+                mainUrl,
+            ).forEach(callback)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 1ad3639b..b0dba9ff 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -265,6 +265,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     OkRu(),
     OkRuHttps(),
     Okrulink(),
+    Sendvid(),
 
     // dood extractors
     DoodCxExtractor(),

From 4a8ee550185f817fffd68372b2144886bd29066a Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Wed, 15 Feb 2023 21:40:10 +0100
Subject: [PATCH 230/273] Added provider tests

---
 .../cloudstream3/ExampleInstrumentedTest.kt   | 198 +------------
 .../com/lagradost/cloudstream3/MainAPI.kt     |  15 +
 .../lagradost/cloudstream3/MainActivity.kt    |   1 +
 .../cloudstream3/mvvm/ArchComponentExt.kt     |  22 +-
 .../ui/settings/SettingsProviders.kt          |  17 ++
 .../ui/settings/testing/TestFragment.kt       |  97 +++++++
 .../ui/settings/testing/TestResultAdapter.kt  |  80 ++++++
 .../ui/settings/testing/TestView.kt           | 119 ++++++++
 .../ui/settings/testing/TestViewModel.kt      | 108 +++++++
 .../lagradost/cloudstream3/utils/AppUtils.kt  |  17 ++
 .../cloudstream3/utils/TestingUtils.kt        | 267 ++++++++++++++++++
 .../res/drawable/baseline_network_ping_24.xml |   5 +
 .../res/drawable/baseline_text_snippet_24.xml |   5 +
 app/src/main/res/layout/fragment_testing.xml  |  53 ++++
 .../main/res/layout/provider_test_item.xml    |  71 +++++
 .../main/res/navigation/mobile_navigation.xml |  17 ++
 app/src/main/res/values/attrs.xml             |   6 +-
 app/src/main/res/values/colors.xml            |   3 +
 app/src/main/res/values/strings.xml           |  10 +
 app/src/main/res/xml/settings_providers.xml   |  36 ++-
 20 files changed, 936 insertions(+), 211 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestView.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
 create mode 100644 app/src/main/res/drawable/baseline_network_ping_24.xml
 create mode 100644 app/src/main/res/drawable/baseline_text_snippet_24.xml
 create mode 100644 app/src/main/res/layout/fragment_testing.xml
 create mode 100644 app/src/main/res/layout/provider_test_item.xml

diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
index 81753f6b..92042d60 100644
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
@@ -1,9 +1,8 @@
 package com.lagradost.cloudstream3
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.SubtitleHelper
+import com.lagradost.cloudstream3.utils.TestingUtils
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 import org.junit.Test
@@ -16,142 +15,11 @@ import org.junit.runner.RunWith
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
-    //@Test
-    //fun useAppContext() {
-    //    // Context of the app under test.
-    //    val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-    //    assertEquals("com.lagradost.cloudstream3", appContext.packageName)
-    //}
-
     private fun getAllProviders(): List<MainAPI> {
+        println("Providers: ${APIHolder.allProviders.size}")
         return APIHolder.allProviders //.filter { !it.usesWebView }
     }
 
-    private suspend fun loadLinks(api: MainAPI, url: String?): Boolean {
-        Assert.assertNotNull("Api ${api.name} has invalid url on episode", url)
-        if (url == null) return true
-        var linksLoaded = 0
-        try {
-            val success = api.loadLinks(url, false, {}) { link ->
-                Assert.assertTrue(
-                    "Api ${api.name} returns link with invalid Quality",
-                    Qualities.values().map { it.value }.contains(link.quality)
-                )
-                Assert.assertTrue(
-                    "Api ${api.name} returns link with invalid url ${link.url}",
-                    link.url.length > 4
-                )
-                linksLoaded++
-            }
-            if (success) {
-                return linksLoaded > 0
-            }
-            Assert.assertTrue("Api ${api.name} has returns false on .loadLinks", success)
-        } catch (e: Exception) {
-            if (e.cause is NotImplementedError) {
-                Assert.fail("Provider has not implemented .loadLinks")
-            }
-            logError(e)
-        }
-        return true
-    }
-
-    private suspend fun testSingleProviderApi(api: MainAPI): Boolean {
-        val searchQueries = listOf("over", "iron", "guy")
-        var correctResponses = 0
-        var searchResult: List<SearchResponse>? = null
-        for (query in searchQueries) {
-            val response = try {
-                api.search(query)
-            } catch (e: Exception) {
-                if (e.cause is NotImplementedError) {
-                    Assert.fail("Provider has not implemented .search")
-                }
-                logError(e)
-                null
-            }
-            if (!response.isNullOrEmpty()) {
-                correctResponses++
-                if (searchResult == null) {
-                    searchResult = response
-                }
-            }
-        }
-
-        if (correctResponses == 0 || searchResult == null) {
-            System.err.println("Api ${api.name} did not return any valid search responses")
-            return false
-        }
-
-        try {
-            var validResults = false
-            for (result in searchResult) {
-                Assert.assertEquals(
-                    "Invalid apiName on response on ${api.name}",
-                    result.apiName,
-                    api.name
-                )
-                val load = api.load(result.url) ?: continue
-                Assert.assertEquals(
-                    "Invalid apiName on load on ${api.name}",
-                    load.apiName,
-                    result.apiName
-                )
-                Assert.assertTrue(
-                    "Api ${api.name} on load does not contain any of the supportedTypes",
-                    api.supportedTypes.contains(load.type)
-                )
-                when (load) {
-                    is AnimeLoadResponse -> {
-                        val gotNoEpisodes =
-                            load.episodes.keys.isEmpty() || load.episodes.keys.any { load.episodes[it].isNullOrEmpty() }
-
-                        if (gotNoEpisodes) {
-                            println("Api ${api.name} got no episodes on ${load.url}")
-                            continue
-                        }
-
-                        val url = (load.episodes[load.episodes.keys.first()])?.first()?.data
-                        validResults = loadLinks(api, url)
-                        if (!validResults) continue
-                    }
-                    is MovieLoadResponse -> {
-                        val gotNoEpisodes = load.dataUrl.isBlank()
-                        if (gotNoEpisodes) {
-                            println("Api ${api.name} got no movie on ${load.url}")
-                            continue
-                        }
-
-                        validResults = loadLinks(api, load.dataUrl)
-                        if (!validResults) continue
-                    }
-                    is TvSeriesLoadResponse -> {
-                        val gotNoEpisodes = load.episodes.isEmpty()
-                        if (gotNoEpisodes) {
-                            println("Api ${api.name} got no episodes on ${load.url}")
-                            continue
-                        }
-
-                        validResults = loadLinks(api, load.episodes.first().data)
-                        if (!validResults) continue
-                    }
-                }
-                break
-            }
-            if (!validResults) {
-                System.err.println("Api ${api.name} did not load on any")
-            }
-
-            return validResults
-        } catch (e: Exception) {
-            if (e.cause is NotImplementedError) {
-                Assert.fail("Provider has not implemented .load")
-            }
-            logError(e)
-            return false
-        }
-    }
-
     @Test
     fun providersExist() {
         Assert.assertTrue(getAllProviders().isNotEmpty())
@@ -159,6 +27,7 @@ class ExampleInstrumentedTest {
     }
 
     @Test
+    @Throws(AssertionError::class)
     fun providerCorrectData() {
         val isoNames = SubtitleHelper.languages.map { it.ISO_639_1 }
         Assert.assertFalse("ISO does not contain any languages", isoNames.isNullOrEmpty())
@@ -181,67 +50,20 @@ class ExampleInstrumentedTest {
     fun providerCorrectHomepage() {
         runBlocking {
             getAllProviders().amap { api ->
-                if (api.hasMainPage) {
-                    try {
-                        val f = api.mainPage.first()
-                        val homepage =
-                            api.getMainPage(1, MainPageRequest(f.name, f.data, f.horizontalImages))
-                        when {
-                            homepage == null -> {
-                                System.err.println("Homepage provider ${api.name} did not correctly load homepage!")
-                            }
-                            homepage.items.isEmpty() -> {
-                                System.err.println("Homepage provider ${api.name} does not contain any items!")
-                            }
-                            homepage.items.any { it.list.isEmpty() } -> {
-                                System.err.println("Homepage provider ${api.name} does not have any items on result!")
-                            }
-                        }
-                    } catch (e: Exception) {
-                        if (e.cause is NotImplementedError) {
-                            Assert.fail("Provider marked as hasMainPage, while in reality is has not been implemented")
-                        }
-                        logError(e)
-                    }
-                }
+                TestingUtils.testHomepage(api, ::println)
             }
         }
         println("Done providerCorrectHomepage")
     }
 
-//    @Test
-//    fun testSingleProvider() {
-//        testSingleProviderApi(ThenosProvider())
-//    }
-
     @Test
-    fun providerCorrect() {
+    fun testAllProvidersCorrect() {
         runBlocking {
-            val invalidProvider = ArrayList<Pair<MainAPI, Exception?>>()
-            val providers = getAllProviders()
-            providers.amap { api ->
-                try {
-                    println("Trying $api")
-                    if (testSingleProviderApi(api)) {
-                        println("Success $api")
-                    } else {
-                        System.err.println("Error $api")
-                        invalidProvider.add(Pair(api, null))
-                    }
-                } catch (e: Exception) {
-                    logError(e)
-                    invalidProvider.add(Pair(api, e))
-                }
-            }
-            if (invalidProvider.isEmpty()) {
-                println("No Invalid providers! :D")
-            } else {
-                println("Invalid providers are: ")
-                for (provider in invalidProvider) {
-                    println("${provider.first}")
-                }
-            }
+            TestingUtils.getDeferredProviderTests(
+                this,
+                getAllProviders(),
+                ::println
+            ) { _, _ -> }
         }
-        println("Done providerCorrect")
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index a277f622..3958984e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -17,8 +17,10 @@ import com.lagradost.cloudstream3.syncproviders.SyncIdName
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import com.lagradost.cloudstream3.utils.Coroutines.mainWork
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import okhttp3.Interceptor
+import org.mozilla.javascript.Scriptable
 import java.text.SimpleDateFormat
 import java.util.*
 import kotlin.math.absoluteValue
@@ -734,6 +736,19 @@ fun fixTitle(str: String): String {
             .replaceFirstChar { char -> if (char.isLowerCase()) char.titlecase(Locale.getDefault()) else it }
     }
 }
+/**
+ * Get rhino context in a safe way as it needs to be initialized on the main thread.
+ * Make sure you get the scope using: val scope: Scriptable = rhino.initSafeStandardObjects()
+ * Use like the following: rhino.evaluateString(scope, js, "JavaScript", 1, null)
+ **/
+suspend fun getRhinoContext(): org.mozilla.javascript.Context {
+    return Coroutines.mainWork {
+        val rhino = org.mozilla.javascript.Context.enter()
+        rhino.initSafeStandardObjects()
+        rhino.optimizationLevel = -1
+        rhino
+    }
+}
 
 /** https://www.imdb.com/title/tt2861424/ -> tt2861424 */
 fun imdbUrlToId(url: String): String? {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index eddec15e..28419e7a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -402,6 +402,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             R.id.navigation_settings_general,
             R.id.navigation_settings_extensions,
             R.id.navigation_settings_plugins,
+            R.id.navigation_test_providers,
         ).contains(destination.id)
 
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt b/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
index afe956cc..bb15bc85 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
@@ -49,7 +49,7 @@ inline fun debugWarning(assert: () -> Boolean, message: () -> String) {
     }
 }
 
-fun <T> LifecycleOwner.observe(liveData: LiveData<T>, action: (t:  T) -> Unit) {
+fun <T> LifecycleOwner.observe(liveData: LiveData<T>, action: (t: T) -> Unit) {
     liveData.observe(this) { it?.let { t -> action(t) } }
 }
 
@@ -121,13 +121,21 @@ suspend fun <T> suspendSafeApiCall(apiCall: suspend () -> T): T? {
     }
 }
 
+fun Throwable.getAllMessages(): String {
+    return (this.localizedMessage ?: "") + (this.cause?.getAllMessages()?.let { "\n$it" } ?: "")
+}
+
+fun Throwable.getStackTracePretty(showMessage: Boolean = true): String {
+    val prefix = if (showMessage) this.localizedMessage?.let { "\n$it" } ?: "" else ""
+    return prefix + this.stackTrace.joinToString(
+        separator = "\n"
+    ) {
+        "${it.fileName} ${it.lineNumber}"
+    }
+}
+
 fun <T> safeFail(throwable: Throwable): Resource<T> {
-    val stackTraceMsg =
-        (throwable.localizedMessage ?: "") + "\n\n" + throwable.stackTrace.joinToString(
-            separator = "\n"
-        ) {
-            "${it.fileName} ${it.lineNumber}"
-        }
+    val stackTraceMsg = throwable.getStackTracePretty()
     return Resource.Failure(false, null, null, stackTraceMsg)
 }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
index 3b01508d..42a864a6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
@@ -2,6 +2,8 @@ package com.lagradost.cloudstream3.ui.settings
 
 import android.os.Bundle
 import android.view.View
+import androidx.navigation.NavOptions
+import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.*
@@ -16,6 +18,7 @@ import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
+import com.lagradost.cloudstream3.utils.UIHelper.navigate
 
 class SettingsProviders : PreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -56,6 +59,20 @@ class SettingsProviders : PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
+        getPref(R.string.test_providers_key)?.setOnPreferenceClickListener {
+            // Somehow animations do not work without this.
+            val options = NavOptions.Builder()
+                .setEnterAnim(R.anim.enter_anim)
+                .setExitAnim(R.anim.exit_anim)
+                .setPopEnterAnim(R.anim.pop_enter)
+                .setPopExitAnim(R.anim.pop_exit)
+                .build()
+
+            this@SettingsProviders.findNavController()
+                .navigate(R.id.navigation_test_providers, null, options)
+            true
+        }
+
         getPref(R.string.prefer_media_type_key)?.setOnPreferenceClickListener {
             val names = enumValues<TvType>().sorted().map { it.name }
             val default =
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
new file mode 100644
index 00000000..34cd67cd
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
@@ -0,0 +1,97 @@
+package com.lagradost.cloudstream3.ui.settings.testing
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.fragment.app.activityViewModels
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.mvvm.observeNullable
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
+import kotlinx.android.synthetic.main.fragment_testing.*
+import kotlinx.android.synthetic.main.view_test.*
+
+
+class TestFragment : Fragment() {
+
+    private val testViewModel: TestViewModel by activityViewModels()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        setUpToolbar(R.string.category_provider_test)
+        super.onViewCreated(view, savedInstanceState)
+
+        provider_test_recycler_view?.adapter = TestResultAdapter(
+            mutableListOf()
+        )
+
+        testViewModel.init()
+        if (testViewModel.isRunningTest) {
+            provider_test?.setState(TestView.TestState.Running)
+        }
+
+        observe(testViewModel.providerProgress) { (passed, failed, total) ->
+            provider_test?.setProgress(passed, failed, total)
+        }
+
+        observeNullable(testViewModel.providerResults) {
+            normalSafeApiCall {
+                val newItems = it.sortedBy { api -> api.first.name }
+                (provider_test_recycler_view?.adapter as? TestResultAdapter)?.updateList(
+                    newItems
+                )
+            }
+        }
+
+        provider_test?.setOnPlayButtonListener { state ->
+            when (state) {
+                TestView.TestState.Stopped -> testViewModel.stopTest()
+                TestView.TestState.Running -> testViewModel.startTest()
+                TestView.TestState.None -> testViewModel.startTest()
+            }
+        }
+
+        if (isTrueTvSettings()) {
+            tests_play_pause?.isFocusableInTouchMode = true
+            tests_play_pause?.requestFocus()
+        }
+
+        provider_test?.playPauseButton?.setOnFocusChangeListener { _, hasFocus ->
+            if (hasFocus) {
+                provider_test_appbar?.setExpanded(true, true)
+            }
+        }
+
+        fun focusRecyclerView() {
+            // Hack to make it possible to focus the recyclerview.
+            if (isTrueTvSettings()) {
+                provider_test_recycler_view?.requestFocus()
+                provider_test_appbar?.setExpanded(false, true)
+            }
+        }
+
+        provider_test?.setOnMainClick {
+            testViewModel.setFilterMethod(TestViewModel.ProviderFilter.All)
+            focusRecyclerView()
+        }
+        provider_test?.setOnFailedClick {
+            testViewModel.setFilterMethod(TestViewModel.ProviderFilter.Failed)
+            focusRecyclerView()
+        }
+        provider_test?.setOnPassedClick {
+            testViewModel.setFilterMethod(TestViewModel.ProviderFilter.Passed)
+            focusRecyclerView()
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.fragment_testing, container, false)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt
new file mode 100644
index 00000000..d04e2379
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt
@@ -0,0 +1,80 @@
+package com.lagradost.cloudstream3.ui.settings.testing
+
+import android.app.AlertDialog
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import com.lagradost.cloudstream3.MainAPI
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.getAllMessages
+import com.lagradost.cloudstream3.mvvm.getStackTracePretty
+import com.lagradost.cloudstream3.utils.AppUtils
+import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
+import com.lagradost.cloudstream3.utils.TestingUtils
+import kotlinx.android.synthetic.main.provider_test_item.view.*
+
+class TestResultAdapter(override val items: MutableList<Pair<MainAPI, TestingUtils.TestResultProvider>>) :
+    AppUtils.DiffAdapter<Pair<MainAPI, TestingUtils.TestResultProvider>>(items) {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        return ProviderTestViewHolder(
+            LayoutInflater.from(parent.context)
+                .inflate(R.layout.provider_test_item, parent, false),
+        )
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is ProviderTestViewHolder -> {
+                val item = items[position]
+                holder.bind(item.first, item.second)
+            }
+        }
+    }
+
+    inner class ProviderTestViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        private val languageText: TextView = itemView.lang_icon
+        private val providerTitle: TextView = itemView.main_text
+        private val statusText: TextView = itemView.passed_failed_marker
+        private val failDescription: TextView = itemView.fail_description
+        private val logButton: ImageView = itemView.action_button
+
+        private fun String.lastLine(): String? {
+            return this.lines().lastOrNull { it.isNotBlank() }
+        }
+
+        fun bind(api: MainAPI, result: TestingUtils.TestResultProvider) {
+            languageText.text = getFlagFromIso(api.lang)
+            providerTitle.text = api.name
+
+            val (resultText, resultColor) = if (result.success) {
+                R.string.test_passed to R.color.colorTestPass
+            } else {
+                R.string.test_failed to R.color.colorTestFail
+            }
+
+            statusText.setText(resultText)
+            statusText.setTextColor(ContextCompat.getColor(itemView.context, resultColor))
+
+            val stackTrace = result.exception?.getStackTracePretty(false)?.ifBlank { null }
+            val messages = result.exception?.getAllMessages()?.ifBlank { null }
+            val fullLog =
+                result.log + (messages?.let { "\n\n$it" } ?: "") + (stackTrace?.let { "\n\n$it" } ?: "")
+
+            failDescription.text = messages?.lastLine() ?: result.log.lastLine()
+
+            logButton.setOnClickListener {
+                val builder: AlertDialog.Builder =
+                    AlertDialog.Builder(it.context, R.style.AlertDialogCustom)
+                builder.setMessage(fullLog)
+                    .setTitle(R.string.test_log)
+                    .show()
+            }
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestView.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestView.kt
new file mode 100644
index 00000000..26513f4a
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestView.kt
@@ -0,0 +1,119 @@
+package com.lagradost.cloudstream3.ui.settings.testing
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.cardview.widget.CardView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import androidx.core.widget.ContentLoadingProgressBar
+import com.google.android.material.button.MaterialButton
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.utils.AppUtils.animateProgressTo
+
+class TestView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : CardView(context, attrs) {
+    enum class TestState(@StringRes val stringRes: Int, @DrawableRes val icon: Int) {
+        None(R.string.start, R.drawable.ic_baseline_play_arrow_24),
+
+        //        Paused(R.string.resume, R.drawable.ic_baseline_play_arrow_24),
+        Stopped(R.string.restart, R.drawable.ic_baseline_play_arrow_24),
+        Running(R.string.stop, R.drawable.pause_to_play),
+    }
+
+    var mainSection: View? = null
+    var testsPassedSection: View? = null
+    var testsFailedSection: View? = null
+
+    var mainSectionText: TextView? = null
+    var mainSectionHeader: TextView? = null
+    var testsPassedSectionText: TextView? = null
+    var testsFailedSectionText: TextView? = null
+    var totalProgressBar: ContentLoadingProgressBar? = null
+
+    var playPauseButton: MaterialButton? = null
+    var stateListener: (TestState) -> Unit = {}
+
+    private var state = TestState.None
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.view_test, this, true)
+
+        mainSection = findViewById(R.id.main_test_section)
+        testsPassedSection = findViewById(R.id.passed_test_section)
+        testsFailedSection = findViewById(R.id.failed_test_section)
+
+        mainSectionHeader = findViewById(R.id.main_test_header)
+        mainSectionText = findViewById(R.id.main_test_section_progress)
+        testsPassedSectionText = findViewById(R.id.passed_test_section_progress)
+        testsFailedSectionText = findViewById(R.id.failed_test_section_progress)
+
+        totalProgressBar = findViewById(R.id.test_total_progress)
+        playPauseButton = findViewById(R.id.tests_play_pause)
+
+        attrs?.let {
+            val typedArray = context.obtainStyledAttributes(it, R.styleable.TestView)
+            val headerText = typedArray.getString(R.styleable.TestView_header_text)
+            mainSectionHeader?.text = headerText
+            typedArray.recycle()
+        }
+
+        playPauseButton?.setOnClickListener {
+            val newState = when (state) {
+                TestState.None -> TestState.Running
+                TestState.Running -> TestState.Stopped
+                TestState.Stopped -> TestState.Running
+            }
+            setState(newState)
+        }
+    }
+
+    fun setOnPlayButtonListener(listener: (TestState) -> Unit) {
+        stateListener = listener
+    }
+
+    fun setState(newState: TestState) {
+        state = newState
+        stateListener.invoke(newState)
+        playPauseButton?.setText(newState.stringRes)
+        playPauseButton?.icon = ContextCompat.getDrawable(context, newState.icon)
+    }
+
+    fun setProgress(passed: Int, failed: Int, total: Int?) {
+        val totalProgress = passed + failed
+        mainSectionText?.text = "$totalProgress / ${total?.toString() ?: "?"}"
+        testsPassedSectionText?.text = passed.toString()
+        testsFailedSectionText?.text = failed.toString()
+
+        totalProgressBar?.max = (total ?: 0) * 1000
+        totalProgressBar?.animateProgressTo(totalProgress * 1000)
+
+        totalProgressBar?.isVisible = !(totalProgress == 0 || (total ?: 0) == 0)
+        if (totalProgress == total) {
+            setState(TestState.Stopped)
+        }
+    }
+
+    fun setMainHeader(@StringRes header: Int) {
+        mainSectionHeader?.setText(header)
+    }
+
+    fun setOnMainClick(listener: OnClickListener) {
+        mainSection?.setOnClickListener(listener)
+    }
+
+    fun setOnPassedClick(listener: OnClickListener) {
+        testsPassedSection?.setOnClickListener(listener)
+    }
+
+    fun setOnFailedClick(listener: OnClickListener) {
+        testsFailedSection?.setOnClickListener(listener)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
new file mode 100644
index 00000000..2e05baff
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
@@ -0,0 +1,108 @@
+package com.lagradost.cloudstream3.ui.settings.testing
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.lagradost.cloudstream3.APIHolder
+import com.lagradost.cloudstream3.MainAPI
+import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
+import com.lagradost.cloudstream3.utils.TestingUtils
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+
+class TestViewModel : ViewModel() {
+    data class TestProgress(
+        val passed: Int,
+        val failed: Int,
+        val total: Int
+    )
+
+    enum class ProviderFilter {
+        All,
+        Passed,
+        Failed
+    }
+
+    private val _providerProgress = MutableLiveData<TestProgress>(null)
+    val providerProgress: LiveData<TestProgress> = _providerProgress
+
+    private val _providerResults =
+        MutableLiveData<List<Pair<MainAPI, TestingUtils.TestResultProvider>>>(
+            emptyList()
+        )
+
+    val providerResults: LiveData<List<Pair<MainAPI, TestingUtils.TestResultProvider>>> =
+        _providerResults
+
+    private var scope: CoroutineScope? = null
+    val isRunningTest
+        get() = scope != null
+
+    private var filter = ProviderFilter.All
+    private val providers = threadSafeListOf<Pair<MainAPI, TestingUtils.TestResultProvider>>()
+    private var passed = 0
+    private var failed = 0
+    private var total = 0
+
+    private fun updateProgress() {
+        _providerProgress.postValue(TestProgress(passed, failed, total))
+        postProviders()
+    }
+
+    private fun postProviders() {
+        synchronized(providers) {
+            val filtered = when (filter) {
+                ProviderFilter.All -> providers
+                ProviderFilter.Passed -> providers.filter { it.second.success }
+                ProviderFilter.Failed -> providers.filter { !it.second.success }
+            }
+            _providerResults.postValue(filtered)
+        }
+    }
+
+    fun setFilterMethod(filter: ProviderFilter) {
+        if (this.filter == filter) return
+        this.filter = filter
+        postProviders()
+    }
+
+    private fun addProvider(api: MainAPI, results: TestingUtils.TestResultProvider) {
+        synchronized(providers) {
+            val index = providers.indexOfFirst { it.first == api }
+            if (index == -1) {
+                providers.add(api to results)
+                if (results.success) passed++ else failed++
+            } else {
+                providers[index] = api to results
+            }
+            updateProgress()
+        }
+    }
+
+    fun init() {
+        val apis = APIHolder.allProviders
+        total = apis.size
+        updateProgress()
+    }
+
+    fun startTest() {
+        scope = CoroutineScope(Dispatchers.Default)
+
+        val apis = APIHolder.allProviders
+        total = apis.size
+        failed = 0
+        passed = 0
+        providers.clear()
+        updateProgress()
+
+        TestingUtils.getDeferredProviderTests(scope ?: return, apis, ::println) { api, result ->
+            addProvider(api, result)
+        }
+    }
+
+    fun stopTest() {
+        scope?.cancel()
+        scope = null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
index 00dee9b2..4b1053b1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.utils
 
+import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Activity.RESULT_CANCELED
@@ -17,6 +18,7 @@ import android.os.*
 import android.provider.MediaStore
 import android.text.Spanned
 import android.util.Log
+import android.view.animation.DecelerateInterpolator
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
@@ -25,6 +27,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.text.HtmlCompat
 import androidx.core.text.toSpanned
+import androidx.core.widget.ContentLoadingProgressBar
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.fragment.findNavController
@@ -179,6 +182,20 @@ object AppUtils {
         touchSlopField.set(recyclerView, touchSlop * f)       // "8" was obtained experimentally
     }
 
+    fun ContentLoadingProgressBar?.animateProgressTo(to: Int) {
+        if (this == null) return
+        val animation: ObjectAnimator = ObjectAnimator.ofInt(
+            this,
+            "progress",
+            this.progress,
+            to
+        )
+        animation.duration = 500
+        animation.setAutoCancel(true)
+        animation.interpolator = DecelerateInterpolator()
+        animation.start()
+    }
+
     @SuppressLint("RestrictedApi")
     fun getAllWatchNextPrograms(context: Context): Set<Long> {
         val COLUMN_WATCH_NEXT_ID_INDEX = 0
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
new file mode 100644
index 00000000..66e1e504
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
@@ -0,0 +1,267 @@
+package com.lagradost.cloudstream3.utils
+
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.mvvm.logError
+import kotlinx.coroutines.*
+import org.junit.Assert
+
+object TestingUtils {
+    open class TestResult(val success: Boolean) {
+        companion object {
+            val Pass = TestResult(true)
+            val Fail = TestResult(false)
+        }
+    }
+
+    class TestResultSearch(val results: List<SearchResponse>) : TestResult(true)
+    class TestResultLoad(val extractorData: String) : TestResult(true)
+
+    class TestResultProvider(success: Boolean, val log: String, val exception: Throwable?) :
+        TestResult(success)
+
+    @Throws(AssertionError::class, CancellationException::class)
+    suspend fun testHomepage(
+        api: MainAPI,
+        logger: (String) -> Unit
+    ): TestResult {
+        if (api.hasMainPage) {
+            try {
+                val f = api.mainPage.first()
+                val homepage =
+                    api.getMainPage(1, MainPageRequest(f.name, f.data, f.horizontalImages))
+                when {
+                    homepage == null -> {
+                        logger.invoke("Homepage provider ${api.name} did not correctly load homepage!")
+                    }
+                    homepage.items.isEmpty() -> {
+                        logger.invoke("Homepage provider ${api.name} does not contain any items!")
+                    }
+                    homepage.items.any { it.list.isEmpty() } -> {
+                        logger.invoke("Homepage provider ${api.name} does not have any items on result!")
+                    }
+                }
+            } catch (e: Throwable) {
+                if (e is NotImplementedError) {
+                    Assert.fail("Provider marked as hasMainPage, while in reality is has not been implemented")
+                } else if (e is CancellationException) {
+                    throw e
+                }
+                logError(e)
+            }
+        }
+        return TestResult.Pass
+    }
+
+    @Throws(AssertionError::class, CancellationException::class)
+    private suspend fun testSearch(
+        api: MainAPI
+    ): TestResult {
+        val searchQueries = listOf("over", "iron", "guy")
+        val searchResults = searchQueries.firstNotNullOfOrNull { query ->
+            try {
+                api.search(query).takeIf { !it.isNullOrEmpty() }
+            } catch (e: Throwable) {
+                if (e is NotImplementedError) {
+                    Assert.fail("Provider has not implemented search()")
+                } else if (e is CancellationException) {
+                    throw e
+                }
+                logError(e)
+                null
+            }
+        }
+
+        return if (searchResults.isNullOrEmpty()) {
+            Assert.fail("Api ${api.name} did not return any valid search responses")
+            TestResult.Fail // Should not be reached
+        } else {
+            TestResultSearch(searchResults)
+        }
+
+    }
+
+
+    @Throws(AssertionError::class, CancellationException::class)
+    private suspend fun testLoad(
+        api: MainAPI,
+        result: SearchResponse,
+        logger: (String) -> Unit
+    ): TestResult {
+        try {
+            Assert.assertEquals(
+                "Invalid apiName on SearchResponse on ${api.name}",
+                result.apiName,
+                api.name
+            )
+
+            val loadResponse = api.load(result.url)
+
+            if (loadResponse == null) {
+                logger.invoke("Returned null loadResponse on ${result.url} on ${api.name}")
+                return TestResult.Fail
+            }
+
+            Assert.assertEquals(
+                "Invalid apiName on LoadResponse on ${api.name}",
+                loadResponse.apiName,
+                result.apiName
+            )
+            Assert.assertTrue(
+                "Api ${api.name} on load does not contain any of the supportedTypes: ${loadResponse.type}",
+                api.supportedTypes.contains(loadResponse.type)
+            )
+
+            val url = when (loadResponse) {
+                is AnimeLoadResponse -> {
+                    val gotNoEpisodes =
+                        loadResponse.episodes.keys.isEmpty() || loadResponse.episodes.keys.any { loadResponse.episodes[it].isNullOrEmpty() }
+
+                    if (gotNoEpisodes) {
+                        logger.invoke("Api ${api.name} got no episodes on ${loadResponse.url}")
+                        return TestResult.Fail
+                    }
+
+                    (loadResponse.episodes[loadResponse.episodes.keys.firstOrNull()])?.firstOrNull()?.data
+                }
+                is MovieLoadResponse -> {
+                    val gotNoEpisodes = loadResponse.dataUrl.isBlank()
+                    if (gotNoEpisodes) {
+                        logger.invoke("Api ${api.name} got no movie on ${loadResponse.url}")
+                        return TestResult.Fail
+                    }
+
+                    loadResponse.dataUrl
+                }
+                is TvSeriesLoadResponse -> {
+                    val gotNoEpisodes = loadResponse.episodes.isEmpty()
+                    if (gotNoEpisodes) {
+                        logger.invoke("Api ${api.name} got no episodes on ${loadResponse.url}")
+                        return TestResult.Fail
+                    }
+                    loadResponse.episodes.firstOrNull()?.data
+                }
+                is LiveStreamLoadResponse -> {
+                    loadResponse.dataUrl
+                }
+                else -> {
+                    logger.invoke("Unknown load response: ${loadResponse.javaClass.name}")
+                    return TestResult.Fail
+                }
+            } ?: return TestResult.Fail
+
+            return TestResultLoad(url)
+
+//            val loadTest = testLoadResponse(api, load, logger)
+//            if (loadTest is TestResultLoad) {
+//                testLinkLoading(api, loadTest.extractorData, logger).success
+//            } else {
+//                false
+//            }
+//            if (!validResults) {
+//                logger("Api ${api.name} did not load on the first search results: ${smallSearchResults.map { it.name }}")
+//            }
+
+//            return TestResult(validResults)
+        } catch (e: Throwable) {
+            if (e is NotImplementedError) {
+                Assert.fail("Provider has not implemented load()")
+            }
+            throw e
+        }
+    }
+
+    @Throws(AssertionError::class, CancellationException::class)
+    private suspend fun testLinkLoading(
+        api: MainAPI,
+        url: String?,
+        logger: (String) -> Unit
+    ): TestResult {
+        Assert.assertNotNull("Api ${api.name} has invalid url on episode", url)
+        if (url == null) return TestResult.Fail // Should never trigger
+
+        var linksLoaded = 0
+        try {
+            val success = api.loadLinks(url, false, {}) { link ->
+                logger.invoke("Video loaded: ${link.name}")
+                Assert.assertTrue(
+                    "Api ${api.name} returns link with invalid url ${link.url}",
+                    link.url.length > 4
+                )
+                linksLoaded++
+            }
+            if (success) {
+                logger.invoke("Links loaded: $linksLoaded")
+                return TestResult(linksLoaded > 0)
+            } else {
+                Assert.fail("Api ${api.name} returns false on loadLinks() with $linksLoaded links loaded")
+            }
+        } catch (e: Throwable) {
+            when (e) {
+                is NotImplementedError -> {
+                    Assert.fail("Provider has not implemented loadLinks()")
+                }
+                else -> {
+                    logger.invoke("Failed link loading on ${api.name} using data: $url")
+                    throw e
+                }
+            }
+        }
+        return TestResult.Pass
+    }
+
+    fun getDeferredProviderTests(
+        scope: CoroutineScope,
+        providers: List<MainAPI>,
+        logger: (String) -> Unit,
+        callback: (MainAPI, TestResultProvider) -> Unit
+    ) {
+        providers.forEach { api ->
+            scope.launch {
+                var log = ""
+                fun addToLog(string: String) {
+                    log += string + "\n"
+                    logger.invoke(string)
+                }
+                fun getLog(): String {
+                    return log.removeSuffix("\n")
+                }
+
+                val result = try {
+                    addToLog("Trying ${api.name}")
+
+                    // Test Homepage
+                    val homepage = testHomepage(api, logger).success
+                    Assert.assertTrue("Homepage failed to load", homepage)
+
+                    // Test Search Results
+                    val searchResults = testSearch(api)
+                    Assert.assertTrue("Failed to get search results", searchResults.success)
+                    searchResults as TestResultSearch
+
+                    // Test Load and LoadLinks
+                    // Only try the first 3 search results to prevent spamming
+                    val success = searchResults.results.take(3).any { searchResponse ->
+                        addToLog("Testing search result: ${searchResponse.url}")
+                        val loadResponse = testLoad(api, searchResponse, ::addToLog)
+                        if (loadResponse !is TestResultLoad) {
+                            false
+                        } else {
+                            testLinkLoading(api, loadResponse.extractorData, ::addToLog).success
+                        }
+                    }
+
+                    if (success) {
+                        logger.invoke("Success ${api.name}")
+                        TestResultProvider(true, getLog(), null)
+                    } else {
+                        logger.invoke("Error ${api.name}")
+                        TestResultProvider(false, getLog(), null)
+                    }
+                } catch (e: Throwable) {
+                    TestResultProvider(false, getLog(), e)
+                }
+                callback.invoke(api, result)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/baseline_network_ping_24.xml b/app/src/main/res/drawable/baseline_network_ping_24.xml
new file mode 100644
index 00000000..1caae667
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_network_ping_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="?attr/white"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,14.67L3.41,6.09L2,7.5l8.5,8.5H4v2h16v-2h-6.5l5.15,-5.15C18.91,10.95 19.2,11 19.5,11c1.38,0 2.5,-1.12 2.5,-2.5S20.88,6 19.5,6S17,7.12 17,8.5c0,0.35 0.07,0.67 0.2,0.97L12,14.67z"/>
+</vector>
diff --git a/app/src/main/res/drawable/baseline_text_snippet_24.xml b/app/src/main/res/drawable/baseline_text_snippet_24.xml
new file mode 100644
index 00000000..c1f3654b
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_text_snippet_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="?attr/white" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/white" android:pathData="M20.41,8.41l-4.83,-4.83C15.21,3.21 14.7,3 14.17,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V9.83C21,9.3 20.79,8.79 20.41,8.41zM7,7h7v2H7V7zM17,17H7v-2h10V17zM17,13H7v-2h10V13z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_testing.xml b/app/src/main/res/layout/fragment_testing.xml
new file mode 100644
index 00000000..1426f59e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_testing.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:backgroundTint="?attr/primaryBlackBackground"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/provider_test_appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/settings_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/primaryGrayBackground"
+            android:paddingTop="@dimen/navbar_height"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:navigationIconTint="?attr/iconColor"
+            app:titleTextColor="?attr/textColor"
+            tools:title="@string/category_provider_test">
+
+        </com.google.android.material.appbar.MaterialToolbar>
+
+        <com.lagradost.cloudstream3.ui.settings.testing.TestView
+            android:id="@+id/provider_test"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:nextFocusDown="@id/provider_test_recycler_view"
+            app:header_text="@string/category_provider_test"
+            app:layout_scrollFlags="scroll|enterAlways" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/provider_test_recycler_view"
+            android:clipToPadding="false"
+            android:paddingBottom="60dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/provider_test_item" />
+
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/provider_test_item.xml b/app/src/main/res/layout/provider_test_item.xml
new file mode 100644
index 00000000..065b1bd8
--- /dev/null
+++ b/app/src/main/res/layout/provider_test_item.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:nextFocusRight="@id/action_button"
+    android:orientation="horizontal"
+    android:padding="12dp">
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/main_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?attr/textColor"
+            android:textSize="16sp"
+            tools:text="Test repository" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/lang_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginEnd="5dp"
+                tools:text="🇷🇼"
+                android:textColor="?attr/grayTextColor"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/passed_failed_marker"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="Failed"
+                tools:visibility="visible" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/fail_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?attr/grayTextColor"
+            tools:text="Unable to load videos"
+            tools:visibility="visible" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/action_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|end"
+        android:layout_marginStart="10dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:focusable="true"
+        android:padding="12dp"
+        android:src="@drawable/baseline_text_snippet_24"
+        app:tint="?attr/white" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index d71eeb06..e59f670e 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -519,6 +519,23 @@
         app:popExitAnim="@anim/exit_anim"
         tools:layout="@layout/fragment_player" />
 
+    <fragment
+        android:id="@+id/navigation_test_providers"
+        android:name="com.lagradost.cloudstream3.ui.settings.testing.TestFragment"
+        android:layout_height="match_parent"
+        app:enterAnim="@anim/enter_anim"
+        app:exitAnim="@anim/exit_anim"
+        app:popEnterAnim="@anim/enter_anim"
+        app:popExitAnim="@anim/exit_anim"
+        tools:layout="@layout/fragment_testing">
+        <action
+            android:id="@+id/action_navigation_global_to_navigation_test_providers"
+            app:destination="@id/navigation_test_providers"
+            app:enterAnim="@anim/enter_anim"
+            app:exitAnim="@anim/exit_anim"
+            app:popEnterAnim="@anim/enter_anim"
+            app:popExitAnim="@anim/exit_anim" />
+    </fragment>
 
     <fragment
         android:id="@+id/navigation_setup_language"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index fc718008..95094311 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="FlowLayout_Layout">
-        <attr format="dimension" name="itemSpacing" />
+        <attr name="itemSpacing" format="dimension" />
     </declare-styleable>
     <declare-styleable name="FlowLayout_Layout_layout_space" />
 
@@ -13,6 +13,10 @@
         <item name="customCastBackgroundColor">?attr/colorPrimary</item>
     </style>
 
+    <declare-styleable name="TestView">
+        <attr name="header_text" format="string" />
+    </declare-styleable>
+
     <declare-styleable name="MainColors">
         <attr name="colorPrimary" format="color" />
         <attr name="colorSearch" format="color" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 61ff0c2b..7dd4c989 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -82,4 +82,7 @@
     <color name="colorPrimaryGrey">#515151</color>
     <color name="colorPrimaryWhite">#FFFFFF</color>
     <color name="colorPrimaryBrown">#622C00</color>
+
+    <color name="colorTestPass">#48E484</color>
+    <color name="colorTestFail">#ea596e</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 778f34c9..cb9d5508 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,7 @@
     <string name="fast_forward_button_time_key" translatable="false">fast_forward_button_time</string>
     <string name="benene_count" translatable="false">benene_count</string>
     <string name="subtitle_settings_key" translatable="false">subtitle_settings_key</string>
+    <string name="test_providers_key" translatable="false">test_providers_key</string>
     <string name="subtitle_settings_chromecast_key" translatable="false">subtitle_settings_chromecast_key</string>
     <string name="quality_pref_key" translatable="false">quality_pref_key</string>
     <string name="player_pref_key" translatable="false">player_pref_key</string>
@@ -195,6 +196,7 @@
     <string name="normal_no_plot">No Plot Found</string>
     <string name="torrent_no_plot">No Description Found</string>
     <string name="show_log_cat">Show Logcat 🐈</string>
+    <string name="test_log">Log</string>
     <string name="picture_in_picture">Picture-in-picture</string>
     <string name="picture_in_picture_des">Continues playback in a miniature player on top of other apps</string>
     <string name="player_size_settings">Player resize button</string>
@@ -282,6 +284,9 @@
     <string name="delete">Delete</string>
     <string name="cancel" translatable="false">@string/sort_cancel</string>
     <string name="pause">Pause</string>
+    <string name="start">Start</string>
+    <string name="test_failed">Failed</string>
+    <string name="test_passed">Passed</string>
     <string name="resume">Resume</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
@@ -423,6 +428,7 @@
     <string name="enable_nsfw_on_providers">Enable NSFW on supported providers</string>
     <string name="subtitles_encoding">Subtitle encoding</string>
     <string name="category_providers">Providers</string>
+    <string name="category_provider_test">Provider test</string>
     <string name="category_ui">Layout</string>
     <string name="automatic">Auto</string>
     <string name="tv_layout">TV layout</string>
@@ -579,6 +585,8 @@
     <string name="audio_tracks">Audio tracks</string>
     <string name="video_tracks">Video tracks</string>
     <string name="apply_on_restart">Apply on Restart</string>
+    <string name="restart">Restart</string>
+    <string name="stop">Stop</string>
     <string name="safe_mode_title">Safe mode on</string>
     <string name="safe_mode_description">All extensions were turned off due to a crash to help you find the one causing trouble.</string>
     <string name="safe_mode_crash_info">View crash info</string>
@@ -636,4 +644,6 @@
     <string name="empty_library_no_accounts_message">Looks like your library is empty :(\nLogin to a library account or add shows to your local library</string>
     <string name="empty_library_logged_in_message">Looks like this list is empty, try switching to another one</string>
     <string name="safe_mode_file">Safe mode file found!\nNot loading any extensions on startup until file is removed.</string>
+<!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings_providers.xml b/app/src/main/res/xml/settings_providers.xml
index a177865b..1ee58faf 100644
--- a/app/src/main/res/xml/settings_providers.xml
+++ b/app/src/main/res/xml/settings_providers.xml
@@ -1,24 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <Preference
-            android:icon="@drawable/ic_baseline_language_24"
-            android:key="@string/provider_lang_key"
-            android:title="@string/provider_lang_settings" />
+        android:icon="@drawable/ic_baseline_language_24"
+        android:key="@string/provider_lang_key"
+        android:title="@string/provider_lang_settings" />
 
     <Preference
-            android:key="@string/prefer_media_type_key"
-            android:title="@string/preferred_media_settings"
-            android:icon="@drawable/ic_baseline_play_arrow_24" />
+        android:icon="@drawable/ic_baseline_play_arrow_24"
+        android:key="@string/prefer_media_type_key"
+        android:title="@string/preferred_media_settings" />
     <Preference
-            android:key="@string/display_sub_key"
-            android:title="@string/display_subbed_dubbed_settings"
-            android:icon="@drawable/ic_outline_voice_over_off_24" />
+        android:icon="@drawable/ic_outline_voice_over_off_24"
+        android:key="@string/display_sub_key"
+        android:title="@string/display_subbed_dubbed_settings" />
 
     <SwitchPreference
-            android:key="@string/enable_nsfw_on_providers_key"
-            android:title="@string/enable_nsfw_on_providers"
-            android:icon="@drawable/ic_baseline_extension_24"
-            android:summary="@string/apply_on_restart"
-            app:defaultValue="false"/>
+        android:icon="@drawable/ic_baseline_extension_24"
+        android:key="@string/enable_nsfw_on_providers_key"
+        android:summary="@string/apply_on_restart"
+        android:title="@string/enable_nsfw_on_providers"
+        app:defaultValue="false" />
+
+    <Preference
+        android:icon="@drawable/baseline_network_ping_24"
+        android:key="@string/test_providers_key"
+        android:title="Test all providers" />
+
 </PreferenceScreen>
\ No newline at end of file

From 9d0cce47a67472260e553ba8acd2e4d08fd43cc9 Mon Sep 17 00:00:00 2001
From: "recloudstream[bot]"
 <111277985+recloudstream[bot]@users.noreply.github.com>
Date: Wed, 15 Feb 2023 20:40:50 +0000
Subject: [PATCH 231/273] update list of locales

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 2e249948..354dc89c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -68,12 +68,12 @@ val appLanguages = arrayListOf(
     Triple("", "español", "es"),
     Triple("", "فارسی", "fa"),
     Triple("", "français", "fr"),
-    Triple("\uD83C\uDDEE\uD83C\uDDF1", "עברית", "iw"),
     Triple("", "हिन्दी", "hi"),
     Triple("", "hrvatski", "hr"),
     Triple("", "magyar", "hu"),
     Triple("\uD83C\uDDEE\uD83C\uDDE9", "Bahasa Indonesia", "in"),
     Triple("", "italiano", "it"),
+    Triple("\uD83C\uDDEE\uD83C\uDDF1", "עברית", "iw"),
     Triple("", "ಕನ್ನಡ", "kn"),
     Triple("", "македонски", "mk"),
     Triple("", "മലയാളം", "ml"),

From 789cd14ef6fcb9cfdd5646d79af25f16916cf3d3 Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Wed, 15 Feb 2023 21:41:20 +0100
Subject: [PATCH 232/273] remove placeholder

---
 app/src/main/res/values/strings.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cb9d5508..47517378 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -644,6 +644,4 @@
     <string name="empty_library_no_accounts_message">Looks like your library is empty :(\nLogin to a library account or add shows to your local library</string>
     <string name="empty_library_logged_in_message">Looks like this list is empty, try switching to another one</string>
     <string name="safe_mode_file">Safe mode file found!\nNot loading any extensions on startup until file is removed.</string>
-<!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>
\ No newline at end of file

From 3dd0fc6c8e90e70eb413aba256da5cc4e3ab6f2e Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Wed, 15 Feb 2023 22:09:08 +0100
Subject: [PATCH 233/273] add view_test

---
 app/src/main/res/layout/view_test.xml | 138 ++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 app/src/main/res/layout/view_test.xml

diff --git a/app/src/main/res/layout/view_test.xml b/app/src/main/res/layout/view_test.xml
new file mode 100644
index 00000000..99300ce4
--- /dev/null
+++ b/app/src/main/res/layout/view_test.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/Widget.Material3.CardView.Elevated"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="?attr/primaryBlackBackground">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="10dp">
+
+        <LinearLayout
+            android:id="@+id/main_test_section"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/outline_drawable_less"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingHorizontal="10dp"
+            android:paddingVertical="10dp">
+
+            <TextView
+                android:id="@+id/main_test_header"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textSize="17sp"
+                tools:text="Homepage test" />
+
+            <TextView
+                android:id="@+id/main_test_section_progress"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="end"
+                android:textSize="17sp"
+                tools:text="67 / 120 " />
+        </LinearLayout>
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            app:cardBackgroundColor="?attr/primaryGrayBackground"
+            app:cardCornerRadius="@dimen/rounded_image_radius">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:id="@+id/passed_test_section"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/outline_drawable_less"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:padding="10dp">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="Tests passed"
+                        android:textSize="17sp" />
+
+                    <TextView
+                        android:id="@+id/passed_test_section_progress"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:textSize="17sp"
+                        tools:text="55" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/failed_test_section"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/outline_drawable_less"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:padding="10dp">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="Tests failed"
+                        android:textSize="17sp" />
+
+                    <TextView
+                        android:id="@+id/failed_test_section_progress"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:textSize="17sp"
+                        tools:text="12" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+
+        </androidx.cardview.widget.CardView>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/tests_play_pause"
+            style="@style/WhiteButton"
+            android:layout_width="wrap_content"
+            android:layout_margin="10dp"
+            android:text="@string/start"
+            app:icon="@drawable/ic_baseline_play_arrow_24">
+
+        </com.google.android.material.button.MaterialButton>
+
+    </LinearLayout>
+
+
+    <androidx.core.widget.ContentLoadingProgressBar
+        android:id="@+id/test_total_progress"
+        style="@android:style/Widget.Material.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="-1.5dp"
+        android:progressBackgroundTint="?attr/colorPrimary"
+        android:progressTint="?attr/colorPrimary"
+        android:visibility="gone"
+        tools:progress="50" />
+
+</androidx.cardview.widget.CardView>

From aacd57cb5d2ae860fad11640d0ada1fe3fd55d2d Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Thu, 16 Feb 2023 01:15:30 +0100
Subject: [PATCH 234/273] Fixed scrolling up on bottom dialogs and removing
 stuff from AniList

---
 .../syncproviders/providers/AniListApi.kt     | 53 +++++++++++++-----
 .../ui/result/ResultFragmentPhone.kt          |  2 -
 .../ui/result/ResultFragmentTv.kt             |  5 +-
 .../layout/bottom_selection_dialog_direct.xml | 54 +++++++++----------
 4 files changed, 69 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
index 7d9de43a..0010ce25 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
@@ -759,6 +759,11 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         return data != ""
     }
 
+    /** Used to query a saved MediaItem on the list to get the id for removal */
+    data class MediaListItemRoot(@JsonProperty("data") val data: MediaListItem? = null)
+    data class MediaListItem(@JsonProperty("MediaList") val MediaList: MediaListId? = null)
+    data class MediaListId(@JsonProperty("id") val id: Long? = null)
+
     private suspend fun postDataAboutId(
         id: Int,
         type: AniListStatusType,
@@ -766,19 +771,43 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         progress: Int?
     ): Boolean {
         val q =
-            """mutation (${'$'}id: Int = $id, ${'$'}status: MediaListStatus = ${
-                aniListStatusString[maxOf(
-                    0,
-                    type.value
-                )]
-            }, ${if (score != null) "${'$'}scoreRaw: Int = ${score * 10}" else ""} , ${if (progress != null) "${'$'}progress: Int = $progress" else ""}) {
-                SaveMediaListEntry (mediaId: ${'$'}id, status: ${'$'}status, scoreRaw: ${'$'}scoreRaw, progress: ${'$'}progress) {
-                    id
-                    status
-                    progress
-                    score
-                }
+            // Delete item if status type is None
+            if (type == AniListStatusType.None) {
+                val userID = getKey<AniListUser>(accountId, ANILIST_USER_KEY)?.id ?: return false
+                // Get list ID for deletion
+                val idQuery = """
+                  query MediaList(${'$'}userId: Int = $userID, ${'$'}mediaId: Int = $id) {
+                    MediaList(userId: ${'$'}userId, mediaId: ${'$'}mediaId) {
+                      id
+                    }
+                  }
+                """
+                val response = postApi(idQuery)
+                val listId =
+                    tryParseJson<MediaListItemRoot>(response)?.data?.MediaList?.id ?: return false
+                """
+                    mutation(${'$'}id: Int = $listId) {
+                        DeleteMediaListEntry(id: ${'$'}id) {
+                            deleted
+                        }
+                    }
+                """
+            } else {
+                """mutation (${'$'}id: Int = $id, ${'$'}status: MediaListStatus = ${
+                    aniListStatusString[maxOf(
+                        0,
+                        type.value
+                    )]
+                }, ${if (score != null) "${'$'}scoreRaw: Int = ${score * 10}" else ""} , ${if (progress != null) "${'$'}progress: Int = $progress" else ""}) {
+                    SaveMediaListEntry (mediaId: ${'$'}id, status: ${'$'}status, scoreRaw: ${'$'}scoreRaw, progress: ${'$'}progress) {
+                        id
+                        status
+                        progress
+                        score
+                    }
                 }"""
+            }
+
         val data = postApi(q)
         return data != ""
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index b38e1765..2f232995 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -322,9 +322,7 @@ class ResultFragmentPhone : ResultFragment() {
                         //    it?.dismiss()
                         //}
                         builder.setCanceledOnTouchOutside(true)
-
                         builder.show()
-
                         builder
                     }
                 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
index 2bd8ff0f..71ecb0e9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
@@ -176,8 +176,7 @@ class ResultFragmentTv : ResultFragment() {
                         loadingDialog = null
                     }
                     loadingDialog = loadingDialog ?: context?.let { ctx ->
-                        val builder =
-                            BottomSheetDialog(ctx)
+                        val builder = BottomSheetDialog(ctx)
                         builder.setContentView(R.layout.bottom_loading)
                         builder.setOnDismissListener {
                             loadingDialog = null
@@ -187,9 +186,7 @@ class ResultFragmentTv : ResultFragment() {
                         //    it?.dismiss()
                         //}
                         builder.setCanceledOnTouchOutside(true)
-
                         builder.show()
-
                         builder
                     }
                 }
diff --git a/app/src/main/res/layout/bottom_selection_dialog_direct.xml b/app/src/main/res/layout/bottom_selection_dialog_direct.xml
index 0d179ebb..cf31ba1f 100644
--- a/app/src/main/res/layout/bottom_selection_dialog_direct.xml
+++ b/app/src/main/res/layout/bottom_selection_dialog_direct.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <TextView
-            android:id="@+id/text1"
-            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="10dp"
-            android:textStyle="bold"
-            android:textSize="20sp"
-            android:textColor="?attr/textColor"
-            android:layout_width="match_parent"
-            android:layout_rowWeight="1"
-            tools:text="Test"
-            android:layout_height="wrap_content" />
+        android:id="@+id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_rowWeight="1"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="10dp"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:textColor="?attr/textColor"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        tools:text="Test" />
 
     <ListView
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusLeft="@id/apply_btt"
-
-            android:id="@+id/listview1"
-            android:layout_marginBottom="60dp"
-            android:paddingTop="10dp"
-            android:requiresFadingEdge="vertical"
-            tools:listitem="@layout/sort_bottom_single_choice_no_checkmark"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_rowWeight="1" />
+        android:id="@+id/listview1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_rowWeight="1"
+        android:layout_marginBottom="60dp"
+        android:nestedScrollingEnabled="true"
+        android:nextFocusLeft="@id/apply_btt"
+        android:nextFocusRight="@id/cancel_btt"
+        android:paddingTop="10dp"
+        android:requiresFadingEdge="vertical"
+        tools:listitem="@layout/sort_bottom_single_choice_no_checkmark" />
 </LinearLayout>

From b6ac155350cf6d4b070e79276efd6389b5858f05 Mon Sep 17 00:00:00 2001
From: MhmdIbrahim1 <107378571+MhmdIbrahim1@users.noreply.github.com>
Date: Fri, 17 Feb 2023 23:42:20 +0200
Subject: [PATCH 235/273] update VideoDownloadService (#377)

---
 .../services/VideoDownloadService.kt          | 51 ++++++++++++++++---
 1 file changed, 44 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/services/VideoDownloadService.kt b/app/src/main/java/com/lagradost/cloudstream3/services/VideoDownloadService.kt
index be2fe75b..6151a0ed 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/services/VideoDownloadService.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/services/VideoDownloadService.kt
@@ -1,11 +1,22 @@
 package com.lagradost.cloudstream3.services
-
-import android.app.IntentService
+import android.app.Service
 import android.content.Intent
+import android.os.IBinder
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
 
-class VideoDownloadService : IntentService("VideoDownloadService") {
-    override fun onHandleIntent(intent: Intent?) {
+class VideoDownloadService : Service() {
+
+    private val downloadScope = CoroutineScope(Dispatchers.Default)
+
+    override fun onBind(intent: Intent?): IBinder? {
+        return null
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         if (intent != null) {
             val id = intent.getIntExtra("id", -1)
             val type = intent.getStringExtra("type")
@@ -14,10 +25,36 @@ class VideoDownloadService : IntentService("VideoDownloadService") {
                     "resume" -> VideoDownloadManager.DownloadActionType.Resume
                     "pause" -> VideoDownloadManager.DownloadActionType.Pause
                     "stop" -> VideoDownloadManager.DownloadActionType.Stop
-                    else -> return
+                    else -> return START_NOT_STICKY
+                }
+
+                downloadScope.launch {
+                    VideoDownloadManager.downloadEvent.invoke(Pair(id, state))
                 }
-                VideoDownloadManager.downloadEvent.invoke(Pair(id, state))
             }
         }
+
+        return START_NOT_STICKY
     }
-}
\ No newline at end of file
+
+    override fun onDestroy() {
+        downloadScope.coroutineContext.cancel()
+        super.onDestroy()
+    }
+}
+//    override fun onHandleIntent(intent: Intent?) {
+//        if (intent != null) {
+//            val id = intent.getIntExtra("id", -1)
+//            val type = intent.getStringExtra("type")
+//            if (id != -1 && type != null) {
+//                val state = when (type) {
+//                    "resume" -> VideoDownloadManager.DownloadActionType.Resume
+//                    "pause" -> VideoDownloadManager.DownloadActionType.Pause
+//                    "stop" -> VideoDownloadManager.DownloadActionType.Stop
+//                    else -> return
+//                }
+//                VideoDownloadManager.downloadEvent.invoke(Pair(id, state))
+//            }
+//        }
+//    }
+//}

From b4065b69beeb6ab12298aba3ea74583fe5f7372f Mon Sep 17 00:00:00 2001
From: no-commit <>
Date: Fri, 17 Feb 2023 23:05:11 +0100
Subject: [PATCH 236/273] Added dropdown indicators Solves #375

---
 app/src/main/res/layout/fragment_result.xml | 23 ++++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index afbf735d..a481ed6b 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -129,9 +129,9 @@
         <androidx.core.widget.NestedScrollView
             android:id="@+id/result_scroll"
             android:layout_width="match_parent"
-            android:paddingBottom="100dp"
+            android:layout_height="wrap_content"
             android:clipToPadding="false"
-            android:layout_height="wrap_content">
+            android:paddingBottom="100dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -326,13 +326,12 @@
 
                             <ImageView
                                 android:id="@+id/result_poster"
-
                                 android:layout_width="100dp"
                                 android:layout_height="140dp"
+                                android:layout_gravity="bottom"
                                 android:contentDescription="@string/result_poster_img_des"
                                 android:foreground="@drawable/outline_drawable"
                                 android:scaleType="centerCrop"
-                                android:layout_gravity="bottom"
                                 tools:src="@drawable/example_poster" />
                         </androidx.cardview.widget.CardView>
 
@@ -516,8 +515,8 @@
                         android:visibility="gone" />
 
                     <com.google.android.material.chip.ChipGroup
-                        style="@style/ChipParent"
                         android:id="@+id/result_tag"
+                        style="@style/ChipParent"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                     <!--<com.lagradost.cloudstream3.widget.FlowLayout
@@ -818,10 +817,13 @@
                                     android:layout_gravity="center_vertical"
                                     android:layout_marginStart="0dp"
                                     android:layout_marginEnd="10dp"
+                                    android:drawableEnd="@drawable/ic_baseline_keyboard_arrow_down_24"
                                     android:nextFocusLeft="@id/result_episode_select"
                                     android:nextFocusRight="@id/result_episode_select"
                                     android:nextFocusUp="@id/result_description"
                                     android:nextFocusDown="@id/result_episodes"
+                                    android:paddingStart="10dp"
+                                    android:paddingEnd="5dp"
                                     android:visibility="gone"
                                     tools:text="Season 1"
                                     tools:visibility="visible" />
@@ -829,16 +831,16 @@
                                 <com.google.android.material.button.MaterialButton
                                     android:id="@+id/result_episode_select"
                                     style="@style/MultiSelectButton"
-
                                     android:layout_gravity="center_vertical"
                                     android:layout_marginStart="0dp"
                                     android:layout_marginEnd="10dp"
-
+                                    android:drawableEnd="@drawable/ic_baseline_keyboard_arrow_down_24"
                                     android:nextFocusLeft="@id/result_season_button"
                                     android:nextFocusRight="@id/result_season_button"
-
                                     android:nextFocusUp="@id/result_description"
                                     android:nextFocusDown="@id/result_episodes"
+                                    android:paddingStart="10dp"
+                                    android:paddingEnd="5dp"
                                     android:visibility="gone"
                                     tools:text="50-100"
                                     tools:visibility="visible" />
@@ -846,15 +848,16 @@
                                 <com.google.android.material.button.MaterialButton
                                     android:id="@+id/result_dub_select"
                                     style="@style/MultiSelectButton"
-
                                     android:layout_gravity="center_vertical"
                                     android:layout_marginStart="0dp"
                                     android:layout_marginEnd="10dp"
+                                    android:drawableEnd="@drawable/ic_baseline_keyboard_arrow_down_24"
                                     android:nextFocusLeft="@id/result_season_button"
                                     android:nextFocusRight="@id/result_season_button"
-
                                     android:nextFocusUp="@id/result_description"
                                     android:nextFocusDown="@id/result_episodes"
+                                    android:paddingStart="10dp"
+                                    android:paddingEnd="5dp"
                                     android:visibility="gone"
                                     tools:text="Dubbed"
                                     tools:visibility="visible" />

From 33aecfbba520be7bdf3adcb8e3a6731113a75bcf Mon Sep 17 00:00:00 2001
From: LikDev-256 <81100289+LikDev-256@users.noreply.github.com>
Date: Sat, 18 Feb 2023 17:45:50 +0530
Subject: [PATCH 237/273] Fix Streamsb (#380)

---
 .../java/com/lagradost/cloudstream3/extractors/StreamSB.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
index 958d63fb..b77617c2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
@@ -130,7 +130,7 @@ open class StreamSB : ExtractorApi() {
             it.value.replace(Regex("(embed-|/e/)"), "")
         }.first()
 //        val master = "$mainUrl/sources48/6d6144797752744a454267617c7c${bytesToHex.lowercase()}7c7c4e61755a56456f34385243727c7c73747265616d7362/6b4a33767968506e4e71374f7c7c343837323439333133333462353935333633373836643638376337633462333634663539343137373761333635313533333835333763376333393636363133393635366136323733343435323332376137633763373337343732363536313664373336327c7c504d754478413835306633797c7c73747265616d7362"
-        val master = "$mainUrl/sources50/" + bytesToHex("||$id||||streamsb".toByteArray()) + "/"
+        val master = "$mainUrl/sources51/" + bytesToHex("||$id||||streamsb".toByteArray()) + "/"
         val headers = mapOf(
             "watchsb" to "sbstream",
         )
@@ -156,4 +156,4 @@ open class StreamSB : ExtractorApi() {
             )
         }
     }
-}
\ No newline at end of file
+}

From 00a91ca5fb487d3f206d436cdd7b39bdf2b23396 Mon Sep 17 00:00:00 2001
From: no-commit <>
Date: Sun, 19 Feb 2023 19:27:40 +0100
Subject: [PATCH 238/273] Added Subscriptions (pinged every ~6 hours)

---
 app/build.gradle.kts                          |   4 +-
 .../com/lagradost/cloudstream3/MainAPI.kt     |  28 ++-
 .../cloudstream3/plugins/PluginManager.kt     |  31 +--
 .../services/SubscriptionWorkManager.kt       | 218 ++++++++++++++++++
 .../syncproviders/providers/LocalList.kt      |   8 +-
 .../cloudstream3/ui/result/ResultFragment.kt  |  35 ++-
 .../ui/result/ResultViewModel2.kt             |  54 ++++-
 .../lagradost/cloudstream3/utils/AppUtils.kt  |  18 ++
 .../cloudstream3/utils/DataStoreHelper.kt     |  78 ++++++-
 .../utils/PackageInstallerService.kt          |  23 +-
 .../utils/VideoDownloadManager.kt             |  13 +-
 .../baseline_notifications_none_24.xml        |   5 +
 .../ic_cloudstream_monochrome_big.xml         |  27 +++
 .../main/res/layout/fragment_result_swipe.xml |  23 +-
 app/src/main/res/values/strings.xml           |   5 +
 15 files changed, 515 insertions(+), 55 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt
 create mode 100644 app/src/main/res/drawable/baseline_notifications_none_24.xml
 create mode 100644 app/src/main/res/drawable/ic_cloudstream_monochrome_big.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3c855d28..9cbccbe5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -184,8 +184,8 @@ dependencies {
     //implementation("com.github.TorrentStream:TorrentStream-Android:2.7.0")
 
     // Downloading
-    implementation("androidx.work:work-runtime:2.7.1")
-    implementation("androidx.work:work-runtime-ktx:2.7.1")
+    implementation("androidx.work:work-runtime:2.8.0")
+    implementation("androidx.work:work-runtime-ktx:2.8.0")
 
     // Networking
 //    implementation("com.squareup.okhttp3:okhttp:4.9.2")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 3958984e..c20786c3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -1327,7 +1327,7 @@ fun LoadResponse?.isAnimeBased(): Boolean {
 
 fun TvType?.isEpisodeBased(): Boolean {
     if (this == null) return false
-    return (this == TvType.TvSeries || this == TvType.Anime)
+    return (this == TvType.TvSeries || this == TvType.Anime || this == TvType.AsianDrama)
 }
 
 
@@ -1351,6 +1351,7 @@ interface EpisodeResponse {
     var showStatus: ShowStatus?
     var nextAiring: NextAiring?
     var seasonNames: List<SeasonData>?
+    fun getLatestEpisodes(): Map<DubStatus, Int?>
 }
 
 @JvmName("addSeasonNamesString")
@@ -1419,7 +1420,18 @@ data class AnimeLoadResponse(
     override var nextAiring: NextAiring? = null,
     override var seasonNames: List<SeasonData>? = null,
     override var backgroundPosterUrl: String? = null,
-) : LoadResponse, EpisodeResponse
+) : LoadResponse, EpisodeResponse {
+    override fun getLatestEpisodes(): Map<DubStatus, Int?> {
+        return episodes.map { (status, episodes) ->
+            val maxSeason = episodes.maxOfOrNull { it.season ?: Int.MIN_VALUE }
+                .takeUnless { it == Int.MIN_VALUE }
+            status to episodes
+                .filter { it.season == maxSeason }
+                .maxOfOrNull { it.episode ?: Int.MIN_VALUE }
+                .takeUnless { it == Int.MIN_VALUE }
+        }.toMap()
+    }
+}
 
 /**
  * If episodes already exist appends the list.
@@ -1617,7 +1629,17 @@ data class TvSeriesLoadResponse(
     override var nextAiring: NextAiring? = null,
     override var seasonNames: List<SeasonData>? = null,
     override var backgroundPosterUrl: String? = null,
-) : LoadResponse, EpisodeResponse
+) : LoadResponse, EpisodeResponse {
+    override fun getLatestEpisodes(): Map<DubStatus, Int?> {
+        val maxSeason =
+            episodes.maxOfOrNull { it.season ?: Int.MIN_VALUE }.takeUnless { it == Int.MIN_VALUE }
+        val max = episodes
+            .filter { it.season == maxSeason }
+            .maxOfOrNull { it.episode ?: Int.MIN_VALUE }
+            .takeUnless { it == Int.MIN_VALUE }
+        return mapOf(DubStatus.None to max)
+    }
+}
 
 suspend fun MainAPI.newTvSeriesLoadResponse(
     name: String,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index 3533d6a8..0dee57eb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -16,6 +16,7 @@ import com.google.gson.Gson
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
 import com.lagradost.cloudstream3.APIHolder.removePluginMapping
+import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
@@ -165,11 +166,11 @@ object PluginManager {
     private var loadedLocalPlugins = false
     private val gson = Gson()
 
-    private suspend fun maybeLoadPlugin(activity: Activity, file: File) {
+    private suspend fun maybeLoadPlugin(context: Context, file: File) {
         val name = file.name
         if (file.extension == "zip" || file.extension == "cs3") {
             loadPlugin(
-                activity,
+                context,
                 file,
                 PluginData(name, null, false, file.absolutePath, PLUGIN_VERSION_NOT_SET)
             )
@@ -199,7 +200,7 @@ object PluginManager {
 
     // var allCurrentOutDatedPlugins: Set<OnlinePluginData> = emptySet()
 
-    suspend fun loadSinglePlugin(activity: Activity, apiName: String): Boolean {
+    suspend fun loadSinglePlugin(context: Context, apiName: String): Boolean {
         return (getPluginsOnline().firstOrNull {
             // Most of the time the provider ends with Provider which isn't part of the api name
             it.internalName.replace("provider", "", ignoreCase = true) == apiName
@@ -209,7 +210,7 @@ object PluginManager {
             })?.let { savedData ->
             // OnlinePluginData(savedData, onlineData)
             loadPlugin(
-                activity,
+                context,
                 File(savedData.filePath),
                 savedData
             )
@@ -371,11 +372,11 @@ object PluginManager {
     /**
      * Use updateAllOnlinePluginsAndLoadThem
      * */
-    fun loadAllOnlinePlugins(activity: Activity) {
+    fun loadAllOnlinePlugins(context: Context) {
         // Load all plugins as fast as possible!
         (getPluginsOnline()).toList().apmap { pluginData ->
             loadPlugin(
-                activity,
+                context,
                 File(pluginData.filePath),
                 pluginData
             )
@@ -398,7 +399,7 @@ object PluginManager {
      * @param forceReload see afterPluginsLoadedEvent, basically a way to load all local plugins
      * and reload all pages even if they are previously valid
      **/
-    fun loadAllLocalPlugins(activity: Activity, forceReload: Boolean) {
+    fun loadAllLocalPlugins(context: Context, forceReload: Boolean) {
         val dir = File(LOCAL_PLUGINS_PATH)
         removeKey(PLUGINS_KEY_LOCAL)
 
@@ -416,7 +417,7 @@ object PluginManager {
         Log.d(TAG, "Files in '${LOCAL_PLUGINS_PATH}' folder: $sortedPlugins")
 
         sortedPlugins?.sortedBy { it.name }?.apmap { file ->
-            maybeLoadPlugin(activity, file)
+            maybeLoadPlugin(context, file)
         }
 
         loadedLocalPlugins = true
@@ -441,14 +442,14 @@ object PluginManager {
     /**
      * @return True if successful, false if not
      * */
-    private suspend fun loadPlugin(activity: Activity, file: File, data: PluginData): Boolean {
+    private suspend fun loadPlugin(context: Context, file: File, data: PluginData): Boolean {
         val fileName = file.nameWithoutExtension
         val filePath = file.absolutePath
         currentlyLoading = fileName
         Log.i(TAG, "Loading plugin: $data")
 
         return try {
-            val loader = PathClassLoader(filePath, activity.classLoader)
+            val loader = PathClassLoader(filePath, context.classLoader)
             var manifest: Plugin.Manifest
             loader.getResourceAsStream("manifest.json").use { stream ->
                 if (stream == null) {
@@ -492,22 +493,22 @@ object PluginManager {
                 addAssetPath.invoke(assets, file.absolutePath)
                 pluginInstance.resources = Resources(
                     assets,
-                    activity.resources.displayMetrics,
-                    activity.resources.configuration
+                    context.resources.displayMetrics,
+                    context.resources.configuration
                 )
             }
             plugins[filePath] = pluginInstance
             classLoaders[loader] = pluginInstance
             urlPlugins[data.url ?: filePath] = pluginInstance
-            pluginInstance.load(activity)
+            pluginInstance.load(context)
             Log.i(TAG, "Loaded plugin ${data.internalName} successfully")
             currentlyLoading = null
             true
         } catch (e: Throwable) {
             Log.e(TAG, "Failed to load $file: ${Log.getStackTraceString(e)}")
             showToast(
-                activity,
-                activity.getString(R.string.plugin_load_fail).format(fileName),
+                context.getActivity(),
+                context.getString(R.string.plugin_load_fail).format(fileName),
                 Toast.LENGTH_LONG
             )
             currentlyLoading = null
diff --git a/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt b/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt
new file mode 100644
index 00000000..d1b1b660
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt
@@ -0,0 +1,218 @@
+package com.lagradost.cloudstream3.services
+
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.net.toUri
+import androidx.work.*
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.APIHolder.getApiDubstatusSettings
+import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.safeApiCall
+import com.lagradost.cloudstream3.plugins.PluginManager
+import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.utils.AppUtils.createNotificationChannel
+import com.lagradost.cloudstream3.utils.Coroutines.ioWork
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllSubscriptions
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getDub
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.getImageBitmapFromUrl
+import kotlinx.coroutines.withTimeoutOrNull
+import java.util.concurrent.TimeUnit
+
+const val SUBSCRIPTION_CHANNEL_ID = "cloudstream3.subscriptions"
+const val SUBSCRIPTION_WORK_NAME = "work_subscription"
+const val SUBSCRIPTION_CHANNEL_NAME = "Subscriptions"
+const val SUBSCRIPTION_CHANNEL_DESCRIPTION = "Notifications for new episodes on subscribed shows"
+const val SUBSCRIPTION_NOTIFICATION_ID = 938712897 // Random unique
+
+class SubscriptionWorkManager(val context: Context, workerParams: WorkerParameters) :
+    CoroutineWorker(context, workerParams) {
+    companion object {
+        fun enqueuePeriodicWork(context: Context?) {
+            if (context == null) return
+
+            val constraints = Constraints.Builder()
+                .setRequiredNetworkType(NetworkType.CONNECTED)
+                .build()
+
+            val periodicSyncDataWork =
+                PeriodicWorkRequest.Builder(SubscriptionWorkManager::class.java, 6, TimeUnit.HOURS)
+                    .addTag(SUBSCRIPTION_WORK_NAME)
+                    .setConstraints(constraints)
+                    .build()
+
+            WorkManager.getInstance(context).enqueueUniquePeriodicWork(
+                SUBSCRIPTION_WORK_NAME,
+                ExistingPeriodicWorkPolicy.KEEP,
+                periodicSyncDataWork
+            )
+
+            // Uncomment below for testing
+
+//            val oneTimeSyncDataWork =
+//                OneTimeWorkRequest.Builder(SubscriptionWorkManager::class.java)
+//                    .addTag(SUBSCRIPTION_WORK_NAME)
+//                    .setConstraints(constraints)
+//                    .build()
+//
+//            WorkManager.getInstance(context).enqueue(oneTimeSyncDataWork)
+        }
+    }
+
+    private val progressNotificationBuilder =
+        NotificationCompat.Builder(context, SUBSCRIPTION_CHANNEL_ID)
+            .setAutoCancel(false)
+            .setColorized(true)
+            .setOnlyAlertOnce(true)
+            .setSilent(true)
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setColor(context.colorFromAttribute(R.attr.colorPrimary))
+            .setContentTitle(context.getString(R.string.subscription_in_progress_notification))
+            .setSmallIcon(R.drawable.quantum_ic_refresh_white_24)
+            .setProgress(0, 0, true)
+
+    private val updateNotificationBuilder =
+        NotificationCompat.Builder(context, SUBSCRIPTION_CHANNEL_ID)
+            .setColorized(true)
+            .setOnlyAlertOnce(true)
+            .setAutoCancel(true)
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setColor(context.colorFromAttribute(R.attr.colorPrimary))
+            .setSmallIcon(R.drawable.ic_cloudstream_monochrome_big)
+
+    private val notificationManager: NotificationManager =
+        context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+    private fun updateProgress(max: Int, progress: Int, indeterminate: Boolean) {
+        notificationManager.notify(
+            SUBSCRIPTION_NOTIFICATION_ID, progressNotificationBuilder
+                .setProgress(max, progress, indeterminate)
+                .build()
+        )
+    }
+
+    override suspend fun doWork(): Result {
+//        println("Update subscriptions!")
+        context.createNotificationChannel(
+            SUBSCRIPTION_CHANNEL_ID,
+            SUBSCRIPTION_CHANNEL_NAME,
+            SUBSCRIPTION_CHANNEL_DESCRIPTION
+        )
+
+        safeApiCall {
+            setForeground(
+                ForegroundInfo(
+                    SUBSCRIPTION_NOTIFICATION_ID,
+                    progressNotificationBuilder.build()
+                )
+            )
+        }
+
+        val subscriptions = getAllSubscriptions()
+
+        if (subscriptions.isEmpty()) {
+            WorkManager.getInstance(context).cancelWorkById(this.id)
+            return Result.success()
+        }
+
+        val max = subscriptions.size
+        var progress = 0
+
+        updateProgress(max, progress, true)
+
+        // We need all plugins loaded.
+        PluginManager.loadAllOnlinePlugins(context)
+        PluginManager.loadAllLocalPlugins(context, false)
+
+        subscriptions.apmap { savedData ->
+            try {
+                val id = savedData.id ?: return@apmap null
+                val api = getApiFromNameNull(savedData.apiName) ?: return@apmap null
+
+                // Reasonable timeout to prevent having this worker run forever.
+                val response = withTimeoutOrNull(60_000) {
+                    api.load(savedData.url) as? EpisodeResponse
+                } ?: return@apmap null
+
+                val dubPreference =
+                    getDub(id) ?: if (
+                        context.getApiDubstatusSettings().contains(DubStatus.Dubbed)
+                    ) {
+                        DubStatus.Dubbed
+                    } else {
+                        DubStatus.Subbed
+                    }
+
+                val latestEpisodes = response.getLatestEpisodes()
+                val latestPreferredEpisode = latestEpisodes[dubPreference]
+
+                val (shouldUpdate, latestEpisode) = if (latestPreferredEpisode != null) {
+                    val latestSeenEpisode =
+                        savedData.lastSeenEpisodeCount[dubPreference] ?: Int.MIN_VALUE
+                    val shouldUpdate = latestPreferredEpisode > latestSeenEpisode
+                    shouldUpdate to latestPreferredEpisode
+                } else {
+                    val latestEpisode = latestEpisodes[DubStatus.None] ?: Int.MIN_VALUE
+                    val latestSeenEpisode =
+                        savedData.lastSeenEpisodeCount[DubStatus.None] ?: Int.MIN_VALUE
+                    val shouldUpdate = latestEpisode > latestSeenEpisode
+                    shouldUpdate to latestEpisode
+                }
+
+                DataStoreHelper.updateSubscribedData(
+                    id,
+                    savedData,
+                    response
+                )
+
+                if (shouldUpdate) {
+                    val updateHeader = savedData.name
+                    val updateDescription = txt(
+                        R.string.subscription_episode_released,
+                        latestEpisode,
+                        savedData.name
+                    ).asString(context)
+
+                    val intent = Intent(context, MainActivity::class.java).apply {
+                        data = savedData.url.toUri()
+                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                    }
+
+                    val pendingIntent =
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                            PendingIntent.getActivity(
+                                context,
+                                0,
+                                intent,
+                                PendingIntent.FLAG_IMMUTABLE
+                            )
+                        } else {
+                            PendingIntent.getActivity(context, 0, intent, 0)
+                        }
+
+                    val poster = ioWork { savedData.posterUrl?.let { url -> context.getImageBitmapFromUrl(url, savedData.posterHeaders) } }
+                    val updateNotification =
+                        updateNotificationBuilder.setContentTitle(updateHeader)
+                            .setContentText(updateDescription)
+                            .setContentIntent(pendingIntent)
+                            .setLargeIcon(poster)
+                            .build()
+
+                    notificationManager.notify(id, updateNotification)
+                }
+
+                // You can probably get some issues here since this is async but it does not matter much.
+                updateProgress(max, ++progress, false)
+            } catch (_: Throwable) {
+            }
+        }
+
+        return Result.success()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt
index 0b081220..7dd43fe7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt
@@ -9,6 +9,7 @@ import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.utils.Coroutines.ioWork
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllSubscriptions
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllWatchStateIds
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getBookmarkedData
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getResultWatchState
@@ -74,13 +75,16 @@ class LocalList : SyncAPI {
                 group.value.mapNotNull {
                     getBookmarkedData(it.first)?.toLibraryItem(it.first.toString())
                 }
-            }
+            } + mapOf(R.string.subscription_list_name to getAllSubscriptions().mapNotNull {
+                it.toLibraryItem()
+            })
         }
 
         val baseMap = WatchType.values().filter { it != WatchType.NONE }.associate {
             // None is not something to display
             it.stringRes to emptyList<SyncAPI.LibraryItem>()
-        }
+        } + mapOf(R.string.subscription_list_name to emptyList())
+
         return SyncAPI.LibraryMetadata(
             (baseMap + list).map { SyncAPI.LibraryList(txt(it.key), it.value) },
             setOf(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 68dd1c0e..bdef14b5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -15,6 +15,7 @@ import android.view.ViewGroup
 import android.widget.AbsListView
 import android.widget.ArrayAdapter
 import android.widget.ImageView
+import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
@@ -27,12 +28,14 @@ import com.google.android.material.chip.ChipDrawable
 import com.lagradost.cloudstream3.APIHolder.getApiDubstatusSettings
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.APIHolder.updateHasTrailers
+import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.DubStatus
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.mvvm.*
+import com.lagradost.cloudstream3.services.SubscriptionWorkManager
 import com.lagradost.cloudstream3.syncproviders.providers.Kitsu
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
@@ -850,7 +853,7 @@ open class ResultFragment : ResultTrailerPlayer() {
         }
 
         observe(viewModel.page) { data ->
-            if(data == null) return@observe
+            if (data == null) return@observe
             when (data) {
                 is Resource.Success -> {
                     val d = data.value
@@ -904,6 +907,36 @@ open class ResultFragment : ResultTrailerPlayer() {
                         updateList(d.actors ?: emptyList())
                     }
 
+                    observeNullable(viewModel.subscribeStatus) { isSubscribed ->
+                        result_subscribe?.isVisible = isSubscribed != null
+                        if (isSubscribed == null) return@observeNullable
+
+                        val drawable = if (isSubscribed) {
+                            R.drawable.ic_baseline_notifications_active_24
+                        } else {
+                            R.drawable.baseline_notifications_none_24
+                        }
+
+                        result_subscribe?.setImageResource(drawable)
+                    }
+
+                    result_subscribe?.setOnClickListener {
+                        val isSubscribed =
+                            viewModel.toggleSubscriptionStatus() ?: return@setOnClickListener
+
+                        val message = if (isSubscribed) {
+                            // Kinda icky to have this here, but it works.
+                            SubscriptionWorkManager.enqueuePeriodicWork(context)
+                            R.string.subscription_new
+                        } else {
+                            R.string.subscription_deleted
+                        }
+
+                        val name = (viewModel.page.value as? Resource.Success)?.value?.title
+                            ?: txt(R.string.no_data).asStringNull(context) ?: ""
+                        showToast(activity, txt(message, name), Toast.LENGTH_SHORT)
+                    }
+
                     result_open_in_browser?.isVisible = d.url.startsWith("http")
                     result_open_in_browser?.setOnClickListener {
                         val i = Intent(ACTION_VIEW)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index afaaeef9..2983b41d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -16,6 +16,7 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.getId
 import com.lagradost.cloudstream3.APIHolder.unixTime
+import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.getCastSession
 import com.lagradost.cloudstream3.CommonActivity.showToast
@@ -414,6 +415,9 @@ class ResultViewModel2 : ViewModel() {
     private val _episodeSynopsis: MutableLiveData<String?> = MutableLiveData(null)
     val episodeSynopsis: LiveData<String?> = _episodeSynopsis
 
+    private val _subscribeStatus: MutableLiveData<Boolean?> = MutableLiveData(null)
+    val subscribeStatus: LiveData<Boolean?> = _subscribeStatus
+
     companion object {
         const val TAG = "RVM2"
         private const val EPISODE_RANGE_SIZE = 20
@@ -815,6 +819,42 @@ class ResultViewModel2 : ViewModel() {
         }
     }
 
+    /**
+     * @return true if the new status is Subscribed, false if not. Null if not possible to subscribe.
+     **/
+    fun toggleSubscriptionStatus(): Boolean? {
+        val isSubscribed = _subscribeStatus.value ?: return null
+        val response = currentResponse ?: return null
+        if (response !is EpisodeResponse) return null
+
+        val currentId = response.getId()
+
+        if (isSubscribed) {
+            DataStoreHelper.removeSubscribedData(currentId)
+        } else {
+            val current = DataStoreHelper.getSubscribedData(currentId)
+
+            DataStoreHelper.setSubscribedData(
+                currentId,
+                DataStoreHelper.SubscribedData(
+                    currentId,
+                    current?.bookmarkedTime ?: unixTimeMS,
+                    unixTimeMS,
+                    response.getLatestEpisodes(),
+                    response.name,
+                    response.url,
+                    response.apiName,
+                    response.type,
+                    response.posterUrl,
+                    response.year
+                )
+            )
+        }
+
+        _subscribeStatus.postValue(!isSubscribed)
+        return !isSubscribed
+    }
+
     private fun startChromecast(
         activity: Activity?,
         result: ResultEpisode,
@@ -1473,7 +1513,8 @@ class ResultViewModel2 : ViewModel() {
                             this.engName,
                             this.name,
                             this.japName
-                        ).filter { it.length > 2 }.distinct(), // the reason why we filter is due to not wanting smth like " " or "?"
+                        ).filter { it.length > 2 }
+                            .distinct(), // the reason why we filter is due to not wanting smth like " " or "?"
                         TrackerType.getTypes(this.type),
                         this.year
                     )
@@ -1670,6 +1711,16 @@ class ResultViewModel2 : ViewModel() {
         postResume()
     }
 
+    private fun postSubscription(loadResponse: LoadResponse) {
+        if (loadResponse.isEpisodeBased()) {
+            val id = loadResponse.getId()
+            val data = DataStoreHelper.getSubscribedData(id)
+            DataStoreHelper.updateSubscribedData(id, data, loadResponse as? EpisodeResponse)
+            val isSubscribed = data != null
+            _subscribeStatus.postValue(isSubscribed)
+        }
+    }
+
     private fun postEpisodeRange(indexer: EpisodeIndexer?, range: EpisodeRange?) {
         if (range == null || indexer == null) {
             return
@@ -1806,6 +1857,7 @@ class ResultViewModel2 : ViewModel() {
     ) {
         currentResponse = loadResponse
         postPage(loadResponse, apiRepository)
+        postSubscription(loadResponse)
         if (updateEpisodes)
             postEpisodes(loadResponse, updateFillers)
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
index 4b1053b1..860144ee 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -4,6 +4,8 @@ import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Activity.RESULT_CANCELED
+import android.app.NotificationChannel
+import android.app.NotificationManager
 import android.content.*
 import android.content.pm.PackageManager
 import android.database.Cursor
@@ -196,6 +198,22 @@ object AppUtils {
         animation.start()
     }
 
+    fun Context.createNotificationChannel(channelId: String, channelName: String, description: String) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val importance = NotificationManager.IMPORTANCE_DEFAULT
+            val channel =
+                NotificationChannel(channelId, channelName, importance).apply {
+                    this.description = description
+                }
+
+            // Register the channel with the system.
+            val notificationManager: NotificationManager =
+                this.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+            notificationManager.createNotificationChannel(channel)
+        }
+    }
+
     @SuppressLint("RestrictedApi")
     fun getAllWatchNextPrograms(context: Context): Set<Long> {
         val COLUMN_WATCH_NEXT_ID_INDEX = 0
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
index 281c9c44..516cd990 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
@@ -1,16 +1,13 @@
 package com.lagradost.cloudstream3.utils
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.APIHolder.capitalize
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
-import com.lagradost.cloudstream3.DubStatus
-import com.lagradost.cloudstream3.SearchQuality
-import com.lagradost.cloudstream3.SearchResponse
-import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.WatchType
@@ -20,6 +17,7 @@ const val VIDEO_POS_DUR = "video_pos_dur"
 const val VIDEO_WATCH_STATE = "video_watch_state"
 const val RESULT_WATCH_STATE = "result_watch_state"
 const val RESULT_WATCH_STATE_DATA = "result_watch_state_data"
+const val RESULT_SUBSCRIBED_STATE_DATA = "result_subscribed_state_data"
 const val RESULT_RESUME_WATCHING = "result_resume_watching_2" // changed due to id changes
 const val RESULT_RESUME_WATCHING_OLD = "result_resume_watching"
 const val RESULT_RESUME_WATCHING_HAS_MIGRATED = "result_resume_watching_migrated"
@@ -42,6 +40,37 @@ object DataStoreHelper {
         return this
     }
 
+    /**
+     * Used to display notifications on new episodes and posters in library.
+     **/
+    data class SubscribedData(
+        @JsonProperty("id") override var id: Int?,
+        @JsonProperty("subscribedTime") val bookmarkedTime: Long,
+        @JsonProperty("latestUpdatedTime") val latestUpdatedTime: Long,
+        @JsonProperty("lastSeenEpisodeCount") val lastSeenEpisodeCount: Map<DubStatus, Int?>,
+        @JsonProperty("name") override val name: String,
+        @JsonProperty("url") override val url: String,
+        @JsonProperty("apiName") override val apiName: String,
+        @JsonProperty("type") override var type: TvType? = null,
+        @JsonProperty("posterUrl") override var posterUrl: String?,
+        @JsonProperty("year") val year: Int?,
+        @JsonProperty("quality") override var quality: SearchQuality? = null,
+        @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>? = null,
+    ) : SearchResponse {
+        fun toLibraryItem(): SyncAPI.LibraryItem? {
+            return SyncAPI.LibraryItem(
+                name,
+                url,
+                id?.toString() ?: return null,
+                null,
+                null,
+                null,
+                latestUpdatedTime,
+                apiName, type, posterUrl, posterHeaders, quality, this.id
+            )
+        }
+    }
+
     data class BookmarkedData(
         @JsonProperty("id") override var id: Int?,
         @JsonProperty("bookmarkedTime") val bookmarkedTime: Long,
@@ -63,7 +92,7 @@ object DataStoreHelper {
                 null,
                 null,
                 null,
-                null,
+                latestUpdatedTime,
                 apiName, type, posterUrl, posterHeaders, quality, this.id
             )
         }
@@ -75,9 +104,7 @@ object DataStoreHelper {
         @JsonProperty("apiName") override val apiName: String,
         @JsonProperty("type") override var type: TvType? = null,
         @JsonProperty("posterUrl") override var posterUrl: String?,
-
         @JsonProperty("watchPos") val watchPos: PosDur?,
-
         @JsonProperty("id") override var id: Int?,
         @JsonProperty("parentId") val parentId: Int?,
         @JsonProperty("episode") val episode: Int?,
@@ -204,6 +231,41 @@ object DataStoreHelper {
         return getKey("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString())
     }
 
+    fun getAllSubscriptions(): List<SubscribedData> {
+        return getKeys("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA")?.mapNotNull {
+            getKey(it)
+        } ?: emptyList()
+    }
+
+    fun removeSubscribedData(id: Int?) {
+        if (id == null) return
+        AccountManager.localListApi.requireLibraryRefresh = true
+        removeKey("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString())
+    }
+
+    /**
+     * Set new seen episodes and update time
+     **/
+    fun updateSubscribedData(id: Int?, data: SubscribedData?, episodeResponse: EpisodeResponse?) {
+        if (id == null || data == null || episodeResponse == null) return
+        val newData = data.copy(
+            latestUpdatedTime = unixTimeMS,
+            lastSeenEpisodeCount = episodeResponse.getLatestEpisodes()
+        )
+        setKey("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString(), newData)
+    }
+
+    fun setSubscribedData(id: Int?, data: SubscribedData) {
+        if (id == null) return
+        setKey("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString(), data)
+        AccountManager.localListApi.requireLibraryRefresh = true
+    }
+
+    fun getSubscribedData(id: Int?): SubscribedData? {
+        if (id == null) return null
+        return getKey("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString())
+    }
+
     fun setViewPos(id: Int?, pos: Long, dur: Long) {
         if (id == null) return
         if (dur < 30_000) return // too short
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt
index 1625981e..dcb1e047 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt
@@ -14,6 +14,7 @@ import androidx.core.app.NotificationCompat
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.AppUtils.createNotificationChannel
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import kotlinx.coroutines.delay
@@ -47,24 +48,12 @@ class PackageInstallerService : Service() {
             .setSmallIcon(R.drawable.rdload)
     }
 
-    private fun createNotificationChannel() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val importance = NotificationManager.IMPORTANCE_DEFAULT
-            val channel =
-                NotificationChannel(UPDATE_CHANNEL_ID, UPDATE_CHANNEL_NAME, importance).apply {
-                    description = UPDATE_CHANNEL_DESCRIPTION
-                }
-
-            // Register the channel with the system
-            val notificationManager: NotificationManager =
-                this.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-            notificationManager.createNotificationChannel(channel)
-        }
-    }
-
     override fun onCreate() {
-        createNotificationChannel()
+        this.createNotificationChannel(
+            UPDATE_CHANNEL_ID,
+            UPDATE_CHANNEL_NAME,
+            UPDATE_CHANNEL_DESCRIPTION
+        )
         startForeground(UPDATE_NOTIFICATION_ID, baseNotification.build())
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
index a629dad9..2902b76b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
@@ -20,6 +20,7 @@ import androidx.work.Data
 import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkManager
+import com.bumptech.glide.load.model.GlideUrl
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.hippo.unifile.UniFile
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
@@ -213,7 +214,7 @@ object VideoDownloadManager {
     }
 
     private val cachedBitmaps = hashMapOf<String, Bitmap>()
-    private fun Context.getImageBitmapFromUrl(url: String): Bitmap? {
+    fun Context.getImageBitmapFromUrl(url: String, headers: Map<String, String>? = null): Bitmap? {
         try {
             if (cachedBitmaps.containsKey(url)) {
                 return cachedBitmaps[url]
@@ -221,12 +222,14 @@ object VideoDownloadManager {
 
             val bitmap = GlideApp.with(this)
                 .asBitmap()
-                .load(url).into(720, 720)
+                .load(GlideUrl(url) { headers ?: emptyMap() })
+                .into(720, 720)
                 .get()
+
             if (bitmap != null) {
                 cachedBitmaps[url] = bitmap
             }
-            return null
+            return bitmap
         } catch (e: Exception) {
             logError(e)
             return null
@@ -426,7 +429,7 @@ object VideoDownloadManager {
     }
 
     private const val reservedChars = "|\\?*<\":>+[]/\'"
-    fun sanitizeFilename(name: String, removeSpaces: Boolean= false): String {
+    fun sanitizeFilename(name: String, removeSpaces: Boolean = false): String {
         var tempName = name
         for (c in reservedChars) {
             tempName = tempName.replace(c, ' ')
@@ -1612,7 +1615,7 @@ object VideoDownloadManager {
                     .mapIndexed { index, any -> DownloadQueueResumePackage(index, any) }
                     .toTypedArray()
             setKey(KEY_RESUME_QUEUE_PACKAGES, dQueue)
-        } catch (t : Throwable) {
+        } catch (t: Throwable) {
             logError(t)
         }
     }
diff --git a/app/src/main/res/drawable/baseline_notifications_none_24.xml b/app/src/main/res/drawable/baseline_notifications_none_24.xml
new file mode 100644
index 00000000..cf589c6d
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_notifications_none_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="?attr/white"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2zM16,17L8,17v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5v6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cloudstream_monochrome_big.xml b/app/src/main/res/drawable/ic_cloudstream_monochrome_big.xml
new file mode 100644
index 00000000..4b8964f8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cloudstream_monochrome_big.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="50"
+    android:viewportHeight="50"
+    android:name="vector">
+    <group android:scaleX="0.1755477"
+        android:scaleY="0.1755477"
+        android:translateX="0"
+        android:translateY="0">
+        <path android:name="path"
+
+            android:pathData="M 245.05 148.63 C 242.249 148.627 239.463 149.052 236.79 149.89 C 235.151 141.364 230.698 133.63 224.147 127.931 C 217.597 122.233 209.321 118.893 200.65 118.45 C 195.913 105.431 186.788 94.458 174.851 87.427 C 162.914 80.396 148.893 77.735 135.21 79.905 C 121.527 82.074 109.017 88.941 99.84 99.32 C 89.871 95.945 79.051 96.024 69.133 99.545 C 59.215 103.065 50.765 109.826 45.155 118.73 C 39.545 127.634 37.094 138.174 38.2 148.64 L 37.94 148.64 C 30.615 148.64 23.582 151.553 18.403 156.733 C 13.223 161.912 10.31 168.945 10.31 176.27 C 10.31 183.595 13.223 190.628 18.403 195.807 C 23.582 200.987 30.615 203.9 37.94 203.9 L 245.05 203.9 C 252.375 203.9 259.408 200.987 264.587 195.807 C 269.767 190.628 272.68 183.595 272.68 176.27 C 272.68 168.945 269.767 161.912 264.587 156.733 C 259.408 151.553 252.375 148.64 245.05 148.64 Z"
+            android:fillColor="#FFFFFF" android:strokeWidth="1"
+            tools:ignore="VectorPath"
+            android:fillAlpha="0.55"/>
+        <path android:name="path_1" android:pathData="M 208.61 125 C 208.61 123.22 208.55 121.45 208.48 119.69 C 205.919 119.01 203.296 118.595 200.65 118.45 C 195.913 105.431 186.788 94.458 174.851 87.427 C 162.914 80.396 148.893 77.735 135.21 79.905 C 121.527 82.074 109.017 88.941 99.84 99.32 C 89.871 95.945 79.051 96.024 69.133 99.545 C 59.215 103.065 50.765 109.826 45.155 118.73 C 39.545 127.634 37.094 138.174 38.2 148.64 L 37.94 148.64 C 30.615 148.64 23.582 151.553 18.403 156.733 C 13.223 161.912 10.31 168.945 10.31 176.27 C 10.31 183.595 13.223 190.628 18.403 195.807 C 23.582 200.987 30.615 203.9 37.94 203.9 L 179 203.9 C 198.116 182.073 208.646 154.015 208.61 125 Z"
+            android:fillColor="#FFFFFF" android:strokeWidth="1"
+            android:fillAlpha="0.55"/>
+        <path android:name="path_2" android:pathData="M 99.84 99.32 C 89.871 95.945 79.051 96.024 69.133 99.545 C 59.215 103.065 50.765 109.826 45.155 118.73 C 39.545 127.634 37.094 138.174 38.2 148.64 L 37.94 148.64 C 30.783 148.665 23.909 151.471 18.779 156.461 C 13.648 161.452 10.653 168.246 10.43 175.399 C 10.207 182.553 12.773 189.52 17.583 194.82 C 22.392 200.121 29.079 203.349 36.22 203.82 C 67.216 202.93 96.673 189.98 118.284 167.742 C 139.895 145.504 151.997 115.689 152 84.68 C 152 83 151.94 81.33 151.87 79.68 C 149.443 79.361 146.998 79.194 144.55 79.18 C 136.095 79.171 127.735 80.962 120.026 84.434 C 112.317 87.907 105.435 92.982 99.84 99.32 Z"
+            android:fillColor="#FFFFFF" android:strokeWidth="1"
+            android:fillAlpha="1"/>
+    </group>
+
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_result_swipe.xml b/app/src/main/res/layout/fragment_result_swipe.xml
index 9d21547a..27729bf8 100644
--- a/app/src/main/res/layout/fragment_result_swipe.xml
+++ b/app/src/main/res/layout/fragment_result_swipe.xml
@@ -57,6 +57,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:id="@+id/media_route_button_holder"
+                android:animateLayoutChanges="true"
                 android:layout_gravity="center_vertical|end">
 
             <androidx.mediarouter.app.MediaRouteButton
@@ -69,15 +70,35 @@
                     app:mediaRouteButtonTint="?attr/textColor" />
 
             <ImageView
+                    android:visibility="gone"
                     android:nextFocusUp="@id/result_back"
                     android:nextFocusDown="@id/result_description"
                     android:nextFocusLeft="@id/result_add_sync"
+                    android:nextFocusRight="@id/result_share"
+
+                    tools:visibility="visible"
+
+                    android:id="@+id/result_subscribe"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_margin="5dp"
+                    android:elevation="10dp"
+
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:src="@drawable/baseline_notifications_none_24"
+                    android:layout_gravity="end|center_vertical"
+                    app:tint="?attr/textColor" />
+
+            <ImageView
+                    android:nextFocusUp="@id/result_back"
+                    android:nextFocusDown="@id/result_description"
+                    android:nextFocusLeft="@id/result_subscribe"
                     android:nextFocusRight="@id/result_open_in_browser"
 
                     android:id="@+id/result_share"
                     android:layout_width="25dp"
                     android:layout_height="25dp"
-                    android:layout_marginEnd="10dp"
+                    android:layout_margin="5dp"
                     android:elevation="10dp"
 
                     android:background="?android:attr/selectableItemBackgroundBorderless"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 47517378..0858fdfa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -644,4 +644,9 @@
     <string name="empty_library_no_accounts_message">Looks like your library is empty :(\nLogin to a library account or add shows to your local library</string>
     <string name="empty_library_logged_in_message">Looks like this list is empty, try switching to another one</string>
     <string name="safe_mode_file">Safe mode file found!\nNot loading any extensions on startup until file is removed.</string>
+    <string name="subscription_in_progress_notification">Updating subscribed shows</string>
+    <string name="subscription_list_name">Subscribed</string>
+    <string name="subscription_new">Subscribed to %s</string>
+    <string name="subscription_deleted">Unsubscribed from %s</string>
+    <string name="subscription_episode_released">Episode %d released!</string>
 </resources>
\ No newline at end of file

From 5f12d067f92fbbe70e2d5dc2ae54de4483988328 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Tue, 21 Feb 2023 18:28:21 +0100
Subject: [PATCH 239/273] Translated using Weblate (Indonesian)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Slovak)

Currently translated at 31.7% (191 of 602 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (German)

Currently translated at 100.0% (597 of 597 strings)

Translated using Weblate (Japanese)

Currently translated at 44.8% (268 of 597 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (597 of 597 strings)

Translated using Weblate (Japanese)

Currently translated at 40.5% (242 of 597 strings)

Translated using Weblate (Japanese)

Currently translated at 34.5% (206 of 597 strings)

Translated using Weblate (Japanese)

Currently translated at 33.1% (198 of 597 strings)

Translated using Weblate (Kannada)

Currently translated at 35.5% (212 of 597 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (597 of 597 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (597 of 597 strings)

Translated using Weblate (Japanese)

Currently translated at 25.7% (154 of 597 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (597 of 597 strings)

Translated using Weblate (German)

Currently translated at 100.0% (597 of 597 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (597 of 597 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (597 of 597 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (597 of 597 strings)

Translated using Weblate (Romanian)

Currently translated at 73.7% (440 of 597 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (597 of 597 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (597 of 597 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (597 of 597 strings)

Translated using Weblate (Japanese)

Currently translated at 22.7% (134 of 589 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (589 of 589 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (589 of 589 strings)

Translated using Weblate (Japanese)

Currently translated at 17.8% (105 of 589 strings)

Translated using Weblate (Ukrainian)

Currently translated at 99.3% (585 of 589 strings)

Translated using Weblate (Japanese)

Currently translated at 16.6% (98 of 589 strings)

Translated using Weblate (Russian)

Currently translated at 99.6% (587 of 589 strings)

Translated using Weblate (Russian)

Currently translated at 99.4% (586 of 589 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 96.0% (566 of 589 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (589 of 589 strings)

Translated using Weblate (German)

Currently translated at 100.0% (589 of 589 strings)

Translated using Weblate (French)

Currently translated at 99.3% (585 of 589 strings)

Added translation using Weblate (Japanese)

Translated using Weblate (Croatian)

Currently translated at 100.0% (589 of 589 strings)

Translated using Weblate (Russian)

Currently translated at 98.9% (583 of 589 strings)

Translated using Weblate (French)

Currently translated at 98.6% (581 of 589 strings)

Translated using Weblate (French)

Currently translated at 96.6% (569 of 589 strings)

Translated using Weblate (Greek)

Currently translated at 98.9% (583 of 589 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (589 of 589 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (589 of 589 strings)

jsdelivr wrapper to githubusercontent

Co-authored-by: Anarchydr <patrikpik879@gmail.com>
Co-authored-by: Andrey Zapolsky <zapoland@gmail.com>
Co-authored-by: Cliff Heraldo <123844876+clxf12@users.noreply.github.com>
Co-authored-by: Cliff Heraldo <cliffkbrt11@gmail.com>
Co-authored-by: Cliff Heraldo <clxf12@users.noreply.hosted.weblate.org>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Dan <denqwerta@gmail.com>
Co-authored-by: Deleted User <noreply+57159@weblate.org>
Co-authored-by: Fjuro <ifjuro@proton.me>
Co-authored-by: Gabriel Cnudde <gabriel.cnudde59@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Julian <hello@apollo.moe>
Co-authored-by: Juraj Liso <lisojuraj@gmail.com>
Co-authored-by: Massimo Pissarello <mapi68@gmail.com>
Co-authored-by: MedRAM <mohammad7ram@users.noreply.hosted.weblate.org>
Co-authored-by: Piotr Strebski <strebski@gmail.com>
Co-authored-by: Prathap Rathod <prathap0144@gmail.com>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Sdarfeesh <Sdarfeesh@protonmail.com>
Co-authored-by: Skrripy <rozihrash.ya6w7@simplelogin.com>
Co-authored-by: Translator-3000 <weblate.m1d0h@8shield.net>
Co-authored-by: abcabcc <xmmandxpp@outlook.com>
Co-authored-by: eightyy8 <oliver.kha@pm.me>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/el/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ja/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/kn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ro/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hant/
Translation: Cloudstream/App
---
 .../cloudstream3/plugins/RepositoryManager.kt |  13 +-
 app/src/main/res/values-ar/strings.xml        |  22 ++-
 app/src/main/res/values-cs/strings.xml        |  12 ++
 app/src/main/res/values-de/strings.xml        |  22 ++-
 app/src/main/res/values-el/strings.xml        |   2 +-
 app/src/main/res/values-es/strings.xml        |  12 ++
 app/src/main/res/values-fr/strings.xml        |  32 ++-
 app/src/main/res/values-hr/strings.xml        |  17 ++
 app/src/main/res/values-in/strings.xml        |  27 ++-
 app/src/main/res/values-it/strings.xml        |  12 ++
 app/src/main/res/values-ja/strings.xml        | 185 ++++++++++++++++++
 app/src/main/res/values-kn/strings.xml        | 127 +++++++++++-
 app/src/main/res/values-pl/strings.xml        |   7 +-
 app/src/main/res/values-ro/strings.xml        |  10 +-
 app/src/main/res/values-ru/strings.xml        |  12 ++
 app/src/main/res/values-sk/strings.xml        |   2 +-
 app/src/main/res/values-uk/strings.xml        |  16 ++
 app/src/main/res/values-zh-rTW/strings.xml    |   3 +-
 app/src/main/res/values-zh/strings.xml        |  17 ++
 19 files changed, 517 insertions(+), 33 deletions(-)
 create mode 100644 app/src/main/res/values-ja/strings.xml

diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
index e77b2d54..a5c2d346 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
@@ -71,6 +71,13 @@ object RepositoryManager {
     val PREBUILT_REPOSITORIES: Array<RepositoryData> by lazy {
         getKey("PREBUILT_REPOSITORIES") ?: emptyArray()
     }
+    val GH_REGEX = Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$")
+
+    fun convertRawGitUrl(url: String): String {
+        val match = GH_REGEX.find(url) ?: return url
+        val (user, repo, rest) = match.destructured
+        return "https://cdn.jsdelivr.net/gh/$user/$repo@$rest"
+    }
 
     suspend fun parseRepoUrl(url: String): String? {
         val fixedUrl = url.trim()
@@ -97,14 +104,14 @@ object RepositoryManager {
     suspend fun parseRepository(url: String): Repository? {
         return suspendSafeApiCall {
             // Take manifestVersion and such into account later
-            app.get(url).parsedSafe()
+            app.get(convertRawGitUrl(url)).parsedSafe()
         }
     }
 
     private suspend fun parsePlugins(pluginUrls: String): List<SitePlugin> {
         // Take manifestVersion and such into account later
         return try {
-            val response = app.get(pluginUrls)
+            val response = app.get(convertRawGitUrl(pluginUrls))
             // Normal parsed function not working?
             // return response.parsedSafe()
             tryParseJson<Array<SitePlugin>>(response.text)?.toList() ?: emptyList()
@@ -139,7 +146,7 @@ object RepositoryManager {
             }
             file.createNewFile()
 
-            val body = app.get(pluginUrl).okhttpResponse.body
+            val body = app.get(convertRawGitUrl(pluginUrl)).okhttpResponse.body
             write(body.byteStream(), file.outputStream())
             file
         }
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 652df937..1e9bcfcc 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -103,7 +103,7 @@
     <string name="action_open_watching">مزيد من المعلومات</string>
     <string name="vpn_might_be_needed">قد تكون هناك حاجة إلى VPN لكي يعمل هذا المزود بشكل صحيح</string>
     <string name="vpn_torrent">هذا المزود هو تورنت ، يوصى باستخدام شبكة ظاهرية خاصة</string>
-    <string name="provider_info_meta">لا يتم توفير البيانات الوصفية بواسطة الموقع ، وسيفشل تحميل الفيديو إذا لم يكن موجودًا في الموقع.</string>
+    <string name="provider_info_meta">لا يتم توفير البيانات الوصفية بواسطة الموقع، وسيفشل تحميل الفيديو إذا لم يكن موجودًا في الموقع.</string>
     <string name="torrent_plot">الوصف</string>
     <string name="normal_no_plot">لم يتم العثور على وصف</string>
     <string name="torrent_no_plot">لم يتم العثور على وصف</string>
@@ -170,7 +170,7 @@
     <string name="copy_link_toast">تم نسخ الرابط إلى الحافظة</string>
     <string name="play_episode_toast">تشغيل الحلقة</string>
     <string name="subs_default_reset_toast">إعادة التعيين إلى القيمة الافتراضية</string>
-    <string name="acra_report_toast">عذرا ، تعطل التطبيق. سيتم إرسال تقرير خطأ مجهول إلى المطورين</string>
+    <string name="acra_report_toast">عذرا، تعطل التطبيق. سيتم إرسال تقرير خطأ مجهول إلى المطورين</string>
     <string name="season">موسم</string>
     <string name="no_season">لا موسم</string>
     <string name="episode">حلقة</string>
@@ -266,8 +266,8 @@
     <string name="video_buffer_length_settings">طول التخزين المؤقت</string>
     <string name="video_buffer_disk_settings">التخزين المؤقت للفيديو على القرص</string>
     <string name="video_buffer_clear_settings">مسح التخزين المؤقت للصورة والفيديو</string>
-    <string name="video_ram_description">يتسبب في حدوث أعطال إذا تم ضبطه على مستوى مرتفع جدا على الأجهزة ذات الذاكرة المنخفضة ، مثل Android TV.</string>
-    <string name="video_disk_description">يسبب مشاكل إذا تم ضبطه على مستوى مرتفع جدا على الأجهزة ذات مساحة التخزين المنخفضة ، مثل Android TV.</string>
+    <string name="video_ram_description">يتسبب في حدوث أعطال إذا تم ضبطه على مستوى مرتفع جدا على الأجهزة ذات الذاكرة المنخفضة، مثل تلفزيون أندرويد.</string>
+    <string name="video_disk_description">يسبب مشاكل إذا تم ضبطه على مستوى مرتفع جدا على الأجهزة ذات مساحة التخزين المنخفضة، مثل تلفزيون أندرويد.</string>
     <string name="dns_pref">إستخدام DNS بدلا من HTTPS</string>
     <string name="dns_pref_summary">مفيد لتجاوز حجب مزود خدمة الإنترنت</string>
     <string name="add_site_pref">موقع بديل (نسخة)</string>
@@ -360,7 +360,7 @@
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">نصٌّ حكيمٌ لهُ سِرٌّ قاطِعٌ وَذُو شَأنٍ عَظيمٍ مكتوبٌ على ثوبٍ أخضرَ ومُغلفٌ بجلدٍ أزرق</string>
-    <string name="recommended">مُوصي به</string>
+    <string name="recommended">مُوصى به</string>
     <string name="player_loaded_subtitles" formatted="true">تم تحميل %s</string>
     <string name="player_load_subtitles">إختيار ملف</string>
     <string name="player_load_subtitles_online">تحميل من الانترنت</string>
@@ -543,4 +543,16 @@
     <string name="pref_category_android_tv">تلفزيون أندرويد</string>
     <string name="android_tv_interface_on_seek_settings_summary">مدة التقديم عنما يكون المشغل مرئيا</string>
     <string name="android_tv_interface_on_seek_settings">مدة التقديم- المشغل المرئي</string>
+    <string name="test_failed">فشل</string>
+    <string name="test_passed">نجح</string>
+    <string name="category_provider_test">إختبار المزود</string>
+    <string name="restart">إعادة التشغيل</string>
+    <string name="test_log">سجل</string>
+    <string name="start">بَدأ</string>
+    <string name="stop">إيقاف</string>
+    <string name="subscription_in_progress_notification">تحديث العروض التي تم الاشتراك فيها</string>
+    <string name="subscription_deleted">إلغاء الاشتراك من %s</string>
+    <string name="subscription_episode_released">تم إصدار الحلقة %d!</string>
+    <string name="subscription_list_name">مشترك</string>
+    <string name="subscription_new">مشترك في %s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index a78da8a4..966cd7d9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -535,4 +535,16 @@
     <string name="android_tv_interface_on_seek_settings">Zobrazený přehrávač - doba hledání</string>
     <string name="pref_category_android_tv">Android TV</string>
     <string name="android_tv_interface_on_seek_settings_summary">Množství vyhledávané doby při zobrazeném přehrávači</string>
+    <string name="test_log">Protokol</string>
+    <string name="category_provider_test">Test poskytovatele</string>
+    <string name="test_failed">Neúspěšné</string>
+    <string name="test_passed">Úspěšné</string>
+    <string name="restart">Restart</string>
+    <string name="start">Spustit</string>
+    <string name="stop">Zastavit</string>
+    <string name="subscription_in_progress_notification">Aktualizace odebíraných pořadů</string>
+    <string name="subscription_new">Přihlášeno k odběru %s</string>
+    <string name="subscription_deleted">Odhlášen odběr od %s</string>
+    <string name="subscription_episode_released">Byla vydána epizoda %d!</string>
+    <string name="subscription_list_name">Odebíráno</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e190aa9c..f6583c20 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -53,7 +53,7 @@
     <string name="type_dropped">Abgebrochen</string>
     <string name="type_plan_to_watch">Geplant</string>
     <string name="type_none">Nichts</string>
-    <string name="type_re_watching">Erneut anschauen</string>
+    <string name="type_re_watching">Erneut schauen</string>
     <string name="play_movie_button">Film abspielen</string>
     <string name="play_livestream_button">Livestream abspielen</string>
     <string name="play_torrent_button">Torrent streamen</string>
@@ -212,7 +212,7 @@
     <string name="no_subtitles">Keine Untertitel</string>
     <string name="default_subtitles">Standard</string>
     <string name="free_storage">Frei</string>
-    <string name="used_storage">Benutzt</string>
+    <string name="used_storage">Belegt</string>
     <string name="app_storage">App</string>
     <string name="movies">Filme</string>
     <string name="tv_series">TV-Serien</string>
@@ -284,7 +284,7 @@
     <string name="resize_fill">Strecken</string>
     <string name="resize_zoom">Vergrößern</string>
     <string name="legal_notice">Haftungsausschluss</string>
-    <string name="category_general">General</string>
+    <string name="category_general">Allgemein</string>
     <string name="random_button_settings">Zufalls-Button</string>
     <string name="random_button_settings_desc">Zufallsbutton auf der Startseite anzeigen</string>
     <string name="provider_lang_settings">Anbieter-Sprachen</string>
@@ -460,11 +460,11 @@
     <string name="automatic_plugin_download_summary">Automatische Installation aller noch nicht installierten Plugins aus hinzugefügten Repositories.</string>
     <string name="redo_setup_process">Einrichtungsvorgang wiederholen</string>
     <string name="apk_installer_settings">APK-Installer</string>
-    <string name="apk_installer_settings_des">Einige Telefone unterstützen das neue Installationsprogramm für Pakete nicht. Benutze die Legacy-Option, wenn sich die Updates nicht installieren lassen.</string>
+    <string name="apk_installer_settings_des">Einige Telefone unterstützen den neuen Package-Installer nicht. Benutze die Legacy-Option, wenn sich die Updates nicht installieren lassen.</string>
     <string name="season_format">%s %d%s</string>
     <string name="pref_category_links">Links</string>
     <string name="pref_category_app_updates">App-Updates</string>
-    <string name="pref_category_backup">Back-Up</string>
+    <string name="pref_category_backup">Sicherung</string>
     <string name="pref_category_extensions">Erweiterungen</string>
     <string name="pref_category_actions">Wartung</string>
     <string name="pref_category_cache">Cache</string>
@@ -506,4 +506,16 @@
     <string name="empty_library_logged_in_message">Diese Liste scheint leer zu sein. Versuche, zu einer anderen Liste zu wechseln.</string>
     <string name="safe_mode_file">Datei für abgesicherten Modus gefunden!
 \nBeim Start werden keine Erweiterungen geladen, bis die Datei entfernt wird.</string>
+    <string name="android_tv_interface_off_seek_settings">Player ausgeblendet - Betrag zum vor- und zurückspulen</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Der Betrag, welcher verwendet wird, wenn der Player eingeblendet ist</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Der Betrag, welcher verwendet wird, wenn der Player ausgeblendet ist</string>
+    <string name="pref_category_android_tv">Android-TV</string>
+    <string name="android_tv_interface_on_seek_settings">Player eingeblendet - Betrag zum vor- und zurückspulen</string>
+    <string name="test_failed">Fehlgeschlagen</string>
+    <string name="test_passed">Erfolgreich</string>
+    <string name="category_provider_test">Anbieter-Test</string>
+    <string name="stop">Stopp</string>
+    <string name="test_log">Log</string>
+    <string name="start">Start</string>
+    <string name="restart">Neustarten</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 0d0b7fb2..5e9dafd8 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -150,7 +150,7 @@
     <string name="episodes">Επεισόδια</string>
     <string name="episodes_range">%d-%d</string>
     <string name="episode_format" formatted="true">%d %s</string>
-    <string name="season_short">Κ</string>
+    <string name="season_short">Σ</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Δεν βρέθηκαν επεισόδια</string>
     <string name="delete_file">Διαγραφή αρχείου</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8366b294..2040169b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -511,4 +511,16 @@
     <string name="pref_category_android_tv">Android TV</string>
     <string name="android_tv_interface_on_seek_settings_summary">La cantidad de búsqueda utilizada cuando la jugadora es visible</string>
     <string name="android_tv_interface_off_seek_settings_summary">La cantidad de búsqueda utilizada cuando el jugador está oculto</string>
+    <string name="stop">Parar</string>
+    <string name="test_failed">Falló</string>
+    <string name="test_log">Registro</string>
+    <string name="start">Empezar</string>
+    <string name="test_passed">Aprobado</string>
+    <string name="category_provider_test">Prueba del proveedor</string>
+    <string name="restart">Reiniciar</string>
+    <string name="subscription_list_name">Suscrito</string>
+    <string name="subscription_new">Suscrito a %s</string>
+    <string name="subscription_deleted">Darse de baja de %s</string>
+    <string name="subscription_in_progress_notification">Actualizando los programas suscritos</string>
+    <string name="subscription_episode_released">¡Episodio %d publicado!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f0e112a8..18255b3b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -6,12 +6,12 @@
     <string name="title_downloads">Téléchargements</string>
     <string name="title_settings">Paramètres</string>
     <string name="search_hint">Rechercher…</string>
-    <string name="search_poster_img_des">Miniature</string>
+    <string name="search_poster_img_des">Affiche</string>
     <string name="no_data">Aucune Donnée</string>
     <string name="episode_more_options_des">Plus d\'options</string>
     <string name="go_back_img_des">Retour</string>
     <string name="next_episode">Épisode suivant</string>
-    <string name="result_poster_img_des">Miniature</string>
+    <string name="result_poster_img_des">Affiche</string>
     <string name="result_tags">Genres</string>
     <string name="result_share">Partager</string>
     <string name="result_open_in_browser">Ouvrir dans le navigateur</string>
@@ -29,7 +29,7 @@
     <string name="pick_subtitle">Sous-titres</string>
     <string name="reload_error">Réessayer la connection…</string>
     <string name="go_back">Retour</string>
-    <string name="episode_poster_img_des">Miniature de l\'Épisode</string>
+    <string name="episode_poster_img_des">Affiche de l\'épisode</string>
     <string name="play_episode">Lire l\'Épisode</string>
     <!--<string name="need_storage">Permet de télécharger les épisodes</string>-->
     <string name="download">Télécharger</string>
@@ -51,10 +51,10 @@
     <string name="pref_disable_acra">Désactiver le rapport de bug automatique</string>
     <string name="home_more_info">Plus d\'informations</string>
     <string name="home_expanded_hide">Cacher</string>
-    <string name="home_main_poster_img_des">Poster principal</string>
+    <string name="home_main_poster_img_des">Affiche principale</string>
     <string name="home_play">Lecture</string>
-    <string name="home_info">Info</string>
-    <string name="home_next_random_img_des">Suivant Aléatoire</string>
+    <string name="home_info">Infos</string>
+    <string name="home_next_random_img_des">Aléatoire suivant</string>
     <string name="home_change_provider_img_des">Changer le fournisseur</string>
     <string name="filter_bookmarks">Filtrer les marques-pages</string>
     <string name="error_bookmarks_text">Marque-pages</string>
@@ -211,7 +211,7 @@
     <string name="actor_background">Arrière plan</string>
     <string name="home_source">Source</string>
     <string name="home_random">Aléatoire</string>
-    <string name="coming_soon">À venir …</string>
+    <string name="coming_soon">Bientôt disponible…</string>
     <string name="poster_image">Image de l\'affiche</string>
     <string name="authenticated_user">%s Connecté</string>
     <string name="action_add_to_bookmarks">Définir le statut de visionage</string>
@@ -490,4 +490,22 @@
     <string name="delayed_update_notice">L\'application sera mise à jour dès la fin de la session</string>
     <string name="plugin_downloaded">Plugin Téléchargé</string>
     <string name="action_remove_from_watched">Retirer de la vue</string>
+    <string name="library">Bibliothèque</string>
+    <string name="browser">Navigateur</string>
+    <string name="sort">Trier</string>
+    <string name="sort_rating_asc">Note (basse à haute)</string>
+    <string name="sort_rating_desc">Note (haut à bas)</string>
+    <string name="sort_alphabetical_a">Alphabétique (A à Z)</string>
+    <string name="empty_library_no_accounts_message">On dirait que votre bibliothèque est vide :(
+\nConnectez-vous à un compte ou ajoutez des séries à votre bibliothèque locale</string>
+    <string name="empty_library_logged_in_message">Il semble que cette liste soit vide, essayez d\'en choisir une autre</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="sort_by">Trié par</string>
+    <string name="sort_alphabetical_z">Alphabétique (Z à A)</string>
+    <string name="select_library">Sélectionnez la bibliothèque</string>
+    <string name="open_with">Ouvrir avec</string>
+    <string name="sort_updated_new">Mis à jour (Nouveau vers ancien)</string>
+    <string name="sort_updated_old">Mis à jour (ancien vers nouveau)</string>
+    <string name="safe_mode_file">Fichier du mode sans échec trouvé !
+\nAucune extension ne sera chargée au démarrage avant que le fichier ne soit enlevé.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 0f3e36bc..926c7f57 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -531,4 +531,21 @@
     <string name="empty_library_logged_in_message">Čini se da je ova lista prazna, pokušajte se prebaciti na drugu</string>
     <string name="safe_mode_file">Pronađena datoteka sigurnog načina rada!
 \nNe učitavaju se ekstenzije pri pokretanju dok se datoteka ne ukloni.</string>
+    <string name="android_tv_interface_on_seek_settings">Prikazan player- iznos preskakanja</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Količina preskakanja koja se koristi kada je player vidljiv</string>
+    <string name="android_tv_interface_off_seek_settings">Player skriven - Količina preskakanja</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Količina preskakanja koja se koristi kada je player skriven</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="test_passed">Prošlo</string>
+    <string name="restart">Restart</string>
+    <string name="test_log">Log</string>
+    <string name="start">Početak</string>
+    <string name="test_failed">Neuspješno</string>
+    <string name="stop">Stop</string>
+    <string name="category_provider_test">Test pružatelja usluga</string>
+    <string name="subscription_in_progress_notification">Ažuriram pretplaćene serije</string>
+    <string name="subscription_episode_released">Epizoda %d izbačena!</string>
+    <string name="subscription_list_name">Pretplaćeno</string>
+    <string name="subscription_new">Pretplaćen na %s</string>
+    <string name="subscription_deleted">Otkazana pretplata sa %s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index d54e4fa9..46d61e44 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -35,7 +35,7 @@
     <string name="skip_loading">Skip Loading</string>
     <string name="loading">Loading…</string>
     <string name="type_watching">Sedang Menonton</string>
-    <string name="type_on_hold">Tertahan</string>
+    <string name="type_on_hold">Tertunda</string>
     <string name="type_completed">Selesai</string>
     <string name="type_dropped">Dihentikan</string>
     <string name="type_plan_to_watch">Rencana untuk Menonton</string>
@@ -387,7 +387,7 @@
     <string name="episode_format" formatted="true">%d %s</string>
     <string name="nsfw">17+</string>
     <string name="others">Lainnya</string>
-    <string name="other_singular">Vidio</string>
+    <string name="other_singular">Video</string>
     <string name="add_site_pref">Duplikasi Website</string>
     <string name="add_site_summary">Duplikasi website yang telah ada, dengan alamat berbeda</string>
     <string name="pref_category_links">Tautan</string>
@@ -395,7 +395,7 @@
     <string name="pref_category_backup">Cadangkan</string>
     <string name="pref_category_extensions">Fitur Tambahan</string>
     <string name="play_with_app_name">Putar di CloudStream</string>
-    <string name="pref_filter_search_quality">Sembunyikan kualitas vidio terpilih di pencarian</string>
+    <string name="pref_filter_search_quality">Sembunyikan kualitas video terpilih di pencarian</string>
     <string name="season_format">%s %d%s</string>
     <string name="livestreams">Siaran langsung</string>
     <string name="remove_site_pref">Hapus Website</string>
@@ -444,7 +444,7 @@
     <string name="extension_rating" formatted="true">Peringkat: %s</string>
     <string name="extension_authors">Pembuat</string>
     <string name="extension_language">Bahasa</string>
-    <string name="player_pref">Pemutar vidio utama</string>
+    <string name="player_pref">Pemutar video utama</string>
     <string name="player_settings_play_in_app">Pemutar Bawaan</string>
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="player_settings_play_in_mpv">MPV</string>
@@ -475,7 +475,7 @@
     <string name="subtitles_remove_captions">Hapus teks tertutup dari subtitel</string>
     <string name="subtitles_remove_bloat">Hapus karakter sampah dari subtitel</string>
     <string name="audio_tracks">Audio Trek</string>
-    <string name="video_tracks">Vidio Trek</string>
+    <string name="video_tracks">Video Trek</string>
     <string name="extension_types">Dukungan</string>
     <string name="hls_playlist">Daftar putar HLS</string>
     <string name="apk_installer_settings">Penginstal APK</string>
@@ -529,4 +529,21 @@
     <string name="empty_library_logged_in_message">Yahh daftar ini kosong, coba ganti ke yang lain</string>
     <string name="safe_mode_file">Mode aman file ditemukan!
 \nTidak memuat ekstensi pada startup sampai berkas dihapus.</string>
+    <string name="android_tv_interface_off_seek_settings">Sembunyikan Pemutaran - Geser</string>
+    <string name="android_tv_interface_on_seek_settings">Pemutar terlihat - Geser</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Geser untuk menghilangkan</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Geser untuk menghilangkan</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="test_log">Log</string>
+    <string name="test_passed">Berhasil</string>
+    <string name="category_provider_test">Tes provider</string>
+    <string name="stop">Berhenti</string>
+    <string name="start">Mulai</string>
+    <string name="restart">Mulai lagi</string>
+    <string name="test_failed">Gagal</string>
+    <string name="subscription_in_progress_notification">Memperbarui acara langganan</string>
+    <string name="subscription_list_name">Berlangganan</string>
+    <string name="subscription_new">Berlangganan ke %s</string>
+    <string name="subscription_deleted">Berhenti berlangganan di %s</string>
+    <string name="subscription_episode_released">Episode %d telah rilis!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9dbc627f..89f6b4ee 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -528,4 +528,16 @@
     <string name="empty_library_logged_in_message">Sembra che questa lista sia vuota, prova a passare a un\'altra</string>
     <string name="safe_mode_file">File \"safe mode\" trovato!
 \nAll\'avvio non sarà caricata alcuna estensione finchè il file non verrà rimosso.</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Quantità di ricerca usata quando il player è nascosto</string>
+    <string name="pref_category_android_tv">TV Android</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Quantità di ricerca usata quando il player è visibile</string>
+    <string name="android_tv_interface_on_seek_settings">Player visibile - Quantità di ricerca</string>
+    <string name="android_tv_interface_off_seek_settings">Player nascosto - Quantità di ricerca</string>
+    <string name="test_log">Registro</string>
+    <string name="start">Avvia</string>
+    <string name="category_provider_test">Test del provider</string>
+    <string name="restart">Riavvia</string>
+    <string name="stop">Ferma</string>
+    <string name="test_passed">Superato</string>
+    <string name="test_failed">Fallito</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
new file mode 100644
index 00000000..a3d1d434
--- /dev/null
+++ b/app/src/main/res/values-ja/strings.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="next_episode_time_min_format" formatted="true">%d分</string>
+    <string name="title_downloads">ダウンロード</string>
+    <string name="title_search">検索</string>
+    <string name="title_settings">設定</string>
+    <string name="result_share">シェア</string>
+    <string name="movies">映画</string>
+    <string name="title_home">ホーム</string>
+    <string name="library">ライブラリ</string>
+    <string name="home_play">再生</string>
+    <string name="next_episode_time_day_format" formatted="true">%d日 %d時間%d分</string>
+    <string name="next_episode_time_hour_format" formatted="true">%d時間%d分</string>
+    <string name="search_hint">検索…</string>
+    <string name="download">ダウンロード</string>
+    <string name="home_info">情報</string>
+    <string name="season">シーズン</string>
+    <string name="trailer">予告編</string>
+    <string name="tv_series_singular">シリーズ</string>
+    <string name="episodes">エピソード</string>
+    <string name="player_speed_text_format" formatted="true">再生速度 (%.2fx)</string>
+    <string name="next_episode">次のエピソード</string>
+    <string name="sort_apply">適用</string>
+    <string name="category_account">アカウント</string>
+    <string name="cartoons">カートゥーン</string>
+    <string name="tv_series">TVシリーズ</string>
+    <string name="torrent">トレント</string>
+    <string name="documentaries">ドキュメンタリー</string>
+    <string name="ova">OVA</string>
+    <string name="asian_drama">アジアドラマ</string>
+    <string name="livestreams">ライブ配信</string>
+    <string name="movies_singular">映画</string>
+    <string name="others">その他</string>
+    <string name="cartoons_singular">カートゥーン</string>
+    <string name="torrent_singular">トレント</string>
+    <string name="documentaries_singular">ドキュメンタリー</string>
+    <string name="asian_drama_singular">アジアドラマ</string>
+    <string name="live_singular">ライブ配信</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="sort_cancel">キャンセル</string>
+    <string name="anime">アニメ</string>
+    <string name="video_lock">ロック</string>
+    <string name="video_source">ソース</string>
+    <string name="nsfw">NSFW</string>
+    <string name="clear_history">履歴を削除</string>
+    <string name="continue_watching">視聴中コンテンツ</string>
+    <string name="category_general">全般</string>
+    <string name="other_singular">動画</string>
+    <string name="category_player">プレーヤー</string>
+    <string name="type_plan_to_watch">懐う</string>
+    <string name="play_trailer_button">予告編を再生</string>
+    <string name="episode_short">エピソード</string>
+    <string name="type_watching">視聴</string>
+    <string name="result_tags">ジャンル</string>
+    <string name="play_movie_button">映画を再生</string>
+    <string name="pick_subtitle">字幕</string>
+    <string name="app_name">CloudStream</string>
+    <string name="play_with_app_name">CloudStreamで再生</string>
+    <string name="browser">ブラウザ</string>
+    <string name="type_completed">完成</string>
+    <string name="type_dropped">放置</string>
+    <string name="type_on_hold">保留</string>
+    <string name="loading">ローディング…</string>
+    <string name="result_open_in_browser">ブラウザで開く</string>
+    <string name="season_short">シーズン</string>
+    <string name="resume_time_left" formatted="true">残り
+\n%d分</string>
+    <string name="play_episode">再生エピソード</string>
+    <string name="downloaded">ダウンロード済</string>
+    <string name="pref_category_backup">バックアップ</string>
+    <string name="home_source">ソース</string>
+    <string name="history">履歴</string>
+    <string name="result_poster_img_des">ポスター</string>
+    <string name="type_none">なし</string>
+    <string name="sort_copy">コピー</string>
+    <string name="sort_close">閉じる</string>
+    <string name="sort_save">保存</string>
+    <string name="sort_clear">消去</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%sエピ%d</string>
+    <string name="cast_format" formatted="true">出演者：%s</string>
+    <string name="search_poster_img_des">ポスター</string>
+    <string name="episode_poster_img_des">エピソードポスター</string>
+    <string name="home_main_poster_img_des">主要ポスター</string>
+    <string name="home_next_random_img_des">次のランダム</string>
+    <string name="go_back_img_des">戻り</string>
+    <string name="rated_format" formatted="true">視聴率 %.1f</string>
+    <string name="new_update_format" formatted="true">新しいアップデートを発見!
+\n%s -&gt; %s</string>
+    <string name="duration_format" formatted="true">%d分</string>
+    <string name="search_hint_site" formatted="true">%sを検索…</string>
+    <string name="pick_source">ソース</string>
+    <string name="filler" formatted="true">ろくごうきじ</string>
+    <string name="reload_error">接続を再試行…</string>
+    <string name="go_back">戻り</string>
+    <string name="action_remove_from_bookmarks">削除</string>
+    <string name="home_more_info">詳細情報</string>
+    <string name="home_expanded_hide">閉じる</string>
+    <string name="category_updates">アップデート・バックアップ</string>
+    <string name="app_language">アプリ言語</string>
+    <string name="github">GitHub（ギットハブ）</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="legal_notice">免責</string>
+    <string name="pref_category_extensions">拡張機能</string>
+    <string name="pref_category_app_updates">アプリ更新</string>
+    <string name="category_providers">提供者</string>
+    <string name="pref_category_subtitles">字幕</string>
+    <string name="pref_category_ui_features">特徴</string>
+    <string name="pref_category_defaults">デフォルト</string>
+    <string name="automatic">自動</string>
+    <string name="home_random">任意</string>
+    <string name="extensions">拡張機能</string>
+    <string name="pref_category_links">リンク</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="login">ログイン</string>
+    <string name="logout">ログアウト</string>
+    <string name="max">最大</string>
+    <string name="min">最小</string>
+    <string name="none">なし</string>
+    <string name="next">次</string>
+    <string name="is_adult">18+</string>
+    <string name="no">否</string>
+    <string name="open_with">で開く</string>
+    <string name="episode">エピソード</string>
+    <string name="duration">時間</string>
+    <string name="synopsis">概要</string>
+    <string name="site">サイト</string>
+    <string name="used_storage">使用</string>
+    <string name="app_storage">アプリ</string>
+    <string name="action_open_watching">詳細情報</string>
+    <string name="action_remove_watching">削除</string>
+    <string name="picture_in_picture">ピクチャーインピクチャー</string>
+    <string name="player_subtitles_settings">字幕</string>
+    <string name="settings_info">情報</string>
+    <string name="pause">一時停止</string>
+    <string name="play_episode_toast">再生エピソード</string>
+    <string name="delete">削除</string>
+    <string name="start">開始</string>
+    <string name="status">状態</string>
+    <string name="year">年</string>
+    <string name="resume">再開</string>
+    <string name="test_failed">失敗</string>
+    <string name="test_passed">合格</string>
+    <string name="free_storage">空き</string>
+    <string name="status_completed">完成</string>
+    <string name="status_ongoing">進行中</string>
+    <string name="normal">デフォルト</string>
+    <string name="player_settings_play_in_browser">ウェブブラウザ</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="extension_language">言語</string>
+    <string name="extension_authors">作成者</string>
+    <string name="extension_size">サイズ</string>
+    <string name="extension_status">状態</string>
+    <string name="extension_version">バージョン</string>
+    <string name="extension_rating" formatted="true">視聴率 %s</string>
+    <string name="rating">視聴率</string>
+    <string name="default_subtitles">デフォルト</string>
+    <string name="download_failed">ダウンロード失敗</string>
+    <string name="download_started">ダウンロード開始</string>
+    <string name="download_done">ダウンロード完了</string>
+    <string name="download_canceled">ダウンロード終了</string>
+    <string name="stream">ストリーム</string>
+    <string name="update_started">アップデート開始</string>
+    <string name="no_season">シーズンなし</string>
+    <string name="no_subtitles">字幕なし</string>
+    <string name="video_aspect_ratio_resize">アスペクト比</string>
+    <string name="skip_loading">ロードをスキップする</string>
+    <string name="episode_more_options_des">その他のオプション</string>
+    <string name="no_data">データなし</string>
+    <string name="downloading">ダウンロード中</string>
+    <string name="error_bookmarks_text">ブックマーク</string>
+    <string name="download_storage_text">内部記憶装置</string>
+    <string name="download_paused">ダウンロードが一時停止</string>
+    <string name="provider_info_meta">メタデータはこのサイトでは提供されません。メタデータがサイト上に存在しない場合、ビデオの読み込みに失敗します。</string>
+    <string name="torrent_plot">記述</string>
+    <string name="show_log_cat">Logcat 🐈を表示</string>
+    <string name="test_log">ログ</string>
+    <string name="search">検索</string>
+    <string name="discord">Discordに参加</string>
+    <string name="update">アップデート</string>
+    <string name="check_for_update">アップデートを確認</string>
+    <string name="show_title">作品名</string>
+    <string name="update_notification_installing">アプリのアップデートをインストール中…</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index efe0a1d8..c36459b7 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -1,3 +1,128 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    </resources>
\ No newline at end of file
+    <string name="app_dub_sub_episode_text_format" formatted="true">%sಎಪಿ%d</string>
+    <string name="cast_format" formatted="true">ಕ್ಯಾಸ್ಟ್:%s</string>
+    <string name="go_back_img_des">ಹಿಂದೆ ಹೋಗು</string>
+    <string name="filler" formatted="true">ಫಿಲ್ಲರ್</string>
+    <string name="title_search">ಹುಡುಕು</string>
+    <string name="title_downloads">ಡೌನ್ಲೋಡ್</string>
+    <string name="subs_font">ಫಾಂಟ್</string>
+    <string name="search_provider_text_providers">ಪೂರೈಕೆದಾರರನ್ನು ಬಳಸಿಕೊಂಡು ಹುಡುಕಿ</string>
+    <string name="search_provider_text_types">ಪ್ರಕಾರಗಳನ್ನು ಬಳಸಿಕೊಂಡು ಹುಡುಕಿ</string>
+    <string name="benene_count_text_none">ಯಾವುದೇ ಬೆನೆನ್ಸ್ ನೀಡಿಲ್ಲ</string>
+    <string name="subs_auto_select_language">ಸ್ವಯಂ-ಆಯ್ಕೆ ಭಾಷೆ</string>
+    <string name="action_open_watching">ಹೆಚ್ಚಿನ ಮಾಹಿತಿ</string>
+    <string name="action_open_play">\@ಸ್ಟ್ರಿಂಗ್/ಹೋಮ್_ಪ್ಲೇ</string>
+    <string name="vpn_might_be_needed">ಈ ಪೂರೈಕೆದಾರರು ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡಲು VPN ಬೇಕಾಗಬಹುದು</string>
+    <string name="player_size_settings_des">ಕಪ್ಪು ಗಡಿಗಳನ್ನು ತೆಗೆದುಹಾಕಿ</string>
+    <string name="next_episode_format" formatted="true">ಸಂಚಿಕೆ%d ಬಿಡುಗಡೆಯಾಗಲಿದೆ</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
+    <string name="result_poster_img_des">ಪೋಸ್ಟರ್</string>
+    <string name="search_poster_img_des">ಪೋಸ್ಟರ್</string>
+    <string name="episode_poster_img_des">ಸಂಚಿಕೆ ಪೋಸ್ಟರ್</string>
+    <string name="home_main_poster_img_des">ಮೇನ್ ಪೋಸ್ಟರ್</string>
+    <string name="update_started">ಅಪ್ಡೇಟ್ ಪ್ರಾರಂಭವಾಗಿದೆ</string>
+    <string name="error_loading_links_toast">ಲೋಡಿಂಗ್ ಲಿಂಕ್ ಎರರ್ ಬಂದಿದೆ</string>
+    <string name="download_storage_text">ಇಂಟರ್ನಲ್ ಸ್ಟೋರೇಜ್</string>
+    <string name="app_dubbed_text">ಡಬ್</string>
+    <string name="app_subbed_text">ಸಬ್</string>
+    <string name="pref_disable_acra">ಸ್ವಯಂಚಾಲಿತ ದೋಷ ವರದಿಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
+    <string name="home_expanded_hide">ಹೈಡ್</string>
+    <string name="home_play">ಪ್ಲೇ</string>
+    <string name="home_info">ಮಾಹಿತಿ</string>
+    <string name="action_add_to_bookmarks">ಸೆಟ್ ವಾಚ್ ಸ್ಟೇಟಸ್</string>
+    <string name="sort_apply">ಅನ್ವಯಿಸು</string>
+    <string name="sort_cancel">ರದ್ದುಮಾಡು</string>
+    <string name="subs_subtitle_elevation">ಸಬ್ ಟೈಟಲ್ಸ್ ಎಲೆವಷನ್</string>
+    <string name="subs_font_size">ಫಾಂಟ್ ಸೈಜ್</string>
+    <string name="subs_subtitle_languages">ಸಬ್ ಟೈಟಲ್ಸ್ ಭಾಷೆ</string>
+    <string name="action_remove_watching">ತೆಗೆದುಹಾಕಿ</string>
+    <string name="vpn_torrent">ಈ ಪೂರೈಕೆದಾರರು ಟೊರೆಂಟ್ ಆಗಿದೆ, VPN ಅನ್ನು ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ</string>
+    <string name="normal_no_plot">ಯಾವುದೇ ಪ್ಲಾಟ್ ಕಂಡುಬಂದಿಲ್ಲ</string>
+    <string name="show_log_cat">ಲಾಗ್‌ಕ್ಯಾಟ್ 🐈 ತೋರಿಸಿ</string>
+    <string name="test_log">ಲಾಗ್</string>
+    <string name="picture_in_picture">ಚಿತ್ರದಲ್ಲಿ-ಚಿತ್ರದಲ್ಲಿ</string>
+    <string name="player_size_settings">ಪ್ಲೇಯರ್ ಮರುಗಾತ್ರಗೊಳಿಸಿ ಬಟನ್</string>
+    <string name="player_subtitles_settings">ಸಬ್ ಟೈಟಲ್ಸ್</string>
+    <string name="player_subtitles_settings_des">ಪ್ಲೇಯರ್ ಸಬ್ ಟೈಟಲ್ಸ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು</string>
+    <string name="chromecast_subtitles_settings_des">ಕ್ರೋಮ್ ಕ್ಯಾಸ್ಟ್ ಸಬ್ ಟೈಟಲ್ಸ್ ಸೆಟ್ಟಿಂಗ್ಸ್</string>
+    <string name="go_back">ಹಿಂದೆ ಹೋಗು</string>
+    <string name="popup_pause_download">ಡೌನ್‌ಲೋಡ್ ವಿರಾಮಗೊಳಿಸಿ</string>
+    <string name="error_bookmarks_text">ಬುಕ್‌ಮಾರ್ಕ್‌</string>
+    <string name="subs_background_color">ಬ್ಯಾಕ್ ಗ್ರೌಂಡ್ ಕಲರ್</string>
+    <string name="benene_count_text">%d ಡೇವ್‌ಗಳಿಗೆ ಬೆನೆನೆಸ್ ನೀಡಲಾಗಿದೆ</string>
+    <string name="subs_hold_to_reset_to_default">ಡೀಫಾಲ್ಟ್‌ಗೆ ಮರುಹೊಂದಿಸಲು ಹಿಡಿದುಕೊಳ್ಳಿ</string>
+    <string name="provider_info_meta">ಸೈಟ್‌ನಿಂದ ಮೆಟಾಡೇಟಾವನ್ನು ಒದಗಿಸಲಾಗಿಲ್ಲ, ಅದು ಸೈಟ್‌ನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲದಿದ್ದರೆ ವೀಡಿಯೊ ಲೋಡಿಂಗ್ ವಿಫಲಗೊಳ್ಳುತ್ತದೆ.</string>
+    <string name="picture_in_picture_des">ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೇಲೆ ಚಿಕಣಿ ಪ್ಲೇಯರ್‌ನಲ್ಲಿ ಪ್ಲೇಬ್ಯಾಕ್ ಅನ್ನು ಮುಂದುವರಿಸುತ್ತದೆ</string>
+    <string name="chromecast_subtitles_settings">ಕ್ರೋಮ್ ಕ್ಯಾಸ್ಟ್ ಸಬ್ ಟೈಟಲ್ಸ್</string>
+    <string name="rated_format" formatted="true">ರೇಟೆಡ್:%.1f</string>
+    <string name="action_remove_from_bookmarks">ತೆಗೆದುಹಾಕಿ</string>
+    <string name="popup_resume_download">ಡೌನ್‌ಲೋಡ್ ಅನ್ನು ಪುನರಾರಂಭಿಸಿ</string>
+    <string name="sort_close">ಕ್ಲೋಸ್</string>
+    <string name="sort_clear">ಕ್ಲಿಯರ್</string>
+    <string name="sort_save">ಸೇವ್</string>
+    <string name="subtitles_settings">ಸಬ್ ಟೈಟಲ್ಸ್ ಸೆಟ್ಟಿಂಗ್ಸ್</string>
+    <string name="popup_play_file">ಫೈಲ್ ಪ್ಲೇ</string>
+    <string name="subs_text_color">ಟೆಕ್ಸ್ಟ್ ಕಲರ್</string>
+    <string name="subs_outline_color">ಔಟ್ ಲೈನ್ ಕಲರ್</string>
+    <string name="subs_window_color">ವಿಂಡೋ ಕಲರ್</string>
+    <string name="subs_edge_type">ಎಡ್ಜ್ ಟೈಪ್</string>
+    <string name="home_change_provider_img_des">ಪ್ರೊವೈಡರ್ ಬದಲಾಯಿಸಿ</string>
+    <string name="duration_format" formatted="true">%dಮಿನ</string>
+    <string name="torrent_plot">ವಿವರಣೆ</string>
+    <string name="player_speed_text_format" formatted="true">ಸ್ಪೀಡ್(%.2fx)</string>
+    <string name="title_home">ಹೋಂ</string>
+    <string name="pick_subtitle">ಸಬ್ ಟೈಟಲ್ಸ್</string>
+    <string name="title_settings">ಸೆಟ್ಟಿಂಗ್ಸ್</string>
+    <string name="filter_bookmarks">ಬುಕ್‌ಮಾರ್ಕ್‌ಗಳನ್ನು ಫಿಲ್ಟರ್ ಮಾಡಿ</string>
+    <string name="search_hint">ಹುಡುಕು…</string>
+    <string name="play_movie_button">ಚಲನಚಿತ್ರವನ್ನು ಪ್ಲೇ ಮಾಡಿ</string>
+    <string name="preview_background_img_des">ಪ್ರಿವ್ಯೂ ಹಿನ್ನೆಲೆ</string>
+    <string name="next_episode">ಮುಂದಿನ ಸಂಚಿಕೆ</string>
+    <string name="app_name">ಕ್ಲೌಡ್ ಸ್ಟ್ರೀಮ್</string>
+    <string name="downloading">ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
+    <string name="stream">ಸ್ಟ್ರೀಮ್</string>
+    <string name="result_share">ಶೇರ್</string>
+    <string name="popup_delete_file">ಫೈಲ್ ಅಳಿಸಿ</string>
+    <string name="home_more_info">ಹೆಚ್ಚಿನ ಮಾಹಿತಿ</string>
+    <string name="new_update_format" formatted="true">ಹೊಸ ಅಪ್ಡೇಟ್ ಬಂದಿದೆ 
+\n%s-%s</string>
+    <string name="loading">ಲೋಡಿಂಗ್…</string>
+    <string name="subs_download_languages">ಡೌನ್‌ಲೋಡ್ ಭಾಷೆಗಳನ್ನು ಮಾಡಿ</string>
+    <string name="play_livestream_button">ಲೈವ್‌ಸ್ಟ್ರೀಮ್ ಪ್ಲೇ ಮಾಡಿ</string>
+    <string name="play_with_app_name">ಕ್ಲೌಡ್ ಸ್ಟ್ರೀಮ್ ಇದರೊಂದಿಗೆ ಪ್ಲೇ ಮಾಡಿ</string>
+    <string name="type_plan_to_watch">ವೀಕ್ಷಿಸಲು ಯೋಜನೆ</string>
+    <string name="play_episode">ಸಂಚಿಕೆಯನ್ನು ಪ್ಲೇ ಮಾಡಿ</string>
+    <string name="continue_watching">ಕಂಟಿನ್ಯೂ ವಾಟಚಿಂಗ್</string>
+    <string name="torrent_no_plot">ಯಾವುದೇ ವಿವರಣೆ ಕಂಡುಬಂದಿಲ್ಲ</string>
+    <string name="play_torrent_button">ಸ್ಟ್ರೀಮ್ ಟೊರೆಂಟ್</string>
+    <string name="download">ಡೌನ್‌ಲೋಡ್</string>
+    <string name="sort_copy">ಕಾಪಿ</string>
+    <string name="no_data">ನೋ ಡೇಟಾ</string>
+    <string name="player_speed">ಪ್ಲೇಯರ್ ಸ್ಪೀಡ್</string>
+    <string name="next_episode_time_day_format" formatted="true">%d %dh %dm</string>
+    <string name="search_hint_site" formatted="true">ಹುಡುಕು %s…</string>
+    <string name="episode_more_options_des">ಹೆಚ್ಚಿನ ಆಯ್ಕೆ</string>
+    <string name="subs_import_text" formatted="true">ಫಾಂಟ್‌ಗಳನ್ನು ಇರಿಸುವ ಮೂಲಕ ಆಮದು ಮಾಡಿ %s</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="result_tags">ಪ್ರಕಾರಗಳು</string>
+    <string name="result_open_in_browser">ಬ್ರೌಸರ್ ತೆರೆಯಿರಿ</string>
+    <string name="type_on_hold">ಆನ್-ಹೋಲ್ಡ್</string>
+    <string name="type_none">ನನ್</string>
+    <string name="reload_error">ಸಂಪರ್ಕವನ್ನು ಮರುಪ್ರಯತ್ನಿಸಿ…</string>
+    <string name="download_paused">ಡೌನ್‌ಲೋಡ್ ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ</string>
+    <string name="download_failed">ಡೌನ್‌ಲೋಡ್ ವಿಫಲವಾಗಿದೆ</string>
+    <string name="download_done">ಡೌನ್‌ಲೋಡ್ ಮುಗಿದಿದೆ</string>
+    <string name="browser">ಬ್ರೌಸರ್</string>
+    <string name="skip_loading">ಸ್ಕಿಪ್ ಲೋಡಿಂಗ್</string>
+    <string name="type_watching">ವಾಚಿಂಗ್</string>
+    <string name="type_completed">ಪೂರ್ಣಗೊಂಡಿದೆ</string>
+    <string name="type_dropped">ಕೈಬಿಡಲಾಯಿತು</string>
+    <string name="type_re_watching">ಪುನಃ ವೀಕ್ಷಿಸುತ್ತಿದೆ</string>
+    <string name="play_trailer_button">ಟ್ರೈಲರ್ ಪ್ಲೇ ಮಾಡಿ</string>
+    <string name="pick_source">ಮೂಲಗಳು</string>
+    <string name="downloaded">ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗಿದೆ</string>
+    <string name="download_started">ಡೌನ್‌ಲೋಡ್ ಪ್ರಾರಂಭವಾಗಿದೆ</string>
+    <string name="download_canceled">ಡೌನ್‌ಲೋಡ್ ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ</string>
+    <string name="home_next_random_img_des">ಮುಂದಿನ ರಾಂಡಮ್</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index c709f124..411f0b45 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -373,7 +373,7 @@
     <string name="skip_setup">Pomiń setup</string>
     <string name="app_layout_subtext">Dostosuj wygląd aplikacji do urządzenia</string>
     <string name="crash_reporting_title">Zgłaszanie błędów</string>
-    <string name="preferred_media_subtext">Co chciałbyś obejrzeć\?</string>
+    <string name="preferred_media_subtext">Co chciałbyś obejrzeć</string>
     <string name="setup_done">Gotowe</string>
     <string name="extensions">Rozszerzenia</string>
     <string name="add_repository">Dodaj repozytorium</string>
@@ -509,4 +509,9 @@
     <string name="empty_library_logged_in_message">Wygląda na to, że ta lista jest pusta, spróbuj przełączyć się na inną</string>
     <string name="safe_mode_file">Znaleziono plik trybu bezpiecznego.
 \nRozszerzenia nie zostaną wczytane, dopóki plik nie zostanie usunięty.</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Używana ilość przewijania, gdy widoczny jest odtwarzacz</string>
+    <string name="android_tv_interface_off_seek_settings">Ukryty odtwarzacz - ilość przewijania</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="android_tv_interface_on_seek_settings">Pokazany odtwarzacz — ilość przewijania</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Używana ilość przewijania, gdy ukryty jest odtwarzacz</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 982546bc..42d9b7c8 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -9,7 +9,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Poster</string>
     <string name="episode_poster_img_des">Poster Episod</string>
     <string name="home_main_poster_img_des">Poster Principal</string>
     <string name="home_next_random_img_des">Următorul la Întâmplare</string>
@@ -142,7 +142,7 @@
     <string name="restore_success">Fișier de rezervă încărcat</string>
     <string name="restore_failed_format" formatted="true">Imposibilitatea de a restaura datele din %s</string>
     <string name="backup_success">Date stocate</string>
-    <string name="backup_failed">Permisiuni de arhivare lipsă, vă rugăm să încercați din nou</string>
+    <string name="backup_failed">Permisiunea de arhivare lipșe, vă rugăm să încercați din nou.</string>
     <string name="backup_failed_error_format">Eroare de backup %s</string>
     <string name="search">Căutare</string>
     <string name="category_account">Conturi și credite</string>
@@ -154,7 +154,7 @@
     <string name="bug_report_settings_on">Nu trimiteți niciun fel de date</string>
     <string name="show_fillers_settings">Afișează etichetele [filler] pentru anime</string>
     <string name="show_trailers_settings">Arată trailerul</string>
-    <string name="kitsu_settings">Arată posterele de la Kitsu</string>
+    <string name="kitsu_settings">Arată afișele de la Kitsu</string>
     <string name="updates_settings">Afișați actualizările aplicației</string>
     <string name="updates_settings_des">Căutați automat noi actualizări la pornire</string>
     <string name="uprereleases_settings">Actualizați la prerelease</string>
@@ -384,4 +384,8 @@
     <string name="autoplay_next_settings_des">Începe următorul episod când se termină episodul curent</string>
     <string name="pref_filter_search_quality">Ascundeți calitatea video selectată în rezultatele căutării</string>
     <string name="play_livestream_button">Redare Livestream</string>
+    <string name="library">Librărie</string>
+    <string name="test_log">Log</string>
+    <string name="browser">Browser</string>
+    <string name="play_with_app_name">Joacă cu CloudStream</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6e9fb394..2812667a 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -506,4 +506,16 @@
     <string name="android_tv_interface_on_seek_settings">Плеер показан - Перемотки объем</string>
     <string name="android_tv_interface_off_seek_settings">Плеер спрятан - Перемотки объем</string>
     <string name="subtitles_remove_bloat">Удалять лишнее из субтитров</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Местоположение ползунка, когда игрок скрыт</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="actor_supporting">Второго планa</string>
+    <string name="skip_type_mixed_op">Смешанный опенинг</string>
+    <string name="skip_type_mixed_ed">Смешанный конец</string>
+    <string name="category_provider_test">Тест провайдер</string>
+    <string name="test_log">Журнал</string>
+    <string name="start">Запустить</string>
+    <string name="test_passed">Выполнено</string>
+    <string name="test_failed">Неудачный</string>
+    <string name="stop">Прекратить</string>
+    <string name="restart">Перезапустить</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 97039233..66d8ada9 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -17,7 +17,7 @@
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="duration_format" formatted="true">%d min</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Plagát</string>
     <string name="episode_poster_img_des">Plagát epizódy</string>
     <string name="home_main_poster_img_des">Hlavný plagát</string>
     <string name="play_with_app_name">Prehrať s CloudStream</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 871e0a28..5330d3ec 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -507,4 +507,20 @@
     <string name="safe_mode_file">Файл безпечного режиму знайдено!
 \nРозширеня не завантажуються під час запуску, доки файл не буде видалено.</string>
     <string name="pref_category_android_tv">Android TV</string>
+    <string name="android_tv_interface_off_seek_settings">Плеєр сховано - обсяг пошуку</string>
+    <string name="android_tv_interface_on_seek_settings">Плеєр показано - обсяг пошуку</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Обсяг пошуку, який використовується, коли плеєр видимий</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Обсяг пошуку, який використовується, коли гравець прихований</string>
+    <string name="test_failed">Не вдалося</string>
+    <string name="test_passed">Пройдено</string>
+    <string name="restart">Перезапуск</string>
+    <string name="test_log">Журнал</string>
+    <string name="start">Старт</string>
+    <string name="stop">Стоп</string>
+    <string name="category_provider_test">Тест постачальника</string>
+    <string name="subscription_in_progress_notification">Оновлення підписаних шоу</string>
+    <string name="subscription_list_name">Підписано</string>
+    <string name="subscription_new">Підписано на %s</string>
+    <string name="subscription_deleted">Відписатися від %s</string>
+    <string name="subscription_episode_released">Епізод %d випущено!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index a8341d46..8a10208a 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -19,7 +19,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">封面</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">封面</string>
     <string name="episode_poster_img_des">劇集封面</string>
     <string name="home_main_poster_img_des">主封面</string>
     <string name="home_next_random_img_des">隨機下一個</string>
@@ -533,4 +533,5 @@
     <string name="pref_category_defaults">預設</string>
     <string name="pref_category_looks">外觀</string>
     <string name="pref_category_ui_features">功能</string>
+    <string name="browser">瀏覽器</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index c57e3ca1..9e2d6137 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -554,4 +554,21 @@
     <string name="empty_library_no_accounts_message">看来您的库是空的 :(
 \n登录库账户或添加节目到您的本地库</string>
     <string name="empty_library_logged_in_message">看来此列表是空的，请尝试切换到另一个</string>
+    <string name="android_tv_interface_on_seek_settings">播放器显示 - 快进快退秒数</string>
+    <string name="android_tv_interface_on_seek_settings_summary">播放器可见时使用的快进快退秒数</string>
+    <string name="android_tv_interface_off_seek_settings">播放器隐藏 - 快进快退秒数</string>
+    <string name="android_tv_interface_off_seek_settings_summary">播放器隐藏时使用的快进快退秒数</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="test_failed">失败</string>
+    <string name="category_provider_test">片源测试</string>
+    <string name="restart">重启</string>
+    <string name="stop">停止</string>
+    <string name="subscription_in_progress_notification">正在更新订阅节目</string>
+    <string name="subscription_list_name">已订阅</string>
+    <string name="subscription_new">已订阅 %s</string>
+    <string name="subscription_deleted">已取消订阅 %s</string>
+    <string name="start">开始</string>
+    <string name="subscription_episode_released">第 %d 集已发布！</string>
+    <string name="test_passed">成功</string>
+    <string name="test_log">日志</string>
 </resources>
\ No newline at end of file

From 51137701f2c6228660720fba94d9dfc53cefb582 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Tue, 21 Feb 2023 18:43:35 +0100
Subject: [PATCH 240/273] add proxy to raw.githubusercontent.com (#368)

---
 .../lagradost/cloudstream3/MainActivity.kt    | 34 ++++++++++++++++++
 .../cloudstream3/plugins/RepositoryManager.kt | 30 ++++++++++++----
 .../ui/settings/SettingsGeneral.kt            | 13 ++++---
 .../lagradost/cloudstream3/utils/AppUtils.kt  |  8 ++++-
 app/src/main/res/values/strings.xml           |  6 ++++
 app/src/main/res/xml/settins_general.xml      | 36 ++++++++++++-------
 6 files changed, 102 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 28419e7a..e626dcd6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -32,7 +32,9 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.google.android.gms.cast.framework.*
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.navigationrail.NavigationRailView
+import com.google.android.material.snackbar.Snackbar
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
+import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.APIHolder.allProviders
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.getApiDubstatusSettings
@@ -79,6 +81,7 @@ import com.lagradost.cloudstream3.ui.setup.SetupFragmentExtensions
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.html
 import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
+import com.lagradost.cloudstream3.utils.AppUtils.isNetworkAvailable
 import com.lagradost.cloudstream3.utils.AppUtils.loadCache
 import com.lagradost.cloudstream3.utils.AppUtils.loadRepository
 import com.lagradost.cloudstream3.utils.AppUtils.loadResult
@@ -86,6 +89,7 @@ import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.BackupUtils.setUpBackup
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.DataStoreHelper.migrateResumeWatching
@@ -717,6 +721,28 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
         changeStatusBarState(isEmulatorSettings())
 
+        // Automatically enable jsdelivr if cant connect to raw.githubusercontent.com
+        if (this.getKey<Boolean>(getString(R.string.jsdelivr_proxy_key)) == null && isNetworkAvailable()) {
+            main {
+                if (checkGithubConnectivity()) {
+                    this.setKey(getString(R.string.jsdelivr_proxy_key), false)
+                } else {
+                    this.setKey(getString(R.string.jsdelivr_proxy_key), true)
+                    val parentView: View = findViewById(android.R.id.content)
+                    Snackbar.make(parentView, R.string.jsdelivr_enabled, Snackbar.LENGTH_LONG).let { snackbar ->
+                        snackbar.setAction(R.string.revert) {
+                            setKey(getString(R.string.jsdelivr_proxy_key), false)
+                        }
+                        snackbar.setBackgroundTint(colorFromAttribute(R.attr.primaryGrayBackground))
+                        snackbar.setTextColor(colorFromAttribute(R.attr.textColor))
+                        snackbar.setActionTextColor(colorFromAttribute(R.attr.colorPrimary))
+                        snackbar.show()
+                    }
+                }
+
+            }
+        }
+
 
         if (PluginManager.checkSafeModeFile()) {
             normalSafeApiCall {
@@ -1090,4 +1116,12 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 //        }
 
     }
+
+    suspend fun checkGithubConnectivity(): Boolean {
+        return try {
+            app.get("https://raw.githubusercontent.com/recloudstream/.github/master/connectivitycheck", timeout = 5).text.trim() == "ok"
+        } catch (t: Throwable) {
+            false
+        }
+    }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
index e77b2d54..742bf308 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
@@ -2,8 +2,10 @@ package com.lagradost.cloudstream3.plugins
 
 import android.content.Context
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.AcraApplication.Companion.context
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
@@ -71,6 +73,15 @@ object RepositoryManager {
     val PREBUILT_REPOSITORIES: Array<RepositoryData> by lazy {
         getKey("PREBUILT_REPOSITORIES") ?: emptyArray()
     }
+    val GH_REGEX = Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$")
+
+    /* Convert raw.githubusercontent.com urls to cdn.jsdelivr.net if enabled in settings */
+    fun convertRawGitUrl(url: String): String {
+        if (getKey<Boolean>(context!!.getString(R.string.jsdelivr_proxy_key)) != true) return url
+        val match = GH_REGEX.find(url) ?: return url
+        val (user, repo, rest) = match.destructured
+        return "https://cdn.jsdelivr.net/gh/$user/$repo@$rest"
+    }
 
     suspend fun parseRepoUrl(url: String): String? {
         val fixedUrl = url.trim()
@@ -84,10 +95,15 @@ object RepositoryManager {
             }
         } else if (fixedUrl.matches("^[a-zA-Z0-9!_-]+$".toRegex())) {
             suspendSafeApiCall {
-                app.get("https://l.cloudstream.cf/${fixedUrl}").let {
-                    return@let if (it.isSuccessful && !it.url.startsWith("https://cutt.ly/branded-domains")) it.url
-                    else app.get("https://cutt.ly/${fixedUrl}").let let2@{ it2 ->
-                        return@let2 if (it2.isSuccessful) it2.url else null
+                app.get("https://l.cloudstream.cf/${fixedUrl}", allowRedirects = false).let {
+                    it.headers["Location"]?.let { url ->
+                        return@suspendSafeApiCall if (!url.startsWith("https://cutt.ly/branded-domains")) url
+                        else null
+                    }
+                    app.get("https://cutt.ly/${fixedUrl}", allowRedirects = false).let { it2 ->
+                        it2.headers["Location"]?.let { url ->
+                            return@suspendSafeApiCall if (url.startsWith("https://cutt.ly/404")) url else null
+                        }
                     }
                 }
             }
@@ -97,14 +113,14 @@ object RepositoryManager {
     suspend fun parseRepository(url: String): Repository? {
         return suspendSafeApiCall {
             // Take manifestVersion and such into account later
-            app.get(url).parsedSafe()
+            app.get(convertRawGitUrl(url)).parsedSafe()
         }
     }
 
     private suspend fun parsePlugins(pluginUrls: String): List<SitePlugin> {
         // Take manifestVersion and such into account later
         return try {
-            val response = app.get(pluginUrls)
+            val response = app.get(convertRawGitUrl(pluginUrls))
             // Normal parsed function not working?
             // return response.parsedSafe()
             tryParseJson<Array<SitePlugin>>(response.text)?.toList() ?: emptyList()
@@ -139,7 +155,7 @@ object RepositoryManager {
             }
             file.createNewFile()
 
-            val body = app.get(pluginUrl).okhttpResponse.body
+            val body = app.get(convertRawGitUrl(pluginUrl)).okhttpResponse.body
             write(body.byteStream(), file.outputStream())
             file
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 354dc89c..c5a11cce 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -82,7 +82,7 @@ val appLanguages = arrayListOf(
     Triple("", "norsk bokmål", "no"),
     Triple("", "polski", "pl"),
     Triple("\uD83C\uDDF5\uD83C\uDDF9", "português", "pt"),
-    Triple("🦍", "mmmm... monke", "qt"),
+    Triple("\uD83E\uDD8D", "mmmm... monke", "qt"),
     Triple("", "română", "ro"),
     Triple("", "русский", "ru"),
     Triple("", "slovenčina", "sk"),
@@ -97,7 +97,7 @@ val appLanguages = arrayListOf(
     Triple("", "中文", "zh"),
     Triple("\uD83C\uDDF9\uD83C\uDDFC", "文言", "zh-rTW"),
 /* end language list */
-).sortedBy { it.second?.toLowerCase() } //ye, we go alphabetical, so ppl don't put their lang on top
+).sortedBy { it.second.lowercase() } //ye, we go alphabetical, so ppl don't put their lang on top
 
 class SettingsGeneral : PreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -157,9 +157,6 @@ class SettingsGeneral : PreferenceFragmentCompat() {
 
         getPref(R.string.locale_key)?.setOnPreferenceClickListener { pref ->
             val tempLangs = appLanguages.toMutableList()
-            //if (beneneCount > 100) {
-            //    tempLangs.add(Triple("\uD83E\uDD8D", "mmmm... monke", "mo"))
-            //}
             val current = getCurrentLocale(pref.context)
             val languageCodes = tempLangs.map { (_, _, iso) -> iso }
             val languageNames = tempLangs.map { (emoji, name, iso) ->
@@ -316,6 +313,12 @@ class SettingsGeneral : PreferenceFragmentCompat() {
             } ?: emptyList()
         }
 
+        settingsManager.edit().putBoolean(getString(R.string.jsdelivr_proxy_key), getKey(getString(R.string.jsdelivr_proxy_key), false) ?: false).apply()
+        getPref(R.string.jsdelivr_proxy_key)?.setOnPreferenceChangeListener { _, newValue ->
+            setKey(getString(R.string.jsdelivr_proxy_key), newValue)
+            return@setOnPreferenceChangeListener true
+        }
+
         getPref(R.string.download_path_key)?.setOnPreferenceClickListener {
             val dirs = getDownloadDirs()
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
index 860144ee..205f0a6b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -491,6 +491,12 @@ object AppUtils {
         }
     }
 
+    fun Context.isNetworkAvailable(): Boolean {
+        val manager = this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val activeNetworkInfo = manager.activeNetworkInfo
+        return activeNetworkInfo != null && activeNetworkInfo.isConnected || manager.allNetworkInfo?.any { it.isConnected } ?: false
+    }
+
     fun splitQuery(url: URL): Map<String, String> {
         val queryPairs: MutableMap<String, String> = LinkedHashMap()
         val query: String = url.query
@@ -815,4 +821,4 @@ object AppUtils {
         }
         return currentAudioFocusRequest
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0858fdfa..2d46a70d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,6 +43,7 @@
     <string name="random_button_key" translatable="false">random_button_key</string>
     <string name="provider_lang_key" translatable="false">provider_lang_key</string>
     <string name="dns_key" translatable="false">dns_key</string>
+    <string name="jsdelivr_proxy_key" translatable="false">jsdelivr_proxy_key</string>
     <string name="download_path_key" translatable="false">download_path_key</string>
     <string name="app_name_download_path" translatable="false">Cloudstream</string>
     <string name="app_layout_key" translatable="false">app_layout_key</string>
@@ -378,6 +379,9 @@
     <string name="video_disk_description">Causes problems if set too high on devices with low storage space, such as Android TV.</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Useful for bypassing ISP blocks</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
+    <string name="jsdelivr_enabled">Failed to reach GitHub, enabling jsdelivr proxy.</string>
+    <string name="jsdelivr_proxy_summary">Bypasses blocking of GitHub using jsdelivr, may cause updates to be delayed by few days.</string>
     <string name="add_site_pref">Clone site</string>
     <string name="remove_site_pref">Remove site</string>
     <string name="add_site_summary">Add a clone of an existing site, with a different URL</string>
@@ -405,6 +409,7 @@
         responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
         CloudStream 3 at your own risk.
     </string>
+    <string name="pref_category_bypass">ISP Bypasses</string>
     <string name="pref_category_links">Links</string>
     <string name="pref_category_app_updates">App updates</string>
     <string name="pref_category_backup">Backup</string>
@@ -644,6 +649,7 @@
     <string name="empty_library_no_accounts_message">Looks like your library is empty :(\nLogin to a library account or add shows to your local library</string>
     <string name="empty_library_logged_in_message">Looks like this list is empty, try switching to another one</string>
     <string name="safe_mode_file">Safe mode file found!\nNot loading any extensions on startup until file is removed.</string>
+    <string name="revert">Revert</string>
     <string name="subscription_in_progress_notification">Updating subscribed shows</string>
     <string name="subscription_list_name">Subscribed</string>
     <string name="subscription_new">Subscribed to %s</string>
diff --git a/app/src/main/res/xml/settins_general.xml b/app/src/main/res/xml/settins_general.xml
index 726f3fd0..c4900bca 100644
--- a/app/src/main/res/xml/settins_general.xml
+++ b/app/src/main/res/xml/settins_general.xml
@@ -6,18 +6,6 @@
         android:title="@string/app_language"
         android:icon="@drawable/ic_baseline_language_24" />
 
-    <Preference
-            android:key="@string/override_site_key"
-            android:title="@string/add_site_pref"
-            android:summary="@string/add_site_summary"
-            android:icon="@drawable/ic_baseline_add_24" />
-
-    <Preference
-            android:key="@string/dns_key"
-            android:title="@string/dns_pref"
-            android:summary="@string/dns_pref_summary"
-            android:icon="@drawable/ic_baseline_dns_24" />
-
     <Preference
             android:key="@string/download_path_key"
             android:title="@string/download_path_pref"
@@ -34,6 +22,30 @@
         android:icon="@drawable/benene"
         app:summary="@string/benene_des" />
 
+    <PreferenceCategory
+            android:title="@string/pref_category_bypass">
+
+        <Preference
+                android:key="@string/override_site_key"
+                android:title="@string/add_site_pref"
+                android:summary="@string/add_site_summary"
+                android:icon="@drawable/ic_baseline_add_24" />
+
+        <Preference
+                android:key="@string/dns_key"
+                android:title="@string/dns_pref"
+                android:summary="@string/dns_pref_summary"
+                android:icon="@drawable/ic_baseline_dns_24" />
+
+        <SwitchPreference
+                android:defaultValue="false"
+                android:icon="@drawable/ic_github_logo"
+                android:key="@string/jsdelivr_proxy_key"
+                android:title="@string/jsdelivr_proxy"
+                android:summary="@string/jsdelivr_proxy_summary" />
+
+    </PreferenceCategory>
+
     <PreferenceCategory
             android:title="@string/pref_category_links">
 

From 1da6a925692de08cb8e8ec00d93d1e5d1f76b8c6 Mon Sep 17 00:00:00 2001
From: "recloudstream[bot]"
 <111277985+recloudstream[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 18:07:04 +0000
Subject: [PATCH 241/273] update list of locales

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index c5a11cce..078419e2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -74,6 +74,7 @@ val appLanguages = arrayListOf(
     Triple("\uD83C\uDDEE\uD83C\uDDE9", "Bahasa Indonesia", "in"),
     Triple("", "italiano", "it"),
     Triple("\uD83C\uDDEE\uD83C\uDDF1", "עברית", "iw"),
+    Triple("", "日本語 (にほんご)", "ja"),
     Triple("", "ಕನ್ನಡ", "kn"),
     Triple("", "македонски", "mk"),
     Triple("", "മലയാളം", "ml"),

From aeab423d2929d1de6dd2681592e2e832f261a935 Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Fri, 24 Feb 2023 18:47:54 +0100
Subject: [PATCH 242/273] Excluded the referer header when empty

---
 .../java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 4772a7f1..cd384c6f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -40,6 +40,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLinkPlayList
 import com.lagradost.cloudstream3.utils.ExtractorUri
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTwoLettersToLanguage
 import java.io.File
+import java.time.Duration
 import javax.net.ssl.HttpsURLConnection
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLSession
@@ -535,15 +536,16 @@ class CS3IPlayer : IPlayer {
                 OkHttpDataSource.Factory(client).setUserAgent(USER_AGENT)
             }
 
+            // Do no include empty referer, if the provider wants those they can use the header map.
+            val refererMap = if (link.referer.isBlank()) emptyMap() else mapOf("referer" to link.referer)
             val headers = mapOf(
-                "referer" to link.referer,
                 "accept" to "*/*",
                 "sec-ch-ua" to "\"Chromium\";v=\"91\", \" Not;A Brand\";v=\"99\"",
                 "sec-ch-ua-mobile" to "?0",
                 "sec-fetch-user" to "?1",
                 "sec-fetch-mode" to "navigate",
                 "sec-fetch-dest" to "video"
-            ) + link.headers // Adds the headers from the provider, e.g Authorization
+            ) + refererMap + link.headers // Adds the headers from the provider, e.g Authorization
 
             return source.apply {
                 setDefaultRequestProperties(headers)

From f722785a379547fb9f28893e0661eeff186b0a3d Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Sat, 25 Feb 2023 01:49:53 +0700
Subject: [PATCH 243/273] fixed Linkbox (#390)

---
 .../cloudstream3/extractors/Linkbox.kt        | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt
index c28a8900..6a4945bb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt
@@ -18,31 +18,36 @@ open class Linkbox : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val id = Regex("""(/file/|id=)(\S+)[&/?]""").find(url)?.groupValues?.get(2)
-        app.get("$mainUrl/api/open/get_url?itemId=$id", referer=url).parsedSafe<Responses>()?.data?.rList?.map { link ->
-            callback.invoke(
-                ExtractorLink(
-                    name,
-                    name,
-                    link.url,
-                    url,
-                    getQualityFromName(link.resolution)
+        val id = Regex("""(?:/f/|/file/|\?id=)(\w+)""").find(url)?.groupValues?.get(1)
+        app.get("$mainUrl/api/file/detail?itemId=$id", referer = url)
+            .parsedSafe<Responses>()?.data?.itemInfo?.resolutionList?.map { link ->
+                callback.invoke(
+                    ExtractorLink(
+                        name,
+                        name,
+                        link.url ?: return@map null,
+                        url,
+                        getQualityFromName(link.resolution)
+                    )
                 )
-            )
-        }
+            }
     }
 
-    data class RList(
-        @JsonProperty("url") val url: String,
-        @JsonProperty("resolution") val resolution: String?,
+    data class Resolutions(
+        @JsonProperty("url") val url: String? = null,
+        @JsonProperty("resolution") val resolution: String? = null,
+    )
+
+    data class ItemInfo(
+        @JsonProperty("resolutionList") val resolutionList: ArrayList<Resolutions>? = arrayListOf(),
     )
 
     data class Data(
-        @JsonProperty("rList") val rList: List<RList>?,
+        @JsonProperty("itemInfo") val itemInfo: ItemInfo? = null,
     )
 
     data class Responses(
-        @JsonProperty("data") val data: Data?,
+        @JsonProperty("data") val data: Data? = null,
     )
 
 }
\ No newline at end of file

From 2926dc6c8eea53a35006b4188f9a03a9a9bb5216 Mon Sep 17 00:00:00 2001
From: Allen Baby <64322605+allenbaby@users.noreply.github.com>
Date: Sat, 25 Feb 2023 00:21:03 +0530
Subject: [PATCH 244/273] Issue #376: Added new feature for separate watch
 quality on mobile data. (#391)

* Issue #376: Added new feature for separate watch quality on mobile data.
---
 .../cloudstream3/ui/player/CS3IPlayer.kt      |  3 ++-
 .../ui/player/FullScreenPlayer.kt             |  4 ++--
 .../ui/settings/SettingsPlayer.kt             | 24 +++++++++++++++++++
 .../lagradost/cloudstream3/utils/AppUtils.kt  |  7 +++++-
 app/src/main/res/values/strings.xml           |  6 +++--
 app/src/main/res/xml/settings_player.xml      |  4 ++++
 6 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index cd384c6f..782e3fa4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -35,6 +35,7 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.utils.EpisodeSkip
+import com.lagradost.cloudstream3.utils.AppUtils.isUsingMobileData
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkPlayList
 import com.lagradost.cloudstream3.utils.ExtractorUri
@@ -849,7 +850,7 @@ class CS3IPlayer : IPlayer {
         Log.i(TAG, "loadExo")
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
         val maxVideoHeight = settingsManager.getInt(
-            context.getString(com.lagradost.cloudstream3.R.string.quality_pref_key),
+            context.getString(if (context.isUsingMobileData()) com.lagradost.cloudstream3.R.string.quality_pref_mobile_data_key else com.lagradost.cloudstream3.R.string.quality_pref_key),
             Int.MAX_VALUE
         )
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 8d28fd9d..d1b2814d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -40,6 +40,7 @@ import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer.Companion.subsProvidersIsActive
 import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.AppUtils.isUsingMobileData
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
@@ -1246,9 +1247,8 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                         ctx.getString(R.string.double_tap_pause_enabled_key),
                         false
                     )
-
                 currentPrefQuality = settingsManager.getInt(
-                    ctx.getString(R.string.quality_pref_key),
+                    ctx.getString(if (ctx.isUsingMobileData()) R.string.quality_pref_mobile_data_key else R.string.quality_pref_key),
                     currentPrefQuality
                 )
                 // useSystemBrightness =
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
index 33d41934..e10a5a1a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
@@ -113,6 +113,30 @@ class SettingsPlayer : PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
+        getPref(R.string.quality_pref_mobile_data_key)?.setOnPreferenceClickListener {
+            val prefValues = Qualities.values().map { it.value }.reversed().toMutableList()
+            prefValues.remove(Qualities.Unknown.value)
+
+            val prefNames = prefValues.map { Qualities.getStringByInt(it) }
+
+            val currentQuality =
+                settingsManager.getInt(
+                    getString(R.string.quality_pref_mobile_data_key),
+                    Qualities.values().last().value
+                )
+
+            activity?.showBottomDialog(
+                prefNames.toList(),
+                prefValues.indexOf(currentQuality),
+                getString(R.string.watch_quality_pref_data),
+                true,
+                {}) {
+                settingsManager.edit().putInt(getString(R.string.quality_pref_mobile_data_key), prefValues[it])
+                    .apply()
+            }
+            return@setOnPreferenceClickListener true
+        }
+
         getPref(R.string.player_pref_key)?.setOnPreferenceClickListener {
             val prefNames = resources.getStringArray(R.array.player_pref_names)
             val prefValues = resources.getIntArray(R.array.player_pref_values)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
index 205f0a6b..a76b62fd 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -776,8 +776,13 @@ object AppUtils {
         return networkInfo.any {
             conManager.getNetworkCapabilities(it)
                 ?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) == true
+                    } &&
+                !networkInfo.any {
+                    conManager.getNetworkCapabilities(it)
+                        ?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true
+                }
         }
-    }
+
 
     private fun Activity?.cacheClass(clazz: String?) {
         clazz?.let { c ->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2d46a70d..49380b5e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,6 +16,7 @@
     <string name="test_providers_key" translatable="false">test_providers_key</string>
     <string name="subtitle_settings_chromecast_key" translatable="false">subtitle_settings_chromecast_key</string>
     <string name="quality_pref_key" translatable="false">quality_pref_key</string>
+    <string name="quality_pref_mobile_data_key" translatable="false">quality_pref_mobile_data_key</string>
     <string name="player_pref_key" translatable="false">player_pref_key</string>
     <string name="prefer_limit_title_key" translatable="false">prefer_limit_title_key</string>
     <string name="prefer_limit_title_rez_key" translatable="false">prefer_limit_title_rez_key</string>
@@ -364,7 +365,8 @@
     <string name="dont_show_again">Don\'t show again</string>
     <string name="skip_update">Skip this Update</string>
     <string name="update">Update</string>
-    <string name="watch_quality_pref">Preferred watch quality</string>
+    <string name="watch_quality_pref">Preferred watch quality (WiFi)</string>
+    <string name="watch_quality_pref_data">Preferred watch quality (Mobile Data)</string>
     <string name="limit_title">Video player title max chars</string>
     <string name="limit_title_rez">Video player resolution</string>
     <string name="video_buffer_size_settings">Video buffer size</string>
@@ -655,4 +657,4 @@
     <string name="subscription_new">Subscribed to %s</string>
     <string name="subscription_deleted">Unsubscribed from %s</string>
     <string name="subscription_episode_released">Episode %d released!</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/xml/settings_player.xml b/app/src/main/res/xml/settings_player.xml
index 0e5bd84f..2d2905ea 100644
--- a/app/src/main/res/xml/settings_player.xml
+++ b/app/src/main/res/xml/settings_player.xml
@@ -15,6 +15,10 @@
             android:icon="@drawable/ic_baseline_hd_24"
             android:key="@string/quality_pref_key"
             android:title="@string/watch_quality_pref" />
+        <Preference
+            android:icon="@drawable/ic_baseline_hd_24"
+            android:key="@string/quality_pref_mobile_data_key"
+            android:title="@string/watch_quality_pref_data" />
 
         <Preference
             android:icon="@drawable/netflix_play"

From 6524eb220bfab60c00c24a5db23a5b1c28c87d13 Mon Sep 17 00:00:00 2001
From: Sarlay <60151189+Sarlay@users.noreply.github.com>
Date: Sat, 25 Feb 2023 21:18:48 +0000
Subject: [PATCH 245/273] Added some extractors mirrors and added Vido
 Extractor (#393)

* Added some mirrors and fixed some extractors

* Fixed Vido extractor (for MesFilms and Wiflix)
---
 .../cloudstream3/extractors/DoodExtractor.kt  |  3 ++
 .../cloudstream3/extractors/Evolaod.kt        | 25 ++------------
 .../cloudstream3/extractors/Filesim.kt        |  5 +++
 .../cloudstream3/extractors/StreamSB.kt       |  4 +++
 .../cloudstream3/extractors/Uqload.kt         | 26 ++++----------
 .../lagradost/cloudstream3/extractors/Vido.kt | 34 +++++++++++++++++++
 .../cloudstream3/utils/ExtractorApi.kt        |  5 +++
 7 files changed, 61 insertions(+), 41 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/extractors/Vido.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
index 7ec1fb22..0d94eb08 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
@@ -38,6 +38,9 @@ class DoodWsExtractor : DoodLaExtractor() {
     override var mainUrl = "https://dood.ws"
 }
 
+class DoodYtExtractor : DoodLaExtractor() {
+    override var mainUrl = "https://dood.yt"
+}
 
 open class DoodLaExtractor : ExtractorApi() {
     override var name = "DoodStream"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Evolaod.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Evolaod.kt
index eddbf6df..3e38b446 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Evolaod.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Evolaod.kt
@@ -16,26 +16,7 @@ open class Evoload : ExtractorApi() {
 
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val lang = url.substring(0, 2)
-        val flag =
-            if (lang == "vo") {
-                " \uD83C\uDDEC\uD83C\uDDE7"
-            }
-            else if (lang == "vf"){
-                " \uD83C\uDDE8\uD83C\uDDF5"
-            } else {
-                ""
-            }
-
-        val cleaned_url = if (lang == "ht") {  // if url doesn't contain a flag and the url starts with http://
-            url
-        } else {
-            url.substring(2, url.length)
-        }
-	//println(lang)
-        //println(cleaned_url)
-
-        val id = cleaned_url.replace("https://evoload.io/e/", "")  // wanted media id
+        val id = url.replace("https://evoload.io/e/", "")  // wanted media id
         val csrv_token = app.get("https://csrv.evosrv.com/captcha?m412548=").text  // whatever that is
         val captchaPass = app.get("https://cd2.evosrv.com/html/jsx/e.jsx").text.take(300).split("captcha_pass = '")[1].split("\'")[0]  //extract the captcha pass from the js response (located in the 300 first chars)
         val payload = mapOf("code" to id, "csrv_token" to csrv_token, "pass" to captchaPass)
@@ -44,9 +25,9 @@ open class Evoload : ExtractorApi() {
         return listOf(
             ExtractorLink(
                 name,
-                name + flag,
+                name,
                 link,
-                cleaned_url,
+                url,
                 Qualities.Unknown.value,
             )
         )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
index bc910a7e..382ca756 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
@@ -13,6 +13,11 @@ class FileMoon : Filesim() {
     override val name = "FileMoon"
 }
 
+class FileMoonSx : Filesim() {
+    override val mainUrl = "https://filemoon.sx"
+    override val name = "FileMoonSx"
+}
+
 open class Filesim : ExtractorApi() {
     override val name = "Filesim"
     override val mainUrl = "https://files.im"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
index b77617c2..b7477242 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
@@ -77,6 +77,10 @@ class StreamSB10 : StreamSB() {
     override var mainUrl = "https://sbplay2.xyz"
 }
 
+class StreamSB11 : StreamSB() {
+    override var mainUrl = "https://sbbrisk.com"
+}
+
 // This is a modified version of https://github.com/jmir1/aniyomi-extensions/blob/master/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/StreamSBExtractor.kt
 // The following code is under the Apache License 2.0 https://github.com/jmir1/aniyomi-extensions/blob/master/LICENSE
 open class StreamSB : ExtractorApi() {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Uqload.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Uqload.kt
index 5109acc3..86bd9e0b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Uqload.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Uqload.kt
@@ -7,6 +7,10 @@ class Uqload1 : Uqload() {
     override var mainUrl = "https://uqload.com"
 }
 
+class Uqload2 : Uqload() {
+    override var mainUrl = "https://uqload.co"
+}
+
 open class Uqload : ExtractorApi() {
     override val name: String = "Uqload"
     override val mainUrl: String = "https://www.uqload.com"
@@ -15,30 +19,14 @@ open class Uqload : ExtractorApi() {
 
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val lang = url.substring(0, 2)
-        val flag =
-            if (lang == "vo") {
-                " \uD83C\uDDEC\uD83C\uDDE7"
-            }
-            else if (lang == "vf"){
-                " \uD83C\uDDE8\uD83C\uDDF5"
-            } else {
-                ""
-            }
-
-        val cleaned_url = if (lang == "ht") {  // if url doesn't contain a flag and the url starts with http://
-            url
-        } else {
-            url.substring(2, url.length)
-        }
-        with(app.get(cleaned_url)) {  // raised error ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED (3003) is due to the response: "error_nofile"
+        with(app.get(url)) {  // raised error ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED (3003) is due to the response: "error_nofile"
             srcRegex.find(this.text)?.groupValues?.get(1)?.replace("\"", "")?.let { link ->
                 return listOf(
                     ExtractorLink(
                         name,
-                        name + flag,
+                        name,
                         link,
-                        cleaned_url,
+                        url,
                         Qualities.Unknown.value,
                     )
                 )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Vido.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vido.kt
new file mode 100644
index 00000000..67e59281
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vido.kt
@@ -0,0 +1,34 @@
+package com.lagradost.cloudstream3.extractors
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.getAndUnpack
+
+class Vido : ExtractorApi() {
+    override var name = "Vido"
+    override var mainUrl = "https://vido.lol"
+    private val srcRegex = Regex("""sources:\s*\["(.*?)"\]""")
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+        val methode = app.get(url.replace("/e/", "/embed-")) // fix wiflix and mesfilms
+        with(methode) {
+            if (!methode.isSuccessful) return null
+            //val quality = unpackedText.lowercase().substringAfter(" height=").substringBefore(" ").toIntOrNull()
+            srcRegex.find(this.text)?.groupValues?.get(1)?.let { link ->
+                return listOf(
+                    ExtractorLink(
+                        name,
+                        name,
+                        link,
+                        url,
+                        Qualities.Unknown.value,
+                        true,
+                    )
+                )
+            }
+        }
+        return null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index b0dba9ff..6540b8c4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -229,6 +229,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     StreamSB8(),
     StreamSB9(),
     StreamSB10(),
+    StreamSB11(),
     SBfull(),
     // Streamhub(), cause Streamhub2() works
     Streamhub2(),
@@ -254,6 +255,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     //  WatchSB(), 'cause StreamSB.kt works
     Uqload(),
     Uqload1(),
+    Uqload2(),
     Evoload(),
     Evoload1(),
     VoeExtractor(),
@@ -277,6 +279,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     DoodShExtractor(),
     DoodWatchExtractor(),
     DoodWfExtractor(),
+    DoodYtExtractor(),
 
     AsianLoad(),
 
@@ -324,6 +327,8 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
 
     Filesim(),
     FileMoon(),
+    FileMoonSx(),
+    Vido(),
     Linkbox(),
     Acefile(),
     SpeedoStream(),

From e5834d485b1447a3687891d698f776e7922289d8 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Sat, 25 Feb 2023 20:37:54 +0100
Subject: [PATCH 246/273] Translated using Weblate (German)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (608 of 608 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (608 of 608 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (608 of 608 strings)

Translated using Weblate (Portuguese)

Currently translated at 81.0% (493 of 608 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (608 of 608 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 99.5% (605 of 608 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (608 of 608 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (608 of 608 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (608 of 608 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (608 of 608 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (608 of 608 strings)

Translated using Weblate (Polish)

Currently translated at 97.3% (592 of 608 strings)

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translated using Weblate (Japanese)

Currently translated at 44.5% (268 of 602 strings)

Translated using Weblate (qt (generated) (qt))

Currently translated at 50.4% (304 of 602 strings)

Translated using Weblate (Slovak)

Currently translated at 31.7% (191 of 602 strings)

Translated using Weblate (Portuguese)

Currently translated at 76.9% (463 of 602 strings)

Translated using Weblate (Somali)

Currently translated at 94.3% (568 of 602 strings)

Translated using Weblate (Somali)

Currently translated at 94.3% (568 of 602 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 44.5% (268 of 602 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 44.5% (268 of 602 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 44.5% (268 of 602 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Esperanto)

Currently translated at 27.5% (166 of 602 strings)

Translated using Weblate (Esperanto)

Currently translated at 27.5% (166 of 602 strings)

Translated using Weblate (Persian)

Currently translated at 20.0% (121 of 602 strings)

Translated using Weblate (Hungarian)

Currently translated at 55.6% (335 of 602 strings)

Translated using Weblate (German)

Currently translated at 99.1% (597 of 602 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Russian)

Currently translated at 99.1% (597 of 602 strings)

Translated using Weblate (Kannada)

Currently translated at 35.2% (212 of 602 strings)

Translated using Weblate (Urdu)

Currently translated at 72.2% (435 of 602 strings)

Translated using Weblate (Tamil)

Currently translated at 18.2% (110 of 602 strings)

Translated using Weblate (Tamil)

Currently translated at 18.2% (110 of 602 strings)

Translated using Weblate (Hebrew)

Currently translated at 97.1% (585 of 602 strings)

Translated using Weblate (Bengali)

Currently translated at 38.7% (233 of 602 strings)

Translated using Weblate (Bengali)

Currently translated at 38.7% (233 of 602 strings)

Translated using Weblate (Bengali)

Currently translated at 38.7% (233 of 602 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 94.1% (567 of 602 strings)

Translated using Weblate (Vietnamese)

Currently translated at 96.8% (583 of 602 strings)

Translated using Weblate (Turkish)

Currently translated at 97.1% (585 of 602 strings)

Translated using Weblate (Tagalog)

Currently translated at 56.1% (338 of 602 strings)

Translated using Weblate (Tagalog)

Currently translated at 56.1% (338 of 602 strings)

Translated using Weblate (Tagalog)

Currently translated at 56.1% (338 of 602 strings)

Translated using Weblate (Swedish)

Currently translated at 74.9% (451 of 602 strings)

Translated using Weblate (Swedish)

Currently translated at 74.9% (451 of 602 strings)

Translated using Weblate (Swedish)

Currently translated at 74.9% (451 of 602 strings)

Translated using Weblate (Romanian)

Currently translated at 73.0% (440 of 602 strings)

Translated using Weblate (Romanian)

Currently translated at 73.0% (440 of 602 strings)

Translated using Weblate (Romanian)

Currently translated at 73.0% (440 of 602 strings)

Translated using Weblate (Polish)

Currently translated at 98.0% (590 of 602 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 88.3% (532 of 602 strings)

Translated using Weblate (Dutch)

Currently translated at 75.0% (452 of 602 strings)

Translated using Weblate (Dutch)

Currently translated at 75.0% (452 of 602 strings)

Translated using Weblate (Dutch)

Currently translated at 75.0% (452 of 602 strings)

Translated using Weblate (Malayalam)

Currently translated at 37.2% (224 of 602 strings)

Translated using Weblate (Malayalam)

Currently translated at 37.2% (224 of 602 strings)

Translated using Weblate (Malayalam)

Currently translated at 37.2% (224 of 602 strings)

Translated using Weblate (Macedonian)

Currently translated at 48.6% (293 of 602 strings)

Translated using Weblate (Macedonian)

Currently translated at 48.6% (293 of 602 strings)

Translated using Weblate (Macedonian)

Currently translated at 48.6% (293 of 602 strings)

Translated using Weblate (Italian)

Currently translated at 99.1% (597 of 602 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Hindi)

Currently translated at 37.7% (227 of 602 strings)

Translated using Weblate (Hindi)

Currently translated at 37.7% (227 of 602 strings)

Translated using Weblate (Hindi)

Currently translated at 37.7% (227 of 602 strings)

Translated using Weblate (French)

Currently translated at 97.3% (586 of 602 strings)

Translated using Weblate (Greek)

Currently translated at 97.0% (584 of 602 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (bp (generated) (bp))

Currently translated at 77.4% (466 of 602 strings)

Translated using Weblate (bp (generated) (bp))

Currently translated at 77.4% (466 of 602 strings)

Translated using Weblate (bp (generated) (bp))

Currently translated at 77.4% (466 of 602 strings)

Translated using Weblate (Bulgarian)

Currently translated at 94.5% (569 of 602 strings)

Translated using Weblate (Bulgarian)

Currently translated at 94.5% (569 of 602 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (602 of 602 strings)

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translated using Weblate (Japanese)

Currently translated at 44.5% (268 of 602 strings)

Translated using Weblate (qt (generated) (qt))

Currently translated at 50.4% (304 of 602 strings)

Translated using Weblate (Slovak)

Currently translated at 31.7% (191 of 602 strings)

Translated using Weblate (Portuguese)

Currently translated at 76.9% (463 of 602 strings)

Translated using Weblate (Somali)

Currently translated at 94.3% (568 of 602 strings)

Translated using Weblate (Somali)

Currently translated at 94.3% (568 of 602 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 44.5% (268 of 602 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 44.5% (268 of 602 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 44.5% (268 of 602 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Esperanto)

Currently translated at 27.5% (166 of 602 strings)

Translated using Weblate (Esperanto)

Currently translated at 27.5% (166 of 602 strings)

Translated using Weblate (Persian)

Currently translated at 20.0% (121 of 602 strings)

Translated using Weblate (Hungarian)

Currently translated at 55.6% (335 of 602 strings)

Translated using Weblate (German)

Currently translated at 99.1% (597 of 602 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Russian)

Currently translated at 99.1% (597 of 602 strings)

Translated using Weblate (Kannada)

Currently translated at 35.2% (212 of 602 strings)

Translated using Weblate (Kannada)

Currently translated at 35.2% (212 of 602 strings)

Translated using Weblate (Urdu)

Currently translated at 72.2% (435 of 602 strings)

Translated using Weblate (Tamil)

Currently translated at 18.2% (110 of 602 strings)

Translated using Weblate (Tamil)

Currently translated at 18.2% (110 of 602 strings)

Translated using Weblate (Hebrew)

Currently translated at 97.1% (585 of 602 strings)

Translated using Weblate (Bengali)

Currently translated at 38.7% (233 of 602 strings)

Translated using Weblate (Bengali)

Currently translated at 38.7% (233 of 602 strings)

Translated using Weblate (Bengali)

Currently translated at 38.7% (233 of 602 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 94.1% (567 of 602 strings)

Translated using Weblate (Vietnamese)

Currently translated at 96.8% (583 of 602 strings)

Translated using Weblate (Turkish)

Currently translated at 97.1% (585 of 602 strings)

Translated using Weblate (Tagalog)

Currently translated at 56.1% (338 of 602 strings)

Translated using Weblate (Tagalog)

Currently translated at 56.1% (338 of 602 strings)

Translated using Weblate (Tagalog)

Currently translated at 56.1% (338 of 602 strings)

Translated using Weblate (Swedish)

Currently translated at 74.9% (451 of 602 strings)

Translated using Weblate (Swedish)

Currently translated at 74.9% (451 of 602 strings)

Translated using Weblate (Swedish)

Currently translated at 74.9% (451 of 602 strings)

Translated using Weblate (Romanian)

Currently translated at 73.0% (440 of 602 strings)

Translated using Weblate (Romanian)

Currently translated at 73.0% (440 of 602 strings)

Translated using Weblate (Romanian)

Currently translated at 73.0% (440 of 602 strings)

Translated using Weblate (Polish)

Currently translated at 98.0% (590 of 602 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 88.3% (532 of 602 strings)

Translated using Weblate (Dutch)

Currently translated at 75.0% (452 of 602 strings)

Translated using Weblate (Dutch)

Currently translated at 75.0% (452 of 602 strings)

Translated using Weblate (Dutch)

Currently translated at 75.0% (452 of 602 strings)

Translated using Weblate (Malayalam)

Currently translated at 37.2% (224 of 602 strings)

Translated using Weblate (Malayalam)

Currently translated at 37.2% (224 of 602 strings)

Translated using Weblate (Malayalam)

Currently translated at 37.2% (224 of 602 strings)

Translated using Weblate (Macedonian)

Currently translated at 48.6% (293 of 602 strings)

Translated using Weblate (Macedonian)

Currently translated at 48.6% (293 of 602 strings)

Translated using Weblate (Macedonian)

Currently translated at 48.6% (293 of 602 strings)

Translated using Weblate (Italian)

Currently translated at 99.1% (597 of 602 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (Hindi)

Currently translated at 37.7% (227 of 602 strings)

Translated using Weblate (Hindi)

Currently translated at 37.7% (227 of 602 strings)

Translated using Weblate (Hindi)

Currently translated at 37.7% (227 of 602 strings)

Translated using Weblate (French)

Currently translated at 97.3% (586 of 602 strings)

Translated using Weblate (Greek)

Currently translated at 97.0% (584 of 602 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (602 of 602 strings)

Translated using Weblate (bp (generated) (bp))

Currently translated at 77.4% (466 of 602 strings)

Translated using Weblate (bp (generated) (bp))

Currently translated at 77.4% (466 of 602 strings)

Translated using Weblate (bp (generated) (bp))

Currently translated at 77.4% (466 of 602 strings)

Translated using Weblate (Bulgarian)

Currently translated at 94.5% (569 of 602 strings)

Translated using Weblate (Bulgarian)

Currently translated at 94.5% (569 of 602 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (602 of 602 strings)

Co-authored-by: Aitor Salaberria <trslbrr@gmail.com>
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Anarchydr <patrikpik879@gmail.com>
Co-authored-by: Anonymous <noreply@weblate.org>
Co-authored-by: Cliff Heraldo <123844876+clxf12@users.noreply.github.com>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Dan <denqwerta@gmail.com>
Co-authored-by: Fjuro <ifjuro@proton.me>
Co-authored-by: Geovani Amaral <geovani.af4@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Julian <hello@apollo.moe>
Co-authored-by: MedRAM <mohammad7ram@users.noreply.hosted.weblate.org>
Co-authored-by: Prathap Rathod <prathap0144@gmail.com>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Sandyran <sandyran@protonmail.com>
Co-authored-by: Sdarfeesh <Sdarfeesh@protonmail.com>
Co-authored-by: Translator-3000 <weblate.m1d0h@8shield.net>
Co-authored-by: Walter H <walter75@gmail.com>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: gnu-ewm <gnu.ewm@protonmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bg/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bp/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/el/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/eo/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fa/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/he/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hu/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ja/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/kn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/mk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ml/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/qt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ro/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/so/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sv/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ta/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ur/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hant/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml |  8 ++++++-
 app/src/main/res/values-cs/strings.xml |  8 ++++++-
 app/src/main/res/values-de/strings.xml | 13 ++++++++++-
 app/src/main/res/values-es/strings.xml |  8 ++++++-
 app/src/main/res/values-hr/strings.xml |  5 +++++
 app/src/main/res/values-in/strings.xml |  5 +++++
 app/src/main/res/values-it/strings.xml | 10 +++++++++
 app/src/main/res/values-kn/strings.xml |  2 +-
 app/src/main/res/values-pl/strings.xml | 17 ++++++++++++++
 app/src/main/res/values-pt/strings.xml | 31 ++++++++++++++++++++++++--
 app/src/main/res/values-qt/strings.xml | 23 ++++++++++---------
 app/src/main/res/values-uk/strings.xml |  9 +++++++-
 app/src/main/res/values-zh/strings.xml |  5 +++++
 13 files changed, 125 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 1e9bcfcc..cfd761e3 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -259,7 +259,7 @@
     <string name="dont_show_again">لا تظهر مرة أخرى</string>
     <string name="skip_update">تخطي هذا التحديث</string>
     <string name="update">تحديث</string>
-    <string name="watch_quality_pref">جودة المشاهدة المفضلة</string>
+    <string name="watch_quality_pref">جودة المشاهدة المفضلة (WiFi)</string>
     <string name="limit_title">أقصى عدد لحروف عنوان مُشغل الفيديو</string>
     <string name="limit_title_rez">أبعاد مُشغل الفيديو</string>
     <string name="video_buffer_size_settings">حجم ذاكرة التخزين المؤقت للفيديو</string>
@@ -555,4 +555,10 @@
     <string name="subscription_episode_released">تم إصدار الحلقة %d!</string>
     <string name="subscription_list_name">مشترك</string>
     <string name="subscription_new">مشترك في %s</string>
+    <string name="pref_category_bypass">تجاوز مزود خدمة الإنترنت</string>
+    <string name="revert">استرجاع</string>
+    <string name="jsdelivr_enabled">فشل الوصول إلى GitHub ، وتمكين وكيل jsdelivr.</string>
+    <string name="jsdelivr_proxy_summary">تجاوز حظر GitHub باستخدام jsdelivr ، قد يتسبب في تأخير التحديثات لبضعة أيام.</string>
+    <string name="jsdelivr_proxy">وكيل raw.githubusercontent.com</string>
+    <string name="watch_quality_pref_data">جودة المشاهدة المفضلة (بيانات الجوال)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 966cd7d9..e99e1010 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -245,7 +245,7 @@
     <string name="dont_show_again">Již nezobrazovat</string>
     <string name="skip_update">Přeskočit tuto aktualizace</string>
     <string name="update">Aktualizovat</string>
-    <string name="watch_quality_pref">Upřednostněná kvalita sledování</string>
+    <string name="watch_quality_pref">Upřednostněná kvalita sledování (WiFi)</string>
     <string name="limit_title">Maximální počet znaků v názvu přehrávače</string>
     <string name="limit_title_rez">Rozlišení přehrávače</string>
     <string name="video_buffer_size_settings">Velikost vyrovnávací paměti videa</string>
@@ -547,4 +547,10 @@
     <string name="subscription_deleted">Odhlášen odběr od %s</string>
     <string name="subscription_episode_released">Byla vydána epizoda %d!</string>
     <string name="subscription_list_name">Odebíráno</string>
+    <string name="jsdelivr_proxy">Proxy raw.githubusercontent.com</string>
+    <string name="jsdelivr_enabled">Nepodařilo se připojit ke GitHubu, povolování proxy jsdelivr.</string>
+    <string name="watch_quality_pref_data">Upřednostněná kvalita sledování (mobilní data)</string>
+    <string name="revert">Vrátit zpět</string>
+    <string name="jsdelivr_proxy_summary">Obchází blokování GitHubu pomocí jsdelivr, může způsobit zpoždění aktualizací o několik dní.</string>
+    <string name="pref_category_bypass">Obcházení ISP</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f6583c20..c5e74a60 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -263,7 +263,7 @@
     <string name="dont_show_again">Nicht mehr anzeigen</string>
     <string name="skip_update">Update ignorieren</string>
     <string name="update">Update</string>
-    <string name="watch_quality_pref">Bevorzugte Auflösung</string>
+    <string name="watch_quality_pref">Bevorzugte Videoqualität (WLAN)</string>
     <string name="limit_title">Videoplayertitel max. Zeichen</string>
     <string name="limit_title_rez">Videoplayer Auflösung</string>
     <string name="video_buffer_size_settings">Videopuffergröße</string>
@@ -518,4 +518,15 @@
     <string name="test_log">Log</string>
     <string name="start">Start</string>
     <string name="restart">Neustarten</string>
+    <string name="watch_quality_pref_data">Bevorzugte Videoqualität (mobile Daten)</string>
+    <string name="jsdelivr_proxy_summary">Umgehung der GitHub Sperre mit jsdelivr, kann zu einigen Tagen Verzögerung bei Updates führen.</string>
+    <string name="subscription_new">%s abonniert</string>
+    <string name="subscription_deleted">%s deabonniert</string>
+    <string name="subscription_episode_released">Episode %d erschienen!</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
+    <string name="jsdelivr_enabled">GitHub kann nicht erreicht werden, der jsdelivr-Proxy wird aktiviert.</string>
+    <string name="subscription_in_progress_notification">Aktualisierung abonnierter Sendungen</string>
+    <string name="revert">Rückgängig</string>
+    <string name="subscription_list_name">Abonniert</string>
+    <string name="pref_category_bypass">ISP-Umgehungen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2040169b..18647ef8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -24,7 +24,7 @@
     <string name="pref_filter_search_quality">Ocultar la calidad de video en los resultados de búsqueda</string>
     <string name="pref_category_player_layout">Diseño</string>
     <string name="category_ui">Diseño</string>
-    <string name="watch_quality_pref">Calidad de visualización preferida</string>
+    <string name="watch_quality_pref">Calidad de visualización preferida (WiFi)</string>
     <string name="player_pref">Reproductor de video preferido</string>
     <string name="emulator_layout">Diseño para emulador</string>
     <string name="app_layout">Diseño de la aplicación</string>
@@ -523,4 +523,10 @@
     <string name="subscription_deleted">Darse de baja de %s</string>
     <string name="subscription_in_progress_notification">Actualizando los programas suscritos</string>
     <string name="subscription_episode_released">¡Episodio %d publicado!</string>
+    <string name="jsdelivr_proxy">Proxy raw.githubusercontent.com</string>
+    <string name="jsdelivr_enabled">No se ha podido acceder a GitHub, activando el proxy jsdelivr.</string>
+    <string name="jsdelivr_proxy_summary">Evita el bloqueo de GitHub usando jsdelivr, puede causar que las actualizaciones se retrasen unos días.</string>
+    <string name="revert">Revertir</string>
+    <string name="pref_category_bypass">ISP Bypasses</string>
+    <string name="watch_quality_pref_data">Calidad de visualización preferida (Datos móviles)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 926c7f57..b623ec5d 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -548,4 +548,9 @@
     <string name="subscription_list_name">Pretplaćeno</string>
     <string name="subscription_new">Pretplaćen na %s</string>
     <string name="subscription_deleted">Otkazana pretplata sa %s</string>
+    <string name="revert">Vraćanje</string>
+    <string name="pref_category_bypass">ISP zaobilaznice</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
+    <string name="jsdelivr_enabled">Neuspješno dohvaćanje GitHuba, omogućavanje jsdelivr proxyja.</string>
+    <string name="jsdelivr_proxy_summary">Zaobilazi blokiranje GitHuba pomoću jsdelivr, može uzrokovati odgode ažuriranja za nekoliko dana.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 46d61e44..84179352 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -546,4 +546,9 @@
     <string name="subscription_new">Berlangganan ke %s</string>
     <string name="subscription_deleted">Berhenti berlangganan di %s</string>
     <string name="subscription_episode_released">Episode %d telah rilis!</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com Proksi</string>
+    <string name="jsdelivr_enabled">Gagal mencapai GitHub, mengaktifkan proksi jsdelivr.</string>
+    <string name="jsdelivr_proxy_summary">Bypass pemblokiran Github menggunakan JSDeliVR, dapat menyebabkan pembaruan tertunda beberapa hari.</string>
+    <string name="pref_category_bypass">Bypass ISP</string>
+    <string name="revert">Pulihkan</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 89f6b4ee..d6bdc204 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -540,4 +540,14 @@
     <string name="stop">Ferma</string>
     <string name="test_passed">Superato</string>
     <string name="test_failed">Fallito</string>
+    <string name="jsdelivr_proxy">Proxy raw.githubusercontent.com</string>
+    <string name="subscription_deleted">Disiscritto da %s</string>
+    <string name="subscription_list_name">Iscritto</string>
+    <string name="subscription_new">Iscritto a %s</string>
+    <string name="jsdelivr_enabled">Impossibile contattare GitHub, abilitazione proxy jsdelivr avviata.</string>
+    <string name="jsdelivr_proxy_summary">Bypassa il blocco di GitHub utilizzando jsdelivr, potrebbe causare un ritardo di alcuni giorni.</string>
+    <string name="pref_category_bypass">Baypass ISP</string>
+    <string name="revert">Ripristina</string>
+    <string name="subscription_in_progress_notification">Aggiornando shows a cui sei iscritto</string>
+    <string name="subscription_episode_released">L\'episodio %d è stato rilasciato!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index c36459b7..242653be 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -85,7 +85,7 @@
     <string name="result_share">ಶೇರ್</string>
     <string name="popup_delete_file">ಫೈಲ್ ಅಳಿಸಿ</string>
     <string name="home_more_info">ಹೆಚ್ಚಿನ ಮಾಹಿತಿ</string>
-    <string name="new_update_format" formatted="true">ಹೊಸ ಅಪ್ಡೇಟ್ ಬಂದಿದೆ 
+    <string name="new_update_format" formatted="true">ಹೊಸ ಅಪ್ಡೇಟ್ ಬಂದಿದೆ
 \n%s-%s</string>
     <string name="loading">ಲೋಡಿಂಗ್…</string>
     <string name="subs_download_languages">ಡೌನ್‌ಲೋಡ್ ಭಾಷೆಗಳನ್ನು ಮಾಡಿ</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 411f0b45..bbaaec57 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -514,4 +514,21 @@
     <string name="pref_category_android_tv">Android TV</string>
     <string name="android_tv_interface_on_seek_settings">Pokazany odtwarzacz — ilość przewijania</string>
     <string name="android_tv_interface_off_seek_settings_summary">Używana ilość przewijania, gdy ukryty jest odtwarzacz</string>
+    <string name="test_log">Dziennik</string>
+    <string name="restart">Uruchom ponownie</string>
+    <string name="start">Rozpocznij</string>
+    <string name="test_failed">Nie powiodło się</string>
+    <string name="test_passed">Ukończone powodzeniem</string>
+    <string name="jsdelivr_proxy">Serwer pośredniczący raw.githubusercontent.com</string>
+    <string name="pref_category_bypass">Obejścia ISP</string>
+    <string name="category_provider_test">Test dostawcy</string>
+    <string name="stop">Zatrzymaj</string>
+    <string name="revert">Przywróć</string>
+    <string name="subscription_in_progress_notification">Aktualizowanie subskrybowanych programów</string>
+    <string name="subscription_list_name">Zasubskrybowano</string>
+    <string name="subscription_new">Zasubskrybowano %s</string>
+    <string name="subscription_deleted">Anulowano subskrypcję %s</string>
+    <string name="subscription_episode_released">Został wydany odcinek %d!</string>
+    <string name="jsdelivr_proxy_summary">Obchodzi blokadę GitHuba za pomocą jsdelivr, może spowodować opóźnienie aktualizacji o kilka dni.</string>
+    <string name="jsdelivr_enabled">Nie udało się połączyć z GitHub, włączono serwer pośredniczący jsdelivr.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 9353664e..3754de8b 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -6,12 +6,12 @@
     <string name="next_episode_format" formatted="true">Episódio %d será lançado em</string>
     <string name="result_poster_img_des">Poster</string>
     <string name="episode_poster_img_des">Capa do Episódio</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Poster</string>
     <string name="home_main_poster_img_des">Capa Principal</string>
     <string name="home_next_random_img_des">Próximo Aleatório</string>
     <string name="go_back_img_des">Voltar</string>
     <string name="home_change_provider_img_des">Trocar Provedor</string>
-    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%d dia(s), %d hora(s) e %d mese(s)</string>
     <string name="home_source">Fonte</string>
     <string name="resolution">Resolução</string>
     <string name="extras">Extras</string>
@@ -381,4 +381,31 @@
     <string name="uppercase_all_subtitles">Todas as legendas em maiúsculas</string>
     <string name="download_all_plugins_from_repo">Transferir todos os plugins deste repositório\?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Desativado)</string>
+    <string name="apk_installer_settings">Instalador APK</string>
+    <string name="duration_format" formatted="true">%d minuto(s)</string>
+    <string name="play_trailer_button">Reproduzir trailer</string>
+    <string name="action_add_to_bookmarks">Marcar como visto/não visto</string>
+    <string name="action_open_play">Reproduzir</string>
+    <string name="automatic_plugin_download_summary">Instalar automaticamente todas as extensões dos repositórios cadastrados.</string>
+    <string name="automatic_plugin_download">Baixar extensões automaticamente</string>
+    <string name="redo_setup_process">Refazer o processo de configuração</string>
+    <string name="go_back_30">-30</string>
+    <string name="other_singular">Vídeo</string>
+    <string name="go_forward_30">+30</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="cast_format" formatted="true">Elenco: %s</string>
+    <string name="update_started">Atualização em andamento</string>
+    <string name="test_log">Log</string>
+    <string name="apk_installer_settings_des">Alguns aparelhos não possuem suporte para o novo instalador de pacotes. Use a opção legado caso não esteja conseguindo atualizar.</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="start">Iniciar</string>
+    <string name="test_failed">Falha</string>
+    <string name="test_passed">Sucesso</string>
+    <string name="library">Biblioteca</string>
+    <string name="browser">Navegar</string>
+    <string name="anim">Aplicativo de Anime pelos mesmos desenvolvedores</string>
+    <string name="ova_singular">Ova</string>
+    <string name="anime_singular">Anime</string>
+    <string name="android_tv_interface_on_seek_settings">Player visível - Procurar valor</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-qt/strings.xml b/app/src/main/res/values-qt/strings.xml
index b36f3b16..c1119bfc 100644
--- a/app/src/main/res/values-qt/strings.xml
+++ b/app/src/main/res/values-qt/strings.xml
@@ -172,30 +172,31 @@
     <string name="resume">oouuh haa</string>
     <string name="double_tap_to_seek_settings_des">oohahaha hahha ooooohaha</string>
     <string name="storage_error">oohahaha hahha ooooohaha haaoou</string>
-    <string name="use_system_brightness_settings">u ahhu uuuh hau  uaohuau</string>
+    <string name="use_system_brightness_settings">u ahhu uuuh hau uaohuau</string>
     <string name="use_system_brightness_settings_des">aahuuouhh ouh hhhah hhaohuhha</string>
     <string name="subs_font_size">a auoo ohauh</string>
-    <string name="source_error">uhaauauau  ahuuouaha</string>
+    <string name="source_error">uhaauauau ahuuouaha</string>
     <string name="remote_error">auuuha h a ahuhaaaa</string>
-    <string name="render_error">uaoh   uhu uahaaaaoo</string>
-    <string name="unexpected_error">uauhah u  aao u oah</string>
-    <string name="watch_quality_pref">h u   ahahh aoou  ha</string>
+    <string name="render_error">uaoh uhu uahaaaaoo</string>
+    <string name="unexpected_error">uauhah u aao u oah</string>
+    <string name="watch_quality_pref">h u ahahh aoou ha</string>
     <string name="dns_pref">haoooo aaoou uou ah</string>
     <string name="dns_pref_summary">oahuouooaouoa ouuhh</string>
     <string name="display_subbed_dubbed_settings">o ouou uhauuuoaah h</string>
     <string name="resize_fit">ou aouhouo aaooao hh</string>
-    <string name="resize_fill">hhauhohhuu  au aaohu</string>
-    <string name="resize_zoom">uhuoh o   a ohahuhohoa hah</string>
+    <string name="resize_fill">hhauhohhuu au aaohu</string>
+    <string name="resize_zoom">uhuoh o a ohahuhohoa hah</string>
     <string name="provider_lang_settings">ua hu ouo o aoau hah ah</string>
-    <string name="legal_notice">ah huu  oouhhau aoaoaaohoo ha</string>
-    <string name="category_general">a ahu uoo uoahuo   uo</string>
+    <string name="legal_notice">ah huu oouhhau aoaoaaohoo ha</string>
+    <string name="category_general">a ahu uoo uoahuo uo</string>
     <string name="app_layout">uo u ohouao</string>
     <string name="automatic">uuoouhh hhuhuuh ouhoaao hau aouo</string>
-    <string name="tv_layout">uha uh  huo uooaah u</string>
+    <string name="tv_layout">uha uh huo uooaah u</string>
     <string name="phone_layout">u ooah uo ahauao huhuu hauu h</string>
     <string name="primary_color_settings">a ou oh ouhuouhoaaha</string>
     <string name="show_fillers_settings">aaooohhouhhha hauauuu</string>
-    <string name="new_update_format">aaaaaaa uuuuuu\n%s -&gt; %s</string>
+    <string name="new_update_format">aaaaaaa uuuuuu
+\n%s -&gt; %s</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s aaou %d</string>
     <string name="cast_format" formatted="true">oouaaahh %s</string>
     <string name="next_episode_format" formatted="true">aaaaaaugh ouh %d uuoogahaaah ooua-h-ha</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 5330d3ec..a676b583 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -217,7 +217,7 @@
     <string name="video_skip_op">Пропустити OP</string>
     <string name="dont_show_again">Не показувати знову</string>
     <string name="update">Оновити</string>
-    <string name="watch_quality_pref">Бажана якість перегляду</string>
+    <string name="watch_quality_pref">Бажана якість перегляду (WiFi)</string>
     <string name="show_title">Заголовок</string>
     <string name="poster_ui_settings">Перемикання елементів інтерфейсу на плакаті</string>
     <string name="no_update_found">Оновлення не знайдено</string>
@@ -523,4 +523,11 @@
     <string name="subscription_new">Підписано на %s</string>
     <string name="subscription_deleted">Відписатися від %s</string>
     <string name="subscription_episode_released">Епізод %d випущено!</string>
+    <string name="revert">Повернути</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com
+\nProxy</string>
+    <string name="jsdelivr_enabled">Не вдалося зв\'язатися з GitHub, увімкнувши проксі-сервер jsdelivr.</string>
+    <string name="pref_category_bypass">Обходи ISP</string>
+    <string name="jsdelivr_proxy_summary">Обходити блокування GitHub з використанням jsdlitr, може викликати затримку оновлень на кілька днів.</string>
+    <string name="watch_quality_pref_data">Бажана якість перегляду (Мобільні дані)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 9e2d6137..626cc0fe 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -571,4 +571,9 @@
     <string name="subscription_episode_released">第 %d 集已发布！</string>
     <string name="test_passed">成功</string>
     <string name="test_log">日志</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com 代理</string>
+    <string name="jsdelivr_enabled">连接 Github 失败，正在启用 jsdelivr 代理。</string>
+    <string name="jsdelivr_proxy_summary">使用 jsdelivr 绕过对 Github 的封锁，可能导致更新延迟几天。</string>
+    <string name="pref_category_bypass">ISP 绕过</string>
+    <string name="revert">还原</string>
 </resources>
\ No newline at end of file

From d6df24eff2d425fc79e52b94a1fe600f857ec19a Mon Sep 17 00:00:00 2001
From: Stormunblessed <86633626+Stormunblessed@users.noreply.github.com>
Date: Mon, 27 Feb 2023 14:05:42 -0600
Subject: [PATCH 247/273] Fixes on filesim and added filemoon, ztreamhub (#397)

* fix fastream, tomatomatela, and added okrulink

* forgot this

* sendvid extractor

* sendvid extractor

* fixes

* Filesim fix, added filemoon and ztreamhub
---
 .../cloudstream3/extractors/Filesim.kt        | 45 +++++++++----------
 .../cloudstream3/utils/ExtractorApi.kt        |  1 +
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
index 382ca756..84fd0552 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
@@ -1,13 +1,15 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import java.net.URI
+import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
 
+
+class Ztreamhub : Filesim() {
+    override val mainUrl: String = "https://ztreamhub.com" //Here 'cause works
+    override val name = "Zstreamhub"
+}
 class FileMoon : Filesim() {
     override val mainUrl = "https://filemoon.to"
     override val name = "FileMoon"
@@ -29,34 +31,27 @@ open class Filesim : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        with(app.get(url).document) {
-            this.select("script").forEach { script ->
-                if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
-                    val data = getAndUnpack(script.data())
-                    val foundData = Regex("""sources:\[(.*?)]""").find(data)?.groupValues?.get(1) ?: return@forEach
-                    val fixedData = foundData.replace("file:", """"file":""")
-
-                    parseJson<List<ResponseSource>>("[$fixedData]").forEach {
-                        callback.invoke(
-                            ExtractorLink(
-                                name,
-                                name,
-                                it.file,
-                                "$mainUrl/",
-                                Qualities.Unknown.value,
-                                URI(it.file).path.endsWith(".m3u8")
-                            )
-                        )
-                    }
+        val response = app.get(url, referer = mainUrl).document
+        response.select("script[type=text/javascript]").map { script ->
+            if (script.data().contains(Regex("eval\\(function\\(p,a,c,k,e,[rd]"))) {
+                val unpackedscript = getAndUnpack(script.data())
+                val m3u8Regex = Regex("file.\\\"(.*?m3u8.*?)\\\"")
+                val m3u8 = m3u8Regex.find(unpackedscript)?.destructured?.component1() ?: ""
+                if (m3u8.isNotEmpty()) {
+                    generateM3u8(
+                        name,
+                        m3u8,
+                        mainUrl
+                    ).forEach(callback)
                 }
             }
         }
     }
 
-    private data class ResponseSource(
+   /* private data class ResponseSource(
         @JsonProperty("file") val file: String,
         @JsonProperty("type") val type: String?,
         @JsonProperty("label") val label: String?
-    )
+    ) */
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 6540b8c4..0bced6b2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -370,6 +370,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Cda(),
     Dailymotion(),
     ByteShare(),
+    Ztreamhub()
 )
 
 

From ab324b93e89b2e955436d7ec2099b3256cb0d005 Mon Sep 17 00:00:00 2001
From: no-commit <>
Date: Tue, 28 Feb 2023 01:19:59 +0100
Subject: [PATCH 248/273] Small fixes to Intents and Subscriptions

---
 .../lagradost/cloudstream3/MainActivity.kt    |  6 ++++-
 .../services/SubscriptionWorkManager.kt       | 22 ++++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index e626dcd6..a7449255 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -319,7 +319,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                     } else if (safeURI(str)?.scheme == appStringSearch) {
                         nextSearchQuery =
                             URLDecoder.decode(str.substringAfter("$appStringSearch://"), "UTF-8")
-                        nav_view.selectedItemId = R.id.navigation_search
+
+                        // Use both navigation views to support both layouts.
+                        // It might be better to use the QuickSearch.
+                        nav_view?.selectedItemId = R.id.navigation_search
+                        nav_rail_view?.selectedItemId = R.id.navigation_search
                     } else if (safeURI(str)?.scheme == appStringResumeWatching) {
                         val id =
                             str.substringAfter("$appStringResumeWatching://").toIntOrNull()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt b/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt
index d1b1b660..adf5abfa 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt
@@ -105,14 +105,12 @@ class SubscriptionWorkManager(val context: Context, workerParams: WorkerParamete
             SUBSCRIPTION_CHANNEL_DESCRIPTION
         )
 
-        safeApiCall {
-            setForeground(
-                ForegroundInfo(
-                    SUBSCRIPTION_NOTIFICATION_ID,
-                    progressNotificationBuilder.build()
-                )
+        setForeground(
+            ForegroundInfo(
+                SUBSCRIPTION_NOTIFICATION_ID,
+                progressNotificationBuilder.build()
             )
-        }
+        )
 
         val subscriptions = getAllSubscriptions()
 
@@ -196,7 +194,15 @@ class SubscriptionWorkManager(val context: Context, workerParams: WorkerParamete
                             PendingIntent.getActivity(context, 0, intent, 0)
                         }
 
-                    val poster = ioWork { savedData.posterUrl?.let { url -> context.getImageBitmapFromUrl(url, savedData.posterHeaders) } }
+                    val poster = ioWork {
+                        savedData.posterUrl?.let { url ->
+                            context.getImageBitmapFromUrl(
+                                url,
+                                savedData.posterHeaders
+                            )
+                        }
+                    }
+
                     val updateNotification =
                         updateNotificationBuilder.setContentTitle(updateHeader)
                             .setContentText(updateDescription)

From f0515c4dc9e38bcf80f9766e7dff9f9ffd802f72 Mon Sep 17 00:00:00 2001
From: Stormunblessed <86633626+Stormunblessed@users.noreply.github.com>
Date: Fri, 3 Mar 2023 09:24:02 +0000
Subject: [PATCH 249/273] Support qualities for Dailymotion (#407)

* Dailymotion qualities
---
 .../cloudstream3/extractors/Dailymotion.kt    | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Dailymotion.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Dailymotion.kt
index 125e4bcf..4b7cb19f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Dailymotion.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Dailymotion.kt
@@ -6,6 +6,7 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
 import com.lagradost.cloudstream3.utils.Qualities
 import java.net.URL
 
@@ -42,18 +43,9 @@ open class Dailymotion : ExtractorApi() {
         )
         val metaData = app.get(metaDataUrl, referer = embedUrl, cookies = cookies)
             .parsedSafe<MetaData>() ?: return
-        metaData.qualities.forEach { (key, video) ->
+        metaData.qualities.forEach { (_, video) ->
             video.forEach {
-                callback.invoke(
-                    ExtractorLink(
-                        name,
-                        "$name $key",
-                        it.url,
-                        "",
-                        Qualities.Unknown.value,
-                        true
-                    )
-                )
+                getStream(it.url, this.name, callback)
             }
         }
     }
@@ -75,6 +67,17 @@ open class Dailymotion : ExtractorApi() {
         return null
     }
 
+    private suspend fun getStream(
+        streamLink: String,
+        name: String,
+        callback: (ExtractorLink) -> Unit
+    )  {
+        return generateM3u8(
+            name,
+            streamLink,
+            "",
+        ).forEach(callback)
+    }
     data class Config(
         val context: Context,
         val dmInternalData: InternalData

From 76545f55c3efeb66e14c6a4c62d2c980adf51830 Mon Sep 17 00:00:00 2001
From: no-commit <>
Date: Fri, 3 Mar 2023 17:45:26 +0100
Subject: [PATCH 250/273] Standardized some home screen padding and made
 subtitle delay persistent. Fixes #405

---
 .../ui/player/FullScreenPlayer.kt             | 10 +++++++
 .../cloudstream3/ui/player/GeneratorPlayer.kt | 29 +++++++++----------
 .../main/res/layout/fragment_home_head.xml    | 28 +++++++-----------
 app/src/main/res/layout/homepage_parent.xml   |  2 --
 4 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index d1b2814d..86e21fd6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -84,6 +84,7 @@ const val HORIZONTAL_MULTIPLIER = 2.0f
 const val DOUBLE_TAB_MAXIMUM_HOLD_TIME = 200L
 const val DOUBLE_TAB_MINIMUM_TIME_BETWEEN = 200L    // this also affects the UI show response time
 const val DOUBLE_TAB_PAUSE_PERCENTAGE = 0.15        // in both directions
+private const val SUBTITLE_DELAY_BUNDLE_KEY = "subtitle_delay"
 
 // All the UI Logic for the player
 open class FullScreenPlayer : AbstractPlayerFragment() {
@@ -1120,11 +1121,20 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         resetRewindText()
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        // As this is video specific it is better to not do any setKey/getKey
+        outState.putLong(SUBTITLE_DELAY_BUNDLE_KEY, subtitleDelay)
+        super.onSaveInstanceState(outState)
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         // init variables
         setPlayBackSpeed(getKey(PLAYBACK_SPEED_KEY) ?: 1.0f)
+        savedInstanceState?.getLong(SUBTITLE_DELAY_BUNDLE_KEY)?.let {
+            subtitleDelay = it
+        }
 
         // handle tv controls
         playerEventListener = { eventType ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 67f58195..46f2bca9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -13,7 +13,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.*
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
 import androidx.core.animation.addListener
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
@@ -734,19 +733,17 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
                 val currentAudioTracks = tracks.allAudioTracks
 
-                val trackBuilder = AlertDialog.Builder(ctx, R.style.AlertDialogCustomBlack)
-                    .setView(R.layout.player_select_tracks)
-
-                val tracksDialog = trackBuilder.create()
+                val trackDialog = Dialog(ctx, R.style.AlertDialogCustomBlack)
+                trackDialog.setContentView(R.layout.player_select_tracks)
+                trackDialog.show()
 
 //                selectTracksDialog = tracksDialog
 
-                tracksDialog.show()
-                val videosList = tracksDialog.video_tracks_list
-                val audioList = tracksDialog.auto_tracks_list
+                val videosList = trackDialog.video_tracks_list
+                val audioList = trackDialog.auto_tracks_list
 
-                tracksDialog.video_tracks_holder.isVisible = currentVideoTracks.size > 1
-                tracksDialog.audio_tracks_holder.isVisible = currentAudioTracks.size > 1
+                trackDialog.video_tracks_holder.isVisible = currentVideoTracks.size > 1
+                trackDialog.audio_tracks_holder.isVisible = currentAudioTracks.size > 1
 
                 fun dismiss() {
                     if (isPlaying) {
@@ -781,7 +778,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     videosList.setItemChecked(which, true)
                 }
 
-                tracksDialog.setOnDismissListener {
+                trackDialog.setOnDismissListener {
                     dismiss()
 //                    selectTracksDialog = null
                 }
@@ -811,11 +808,11 @@ class GeneratorPlayer : FullScreenPlayer() {
                     audioList.setItemChecked(which, true)
                 }
 
-                tracksDialog.cancel_btt?.setOnClickListener {
-                    tracksDialog.dismissSafe(activity)
+                trackDialog.cancel_btt?.setOnClickListener {
+                    trackDialog.dismissSafe(activity)
                 }
 
-                tracksDialog.apply_btt?.setOnClickListener {
+                trackDialog.apply_btt?.setOnClickListener {
                     val currentTrack = currentAudioTracks.getOrNull(audioIndexStart)
                     player.setPreferredAudioTrack(
                         currentTrack?.language, currentTrack?.id
@@ -828,7 +825,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                         player.setMaxVideoSize(width, height, currentVideo?.id)
                     }
 
-                    tracksDialog.dismissSafe(activity)
+                    trackDialog.dismissSafe(activity)
                 }
             }
         } catch (e: Exception) {
@@ -1145,7 +1142,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         val source = currentSelectedLink?.first?.name ?: currentSelectedLink?.second?.name ?: "NULL"
 
-         val title = when (titleRez) {
+        val title = when (titleRez) {
             0 -> ""
             1 -> extra
             2 -> source
diff --git a/app/src/main/res/layout/fragment_home_head.xml b/app/src/main/res/layout/fragment_home_head.xml
index 0ee50042..603621f7 100644
--- a/app/src/main/res/layout/fragment_home_head.xml
+++ b/app/src/main/res/layout/fragment_home_head.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/home_header"
     android:layout_width="match_parent"
@@ -86,7 +85,6 @@
             android:gravity="center"
             android:orientation="vertical">
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -115,7 +113,6 @@
                     style="@style/WhiteButton"
                     android:layout_width="wrap_content"
                     android:layout_gravity="center"
-
                     android:text="@string/home_play"
                     app:icon="@drawable/ic_baseline_play_arrow_24" />
 
@@ -148,17 +145,16 @@
 
         <TextView
             android:id="@+id/home_watch_parent_item_title"
-
             style="@style/WatchHeaderText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="0dp"
+            android:background="?android:attr/selectableItemBackground"
+            android:contentDescription="@string/home_more_info"
             android:padding="12dp"
             android:text="@string/continue_watching"
             app:drawableRightCompat="@drawable/ic_baseline_arrow_forward_24"
-            app:drawableTint="?attr/white"
-            android:background="?android:attr/selectableItemBackground"
-            android:contentDescription="@string/home_more_info"/>
+            app:drawableTint="?attr/white" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/home_watch_child_recyclerview"
@@ -167,7 +163,7 @@
             android:clipToPadding="false"
             android:descendantFocusability="afterDescendants"
             android:orientation="horizontal"
-            android:paddingEnd="5dp"
+            android:paddingHorizontal="5dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:listitem="@layout/home_result_grid" />
 
@@ -184,9 +180,9 @@
         <FrameLayout
             android:id="@+id/home_bookmark_parent_item_title"
 
-            android:background="?android:attr/selectableItemBackground"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:background="?android:attr/selectableItemBackground">
 
             <HorizontalScrollView
                 android:layout_width="match_parent"
@@ -262,14 +258,13 @@
             </HorizontalScrollView>
 
             <ImageView
-                android:layout_marginEnd="12dp"
-                android:layout_gravity="end"
-
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:layout_gravity="end"
+                android:layout_marginEnd="12dp"
+                android:contentDescription="@string/home_more_info"
                 android:src="@drawable/ic_baseline_arrow_forward_24"
-                app:drawableTint="?attr/white"
-                android:contentDescription="@string/home_more_info"/>
+                app:drawableTint="?attr/white" />
         </FrameLayout>
 
         <androidx.recyclerview.widget.RecyclerView
@@ -277,10 +272,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:clipToPadding="false"
-
             android:descendantFocusability="afterDescendants"
             android:orientation="horizontal"
-            android:paddingEnd="5dp"
+            android:paddingHorizontal="5dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:listitem="@layout/home_result_grid" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/homepage_parent.xml b/app/src/main/res/layout/homepage_parent.xml
index b2f3e0a7..9c5dc84d 100644
--- a/app/src/main/res/layout/homepage_parent.xml
+++ b/app/src/main/res/layout/homepage_parent.xml
@@ -23,9 +23,7 @@
             android:nextFocusUp="@id/home_child_more_info"
             android:paddingHorizontal="5dp"
             android:clipToPadding="false"
-
             android:descendantFocusability="afterDescendants"
-
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             android:id="@+id/home_child_recyclerview"
             android:orientation="horizontal"

From 1eaa4620dc7ec00d34486d1e6ce6a7a1c38afe77 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Thu, 2 Mar 2023 05:38:39 +0100
Subject: [PATCH 251/273] Translated using Weblate (qt (generated) (qt))

Currently translated at 54.5% (333 of 610 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (French)

Currently translated at 98.8% (603 of 610 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (German)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Russian)

Currently translated at 99.6% (608 of 610 strings)

Translated using Weblate (Portuguese)

Currently translated at 85.0% (519 of 610 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Vietnamese)

Currently translated at 96.8% (591 of 610 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (610 of 610 strings)

Co-authored-by: Anarchydr <patrikpik879@gmail.com>
Co-authored-by: Cliff Heraldo <123844876+clxf12@users.noreply.github.com>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Duc Nguyen Tien <ducnt123@gmail.com>
Co-authored-by: Felipe Nogueira <contato.fnog@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Julian <hello@apollo.moe>
Co-authored-by: Massimo Pissarello <mapi68@gmail.com>
Co-authored-by: Samuel Gadiel <samuelgadiel@gmail.com>
Co-authored-by: Sdarfeesh <Sdarfeesh@protonmail.com>
Co-authored-by: Walter H <walter75@gmail.com>
Co-authored-by: eightyy8 <oliver.kha@pm.me>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/qt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translation: Cloudstream/App
---
 app/src/main/res/values-de/strings.xml |   2 +-
 app/src/main/res/values-es/strings.xml |   8 +-
 app/src/main/res/values-fr/strings.xml |  17 +-
 app/src/main/res/values-hr/strings.xml |   1 +
 app/src/main/res/values-in/strings.xml |   3 +-
 app/src/main/res/values-it/strings.xml |   3 +-
 app/src/main/res/values-pl/strings.xml |   3 +-
 app/src/main/res/values-pt/strings.xml | 217 +++++++++++++++++++------
 app/src/main/res/values-qt/strings.xml |  29 ++++
 app/src/main/res/values-ru/strings.xml |  13 +-
 app/src/main/res/values-vi/strings.xml |  23 ++-
 app/src/main/res/values-zh/strings.xml |   3 +-
 12 files changed, 254 insertions(+), 68 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c5e74a60..7cf49de1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -246,7 +246,7 @@
     <string name="episode_action_play_in_browser">In Browser wiedergeben</string>
     <string name="episode_action_copy_link">Link kopieren</string>
     <string name="episode_action_auto_download">Auto-Download</string>
-    <string name="episode_action_download_mirror">Download-Mirror</string>
+    <string name="episode_action_download_mirror">Alternativer Download</string>
     <string name="episode_action_reload_links">Links neu laden</string>
     <string name="episode_action_download_subtitle">Untertitel herunterladen</string>
     <string name="show_hd">Qualitätsanzeige</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 18647ef8..0b195275 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -506,11 +506,11 @@
 \nInicia sesión en una cuenta de biblioteca o añade series desde tu biblioteca local</string>
     <string name="safe_mode_file">¡Se encontró un archivo en modo seguro!
 \nNo cargar ninguna extensión al inicio hasta que se elimine el archivo.</string>
-    <string name="android_tv_interface_on_seek_settings">Jugadora mostrada - buscar cantidad</string>
-    <string name="android_tv_interface_off_seek_settings">Jugadora oculta - buscar cantidad</string>
+    <string name="android_tv_interface_on_seek_settings">Reproductor visible - buscar cantidad</string>
+    <string name="android_tv_interface_off_seek_settings">Reproductor oculto - buscar cantidad</string>
     <string name="pref_category_android_tv">Android TV</string>
-    <string name="android_tv_interface_on_seek_settings_summary">La cantidad de búsqueda utilizada cuando la jugadora es visible</string>
-    <string name="android_tv_interface_off_seek_settings_summary">La cantidad de búsqueda utilizada cuando el jugador está oculto</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Tiempo de búsqueda usado (en segundos) cuando el reproductor está visible</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Tiempo de búsqueda usado (en segundos) cuando el reproductor está oculto</string>
     <string name="stop">Parar</string>
     <string name="test_failed">Falló</string>
     <string name="test_log">Registro</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 18255b3b..f3d35c19 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -130,7 +130,7 @@
     <string name="new_update_format" formatted="true">Nouvelle mise à jour trouvée !
 \n%s -&gt; %s</string>
     <string name="filler" formatted="true">Épisode spécial</string>
-    <string name="watch_quality_pref">Qualité de visionnage préférée</string>
+    <string name="watch_quality_pref">Qualité de visionnage préférée (WiFi)</string>
     <string name="video_buffer_size_settings">Taille de la mémoire cache</string>
     <string name="resize_fill">Étendre</string>
     <string name="legal_notice">Non-responsabilité</string>
@@ -508,4 +508,19 @@
     <string name="sort_updated_old">Mis à jour (ancien vers nouveau)</string>
     <string name="safe_mode_file">Fichier du mode sans échec trouvé !
 \nAucune extension ne sera chargée au démarrage avant que le fichier ne soit enlevé.</string>
+    <string name="stop">Arrêter</string>
+    <string name="revert">Revenir à</string>
+    <string name="test_log">Enregistrer</string>
+    <string name="watch_quality_pref_data">Qualité de visionnage préférée (données mobiles)</string>
+    <string name="subscription_new">Abonné à %s</string>
+    <string name="start">Démarrer</string>
+    <string name="category_provider_test">Test des fournisseurs</string>
+    <string name="test_passed">Réussi</string>
+    <string name="subscription_deleted">Désabonné de %s</string>
+    <string name="restart">Redémarrer</string>
+    <string name="subscription_list_name">Abonné</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
+    <string name="pref_category_bypass">Contournements de FAI</string>
+    <string name="subscription_episode_released">L\'épisode %d est sorti !</string>
+    <string name="test_failed">Échouer</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index b623ec5d..159542cc 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -553,4 +553,5 @@
     <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
     <string name="jsdelivr_enabled">Neuspješno dohvaćanje GitHuba, omogućavanje jsdelivr proxyja.</string>
     <string name="jsdelivr_proxy_summary">Zaobilazi blokiranje GitHuba pomoću jsdelivr, može uzrokovati odgode ažuriranja za nekoliko dana.</string>
+    <string name="watch_quality_pref_data">Preferirana kvaliteta gledanja (podatkovna mobilna mreža)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 84179352..0e383562 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -243,7 +243,7 @@
     <string name="dont_show_again">Jangan tunjukkan lagi</string>
     <string name="skip_update">Skip Update ini</string>
     <string name="update">Update</string>
-    <string name="watch_quality_pref">Kualitas tontonan yang lebih diinginkan</string>
+    <string name="watch_quality_pref">Kualitas tontonan yang lebih diinginkan (WIFI)</string>
     <string name="limit_title">Karakter maksimal judul pemutar video</string>
     <string name="limit_title_rez">Resolusi pemutar video</string>
     <string name="video_buffer_size_settings">Ukuran buffer video</string>
@@ -551,4 +551,5 @@
     <string name="jsdelivr_proxy_summary">Bypass pemblokiran Github menggunakan JSDeliVR, dapat menyebabkan pembaruan tertunda beberapa hari.</string>
     <string name="pref_category_bypass">Bypass ISP</string>
     <string name="revert">Pulihkan</string>
+    <string name="watch_quality_pref_data">Nonton dengan kualitas yang di inginkan (Data Seluler)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d6bdc204..b8e7eb20 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -265,7 +265,7 @@
     <string name="dont_show_again">Non mostrare di nuovo</string>
     <string name="skip_update">Salta questo aggiornamento</string>
     <string name="update">Aggiorna</string>
-    <string name="watch_quality_pref">Risoluzione preferita</string>
+    <string name="watch_quality_pref">Qualità di visualizzazione preferita (WiFi)</string>
     <string name="limit_title">Limita i caratteri del titolo nel player</string>
     <string name="limit_title_rez">Risoluzione video player</string>
     <string name="video_buffer_size_settings">Dimensione cache video</string>
@@ -550,4 +550,5 @@
     <string name="revert">Ripristina</string>
     <string name="subscription_in_progress_notification">Aggiornando shows a cui sei iscritto</string>
     <string name="subscription_episode_released">L\'episodio %d è stato rilasciato!</string>
+    <string name="watch_quality_pref_data">Qualità di visualizzazione preferita (Dati mobili)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index bbaaec57..558a46ed 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -254,7 +254,7 @@
     <string name="dont_show_again">Nie pokazuj ponownie</string>
     <string name="skip_update">Pomiń tę aktualizację</string>
     <string name="update">Aktualizacja</string>
-    <string name="watch_quality_pref">Domyślna jakość</string>
+    <string name="watch_quality_pref">Domyślna jakość (WiFi)</string>
     <string name="limit_title">Maksymalna ilość znaków w tytule odtwarzacza</string>
     <string name="limit_title_rez">Rozdzielczość odtwarzacza wideo</string>
     <string name="video_buffer_size_settings">Rozmiar bufora wideo</string>
@@ -531,4 +531,5 @@
     <string name="subscription_episode_released">Został wydany odcinek %d!</string>
     <string name="jsdelivr_proxy_summary">Obchodzi blokadę GitHuba za pomocą jsdelivr, może spowodować opóźnienie aktualizacji o kilka dni.</string>
     <string name="jsdelivr_enabled">Nie udało się połączyć z GitHub, włączono serwer pośredniczący jsdelivr.</string>
+    <string name="watch_quality_pref_data">Domyślna jakość (dane mobilne)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 3754de8b..0c846361 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -3,63 +3,63 @@
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-    <string name="next_episode_format" formatted="true">Episódio %d será lançado em</string>
+    <string name="next_episode_format" formatted="true">O episódio %d será lançado em</string>
     <string name="result_poster_img_des">Poster</string>
-    <string name="episode_poster_img_des">Capa do Episódio</string>
+    <string name="episode_poster_img_des">Pôster do episódio</string>
     <string name="search_poster_img_des">Poster</string>
-    <string name="home_main_poster_img_des">Capa Principal</string>
+    <string name="home_main_poster_img_des">Pôster Principal</string>
     <string name="home_next_random_img_des">Próximo Aleatório</string>
     <string name="go_back_img_des">Voltar</string>
-    <string name="home_change_provider_img_des">Trocar Provedor</string>
-    <string name="next_episode_time_day_format" formatted="true">%d dia(s), %d hora(s) e %d mese(s)</string>
+    <string name="home_change_provider_img_des">Alterar Provedor</string>
+    <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="home_source">Fonte</string>
     <string name="resolution">Resolução</string>
     <string name="extras">Extras</string>
-    <string name="preview_background_img_des">Preview Background</string>
+    <string name="preview_background_img_des">Visualizar plano de fundo</string>
     <string name="player_speed_text_format" formatted="true">Velocidade (%.2fx)</string>
     <string name="rated_format" formatted="true">Classificado: %.1f</string>
     <string name="new_update_format" formatted="true">Nova atualização encontrada!
 \n%s -&gt; %s</string>
-    <string name="filler" formatted="true">Enchimento</string>
+    <string name="filler" formatted="true">Preenchimento</string>
     <string name="app_name">CloudStream</string>
-    <string name="play_with_app_name">Reproduzir com CloudStream</string>
+    <string name="play_with_app_name">Assistir com o CloudStream</string>
     <string name="title_home">Início</string>
-    <string name="title_search">Pesquisa</string>
-    <string name="title_downloads">Transferências</string>
-    <string name="title_settings">Opções</string>
+    <string name="title_search">Pesquisar</string>
+    <string name="title_downloads">Downloads</string>
+    <string name="title_settings">Configurações</string>
     <string name="search_hint">Procurar…</string>
-    <string name="search_hint_site" formatted="true">Procurar em %s…</string>
-    <string name="no_data">Sem Dados</string>
-    <string name="episode_more_options_des">Mais Opções</string>
+    <string name="search_hint_site" formatted="true">Pesquisar %s…</string>
+    <string name="no_data">Sem dados</string>
+    <string name="episode_more_options_des">Mais opções</string>
     <string name="next_episode">Próximo episódio</string>
-    <string name="result_tags">Géneros</string>
-    <string name="result_share">Partilhar</string>
-    <string name="result_open_in_browser">Abrir no Navegador</string>
-    <string name="skip_loading">Saltar Carga</string>
+    <string name="result_tags">Gêneros</string>
+    <string name="result_share">Compartilhar</string>
+    <string name="result_open_in_browser">Abrir no navegador</string>
+    <string name="skip_loading">Pular carregamento</string>
     <string name="loading">Carregando…</string>
     <string name="type_watching">Assistindo</string>
-    <string name="type_on_hold">Em Espera</string>
+    <string name="type_on_hold">Em espera</string>
     <string name="type_completed">Concluído</string>
-    <string name="type_dropped">Abandonado</string>
-    <string name="type_plan_to_watch">Planeio Assistir</string>
-    <string name="type_none">Nenhuma</string>
-    <string name="type_re_watching">Assistindo de Novo</string>
-    <string name="play_movie_button">Reproduzir Filme</string>
-    <string name="play_livestream_button">Reproduzir Livestream</string>
+    <string name="type_dropped">Desistido</string>
+    <string name="type_plan_to_watch">Pretendo assistir</string>
+    <string name="type_none">Nenhum</string>
+    <string name="type_re_watching">Reassistindo</string>
+    <string name="play_movie_button">Reproduzir filme</string>
+    <string name="play_livestream_button">Reproduzir transmissão ao vivo</string>
     <string name="play_torrent_button">Transmitir Torrent</string>
     <string name="pick_source">Fontes</string>
     <string name="pick_subtitle">Legendas</string>
-    <string name="reload_error">Voltar a tentar ligação…</string>
-    <string name="go_back">Voltar Atrás</string>
-    <string name="play_episode">Reproduzir Episódio</string>
-    <string name="download">Transferir</string>
-    <string name="downloaded">Transferido</string>
-    <string name="downloading">A Transferir</string>
-    <string name="download_paused">Transferência em Pausa</string>
-    <string name="download_started">Transferência Iniciada</string>
-    <string name="download_failed">Transferência Falhou</string>
-    <string name="download_canceled">Transferência Cancelada</string>
-    <string name="download_done">Transferência Completa</string>
+    <string name="reload_error">Tentar conexão novamente…</string>
+    <string name="go_back">Voltar</string>
+    <string name="play_episode">Reproduzir episódio</string>
+    <string name="download">Download</string>
+    <string name="downloaded">Baixado</string>
+    <string name="downloading">Baixando</string>
+    <string name="download_paused">Download Pausado</string>
+    <string name="download_started">Download Iniciado</string>
+    <string name="download_failed">Falha no Download</string>
+    <string name="download_canceled">Download cancelado</string>
+    <string name="download_done">Download concluído</string>
     <string name="stream">Stream</string>
     <string name="error_loading_links_toast">Erro a Carregar Links</string>
     <string name="download_storage_text">Armazenamento Interno</string>
@@ -142,7 +142,7 @@
     <string name="restore_success">Arquivo de backup carregado</string>
     <string name="restore_failed_format" formatted="true">Falha ao restaurar dados do ficheiro %s</string>
     <string name="backup_success">Dados guardados com sucesso</string>
-    <string name="backup_failed">Permissões de armazenamento em falta, por favor tente de novo</string>
+    <string name="backup_failed">Permissão de armazenamento não encontrada, por favor tente novamente.</string>
     <string name="backup_failed_error_format">Erro no backup de %s</string>
     <string name="search">Procurar</string>
     <string name="category_account">Contas</string>
@@ -250,15 +250,15 @@
     <string name="dont_show_again">Não mostrar de novo</string>
     <string name="skip_update">Saltar esta Atualização</string>
     <string name="update">Atualizar</string>
-    <string name="watch_quality_pref">Qualidade Preferida</string>
-    <string name="limit_title">Máximo de caracteres do título de vídeos</string>
+    <string name="watch_quality_pref">Qualidade Preferida (WiFi)</string>
+    <string name="limit_title">Máximo de caracteres do título no player de video</string>
     <string name="limit_title_rez">Resolução do player de vídeo</string>
     <string name="video_buffer_size_settings">Tamanho do buffer do vídeo</string>
     <string name="video_buffer_length_settings">Comprimento do buffer do vídeo</string>
     <string name="video_buffer_disk_settings">Cache do vídeo em disco</string>
     <string name="video_buffer_clear_settings">Limpar cache de vídeo e imagem</string>
-    <string name="video_ram_description">Causará travamentos aleatórios se definido muito alto. Não mude se tiver pouca memória RAM, como um Android TV ou um telefone antigo</string>
-    <string name="video_disk_description">Pode causar problemas em sistemas com pouco espaço de armazenamento se definido muito alto, como em dispositivos Android TV</string>
+    <string name="video_ram_description">Causará travamentos em dispositivos com pouca memória se definido muito alto , como uma Android TV.</string>
+    <string name="video_disk_description">Pode causar problemas em sistemas com pouco espaço de armazenamento se definido muito alto, como uma Android TV.</string>
     <string name="dns_pref">DNS sobre HTTPS</string>
     <string name="dns_pref_summary">Útil para contornar bloqueios do fornecedor de internet</string>
     <string name="add_site_pref">Clonar site</string>
@@ -363,7 +363,7 @@
     <string name="plugin_loaded">Plugin Carregado</string>
     <string name="plugin_deleted">Plugin Apagado</string>
     <string name="plugin_load_fail" formatted="true">Falha ao carregar %s</string>
-    <string name="batch_download_start_format" formatted="true">Iniciada a transferência %d %s</string>
+    <string name="batch_download_start_format" formatted="true">Download iniciado %d %s…</string>
     <string name="batch_download_finish_format" formatted="true">Transferido %d %s com sucesso</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Tudo %s já transferido</string>
     <string name="batch_download">Transferência em batch</string>
@@ -375,18 +375,22 @@
     <string name="plugins_downloaded" formatted="true">Transferido: %d</string>
     <string name="plugins_disabled" formatted="true">Desativado: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Não transferido: %d</string>
-    <string name="blank_repo_message">Adicionar um repositório para instalar extensões de sites</string>
+    <string name="blank_repo_message">O CloudStream não possui sites instalados por padrão. Você precisa instalar os sites a partir de repositórios.
+\n
+\nDevido a uma restrição sem sentido de direitos autorais (DMCA) pela Sky UK Limited 🤮 não podemos vincular o site do repositório no aplicativo.
+\n
+\nJunte-se ao nosso Discord ou pesquise online.</string>
     <string name="view_public_repositories_button">Ver repositórios da comunidade</string>
     <string name="view_public_repositories_button_short">Lista pública</string>
     <string name="uppercase_all_subtitles">Todas as legendas em maiúsculas</string>
     <string name="download_all_plugins_from_repo">Transferir todos os plugins deste repositório\?</string>
     <string name="single_plugin_disabled" formatted="true">%s (Desativado)</string>
     <string name="apk_installer_settings">Instalador APK</string>
-    <string name="duration_format" formatted="true">%d minuto(s)</string>
-    <string name="play_trailer_button">Reproduzir trailer</string>
+    <string name="duration_format" formatted="true">%d min</string>
+    <string name="play_trailer_button">Assistir Trailer</string>
     <string name="action_add_to_bookmarks">Marcar como visto/não visto</string>
     <string name="action_open_play">Reproduzir</string>
-    <string name="automatic_plugin_download_summary">Instalar automaticamente todas as extensões dos repositórios cadastrados.</string>
+    <string name="automatic_plugin_download_summary">Instalar automaticamente todos os plugins ainda não instalados dos repositórios adicionados.</string>
     <string name="automatic_plugin_download">Baixar extensões automaticamente</string>
     <string name="redo_setup_process">Refazer o processo de configuração</string>
     <string name="go_back_30">-30</string>
@@ -394,9 +398,9 @@
     <string name="go_forward_30">+30</string>
     <string name="season_format">%s %d%s</string>
     <string name="cast_format" formatted="true">Elenco: %s</string>
-    <string name="update_started">Atualização em andamento</string>
+    <string name="update_started">Atualização iniciada</string>
     <string name="test_log">Log</string>
-    <string name="apk_installer_settings_des">Alguns aparelhos não possuem suporte para o novo instalador de pacotes. Use a opção legado caso não esteja conseguindo atualizar.</string>
+    <string name="apk_installer_settings_des">Alguns aparelhos não suportam o novo instalador de pacotes. Use a opção legado caso não esteja conseguindo atualizar.</string>
     <string name="episodes_range">%d-%d</string>
     <string name="episode_format" formatted="true">%d %s</string>
     <string name="start">Iniciar</string>
@@ -408,4 +412,121 @@
     <string name="ova_singular">Ova</string>
     <string name="anime_singular">Anime</string>
     <string name="android_tv_interface_on_seek_settings">Player visível - Procurar valor</string>
+    <string name="update_notification_installing">Instalando atualização do app…</string>
+    <string name="confirm_exit_dialog">Você tem certeza que deseja sair\?</string>
+    <string name="extension_version">Versão</string>
+    <string name="skip_type_ed">Encerramento</string>
+    <string name="clear_history">Limpar histórico</string>
+    <string name="skip_type_op">Abertura</string>
+    <string name="no">Não</string>
+    <string name="sort_by">Ordenar por</string>
+    <string name="yes">Sim</string>
+    <string name="update_notification_downloading">Baixando atualização do app…</string>
+    <string name="subscription_episode_released">Episódio %d lançado!</string>
+    <string name="skip_type_creddits">Créditos</string>
+    <string name="extension_description">Descrição</string>
+    <string name="extension_size">Tamanho</string>
+    <string name="stop">Parar</string>
+    <string name="safe_mode_title">Modo seguro ligado</string>
+    <string name="history">Histórico</string>
+    <string name="sort">Ordenar</string>
+    <string name="player_settings_play_in_app">Player interno</string>
+    <string name="extension_authors">Autores</string>
+    <string name="extension_types">Suportado</string>
+    <string name="extension_language">Idioma</string>
+    <string name="extension_install_first">Instalar a extensão primeiro</string>
+    <string name="hls_playlist">Playlist HLS</string>
+    <string name="player_pref">Player de vídeo preferido</string>
+    <string name="extension_status">Estado</string>
+    <string name="pref_category_gestures">Gestos</string>
+    <string name="tracks">Faixas</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_cam">Cam</string>
+    <string name="skip_type_intro">Abertura</string>
+    <string name="select_library">Selecionar Biblioteca</string>
+    <string name="jsdelivr_proxy_summary">Contorna o bloqueio do GitHub ao usar jsdelivr, pode atrasar atualizações em alguns dias.</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="all_languages_preference">Todas as linguagens</string>
+    <string name="sort_updated_new">Atualizado (Novo para Antigo)</string>
+    <string name="subscription_list_name">Inscrito</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="restart">Reiniciar</string>
+    <string name="player_settings_play_in_browser">Navegador Web</string>
+    <string name="sort_updated_old">Atualizado (Antigo para Novo)</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="apk_installer_package_installer">Instalador de pacotes</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="action_remove_from_watched">Remover dos assistidos</string>
+    <string name="update_notification_failed">Não foi possível instalar a nova versão do aplicativo</string>
+    <string name="subscription_deleted">Inscrição cancelada em %s</string>
+    <string name="skip_type_mixed_ed">Final misto</string>
+    <string name="sort_rating_desc">Avaliações (Decrescente)</string>
+    <string name="apply_on_restart">Aplicar ao reiniciar</string>
+    <string name="referer">Referente</string>
+    <string name="android_tv_interface_off_seek_settings">Player oculto - Quantidade de Busca</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
+    <string name="quality_blueray">Blu-ray</string>
+    <string name="pref_category_looks">Aparência</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="is_adult">18+</string>
+    <string name="open_with">Abrir com</string>
+    <string name="category_provider_test">Teste de provedor</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="safe_mode_crash_info">Ver informações sobre falha</string>
+    <string name="app_not_found_error">Aplicativo não encontrado</string>
+    <string name="revert">Reverter</string>
+    <string name="network_adress_example">Link para transmitir</string>
+    <string name="plugin_downloaded">Plugins baixados</string>
+    <string name="plugins_updated" formatted="true">%d plugins atualizados</string>
+    <string name="skip_type_format" formatted="true">Pular %s</string>
+    <string name="skip_type_mixed_op">Abertura mista</string>
+    <string name="sort_alphabetical_z">Alfabético (Z a A)</string>
+    <string name="empty_library_logged_in_message">Parece que esta lista está vazia, tente trocar para outra</string>
+    <string name="subscription_new">Inscrito em %s</string>
+    <string name="quality_4k">4K</string>
+    <string name="video_tracks">Faixas de vídeo</string>
+    <string name="delayed_update_notice">O aplicativo será atualizado ao sair</string>
+    <string name="subscription_in_progress_notification">Atualizando shows inscritos</string>
+    <string name="sort_alphabetical_a">Alfabético (A a Z)</string>
+    <string name="sort_rating_asc">Avaliações (Crescente)</string>
+    <string name="empty_library_no_accounts_message">Parece que a sua biblioteca está vazia :(
+\nFaça login em uma conta de biblioteca ou adicione shows à sua biblioteca local</string>
+    <string name="safe_mode_file">Arquivo de modo de segurança encontrado!
+\nNenhuma extensão será carregada na inicialização do app até que o arquivo seja removido.</string>
+    <string name="pref_category_bypass">Contorno do provedor de serviço de internet (ISP)</string>
+    <string name="pref_category_links">Links</string>
+    <string name="pref_category_player_features">Recursos do Player</string>
+    <string name="pref_category_ui_features">Recursos</string>
+    <string name="pref_category_app_updates">Atualizações de aplicativos</string>
+    <string name="watch_quality_pref_data">Qualidade Preferida (Dados Móveis)</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Quantidade de busca (em segundos) usada quando o player de video está visível</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Quantidade de busca (em segundos) usada quando o player de video está oculto</string>
+    <string name="jsdelivr_enabled">Falha ao conectar com GitHub, ativando proxy jsdelivr.</string>
+    <string name="pref_category_cache">Cache</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="pref_category_subtitles">Legendas</string>
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
+    <string name="quality_hq">HQ</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_tc">TC</string>
+    <string name="quality_webrip">Web</string>
+    <string name="extension_rating" formatted="true">Nota: %s</string>
+    <string name="apk_installer_legacy">Legado</string>
+    <string name="safe_mode_description">Todas as extensões foram desativadas devido a uma falha para ajudá-lo a encontrar a que está causando o problema.</string>
+    <string name="skip_type_recap">Recapitular</string>
+    <string name="enable_skip_op_from_database_des">Mostrar pop-ups para pular abertura/encerramento</string>
+    <string name="clipboard_too_large">Muito texto. Não é possível salvar na área de transferência.</string>
+    <string name="action_mark_as_watched">Marcar como assistido</string>
+    <string name="pref_category_backup">Backup</string>
+    <string name="pref_category_extensions">Extensões</string>
+    <string name="pref_category_actions">Ações</string>
+    <string name="pref_category_player_layout">Layout</string>
+    <string name="pref_category_defaults">Configurações padrão</string>
+    <string name="quality_sd">SD</string>
+    <string name="audio_tracks">Faixas de áudio</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-qt/strings.xml b/app/src/main/res/values-qt/strings.xml
index c1119bfc..76852ca4 100644
--- a/app/src/main/res/values-qt/strings.xml
+++ b/app/src/main/res/values-qt/strings.xml
@@ -219,4 +219,33 @@
     <string name="sort_copy">uuuuhhhoouuooog ooaaahhhh</string>
     <string name="sort_close">uuu ugggg</string>
     <string name="sort_clear">ooo guggg ooh</string>
+    <string name="tracks">auuuooohaaaaagh</string>
+    <string name="library">uuuuuuuh aaaoo o</string>
+    <string name="category_updates">ooooooouuuua aa aaagh agh</string>
+    <string name="ova">AAAAUUUOH</string>
+    <string name="subscription_list_name">aoughoooaaaa</string>
+    <string name="movies_singular">oooouuuh</string>
+    <string name="category_player">ahaough aaouuuuh-h</string>
+    <string name="tv_series_singular">auughooo</string>
+    <string name="pref_category_player_layout">ooooooa aauoh</string>
+    <string name="subs_subtitle_languages">aaaaagh oouoo aaaaaaa</string>
+    <string name="category_account">aaaaaagh uuohuoh</string>
+    <string name="extensions">aaaaaauo agghhhhhhaoouu</string>
+    <string name="others">uuuuuuuuh</string>
+    <string name="test_log">ouaaahh</string>
+    <string name="subs_import_text" formatted="true">ooough aaoough aooou %s aaaa</string>
+    <string name="documentaries">ouooooouuuu oooooo</string>
+    <string name="livestreams">aaaaaaaaaaahhhgh-aooohoooo</string>
+    <string name="pref_category_extensions">aau aooooghaao</string>
+    <string name="provider_info_meta">aagh aaaaaaaaaaaa oooh, aaough, ooga oguuu aaaaaaaaaaa ooooooohghh a-a-aaauo</string>
+    <string name="resume_time_left" formatted="true">%dmmmmmm..
+\naaaaooughugh</string>
+    <string name="asian_drama">aooohuohaaaa ooooagh</string>
+    <string name="subtitle_offset">oooooogh-aaaaaogh</string>
+    <string name="trailer">guuuaaaahhhhhhhaaa</string>
+    <string name="show_log_cat">woooaaahh ahahaaaauu 🦍</string>
+    <string name="nsfw">AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOOOGGAGHAGHAAA</string>
+    <string name="clear_history">aoaaaaaoooghhh</string>
+    <string name="sort_save">oooooh uuaagh</string>
+    <string name="action_open_play">\@string/home_play</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2812667a..e613cee4 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -318,7 +318,7 @@
     <string name="skip_type_creddits">Титры</string>
     <string name="action_mark_as_watched">Отметить как просмотренное</string>
     <string name="limit_title_rez">Разрешение видеоплеера</string>
-    <string name="watch_quality_pref">Желаемое качество видео</string>
+    <string name="watch_quality_pref">Предпочтительное качество видео (WiFi)</string>
     <string name="limit_title">Максимум символов</string>
     <string name="video_buffer_length_settings">Длинна буфера</string>
     <string name="video_buffer_disk_settings">Кеш видео на диске</string>
@@ -518,4 +518,15 @@
     <string name="test_failed">Неудачный</string>
     <string name="stop">Прекратить</string>
     <string name="restart">Перезапустить</string>
+    <string name="revert">Вернуться</string>
+    <string name="subscription_new">Подписался на %s</string>
+    <string name="watch_quality_pref_data">Предпочтительное качество видео (Мобильный интернет)</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com Прокси-сервер</string>
+    <string name="jsdelivr_enabled">Не удалось подключиться к GitHub. Будет выполнен прокси jsdelivr.</string>
+    <string name="subscription_episode_released">Эпизод %d выпущен!</string>
+    <string name="pref_category_bypass">Обходы провайдера</string>
+    <string name="subscription_in_progress_notification">Обновление подписки на фильмы и сериалы</string>
+    <string name="jsdelivr_proxy_summary">Обход ограничения доступа к GitHub с помощью jsdelivr может задержать обновления на несколько дней.</string>
+    <string name="subscription_list_name">Подписные</string>
+    <string name="subscription_deleted">Отказались от подписки на %s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index db647b5d..59c65916 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -10,7 +10,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Ảnh bìa</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
@@ -260,18 +260,18 @@
     <string name="check_for_update">Kiểm tra cập nhật</string>
     <string name="video_lock">Khóa</string>
     <string name="video_aspect_ratio_resize">Thu Phóng</string>
-    <string name="video_source">Tuỳ chọn</string>
-    <string name="video_skip_op">Tua nhanh</string>
+    <string name="video_source">Nguồn</string>
+    <string name="video_skip_op">Bỏ qua OP</string>
     <string name="dont_show_again">Không hiện lại</string>
-    <string name="skip_update">Bỏ qua</string>
+    <string name="skip_update">Bỏ qua bản cập nhật này</string>
     <string name="update">Cập nhật</string>
-    <string name="watch_quality_pref">Tự động chọn chất lượng phim</string>
+    <string name="watch_quality_pref">Chất lượng xem ưu tiên (WiFi)</string>
     <string name="limit_title">Kí tự tối đa trên tiêu đề</string>
-    <string name="limit_title_rez">Định dạng trình phát</string>
-    <string name="video_buffer_size_settings">Dung lượng video cache</string>
+    <string name="limit_title_rez">Độ phân giải trình phát video</string>
+    <string name="video_buffer_size_settings">Kích thước bộ nhớ đệm video</string>
     <string name="video_buffer_length_settings">Thời lượng bộ nhớ đệm</string>
-    <string name="video_buffer_disk_settings">Dung lượng video cache</string>
-    <string name="video_buffer_clear_settings">Xoá hình ảnh và video</string>
+    <string name="video_buffer_disk_settings">Lưu bộ nhớ đệm video trên ổ cứng</string>
+    <string name="video_buffer_clear_settings">Xoá bộ nhớ đệm hình ảnh và video</string>
     <string name="video_ram_description">Sẽ gây lỗi nếu đặt quá cao trên máy có dung lượng ram thấp như Android TV.</string>
     <string name="video_disk_description">Sẽ gây lỗi nếu đặt quá cao trên máy có dung lượng lưu trữ thấp như Android TV.</string>
     <string name="dns_pref">DNS over HTTPS</string>
@@ -519,4 +519,9 @@
     <string name="empty_library_logged_in_message">Có vẻ như danh sách này trống, hãy thử chuyển sang danh sách khác</string>
     <string name="sort_alphabetical_a">Chữ cái (A đến Z)</string>
     <string name="select_library">Chọn Thư viện</string>
+    <string name="test_log">Nhật ký</string>
+    <string name="watch_quality_pref_data">Chất lượng xem ưu tiên (Dữ liệu di động)</string>
+    <string name="test_failed">Thất bại</string>
+    <string name="test_passed">Thành công</string>
+    <string name="start">Bắt đầu</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 626cc0fe..72d62a04 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -286,7 +286,7 @@
     <string name="dont_show_again">不再显示</string>
     <string name="skip_update">跳过此更新</string>
     <string name="update">更新</string>
-    <string name="watch_quality_pref">首选播放画质</string>
+    <string name="watch_quality_pref">首选播放画质（WiFi）</string>
     <string name="limit_title">视频播放器标题最多字符</string>
     <string name="limit_title_rez">视频播放器标题</string>
     <string name="video_buffer_size_settings">视频缓冲大小</string>
@@ -576,4 +576,5 @@
     <string name="jsdelivr_proxy_summary">使用 jsdelivr 绕过对 Github 的封锁，可能导致更新延迟几天。</string>
     <string name="pref_category_bypass">ISP 绕过</string>
     <string name="revert">还原</string>
+    <string name="watch_quality_pref_data">首选播放画质（移动数据）</string>
 </resources>
\ No newline at end of file

From e85b31c35ddac86e03cfbd495e01a69cedfe56ff Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Tue, 7 Mar 2023 17:36:53 +0100
Subject: [PATCH 252/273] Fixing rouge pixels in settings

---
 app/src/main/res/values/styles.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 78c62c69..b9648162 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -40,7 +40,6 @@
         <!-- Preference -->
         <item name="android:textColor">?attr/textColor</item>
         <item name="android:textColorSecondary">?attr/grayTextColor</item>
-        <item name="android:icon">?attr/grayTextColor</item>
 
         <item name="android:textColorHint">?attr/grayTextColor</item>
         <item name="android:editTextColor">?attr/textColor</item>

From 37244ab0f74392af6861a4f894ebb1a3de77806a Mon Sep 17 00:00:00 2001
From: PokerFace <117321707+pokerface-bad@users.noreply.github.com>
Date: Sat, 11 Mar 2023 02:45:11 +0700
Subject: [PATCH 253/273] Intertal Player: Added MPD support (#402)

* added isDash in ExtractorLink
---
 .../cloudstream3/ui/player/CS3IPlayer.kt      | 10 +++++-----
 .../cloudstream3/utils/ExtractorApi.kt        | 19 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 782e3fa4..cb8efe92 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -1196,10 +1196,10 @@ class CS3IPlayer : IPlayer {
                 HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.socketFactory)
             }
 
-            val mime = if (link.isM3u8) {
-                MimeTypes.APPLICATION_M3U8
-            } else {
-                MimeTypes.VIDEO_MP4
+            val mime = when {
+                link.isM3u8 -> MimeTypes.APPLICATION_M3U8
+                link.isDash -> MimeTypes.APPLICATION_MPD
+                else -> MimeTypes.VIDEO_MP4
             }
 
             val mediaItems = if (link is ExtractorLinkPlayList) {
@@ -1249,4 +1249,4 @@ class CS3IPlayer : IPlayer {
             loadOfflinePlayer(context, it)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 0bced6b2..b03c9fb7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -52,7 +52,7 @@ data class ExtractorLinkPlayList(
 )
 
 
-open class ExtractorLink(
+open class ExtractorLink constructor(
     open val source: String,
     open val name: String,
     override val url: String,
@@ -62,7 +62,24 @@ open class ExtractorLink(
     override val headers: Map<String, String> = mapOf(),
     /** Used for getExtractorVerifierJob() */
     open val extractorData: String? = null,
+    open val isDash: Boolean = false,
 ) : VideoDownloadManager.IDownloadableMinimum {
+    /**
+     * Old constructor without isDash, allows for backwards compatibility with extensions.
+     * Should be removed after all extensions have updated their cloudstream.jar
+     **/
+    constructor(
+        source: String,
+        name: String,
+        url: String,
+        referer: String,
+        quality: Int,
+        isM3u8: Boolean = false,
+        headers: Map<String, String> = mapOf(),
+        /** Used for getExtractorVerifierJob() */
+        extractorData: String? = null
+    ) : this(source, name, url, referer, quality, isM3u8, headers, extractorData, false)
+
     override fun toString(): String {
         return "ExtractorLink(name=$name, url=$url, referer=$referer, isM3u8=$isM3u8)"
     }

From 8b2881f5f64fad7eb29c93af0a3f696798b93d39 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 10 Mar 2023 20:45:19 +0100
Subject: [PATCH 254/273] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Dutch)

Currently translated at 74.0% (452 of 610 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (610 of 610 strings)

Added translation using Weblate (Malay)

Translated using Weblate (Russian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Turkish)

Currently translated at 99.1% (605 of 610 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (English)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (English)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (English)

Currently translated at 100.0% (610 of 610 strings)

Co-authored-by: Cliff Heraldo <123844876+clxf12@users.noreply.github.com>
Co-authored-by: Dan <denqwerta@gmail.com>
Co-authored-by: Felipe Nogueira <contato.fnog@gmail.com>
Co-authored-by: Fjuro <ifjuro@proton.me>
Co-authored-by: Frank Gerritsen Mulkes <frankgmwerk@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Samuel Gadiel <samuelgadiel@gmail.com>
Co-authored-by: Skrripy <rozihrash.ya6w7@simplelogin.com>
Co-authored-by: TZVS <akyasan@tuta.io>
Co-authored-by: Tang Yin <bingyuanshiye@126.com>
Co-authored-by: Walter H <walter75@gmail.com>
Co-authored-by: eightyy8 <oliver.kha@pm.me>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/en/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml |  18 +--
 app/src/main/res/values-cs/strings.xml |  18 +--
 app/src/main/res/values-es/strings.xml |  18 +--
 app/src/main/res/values-in/strings.xml |  18 +--
 app/src/main/res/values-ms/strings.xml |   2 +
 app/src/main/res/values-nl/strings.xml |  11 +-
 app/src/main/res/values-pt/strings.xml |  14 +-
 app/src/main/res/values-ru/strings.xml |  16 +--
 app/src/main/res/values-tr/strings.xml | 173 ++++++++++++++-----------
 app/src/main/res/values-uk/strings.xml | 101 +++++++--------
 app/src/main/res/values-zh/strings.xml |  14 +-
 app/src/main/res/values/strings.xml    |  20 +--
 12 files changed, 225 insertions(+), 198 deletions(-)
 create mode 100644 app/src/main/res/values-ms/strings.xml

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index cfd761e3..ae45465b 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -119,16 +119,16 @@
     <string name="eigengraumode_settings">وضع إيغنغرافي</string>
     <string name="eigengraumode_settings_des">يضيف خيار السرعة في المُشغل</string>
     <string name="swipe_to_seek_settings">السحب لتقديم</string>
-    <string name="swipe_to_seek_settings_des">إسحب إلى اليسار أو اليمين للتحكم في الوقت في مُشغل الفيديو</string>
+    <string name="swipe_to_seek_settings_des">اسحب من جانب إلى آخر للتحكم في موضعك في مقطع فيديو</string>
     <string name="swipe_to_change_settings">السحب لتغيير الإعدادات</string>
-    <string name="swipe_to_change_settings_des">إسحب على الجانب الأيسر أو الأيمن لتغيير السطوع أو مستوى الصوت</string>
+    <string name="swipe_to_change_settings_des">مرر لأعلى أو لأسفل على الجانب الأيسر أو الأيمن لتغيير السطوع أو مستوى الصوت</string>
     <string name="autoplay_next_settings">تشغيل الحلقة التالية تلقائيًا</string>
     <string name="autoplay_next_settings_des">تبدأ الحلقة التالية عندما تنتهي الحالية</string>
     <string name="double_tap_to_seek_settings">النقر مرتان للتقديم للأمام أو للخلف</string>
     <string name="double_tap_to_pause_settings">الضغط مرتان لإيقاف مؤقت</string>
-    <string name="double_tap_to_seek_amount_settings">التحكم في مدى تقديم المُشغل</string>
+    <string name="double_tap_to_seek_amount_settings">التحكم في مدى تقديم المُشغل(ثوان)</string>
     <string name="double_tap_to_seek_settings_des">إضغط مرتين على الجانب الأيمن أو الأيسر للتقديم للأمام أو للخلف</string>
-    <string name="double_tap_to_pause_settings_des">إضغط في الوسط لإيقاف مؤقت</string>
+    <string name="double_tap_to_pause_settings_des">اضغط مرتين في المنتصف للتوقف</string>
     <string name="use_system_brightness_settings">استخدم سطوع النظام</string>
     <string name="use_system_brightness_settings_des">استخدم سطوع النظام في مُشغل التطبيق بدلاً من التراكب الداكن</string>
     <string name="episode_sync_settings">تحديث تقدم المشاهدة</string>
@@ -155,7 +155,7 @@
     <string name="automatic_plugin_updates">تحديث الإضافات تلقائيًا</string>
     <string name="automatic_plugin_download">تنزيل الإضافات تلقائيًا</string>
     <string name="updates_settings">التحديث التلقائي</string>
-    <string name="updates_settings_des">البحث تلقائيًا عن التحديثات الجديدة عند البداية</string>
+    <string name="updates_settings_des">ابحث تلقائيا عن التحديثات الجديدة بعد بدء التطبيق.</string>
     <string name="uprereleases_settings">التحديث إلى الاصدارات التجريبية (بيتا)</string>
     <string name="uprereleases_settings_des">البحث عن التحديثات التجريبية بدلاً من الإصدارات الكاملة فقط</string>
     <string name="github">غيت هاب</string>
@@ -218,8 +218,8 @@
     <string name="movies_singular">فيلم</string>
     <string name="tv_series_singular">مسلسل</string>
     <string name="cartoons_singular">كرتون</string>
-    <string name="anime_singular">أنمي</string>
-    <string name="ova_singular">اوفا</string>
+    <string name="anime_singular">أنيمي</string>
+    <string name="ova_singular">أوفا</string>
     <string name="torrent_singular">تورنت</string>
     <string name="documentaries_singular">وثائقي</string>
     <string name="asian_drama_singular">دراما آسيوية</string>
@@ -284,7 +284,7 @@
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">عام</string>
     <string name="random_button_settings">زر العشوائي</string>
-    <string name="random_button_settings_desc">إظهار زر العشوائي على الصفحة الرئيسية</string>
+    <string name="random_button_settings_desc">يظهر الزر على الصفحة الرئيسية والذي يمكنه اختيار فيلم عشوائي أو مسلسل تلفزيوني من الصفحة الرئيسية</string>
     <string name="provider_lang_settings">لغات المزود</string>
     <string name="app_layout">واجهة التطبيق</string>
     <string name="preferred_media_settings">المحتوى المفضل</string>
@@ -558,7 +558,7 @@
     <string name="pref_category_bypass">تجاوز مزود خدمة الإنترنت</string>
     <string name="revert">استرجاع</string>
     <string name="jsdelivr_enabled">فشل الوصول إلى GitHub ، وتمكين وكيل jsdelivr.</string>
-    <string name="jsdelivr_proxy_summary">تجاوز حظر GitHub باستخدام jsdelivr ، قد يتسبب في تأخير التحديثات لبضعة أيام.</string>
+    <string name="jsdelivr_proxy_summary">باستخدام jsdelivr ، يمكن تجاوز حظر GitHub. قد يؤخر التحديثات لبضعة أيام.</string>
     <string name="jsdelivr_proxy">وكيل raw.githubusercontent.com</string>
     <string name="watch_quality_pref_data">جودة المشاهدة المفضلة (بيانات الجوال)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e99e1010..67179b46 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -122,14 +122,14 @@
     <string name="eigengraumode_settings">Rychlostní režim</string>
     <string name="eigengraumode_settings_des">Přidá do přehrávače možnost rychlosti</string>
     <string name="swipe_to_seek_settings">Přejet pro posun</string>
-    <string name="swipe_to_seek_settings_des">Přejeďte prstem vlevo nebo vpravo pro ovládání času v přehrávači</string>
+    <string name="swipe_to_seek_settings_des">Přejeďte prstem ze strany na stranu pro ovládání své pozice ve videu</string>
     <string name="swipe_to_change_settings">Přejet pro změnu nastavení</string>
-    <string name="swipe_to_change_settings_des">Přejeďte prstem na levé nebo pravé straně pro změnu jasu nebo hlasitosti</string>
+    <string name="swipe_to_change_settings_des">Přejeďte prstem nahoru nebo dolů na levé nebo pravé straně pro změnu jasu nebo hlasitosti</string>
     <string name="double_tap_to_seek_settings">Dvojité klepnutí pro posun</string>
     <string name="double_tap_to_pause_settings">Dvojité klepnutí pro pozastavení</string>
-    <string name="double_tap_to_seek_amount_settings">Množství času k posunu</string>
+    <string name="double_tap_to_seek_amount_settings">Množství času k posunu (sekundy)</string>
     <string name="double_tap_to_seek_settings_des">Klepněte dvakrát vpravo nebo vlevo pro posun vpřed nebo vzad</string>
-    <string name="double_tap_to_pause_settings_des">Klepněte doprostřed pro pozastavení</string>
+    <string name="double_tap_to_pause_settings_des">Klepněte dvakrát doprostřed pro pozastavení</string>
     <string name="use_system_brightness_settings">Použít systémový jas</string>
     <string name="use_system_brightness_settings_des">V přehrávači použít systémov překrytí</string>
     <string name="episode_sync_settings">Aktualizovat postup sledování</string>
@@ -151,7 +151,7 @@
     <string name="bug_report_settings_on">Nebude odesílat žádná data</string>
     <string name="show_fillers_settings">Zobrazit výplňové epizody u anime</string>
     <string name="updates_settings">Zobrazit aktualizace aplikace</string>
-    <string name="updates_settings_des">Při spuštění automaticky zkontrolovat nové aktualizace</string>
+    <string name="updates_settings_des">Při spuštění aplikace automaticky zkontrolovat nové aktualizace.</string>
     <string name="uprereleases_settings">Aktualizovat na předběžná vydání</string>
     <string name="uprereleases_settings_des">Kontrolovat aktualizace předběžných vydání, místo normálních plných vydání</string>
     <string name="github">GitHub</string>
@@ -211,8 +211,8 @@
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Seriál</string>
     <string name="cartoons_singular">Animovaný</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">Anime</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Dokument</string>
     <string name="asian_drama_singular">Asijské drama</string>
@@ -266,7 +266,7 @@
     <string name="legal_notice_text" translatable="false">Jakékoli právní otázky týkající se obsahu této aplikace je třeba řešit se samotnými hostiteli a poskytovateli souborů, protože s nimi nejsme nijak spojeni. V případě porušení autorských práv se obraťte přímo na odpovědné strany nebo na webové stránky, na kterých se streamování odehrává. Aplikace je určena výhradně pro vzdělávací a osobní účely. CloudStream 3 v aplikaci nehostuje žádný obsah a nemá žádnou kontrolu nad tím, jaká média jsou v aplikaci umístěna nebo odstraněna. CloudStream 3 funguje jako jakýkoli jiný vyhledávač, například Google. Služba CloudStream 3 nehostuje, nenahrává ani nespravuje žádná videa, filmy ani obsah. Pouze vyhledává, agreguje a zobrazuje odkazy v pohodlném, uživatelsky přívětivém rozhraní. Pouze shromažďuje webové stránky třetích stran, které jsou veřejně přístupné prostřednictvím jakéhokoli běžného webového prohlížeče. Je odpovědností uživatele, aby se vyvaroval jakýchkoli akcí, které by mohly porušovat zákony platné v jeho lokalitě. Použijte CloudStream 3 na vlastní nebezpečí.</string>
     <string name="category_general">Obecné</string>
     <string name="random_button_settings">Náhodné tlačítko</string>
-    <string name="random_button_settings_desc">Zobrazit na domovské stránce náhodné tlačítko</string>
+    <string name="random_button_settings_desc">Zobrazit na domovské stránce tlačítko, kterým lze vybrat náhodný film nebo seriál z domovské stránky</string>
     <string name="provider_lang_settings">Jazyk poskytovatelů</string>
     <string name="app_layout">Rozložení aplikace</string>
     <string name="preferred_media_settings">Preferovaná média</string>
@@ -551,6 +551,6 @@
     <string name="jsdelivr_enabled">Nepodařilo se připojit ke GitHubu, povolování proxy jsdelivr.</string>
     <string name="watch_quality_pref_data">Upřednostněná kvalita sledování (mobilní data)</string>
     <string name="revert">Vrátit zpět</string>
-    <string name="jsdelivr_proxy_summary">Obchází blokování GitHubu pomocí jsdelivr, může způsobit zpoždění aktualizací o několik dní.</string>
+    <string name="jsdelivr_proxy_summary">Pomocí jsdelivr lze obejít blokování GitHubu. Může dojít ke zpoždění aktualizací o několik dní.</string>
     <string name="pref_category_bypass">Obcházení ISP</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0b195275..5c8ac532 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -51,10 +51,10 @@
     <string name="subtitles_raised">Elevado</string>
     <string name="subtitle_offset_extra_hint_later_format">Use esto si los subtítulos se muestran %d ms muy pronto</string>
     <string name="subtitle_offset_extra_hint_before_format">Use esto si los subtítulos se muestran %d ms tarde</string>
-    <string name="swipe_to_seek_settings_des">Desliza el dedo hacia la izquierda o hacia la derecha para controlar el tiempo en el reproductor de video</string>
+    <string name="swipe_to_seek_settings_des">Desliza el dedo de lado a lado para controlar la posición en un video</string>
     <string name="subtitles_filter_lang">Filtrar por idioma de medios preferido</string>
     <string name="subtitles_remove_captions">Eliminar Closed Captions (CC) de los subtítulos</string>
-    <string name="double_tap_to_seek_amount_settings">Cantidad de tiempo de búsqueda en el reproductor (en segundos)</string>
+    <string name="double_tap_to_seek_amount_settings">Cantidad de búsquedas del reproductor (segundos)</string>
     <string name="use_system_brightness_settings_des">Use el brillo del sistema en el reproductor de la app en lugar de una superposición oscura</string>
     <string name="limit_title_rez">Resolución del reproductor de video</string>
     <string name="player_settings_play_in_mpv">MPV</string>
@@ -205,16 +205,16 @@
     <string name="eigengraumode_settings">Modo Eigengravy</string>
     <string name="swipe_to_seek_settings">Deslice para avanzar/retroceder</string>
     <string name="swipe_to_change_settings">Deslice para cambiar la configuración</string>
-    <string name="swipe_to_change_settings_des">Deslice el dedo hacia la izquierda o hacia la derecha para cambiar el brillo o el volumen</string>
+    <string name="swipe_to_change_settings_des">Deslice hacia arriba o hacia abajo en el lado izquierdo o derecho para cambiar el brillo o el volumen</string>
     <string name="double_tap_to_seek_settings">Toca dos veces para buscar</string>
     <string name="double_tap_to_pause_settings">Tocar dos veces para pausar</string>
     <string name="double_tap_to_seek_settings_des">Toque dos veces en el lado derecho o izquierdo para buscar hacia adelante o hacia atrás</string>
-    <string name="double_tap_to_pause_settings_des">Toque en el medio para pausar</string>
+    <string name="double_tap_to_pause_settings_des">Toque dos veces en el medio para hacer una pausa</string>
     <string name="use_system_brightness_settings">Usar brillo del sistema</string>
     <string name="restore_settings">Restaurar datos desde el backup</string>
     <string name="backup_settings">Hacer copia de los datos (backup)</string>
     <string name="restore_success">Archivo de backup cargado</string>
-    <string name="updates_settings_des">Buscar automáticamente nuevas actualizaciones al inicio</string>
+    <string name="updates_settings_des">Busque automáticamente nuevas actualizaciones después de iniciar la aplicación.</string>
     <string name="redo_setup_process">Rehacer el proceso de configuración inicial</string>
     <string name="show_fillers_settings">Mostrar episodio de relleno para Anime</string>
     <string name="play_episode_toast">Reproducir Episodio</string>
@@ -306,7 +306,7 @@
     <string name="pref_category_looks">Aspecto</string>
     <string name="pref_category_ui_features">Características</string>
     <string name="random_button_settings">Botón de Al azar</string>
-    <string name="random_button_settings_desc">Muestra un botón de reproducción \"al azar\" en la página de inicio</string>
+    <string name="random_button_settings_desc">Muestra un botón de reproducción \"al azar\" en la página de inicio para poelículas y series</string>
     <string name="account">cuenta</string>
     <string name="logout">Cerrar sesión</string>
     <string name="switch_account">Cambiar cuenta</string>
@@ -363,8 +363,8 @@
     <string name="movies_singular">Película</string>
     <string name="tv_series_singular">Serie</string>
     <string name="cartoons_singular">Dibujo animado</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">Anime</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Documental</string>
     <string name="asian_drama_singular">Drama asiático</string>
@@ -525,7 +525,7 @@
     <string name="subscription_episode_released">¡Episodio %d publicado!</string>
     <string name="jsdelivr_proxy">Proxy raw.githubusercontent.com</string>
     <string name="jsdelivr_enabled">No se ha podido acceder a GitHub, activando el proxy jsdelivr.</string>
-    <string name="jsdelivr_proxy_summary">Evita el bloqueo de GitHub usando jsdelivr, puede causar que las actualizaciones se retrasen unos días.</string>
+    <string name="jsdelivr_proxy_summary">Con jsdelivr, se puede omitir el bloqueo de GitHub. Puede retrasar las actualizaciones unos días.</string>
     <string name="revert">Revertir</string>
     <string name="pref_category_bypass">ISP Bypasses</string>
     <string name="watch_quality_pref_data">Calidad de visualización preferida (Datos móviles)</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 0e383562..1913868a 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -120,14 +120,14 @@
     <string name="eigengraumode_settings">Mode Eigengravy</string>
     <string name="eigengraumode_settings_des">Menambahkan opsi kecepatan di pemutar</string>
     <string name="swipe_to_seek_settings">Geser untuk mengubah waktu</string>
-    <string name="swipe_to_seek_settings_des">Geser ke kiri atau kanan untuk mengontrol waktu di pemutar video</string>
+    <string name="swipe_to_seek_settings_des">Geser dari sisi ke sisi untuk mengontrol posisi dalam video</string>
     <string name="swipe_to_change_settings">Geser untuk mengubah pengaturan</string>
-    <string name="swipe_to_change_settings_des">Geser ke sisi kiri atau kanan untuk mengubah pencerahan atau volume</string>
+    <string name="swipe_to_change_settings_des">Geser ke atas atau ke bawah di sisi kiri atau kanan untuk mengubah kecerahan atau volume</string>
     <string name="double_tap_to_seek_settings">Tekan dua kali untuk mengubah waktu</string>
     <string name="double_tap_to_pause_settings">Tekan dua kali untuk menjeda</string>
-    <string name="double_tap_to_seek_amount_settings">Jumlah pengubah waktu pemutar</string>
+    <string name="double_tap_to_seek_amount_settings">Jumlah pengubah waktu pemutar (Detik)</string>
     <string name="double_tap_to_seek_settings_des">Tekan dua kali di sisi kanan atau kiri untuk mengubah waktu ke depan atau ke belakang</string>
-    <string name="double_tap_to_pause_settings_des">Tekan di tengah untuk menjeda</string>
+    <string name="double_tap_to_pause_settings_des">Tekan dua kali di tengah untuk menjeda</string>
     <string name="use_system_brightness_settings">Gunakan pencerahan sistem</string>
     <string name="use_system_brightness_settings_des">Gunakan pencerahan sistem di pemutar aplikasi dari pada hamparan gelap</string>
     <string name="episode_sync_settings">Update progres tontonan</string>
@@ -149,7 +149,7 @@
     <string name="bug_report_settings_on">Tidak mengirim data</string>
     <string name="show_fillers_settings">Tampilkan episode filler untuk anime</string>
     <string name="updates_settings">Tampilkan update aplikasi</string>
-    <string name="updates_settings_des">Secara otomatis mencari update terbaru saat aplikasi dibuka</string>
+    <string name="updates_settings_des">Secara otomatis mencari update terbaru setelah aplikasi dibuka.</string>
     <string name="uprereleases_settings">Update ke prarilis</string>
     <string name="uprereleases_settings_des">Hanya mencari update prarilis daripada rilis penuh</string>
     <string name="github">Github</string>
@@ -209,8 +209,8 @@
     <string name="movies_singular">Movie</string>
     <string name="tv_series_singular">Seri</string>
     <string name="cartoons_singular">Kartun</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">Anime</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Film Dokumenter</string>
     <string name="asian_drama_singular">Drama Asia</string>
@@ -264,7 +264,7 @@
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Umum</string>
     <string name="random_button_settings">Tombol Acak</string>
-    <string name="random_button_settings_desc">Tampilkan tombol acak di Beranda</string>
+    <string name="random_button_settings_desc">Tampilkan tombol di halaman utama yang dapat memilih seri film atau TV acak dari halaman utama</string>
     <string name="provider_lang_settings">Bahasa provider</string>
     <string name="app_layout">Tata Letak Aplikasi</string>
     <string name="preferred_media_settings">Media yang lebih diinginkan</string>
@@ -548,7 +548,7 @@
     <string name="subscription_episode_released">Episode %d telah rilis!</string>
     <string name="jsdelivr_proxy">raw.githubusercontent.com Proksi</string>
     <string name="jsdelivr_enabled">Gagal mencapai GitHub, mengaktifkan proksi jsdelivr.</string>
-    <string name="jsdelivr_proxy_summary">Bypass pemblokiran Github menggunakan JSDeliVR, dapat menyebabkan pembaruan tertunda beberapa hari.</string>
+    <string name="jsdelivr_proxy_summary">Mengunakan jsdelivers, bisa melewati pemblokiran GitHub. Mungkin dapat menyebabkan pembaruan tertunda dalam beberapa hari.</string>
     <string name="pref_category_bypass">Bypass ISP</string>
     <string name="revert">Pulihkan</string>
     <string name="watch_quality_pref_data">Nonton dengan kualitas yang di inginkan (Data Seluler)</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
new file mode 100644
index 00000000..a6b3daec
--- /dev/null
+++ b/app/src/main/res/values-ms/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c2561914..dd89c34a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -9,7 +9,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Poster</string>
     <string name="episode_poster_img_des">Aflevering Poster</string>
     <string name="home_main_poster_img_des">Hoofdposter</string>
     <string name="home_next_random_img_des">Volgende willekeurig</string>
@@ -128,14 +128,14 @@
     <string name="eigengraumode_settings">Eigengravy Modus</string>
     <string name="eigengraumode_settings_des">Voegt een snelheidsoptie toe in de speler</string>
     <string name="swipe_to_seek_settings">Swipe to seek</string>
-    <string name="swipe_to_seek_settings_des">Veeg naar links of rechts om de tijd in de videoplayer te regelen</string>
+    <string name="swipe_to_seek_settings_des">Veeg naar links of rechts om de tijd in de videospeler te regelen</string>
     <string name="swipe_to_change_settings">Veeg om instellingen te wijzigen</string>
     <string name="swipe_to_change_settings_des">Veeg naar links of rechts om de helderheid of het volume te wijzigen</string>
     <string name="double_tap_to_seek_settings">Dubbeltik om te zien</string>
     <string name="double_tap_to_pause_settings">Dubbeltik om te pauzeren</string>
-    <string name="double_tap_to_seek_amount_settings">Speler zoeken bedrag</string>
+    <string name="double_tap_to_seek_amount_settings">Videospeler aantal zoeken</string>
     <string name="double_tap_to_seek_settings_des">Tik twee keer aan de rechter- of linkerkant om vooruit of achteruit te zoeken</string>
-    <string name="double_tap_to_pause_settings_des">Tik in het midden om te pauzeren</string>
+    <string name="double_tap_to_pause_settings_des">Tik twee keer in het midden om te pauzeren</string>
     <string name="use_system_brightness_settings">Systeemhelderheid gebruiken</string>
     <string name="use_system_brightness_settings_des">Gebruik systeemhelderheid in de app-speler in plaats van een donkere overlay</string>
     <string name="episode_sync_settings">Kijkvoortgang bijwerken</string>
@@ -405,4 +405,7 @@
     <string name="autoplay_next_settings_des">Start de volgende episode wanneer deze afgelopen is</string>
     <string name="autoplay_next_settings">Volgende episode automatisch afspelen</string>
     <string name="update_started">De update is gestart</string>
+    <string name="library">Bibliotheek</string>
+    <string name="browser">Browser</string>
+    <string name="test_log">Logboek</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 0c846361..64ccb903 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -123,16 +123,16 @@
     <string name="eigengraumode_settings">Modo Eigengravy</string>
     <string name="eigengraumode_settings_des">Acrescenta uma opção de velocidade no player</string>
     <string name="swipe_to_seek_settings">Deslize para andar</string>
-    <string name="swipe_to_seek_settings_des">Deslize para a esq. ou dir. para controlar o tempo no player</string>
+    <string name="swipe_to_seek_settings_des">Deslize para os lados para controlar a posição em um vídeo</string>
     <string name="swipe_to_change_settings">Deslize para mudar as configurações</string>
-    <string name="swipe_to_change_settings_des">Deslize do lado esq. ou dir. para ajustar brilho ou volume</string>
+    <string name="swipe_to_change_settings_des">Deslize para cima ou para baixo, no lado esquerdo ou direito, para ajustar brilho ou volume</string>
     <string name="autoplay_next_settings">Reproduzir automaticamente próximo episódio</string>
     <string name="autoplay_next_settings_des">Começa o próximo episódio quando o atual termina</string>
     <string name="double_tap_to_seek_settings">Toque duplo para avançar</string>
     <string name="double_tap_to_pause_settings">Toque duplo para pôr em pausa</string>
-    <string name="double_tap_to_seek_amount_settings">Segundos avançados no player</string>
+    <string name="double_tap_to_seek_amount_settings">Tempo de busca no player (Segundos)</string>
     <string name="double_tap_to_seek_settings_des">Toque duplo no lado esq. ou dir. para andar para trás ou para a frente</string>
-    <string name="double_tap_to_pause_settings_des">Toque no meio para pôr em pausa</string>
+    <string name="double_tap_to_pause_settings_des">Toque duas vezes no meio para pausar</string>
     <string name="use_system_brightness_settings">Usar brilho da sistema</string>
     <string name="use_system_brightness_settings_des">Usar brilho do sistema no player em vez de uma sobreposição escura</string>
     <string name="episode_sync_settings">Atualizar progresso</string>
@@ -158,7 +158,7 @@
     <string name="pref_filter_search_quality">Esconder qualidades de vídeo selecionadas nos resultados da Pesquisa</string>
     <string name="automatic_plugin_updates">Atualizações de plugin automáticas</string>
     <string name="updates_settings">Mostrar atualizações da app</string>
-    <string name="updates_settings_des">Procurar novas atualizações automaticamente ao iniciar</string>
+    <string name="updates_settings_des">Procurar automaticamente por novas atualizações depois de iniciar o app.</string>
     <string name="uprereleases_settings">Atualizar para pré-lançamentos</string>
     <string name="uprereleases_settings_des">Procura atualizações de pré-lançamento em vez de só lançamentos oficiais</string>
     <string name="github">Github</string>
@@ -273,7 +273,7 @@
     <string name="legal_notice">Aviso Legal</string>
     <string name="category_general">Geral</string>
     <string name="random_button_settings">Botão Aleatório</string>
-    <string name="random_button_settings_desc">Mostra o botão Aleatório na página inicial</string>
+    <string name="random_button_settings_desc">Mostra o botão Aleatório na página inicial, que pode escolher aleatoriamente um filme ou série</string>
     <string name="provider_lang_settings">Idioma dos fornecedores</string>
     <string name="app_layout">Layout da App</string>
     <string name="preferred_media_settings">Mídia preferida</string>
@@ -444,7 +444,7 @@
     <string name="quality_cam">Cam</string>
     <string name="skip_type_intro">Abertura</string>
     <string name="select_library">Selecionar Biblioteca</string>
-    <string name="jsdelivr_proxy_summary">Contorna o bloqueio do GitHub ao usar jsdelivr, pode atrasar atualizações em alguns dias.</string>
+    <string name="jsdelivr_proxy_summary">Usando jsdelivr o bloqueio do GitHub pode ser contornado. Pode atrasar atualizações em alguns dias.</string>
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="all_languages_preference">Todas as linguagens</string>
     <string name="sort_updated_new">Atualizado (Novo para Antigo)</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e613cee4..5295bd35 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -142,10 +142,10 @@
     <string name="eigengraumode_settings_des">Добавляет опцию скорости в проигрывателе</string>
     <string name="swipe_to_seek_settings">Проведите пальцем для поиска</string>
     <string name="swipe_to_change_settings">Проведите пальцем для изменения настроек</string>
-    <string name="swipe_to_change_settings_des">Проведите пальцем по левой или правой стороне для изменения яркости или громкости</string>
+    <string name="swipe_to_change_settings_des">Проведите вверх или вниз по левой или правой стороне, чтобы изменить яркость или громкость</string>
     <string name="autoplay_next_settings">Автопроиграть следующего серия</string>
     <string name="play_torrent_button">Поток торрент</string>
-    <string name="swipe_to_seek_settings_des">Проведите пальцем влево или вправо, чтобы управлять временем в видеоплеере</string>
+    <string name="swipe_to_seek_settings_des">Проведите пальцем из стороны в сторону, чтобы управлять свое место в видеоролике</string>
     <string name="autoplay_next_settings_des">Начните следующий серию, когда закончится текущий</string>
     <string name="restore_success">Загружена резервная копия</string>
     <string name="restore_failed_format" formatted="true">Не удалось восстановить данные из %s</string>
@@ -159,7 +159,7 @@
     <string name="automatic_plugin_updates">Автоматическое обновление плагинов</string>
     <string name="automatic_plugin_download">Автоматическая загрузка плагинов</string>
     <string name="updates_settings">Показать обновления приложения</string>
-    <string name="updates_settings_des">Автоматически проверять обновления при старте</string>
+    <string name="updates_settings_des">Автоматически проверять обновления при старте приложения.</string>
     <string name="uprereleases_settings">Обновится до пре-релиза</string>
     <string name="apk_installer_settings">APK установщик</string>
     <string name="github">Github</string>
@@ -227,7 +227,7 @@
     <string name="used_storage">Использовано</string>
     <string name="double_tap_to_pause_settings">Двойное нажатие для паузы</string>
     <string name="double_tap_to_seek_settings_des">Коснитесь дважды правой или левой стороны для поиска вперед или назад</string>
-    <string name="double_tap_to_pause_settings_des">Нажмите в центре для паузы</string>
+    <string name="double_tap_to_pause_settings_des">Нажмите дважды в центре, чтобы сделать паузу</string>
     <string name="use_system_brightness_settings">Использовать системную яркость</string>
     <string name="episode_sync_settings_des">Автоматически синхронизировать текущий прогресс эпизода</string>
     <string name="backup_failed_error_format">Ошибка резервного копирования %s</string>
@@ -408,8 +408,8 @@
     <string name="subtitles_example_text">Съешь ещё этих мягких французских булок, да выпей же чаю</string>
     <string name="recommended">Рекомендуется</string>
     <string name="player_loaded_subtitles" formatted="true">Загружено %s</string>
-    <string name="anime_singular">\@нить/аниме</string>
-    <string name="ova_singular">\@нить/ova</string>
+    <string name="anime_singular">Аниме</string>
+    <string name="ova_singular">OVA</string>
     <string name="show_dub">Этикетка Dub</string>
     <string name="site">Сайт</string>
     <string name="pref_category_ui_features">Функции</string>
@@ -493,7 +493,7 @@
     <string name="subtitles_filter_lang">Фильтровать по предпочитаемому языку медиа</string>
     <string name="error_invalid_id">Неверный ID</string>
     <string name="network_adress_example">Ссылка на стрим</string>
-    <string name="random_button_settings_desc">Отображать рандомную кнопку на Главной странице</string>
+    <string name="random_button_settings_desc">Показывает кнопку на главной странице, с помощью которой можно выбрать случайный фильм или сериал с главной страницы</string>
     <string name="random_button_settings">Рандомная кнопка</string>
     <string name="apk_installer_legacy">Legacy (старый)</string>
     <string name="player_settings_play_in_web">Веб видеокаст</string>
@@ -501,7 +501,7 @@
     <string name="episode_action_reload_links">Перезагрузить ссылки</string>
     <string name="preferred_media_settings">Предпочтительные медиа</string>
     <string name="subtitles_depressed">Опущенные</string>
-    <string name="double_tap_to_seek_amount_settings">Объем перемотки плеера</string>
+    <string name="double_tap_to_seek_amount_settings">Объем перемотки плеера (секундах)</string>
     <string name="android_tv_interface_on_seek_settings_summary">Объем перемотка, используемый, когда плеер виден</string>
     <string name="android_tv_interface_on_seek_settings">Плеер показан - Перемотки объем</string>
     <string name="android_tv_interface_off_seek_settings">Плеер спрятан - Перемотки объем</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 807716d8..f53bb69d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -117,47 +117,47 @@
     <string name="benene_count_text_none">Hiç muz verilmedi</string>
     <string name="subs_auto_select_language">Otomatik seçilecek dil</string>
     <string name="subs_download_languages">İndirilecek diller</string>
-    <string name="subs_subtitle_languages">Alt yazı dili</string>
-    <string name="subs_hold_to_reset_to_default">Varsayılana döndürmek için basılı tut</string>
+    <string name="subs_subtitle_languages">Altyazı dili</string>
+    <string name="subs_hold_to_reset_to_default">Sıfırlamak için basılı tut</string>
     <string name="subs_import_text" formatted="true">Fontları içe aktarmak için %s konumuna yerleştirin</string>
     <string name="continue_watching">İzlemeye devam et</string>
     <string name="action_remove_watching">Kaldır</string>
     <string name="action_open_watching">Daha fazla bilgi</string>
     <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Bu sağlayıcının düzgün çalışması için bir VPN gerekebilir</string>
-    <string name="vpn_torrent">Bu sağlayıcı bir torrent. VPN önerilir</string>
+    <string name="vpn_torrent">Bu sağlayıcı torrent kullanıyor, bir VPN önerilir</string>
     <string name="provider_info_meta">Metadata site tarafından sağlanmamış, veri site\'de bulunmuyorsa video yüklenmesi başarısız olacak.</string>
     <string name="torrent_plot">Açıklama</string>
     <string name="normal_no_plot">Konu bulunamadı</string>
     <string name="torrent_no_plot">Açıklama bulunamadı</string>
-    <string name="show_log_cat">Logcat\'i göster 🐈</string>
-    <string name="picture_in_picture">Resim-içinde-resim</string>
-    <string name="picture_in_picture_des">Diğer uygulamaların üzerinde minyatür bir oynatıcıda oynatmaya devam eder</string>
+    <string name="show_log_cat">Logcat\'i görüntüle 🐈</string>
+    <string name="picture_in_picture">Görüntü içinde görüntü</string>
+    <string name="picture_in_picture_des">İçerik diğer uygulamaların üzerinde küçük bir pencerede oynatılmaya devam eder</string>
     <string name="player_size_settings">Oynatıcı yeniden boyutlandırma butonu</string>
-    <string name="player_size_settings_des">Siyah sınırları kaldır</string>
-    <string name="player_subtitles_settings">Alt yazı</string>
+    <string name="player_size_settings_des">Siyah sınır çizgilerini kaldır</string>
+    <string name="player_subtitles_settings">Alt yazılar</string>
     <string name="player_subtitles_settings_des">Oynatıcı alt yazı ayarları</string>
-    <string name="chromecast_subtitles_settings">Chromecast alt yazı</string>
+    <string name="chromecast_subtitles_settings">Chromecast alt yazıları</string>
     <string name="chromecast_subtitles_settings_des">Chromecast alt yazı ayarları</string>
-    <string name="eigengraumode_settings">Eigengravy modu</string>
-    <string name="eigengraumode_settings_des">Oynatıcıya bir hız seçeneği ekle</string>
-    <string name="swipe_to_seek_settings">Gözlemek için kaydır</string>
-    <string name="swipe_to_seek_settings_des">Zamanı ayarlamak için sağa veya sola kaydır</string>
+    <string name="eigengraumode_settings">Eigengrau modu</string>
+    <string name="eigengraumode_settings_des">Oynatıcıya hız seçeneği ekler</string>
+    <string name="swipe_to_seek_settings">Atlamak için kaydır</string>
+    <string name="swipe_to_seek_settings_des">Zamanı ayarlamak için yanlardan kaydır</string>
     <string name="swipe_to_change_settings">Ayarları değiştirmek için kaydır</string>
-    <string name="swipe_to_change_settings_des">Sol ve sağ taraftan kaydırarak parlaklık ve sesi ayarla</string>
+    <string name="swipe_to_change_settings_des">Sol ve sağ taraftan yukarı kaydırarak ekran parlaklığı ve sesi ayarla</string>
     <string name="autoplay_next_settings">Sonraki bölümü otomatik oynat</string>
     <string name="autoplay_next_settings_des">Mevcut bölüm bittiğinde sonraki bölüme başla</string>
-    <string name="double_tap_to_seek_settings">Gözlemek için çift tıkla</string>
-    <string name="double_tap_to_pause_settings">Durdurmak için çift tıkla</string>
-    <string name="double_tap_to_seek_amount_settings">Oynatıcı gözleme miktarı</string>
-    <string name="double_tap_to_seek_settings_des">İleri ve geri atlamak için sağa ve sola çift tıkla</string>
-    <string name="double_tap_to_pause_settings_des">Durdurmak için ortaya tıkla</string>
+    <string name="double_tap_to_seek_settings">Çift dokunarak atla</string>
+    <string name="double_tap_to_pause_settings">İki kez dokunarak duraklat</string>
+    <string name="double_tap_to_seek_amount_settings">Atlanacak süre (Saniye)</string>
+    <string name="double_tap_to_seek_settings_des">İleri ve geri atlamak için sağa ve sola iki kez dokun</string>
+    <string name="double_tap_to_pause_settings_des">Durdurmak için ekranın ortasına çift dokun</string>
     <string name="use_system_brightness_settings">Sistem parlaklığını kullan</string>
-    <string name="use_system_brightness_settings_des">Oynatıcıda karanlık kaplama yerine sistem parlaklığını kullan</string>
+    <string name="use_system_brightness_settings_des">Oynatıcıyı karartmak yerine sistem parlaklığını kullan</string>
     <string name="episode_sync_settings">İzleme ilerlemesini güncelle</string>
     <string name="episode_sync_settings_des">Mevcut bölüm ilerlemesini otomatik güncelle</string>
-    <string name="restore_settings">Yedekten geri yükle</string>
-    <string name="backup_settings">Verileri yedekleyin</string>
+    <string name="restore_settings">Verileri yedekten geri yükle</string>
+    <string name="backup_settings">Verileri yedekle</string>
     <string name="restore_success">Yedek dosyası yüklendi</string>
     <string name="restore_failed_format" formatted="true">Geri yükleme başarısız oldu: %s</string>
     <string name="backup_success">Başarıyla yedeklendi</string>
@@ -165,21 +165,21 @@
     <string name="backup_failed_error_format">%s yedeklenirken hata</string>
     <string name="search">Ara</string>
     <string name="category_account">Hesaplar</string>
-    <string name="category_updates">Güncellemeler ve yedek</string>
+    <string name="category_updates">Güncellemeler ve yedekleme</string>
     <string name="settings_info">Bilgi</string>
     <string name="advanced_search">Gelişmiş arama</string>
-    <string name="advanced_search_des">Sağlayıcılara göre ayrılmış arama sonuçlarını ver</string>
+    <string name="advanced_search_des">Arama sonuçlarını sağlayıcıya göre ayırır</string>
     <string name="bug_report_settings_off">Yalnızca çökmelerle ilgili verileri gönderir</string>
-    <string name="bug_report_settings_on">Hiç veri göndermez</string>
-    <string name="show_fillers_settings">Anime için filler bölümleri gösterir</string>
+    <string name="bug_report_settings_on">Veri göndermez</string>
+    <string name="show_fillers_settings">Anime için filler bölümleri göster</string>
     <string name="show_trailers_settings">Fragmanları göster</string>
     <string name="kitsu_settings">Kitsu\'dan posterleri göster</string>
-    <string name="pref_filter_search_quality">Seçilen video kalitelerini arama sonuçlarında gizle</string>
+    <string name="pref_filter_search_quality">Seçilen video kalitelerini arama sonuçlarında gösterme</string>
     <string name="automatic_plugin_updates">Otomatik eklenti güncellemeleri</string>
     <string name="updates_settings">Uygulama güncellemelerini göster</string>
-    <string name="updates_settings_des">Başlangıçta yeni güncellemeleri otomatik olarak ara</string>
-    <string name="uprereleases_settings">Ön sürümlere güncelle</string>
-    <string name="uprereleases_settings_des">Sadece tam sürümler yerine ön sürüm güncellemelerini de ara</string>
+    <string name="updates_settings_des">Uygulama başlatıldıktan sonra güncellemeleri otomatik olarak kontrol et.</string>
+    <string name="uprereleases_settings">Deneysel sürümlere güncelle</string>
+    <string name="uprereleases_settings_des">Yalnızca tam sürümler yerine deneysel güncellemeleri de ara</string>
     <string name="github">GitHub</string>
     <string name="lightnovel">Aynı geliştiriciler tarafından LightNovel uygulaması</string>
     <string name="anim">Aynı geliştiriciler tarafından anime uygulaması</string>
@@ -191,8 +191,8 @@
     <string name="no_links_found_toast">Bağlantı bulunamadı</string>
     <string name="copy_link_toast">Bağlantı panoya kopyalandı</string>
     <string name="play_episode_toast">Bölümü oynat</string>
-    <string name="subs_default_reset_toast">Varsayılana sıfırla</string>
-    <string name="acra_report_toast">Üzgünüz, uygulama çöktü. Geliştiricilere isimsiz bir hata raporu gönderilecek</string>
+    <string name="subs_default_reset_toast">Varsayılan değere sıfırla</string>
+    <string name="acra_report_toast">Üzgünüz, uygulama çöktü. Geliştiricilere anonim bir hata raporu gönderilecek</string>
     <string name="season">Sezon</string>
     <string name="season_format">%s %d%s</string>
     <string name="no_season">Sezon yok</string>
@@ -210,8 +210,8 @@
     <string name="resume">Sürdür</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">%s dosyası tamamen silinecek
-\nEmins misiniz\?</string>
+    <string name="delete_message" formatted="true">%s tamamen silinecek
+\nEmin misiniz\?</string>
     <string name="resume_time_left" formatted="true">%dm
 \nkaldı</string>
     <string name="status_ongoing">Devam ediyor</string>
@@ -236,9 +236,9 @@
     <string name="torrent">Torrentler</string>
     <string name="documentaries">Belgeseller</string>
     <string name="ova">OVA</string>
-    <string name="asian_drama">Asya dramaları</string>
+    <string name="asian_drama">Asya dizileri</string>
     <string name="livestreams">Canlı yayınlar</string>
-    <string name="nsfw">NSFW</string>
+    <string name="nsfw">+18</string>
     <string name="others">Diğerleri</string>
     <!--singular-->
     <string name="movies_singular">Film</string>
@@ -248,9 +248,9 @@
     <string name="ova_singular">\@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Belgesel</string>
-    <string name="asian_drama_singular">Asya draması</string>
+    <string name="asian_drama_singular">Asya dizisi</string>
     <string name="live_singular">Canlı yayın</string>
-    <string name="nsfw_singular">NSFW</string>
+    <string name="nsfw_singular">+18</string>
     <string name="other_singular">Video</string>
     <string name="source_error">Kaynak hatası</string>
     <string name="remote_error">Sunucu hatası</string>
@@ -259,10 +259,10 @@
     <string name="storage_error">İndirme hatası, depolama izinlerini kontrol edin</string>
     <string name="episode_action_chromecast_episode">Bölümü Chromecast ile yayınla</string>
     <string name="episode_action_chromecast_mirror">Bağlantıyı Chromecast ile yayınla</string>
-    <string name="episode_action_play_in_app">Uygulamada oynat</string>
-    <string name="episode_action_play_in_format">%s\'deda oynat</string>
+    <string name="episode_action_play_in_app">Burada oynat</string>
+    <string name="episode_action_play_in_format">%s üzerinden oynat</string>
     <string name="episode_action_play_in_browser">Tarayıcıda oynat</string>
-    <string name="episode_action_copy_link">Linki kopyala</string>
+    <string name="episode_action_copy_link">Bağlantıyı kopyala</string>
     <string name="episode_action_auto_download">Otomatik indir</string>
     <string name="episode_action_download_mirror">Şu kaynaktan indir</string>
     <string name="episode_action_reload_links">Bağlantıları yenile</string>
@@ -281,22 +281,22 @@
     <string name="video_lock">Kilitle</string>
     <string name="video_aspect_ratio_resize">Yeniden boyutlandır</string>
     <string name="video_source">Kaynak</string>
-    <string name="video_skip_op">OP\'yi geç</string>
+    <string name="video_skip_op">Jeneriği geç</string>
     <string name="dont_show_again">Bir daha gösterme</string>
     <string name="skip_update">Bu güncellemeyi atla</string>
     <string name="update">Güncelle</string>
-    <string name="watch_quality_pref">Tercih edilen izleme kalitesi</string>
-    <string name="limit_title">Oynatıcıdaki maksimum başlık karakter sayısı</string>
-    <string name="limit_title_rez">Oynatıcının üst tarafındaki öğeler</string>
+    <string name="watch_quality_pref">Tercih edilen görüntü kalitesi (WiFi)</string>
+    <string name="limit_title">Video oynatıcı başlığı karakter üst sınırı</string>
+    <string name="limit_title_rez">Oynatıcının çözünürlüğü</string>
     <string name="video_buffer_size_settings">Video arabelleği boyutu</string>
     <string name="video_buffer_length_settings">Video arabelleği uzunluğu</string>
-    <string name="video_buffer_disk_settings">Diskteki video önbelleği</string>
+    <string name="video_buffer_disk_settings">Hafızadaki video önbelleği</string>
     <string name="video_buffer_clear_settings">Video ve resim önbelleğini temizle</string>
-    <string name="video_ram_description">Android TV gibi düşük belleğe sahip cihazlarda çok yükseğe ayarlanırsa çökmelere neden olur.</string>
-    <string name="video_disk_description">Çok yükseğe ayarlanırsa, Android TV cihazları gibi düşük depolama alanına sahip sistemlerde sorunlara neden olabilir.</string>
-    <string name="dns_pref">HTTPS üzerinden DNS</string>
-    <string name="dns_pref_summary">ISP bloklarını atlatmak için kullanışlıdır</string>
-    <string name="add_site_pref">Klon site</string>
+    <string name="video_ram_description">Çok yükseğe ayarlanırsa düşük belleğe sahip cihazlarda çökmelere neden olur (örn. Android TV).</string>
+    <string name="video_disk_description">Çok yükseğe ayarlanırsa düşük depolama alanına sahip sistemlerde sorunlara neden olur (örn. Android TV).</string>
+    <string name="dns_pref">HTTPS üzerinden DNS (DoH)</string>
+    <string name="dns_pref_summary">İnternet Servis Sağlayıcısı (İSS) kısıtlamalarını aşmak için kullanışlıdır</string>
+    <string name="add_site_pref">Siteyi kopyala</string>
     <string name="remove_site_pref">Siteyi kaldır</string>
     <string name="add_site_summary">Farklı bir URL ile mevcut bir sitenin klonunu ekleyin</string>
     <string name="download_path_pref">İndirme konumu</string>
@@ -305,16 +305,16 @@
     <string name="resize_fit">Ekrana sığdır</string>
     <string name="resize_fill">Uzat</string>
     <string name="resize_zoom">Yakınlaştır</string>
-    <string name="legal_notice">Disclaimer</string>
+    <string name="legal_notice">Yasal Uyarı</string>
     <string name="legal_notice_key" translatable="false">legal_notice_key</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Genel</string>
-    <string name="random_button_settings">Rastgele butonu</string>
-    <string name="random_button_settings_desc">Ana sayfada rastgele butonunu göster</string>
+    <string name="random_button_settings">Rastgele İçerik</string>
+    <string name="random_button_settings_desc">Ana sayfada rastgele bir film veya dizi seçen bir tuş gösterir</string>
     <string name="provider_lang_settings">Sağlayıcı dilleri</string>
     <string name="app_layout">Uygulama düzeni</string>
     <string name="preferred_media_settings">Tercih edilen medya</string>
-    <string name="enable_nsfw_on_providers">Desteklenen sağlayıcılarda NSFW\'yi etkinleştir</string>
+    <string name="enable_nsfw_on_providers">Desteklenen sağlayıcılarda +18 içeriği etkinleştir</string>
     <string name="subtitles_encoding">Alt yazı kodlaması</string>
     <string name="category_providers">Sağlayıcılar</string>
     <string name="category_ui">Düzen</string>
@@ -336,7 +336,7 @@
     <string name="example_email">hello@world.com</string>
     <string name="example_ip">127.0.0.1</string>
     <string name="example_site_name">MyCoolSite</string>
-    <string name="example_site_url">example.com</string>
+    <string name="example_site_url">ornek.com</string>
     <string name="example_lang_name">Dil kodu (tr)</string>
     <!--
     <string name="mal_account_settings" translatable="false">MAL</string>
@@ -354,14 +354,14 @@
     <string name="add_account">Hesap ekle</string>
     <string name="create_account">Hesap oluştur</string>
     <string name="add_sync">Bölüm takibi ekle</string>
-    <string name="added_sync_format" formatted="true">Eklendi %s</string>
+    <string name="added_sync_format" formatted="true">%s eklendi</string>
     <string name="upload_sync">Senkronize et</string>
     <string name="sync_score">Puan</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="authenticated_user" formatted="true">%s için doğrulama başarılı</string>
-    <string name="authenticated_user_fail" formatted="true">%s için doğrulama başarısız</string>
+    <string name="authenticated_user" formatted="true">%s başarıyla doğrulandı</string>
+    <string name="authenticated_user_fail" formatted="true">%s ile giriş yapılamadı</string>
     <!-- ============ -->
     <string name="none">Hiçbiri</string>
     <string name="normal">Normal</string>
@@ -376,7 +376,7 @@
     <string name="subtitle_offset">Alt yazı senkronu</string>
     <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Alt yazı gecikmesi</string>
-    <string name="subtitle_offset_extra_hint_later_format">Alt yazılar %d ms erken gözüküyorsa bunu kullanın</string>
+    <string name="subtitle_offset_extra_hint_later_format">Alt yazılar %d ms erken görüntüleniyorsa bunu kullanın</string>
     <string name="subtitle_offset_extra_hint_before_format">Alt yazılar %d ms geç gözüküyorsa bunu kullanın</string>
     <string name="subtitle_offset_extra_hint_none_format">Alt yazı gecikmesi yok</string>
     <!--
@@ -387,7 +387,7 @@
     -->
     <string name="subtitles_example_text">Pijamalı hasta yağız şoföre çabucak güvendi</string>
     <string name="recommended">Önerilen</string>
-    <string name="player_loaded_subtitles" formatted="true">%s yüklendi</string>
+    <string name="player_loaded_subtitles" formatted="true">%s eklendi</string>
     <string name="player_load_subtitles">Dosyadan yükle</string>
     <string name="player_load_subtitles_online">İnternetten yükle</string>
     <string name="downloaded_file">İndirilen dosya</string>
@@ -422,10 +422,10 @@
     <string name="error_invalid_data">Geçersiz veri</string>
     <string name="error_invalid_url">Geçersiz URL</string>
     <string name="error">Hata</string>
-    <string name="subtitles_remove_captions">Alt yazılardan seçmeli alt yazıyı kaldır</string>
+    <string name="subtitles_remove_captions">Alt yazılardan seçmeli alt yazıyı (CC) kaldır</string>
     <string name="subtitles_remove_bloat">Alt yazılardaki şişkinliği kaldır</string>
     <string name="subtitles_filter_lang">Tercih edilen medya diline göre filtrele</string>
-    <string name="extras">Ekstralar</string>
+    <string name="extras">Ek içerikler</string>
     <string name="trailer">Fragman</string>
     <string name="network_adress_example">Yayına bağlan</string>
     <string name="referer">Yönlendiren</string>
@@ -433,7 +433,7 @@
     <string name="provider_languages_tip">Videoları bu dillerde izle</string>
     <string name="previous">Geri</string>
     <string name="skip_setup">Kurulumu atla</string>
-    <string name="app_layout_subtext">Cihazınıza uygun görünümü seçin</string>
+    <string name="app_layout_subtext">Cihazınıza uygun uygulama görünümünü seçin</string>
     <string name="crash_reporting_title">Çökme raporları</string>
     <string name="preferred_media_subtext">Ne izlemek istiyorsunuz</string>
     <string name="setup_done">Bitti</string>
@@ -445,7 +445,7 @@
     <string name="plugin_deleted">Eklenti silindi</string>
     <string name="plugin_load_fail" formatted="true">%s yüklenemedi</string>
     <string name="is_adult">+18</string>
-    <string name="batch_download_start_format" formatted="true">%d %s … indirilmeye başlandı</string>
+    <string name="batch_download_start_format" formatted="true">%d %s indirilmeye başlandı…</string>
     <string name="batch_download_finish_format" formatted="true">%d %s indirildi</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">%s\'nin tamamı zaten indirildi</string>
     <string name="batch_download">Toplu indir</string>
@@ -477,7 +477,7 @@
     <string name="safe_mode_crash_info">Çökme bilgisini göster</string>
     <string name="extension_rating" formatted="true">Puan: %s</string>
     <string name="extension_description">Açıklama</string>
-    <string name="extension_version">Versiyon</string>
+    <string name="extension_version">Sürüm</string>
     <string name="extension_status">Durum</string>
     <string name="extension_size">Boyut</string>
     <string name="extension_authors">Geliştiriciler</string>
@@ -499,14 +499,14 @@
     <string name="play_trailer_button">Fragmanı oynat</string>
     <string name="automatic_plugin_download_summary">Eklenen depolardan henüz yüklenmemiş tüm eklentileri otomatik olarak yükleyin.</string>
     <string name="update_started">Güncelleme başladı</string>
-    <string name="apk_installer_settings_des">Bazı cihazlar yeni paket yükleyiciyi desteklemez.. Güncellemele yüklenmezse eski seçeneği deneyin.</string>
+    <string name="apk_installer_settings_des">Bazı cihazlar yeni paket yükleyiciyi desteklemez.. Güncellemeler yüklenmezse eski seçeneği deneyin.</string>
     <string name="automatic_plugin_download">Eklentileri otomatik olarak indir</string>
     <string name="apk_installer_settings">APK indirici</string>
-    <string name="pref_category_links">Linkler</string>
+    <string name="pref_category_links">Bağlantılar</string>
     <string name="pref_category_app_updates">Uygulama güncellemeleri</string>
     <string name="pref_category_backup">Yedek</string>
     <string name="pref_category_player_features">Oynatıcı özellikleri</string>
-    <string name="pref_category_subtitles">Altyazılar</string>
+    <string name="pref_category_subtitles">Alt yazılar</string>
     <string name="pref_category_player_layout">Düzen</string>
     <string name="pref_category_defaults">Varsayılanlar</string>
     <string name="pref_category_extensions">Eklentiler</string>
@@ -531,22 +531,22 @@
     <string name="action_remove_from_watched">İzlenenlerden kaldır</string>
     <string name="skip_type_mixed_ed">Karışık son</string>
     <string name="skip_type_mixed_op">Karışık başlangıç</string>
-    <string name="skip_type_creddits">Kredi</string>
+    <string name="skip_type_creddits">Katkıda Bulunanlar</string>
     <string name="skip_type_intro">Giriş</string>
     <string name="plugin_downloaded">Eklenti İndirildi</string>
-    <string name="pref_category_actions">Aksiyonlar</string>
-    <string name="enable_skip_op_from_database_des">Açma/bitiş için atlama açılır pencerelerini göster</string>
+    <string name="pref_category_actions">Eylemler</string>
+    <string name="enable_skip_op_from_database_des">Açılış/bitiş için atlama açılır pencerelerini göster</string>
     <string name="clipboard_too_large">Çok fazla metin. Panoya kaydedilemiyor.</string>
     <string name="library">Kütüphane</string>
     <string name="browser">Tarayıcı</string>
     <string name="empty_library_no_accounts_message">Görünüşe göre kütüphaneniz boş :(
-\nBir kütüphane hesabına giriş yapın veya yerel kütüphanenize gösteri ekleyin</string>
+\nBir kütüphane hesabına giriş yapın veya yerel kütüphanenize içerik ekleyin</string>
     <string name="safe_mode_file">Güvenli mod dosyası bulundu!
 \nDosya kaldırılana kadar başlangıçta herhangi bir uzantı yüklenmiyor.</string>
     <string name="sort_by">Sırala</string>
     <string name="sort">Sırala</string>
-    <string name="sort_updated_new">Güncel (Yeniden Eskiye)</string>
-    <string name="sort_updated_old">Güncel (Eskiden Yeniye)</string>
+    <string name="sort_updated_new">Güncellenme (Yeniden Eskiye)</string>
+    <string name="sort_updated_old">Güncellenme (Eskiden Yeniye)</string>
     <string name="sort_alphabetical_a">Alfabetik (A\'dan Z’ye)</string>
     <string name="sort_alphabetical_z">Alfabetik (Z - A)</string>
     <string name="select_library">Kütüphane Seçin</string>
@@ -554,4 +554,27 @@
     <string name="empty_library_logged_in_message">Görünüşe göre bu liste boş, başka bir listeye geçmeyi deneyin</string>
     <string name="sort_rating_desc">Derecelendirme (Yüksekten Düşüğe)</string>
     <string name="sort_rating_asc">Derecelendirme (Düşükten Yükseğe)</string>
+    <string name="restart">Yeniden başlat</string>
+    <string name="android_tv_interface_off_seek_settings">Oynatıcı gizlenmişken atlanacak süre</string>
+    <string name="pref_category_bypass">İSS Kısıtlamaları</string>
+    <string name="jsdelivr_enabled">GitHub\'a ulaşılamadı, jsdelivr vekil sunucusu etkinleştiriliyor.</string>
+    <string name="start">Başlat</string>
+    <string name="test_passed">Başarılı oldu</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com vekil sunucusu (proxy)</string>
+    <string name="watch_quality_pref_data">Tercih edilen görüntü kalitesi (Mobil veri)</string>
+    <string name="android_tv_interface_on_seek_settings">Oynatıcı görünürken atlanacak süre</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Oynatıcı gizli durumdayken atlanacak süre miktarı</string>
+    <string name="jsdelivr_proxy_summary">jsdelivr kullanarak GitHub kısıtlamasını aşar. Güncellemeler birkaç gün gecikebilir.</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="subscription_episode_released">Yeni bölüm %d yayınlandı!</string>
+    <string name="category_provider_test">Sağlayıcıyı kontrol et</string>
+    <string name="test_failed">Başarısız oldu</string>
+    <string name="stop">Durdur</string>
+    <string name="revert">Geri al</string>
+    <string name="subscription_in_progress_notification">Abone olunan gösteriler güncelleniyor</string>
+    <string name="subscription_list_name">Abone olunan</string>
+    <string name="subscription_new">%s kanalına abone olundu</string>
+    <string name="subscription_deleted">%s kanalı aboneliğinden çıkıldı</string>
+    <string name="test_log">Günlük</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Oynatıcı görünür durumdayken atlanacak süre miktarı</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index a676b583..dc7a452e 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="search_poster_img_des">Постер</string>
-    <string name="episode_poster_img_des">Постер епізоду</string>
+    <string name="episode_poster_img_des">Постер до епізоду</string>
     <string name="download_canceled">Завантаження скасовано</string>
-    <string name="home_change_provider_img_des">Змінити постачальника</string>
+    <string name="home_change_provider_img_des">Змінити провайдера</string>
     <string name="go_back_img_des">Назад</string>
     <string name="rated_format" formatted="true">Рейтинг: %.1f</string>
     <string name="cast_format" formatted="true">Актори: %s</string>
-    <string name="next_episode_format" formatted="true">Епізод %d буде випущено через</string>
+    <string name="next_episode_format" formatted="true">Епізод %d вийде через</string>
     <string name="result_poster_img_des">Poster</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Еп. %d</string>
     <string name="next_episode_time_day_format" formatted="true">%dд %dгод %dхв</string>
@@ -15,14 +15,14 @@
     <string name="next_episode_time_min_format" formatted="true">%dхв</string>
     <string name="home_main_poster_img_des">Головний постер</string>
     <string name="home_next_random_img_des">Наступний випадковий</string>
-    <string name="preview_background_img_des">Перегляд фону</string>
+    <string name="preview_background_img_des">Попередній перегляд фону</string>
     <string name="player_speed_text_format" formatted="true">Швидкість (%.2fx)</string>
-    <string name="new_update_format" formatted="true">Нове оновлення знайдено!
+    <string name="new_update_format" formatted="true">Знайдено нове оновлення!
 \n%s -&gt; %s</string>
     <string name="title_search">Пошук</string>
     <string name="title_downloads">Завантаження</string>
     <string name="duration_format" formatted="true">%d хв</string>
-    <string name="title_settings">Параметри</string>
+    <string name="title_settings">Налаштування</string>
     <string name="search_hint">Пошук…</string>
     <string name="search_hint_site" formatted="true">Пошук %s…</string>
     <string name="no_data">Дані відсутні</string>
@@ -37,7 +37,7 @@
     <string name="type_dropped">Покинуто</string>
     <string name="play_movie_button">Переглянути фільм</string>
     <string name="play_trailer_button">Переглянути трейлер</string>
-    <string name="play_torrent_button">Переглянути торрент</string>
+    <string name="play_torrent_button">Трансляція через торрент</string>
     <string name="reload_error">Повторити підключення…</string>
     <string name="go_back">Назад</string>
     <string name="play_episode">Переглянути епізод</string>
@@ -64,7 +64,7 @@
     <string name="subs_edge_type">Тип контуру</string>
     <string name="subs_font">Шрифт</string>
     <string name="subs_font_size">Розмір шрифту</string>
-    <string name="search_provider_text_providers">Пошук за допомогою постачальників</string>
+    <string name="search_provider_text_providers">Пошук за допомогою провайдерів</string>
     <string name="search_provider_text_types">Пошук за типами</string>
     <string name="benene_count_text_none">Бананів немає</string>
     <string name="subs_auto_select_language">Автовибір мови</string>
@@ -75,25 +75,25 @@
     <string name="continue_watching">Продовжити перегляд</string>
     <string name="action_remove_watching">Вилучити</string>
     <string name="action_open_watching">Детальніше</string>
-    <string name="vpn_torrent">Цей постачальник є торрентом, рекомендується VPN</string>
+    <string name="vpn_torrent">Цей провайдер є торрентом, рекомендується VPN</string>
     <string name="torrent_plot">Опис</string>
     <string name="normal_no_plot">Сюжет не знайдено</string>
     <string name="torrent_no_plot">Опис не знайдено</string>
     <string name="show_log_cat">Показати Logcat 🐈</string>
-    <string name="picture_in_picture_des">Продовження відтворення в мініатюрному плеєрі поверх інших програм</string>
+    <string name="picture_in_picture_des">Продовження відтворення в мініатюрному плеєрі поверх інших застосунків</string>
     <string name="player_size_settings_des">Прибирає чорні рамки</string>
     <string name="player_subtitles_settings">Субтитри</string>
     <string name="chromecast_subtitles_settings">Субтитри Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Налаштування субтитрів Chromecast</string>
     <string name="eigengraumode_settings">Режим Eigengravy</string>
     <string name="swipe_to_change_settings">Проведіть пальцем, щоб змінити налаштування</string>
-    <string name="swipe_to_change_settings_des">Проведіть пальцем ліворуч або праворуч, щоб змінити яскравість або гучність</string>
+    <string name="swipe_to_change_settings_des">Проведіть пальцем вгору або вниз ліворуч або праворуч, щоб змінити яскравість або гучність</string>
     <string name="autoplay_next_settings_des">Відтворення наступного епізоду після закінчення поточного</string>
     <string name="title_home">Головна</string>
     <string name="app_name">CloudStream</string>
     <string name="filler" formatted="true">Філер</string>
     <string name="play_with_app_name">Програти в CloudStream</string>
-    <string name="stream">Потік</string>
+    <string name="stream">Трансляція</string>
     <string name="type_watching">Переглядаю</string>
     <string name="result_share">Поділитися</string>
     <string name="type_on_hold">Відкладено</string>
@@ -121,11 +121,11 @@
     <string name="subs_text_color">Колір тексту</string>
     <string name="subs_outline_color">Колір контуру</string>
     <string name="autoplay_next_settings">Автовідтворення наступного епізоду</string>
-    <string name="swipe_to_seek_settings_des">Проведіть пальцем ліворуч або праворуч, щоб керувати часом у відеоплеєрі</string>
+    <string name="swipe_to_seek_settings_des">Проведіть пальцем з боку в бік, щоб керувати своїм положенням у відео</string>
     <string name="benene_count_text">%d Бананів для розробників</string>
     <string name="player_size_settings">Кнопка зміни розміру плеєра</string>
     <string name="action_open_play">\@string/home_play</string>
-    <string name="vpn_might_be_needed">Для коректної роботи цього постачальника може знадобитися VPN</string>
+    <string name="vpn_might_be_needed">Для коректної роботи цього провайдера може знадобитися VPN</string>
     <string name="provider_info_meta">Метадані не надаються сайтом, завантаження відео не відбудеться, якщо їх немає на сайті.</string>
     <string name="picture_in_picture">Картинка в картинці</string>
     <string name="player_subtitles_settings_des">Налаштування субтитрів плеєра</string>
@@ -133,8 +133,8 @@
     <string name="swipe_to_seek_settings">Проведіть пальцем, щоб перемотати</string>
     <string name="double_tap_to_seek_settings">Двічі торкніться, щоб перемотати</string>
     <string name="double_tap_to_pause_settings">Двічі торкніться для паузи</string>
-    <string name="double_tap_to_seek_amount_settings">Крок перемотки</string>
-    <string name="double_tap_to_pause_settings_des">Натисніть посередині, щоб поставити на паузу</string>
+    <string name="double_tap_to_seek_amount_settings">Крок перемотки (Секунди)</string>
+    <string name="double_tap_to_pause_settings_des">Натисніть двічі посередині, щоб призупинити</string>
     <string name="use_system_brightness_settings">Використовувати яскравість системи</string>
     <string name="episode_sync_settings">Оновити прогрес перегляду</string>
     <string name="restore_settings">Відновлення даних з резервної копії</string>
@@ -147,23 +147,23 @@
     <string name="category_updates">Оновлення та резервне копіювання</string>
     <string name="settings_info">Інформація</string>
     <string name="advanced_search">Розширений пошук</string>
-    <string name="advanced_search_des">Надає результати пошуку, розділені за постачальниками</string>
+    <string name="advanced_search_des">Надає результати пошуку, розділені за провайдерами</string>
     <string name="bug_report_settings_off">Надсилає дані лише про збої</string>
     <string name="bug_report_settings_on">Не надсилає даних</string>
-    <string name="show_fillers_settings">Показати заповнюючий епізод для аніме</string>
+    <string name="show_fillers_settings">Показати філерний епізод для аніме</string>
     <string name="show_trailers_settings">Показати трейлери</string>
     <string name="pref_filter_search_quality">Приховати вибрану якість відео в результатах пошуку</string>
     <string name="automatic_plugin_download">Автоматичне завантаження плагінів</string>
-    <string name="updates_settings">Показати оновлення програми</string>
+    <string name="updates_settings">Показати оновлення застосунку</string>
     <string name="redo_setup_process">Повторний процес налаштування</string>
-    <string name="uprereleases_settings_des">Пошук лише попередніх оновлень, а не повних релізів</string>
+    <string name="uprereleases_settings_des">Пошук лише бета-оновлень, а не повних релізів</string>
     <string name="apk_installer_settings">Встановлювач APK</string>
     <string name="github">Github</string>
     <string name="lightnovel">Застосунок для легких новел від тих же розробників</string>
     <string name="anim">Застосунок для аніме від тих же розробників</string>
     <string name="benene">Дайте бананів розробникам</string>
-    <string name="app_language">Мова програми</string>
-    <string name="no_chromecast_support_toast">Цей постачальник не має підтримки Chromecast</string>
+    <string name="app_language">Мова застосунку</string>
+    <string name="no_chromecast_support_toast">Цей провайдер не має підтримки Chromecast</string>
     <string name="no_links_found_toast">Посилань не знайдено</string>
     <string name="play_episode_toast">Переглянути епізод</string>
     <string name="subs_default_reset_toast">Скинути до значення за замовчуванням</string>
@@ -180,7 +180,7 @@
 \nВи впевнені\?</string>
     <string name="resume_time_left" formatted="true">%dхв
 \nзалишилося</string>
-    <string name="status_ongoing">Триває</string>
+    <string name="status_ongoing">Виходить</string>
     <string name="status_completed">Завершено</string>
     <string name="rating">Рейтинг</string>
     <string name="duration">Тривалість</string>
@@ -189,7 +189,7 @@
     <string name="default_subtitles">За замовчуванням</string>
     <string name="free_storage">Вільно</string>
     <string name="used_storage">Зайнято</string>
-    <string name="app_storage">Програма</string>
+    <string name="app_storage">Застосунок</string>
     <string name="tv_series">Телесеріали</string>
     <string name="cartoons">Мультфільми</string>
     <string name="anime">Аніме</string>
@@ -208,7 +208,7 @@
     <string name="remote_error">Віддалена помилка</string>
     <string name="render_error">Помилка рендеринга</string>
     <string name="episode_action_chromecast_mirror">Дзеркало Chromecast</string>
-    <string name="episode_action_play_in_app">Переглянути в програмі</string>
+    <string name="episode_action_play_in_app">Переглянути в застосунку</string>
     <string name="episode_action_play_in_format">Переглянути в %s</string>
     <string name="episode_action_auto_download">Автозавантаження</string>
     <string name="episode_action_download_mirror">Завантажити дзеркало</string>
@@ -230,7 +230,7 @@
     <string name="kitsu_settings">Показати постери від Kitsu</string>
     <string name="automatic_plugin_updates">Автоматичне оновлення плагінів</string>
     <string name="automatic_plugin_download_summary">Автоматично встановлювати всі ще не встановлені плагіни з доданих репозиторіїв.</string>
-    <string name="updates_settings_des">Автоматичний пошук нових оновлень при запуску</string>
+    <string name="updates_settings_des">Автоматично шукати нові оновлення після запуску застосунку.</string>
     <string name="uprereleases_settings">Оновлення до бета-версій</string>
     <string name="copy_link_toast">Посилання скопійовано в буфер обміну</string>
     <string name="apk_installer_settings_des">Деякі телефони не підтримують новий інсталятор пакетів. Спробуйте стару версію, якщо оновлення не встановлюються.</string>
@@ -255,7 +255,7 @@
     <string name="documentaries">Документальні фільми</string>
     <string name="nsfw">NSFW</string>
     <string name="movies_singular">Фільм</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Торрент</string>
     <string name="show_hd">Мітка якості</string>
     <string name="nsfw_singular">NSFW</string>
@@ -273,7 +273,7 @@
     <string name="resize_fill">Заповнити</string>
     <string name="resize_zoom">Збільшити</string>
     <string name="tracks">Доріжки</string>
-    <string name="pref_category_app_updates">Оновлення програми</string>
+    <string name="pref_category_app_updates">Оновлення застосунку</string>
     <string name="pref_category_cache">Кеш</string>
     <string name="pref_category_gestures">Жести</string>
     <string name="pref_category_player_features">Особливості плеєра</string>
@@ -283,16 +283,16 @@
     <string name="pref_category_ui_features">Особливості</string>
     <string name="category_general">Загальне</string>
     <string name="random_button_settings">Випадкова кнопка</string>
-    <string name="random_button_settings_desc">Показати випадкову кнопку на Головній сторінці</string>
-    <string name="provider_lang_settings">Мови постачальника</string>
-    <string name="app_layout">Макет програми</string>
+    <string name="random_button_settings_desc">Показує кнопку на Головній сторінці, яка може вибрати випадковий фільм або серіал на Головній сторінці</string>
+    <string name="provider_lang_settings">Мови провайдера</string>
+    <string name="app_layout">Макет застосунку</string>
     <string name="preferred_media_settings">Бажані медіа</string>
     <string name="automatic">Авто</string>
     <string name="tv_layout">Макет телевізора</string>
     <string name="phone_layout">Макет телефону</string>
     <string name="emulator_layout">Макет емулятора</string>
     <string name="primary_color_settings">Основний колір</string>
-    <string name="app_theme_settings">Тема програми</string>
+    <string name="app_theme_settings">Тема застосунку</string>
     <string name="bottom_title_settings">Розташування назви постера</string>
     <string name="bottom_title_settings_des">Розмістіть назву під постером</string>
     <string name="example_password">пароль123</string>
@@ -363,7 +363,7 @@
     <string name="subtitles_encoding">Кодування субтитрів</string>
     <string name="enable_nsfw_on_providers">Включити NSFW на підтримуваних постачальників</string>
     <string name="category_ui">Макет</string>
-    <string name="category_providers">Постачальники</string>
+    <string name="category_providers">Провайдери</string>
     <string name="example_site_url">example.com</string>
     <string name="login_format" formatted="true">%s %s</string>
     <string name="subtitles_depressed">Депресивний</string>
@@ -429,7 +429,7 @@
     <string name="plugins_updated" formatted="true">Оновлено %d плагіни</string>
     <string name="blank_repo_message">За замовчуванням в CloudStream не встановлені сайти. Вам потрібно встановити сайти з репозиторіїв.
 \n
-\nЧерез безмозкий DMCA від Sky UK Limited 🤮 ми не можемо прив\'язати сайт репозиторію в застосунку.
+\nЧерез безмозкий DMCA від Sky UK Limited 🤮 ми не можемо прив\'язати сайт репозиторію в застосунок.
 \n
 \nПриєднуйтесь до нашого Discord або шукайте в інтернеті.</string>
     <string name="view_public_repositories_button">Переглянути репозиторії спільноти</string>
@@ -451,28 +451,28 @@
     <string name="player_settings_play_in_app">Вбудований плеєр</string>
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="player_settings_play_in_mpv">MPV</string>
-    <string name="player_settings_play_in_web">Відтворення веб-відео</string>
-    <string name="player_settings_play_in_browser">Веб-браузер</string>
-    <string name="skip_type_ed">Кінець</string>
+    <string name="player_settings_play_in_web">Відтворення вебвідео</string>
+    <string name="player_settings_play_in_browser">Веббраузер</string>
+    <string name="skip_type_ed">Ендінґ</string>
     <string name="skip_type_recap">Коротке повторення</string>
     <string name="skip_type_format" formatted="true">Пропустити %s</string>
-    <string name="skip_type_mixed_ed">Змішаний кінець</string>
+    <string name="skip_type_mixed_ed">Змішаний ендінґ</string>
     <string name="skip_type_creddits">Подяки</string>
-    <string name="skip_type_op">Опенінг</string>
+    <string name="skip_type_op">Опенінґ</string>
     <string name="skip_type_intro">Вступ</string>
     <string name="clear_history">Очистити історію</string>
     <string name="history">Історія</string>
-    <string name="enable_skip_op_from_database_des">Показувати спливаючі вікна для опенінгу/кінця</string>
+    <string name="enable_skip_op_from_database_des">Показувати спливаючі вікна для опенінґу/ендінґу</string>
     <string name="clipboard_too_large">Забагато тексту. Не вдалося зберегти в буфер обміну.</string>
     <string name="action_mark_as_watched">Позначити як переглянуте</string>
     <string name="confirm_exit_dialog">Ви впевнені що хочете вийти\?</string>
     <string name="yes">Так</string>
     <string name="no">Ні</string>
-    <string name="update_notification_installing">Установлення оновлення програми…</string>
-    <string name="update_notification_failed">Не вдалося встановити нову версію програми</string>
+    <string name="update_notification_installing">Встановлення оновлення застосунку…</string>
+    <string name="update_notification_failed">Не вдалося встановити нову версію застосунку</string>
     <string name="apk_installer_legacy">Старий</string>
-    <string name="apk_installer_package_installer">Інсталятор пакетів</string>
-    <string name="delayed_update_notice">Програму буде оновлено після виходу</string>
+    <string name="apk_installer_package_installer">Встановлювач пакетів</string>
+    <string name="delayed_update_notice">Застосунок буде оновлено після виходу</string>
     <string name="delete_repository_plugins">Це також призведе до видалення всіх плагінів репозиторію</string>
     <string name="all_languages_preference">Всі мови</string>
     <string name="previous">Назад</string>
@@ -484,10 +484,10 @@
     <string name="player_pref">Бажаний відеоплеєр</string>
     <string name="safe_mode_title">Увімкнено безпечний режим</string>
     <string name="extension_authors">Автори</string>
-    <string name="update_notification_downloading">Завантаження оновлення програми…</string>
+    <string name="update_notification_downloading">Завантаження оновлення застосунку…</string>
     <string name="safe_mode_description">Усі розширення вимкнено через збій, щоб допомогти вам знайти те, що спричиняє проблеми.</string>
-    <string name="app_not_found_error">Програму не знайдено</string>
-    <string name="skip_type_mixed_op">Змішаний опенінг</string>
+    <string name="app_not_found_error">Застосунок не знайдено</string>
+    <string name="skip_type_mixed_op">Змішаний опенінґ</string>
     <string name="action_remove_from_watched">Видалити з переглянутого</string>
     <string name="sort_updated_old">За оновленням (від старого до нового)</string>
     <string name="sort_updated_new">За оновленням (від нового до старого)</string>
@@ -517,17 +517,16 @@
     <string name="test_log">Журнал</string>
     <string name="start">Старт</string>
     <string name="stop">Стоп</string>
-    <string name="category_provider_test">Тест постачальника</string>
+    <string name="category_provider_test">Тест провайдер</string>
     <string name="subscription_in_progress_notification">Оновлення підписаних шоу</string>
     <string name="subscription_list_name">Підписано</string>
     <string name="subscription_new">Підписано на %s</string>
     <string name="subscription_deleted">Відписатися від %s</string>
     <string name="subscription_episode_released">Епізод %d випущено!</string>
     <string name="revert">Повернути</string>
-    <string name="jsdelivr_proxy">raw.githubusercontent.com
-\nProxy</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com Проксі</string>
     <string name="jsdelivr_enabled">Не вдалося зв\'язатися з GitHub, увімкнувши проксі-сервер jsdelivr.</string>
     <string name="pref_category_bypass">Обходи ISP</string>
-    <string name="jsdelivr_proxy_summary">Обходити блокування GitHub з використанням jsdlitr, може викликати затримку оновлень на кілька днів.</string>
+    <string name="jsdelivr_proxy_summary">За допомогою jsdelivr можна обійти блокування GitHub. Можлива затримка оновлень на кілька днів.</string>
     <string name="watch_quality_pref_data">Бажана якість перегляду (Мобільні дані)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 72d62a04..a14b87cc 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -142,14 +142,14 @@
     <string name="eigengraumode_settings">倍速模式</string>
     <string name="eigengraumode_settings_des">在播放器中添加播放速度选项</string>
     <string name="swipe_to_seek_settings">滑动控制进度</string>
-    <string name="swipe_to_seek_settings_des">左右滑动控制播放进度</string>
+    <string name="swipe_to_seek_settings_des">左右滑动以控制视频中的位置</string>
     <string name="swipe_to_change_settings">滑动更改设置</string>
     <string name="swipe_to_change_settings_des">上下滑动修改亮度或音量</string>
     <string name="autoplay_next_settings">自动播放下一集</string>
     <string name="autoplay_next_settings_des">播放完毕后播放下一集</string>
     <string name="double_tap_to_seek_settings">双击控制进度</string>
     <string name="double_tap_to_pause_settings">双击暂停</string>
-    <string name="double_tap_to_seek_amount_settings">双击控制进度时间</string>
+    <string name="double_tap_to_seek_amount_settings">双击控制进度时间 （秒）</string>
     <string name="double_tap_to_seek_settings_des">在左右侧双击快进或快退</string>
     <string name="double_tap_to_pause_settings_des">双击中间暂停</string>
     <string name="use_system_brightness_settings">使用系统亮度</string>
@@ -178,7 +178,7 @@
     <string name="automatic_plugin_updates">自动更新插件</string>
     <string name="automatic_plugin_download">自动下载插件</string>
     <string name="updates_settings">显示应用更新</string>
-    <string name="updates_settings_des">启动时自动搜索更新</string>
+    <string name="updates_settings_des">启动应用后自动搜索更新。</string>
     <string name="uprereleases_settings">更新至预览版</string>
     <string name="uprereleases_settings_des">搜索预览版更新替代仅搜索完整版本</string>
     <string name="github">Github</string>
@@ -245,8 +245,8 @@
     <string name="movies_singular">电影</string>
     <string name="tv_series_singular">电视剧</string>
     <string name="cartoons_singular">卡通</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">动漫</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">种子</string>
     <string name="documentaries_singular">纪录片</string>
     <string name="asian_drama_singular">亚洲剧</string>
@@ -311,7 +311,7 @@
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">通用</string>
     <string name="random_button_settings">随机按钮</string>
-    <string name="random_button_settings_desc">在主页中显示随机按钮</string>
+    <string name="random_button_settings_desc">在主页上显示按钮，可以从主页上随机选择电影或电视剧</string>
     <string name="provider_lang_settings">片源语言</string>
     <string name="app_layout">应用布局</string>
     <string name="preferred_media_settings">首选类型</string>
@@ -573,7 +573,7 @@
     <string name="test_log">日志</string>
     <string name="jsdelivr_proxy">raw.githubusercontent.com 代理</string>
     <string name="jsdelivr_enabled">连接 Github 失败，正在启用 jsdelivr 代理。</string>
-    <string name="jsdelivr_proxy_summary">使用 jsdelivr 绕过对 Github 的封锁，可能导致更新延迟几天。</string>
+    <string name="jsdelivr_proxy_summary">使用jsdelivr，可以绕过GitHub的封锁。可能会延迟几天的更新。</string>
     <string name="pref_category_bypass">ISP 绕过</string>
     <string name="revert">还原</string>
     <string name="watch_quality_pref_data">首选播放画质（移动数据）</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 49380b5e..911c0d07 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -210,17 +210,17 @@
     <string name="eigengraumode_settings">Eigengravy Mode</string>
     <string name="eigengraumode_settings_des">Adds a speed option in the player</string>
     <string name="swipe_to_seek_settings">Swipe to seek</string>
-    <string name="swipe_to_seek_settings_des">Swipe left or right to control time in the videoplayer</string>
+    <string name="swipe_to_seek_settings_des">Swipe from side to side to control your position in a video</string>
     <string name="swipe_to_change_settings">Swipe to change settings</string>
-    <string name="swipe_to_change_settings_des">Swipe on the left or right side to change brightness or volume</string>
+    <string name="swipe_to_change_settings_des">Slide up or down on the left or right side to change brightness or volume</string>
     <string name="autoplay_next_settings">Autoplay next episode</string>
     <string name="autoplay_next_settings_des">Start the next episode when the current one ends</string>
     <string name="double_tap_to_seek_settings">Double tap to seek</string>
     <string name="double_tap_to_pause_settings">Double tap to pause</string>
-    <string name="double_tap_to_seek_amount_settings">Player seek amount</string>
+    <string name="double_tap_to_seek_amount_settings">Player seek amount (Seconds)</string>
     <string name="double_tap_to_seek_settings_des">Tap twice on the right or left side to seek forwards or backwards
     </string>
-    <string name="double_tap_to_pause_settings_des">Tap in the middle to pause</string>
+    <string name="double_tap_to_pause_settings_des">Tap twice in the middle to pause</string>
     <string name="use_system_brightness_settings">Use system brightness</string>
     <string name="use_system_brightness_settings_des">Use system brightness in the app player instead of a dark
         overlay
@@ -251,7 +251,7 @@
     <string name="automatic_plugin_download">Automatically download plugins</string>
     <string name="automatic_plugin_download_summary">Automatically install all not yet installed plugins from added repositories.</string>
     <string name="updates_settings">Show app updates</string>
-    <string name="updates_settings_des">Automatically search for new updates on start</string>
+    <string name="updates_settings_des">Automatically search for new updates after starting the app.</string>
     <string name="redo_setup_process">Redo setup process</string>
     <string name="uprereleases_settings">Update to prereleases</string>
     <string name="uprereleases_settings_des">Search for prerelease updates instead of full releases only</string>
@@ -324,8 +324,8 @@
     <string name="movies_singular">Movie</string>
     <string name="tv_series_singular">Series</string>
     <string name="cartoons_singular">Cartoon</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">Anime</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Documentary</string>
     <string name="asian_drama_singular">Asian Drama</string>
@@ -383,7 +383,7 @@
     <string name="dns_pref_summary">Useful for bypassing ISP blocks</string>
     <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
     <string name="jsdelivr_enabled">Failed to reach GitHub, enabling jsdelivr proxy.</string>
-    <string name="jsdelivr_proxy_summary">Bypasses blocking of GitHub using jsdelivr, may cause updates to be delayed by few days.</string>
+    <string name="jsdelivr_proxy_summary">Using jsdelivr, GitHub blocking can be bypassed. May delay updates by a few days.</string>
     <string name="add_site_pref">Clone site</string>
     <string name="remove_site_pref">Remove site</string>
     <string name="add_site_summary">Add a clone of an existing site, with a different URL</string>
@@ -428,7 +428,7 @@
     <string name="pref_category_ui_features">Features</string>
     <string name="category_general">General</string>
     <string name="random_button_settings">Random Button</string>
-    <string name="random_button_settings_desc">Show random button on Homepage</string>
+    <string name="random_button_settings_desc">Shows button on Homepage which can choose a random movie or TV series from the Homepage</string>
     <string name="provider_lang_settings">Provider languages</string>
     <string name="app_layout">App Layout</string>
     <string name="preferred_media_settings">Preferred media</string>
@@ -657,4 +657,4 @@
     <string name="subscription_new">Subscribed to %s</string>
     <string name="subscription_deleted">Unsubscribed from %s</string>
     <string name="subscription_episode_released">Episode %d released!</string>
-</resources>
+</resources>
\ No newline at end of file

From fab55d82c480c2de7a630b567c94e44fbc30ac41 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Thu, 9 Mar 2023 22:35:44 +0100
Subject: [PATCH 255/273] Translated using Weblate (Portuguese)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Dutch)

Currently translated at 74.0% (452 of 610 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (610 of 610 strings)

Added translation using Weblate (Malay)

Translated using Weblate (Russian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Turkish)

Currently translated at 99.1% (605 of 610 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (English)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (English)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (English)

Currently translated at 100.0% (610 of 610 strings)

Co-authored-by: Cliff Heraldo <123844876+clxf12@users.noreply.github.com>
Co-authored-by: Dan <denqwerta@gmail.com>
Co-authored-by: Felipe Nogueira <contato.fnog@gmail.com>
Co-authored-by: Fjuro <ifjuro@proton.me>
Co-authored-by: Frank Gerritsen Mulkes <frankgmwerk@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Samuel Gadiel <samuelgadiel@gmail.com>
Co-authored-by: Skrripy <rozihrash.ya6w7@simplelogin.com>
Co-authored-by: TZVS <akyasan@tuta.io>
Co-authored-by: Tang Yin <bingyuanshiye@126.com>
Co-authored-by: Walter H <walter75@gmail.com>
Co-authored-by: eightyy8 <oliver.kha@pm.me>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/en/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translation: Cloudstream/App
---
 app/src/main/res/values-ar/strings.xml |  18 +--
 app/src/main/res/values-cs/strings.xml |  18 +--
 app/src/main/res/values-es/strings.xml |  18 +--
 app/src/main/res/values-in/strings.xml |  18 +--
 app/src/main/res/values-ms/strings.xml |   2 +
 app/src/main/res/values-nl/strings.xml |  11 +-
 app/src/main/res/values-pt/strings.xml |  14 +-
 app/src/main/res/values-ru/strings.xml |  16 +--
 app/src/main/res/values-tr/strings.xml | 173 ++++++++++++++-----------
 app/src/main/res/values-uk/strings.xml |  33 +++--
 app/src/main/res/values-zh/strings.xml |  14 +-
 app/src/main/res/values/strings.xml    |  20 +--
 12 files changed, 191 insertions(+), 164 deletions(-)
 create mode 100644 app/src/main/res/values-ms/strings.xml

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index cfd761e3..ae45465b 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -119,16 +119,16 @@
     <string name="eigengraumode_settings">وضع إيغنغرافي</string>
     <string name="eigengraumode_settings_des">يضيف خيار السرعة في المُشغل</string>
     <string name="swipe_to_seek_settings">السحب لتقديم</string>
-    <string name="swipe_to_seek_settings_des">إسحب إلى اليسار أو اليمين للتحكم في الوقت في مُشغل الفيديو</string>
+    <string name="swipe_to_seek_settings_des">اسحب من جانب إلى آخر للتحكم في موضعك في مقطع فيديو</string>
     <string name="swipe_to_change_settings">السحب لتغيير الإعدادات</string>
-    <string name="swipe_to_change_settings_des">إسحب على الجانب الأيسر أو الأيمن لتغيير السطوع أو مستوى الصوت</string>
+    <string name="swipe_to_change_settings_des">مرر لأعلى أو لأسفل على الجانب الأيسر أو الأيمن لتغيير السطوع أو مستوى الصوت</string>
     <string name="autoplay_next_settings">تشغيل الحلقة التالية تلقائيًا</string>
     <string name="autoplay_next_settings_des">تبدأ الحلقة التالية عندما تنتهي الحالية</string>
     <string name="double_tap_to_seek_settings">النقر مرتان للتقديم للأمام أو للخلف</string>
     <string name="double_tap_to_pause_settings">الضغط مرتان لإيقاف مؤقت</string>
-    <string name="double_tap_to_seek_amount_settings">التحكم في مدى تقديم المُشغل</string>
+    <string name="double_tap_to_seek_amount_settings">التحكم في مدى تقديم المُشغل(ثوان)</string>
     <string name="double_tap_to_seek_settings_des">إضغط مرتين على الجانب الأيمن أو الأيسر للتقديم للأمام أو للخلف</string>
-    <string name="double_tap_to_pause_settings_des">إضغط في الوسط لإيقاف مؤقت</string>
+    <string name="double_tap_to_pause_settings_des">اضغط مرتين في المنتصف للتوقف</string>
     <string name="use_system_brightness_settings">استخدم سطوع النظام</string>
     <string name="use_system_brightness_settings_des">استخدم سطوع النظام في مُشغل التطبيق بدلاً من التراكب الداكن</string>
     <string name="episode_sync_settings">تحديث تقدم المشاهدة</string>
@@ -155,7 +155,7 @@
     <string name="automatic_plugin_updates">تحديث الإضافات تلقائيًا</string>
     <string name="automatic_plugin_download">تنزيل الإضافات تلقائيًا</string>
     <string name="updates_settings">التحديث التلقائي</string>
-    <string name="updates_settings_des">البحث تلقائيًا عن التحديثات الجديدة عند البداية</string>
+    <string name="updates_settings_des">ابحث تلقائيا عن التحديثات الجديدة بعد بدء التطبيق.</string>
     <string name="uprereleases_settings">التحديث إلى الاصدارات التجريبية (بيتا)</string>
     <string name="uprereleases_settings_des">البحث عن التحديثات التجريبية بدلاً من الإصدارات الكاملة فقط</string>
     <string name="github">غيت هاب</string>
@@ -218,8 +218,8 @@
     <string name="movies_singular">فيلم</string>
     <string name="tv_series_singular">مسلسل</string>
     <string name="cartoons_singular">كرتون</string>
-    <string name="anime_singular">أنمي</string>
-    <string name="ova_singular">اوفا</string>
+    <string name="anime_singular">أنيمي</string>
+    <string name="ova_singular">أوفا</string>
     <string name="torrent_singular">تورنت</string>
     <string name="documentaries_singular">وثائقي</string>
     <string name="asian_drama_singular">دراما آسيوية</string>
@@ -284,7 +284,7 @@
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">عام</string>
     <string name="random_button_settings">زر العشوائي</string>
-    <string name="random_button_settings_desc">إظهار زر العشوائي على الصفحة الرئيسية</string>
+    <string name="random_button_settings_desc">يظهر الزر على الصفحة الرئيسية والذي يمكنه اختيار فيلم عشوائي أو مسلسل تلفزيوني من الصفحة الرئيسية</string>
     <string name="provider_lang_settings">لغات المزود</string>
     <string name="app_layout">واجهة التطبيق</string>
     <string name="preferred_media_settings">المحتوى المفضل</string>
@@ -558,7 +558,7 @@
     <string name="pref_category_bypass">تجاوز مزود خدمة الإنترنت</string>
     <string name="revert">استرجاع</string>
     <string name="jsdelivr_enabled">فشل الوصول إلى GitHub ، وتمكين وكيل jsdelivr.</string>
-    <string name="jsdelivr_proxy_summary">تجاوز حظر GitHub باستخدام jsdelivr ، قد يتسبب في تأخير التحديثات لبضعة أيام.</string>
+    <string name="jsdelivr_proxy_summary">باستخدام jsdelivr ، يمكن تجاوز حظر GitHub. قد يؤخر التحديثات لبضعة أيام.</string>
     <string name="jsdelivr_proxy">وكيل raw.githubusercontent.com</string>
     <string name="watch_quality_pref_data">جودة المشاهدة المفضلة (بيانات الجوال)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e99e1010..67179b46 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -122,14 +122,14 @@
     <string name="eigengraumode_settings">Rychlostní režim</string>
     <string name="eigengraumode_settings_des">Přidá do přehrávače možnost rychlosti</string>
     <string name="swipe_to_seek_settings">Přejet pro posun</string>
-    <string name="swipe_to_seek_settings_des">Přejeďte prstem vlevo nebo vpravo pro ovládání času v přehrávači</string>
+    <string name="swipe_to_seek_settings_des">Přejeďte prstem ze strany na stranu pro ovládání své pozice ve videu</string>
     <string name="swipe_to_change_settings">Přejet pro změnu nastavení</string>
-    <string name="swipe_to_change_settings_des">Přejeďte prstem na levé nebo pravé straně pro změnu jasu nebo hlasitosti</string>
+    <string name="swipe_to_change_settings_des">Přejeďte prstem nahoru nebo dolů na levé nebo pravé straně pro změnu jasu nebo hlasitosti</string>
     <string name="double_tap_to_seek_settings">Dvojité klepnutí pro posun</string>
     <string name="double_tap_to_pause_settings">Dvojité klepnutí pro pozastavení</string>
-    <string name="double_tap_to_seek_amount_settings">Množství času k posunu</string>
+    <string name="double_tap_to_seek_amount_settings">Množství času k posunu (sekundy)</string>
     <string name="double_tap_to_seek_settings_des">Klepněte dvakrát vpravo nebo vlevo pro posun vpřed nebo vzad</string>
-    <string name="double_tap_to_pause_settings_des">Klepněte doprostřed pro pozastavení</string>
+    <string name="double_tap_to_pause_settings_des">Klepněte dvakrát doprostřed pro pozastavení</string>
     <string name="use_system_brightness_settings">Použít systémový jas</string>
     <string name="use_system_brightness_settings_des">V přehrávači použít systémov překrytí</string>
     <string name="episode_sync_settings">Aktualizovat postup sledování</string>
@@ -151,7 +151,7 @@
     <string name="bug_report_settings_on">Nebude odesílat žádná data</string>
     <string name="show_fillers_settings">Zobrazit výplňové epizody u anime</string>
     <string name="updates_settings">Zobrazit aktualizace aplikace</string>
-    <string name="updates_settings_des">Při spuštění automaticky zkontrolovat nové aktualizace</string>
+    <string name="updates_settings_des">Při spuštění aplikace automaticky zkontrolovat nové aktualizace.</string>
     <string name="uprereleases_settings">Aktualizovat na předběžná vydání</string>
     <string name="uprereleases_settings_des">Kontrolovat aktualizace předběžných vydání, místo normálních plných vydání</string>
     <string name="github">GitHub</string>
@@ -211,8 +211,8 @@
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Seriál</string>
     <string name="cartoons_singular">Animovaný</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">Anime</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Dokument</string>
     <string name="asian_drama_singular">Asijské drama</string>
@@ -266,7 +266,7 @@
     <string name="legal_notice_text" translatable="false">Jakékoli právní otázky týkající se obsahu této aplikace je třeba řešit se samotnými hostiteli a poskytovateli souborů, protože s nimi nejsme nijak spojeni. V případě porušení autorských práv se obraťte přímo na odpovědné strany nebo na webové stránky, na kterých se streamování odehrává. Aplikace je určena výhradně pro vzdělávací a osobní účely. CloudStream 3 v aplikaci nehostuje žádný obsah a nemá žádnou kontrolu nad tím, jaká média jsou v aplikaci umístěna nebo odstraněna. CloudStream 3 funguje jako jakýkoli jiný vyhledávač, například Google. Služba CloudStream 3 nehostuje, nenahrává ani nespravuje žádná videa, filmy ani obsah. Pouze vyhledává, agreguje a zobrazuje odkazy v pohodlném, uživatelsky přívětivém rozhraní. Pouze shromažďuje webové stránky třetích stran, které jsou veřejně přístupné prostřednictvím jakéhokoli běžného webového prohlížeče. Je odpovědností uživatele, aby se vyvaroval jakýchkoli akcí, které by mohly porušovat zákony platné v jeho lokalitě. Použijte CloudStream 3 na vlastní nebezpečí.</string>
     <string name="category_general">Obecné</string>
     <string name="random_button_settings">Náhodné tlačítko</string>
-    <string name="random_button_settings_desc">Zobrazit na domovské stránce náhodné tlačítko</string>
+    <string name="random_button_settings_desc">Zobrazit na domovské stránce tlačítko, kterým lze vybrat náhodný film nebo seriál z domovské stránky</string>
     <string name="provider_lang_settings">Jazyk poskytovatelů</string>
     <string name="app_layout">Rozložení aplikace</string>
     <string name="preferred_media_settings">Preferovaná média</string>
@@ -551,6 +551,6 @@
     <string name="jsdelivr_enabled">Nepodařilo se připojit ke GitHubu, povolování proxy jsdelivr.</string>
     <string name="watch_quality_pref_data">Upřednostněná kvalita sledování (mobilní data)</string>
     <string name="revert">Vrátit zpět</string>
-    <string name="jsdelivr_proxy_summary">Obchází blokování GitHubu pomocí jsdelivr, může způsobit zpoždění aktualizací o několik dní.</string>
+    <string name="jsdelivr_proxy_summary">Pomocí jsdelivr lze obejít blokování GitHubu. Může dojít ke zpoždění aktualizací o několik dní.</string>
     <string name="pref_category_bypass">Obcházení ISP</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0b195275..5c8ac532 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -51,10 +51,10 @@
     <string name="subtitles_raised">Elevado</string>
     <string name="subtitle_offset_extra_hint_later_format">Use esto si los subtítulos se muestran %d ms muy pronto</string>
     <string name="subtitle_offset_extra_hint_before_format">Use esto si los subtítulos se muestran %d ms tarde</string>
-    <string name="swipe_to_seek_settings_des">Desliza el dedo hacia la izquierda o hacia la derecha para controlar el tiempo en el reproductor de video</string>
+    <string name="swipe_to_seek_settings_des">Desliza el dedo de lado a lado para controlar la posición en un video</string>
     <string name="subtitles_filter_lang">Filtrar por idioma de medios preferido</string>
     <string name="subtitles_remove_captions">Eliminar Closed Captions (CC) de los subtítulos</string>
-    <string name="double_tap_to_seek_amount_settings">Cantidad de tiempo de búsqueda en el reproductor (en segundos)</string>
+    <string name="double_tap_to_seek_amount_settings">Cantidad de búsquedas del reproductor (segundos)</string>
     <string name="use_system_brightness_settings_des">Use el brillo del sistema en el reproductor de la app en lugar de una superposición oscura</string>
     <string name="limit_title_rez">Resolución del reproductor de video</string>
     <string name="player_settings_play_in_mpv">MPV</string>
@@ -205,16 +205,16 @@
     <string name="eigengraumode_settings">Modo Eigengravy</string>
     <string name="swipe_to_seek_settings">Deslice para avanzar/retroceder</string>
     <string name="swipe_to_change_settings">Deslice para cambiar la configuración</string>
-    <string name="swipe_to_change_settings_des">Deslice el dedo hacia la izquierda o hacia la derecha para cambiar el brillo o el volumen</string>
+    <string name="swipe_to_change_settings_des">Deslice hacia arriba o hacia abajo en el lado izquierdo o derecho para cambiar el brillo o el volumen</string>
     <string name="double_tap_to_seek_settings">Toca dos veces para buscar</string>
     <string name="double_tap_to_pause_settings">Tocar dos veces para pausar</string>
     <string name="double_tap_to_seek_settings_des">Toque dos veces en el lado derecho o izquierdo para buscar hacia adelante o hacia atrás</string>
-    <string name="double_tap_to_pause_settings_des">Toque en el medio para pausar</string>
+    <string name="double_tap_to_pause_settings_des">Toque dos veces en el medio para hacer una pausa</string>
     <string name="use_system_brightness_settings">Usar brillo del sistema</string>
     <string name="restore_settings">Restaurar datos desde el backup</string>
     <string name="backup_settings">Hacer copia de los datos (backup)</string>
     <string name="restore_success">Archivo de backup cargado</string>
-    <string name="updates_settings_des">Buscar automáticamente nuevas actualizaciones al inicio</string>
+    <string name="updates_settings_des">Busque automáticamente nuevas actualizaciones después de iniciar la aplicación.</string>
     <string name="redo_setup_process">Rehacer el proceso de configuración inicial</string>
     <string name="show_fillers_settings">Mostrar episodio de relleno para Anime</string>
     <string name="play_episode_toast">Reproducir Episodio</string>
@@ -306,7 +306,7 @@
     <string name="pref_category_looks">Aspecto</string>
     <string name="pref_category_ui_features">Características</string>
     <string name="random_button_settings">Botón de Al azar</string>
-    <string name="random_button_settings_desc">Muestra un botón de reproducción \"al azar\" en la página de inicio</string>
+    <string name="random_button_settings_desc">Muestra un botón de reproducción \"al azar\" en la página de inicio para poelículas y series</string>
     <string name="account">cuenta</string>
     <string name="logout">Cerrar sesión</string>
     <string name="switch_account">Cambiar cuenta</string>
@@ -363,8 +363,8 @@
     <string name="movies_singular">Película</string>
     <string name="tv_series_singular">Serie</string>
     <string name="cartoons_singular">Dibujo animado</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">Anime</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Documental</string>
     <string name="asian_drama_singular">Drama asiático</string>
@@ -525,7 +525,7 @@
     <string name="subscription_episode_released">¡Episodio %d publicado!</string>
     <string name="jsdelivr_proxy">Proxy raw.githubusercontent.com</string>
     <string name="jsdelivr_enabled">No se ha podido acceder a GitHub, activando el proxy jsdelivr.</string>
-    <string name="jsdelivr_proxy_summary">Evita el bloqueo de GitHub usando jsdelivr, puede causar que las actualizaciones se retrasen unos días.</string>
+    <string name="jsdelivr_proxy_summary">Con jsdelivr, se puede omitir el bloqueo de GitHub. Puede retrasar las actualizaciones unos días.</string>
     <string name="revert">Revertir</string>
     <string name="pref_category_bypass">ISP Bypasses</string>
     <string name="watch_quality_pref_data">Calidad de visualización preferida (Datos móviles)</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 0e383562..1913868a 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -120,14 +120,14 @@
     <string name="eigengraumode_settings">Mode Eigengravy</string>
     <string name="eigengraumode_settings_des">Menambahkan opsi kecepatan di pemutar</string>
     <string name="swipe_to_seek_settings">Geser untuk mengubah waktu</string>
-    <string name="swipe_to_seek_settings_des">Geser ke kiri atau kanan untuk mengontrol waktu di pemutar video</string>
+    <string name="swipe_to_seek_settings_des">Geser dari sisi ke sisi untuk mengontrol posisi dalam video</string>
     <string name="swipe_to_change_settings">Geser untuk mengubah pengaturan</string>
-    <string name="swipe_to_change_settings_des">Geser ke sisi kiri atau kanan untuk mengubah pencerahan atau volume</string>
+    <string name="swipe_to_change_settings_des">Geser ke atas atau ke bawah di sisi kiri atau kanan untuk mengubah kecerahan atau volume</string>
     <string name="double_tap_to_seek_settings">Tekan dua kali untuk mengubah waktu</string>
     <string name="double_tap_to_pause_settings">Tekan dua kali untuk menjeda</string>
-    <string name="double_tap_to_seek_amount_settings">Jumlah pengubah waktu pemutar</string>
+    <string name="double_tap_to_seek_amount_settings">Jumlah pengubah waktu pemutar (Detik)</string>
     <string name="double_tap_to_seek_settings_des">Tekan dua kali di sisi kanan atau kiri untuk mengubah waktu ke depan atau ke belakang</string>
-    <string name="double_tap_to_pause_settings_des">Tekan di tengah untuk menjeda</string>
+    <string name="double_tap_to_pause_settings_des">Tekan dua kali di tengah untuk menjeda</string>
     <string name="use_system_brightness_settings">Gunakan pencerahan sistem</string>
     <string name="use_system_brightness_settings_des">Gunakan pencerahan sistem di pemutar aplikasi dari pada hamparan gelap</string>
     <string name="episode_sync_settings">Update progres tontonan</string>
@@ -149,7 +149,7 @@
     <string name="bug_report_settings_on">Tidak mengirim data</string>
     <string name="show_fillers_settings">Tampilkan episode filler untuk anime</string>
     <string name="updates_settings">Tampilkan update aplikasi</string>
-    <string name="updates_settings_des">Secara otomatis mencari update terbaru saat aplikasi dibuka</string>
+    <string name="updates_settings_des">Secara otomatis mencari update terbaru setelah aplikasi dibuka.</string>
     <string name="uprereleases_settings">Update ke prarilis</string>
     <string name="uprereleases_settings_des">Hanya mencari update prarilis daripada rilis penuh</string>
     <string name="github">Github</string>
@@ -209,8 +209,8 @@
     <string name="movies_singular">Movie</string>
     <string name="tv_series_singular">Seri</string>
     <string name="cartoons_singular">Kartun</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">Anime</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Film Dokumenter</string>
     <string name="asian_drama_singular">Drama Asia</string>
@@ -264,7 +264,7 @@
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Umum</string>
     <string name="random_button_settings">Tombol Acak</string>
-    <string name="random_button_settings_desc">Tampilkan tombol acak di Beranda</string>
+    <string name="random_button_settings_desc">Tampilkan tombol di halaman utama yang dapat memilih seri film atau TV acak dari halaman utama</string>
     <string name="provider_lang_settings">Bahasa provider</string>
     <string name="app_layout">Tata Letak Aplikasi</string>
     <string name="preferred_media_settings">Media yang lebih diinginkan</string>
@@ -548,7 +548,7 @@
     <string name="subscription_episode_released">Episode %d telah rilis!</string>
     <string name="jsdelivr_proxy">raw.githubusercontent.com Proksi</string>
     <string name="jsdelivr_enabled">Gagal mencapai GitHub, mengaktifkan proksi jsdelivr.</string>
-    <string name="jsdelivr_proxy_summary">Bypass pemblokiran Github menggunakan JSDeliVR, dapat menyebabkan pembaruan tertunda beberapa hari.</string>
+    <string name="jsdelivr_proxy_summary">Mengunakan jsdelivers, bisa melewati pemblokiran GitHub. Mungkin dapat menyebabkan pembaruan tertunda dalam beberapa hari.</string>
     <string name="pref_category_bypass">Bypass ISP</string>
     <string name="revert">Pulihkan</string>
     <string name="watch_quality_pref_data">Nonton dengan kualitas yang di inginkan (Data Seluler)</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
new file mode 100644
index 00000000..a6b3daec
--- /dev/null
+++ b/app/src/main/res/values-ms/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c2561914..dd89c34a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -9,7 +9,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Poster</string>
     <string name="episode_poster_img_des">Aflevering Poster</string>
     <string name="home_main_poster_img_des">Hoofdposter</string>
     <string name="home_next_random_img_des">Volgende willekeurig</string>
@@ -128,14 +128,14 @@
     <string name="eigengraumode_settings">Eigengravy Modus</string>
     <string name="eigengraumode_settings_des">Voegt een snelheidsoptie toe in de speler</string>
     <string name="swipe_to_seek_settings">Swipe to seek</string>
-    <string name="swipe_to_seek_settings_des">Veeg naar links of rechts om de tijd in de videoplayer te regelen</string>
+    <string name="swipe_to_seek_settings_des">Veeg naar links of rechts om de tijd in de videospeler te regelen</string>
     <string name="swipe_to_change_settings">Veeg om instellingen te wijzigen</string>
     <string name="swipe_to_change_settings_des">Veeg naar links of rechts om de helderheid of het volume te wijzigen</string>
     <string name="double_tap_to_seek_settings">Dubbeltik om te zien</string>
     <string name="double_tap_to_pause_settings">Dubbeltik om te pauzeren</string>
-    <string name="double_tap_to_seek_amount_settings">Speler zoeken bedrag</string>
+    <string name="double_tap_to_seek_amount_settings">Videospeler aantal zoeken</string>
     <string name="double_tap_to_seek_settings_des">Tik twee keer aan de rechter- of linkerkant om vooruit of achteruit te zoeken</string>
-    <string name="double_tap_to_pause_settings_des">Tik in het midden om te pauzeren</string>
+    <string name="double_tap_to_pause_settings_des">Tik twee keer in het midden om te pauzeren</string>
     <string name="use_system_brightness_settings">Systeemhelderheid gebruiken</string>
     <string name="use_system_brightness_settings_des">Gebruik systeemhelderheid in de app-speler in plaats van een donkere overlay</string>
     <string name="episode_sync_settings">Kijkvoortgang bijwerken</string>
@@ -405,4 +405,7 @@
     <string name="autoplay_next_settings_des">Start de volgende episode wanneer deze afgelopen is</string>
     <string name="autoplay_next_settings">Volgende episode automatisch afspelen</string>
     <string name="update_started">De update is gestart</string>
+    <string name="library">Bibliotheek</string>
+    <string name="browser">Browser</string>
+    <string name="test_log">Logboek</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 0c846361..64ccb903 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -123,16 +123,16 @@
     <string name="eigengraumode_settings">Modo Eigengravy</string>
     <string name="eigengraumode_settings_des">Acrescenta uma opção de velocidade no player</string>
     <string name="swipe_to_seek_settings">Deslize para andar</string>
-    <string name="swipe_to_seek_settings_des">Deslize para a esq. ou dir. para controlar o tempo no player</string>
+    <string name="swipe_to_seek_settings_des">Deslize para os lados para controlar a posição em um vídeo</string>
     <string name="swipe_to_change_settings">Deslize para mudar as configurações</string>
-    <string name="swipe_to_change_settings_des">Deslize do lado esq. ou dir. para ajustar brilho ou volume</string>
+    <string name="swipe_to_change_settings_des">Deslize para cima ou para baixo, no lado esquerdo ou direito, para ajustar brilho ou volume</string>
     <string name="autoplay_next_settings">Reproduzir automaticamente próximo episódio</string>
     <string name="autoplay_next_settings_des">Começa o próximo episódio quando o atual termina</string>
     <string name="double_tap_to_seek_settings">Toque duplo para avançar</string>
     <string name="double_tap_to_pause_settings">Toque duplo para pôr em pausa</string>
-    <string name="double_tap_to_seek_amount_settings">Segundos avançados no player</string>
+    <string name="double_tap_to_seek_amount_settings">Tempo de busca no player (Segundos)</string>
     <string name="double_tap_to_seek_settings_des">Toque duplo no lado esq. ou dir. para andar para trás ou para a frente</string>
-    <string name="double_tap_to_pause_settings_des">Toque no meio para pôr em pausa</string>
+    <string name="double_tap_to_pause_settings_des">Toque duas vezes no meio para pausar</string>
     <string name="use_system_brightness_settings">Usar brilho da sistema</string>
     <string name="use_system_brightness_settings_des">Usar brilho do sistema no player em vez de uma sobreposição escura</string>
     <string name="episode_sync_settings">Atualizar progresso</string>
@@ -158,7 +158,7 @@
     <string name="pref_filter_search_quality">Esconder qualidades de vídeo selecionadas nos resultados da Pesquisa</string>
     <string name="automatic_plugin_updates">Atualizações de plugin automáticas</string>
     <string name="updates_settings">Mostrar atualizações da app</string>
-    <string name="updates_settings_des">Procurar novas atualizações automaticamente ao iniciar</string>
+    <string name="updates_settings_des">Procurar automaticamente por novas atualizações depois de iniciar o app.</string>
     <string name="uprereleases_settings">Atualizar para pré-lançamentos</string>
     <string name="uprereleases_settings_des">Procura atualizações de pré-lançamento em vez de só lançamentos oficiais</string>
     <string name="github">Github</string>
@@ -273,7 +273,7 @@
     <string name="legal_notice">Aviso Legal</string>
     <string name="category_general">Geral</string>
     <string name="random_button_settings">Botão Aleatório</string>
-    <string name="random_button_settings_desc">Mostra o botão Aleatório na página inicial</string>
+    <string name="random_button_settings_desc">Mostra o botão Aleatório na página inicial, que pode escolher aleatoriamente um filme ou série</string>
     <string name="provider_lang_settings">Idioma dos fornecedores</string>
     <string name="app_layout">Layout da App</string>
     <string name="preferred_media_settings">Mídia preferida</string>
@@ -444,7 +444,7 @@
     <string name="quality_cam">Cam</string>
     <string name="skip_type_intro">Abertura</string>
     <string name="select_library">Selecionar Biblioteca</string>
-    <string name="jsdelivr_proxy_summary">Contorna o bloqueio do GitHub ao usar jsdelivr, pode atrasar atualizações em alguns dias.</string>
+    <string name="jsdelivr_proxy_summary">Usando jsdelivr o bloqueio do GitHub pode ser contornado. Pode atrasar atualizações em alguns dias.</string>
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="all_languages_preference">Todas as linguagens</string>
     <string name="sort_updated_new">Atualizado (Novo para Antigo)</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e613cee4..5295bd35 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -142,10 +142,10 @@
     <string name="eigengraumode_settings_des">Добавляет опцию скорости в проигрывателе</string>
     <string name="swipe_to_seek_settings">Проведите пальцем для поиска</string>
     <string name="swipe_to_change_settings">Проведите пальцем для изменения настроек</string>
-    <string name="swipe_to_change_settings_des">Проведите пальцем по левой или правой стороне для изменения яркости или громкости</string>
+    <string name="swipe_to_change_settings_des">Проведите вверх или вниз по левой или правой стороне, чтобы изменить яркость или громкость</string>
     <string name="autoplay_next_settings">Автопроиграть следующего серия</string>
     <string name="play_torrent_button">Поток торрент</string>
-    <string name="swipe_to_seek_settings_des">Проведите пальцем влево или вправо, чтобы управлять временем в видеоплеере</string>
+    <string name="swipe_to_seek_settings_des">Проведите пальцем из стороны в сторону, чтобы управлять свое место в видеоролике</string>
     <string name="autoplay_next_settings_des">Начните следующий серию, когда закончится текущий</string>
     <string name="restore_success">Загружена резервная копия</string>
     <string name="restore_failed_format" formatted="true">Не удалось восстановить данные из %s</string>
@@ -159,7 +159,7 @@
     <string name="automatic_plugin_updates">Автоматическое обновление плагинов</string>
     <string name="automatic_plugin_download">Автоматическая загрузка плагинов</string>
     <string name="updates_settings">Показать обновления приложения</string>
-    <string name="updates_settings_des">Автоматически проверять обновления при старте</string>
+    <string name="updates_settings_des">Автоматически проверять обновления при старте приложения.</string>
     <string name="uprereleases_settings">Обновится до пре-релиза</string>
     <string name="apk_installer_settings">APK установщик</string>
     <string name="github">Github</string>
@@ -227,7 +227,7 @@
     <string name="used_storage">Использовано</string>
     <string name="double_tap_to_pause_settings">Двойное нажатие для паузы</string>
     <string name="double_tap_to_seek_settings_des">Коснитесь дважды правой или левой стороны для поиска вперед или назад</string>
-    <string name="double_tap_to_pause_settings_des">Нажмите в центре для паузы</string>
+    <string name="double_tap_to_pause_settings_des">Нажмите дважды в центре, чтобы сделать паузу</string>
     <string name="use_system_brightness_settings">Использовать системную яркость</string>
     <string name="episode_sync_settings_des">Автоматически синхронизировать текущий прогресс эпизода</string>
     <string name="backup_failed_error_format">Ошибка резервного копирования %s</string>
@@ -408,8 +408,8 @@
     <string name="subtitles_example_text">Съешь ещё этих мягких французских булок, да выпей же чаю</string>
     <string name="recommended">Рекомендуется</string>
     <string name="player_loaded_subtitles" formatted="true">Загружено %s</string>
-    <string name="anime_singular">\@нить/аниме</string>
-    <string name="ova_singular">\@нить/ova</string>
+    <string name="anime_singular">Аниме</string>
+    <string name="ova_singular">OVA</string>
     <string name="show_dub">Этикетка Dub</string>
     <string name="site">Сайт</string>
     <string name="pref_category_ui_features">Функции</string>
@@ -493,7 +493,7 @@
     <string name="subtitles_filter_lang">Фильтровать по предпочитаемому языку медиа</string>
     <string name="error_invalid_id">Неверный ID</string>
     <string name="network_adress_example">Ссылка на стрим</string>
-    <string name="random_button_settings_desc">Отображать рандомную кнопку на Главной странице</string>
+    <string name="random_button_settings_desc">Показывает кнопку на главной странице, с помощью которой можно выбрать случайный фильм или сериал с главной страницы</string>
     <string name="random_button_settings">Рандомная кнопка</string>
     <string name="apk_installer_legacy">Legacy (старый)</string>
     <string name="player_settings_play_in_web">Веб видеокаст</string>
@@ -501,7 +501,7 @@
     <string name="episode_action_reload_links">Перезагрузить ссылки</string>
     <string name="preferred_media_settings">Предпочтительные медиа</string>
     <string name="subtitles_depressed">Опущенные</string>
-    <string name="double_tap_to_seek_amount_settings">Объем перемотки плеера</string>
+    <string name="double_tap_to_seek_amount_settings">Объем перемотки плеера (секундах)</string>
     <string name="android_tv_interface_on_seek_settings_summary">Объем перемотка, используемый, когда плеер виден</string>
     <string name="android_tv_interface_on_seek_settings">Плеер показан - Перемотки объем</string>
     <string name="android_tv_interface_off_seek_settings">Плеер спрятан - Перемотки объем</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 807716d8..f53bb69d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -117,47 +117,47 @@
     <string name="benene_count_text_none">Hiç muz verilmedi</string>
     <string name="subs_auto_select_language">Otomatik seçilecek dil</string>
     <string name="subs_download_languages">İndirilecek diller</string>
-    <string name="subs_subtitle_languages">Alt yazı dili</string>
-    <string name="subs_hold_to_reset_to_default">Varsayılana döndürmek için basılı tut</string>
+    <string name="subs_subtitle_languages">Altyazı dili</string>
+    <string name="subs_hold_to_reset_to_default">Sıfırlamak için basılı tut</string>
     <string name="subs_import_text" formatted="true">Fontları içe aktarmak için %s konumuna yerleştirin</string>
     <string name="continue_watching">İzlemeye devam et</string>
     <string name="action_remove_watching">Kaldır</string>
     <string name="action_open_watching">Daha fazla bilgi</string>
     <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Bu sağlayıcının düzgün çalışması için bir VPN gerekebilir</string>
-    <string name="vpn_torrent">Bu sağlayıcı bir torrent. VPN önerilir</string>
+    <string name="vpn_torrent">Bu sağlayıcı torrent kullanıyor, bir VPN önerilir</string>
     <string name="provider_info_meta">Metadata site tarafından sağlanmamış, veri site\'de bulunmuyorsa video yüklenmesi başarısız olacak.</string>
     <string name="torrent_plot">Açıklama</string>
     <string name="normal_no_plot">Konu bulunamadı</string>
     <string name="torrent_no_plot">Açıklama bulunamadı</string>
-    <string name="show_log_cat">Logcat\'i göster 🐈</string>
-    <string name="picture_in_picture">Resim-içinde-resim</string>
-    <string name="picture_in_picture_des">Diğer uygulamaların üzerinde minyatür bir oynatıcıda oynatmaya devam eder</string>
+    <string name="show_log_cat">Logcat\'i görüntüle 🐈</string>
+    <string name="picture_in_picture">Görüntü içinde görüntü</string>
+    <string name="picture_in_picture_des">İçerik diğer uygulamaların üzerinde küçük bir pencerede oynatılmaya devam eder</string>
     <string name="player_size_settings">Oynatıcı yeniden boyutlandırma butonu</string>
-    <string name="player_size_settings_des">Siyah sınırları kaldır</string>
-    <string name="player_subtitles_settings">Alt yazı</string>
+    <string name="player_size_settings_des">Siyah sınır çizgilerini kaldır</string>
+    <string name="player_subtitles_settings">Alt yazılar</string>
     <string name="player_subtitles_settings_des">Oynatıcı alt yazı ayarları</string>
-    <string name="chromecast_subtitles_settings">Chromecast alt yazı</string>
+    <string name="chromecast_subtitles_settings">Chromecast alt yazıları</string>
     <string name="chromecast_subtitles_settings_des">Chromecast alt yazı ayarları</string>
-    <string name="eigengraumode_settings">Eigengravy modu</string>
-    <string name="eigengraumode_settings_des">Oynatıcıya bir hız seçeneği ekle</string>
-    <string name="swipe_to_seek_settings">Gözlemek için kaydır</string>
-    <string name="swipe_to_seek_settings_des">Zamanı ayarlamak için sağa veya sola kaydır</string>
+    <string name="eigengraumode_settings">Eigengrau modu</string>
+    <string name="eigengraumode_settings_des">Oynatıcıya hız seçeneği ekler</string>
+    <string name="swipe_to_seek_settings">Atlamak için kaydır</string>
+    <string name="swipe_to_seek_settings_des">Zamanı ayarlamak için yanlardan kaydır</string>
     <string name="swipe_to_change_settings">Ayarları değiştirmek için kaydır</string>
-    <string name="swipe_to_change_settings_des">Sol ve sağ taraftan kaydırarak parlaklık ve sesi ayarla</string>
+    <string name="swipe_to_change_settings_des">Sol ve sağ taraftan yukarı kaydırarak ekran parlaklığı ve sesi ayarla</string>
     <string name="autoplay_next_settings">Sonraki bölümü otomatik oynat</string>
     <string name="autoplay_next_settings_des">Mevcut bölüm bittiğinde sonraki bölüme başla</string>
-    <string name="double_tap_to_seek_settings">Gözlemek için çift tıkla</string>
-    <string name="double_tap_to_pause_settings">Durdurmak için çift tıkla</string>
-    <string name="double_tap_to_seek_amount_settings">Oynatıcı gözleme miktarı</string>
-    <string name="double_tap_to_seek_settings_des">İleri ve geri atlamak için sağa ve sola çift tıkla</string>
-    <string name="double_tap_to_pause_settings_des">Durdurmak için ortaya tıkla</string>
+    <string name="double_tap_to_seek_settings">Çift dokunarak atla</string>
+    <string name="double_tap_to_pause_settings">İki kez dokunarak duraklat</string>
+    <string name="double_tap_to_seek_amount_settings">Atlanacak süre (Saniye)</string>
+    <string name="double_tap_to_seek_settings_des">İleri ve geri atlamak için sağa ve sola iki kez dokun</string>
+    <string name="double_tap_to_pause_settings_des">Durdurmak için ekranın ortasına çift dokun</string>
     <string name="use_system_brightness_settings">Sistem parlaklığını kullan</string>
-    <string name="use_system_brightness_settings_des">Oynatıcıda karanlık kaplama yerine sistem parlaklığını kullan</string>
+    <string name="use_system_brightness_settings_des">Oynatıcıyı karartmak yerine sistem parlaklığını kullan</string>
     <string name="episode_sync_settings">İzleme ilerlemesini güncelle</string>
     <string name="episode_sync_settings_des">Mevcut bölüm ilerlemesini otomatik güncelle</string>
-    <string name="restore_settings">Yedekten geri yükle</string>
-    <string name="backup_settings">Verileri yedekleyin</string>
+    <string name="restore_settings">Verileri yedekten geri yükle</string>
+    <string name="backup_settings">Verileri yedekle</string>
     <string name="restore_success">Yedek dosyası yüklendi</string>
     <string name="restore_failed_format" formatted="true">Geri yükleme başarısız oldu: %s</string>
     <string name="backup_success">Başarıyla yedeklendi</string>
@@ -165,21 +165,21 @@
     <string name="backup_failed_error_format">%s yedeklenirken hata</string>
     <string name="search">Ara</string>
     <string name="category_account">Hesaplar</string>
-    <string name="category_updates">Güncellemeler ve yedek</string>
+    <string name="category_updates">Güncellemeler ve yedekleme</string>
     <string name="settings_info">Bilgi</string>
     <string name="advanced_search">Gelişmiş arama</string>
-    <string name="advanced_search_des">Sağlayıcılara göre ayrılmış arama sonuçlarını ver</string>
+    <string name="advanced_search_des">Arama sonuçlarını sağlayıcıya göre ayırır</string>
     <string name="bug_report_settings_off">Yalnızca çökmelerle ilgili verileri gönderir</string>
-    <string name="bug_report_settings_on">Hiç veri göndermez</string>
-    <string name="show_fillers_settings">Anime için filler bölümleri gösterir</string>
+    <string name="bug_report_settings_on">Veri göndermez</string>
+    <string name="show_fillers_settings">Anime için filler bölümleri göster</string>
     <string name="show_trailers_settings">Fragmanları göster</string>
     <string name="kitsu_settings">Kitsu\'dan posterleri göster</string>
-    <string name="pref_filter_search_quality">Seçilen video kalitelerini arama sonuçlarında gizle</string>
+    <string name="pref_filter_search_quality">Seçilen video kalitelerini arama sonuçlarında gösterme</string>
     <string name="automatic_plugin_updates">Otomatik eklenti güncellemeleri</string>
     <string name="updates_settings">Uygulama güncellemelerini göster</string>
-    <string name="updates_settings_des">Başlangıçta yeni güncellemeleri otomatik olarak ara</string>
-    <string name="uprereleases_settings">Ön sürümlere güncelle</string>
-    <string name="uprereleases_settings_des">Sadece tam sürümler yerine ön sürüm güncellemelerini de ara</string>
+    <string name="updates_settings_des">Uygulama başlatıldıktan sonra güncellemeleri otomatik olarak kontrol et.</string>
+    <string name="uprereleases_settings">Deneysel sürümlere güncelle</string>
+    <string name="uprereleases_settings_des">Yalnızca tam sürümler yerine deneysel güncellemeleri de ara</string>
     <string name="github">GitHub</string>
     <string name="lightnovel">Aynı geliştiriciler tarafından LightNovel uygulaması</string>
     <string name="anim">Aynı geliştiriciler tarafından anime uygulaması</string>
@@ -191,8 +191,8 @@
     <string name="no_links_found_toast">Bağlantı bulunamadı</string>
     <string name="copy_link_toast">Bağlantı panoya kopyalandı</string>
     <string name="play_episode_toast">Bölümü oynat</string>
-    <string name="subs_default_reset_toast">Varsayılana sıfırla</string>
-    <string name="acra_report_toast">Üzgünüz, uygulama çöktü. Geliştiricilere isimsiz bir hata raporu gönderilecek</string>
+    <string name="subs_default_reset_toast">Varsayılan değere sıfırla</string>
+    <string name="acra_report_toast">Üzgünüz, uygulama çöktü. Geliştiricilere anonim bir hata raporu gönderilecek</string>
     <string name="season">Sezon</string>
     <string name="season_format">%s %d%s</string>
     <string name="no_season">Sezon yok</string>
@@ -210,8 +210,8 @@
     <string name="resume">Sürdür</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">%s dosyası tamamen silinecek
-\nEmins misiniz\?</string>
+    <string name="delete_message" formatted="true">%s tamamen silinecek
+\nEmin misiniz\?</string>
     <string name="resume_time_left" formatted="true">%dm
 \nkaldı</string>
     <string name="status_ongoing">Devam ediyor</string>
@@ -236,9 +236,9 @@
     <string name="torrent">Torrentler</string>
     <string name="documentaries">Belgeseller</string>
     <string name="ova">OVA</string>
-    <string name="asian_drama">Asya dramaları</string>
+    <string name="asian_drama">Asya dizileri</string>
     <string name="livestreams">Canlı yayınlar</string>
-    <string name="nsfw">NSFW</string>
+    <string name="nsfw">+18</string>
     <string name="others">Diğerleri</string>
     <!--singular-->
     <string name="movies_singular">Film</string>
@@ -248,9 +248,9 @@
     <string name="ova_singular">\@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Belgesel</string>
-    <string name="asian_drama_singular">Asya draması</string>
+    <string name="asian_drama_singular">Asya dizisi</string>
     <string name="live_singular">Canlı yayın</string>
-    <string name="nsfw_singular">NSFW</string>
+    <string name="nsfw_singular">+18</string>
     <string name="other_singular">Video</string>
     <string name="source_error">Kaynak hatası</string>
     <string name="remote_error">Sunucu hatası</string>
@@ -259,10 +259,10 @@
     <string name="storage_error">İndirme hatası, depolama izinlerini kontrol edin</string>
     <string name="episode_action_chromecast_episode">Bölümü Chromecast ile yayınla</string>
     <string name="episode_action_chromecast_mirror">Bağlantıyı Chromecast ile yayınla</string>
-    <string name="episode_action_play_in_app">Uygulamada oynat</string>
-    <string name="episode_action_play_in_format">%s\'deda oynat</string>
+    <string name="episode_action_play_in_app">Burada oynat</string>
+    <string name="episode_action_play_in_format">%s üzerinden oynat</string>
     <string name="episode_action_play_in_browser">Tarayıcıda oynat</string>
-    <string name="episode_action_copy_link">Linki kopyala</string>
+    <string name="episode_action_copy_link">Bağlantıyı kopyala</string>
     <string name="episode_action_auto_download">Otomatik indir</string>
     <string name="episode_action_download_mirror">Şu kaynaktan indir</string>
     <string name="episode_action_reload_links">Bağlantıları yenile</string>
@@ -281,22 +281,22 @@
     <string name="video_lock">Kilitle</string>
     <string name="video_aspect_ratio_resize">Yeniden boyutlandır</string>
     <string name="video_source">Kaynak</string>
-    <string name="video_skip_op">OP\'yi geç</string>
+    <string name="video_skip_op">Jeneriği geç</string>
     <string name="dont_show_again">Bir daha gösterme</string>
     <string name="skip_update">Bu güncellemeyi atla</string>
     <string name="update">Güncelle</string>
-    <string name="watch_quality_pref">Tercih edilen izleme kalitesi</string>
-    <string name="limit_title">Oynatıcıdaki maksimum başlık karakter sayısı</string>
-    <string name="limit_title_rez">Oynatıcının üst tarafındaki öğeler</string>
+    <string name="watch_quality_pref">Tercih edilen görüntü kalitesi (WiFi)</string>
+    <string name="limit_title">Video oynatıcı başlığı karakter üst sınırı</string>
+    <string name="limit_title_rez">Oynatıcının çözünürlüğü</string>
     <string name="video_buffer_size_settings">Video arabelleği boyutu</string>
     <string name="video_buffer_length_settings">Video arabelleği uzunluğu</string>
-    <string name="video_buffer_disk_settings">Diskteki video önbelleği</string>
+    <string name="video_buffer_disk_settings">Hafızadaki video önbelleği</string>
     <string name="video_buffer_clear_settings">Video ve resim önbelleğini temizle</string>
-    <string name="video_ram_description">Android TV gibi düşük belleğe sahip cihazlarda çok yükseğe ayarlanırsa çökmelere neden olur.</string>
-    <string name="video_disk_description">Çok yükseğe ayarlanırsa, Android TV cihazları gibi düşük depolama alanına sahip sistemlerde sorunlara neden olabilir.</string>
-    <string name="dns_pref">HTTPS üzerinden DNS</string>
-    <string name="dns_pref_summary">ISP bloklarını atlatmak için kullanışlıdır</string>
-    <string name="add_site_pref">Klon site</string>
+    <string name="video_ram_description">Çok yükseğe ayarlanırsa düşük belleğe sahip cihazlarda çökmelere neden olur (örn. Android TV).</string>
+    <string name="video_disk_description">Çok yükseğe ayarlanırsa düşük depolama alanına sahip sistemlerde sorunlara neden olur (örn. Android TV).</string>
+    <string name="dns_pref">HTTPS üzerinden DNS (DoH)</string>
+    <string name="dns_pref_summary">İnternet Servis Sağlayıcısı (İSS) kısıtlamalarını aşmak için kullanışlıdır</string>
+    <string name="add_site_pref">Siteyi kopyala</string>
     <string name="remove_site_pref">Siteyi kaldır</string>
     <string name="add_site_summary">Farklı bir URL ile mevcut bir sitenin klonunu ekleyin</string>
     <string name="download_path_pref">İndirme konumu</string>
@@ -305,16 +305,16 @@
     <string name="resize_fit">Ekrana sığdır</string>
     <string name="resize_fill">Uzat</string>
     <string name="resize_zoom">Yakınlaştır</string>
-    <string name="legal_notice">Disclaimer</string>
+    <string name="legal_notice">Yasal Uyarı</string>
     <string name="legal_notice_key" translatable="false">legal_notice_key</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Genel</string>
-    <string name="random_button_settings">Rastgele butonu</string>
-    <string name="random_button_settings_desc">Ana sayfada rastgele butonunu göster</string>
+    <string name="random_button_settings">Rastgele İçerik</string>
+    <string name="random_button_settings_desc">Ana sayfada rastgele bir film veya dizi seçen bir tuş gösterir</string>
     <string name="provider_lang_settings">Sağlayıcı dilleri</string>
     <string name="app_layout">Uygulama düzeni</string>
     <string name="preferred_media_settings">Tercih edilen medya</string>
-    <string name="enable_nsfw_on_providers">Desteklenen sağlayıcılarda NSFW\'yi etkinleştir</string>
+    <string name="enable_nsfw_on_providers">Desteklenen sağlayıcılarda +18 içeriği etkinleştir</string>
     <string name="subtitles_encoding">Alt yazı kodlaması</string>
     <string name="category_providers">Sağlayıcılar</string>
     <string name="category_ui">Düzen</string>
@@ -336,7 +336,7 @@
     <string name="example_email">hello@world.com</string>
     <string name="example_ip">127.0.0.1</string>
     <string name="example_site_name">MyCoolSite</string>
-    <string name="example_site_url">example.com</string>
+    <string name="example_site_url">ornek.com</string>
     <string name="example_lang_name">Dil kodu (tr)</string>
     <!--
     <string name="mal_account_settings" translatable="false">MAL</string>
@@ -354,14 +354,14 @@
     <string name="add_account">Hesap ekle</string>
     <string name="create_account">Hesap oluştur</string>
     <string name="add_sync">Bölüm takibi ekle</string>
-    <string name="added_sync_format" formatted="true">Eklendi %s</string>
+    <string name="added_sync_format" formatted="true">%s eklendi</string>
     <string name="upload_sync">Senkronize et</string>
     <string name="sync_score">Puan</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="authenticated_user" formatted="true">%s için doğrulama başarılı</string>
-    <string name="authenticated_user_fail" formatted="true">%s için doğrulama başarısız</string>
+    <string name="authenticated_user" formatted="true">%s başarıyla doğrulandı</string>
+    <string name="authenticated_user_fail" formatted="true">%s ile giriş yapılamadı</string>
     <!-- ============ -->
     <string name="none">Hiçbiri</string>
     <string name="normal">Normal</string>
@@ -376,7 +376,7 @@
     <string name="subtitle_offset">Alt yazı senkronu</string>
     <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Alt yazı gecikmesi</string>
-    <string name="subtitle_offset_extra_hint_later_format">Alt yazılar %d ms erken gözüküyorsa bunu kullanın</string>
+    <string name="subtitle_offset_extra_hint_later_format">Alt yazılar %d ms erken görüntüleniyorsa bunu kullanın</string>
     <string name="subtitle_offset_extra_hint_before_format">Alt yazılar %d ms geç gözüküyorsa bunu kullanın</string>
     <string name="subtitle_offset_extra_hint_none_format">Alt yazı gecikmesi yok</string>
     <!--
@@ -387,7 +387,7 @@
     -->
     <string name="subtitles_example_text">Pijamalı hasta yağız şoföre çabucak güvendi</string>
     <string name="recommended">Önerilen</string>
-    <string name="player_loaded_subtitles" formatted="true">%s yüklendi</string>
+    <string name="player_loaded_subtitles" formatted="true">%s eklendi</string>
     <string name="player_load_subtitles">Dosyadan yükle</string>
     <string name="player_load_subtitles_online">İnternetten yükle</string>
     <string name="downloaded_file">İndirilen dosya</string>
@@ -422,10 +422,10 @@
     <string name="error_invalid_data">Geçersiz veri</string>
     <string name="error_invalid_url">Geçersiz URL</string>
     <string name="error">Hata</string>
-    <string name="subtitles_remove_captions">Alt yazılardan seçmeli alt yazıyı kaldır</string>
+    <string name="subtitles_remove_captions">Alt yazılardan seçmeli alt yazıyı (CC) kaldır</string>
     <string name="subtitles_remove_bloat">Alt yazılardaki şişkinliği kaldır</string>
     <string name="subtitles_filter_lang">Tercih edilen medya diline göre filtrele</string>
-    <string name="extras">Ekstralar</string>
+    <string name="extras">Ek içerikler</string>
     <string name="trailer">Fragman</string>
     <string name="network_adress_example">Yayına bağlan</string>
     <string name="referer">Yönlendiren</string>
@@ -433,7 +433,7 @@
     <string name="provider_languages_tip">Videoları bu dillerde izle</string>
     <string name="previous">Geri</string>
     <string name="skip_setup">Kurulumu atla</string>
-    <string name="app_layout_subtext">Cihazınıza uygun görünümü seçin</string>
+    <string name="app_layout_subtext">Cihazınıza uygun uygulama görünümünü seçin</string>
     <string name="crash_reporting_title">Çökme raporları</string>
     <string name="preferred_media_subtext">Ne izlemek istiyorsunuz</string>
     <string name="setup_done">Bitti</string>
@@ -445,7 +445,7 @@
     <string name="plugin_deleted">Eklenti silindi</string>
     <string name="plugin_load_fail" formatted="true">%s yüklenemedi</string>
     <string name="is_adult">+18</string>
-    <string name="batch_download_start_format" formatted="true">%d %s … indirilmeye başlandı</string>
+    <string name="batch_download_start_format" formatted="true">%d %s indirilmeye başlandı…</string>
     <string name="batch_download_finish_format" formatted="true">%d %s indirildi</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">%s\'nin tamamı zaten indirildi</string>
     <string name="batch_download">Toplu indir</string>
@@ -477,7 +477,7 @@
     <string name="safe_mode_crash_info">Çökme bilgisini göster</string>
     <string name="extension_rating" formatted="true">Puan: %s</string>
     <string name="extension_description">Açıklama</string>
-    <string name="extension_version">Versiyon</string>
+    <string name="extension_version">Sürüm</string>
     <string name="extension_status">Durum</string>
     <string name="extension_size">Boyut</string>
     <string name="extension_authors">Geliştiriciler</string>
@@ -499,14 +499,14 @@
     <string name="play_trailer_button">Fragmanı oynat</string>
     <string name="automatic_plugin_download_summary">Eklenen depolardan henüz yüklenmemiş tüm eklentileri otomatik olarak yükleyin.</string>
     <string name="update_started">Güncelleme başladı</string>
-    <string name="apk_installer_settings_des">Bazı cihazlar yeni paket yükleyiciyi desteklemez.. Güncellemele yüklenmezse eski seçeneği deneyin.</string>
+    <string name="apk_installer_settings_des">Bazı cihazlar yeni paket yükleyiciyi desteklemez.. Güncellemeler yüklenmezse eski seçeneği deneyin.</string>
     <string name="automatic_plugin_download">Eklentileri otomatik olarak indir</string>
     <string name="apk_installer_settings">APK indirici</string>
-    <string name="pref_category_links">Linkler</string>
+    <string name="pref_category_links">Bağlantılar</string>
     <string name="pref_category_app_updates">Uygulama güncellemeleri</string>
     <string name="pref_category_backup">Yedek</string>
     <string name="pref_category_player_features">Oynatıcı özellikleri</string>
-    <string name="pref_category_subtitles">Altyazılar</string>
+    <string name="pref_category_subtitles">Alt yazılar</string>
     <string name="pref_category_player_layout">Düzen</string>
     <string name="pref_category_defaults">Varsayılanlar</string>
     <string name="pref_category_extensions">Eklentiler</string>
@@ -531,22 +531,22 @@
     <string name="action_remove_from_watched">İzlenenlerden kaldır</string>
     <string name="skip_type_mixed_ed">Karışık son</string>
     <string name="skip_type_mixed_op">Karışık başlangıç</string>
-    <string name="skip_type_creddits">Kredi</string>
+    <string name="skip_type_creddits">Katkıda Bulunanlar</string>
     <string name="skip_type_intro">Giriş</string>
     <string name="plugin_downloaded">Eklenti İndirildi</string>
-    <string name="pref_category_actions">Aksiyonlar</string>
-    <string name="enable_skip_op_from_database_des">Açma/bitiş için atlama açılır pencerelerini göster</string>
+    <string name="pref_category_actions">Eylemler</string>
+    <string name="enable_skip_op_from_database_des">Açılış/bitiş için atlama açılır pencerelerini göster</string>
     <string name="clipboard_too_large">Çok fazla metin. Panoya kaydedilemiyor.</string>
     <string name="library">Kütüphane</string>
     <string name="browser">Tarayıcı</string>
     <string name="empty_library_no_accounts_message">Görünüşe göre kütüphaneniz boş :(
-\nBir kütüphane hesabına giriş yapın veya yerel kütüphanenize gösteri ekleyin</string>
+\nBir kütüphane hesabına giriş yapın veya yerel kütüphanenize içerik ekleyin</string>
     <string name="safe_mode_file">Güvenli mod dosyası bulundu!
 \nDosya kaldırılana kadar başlangıçta herhangi bir uzantı yüklenmiyor.</string>
     <string name="sort_by">Sırala</string>
     <string name="sort">Sırala</string>
-    <string name="sort_updated_new">Güncel (Yeniden Eskiye)</string>
-    <string name="sort_updated_old">Güncel (Eskiden Yeniye)</string>
+    <string name="sort_updated_new">Güncellenme (Yeniden Eskiye)</string>
+    <string name="sort_updated_old">Güncellenme (Eskiden Yeniye)</string>
     <string name="sort_alphabetical_a">Alfabetik (A\'dan Z’ye)</string>
     <string name="sort_alphabetical_z">Alfabetik (Z - A)</string>
     <string name="select_library">Kütüphane Seçin</string>
@@ -554,4 +554,27 @@
     <string name="empty_library_logged_in_message">Görünüşe göre bu liste boş, başka bir listeye geçmeyi deneyin</string>
     <string name="sort_rating_desc">Derecelendirme (Yüksekten Düşüğe)</string>
     <string name="sort_rating_asc">Derecelendirme (Düşükten Yükseğe)</string>
+    <string name="restart">Yeniden başlat</string>
+    <string name="android_tv_interface_off_seek_settings">Oynatıcı gizlenmişken atlanacak süre</string>
+    <string name="pref_category_bypass">İSS Kısıtlamaları</string>
+    <string name="jsdelivr_enabled">GitHub\'a ulaşılamadı, jsdelivr vekil sunucusu etkinleştiriliyor.</string>
+    <string name="start">Başlat</string>
+    <string name="test_passed">Başarılı oldu</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com vekil sunucusu (proxy)</string>
+    <string name="watch_quality_pref_data">Tercih edilen görüntü kalitesi (Mobil veri)</string>
+    <string name="android_tv_interface_on_seek_settings">Oynatıcı görünürken atlanacak süre</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Oynatıcı gizli durumdayken atlanacak süre miktarı</string>
+    <string name="jsdelivr_proxy_summary">jsdelivr kullanarak GitHub kısıtlamasını aşar. Güncellemeler birkaç gün gecikebilir.</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="subscription_episode_released">Yeni bölüm %d yayınlandı!</string>
+    <string name="category_provider_test">Sağlayıcıyı kontrol et</string>
+    <string name="test_failed">Başarısız oldu</string>
+    <string name="stop">Durdur</string>
+    <string name="revert">Geri al</string>
+    <string name="subscription_in_progress_notification">Abone olunan gösteriler güncelleniyor</string>
+    <string name="subscription_list_name">Abone olunan</string>
+    <string name="subscription_new">%s kanalına abone olundu</string>
+    <string name="subscription_deleted">%s kanalı aboneliğinden çıkıldı</string>
+    <string name="test_log">Günlük</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Oynatıcı görünür durumdayken atlanacak süre miktarı</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index a676b583..6dca29b4 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="search_poster_img_des">Постер</string>
-    <string name="episode_poster_img_des">Постер епізоду</string>
+    <string name="episode_poster_img_des">Постер до епізоду</string>
     <string name="download_canceled">Завантаження скасовано</string>
     <string name="home_change_provider_img_des">Змінити постачальника</string>
     <string name="go_back_img_des">Назад</string>
     <string name="rated_format" formatted="true">Рейтинг: %.1f</string>
     <string name="cast_format" formatted="true">Актори: %s</string>
-    <string name="next_episode_format" formatted="true">Епізод %d буде випущено через</string>
+    <string name="next_episode_format" formatted="true">Епізод %d вийде через</string>
     <string name="result_poster_img_des">Poster</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Еп. %d</string>
     <string name="next_episode_time_day_format" formatted="true">%dд %dгод %dхв</string>
@@ -15,16 +15,16 @@
     <string name="next_episode_time_min_format" formatted="true">%dхв</string>
     <string name="home_main_poster_img_des">Головний постер</string>
     <string name="home_next_random_img_des">Наступний випадковий</string>
-    <string name="preview_background_img_des">Перегляд фону</string>
+    <string name="preview_background_img_des">Попередній перегляд фону</string>
     <string name="player_speed_text_format" formatted="true">Швидкість (%.2fx)</string>
-    <string name="new_update_format" formatted="true">Нове оновлення знайдено!
+    <string name="new_update_format" formatted="true">Знайдено нове оновлення!
 \n%s -&gt; %s</string>
     <string name="title_search">Пошук</string>
     <string name="title_downloads">Завантаження</string>
     <string name="duration_format" formatted="true">%d хв</string>
     <string name="title_settings">Параметри</string>
     <string name="search_hint">Пошук…</string>
-    <string name="search_hint_site" formatted="true">Пошук %s…</string>
+    <string name="search_hint_site" formatted="true">Пошук на %s…</string>
     <string name="no_data">Дані відсутні</string>
     <string name="episode_more_options_des">Більше опцій</string>
     <string name="next_episode">Наступний епізод</string>
@@ -37,7 +37,7 @@
     <string name="type_dropped">Покинуто</string>
     <string name="play_movie_button">Переглянути фільм</string>
     <string name="play_trailer_button">Переглянути трейлер</string>
-    <string name="play_torrent_button">Переглянути торрент</string>
+    <string name="play_torrent_button">Трансляція через торрент</string>
     <string name="reload_error">Повторити підключення…</string>
     <string name="go_back">Назад</string>
     <string name="play_episode">Переглянути епізод</string>
@@ -87,13 +87,13 @@
     <string name="chromecast_subtitles_settings_des">Налаштування субтитрів Chromecast</string>
     <string name="eigengraumode_settings">Режим Eigengravy</string>
     <string name="swipe_to_change_settings">Проведіть пальцем, щоб змінити налаштування</string>
-    <string name="swipe_to_change_settings_des">Проведіть пальцем ліворуч або праворуч, щоб змінити яскравість або гучність</string>
+    <string name="swipe_to_change_settings_des">Проведіть пальцем вгору або вниз ліворуч або праворуч, щоб змінити яскравість або гучність</string>
     <string name="autoplay_next_settings_des">Відтворення наступного епізоду після закінчення поточного</string>
     <string name="title_home">Головна</string>
     <string name="app_name">CloudStream</string>
     <string name="filler" formatted="true">Філер</string>
     <string name="play_with_app_name">Програти в CloudStream</string>
-    <string name="stream">Потік</string>
+    <string name="stream">Трансляція</string>
     <string name="type_watching">Переглядаю</string>
     <string name="result_share">Поділитися</string>
     <string name="type_on_hold">Відкладено</string>
@@ -121,7 +121,7 @@
     <string name="subs_text_color">Колір тексту</string>
     <string name="subs_outline_color">Колір контуру</string>
     <string name="autoplay_next_settings">Автовідтворення наступного епізоду</string>
-    <string name="swipe_to_seek_settings_des">Проведіть пальцем ліворуч або праворуч, щоб керувати часом у відеоплеєрі</string>
+    <string name="swipe_to_seek_settings_des">Проведіть пальцем з боку в бік, щоб керувати своїм положенням у відео</string>
     <string name="benene_count_text">%d Бананів для розробників</string>
     <string name="player_size_settings">Кнопка зміни розміру плеєра</string>
     <string name="action_open_play">\@string/home_play</string>
@@ -133,8 +133,8 @@
     <string name="swipe_to_seek_settings">Проведіть пальцем, щоб перемотати</string>
     <string name="double_tap_to_seek_settings">Двічі торкніться, щоб перемотати</string>
     <string name="double_tap_to_pause_settings">Двічі торкніться для паузи</string>
-    <string name="double_tap_to_seek_amount_settings">Крок перемотки</string>
-    <string name="double_tap_to_pause_settings_des">Натисніть посередині, щоб поставити на паузу</string>
+    <string name="double_tap_to_seek_amount_settings">Крок перемотки (Секунди)</string>
+    <string name="double_tap_to_pause_settings_des">Натисніть двічі посередині, щоб призупинити</string>
     <string name="use_system_brightness_settings">Використовувати яскравість системи</string>
     <string name="episode_sync_settings">Оновити прогрес перегляду</string>
     <string name="restore_settings">Відновлення даних з резервної копії</string>
@@ -230,7 +230,7 @@
     <string name="kitsu_settings">Показати постери від Kitsu</string>
     <string name="automatic_plugin_updates">Автоматичне оновлення плагінів</string>
     <string name="automatic_plugin_download_summary">Автоматично встановлювати всі ще не встановлені плагіни з доданих репозиторіїв.</string>
-    <string name="updates_settings_des">Автоматичний пошук нових оновлень при запуску</string>
+    <string name="updates_settings_des">Автоматично шукати нові оновлення після запуску застосунку.</string>
     <string name="uprereleases_settings">Оновлення до бета-версій</string>
     <string name="copy_link_toast">Посилання скопійовано в буфер обміну</string>
     <string name="apk_installer_settings_des">Деякі телефони не підтримують новий інсталятор пакетів. Спробуйте стару версію, якщо оновлення не встановлюються.</string>
@@ -255,7 +255,7 @@
     <string name="documentaries">Документальні фільми</string>
     <string name="nsfw">NSFW</string>
     <string name="movies_singular">Фільм</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Торрент</string>
     <string name="show_hd">Мітка якості</string>
     <string name="nsfw_singular">NSFW</string>
@@ -283,7 +283,7 @@
     <string name="pref_category_ui_features">Особливості</string>
     <string name="category_general">Загальне</string>
     <string name="random_button_settings">Випадкова кнопка</string>
-    <string name="random_button_settings_desc">Показати випадкову кнопку на Головній сторінці</string>
+    <string name="random_button_settings_desc">Показує кнопку на Головній сторінці, яка може вибрати випадковий фільм або серіал на Головній сторінці</string>
     <string name="provider_lang_settings">Мови постачальника</string>
     <string name="app_layout">Макет програми</string>
     <string name="preferred_media_settings">Бажані медіа</string>
@@ -524,10 +524,9 @@
     <string name="subscription_deleted">Відписатися від %s</string>
     <string name="subscription_episode_released">Епізод %d випущено!</string>
     <string name="revert">Повернути</string>
-    <string name="jsdelivr_proxy">raw.githubusercontent.com
-\nProxy</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
     <string name="jsdelivr_enabled">Не вдалося зв\'язатися з GitHub, увімкнувши проксі-сервер jsdelivr.</string>
     <string name="pref_category_bypass">Обходи ISP</string>
-    <string name="jsdelivr_proxy_summary">Обходити блокування GitHub з використанням jsdlitr, може викликати затримку оновлень на кілька днів.</string>
+    <string name="jsdelivr_proxy_summary">За допомогою jsdelivr можна обійти блокування GitHub. Можлива затримка оновлень на кілька днів.</string>
     <string name="watch_quality_pref_data">Бажана якість перегляду (Мобільні дані)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 72d62a04..a14b87cc 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -142,14 +142,14 @@
     <string name="eigengraumode_settings">倍速模式</string>
     <string name="eigengraumode_settings_des">在播放器中添加播放速度选项</string>
     <string name="swipe_to_seek_settings">滑动控制进度</string>
-    <string name="swipe_to_seek_settings_des">左右滑动控制播放进度</string>
+    <string name="swipe_to_seek_settings_des">左右滑动以控制视频中的位置</string>
     <string name="swipe_to_change_settings">滑动更改设置</string>
     <string name="swipe_to_change_settings_des">上下滑动修改亮度或音量</string>
     <string name="autoplay_next_settings">自动播放下一集</string>
     <string name="autoplay_next_settings_des">播放完毕后播放下一集</string>
     <string name="double_tap_to_seek_settings">双击控制进度</string>
     <string name="double_tap_to_pause_settings">双击暂停</string>
-    <string name="double_tap_to_seek_amount_settings">双击控制进度时间</string>
+    <string name="double_tap_to_seek_amount_settings">双击控制进度时间 （秒）</string>
     <string name="double_tap_to_seek_settings_des">在左右侧双击快进或快退</string>
     <string name="double_tap_to_pause_settings_des">双击中间暂停</string>
     <string name="use_system_brightness_settings">使用系统亮度</string>
@@ -178,7 +178,7 @@
     <string name="automatic_plugin_updates">自动更新插件</string>
     <string name="automatic_plugin_download">自动下载插件</string>
     <string name="updates_settings">显示应用更新</string>
-    <string name="updates_settings_des">启动时自动搜索更新</string>
+    <string name="updates_settings_des">启动应用后自动搜索更新。</string>
     <string name="uprereleases_settings">更新至预览版</string>
     <string name="uprereleases_settings_des">搜索预览版更新替代仅搜索完整版本</string>
     <string name="github">Github</string>
@@ -245,8 +245,8 @@
     <string name="movies_singular">电影</string>
     <string name="tv_series_singular">电视剧</string>
     <string name="cartoons_singular">卡通</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">动漫</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">种子</string>
     <string name="documentaries_singular">纪录片</string>
     <string name="asian_drama_singular">亚洲剧</string>
@@ -311,7 +311,7 @@
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">通用</string>
     <string name="random_button_settings">随机按钮</string>
-    <string name="random_button_settings_desc">在主页中显示随机按钮</string>
+    <string name="random_button_settings_desc">在主页上显示按钮，可以从主页上随机选择电影或电视剧</string>
     <string name="provider_lang_settings">片源语言</string>
     <string name="app_layout">应用布局</string>
     <string name="preferred_media_settings">首选类型</string>
@@ -573,7 +573,7 @@
     <string name="test_log">日志</string>
     <string name="jsdelivr_proxy">raw.githubusercontent.com 代理</string>
     <string name="jsdelivr_enabled">连接 Github 失败，正在启用 jsdelivr 代理。</string>
-    <string name="jsdelivr_proxy_summary">使用 jsdelivr 绕过对 Github 的封锁，可能导致更新延迟几天。</string>
+    <string name="jsdelivr_proxy_summary">使用jsdelivr，可以绕过GitHub的封锁。可能会延迟几天的更新。</string>
     <string name="pref_category_bypass">ISP 绕过</string>
     <string name="revert">还原</string>
     <string name="watch_quality_pref_data">首选播放画质（移动数据）</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 49380b5e..911c0d07 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -210,17 +210,17 @@
     <string name="eigengraumode_settings">Eigengravy Mode</string>
     <string name="eigengraumode_settings_des">Adds a speed option in the player</string>
     <string name="swipe_to_seek_settings">Swipe to seek</string>
-    <string name="swipe_to_seek_settings_des">Swipe left or right to control time in the videoplayer</string>
+    <string name="swipe_to_seek_settings_des">Swipe from side to side to control your position in a video</string>
     <string name="swipe_to_change_settings">Swipe to change settings</string>
-    <string name="swipe_to_change_settings_des">Swipe on the left or right side to change brightness or volume</string>
+    <string name="swipe_to_change_settings_des">Slide up or down on the left or right side to change brightness or volume</string>
     <string name="autoplay_next_settings">Autoplay next episode</string>
     <string name="autoplay_next_settings_des">Start the next episode when the current one ends</string>
     <string name="double_tap_to_seek_settings">Double tap to seek</string>
     <string name="double_tap_to_pause_settings">Double tap to pause</string>
-    <string name="double_tap_to_seek_amount_settings">Player seek amount</string>
+    <string name="double_tap_to_seek_amount_settings">Player seek amount (Seconds)</string>
     <string name="double_tap_to_seek_settings_des">Tap twice on the right or left side to seek forwards or backwards
     </string>
-    <string name="double_tap_to_pause_settings_des">Tap in the middle to pause</string>
+    <string name="double_tap_to_pause_settings_des">Tap twice in the middle to pause</string>
     <string name="use_system_brightness_settings">Use system brightness</string>
     <string name="use_system_brightness_settings_des">Use system brightness in the app player instead of a dark
         overlay
@@ -251,7 +251,7 @@
     <string name="automatic_plugin_download">Automatically download plugins</string>
     <string name="automatic_plugin_download_summary">Automatically install all not yet installed plugins from added repositories.</string>
     <string name="updates_settings">Show app updates</string>
-    <string name="updates_settings_des">Automatically search for new updates on start</string>
+    <string name="updates_settings_des">Automatically search for new updates after starting the app.</string>
     <string name="redo_setup_process">Redo setup process</string>
     <string name="uprereleases_settings">Update to prereleases</string>
     <string name="uprereleases_settings_des">Search for prerelease updates instead of full releases only</string>
@@ -324,8 +324,8 @@
     <string name="movies_singular">Movie</string>
     <string name="tv_series_singular">Series</string>
     <string name="cartoons_singular">Cartoon</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">Anime</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Documentary</string>
     <string name="asian_drama_singular">Asian Drama</string>
@@ -383,7 +383,7 @@
     <string name="dns_pref_summary">Useful for bypassing ISP blocks</string>
     <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
     <string name="jsdelivr_enabled">Failed to reach GitHub, enabling jsdelivr proxy.</string>
-    <string name="jsdelivr_proxy_summary">Bypasses blocking of GitHub using jsdelivr, may cause updates to be delayed by few days.</string>
+    <string name="jsdelivr_proxy_summary">Using jsdelivr, GitHub blocking can be bypassed. May delay updates by a few days.</string>
     <string name="add_site_pref">Clone site</string>
     <string name="remove_site_pref">Remove site</string>
     <string name="add_site_summary">Add a clone of an existing site, with a different URL</string>
@@ -428,7 +428,7 @@
     <string name="pref_category_ui_features">Features</string>
     <string name="category_general">General</string>
     <string name="random_button_settings">Random Button</string>
-    <string name="random_button_settings_desc">Show random button on Homepage</string>
+    <string name="random_button_settings_desc">Shows button on Homepage which can choose a random movie or TV series from the Homepage</string>
     <string name="provider_lang_settings">Provider languages</string>
     <string name="app_layout">App Layout</string>
     <string name="preferred_media_settings">Preferred media</string>
@@ -657,4 +657,4 @@
     <string name="subscription_new">Subscribed to %s</string>
     <string name="subscription_deleted">Unsubscribed from %s</string>
     <string name="subscription_episode_released">Episode %d released!</string>
-</resources>
+</resources>
\ No newline at end of file

From 3a5d8725459a33e9f58a8923e172ef2cae85f0e9 Mon Sep 17 00:00:00 2001
From: "recloudstream[bot]"
 <111277985+recloudstream[bot]@users.noreply.github.com>
Date: Fri, 10 Mar 2023 20:01:20 +0000
Subject: [PATCH 256/273] update list of locales

---
 .../com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 078419e2..4aa859aa 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -78,6 +78,7 @@ val appLanguages = arrayListOf(
     Triple("", "ಕನ್ನಡ", "kn"),
     Triple("", "македонски", "mk"),
     Triple("", "മലയാളം", "ml"),
+    Triple("", "bahasa Melayu", "ms"),
     Triple("", "Nederlands", "nl"),
     Triple("", "norsk nynorsk", "nn"),
     Triple("", "norsk bokmål", "no"),

From 13ee8e21d06c34a5f01e476ee133a4acc4b854ea Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Fri, 10 Mar 2023 21:33:13 +0100
Subject: [PATCH 257/273] Semi-unfucked VLC on A13+

---
 .../lagradost/cloudstream3/MainActivity.kt    | 31 ++++++++++++-------
 .../ui/result/ResultViewModel2.kt             |  8 ++++-
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index a7449255..7818e357 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
 import android.util.AttributeSet
 import android.util.Log
@@ -34,7 +35,6 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.navigationrail.NavigationRailView
 import com.google.android.material.snackbar.Snackbar
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
-import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.APIHolder.allProviders
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.getApiDubstatusSettings
@@ -170,7 +170,12 @@ open class ResultResume(
 
 val VLC = object : ResultResume(
     VLC_PACKAGE,
-    "org.videolan.vlc.player.result",
+    // Android 13 intent restrictions fucks up specifically launching the VLC player
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+        "org.videolan.vlc.player.result"
+    } else {
+        Intent.ACTION_VIEW
+    },
     "extra_position",
     "extra_duration",
 ) {
@@ -733,15 +738,16 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                 } else {
                     this.setKey(getString(R.string.jsdelivr_proxy_key), true)
                     val parentView: View = findViewById(android.R.id.content)
-                    Snackbar.make(parentView, R.string.jsdelivr_enabled, Snackbar.LENGTH_LONG).let { snackbar ->
-                        snackbar.setAction(R.string.revert) {
-                            setKey(getString(R.string.jsdelivr_proxy_key), false)
+                    Snackbar.make(parentView, R.string.jsdelivr_enabled, Snackbar.LENGTH_LONG)
+                        .let { snackbar ->
+                            snackbar.setAction(R.string.revert) {
+                                setKey(getString(R.string.jsdelivr_proxy_key), false)
+                            }
+                            snackbar.setBackgroundTint(colorFromAttribute(R.attr.primaryGrayBackground))
+                            snackbar.setTextColor(colorFromAttribute(R.attr.textColor))
+                            snackbar.setActionTextColor(colorFromAttribute(R.attr.colorPrimary))
+                            snackbar.show()
                         }
-                        snackbar.setBackgroundTint(colorFromAttribute(R.attr.primaryGrayBackground))
-                        snackbar.setTextColor(colorFromAttribute(R.attr.textColor))
-                        snackbar.setActionTextColor(colorFromAttribute(R.attr.colorPrimary))
-                        snackbar.show()
-                    }
                 }
 
             }
@@ -1123,7 +1129,10 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
     suspend fun checkGithubConnectivity(): Boolean {
         return try {
-            app.get("https://raw.githubusercontent.com/recloudstream/.github/master/connectivitycheck", timeout = 5).text.trim() == "ok"
+            app.get(
+                "https://raw.githubusercontent.com/recloudstream/.github/master/connectivitycheck",
+                timeout = 5
+            ).text.trim() == "ok"
         } catch (t: Throwable) {
             false
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 2983b41d..46a8c9f6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.ui.result
 import android.app.Activity
 import android.content.*
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
@@ -1125,7 +1126,12 @@ class ResultViewModel2 : ViewModel() {
             1L
         }
 
-        component = VLC_COMPONENT
+        // Component no longer safe to use in A13 for VLC
+        // https://code.videolan.org/videolan/vlc-android/-/issues/2776
+        // This will likely need to be updated once VLC fixes their documentation.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            component = VLC_COMPONENT
+        }
 
         putExtra("from_start", !resume)
         putExtra("position", position)

From 29174dbb30a2713844199206cc0b2e5723283f6c Mon Sep 17 00:00:00 2001
From: LikDev-256 <81100289+LikDev-256@users.noreply.github.com>
Date: Mon, 13 Mar 2023 21:41:35 +0530
Subject: [PATCH 258/273] Feat: fix Streamsb (#417)

* Fix Streamsb

* feat(StreamSB) stream break: support audiotracks

* Revert "feat(StreamSB) stream break: support audiotracks"

This reverts commit 078caf9f88dc92bb7416f51458b1bbea73bfb9bf.

* Feat: fix Streamsb

They normally update source numbers like 50, 51 but instead of 52 they totally dumped everything and just flipped the number into 15
---
 .../main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
index b7477242..cac31328 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
@@ -134,7 +134,7 @@ open class StreamSB : ExtractorApi() {
             it.value.replace(Regex("(embed-|/e/)"), "")
         }.first()
 //        val master = "$mainUrl/sources48/6d6144797752744a454267617c7c${bytesToHex.lowercase()}7c7c4e61755a56456f34385243727c7c73747265616d7362/6b4a33767968506e4e71374f7c7c343837323439333133333462353935333633373836643638376337633462333634663539343137373761333635313533333835333763376333393636363133393635366136323733343435323332376137633763373337343732363536313664373336327c7c504d754478413835306633797c7c73747265616d7362"
-        val master = "$mainUrl/sources51/" + bytesToHex("||$id||||streamsb".toByteArray()) + "/"
+        val master = "$mainUrl/sources15/" + bytesToHex("||$id||||streamsb".toByteArray()) + "/"
         val headers = mapOf(
             "watchsb" to "sbstream",
         )

From 3e2b0f2a17243abbdfddd929544058b7977bc32a Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 10 Mar 2023 20:45:19 +0100
Subject: [PATCH 259/273] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Dutch)

Currently translated at 74.0% (452 of 610 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (610 of 610 strings)

Added translation using Weblate (Malay)

Translated using Weblate (Russian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Turkish)

Currently translated at 99.1% (605 of 610 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (English)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (English)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (English)

Currently translated at 100.0% (610 of 610 strings)

Co-authored-by: Cliff Heraldo <123844876+clxf12@users.noreply.github.com>
Co-authored-by: Dan <denqwerta@gmail.com>
Co-authored-by: Felipe Nogueira <contato.fnog@gmail.com>
Co-authored-by: Fjuro <ifjuro@proton.me>
Co-authored-by: Frank Gerritsen Mulkes <frankgmwerk@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Samuel Gadiel <samuelgadiel@gmail.com>
Co-authored-by: Skrripy <rozihrash.ya6w7@simplelogin.com>
Co-authored-by: TZVS <akyasan@tuta.io>
Co-authored-by: Tang Yin <bingyuanshiye@126.com>
Co-authored-by: Walter H <walter75@gmail.com>
Co-authored-by: eightyy8 <oliver.kha@pm.me>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/en/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translation: Cloudstream/App
---
 app/src/main/res/values-uk/strings.xml | 72 +++++++++++++-------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 6dca29b4..48856dbb 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -3,7 +3,7 @@
     <string name="search_poster_img_des">Постер</string>
     <string name="episode_poster_img_des">Постер до епізоду</string>
     <string name="download_canceled">Завантаження скасовано</string>
-    <string name="home_change_provider_img_des">Змінити постачальника</string>
+    <string name="home_change_provider_img_des">Змінити провайдера</string>
     <string name="go_back_img_des">Назад</string>
     <string name="rated_format" formatted="true">Рейтинг: %.1f</string>
     <string name="cast_format" formatted="true">Актори: %s</string>
@@ -22,7 +22,7 @@
     <string name="title_search">Пошук</string>
     <string name="title_downloads">Завантаження</string>
     <string name="duration_format" formatted="true">%d хв</string>
-    <string name="title_settings">Параметри</string>
+    <string name="title_settings">Налаштування</string>
     <string name="search_hint">Пошук…</string>
     <string name="search_hint_site" formatted="true">Пошук на %s…</string>
     <string name="no_data">Дані відсутні</string>
@@ -64,7 +64,7 @@
     <string name="subs_edge_type">Тип контуру</string>
     <string name="subs_font">Шрифт</string>
     <string name="subs_font_size">Розмір шрифту</string>
-    <string name="search_provider_text_providers">Пошук за допомогою постачальників</string>
+    <string name="search_provider_text_providers">Пошук за допомогою провайдерів</string>
     <string name="search_provider_text_types">Пошук за типами</string>
     <string name="benene_count_text_none">Бананів немає</string>
     <string name="subs_auto_select_language">Автовибір мови</string>
@@ -75,12 +75,12 @@
     <string name="continue_watching">Продовжити перегляд</string>
     <string name="action_remove_watching">Вилучити</string>
     <string name="action_open_watching">Детальніше</string>
-    <string name="vpn_torrent">Цей постачальник є торрентом, рекомендується VPN</string>
+    <string name="vpn_torrent">Цей провайдер є торрентом, рекомендується VPN</string>
     <string name="torrent_plot">Опис</string>
     <string name="normal_no_plot">Сюжет не знайдено</string>
     <string name="torrent_no_plot">Опис не знайдено</string>
     <string name="show_log_cat">Показати Logcat 🐈</string>
-    <string name="picture_in_picture_des">Продовження відтворення в мініатюрному плеєрі поверх інших програм</string>
+    <string name="picture_in_picture_des">Продовження відтворення в мініатюрному плеєрі поверх інших застосунків</string>
     <string name="player_size_settings_des">Прибирає чорні рамки</string>
     <string name="player_subtitles_settings">Субтитри</string>
     <string name="chromecast_subtitles_settings">Субтитри Chromecast</string>
@@ -125,7 +125,7 @@
     <string name="benene_count_text">%d Бананів для розробників</string>
     <string name="player_size_settings">Кнопка зміни розміру плеєра</string>
     <string name="action_open_play">\@string/home_play</string>
-    <string name="vpn_might_be_needed">Для коректної роботи цього постачальника може знадобитися VPN</string>
+    <string name="vpn_might_be_needed">Для коректної роботи цього провайдера може знадобитися VPN</string>
     <string name="provider_info_meta">Метадані не надаються сайтом, завантаження відео не відбудеться, якщо їх немає на сайті.</string>
     <string name="picture_in_picture">Картинка в картинці</string>
     <string name="player_subtitles_settings_des">Налаштування субтитрів плеєра</string>
@@ -147,23 +147,23 @@
     <string name="category_updates">Оновлення та резервне копіювання</string>
     <string name="settings_info">Інформація</string>
     <string name="advanced_search">Розширений пошук</string>
-    <string name="advanced_search_des">Надає результати пошуку, розділені за постачальниками</string>
+    <string name="advanced_search_des">Надає результати пошуку, розділені за провайдерами</string>
     <string name="bug_report_settings_off">Надсилає дані лише про збої</string>
     <string name="bug_report_settings_on">Не надсилає даних</string>
-    <string name="show_fillers_settings">Показати заповнюючий епізод для аніме</string>
+    <string name="show_fillers_settings">Показати філерний епізод для аніме</string>
     <string name="show_trailers_settings">Показати трейлери</string>
     <string name="pref_filter_search_quality">Приховати вибрану якість відео в результатах пошуку</string>
     <string name="automatic_plugin_download">Автоматичне завантаження плагінів</string>
-    <string name="updates_settings">Показати оновлення програми</string>
+    <string name="updates_settings">Показати оновлення застосунку</string>
     <string name="redo_setup_process">Повторний процес налаштування</string>
-    <string name="uprereleases_settings_des">Пошук лише попередніх оновлень, а не повних релізів</string>
+    <string name="uprereleases_settings_des">Пошук лише бета-оновлень, а не повних релізів</string>
     <string name="apk_installer_settings">Встановлювач APK</string>
     <string name="github">Github</string>
     <string name="lightnovel">Застосунок для легких новел від тих же розробників</string>
     <string name="anim">Застосунок для аніме від тих же розробників</string>
     <string name="benene">Дайте бананів розробникам</string>
-    <string name="app_language">Мова програми</string>
-    <string name="no_chromecast_support_toast">Цей постачальник не має підтримки Chromecast</string>
+    <string name="app_language">Мова застосунку</string>
+    <string name="no_chromecast_support_toast">Цей провайдер не має підтримки Chromecast</string>
     <string name="no_links_found_toast">Посилань не знайдено</string>
     <string name="play_episode_toast">Переглянути епізод</string>
     <string name="subs_default_reset_toast">Скинути до значення за замовчуванням</string>
@@ -180,7 +180,7 @@
 \nВи впевнені\?</string>
     <string name="resume_time_left" formatted="true">%dхв
 \nзалишилося</string>
-    <string name="status_ongoing">Триває</string>
+    <string name="status_ongoing">Виходить</string>
     <string name="status_completed">Завершено</string>
     <string name="rating">Рейтинг</string>
     <string name="duration">Тривалість</string>
@@ -189,7 +189,7 @@
     <string name="default_subtitles">За замовчуванням</string>
     <string name="free_storage">Вільно</string>
     <string name="used_storage">Зайнято</string>
-    <string name="app_storage">Програма</string>
+    <string name="app_storage">Застосунок</string>
     <string name="tv_series">Телесеріали</string>
     <string name="cartoons">Мультфільми</string>
     <string name="anime">Аніме</string>
@@ -208,7 +208,7 @@
     <string name="remote_error">Віддалена помилка</string>
     <string name="render_error">Помилка рендеринга</string>
     <string name="episode_action_chromecast_mirror">Дзеркало Chromecast</string>
-    <string name="episode_action_play_in_app">Переглянути в програмі</string>
+    <string name="episode_action_play_in_app">Переглянути в застосунку</string>
     <string name="episode_action_play_in_format">Переглянути в %s</string>
     <string name="episode_action_auto_download">Автозавантаження</string>
     <string name="episode_action_download_mirror">Завантажити дзеркало</string>
@@ -273,7 +273,7 @@
     <string name="resize_fill">Заповнити</string>
     <string name="resize_zoom">Збільшити</string>
     <string name="tracks">Доріжки</string>
-    <string name="pref_category_app_updates">Оновлення програми</string>
+    <string name="pref_category_app_updates">Оновлення застосунку</string>
     <string name="pref_category_cache">Кеш</string>
     <string name="pref_category_gestures">Жести</string>
     <string name="pref_category_player_features">Особливості плеєра</string>
@@ -284,15 +284,15 @@
     <string name="category_general">Загальне</string>
     <string name="random_button_settings">Випадкова кнопка</string>
     <string name="random_button_settings_desc">Показує кнопку на Головній сторінці, яка може вибрати випадковий фільм або серіал на Головній сторінці</string>
-    <string name="provider_lang_settings">Мови постачальника</string>
-    <string name="app_layout">Макет програми</string>
+    <string name="provider_lang_settings">Мови провайдера</string>
+    <string name="app_layout">Макет застосунку</string>
     <string name="preferred_media_settings">Бажані медіа</string>
     <string name="automatic">Авто</string>
     <string name="tv_layout">Макет телевізора</string>
     <string name="phone_layout">Макет телефону</string>
     <string name="emulator_layout">Макет емулятора</string>
     <string name="primary_color_settings">Основний колір</string>
-    <string name="app_theme_settings">Тема програми</string>
+    <string name="app_theme_settings">Тема застосунку</string>
     <string name="bottom_title_settings">Розташування назви постера</string>
     <string name="bottom_title_settings_des">Розмістіть назву під постером</string>
     <string name="example_password">пароль123</string>
@@ -363,7 +363,7 @@
     <string name="subtitles_encoding">Кодування субтитрів</string>
     <string name="enable_nsfw_on_providers">Включити NSFW на підтримуваних постачальників</string>
     <string name="category_ui">Макет</string>
-    <string name="category_providers">Постачальники</string>
+    <string name="category_providers">Провайдери</string>
     <string name="example_site_url">example.com</string>
     <string name="login_format" formatted="true">%s %s</string>
     <string name="subtitles_depressed">Депресивний</string>
@@ -429,7 +429,7 @@
     <string name="plugins_updated" formatted="true">Оновлено %d плагіни</string>
     <string name="blank_repo_message">За замовчуванням в CloudStream не встановлені сайти. Вам потрібно встановити сайти з репозиторіїв.
 \n
-\nЧерез безмозкий DMCA від Sky UK Limited 🤮 ми не можемо прив\'язати сайт репозиторію в застосунку.
+\nЧерез безмозкий DMCA від Sky UK Limited 🤮 ми не можемо прив\'язати сайт репозиторію в застосунок.
 \n
 \nПриєднуйтесь до нашого Discord або шукайте в інтернеті.</string>
     <string name="view_public_repositories_button">Переглянути репозиторії спільноти</string>
@@ -451,28 +451,28 @@
     <string name="player_settings_play_in_app">Вбудований плеєр</string>
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="player_settings_play_in_mpv">MPV</string>
-    <string name="player_settings_play_in_web">Відтворення веб-відео</string>
-    <string name="player_settings_play_in_browser">Веб-браузер</string>
-    <string name="skip_type_ed">Кінець</string>
+    <string name="player_settings_play_in_web">Відтворення вебвідео</string>
+    <string name="player_settings_play_in_browser">Веббраузер</string>
+    <string name="skip_type_ed">Ендінґ</string>
     <string name="skip_type_recap">Коротке повторення</string>
     <string name="skip_type_format" formatted="true">Пропустити %s</string>
-    <string name="skip_type_mixed_ed">Змішаний кінець</string>
+    <string name="skip_type_mixed_ed">Змішаний ендінґ</string>
     <string name="skip_type_creddits">Подяки</string>
-    <string name="skip_type_op">Опенінг</string>
+    <string name="skip_type_op">Опенінґ</string>
     <string name="skip_type_intro">Вступ</string>
     <string name="clear_history">Очистити історію</string>
     <string name="history">Історія</string>
-    <string name="enable_skip_op_from_database_des">Показувати спливаючі вікна для опенінгу/кінця</string>
+    <string name="enable_skip_op_from_database_des">Показувати спливаючі вікна для опенінґу/ендінґу</string>
     <string name="clipboard_too_large">Забагато тексту. Не вдалося зберегти в буфер обміну.</string>
     <string name="action_mark_as_watched">Позначити як переглянуте</string>
     <string name="confirm_exit_dialog">Ви впевнені що хочете вийти\?</string>
     <string name="yes">Так</string>
     <string name="no">Ні</string>
-    <string name="update_notification_installing">Установлення оновлення програми…</string>
-    <string name="update_notification_failed">Не вдалося встановити нову версію програми</string>
+    <string name="update_notification_installing">Встановлення оновлення застосунку…</string>
+    <string name="update_notification_failed">Не вдалося встановити нову версію застосунку</string>
     <string name="apk_installer_legacy">Старий</string>
-    <string name="apk_installer_package_installer">Інсталятор пакетів</string>
-    <string name="delayed_update_notice">Програму буде оновлено після виходу</string>
+    <string name="apk_installer_package_installer">Встановлювач пакетів</string>
+    <string name="delayed_update_notice">Застосунок буде оновлено після виходу</string>
     <string name="delete_repository_plugins">Це також призведе до видалення всіх плагінів репозиторію</string>
     <string name="all_languages_preference">Всі мови</string>
     <string name="previous">Назад</string>
@@ -484,10 +484,10 @@
     <string name="player_pref">Бажаний відеоплеєр</string>
     <string name="safe_mode_title">Увімкнено безпечний режим</string>
     <string name="extension_authors">Автори</string>
-    <string name="update_notification_downloading">Завантаження оновлення програми…</string>
+    <string name="update_notification_downloading">Завантаження оновлення застосунку…</string>
     <string name="safe_mode_description">Усі розширення вимкнено через збій, щоб допомогти вам знайти те, що спричиняє проблеми.</string>
-    <string name="app_not_found_error">Програму не знайдено</string>
-    <string name="skip_type_mixed_op">Змішаний опенінг</string>
+    <string name="app_not_found_error">Застосунок не знайдено</string>
+    <string name="skip_type_mixed_op">Змішаний опенінґ</string>
     <string name="action_remove_from_watched">Видалити з переглянутого</string>
     <string name="sort_updated_old">За оновленням (від старого до нового)</string>
     <string name="sort_updated_new">За оновленням (від нового до старого)</string>
@@ -517,14 +517,14 @@
     <string name="test_log">Журнал</string>
     <string name="start">Старт</string>
     <string name="stop">Стоп</string>
-    <string name="category_provider_test">Тест постачальника</string>
+    <string name="category_provider_test">Тест провайдер</string>
     <string name="subscription_in_progress_notification">Оновлення підписаних шоу</string>
     <string name="subscription_list_name">Підписано</string>
     <string name="subscription_new">Підписано на %s</string>
     <string name="subscription_deleted">Відписатися від %s</string>
     <string name="subscription_episode_released">Епізод %d випущено!</string>
     <string name="revert">Повернути</string>
-    <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com Проксі</string>
     <string name="jsdelivr_enabled">Не вдалося зв\'язатися з GitHub, увімкнувши проксі-сервер jsdelivr.</string>
     <string name="pref_category_bypass">Обходи ISP</string>
     <string name="jsdelivr_proxy_summary">За допомогою jsdelivr можна обійти блокування GitHub. Можлива затримка оновлень на кілька днів.</string>

From 19dc1a2456b658e85bbd2123e85a5cafdcdc651f Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Tue, 14 Mar 2023 12:59:32 +0100
Subject: [PATCH 260/273] Un-bruh-momented some translations

---
 app/src/main/res/values-ar/strings.xml     |  2 +-
 app/src/main/res/values-bg/strings.xml     |  6 +++---
 app/src/main/res/values-bn/strings.xml     |  4 ++--
 app/src/main/res/values-bp/strings.xml     |  8 ++++----
 app/src/main/res/values-cs/strings.xml     |  2 +-
 app/src/main/res/values-de/strings.xml     |  2 +-
 app/src/main/res/values-el/strings.xml     |  6 +++---
 app/src/main/res/values-es/strings.xml     |  2 +-
 app/src/main/res/values-fr/strings.xml     |  6 +++---
 app/src/main/res/values-hr/strings.xml     |  6 +++---
 app/src/main/res/values-hu/strings.xml     |  8 ++++----
 app/src/main/res/values-in/strings.xml     |  2 +-
 app/src/main/res/values-it/strings.xml     |  2 +-
 app/src/main/res/values-iw/strings.xml     |  6 +++---
 app/src/main/res/values-nl/strings.xml     |  6 +++---
 app/src/main/res/values-no/strings.xml     |  8 ++++----
 app/src/main/res/values-pl/strings.xml     |  6 +++---
 app/src/main/res/values-qt/strings.xml     |  2 +-
 app/src/main/res/values-ro/strings.xml     |  2 +-
 app/src/main/res/values-ru/strings.xml     |  2 +-
 app/src/main/res/values-sk/strings.xml     |  2 +-
 app/src/main/res/values-sv/strings.xml     | 10 +++++-----
 app/src/main/res/values-tl/strings.xml     |  2 +-
 app/src/main/res/values-tr/strings.xml     | 16 ++++++++--------
 app/src/main/res/values-uk/strings.xml     |  2 +-
 app/src/main/res/values-ur/strings.xml     |  2 +-
 app/src/main/res/values-vi/strings.xml     |  4 ++--
 app/src/main/res/values-zh-rTW/strings.xml | 16 ++++++++--------
 app/src/main/res/values-zh/strings.xml     | 12 ++++++------
 29 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index ae45465b..84934288 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -342,7 +342,7 @@
     <string name="all">الكل</string>
     <string name="max">الحد الاقصي</string>
     <string name="min">الحد الأدنى</string>
-    <string name="subtitles_none" translatable="false">\@string/none</string>
+    <string name="subtitles_none" translatable="false">@string/none</string>
     <string name="subtitles_outline">الخطوط المحيطة</string>
     <string name="subtitles_depressed">النمط المنخفض</string>
     <string name="subtitles_shadow">ظل</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index f1f512a1..496512f7 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -105,7 +105,7 @@
     <string name="continue_watching">Продължете да гледате</string>
     <string name="action_remove_watching">Премахване</string>
     <string name="action_open_watching">Повече информация</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Може да е необходим VPN, за да работи правилно този доставчик</string>
     <string name="vpn_torrent">Този доставчик е торент, препоръчва се VPN</string>
     <string name="provider_info_meta">Метаданните не се предоставят от сайта, зареждането на видео ще бъде неуспешно, ако не съществува на сайта.</string>
@@ -223,8 +223,8 @@
     <string name="movies_singular">Филм</string>
     <string name="tv_series_singular">Серия</string>
     <string name="cartoons_singular">Анимационен филм</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">@string/anime</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="torrent_singular">Торент</string>
     <string name="documentaries_singular">Документален филм</string>
     <string name="asian_drama_singular">Азиатска драма</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 7e0448d6..7c37e291 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -143,8 +143,8 @@
     <string name="category_updates">হালনাগাদ ও ব্যাকআপ</string>
     <string name="updates_settings">অ্যাপ এর হালনাগাদ দেখান</string>
     <string name="swipe_to_seek_settings">খুঁজতে সোয়াইপ করুন</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="double_tap_to_seek_settings">আগাতে ডবল ট্যাপ করুন</string>
     <string name="eigengraumode_settings">আইজেনগ্রাভি মোড</string>
     <string name="update_started">আপডেট শুরু হয়েছে</string>
diff --git a/app/src/main/res/values-bp/strings.xml b/app/src/main/res/values-bp/strings.xml
index 2c2e1303..acdf0ae0 100644
--- a/app/src/main/res/values-bp/strings.xml
+++ b/app/src/main/res/values-bp/strings.xml
@@ -10,7 +10,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
@@ -108,7 +108,7 @@
     <string name="continue_watching">Continue Assistindo</string>
     <string name="action_remove_watching">Remover</string>
     <string name="action_open_watching">Mais Info</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Uma VPN pode ser necessária para esse fornecedor funcionar corretamente</string>
     <string name="vpn_torrent">Esse fornecedor é um torrent, uma VPN é recomendada</string>
     <string name="provider_info_meta">Metadados não são oferecidas pelo site, o carregamento do video pode falhar se ele não existir no site.</string>
@@ -222,8 +222,8 @@
     <string name="movies_singular">Filme</string>
     <string name="tv_series_singular">Série</string>
     <string name="cartoons_singular">Desenho Animado</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">@string/anime</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Documentário</string>
     <string name="asian_drama_singular">Drama Asiático</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 67179b46..1a139511 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -103,7 +103,7 @@
     <string name="continue_watching">Pokračovat ve sledování</string>
     <string name="action_remove_watching">Odebrat</string>
     <string name="action_open_watching">Další informace</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Aby tento poskytovatel fungoval správně, budete možná potřebovat VPN</string>
     <string name="vpn_torrent">Tento poskytovatel je torrent, je doporučená VPN</string>
     <string name="provider_info_meta">Web neposkytnul žádná metadata, načítání videa selže, pokud na webu neexistuje.</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7cf49de1..e1093e05 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -115,7 +115,7 @@
     <string name="continue_watching">Weiterschauen</string>
     <string name="action_remove_watching">Entfernen</string>
     <string name="action_open_watching">Mehr Infos</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Damit dieser Anbieter korrekt funktioniert, ist möglicherweise ein VPN erforderlich</string>
     <string name="vpn_torrent">Dieser Anbieter bietet Torrents an, ein VPN wird dringend empfohlen</string>
     <string name="provider_info_meta">Metadaten werden nicht von der Website bereitgestellt, das Laden des Videos schlägt fehl, wenn sie auf der Website nicht vorhanden sind.</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 5e9dafd8..0d45b2c1 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -387,7 +387,7 @@
     <string name="sort_close">Κλείσιμο</string>
     <string name="sort_clear">Εκκαθάριση</string>
     <string name="subs_subtitle_languages">Γλώσσα υποτίτλων</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="provider_info_meta">Δεν έχουν παρασχεθεί μεταδεδομένα από τον ιστότοπο, η φόρτωση του βίντεο θα αποτύχει αν δεν υπάρχει στον ιστότοπο.</string>
     <string name="double_tap_to_pause_settings">Διπλό πάτημα για παύση</string>
     <string name="double_tap_to_seek_amount_settings">Μέγεθος αναζήτησης στο πρόγραμμα αναπαραγωγής</string>
@@ -452,7 +452,7 @@
     <string name="skip_type_mixed_ed">Ανάμεικτοι τίτλοι τέλους</string>
     <string name="go_back_30">-30</string>
     <string name="rating">Κριτική</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="pref_category_app_updates">Ενημερώσεις εφαρμογής</string>
     <string name="pref_category_backup">Αντίγραφο ασφαλείας</string>
     <string name="pref_category_extensions">Extensions</string>
@@ -464,7 +464,7 @@
     <string name="pref_category_defaults">Προεπιλεγμένα</string>
     <string name="login_format" formatted="true">%s %s</string>
     <string name="subs_font_size">Μέγεθος γραμματοσειράς</string>
-    <string name="anime_singular">\@string/anime</string>
+    <string name="anime_singular">@string/anime</string>
     <string name="pref_category_links">Σύνδεσμοι</string>
     <string name="pref_category_looks">Εμφάνιση</string>
     <string name="pref_category_ui_features">Χαρακτηριστικά</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5c8ac532..f036653f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -194,7 +194,7 @@
     <string name="continue_watching">Continuar Viendo</string>
     <string name="action_remove_watching">Remover</string>
     <string name="action_open_watching">Más info</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Una VPN puede ser necesaria para que este proveedor funcione correctamente</string>
     <string name="vpn_torrent">Este proveedor es un torrent, se recomienda una VPN</string>
     <string name="provider_info_meta">El sitio no proporciona los metadatos, la carga del video fallará si no existe en el sitio.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f3d35c19..9fee8c3c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -240,7 +240,7 @@
     <string name="continue_watching">Continuer à regarder</string>
     <string name="action_remove_watching">Retirer</string>
     <string name="action_open_watching">Plus d\'informations</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Un VPN peut être nécessaire pour que ce fournisseur fonctionne correctement</string>
     <string name="vpn_torrent">Ce fournisseur est un torrent, un VPN est recommandé</string>
     <string name="provider_info_meta">Les métadonnées ne sont pas fournies par le site, le chargement de la vidéo échouera si elles n\'existent pas sur le site.</string>
@@ -385,8 +385,8 @@
     <string name="quality_4k">4K</string>
     <string name="quality_webrip">Web</string>
     <string name="go_back_30">-30</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">@string/anime</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="login_format" formatted="true">%s %s</string>
     <string name="subtitles_filter_lang">Filtrez par langue préférée</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 159542cc..23fd9624 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -119,7 +119,7 @@
     <string name="continue_watching">Nastavite s gledanjem</string>
     <string name="action_remove_watching">Makni</string>
     <string name="action_open_watching">Više informacija</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Za ispravan rad ovog pružatelja usluga može biti potreban VPN</string>
     <string name="vpn_torrent">Ovaj pružatelj usluga je torrent, preporučuje se VPN</string>
     <string name="provider_info_meta">Stranica ne daje metapodatke, učitavanje videozapisa neće uspjeti ako ne postoji na stranici.</string>
@@ -238,8 +238,8 @@
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Serija</string>
     <string name="cartoons_singular">Crtić</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">@string/anime</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Dokumentarac</string>
     <string name="asian_drama_singular">Azijska drama</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 5b42fd6a..66526821 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -57,7 +57,7 @@
     <string name="result_open_in_browser">Megnyitás böngészőben</string>
     <string name="skip_loading">Betöltés kihagyása</string>
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">@string/result_poster_img_des</string>
     <string name="type_watching">Nézés</string>
     <string name="type_completed">Befejezve</string>
     <string name="type_plan_to_watch">Később megnézés</string>
@@ -111,7 +111,7 @@
     <string name="subs_import_text" formatted="true">Betűtípusok importálása %s</string>
     <string name="action_remove_watching">Eltávolítás</string>
     <string name="action_open_watching">Több információ</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">VPN szükséges lehet ehhez a szolgáltató megfelelő működéséhez</string>
     <string name="vpn_torrent">Ez a szolgáltató torrent, VPN ajánlott</string>
     <string name="torrent_plot">Leírás</string>
@@ -172,11 +172,11 @@
     <string name="ova">OVA</string>
     <string name="others">Egyebek</string>
     <string name="tv_series_singular">Sorozat</string>
-    <string name="anime_singular">\@string/anime</string>
+    <string name="anime_singular">@string/anime</string>
     <string name="source_error">Forráshiba</string>
     <string name="nsfw">NSFW</string>
     <string name="cartoons_singular">Rajzfilm</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="live_singular">Élőadás</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Videó</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 1913868a..f5af3877 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -101,7 +101,7 @@
     <string name="continue_watching">Lanjutkan Menonton</string>
     <string name="action_remove_watching">Hapus</string>
     <string name="action_open_watching">Info lebih lanjut</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Sebuah VPN mungkin diperlukan agar provider ini bisa bekerja dengan benar</string>
     <string name="vpn_torrent">Provider ini adalah sebuah torrent, VPN direkomendasikan</string>
     <string name="provider_info_meta">Metadata tidak disediakan oleh situs, loading video akan gagal jika tidak ada di situs.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b8e7eb20..4476b4a0 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -108,7 +108,7 @@
     <string name="continue_watching">Continua a guardare</string>
     <string name="action_remove_watching">Rimuovi</string>
     <string name="action_open_watching">Più info</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Potrebbe essere necessaria una VPN per far funzionare correttamente questo provider</string>
     <string name="vpn_torrent">Questo provider è un torrent, si raccomanda una VPN</string>
     <string name="provider_info_meta">I metadati non sono forniti dal sito, il caricamento del video fallirà se non esiste sul sito.</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 11cf77ce..4ed5ddc0 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -116,7 +116,7 @@
     <string name="chromecast_subtitles_settings">כתוביות כרומקאסט</string>
     <string name="picture_in_picture_des">ממשיך ניגון בנגן מינימלי מעל ישומים אחרים</string>
     <string name="player_subtitles_settings">כתוביות</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="history">היסטוריה</string>
     <string name="apk_installer_legacy">מורשת</string>
     <string name="no">לא</string>
@@ -164,8 +164,8 @@
     <string name="used_storage">משומש</string>
     <string name="tv_series">סדרת טלוויזיה</string>
     <string name="cartoons">סדרות/סרטים מצוירים</string>
-    <string name="anime_singular">\@string/אנימה</string>
-    <string name="ova_singular">\@string/אנימציית וידאו מקורית</string>
+    <string name="anime_singular">@string/אנימה</string>
+    <string name="ova_singular">@string/אנימציית וידאו מקורית</string>
     <string name="asian_drama_singular">דרמה אסייתית</string>
     <string name="episode_action_chromecast_episode">כרומקאסט את הפרק</string>
     <string name="episode_action_chromecast_mirror">כרומקאסט את המראה</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index dd89c34a..3595a24a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -109,7 +109,7 @@
     <string name="continue_watching">Doorgaan met kijken</string>
     <string name="action_remove_watching">Verwijder</string>
     <string name="action_open_watching">Meer Info</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Een VPN kan nodig zijn om deze provider correct te laten werken</string>
     <string name="vpn_torrent">Deze provider is een torrent, een VPN wordt aanbevolen</string>
     <string name="provider_info_meta">Metadata wordt niet geleverd door de site, het laden van video\'s zal mislukken als deze niet op de site bestaat.</string>
@@ -222,8 +222,8 @@
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Serie</string>
     <string name="cartoons_singular">Tekenfilm</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">@string/anime</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Documentaire</string>
     <string name="asian_drama_singular">Aziatisch drama</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 41bf704d..d9feb60c 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Plakat</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Episode Plakat</string>
     <string name="home_main_poster_img_des">Main Plakat</string>
     <string name="home_next_random_img_des">Neste tilfeldig</string>
@@ -412,7 +412,7 @@
     <string name="poster_ui_settings">Slå av/på grensesnittselementer på plakat</string>
     <string name="skip_update">Hopp over denne oppdateringen</string>
     <string name="video_ram_description">Forårsaker tilfeldige krasj hvis satt for høyt. Ikke endre dette hvis du ikke har lite minne.</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="backup_settings">Sikkerhetskopier data</string>
     <string name="backup_success">Data lagret</string>
     <string name="authenticated_user_fail" formatted="true">Kunne ikke logge inn på %s</string>
@@ -422,11 +422,11 @@
     <string name="nsfw">Sensurerbart</string>
     <string name="quality_webrip">Vev</string>
     <string name="network_adress_example">Lenke til strøm</string>
-    <string name="anime_singular">\@string/anime</string>
+    <string name="anime_singular">@string/anime</string>
     <string name="pref_filter_search_quality">Skjul valgt videokvalitet i søkeresultater</string>
     <string name="restore_success">Lastet inn sikkerhetkopifil</string>
     <string name="category_updates">Oppdateringer og sikkerhetskopi</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="confirm_exit_dialog">Avslutt\?</string>
     <string name="nsfw_singular">Sensurerbart</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Alle %s er allerede nedlastet</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 558a46ed..7fc0c887 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -455,7 +455,7 @@
     <string name="apk_installer_settings">Instalator APK</string>
     <string name="apk_installer_settings_des">Niektóre telefony nie obsługują nowego instalatora pakietów. Wypróbuj tryb legacy, jeśli aktualizacje nie zostaną zainstalowane.</string>
     <string name="example_password">password123</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="example_site_name">MojaFajnaWitryna</string>
     <string name="example_username">MyCoolUsername</string>
     <string name="example_ip">127.0.0.1</string>
@@ -463,9 +463,9 @@
     <string name="example_site_url">przyklad.pl</string>
     <string name="sync_total_episodes_none">/\?\?</string>
     <string name="apk_installer_package_installer">Instalator pakietów</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="example_email">hello@world.com</string>
-    <string name="anime_singular">\@string/anime</string>
+    <string name="anime_singular">@string/anime</string>
     <string name="skip_type_op">Opening</string>
     <string name="skip_type_ed">Ending</string>
     <string name="skip_type_mixed_op">Mixed opening</string>
diff --git a/app/src/main/res/values-qt/strings.xml b/app/src/main/res/values-qt/strings.xml
index 76852ca4..aee3de91 100644
--- a/app/src/main/res/values-qt/strings.xml
+++ b/app/src/main/res/values-qt/strings.xml
@@ -247,5 +247,5 @@
     <string name="nsfw">AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOOOGGAGHAGHAAA</string>
     <string name="clear_history">aoaaaaaoooghhh</string>
     <string name="sort_save">oooooh uuaagh</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 42d9b7c8..8cd24a3b 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -106,7 +106,7 @@
     <string name="continue_watching">Continuați să urmăriți</string>
     <string name="action_remove_watching">Eliminați</string>
     <string name="action_open_watching">Mai multe informații</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Există probabilitatea necesitații unui VPN pentru ca acest furnizor să funcționeze corespunzător</string>
     <string name="vpn_torrent">Acest furnizor este un torrent, se recomandă un VPN</string>
     <string name="provider_info_meta">Metadatele nu sunt furnizate de către site, există posibilitatea ca încărcarea videoclipului să eșueze.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5295bd35..e9494040 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -363,7 +363,7 @@
     <string name="extensions">Расширения</string>
     <string name="repository_url_hint">URL репозитория</string>
     <string name="plugin_loaded">Плагин загружен</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="double_tap_to_seek_settings">Перемотка двойным нажатием</string>
     <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 66d8ada9..96fbaff1 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -99,7 +99,7 @@
     <string name="vpn_torrent">Tento poskytovateľ je torrent, odporúča sa VPN</string>
     <string name="subs_import_text" formatted="true">Importovať písma ich umiestnením do %s</string>
     <string name="action_open_watching">Viac informácií</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="continue_watching">Pokračovať v sledovaní</string>
     <string name="vpn_might_be_needed">Na správne fungovanie tohto poskytovateľa môže byť potrebná VPN</string>
     <string name="provider_info_meta">Stránka neposkytla žiadne metadáta, načítanie videa zlyhá, ak na stránke neexistuje.</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 32336b66..25066d7b 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -33,7 +33,7 @@
     <string name="pick_subtitle">Undertexter</string>
     <string name="reload_error">Försök ansluta igen…</string>
     <string name="go_back">Gå tillbaka</string>
-    <string name="episode_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="episode_poster_img_des">@string/result_poster_img_des</string>
     <string name="play_episode">Spela Avsnitt</string>
     <string name="download">Ladda ner</string>
     <string name="download_storage_text">Intern lagring</string>
@@ -44,7 +44,7 @@
     <string name="pref_disable_acra">Inaktivera automatisk felrapportering</string>
     <string name="home_more_info">Mer information</string>
     <string name="home_expanded_hide">Hide</string>
-    <string name="home_main_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="home_main_poster_img_des">@string/result_poster_img_des</string>
     <string name="home_play">Spela upp</string>
     <string name="home_info">Info</string>
     <string name="home_next_random_img_des">Nästa</string>
@@ -235,7 +235,7 @@
     <string name="next_episode_format" formatted="true">Episod %d kommer släppas om</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="show_trailers_settings">Visa trailers</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="ova">OVA</string>
     <string name="episodes_range">%d-%d</string>
     <string name="episode_format" formatted="true">%d %s</string>
@@ -244,7 +244,7 @@
     <string name="resume_time_left" formatted="true">%dm
 \nåterstår</string>
     <string name="nsfw">NSFW</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="go_forward_30">+30</string>
@@ -273,7 +273,7 @@
     <string name="asian_drama">Asiatiska draman</string>
     <string name="others">Andra</string>
     <string name="cartoons_singular">Tecknade serier</string>
-    <string name="anime_singular">\@string/anime</string>
+    <string name="anime_singular">@string/anime</string>
     <string name="documentaries_singular">Dokumentär</string>
     <string name="asian_drama_singular">Asiatisk drama</string>
     <string name="other_singular">Video</string>
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 9e5b29d4..721c421c 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -5,7 +5,7 @@
     <string name="app_dub_sub_episode_text_format">%s Ep %d</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f53bb69d..975242b2 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -23,9 +23,9 @@
     <string name="episode_poster_img_des">Bölüm Posteri</string>
     <string name="home_main_poster_img_des">Ana Poster</string>
     <string name="home_next_random_img_des">Sonraki Rastgele</string>
-    <string name="episode_play_img_des" translatable="false">\@string/play_episode</string>
+    <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
     <string name="go_back_img_des">Geri git</string>
-    <string name="change_providers_img_des" translatable="false">\@string/home_change_provider_img_des</string>
+    <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">Change Provider</string>
     <string name="preview_background_img_des">Preview Background</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
@@ -46,7 +46,7 @@
     <string name="no_data">Veri yok</string>
     <string name="episode_more_options_des">Daha fazla seçenek</string>
     <string name="next_episode">Sonraki bölüm</string>
-    <string name="result_plot" translatable="false">\@string/synopsis</string>
+    <string name="result_plot" translatable="false">@string/synopsis</string>
     <string name="result_tags">Türler</string>
     <string name="result_share">Paylaş</string>
     <string name="result_open_in_browser">Tarayıcıda aç</string>
@@ -123,7 +123,7 @@
     <string name="continue_watching">İzlemeye devam et</string>
     <string name="action_remove_watching">Kaldır</string>
     <string name="action_open_watching">Daha fazla bilgi</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Bu sağlayıcının düzgün çalışması için bir VPN gerekebilir</string>
     <string name="vpn_torrent">Bu sağlayıcı torrent kullanıyor, bir VPN önerilir</string>
     <string name="provider_info_meta">Metadata site tarafından sağlanmamış, veri site\'de bulunmuyorsa video yüklenmesi başarısız olacak.</string>
@@ -205,7 +205,7 @@
     <string name="no_episodes_found">Bölüm bulunamadı</string>
     <string name="delete_file">Dosyayı sil</string>
     <string name="delete">Sil</string>
-    <string name="cancel" translatable="false">\@string/sort_cancel</string>
+    <string name="cancel" translatable="false">@string/sort_cancel</string>
     <string name="pause">Durdur</string>
     <string name="resume">Sürdür</string>
     <string name="go_back_30">-30</string>
@@ -244,8 +244,8 @@
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Dizi</string>
     <string name="cartoons_singular">Çizgi film</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">@string/anime</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Belgesel</string>
     <string name="asian_drama_singular">Asya dizisi</string>
@@ -368,7 +368,7 @@
     <string name="all">Hepsi</string>
     <string name="max">Maksimum</string>
     <string name="min">Minimum</string>
-    <string name="subtitles_none" translatable="false">\@string/none</string>
+    <string name="subtitles_none" translatable="false">@string/none</string>
     <string name="subtitles_outline">Dış hat</string>
     <string name="subtitles_depressed">Çökmüş</string>
     <string name="subtitles_shadow">Gölge</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 6dca29b4..648de819 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -124,7 +124,7 @@
     <string name="swipe_to_seek_settings_des">Проведіть пальцем з боку в бік, щоб керувати своїм положенням у відео</string>
     <string name="benene_count_text">%d Бананів для розробників</string>
     <string name="player_size_settings">Кнопка зміни розміру плеєра</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Для коректної роботи цього постачальника може знадобитися VPN</string>
     <string name="provider_info_meta">Метадані не надаються сайтом, завантаження відео не відбудеться, якщо їх немає на сайті.</string>
     <string name="picture_in_picture">Картинка в картинці</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index f733addc..80081215 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -230,7 +230,7 @@
     <string name="tv_series_singular">سلسلہ</string>
     <string name="cartoons_singular">کارٹون</string>
     <string name="anime_singular">انیمی</string>
-    <string name="ova_singular">\@string/اووا</string>
+    <string name="ova_singular">@string/اووا</string>
     <string name="torrent_singular">ٹورینٹ</string>
     <string name="documentaries_singular">دستاویزی فلم</string>
     <string name="asian_drama_singular">ایشیائی ڈرامے</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 59c65916..74e748a3 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -110,7 +110,7 @@
     <string name="continue_watching">Tiếp tục xem</string>
     <string name="action_remove_watching">Loại bỏ</string>
     <string name="action_open_watching">Thông tin thêm</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Bạn có thể sẽ cần sử dụng VPN để xem phim này</string>
     <string name="vpn_torrent">Phim này được chiếu dưới dạng Torrent. Hãy sử dụng VPN để xem</string>
     <string name="torrent_plot">Thông tin phim</string>
@@ -229,7 +229,7 @@
     <string name="tv_series_singular">Phim Bộ</string>
     <string name="cartoons_singular">Hoạt Hình</string>
     <string name="anime_singular">Anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Phim Tài Liệu</string>
     <string name="asian_drama_singular">Truyền Hình Châu Á</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 8a10208a..6aa41ff3 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -23,9 +23,9 @@
     <string name="episode_poster_img_des">劇集封面</string>
     <string name="home_main_poster_img_des">主封面</string>
     <string name="home_next_random_img_des">隨機下一個</string>
-    <string name="episode_play_img_des" translatable="false">\@string/play_episode</string>
+    <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
     <string name="go_back_img_des">返回</string>
-    <string name="change_providers_img_des" translatable="false">\@string/home_change_provider_img_des</string>
+    <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">更改片源</string>
     <string name="preview_background_img_des">預覽背景</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
@@ -46,7 +46,7 @@
     <string name="no_data">無資料</string>
     <string name="episode_more_options_des">更多選項</string>
     <string name="next_episode">下一集</string>
-    <string name="result_plot" translatable="false">\@string/synopsis</string>
+    <string name="result_plot" translatable="false">@string/synopsis</string>
     <string name="result_tags">類型</string>
     <string name="result_share">分享</string>
     <string name="result_open_in_browser">在瀏覽器中打開</string>
@@ -123,7 +123,7 @@
     <string name="continue_watching">繼續觀看</string>
     <string name="action_remove_watching">移除</string>
     <string name="action_open_watching">更多資訊</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">此片源可能需要 VPN 才能正常使用</string>
     <string name="vpn_torrent">此片源是種子，建議使用 VPN</string>
     <string name="provider_info_meta">站點不提供元數據，如果站點上不存在元數據，影片載入將失敗。</string>
@@ -205,7 +205,7 @@
     <string name="no_episodes_found">未找到劇集</string>
     <string name="delete_file">刪除文件</string>
     <string name="delete">刪除</string>
-    <string name="cancel" translatable="false">\@string/sort_cancel</string>
+    <string name="cancel" translatable="false">@string/sort_cancel</string>
     <string name="pause">暫停</string>
     <string name="resume">繼續</string>
     <string name="go_back_30">-30</string>
@@ -244,8 +244,8 @@
     <string name="movies_singular">電影</string>
     <string name="tv_series_singular">電視劇</string>
     <string name="cartoons_singular">卡通</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">@string/anime</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="torrent_singular">種子</string>
     <string name="documentaries_singular">紀錄片</string>
     <string name="asian_drama_singular">亞洲劇</string>
@@ -368,7 +368,7 @@
     <string name="all">全部</string>
     <string name="max">最大</string>
     <string name="min">最小</string>
-    <string name="subtitles_none" translatable="false">\@string/none</string>
+    <string name="subtitles_none" translatable="false">@string/none</string>
     <string name="subtitles_outline">輪廓</string>
     <string name="subtitles_depressed">凹陷</string>
     <string name="subtitles_shadow">陰影</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index a14b87cc..574624bc 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -23,9 +23,9 @@
     <string name="episode_poster_img_des">剧集封面</string>
     <string name="home_main_poster_img_des">主封面</string>
     <string name="home_next_random_img_des">随机下一个</string>
-    <string name="episode_play_img_des" translatable="false">\@string/play_episode</string>
+    <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
     <string name="go_back_img_des">返回</string>
-    <string name="change_providers_img_des" translatable="false">\@string/home_change_provider_img_des</string>
+    <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">更改片源</string>
     <string name="preview_background_img_des">预览背景</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
@@ -46,7 +46,7 @@
     <string name="no_data">无数据</string>
     <string name="episode_more_options_des">更多选项</string>
     <string name="next_episode">下一集</string>
-    <string name="result_plot" translatable="false">\@string/synopsis</string>
+    <string name="result_plot" translatable="false">@string/synopsis</string>
     <string name="result_tags">类型</string>
     <string name="result_share">分享</string>
     <string name="result_open_in_browser">在浏览器中打开</string>
@@ -123,7 +123,7 @@
     <string name="continue_watching">继续观看</string>
     <string name="action_remove_watching">移除</string>
     <string name="action_open_watching">更多信息</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">此片源可能需要 VPN 才能正常使用</string>
     <string name="vpn_torrent">此片源为种子文件，建议使用 VPN</string>
     <string name="provider_info_meta">站点不提供元数据，如果站点上不存在元数据，视频加载将失败。</string>
@@ -206,7 +206,7 @@
     <string name="no_episodes_found">未找到剧集</string>
     <string name="delete_file">删除文件</string>
     <string name="delete">删除</string>
-    <string name="cancel" translatable="false">\@string/sort_cancel</string>
+    <string name="cancel" translatable="false">@string/sort_cancel</string>
     <string name="pause">暂停</string>
     <string name="resume">继续</string>
     <string name="go_back_30">-30</string>
@@ -369,7 +369,7 @@
     <string name="all">全部</string>
     <string name="max">最大</string>
     <string name="min">最小</string>
-    <string name="subtitles_none" translatable="false">\@string/none</string>
+    <string name="subtitles_none" translatable="false">@string/none</string>
     <string name="subtitles_outline">轮廓</string>
     <string name="subtitles_depressed">凹陷</string>
     <string name="subtitles_shadow">阴影</string>

From 2d7126d71f3946d072652c4d6e63c938198bdafe Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Tue, 14 Mar 2023 13:12:34 +0100
Subject: [PATCH 261/273] Fix for fix for translations

---
 app/src/main/res/values-iw/strings.xml | 4 ++--
 app/src/main/res/values-ur/strings.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 4ed5ddc0..645724fd 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -164,8 +164,8 @@
     <string name="used_storage">משומש</string>
     <string name="tv_series">סדרת טלוויזיה</string>
     <string name="cartoons">סדרות/סרטים מצוירים</string>
-    <string name="anime_singular">@string/אנימה</string>
-    <string name="ova_singular">@string/אנימציית וידאו מקורית</string>
+    <string name="anime_singular">@string/anime</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="asian_drama_singular">דרמה אסייתית</string>
     <string name="episode_action_chromecast_episode">כרומקאסט את הפרק</string>
     <string name="episode_action_chromecast_mirror">כרומקאסט את המראה</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 80081215..4a8bbf11 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -230,7 +230,7 @@
     <string name="tv_series_singular">سلسلہ</string>
     <string name="cartoons_singular">کارٹون</string>
     <string name="anime_singular">انیمی</string>
-    <string name="ova_singular">@string/اووا</string>
+    <string name="ova_singular">اووا</string>
     <string name="torrent_singular">ٹورینٹ</string>
     <string name="documentaries_singular">دستاویزی فلم</string>
     <string name="asian_drama_singular">ایشیائی ڈرامے</string>

From 7bfcf25df4738741c8553cfce5e96fe711cddea6 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Tue, 14 Mar 2023 18:50:13 +0000
Subject: [PATCH 262/273] add a way to autofix weblate's issue with @string

---
 .github/locales.py                   | 15 ++++++++++++++-
 .github/workflows/update_locales.yml |  9 ++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.github/locales.py b/.github/locales.py
index 1c79c093..04d9cd13 100644
--- a/.github/locales.py
+++ b/.github/locales.py
@@ -1,6 +1,7 @@
 import re
 import glob
 import requests
+import lxml.etree as ET  # builtin library doesn't preserve comments
 
 
 SETTINGS_PATH = "app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt"
@@ -45,4 +46,16 @@ open(SETTINGS_PATH, "w+",encoding='utf-8').write(
     "\n" +
     END_MARKER +
     after_src
-)
\ No newline at end of file
+)
+
+# Go through each values.xml file and fix escaped \@string
+for file in glob.glob(f"{XML_NAME}*/strings.xml"):
+    try:
+        tree = ET.parse(file)
+        for child in tree.getroot():
+            if child.text.startswith("\\@string/"):
+                print(f"[{file}] fixing {child.attrib['name']}")
+                child.text = child.text.replace("\\@string/", "@string/")
+        tree.write(file, encoding="utf-8", method="xml", pretty_print=True, xml_declaration=True)
+    except ET.ParseError as ex:
+        print(f"[{file}] {ex}")
\ No newline at end of file
diff --git a/.github/workflows/update_locales.yml b/.github/workflows/update_locales.yml
index 93cdca44..628e9bc9 100644
--- a/.github/workflows/update_locales.yml
+++ b/.github/workflows/update_locales.yml
@@ -1,4 +1,4 @@
-name: Update locale lists
+name: Fix locale issues
 
 on:
   workflow_dispatch:
@@ -9,7 +9,7 @@ on:
       - master
 
 concurrency: 
-  group: "locale-list"
+  group: "locale"
   cancel-in-progress: true
 
 jobs:
@@ -26,6 +26,9 @@ jobs:
     - uses: actions/checkout@v2
       with:
         token: ${{ steps.generate_token.outputs.token }}
+    - name: Install dependencies
+      run: |
+        pip3 install lxml
     - name: Edit files
       run: |
         python3 .github/locales.py
@@ -35,5 +38,5 @@ jobs:
         git config --local user.name "recloudstream[bot]"
         git add .
         # "echo" returns true so the build succeeds, even if no changed files
-        git commit -m 'update list of locales' || echo
+        git commit -m 'chore(locales): fix locale issues' || echo
         git push

From 8ebf5185a3fe95db8adabedf483e34ccda1fbdcb Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Fri, 17 Mar 2023 15:46:11 +0100
Subject: [PATCH 263/273] Add ffmpeg audio decoding

---
 app/build.gradle.kts                          |  2 +
 .../cloudstream3/ui/player/CS3IPlayer.kt      | 44 +++++++++++--------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9cbccbe5..f70a575f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -159,6 +159,8 @@ dependencies {
     implementation("com.google.android.exoplayer:extension-cast:2.18.2")
     implementation("com.google.android.exoplayer:extension-mediasession:2.18.2")
     implementation("com.google.android.exoplayer:extension-okhttp:2.18.2")
+    // Use the Jellyfin ffmpeg extension for easy ffmpeg audio decoding in exoplayer. Thank you Jellyfin <3
+    implementation("org.jellyfin.exoplayer:exoplayer-ffmpeg-extension:2.18.2+1")
 
     //implementation("com.google.android.exoplayer:extension-leanback:2.14.0")
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index cb8efe92..2aaa3619 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -9,8 +9,11 @@ import android.widget.FrameLayout
 import androidx.preference.PreferenceManager
 import com.google.android.exoplayer2.*
 import com.google.android.exoplayer2.C.*
+import com.google.android.exoplayer2.DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON
+import com.google.android.exoplayer2.DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER
 import com.google.android.exoplayer2.database.StandaloneDatabaseProvider
 import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource
+import com.google.android.exoplayer2.mediacodec.MediaCodecSelector
 import com.google.android.exoplayer2.source.*
 import com.google.android.exoplayer2.text.TextRenderer
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
@@ -538,7 +541,8 @@ class CS3IPlayer : IPlayer {
             }
 
             // Do no include empty referer, if the provider wants those they can use the header map.
-            val refererMap = if (link.referer.isBlank()) emptyMap() else mapOf("referer" to link.referer)
+            val refererMap =
+                if (link.referer.isBlank()) emptyMap() else mapOf("referer" to link.referer)
             val headers = mapOf(
                 "accept" to "*/*",
                 "sec-ch-ua" to "\"Chromium\";v=\"91\", \" Not;A Brand\";v=\"99\"",
@@ -669,23 +673,27 @@ class CS3IPlayer : IPlayer {
             val exoPlayerBuilder =
                 ExoPlayer.Builder(context)
                     .setRenderersFactory { eventHandler, videoRendererEventListener, audioRendererEventListener, textRendererOutput, metadataRendererOutput ->
-                        DefaultRenderersFactory(context).createRenderers(
-                            eventHandler,
-                            videoRendererEventListener,
-                            audioRendererEventListener,
-                            textRendererOutput,
-                            metadataRendererOutput
-                        ).map {
-                            if (it is TextRenderer) {
-                                currentTextRenderer = CustomTextRenderer(
-                                    subtitleOffset,
-                                    textRendererOutput,
-                                    eventHandler.looper,
-                                    CustomSubtitleDecoderFactory()
-                                )
-                                currentTextRenderer!!
-                            } else it
-                        }.toTypedArray()
+                        DefaultRenderersFactory(context).apply {
+                            setEnableDecoderFallback(true)
+                            // Enable Ffmpeg extension
+                            setExtensionRendererMode(EXTENSION_RENDERER_MODE_ON)
+                        }.createRenderers(
+                                eventHandler,
+                                videoRendererEventListener,
+                                audioRendererEventListener,
+                                textRendererOutput,
+                                metadataRendererOutput
+                            ).map {
+                                if (it is TextRenderer) {
+                                    currentTextRenderer = CustomTextRenderer(
+                                        subtitleOffset,
+                                        textRendererOutput,
+                                        eventHandler.looper,
+                                        CustomSubtitleDecoderFactory()
+                                    )
+                                    currentTextRenderer!!
+                                } else it
+                            }.toTypedArray()
                     }
                     .setTrackSelector(
                         trackSelector ?: getTrackSelector(

From 288c5ffa39d60e0285cef573b20fe6ad4ecf7c29 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Thu, 16 Mar 2023 13:00:08 +0100
Subject: [PATCH 264/273] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (610 of 610 strings)

Translated using Weblate (German)

Currently translated at 100.0% (610 of 610 strings)

Co-authored-by: Anarchydr <patrikpik879@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Julian <hello@apollo.moe>
Co-authored-by: Sdarfeesh <Sdarfeesh@protonmail.com>
Co-authored-by: Skrripy <rozihrash.ya6w7@simplelogin.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translation: Cloudstream/App
---
 app/src/main/res/values-de/strings.xml | 16 ++++++++--------
 app/src/main/res/values-hr/strings.xml | 18 +++++++++---------
 app/src/main/res/values-uk/strings.xml |  2 +-
 app/src/main/res/values-zh/strings.xml |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e1093e05..911705d5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -41,7 +41,7 @@
     <string name="search_hint_site" formatted="true">Suche %s…</string>
     <string name="no_data">Keine Daten vorhanden</string>
     <string name="episode_more_options_des">Mehr Optionen</string>
-    <string name="next_episode">Nächste Epsisode</string>
+    <string name="next_episode">Nächste Episode</string>
     <string name="result_tags">Genres</string>
     <string name="result_share">Teilen</string>
     <string name="result_open_in_browser">In Browser öffnen</string>
@@ -136,14 +136,14 @@
     <string name="swipe_to_seek_settings">Wischen zum vor- und zurückspulen</string>
     <string name="swipe_to_seek_settings_des">Nach links oder rechts wischen, um die Zeit im Videoplayer zu steuern</string>
     <string name="swipe_to_change_settings">Wischen, um Einstellungen zu ändern</string>
-    <string name="swipe_to_change_settings_des">Links oder rechts wischen, um die Helligkeit oder Lautstärke zu ändern</string>
+    <string name="swipe_to_change_settings_des">Links oder rechts nach oben oder unten wischen, um die Helligkeit oder Lautstärke zu ändern</string>
     <string name="autoplay_next_settings">Nächste Episode automatisch abspielen</string>
     <string name="autoplay_next_settings_des">Nächste Episode wird gestartet, sobald die aktuelle Episode endet</string>
     <string name="double_tap_to_seek_settings">Doppeltippen zum vor- und zurückspulen</string>
     <string name="double_tap_to_pause_settings">Doppeltippen zum Pausieren</string>
-    <string name="double_tap_to_seek_amount_settings">Zeit für vor- und zurückspulen im Player</string>
+    <string name="double_tap_to_seek_amount_settings">Zeit für vor- und zurückspulen im Player (Sekunden)</string>
     <string name="double_tap_to_seek_settings_des">Zweimal auf die rechte oder linke Seite tippen, um vor- oder zurückzuspulen</string>
-    <string name="double_tap_to_pause_settings_des">In die Mitte tippen, um zu pausieren</string>
+    <string name="double_tap_to_pause_settings_des">Doppelt in die Mitte tippen, um zu pausieren</string>
     <string name="use_system_brightness_settings">Systemhelligkeit verwenden</string>
     <string name="use_system_brightness_settings_des">Systemhelligkeit anstelle eines dunklen Overlay im Player verwenden</string>
     <string name="episode_sync_settings">Episodenfortschritt aktualisieren</string>
@@ -166,7 +166,7 @@
     <string name="pref_filter_search_quality">Ausgewählte Videoqualität bei Suchergebnissen ausblenden</string>
     <string name="automatic_plugin_updates">Automatische Plugin-Updates</string>
     <string name="updates_settings">App-Updates anzeigen</string>
-    <string name="updates_settings_des">Automatisches Suchen nach neuen Updates beim Start</string>
+    <string name="updates_settings_des">Automatisches Suchen nach neuen Updates nach dem Start</string>
     <string name="uprereleases_settings">Auf Vorabversionen updaten</string>
     <string name="uprereleases_settings_des">Suche nach Vorabversionen statt nur nach Vollversionen</string>
     <string name="github">Github</string>
@@ -286,7 +286,7 @@
     <string name="legal_notice">Haftungsausschluss</string>
     <string name="category_general">Allgemein</string>
     <string name="random_button_settings">Zufalls-Button</string>
-    <string name="random_button_settings_desc">Zufallsbutton auf der Startseite anzeigen</string>
+    <string name="random_button_settings_desc">Zeigt einen Zufallsbutton auf der Startseite an, mit welchem eine Serie oder ein Film von der Website zufällig ausgewählt wird</string>
     <string name="provider_lang_settings">Anbieter-Sprachen</string>
     <string name="app_layout">App-Layout</string>
     <string name="preferred_media_settings">Bevorzugte Medien</string>
@@ -519,13 +519,13 @@
     <string name="start">Start</string>
     <string name="restart">Neustarten</string>
     <string name="watch_quality_pref_data">Bevorzugte Videoqualität (mobile Daten)</string>
-    <string name="jsdelivr_proxy_summary">Umgehung der GitHub Sperre mit jsdelivr, kann zu einigen Tagen Verzögerung bei Updates führen.</string>
+    <string name="jsdelivr_proxy_summary">Umgehung der GitHub Sperre mit jsdelivr. Kann zu einigen Tagen Verzögerung bei Updates führen.</string>
     <string name="subscription_new">%s abonniert</string>
     <string name="subscription_deleted">%s deabonniert</string>
     <string name="subscription_episode_released">Episode %d erschienen!</string>
     <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
     <string name="jsdelivr_enabled">GitHub kann nicht erreicht werden, der jsdelivr-Proxy wird aktiviert.</string>
-    <string name="subscription_in_progress_notification">Aktualisierung abonnierter Sendungen</string>
+    <string name="subscription_in_progress_notification">Abonnierte Serien werden aktualisiert</string>
     <string name="revert">Rückgängig</string>
     <string name="subscription_list_name">Abonniert</string>
     <string name="pref_category_bypass">ISP-Umgehungen</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 23fd9624..5366fe34 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -138,16 +138,16 @@
     <string name="eigengraumode_settings">Eigengravy način</string>
     <string name="eigengraumode_settings_des">Dodaje opciju brzine u playeru</string>
     <string name="swipe_to_seek_settings">Prijeđi prstom za traženje</string>
-    <string name="swipe_to_seek_settings_des">Prijeđi prstom ulijevo ili udesno za kontrolu vremena u videoplayeru</string>
+    <string name="swipe_to_seek_settings_des">Prijeđite prstom ulijevo ili udesno kako biste kontrolirali player</string>
     <string name="swipe_to_change_settings">Klizni za promjenu postavki</string>
-    <string name="swipe_to_change_settings_des">Prijeđi prstom ulijevo ili udesno za promjenu svjetline ili glasnoće</string>
+    <string name="swipe_to_change_settings_des">Kliznite prstom ulijevo ili udesno za promjenu svjetline ili glasnoće</string>
     <string name="autoplay_next_settings">Automatski započni sljedeću epizodu</string>
     <string name="autoplay_next_settings_des">Započne sljedeću epizodu kad trenutna završi</string>
     <string name="double_tap_to_seek_settings">Dodirni dvaput za traženje</string>
     <string name="double_tap_to_pause_settings">Dodirni dvaput za pauziranje</string>
-    <string name="double_tap_to_seek_amount_settings">Iznos preskakanja u playeru</string>
+    <string name="double_tap_to_seek_amount_settings">Iznos preskakanja u playeru (Sekunde)</string>
     <string name="double_tap_to_seek_settings_des">Dvaput dodirni desnu ili lijevu stranu ekrana za pomicanje naprijed ili natrag</string>
-    <string name="double_tap_to_pause_settings_des">Dodirni u sredinu zaslona za pauziranje</string>
+    <string name="double_tap_to_pause_settings_des">Dodirnite dvaput u sredinu zaslona za pauziranje</string>
     <string name="use_system_brightness_settings">Koristi svijetlinu u sustavu</string>
     <string name="use_system_brightness_settings_des">Koristi svjetlinu sustava u playeru aplikacija umjesto tamnog preklopa</string>
     <string name="episode_sync_settings">Ažuriraj napredak gledanja</string>
@@ -173,7 +173,7 @@
     <string name="pref_filter_search_quality">Sakrij odabranu kvalitetu videozapisa u rezultatima pretraživanja</string>
     <string name="automatic_plugin_updates">Automatsko ažuriranje dodataka</string>
     <string name="updates_settings">Prikaži ažuriranja aplikacije</string>
-    <string name="updates_settings_des">Automatski traži nova ažuriranja pri pokretanju aplikacije</string>
+    <string name="updates_settings_des">Automatski traži nova ažuriranja nakon pokretanja aplikacije</string>
     <string name="uprereleases_settings">Ažuriranje na predizdanja</string>
     <string name="uprereleases_settings_des">Tražite ažuriranja prije izdanja umjesto samo potpunih izdanja</string>
     <string name="github">Github</string>
@@ -238,8 +238,8 @@
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Serija</string>
     <string name="cartoons_singular">Crtić</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">Anime</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Dokumentarac</string>
     <string name="asian_drama_singular">Azijska drama</string>
@@ -299,7 +299,7 @@
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Općenito</string>
     <string name="random_button_settings">Random gumb</string>
-    <string name="random_button_settings_desc">Prikaži random gumb na početnoj stranici</string>
+    <string name="random_button_settings_desc">Prikazuje gumb na početnoj stranici koji može odabrati nasumični film ili TV seriju s početne stranice</string>
     <string name="provider_lang_settings">Jezici pružatelja usluga</string>
     <string name="app_layout">Izgled aplikacije</string>
     <string name="preferred_media_settings">Preferirani mediji</string>
@@ -552,6 +552,6 @@
     <string name="pref_category_bypass">ISP zaobilaznice</string>
     <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
     <string name="jsdelivr_enabled">Neuspješno dohvaćanje GitHuba, omogućavanje jsdelivr proxyja.</string>
-    <string name="jsdelivr_proxy_summary">Zaobilazi blokiranje GitHuba pomoću jsdelivr, može uzrokovati odgode ažuriranja za nekoliko dana.</string>
+    <string name="jsdelivr_proxy_summary">Koristeći jsdelivr, GitHub blokiranje se može zaobići. Može odgoditi ažuriranja za nekoliko dana.</string>
     <string name="watch_quality_pref_data">Preferirana kvaliteta gledanja (podatkovna mobilna mreža)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 648de819..d9ec76bb 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -22,7 +22,7 @@
     <string name="title_search">Пошук</string>
     <string name="title_downloads">Завантаження</string>
     <string name="duration_format" formatted="true">%d хв</string>
-    <string name="title_settings">Параметри</string>
+    <string name="title_settings">Налаштування</string>
     <string name="search_hint">Пошук…</string>
     <string name="search_hint_site" formatted="true">Пошук на %s…</string>
     <string name="no_data">Дані відсутні</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 574624bc..47807259 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -573,7 +573,7 @@
     <string name="test_log">日志</string>
     <string name="jsdelivr_proxy">raw.githubusercontent.com 代理</string>
     <string name="jsdelivr_enabled">连接 Github 失败，正在启用 jsdelivr 代理。</string>
-    <string name="jsdelivr_proxy_summary">使用jsdelivr，可以绕过GitHub的封锁。可能会延迟几天的更新。</string>
+    <string name="jsdelivr_proxy_summary">使用 jsdelivr，可以绕过 GitHub 的封锁。可能会延迟几天的更新。</string>
     <string name="pref_category_bypass">ISP 绕过</string>
     <string name="revert">还原</string>
     <string name="watch_quality_pref_data">首选播放画质（移动数据）</string>

From 67318a62a37673f1acef39dc60684a0b9e005def Mon Sep 17 00:00:00 2001
From: "recloudstream[bot]"
 <111277985+recloudstream[bot]@users.noreply.github.com>
Date: Fri, 17 Mar 2023 15:04:00 +0000
Subject: [PATCH 265/273] chore(locales): fix locale issues

---
 app/src/main/res/values-ar/strings.xml     | 4 ++--
 app/src/main/res/values-bg/strings.xml     | 7 ++++---
 app/src/main/res/values-bn/strings.xml     | 4 ++--
 app/src/main/res/values-bp/strings.xml     | 7 ++++---
 app/src/main/res/values-cs/strings.xml     | 7 ++++---
 app/src/main/res/values-de/strings.xml     | 4 ++--
 app/src/main/res/values-el/strings.xml     | 7 ++++---
 app/src/main/res/values-eo/strings.xml     | 4 ++--
 app/src/main/res/values-es/strings.xml     | 4 ++--
 app/src/main/res/values-fa/strings.xml     | 4 ++--
 app/src/main/res/values-fr/strings.xml     | 7 ++++---
 app/src/main/res/values-hi/strings.xml     | 7 ++++---
 app/src/main/res/values-hr/strings.xml     | 7 ++++---
 app/src/main/res/values-hu/strings.xml     | 4 ++--
 app/src/main/res/values-in/strings.xml     | 7 ++++---
 app/src/main/res/values-it/strings.xml     | 7 ++++---
 app/src/main/res/values-iw/strings.xml     | 4 ++--
 app/src/main/res/values-ja/strings.xml     | 4 ++--
 app/src/main/res/values-kn/strings.xml     | 4 ++--
 app/src/main/res/values-mk/strings.xml     | 7 ++++---
 app/src/main/res/values-ml/strings.xml     | 7 ++++---
 app/src/main/res/values-ms/strings.xml     | 4 ++--
 app/src/main/res/values-nl/strings.xml     | 7 ++++---
 app/src/main/res/values-nn/strings.xml     | 4 ++--
 app/src/main/res/values-no/strings.xml     | 4 ++--
 app/src/main/res/values-pl/strings.xml     | 7 ++++---
 app/src/main/res/values-pt/strings.xml     | 4 ++--
 app/src/main/res/values-qt/strings.xml     | 4 ++--
 app/src/main/res/values-ro/strings.xml     | 7 ++++---
 app/src/main/res/values-ru/strings.xml     | 4 ++--
 app/src/main/res/values-sk/strings.xml     | 4 ++--
 app/src/main/res/values-so/strings.xml     | 4 ++--
 app/src/main/res/values-sv/strings.xml     | 7 ++++---
 app/src/main/res/values-ta/strings.xml     | 4 ++--
 app/src/main/res/values-tl/strings.xml     | 7 ++++---
 app/src/main/res/values-tr/strings.xml     | 7 ++++---
 app/src/main/res/values-uk/strings.xml     | 4 ++--
 app/src/main/res/values-ur/strings.xml     | 4 ++--
 app/src/main/res/values-vi/strings.xml     | 7 ++++---
 app/src/main/res/values-zh-rTW/strings.xml | 7 ++++---
 app/src/main/res/values-zh/strings.xml     | 7 ++++---
 41 files changed, 122 insertions(+), 102 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 84934288..2a356812 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">ملصق</string>
@@ -561,4 +561,4 @@
     <string name="jsdelivr_proxy_summary">باستخدام jsdelivr ، يمكن تجاوز حظر GitHub. قد يؤخر التحديثات لبضعة أيام.</string>
     <string name="jsdelivr_proxy">وكيل raw.githubusercontent.com</string>
     <string name="watch_quality_pref_data">جودة المشاهدة المفضلة (بيانات الجوال)</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 496512f7..301242cd 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string formatted="true" name="app_dub_sub_episode_text_format">%s еп. %d</string>
     <string formatted="true" name="cast_format">Актьори: %s</string>
@@ -497,4 +498,4 @@
     <string name="delayed_update_notice">Приложението ще се актуализира при изход от него</string>
     <string name="update_started">Започна Актуализация</string>
     <string name="action_remove_from_watched">Премахване от гледани</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 7c37e291..71d5d6d0 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="result_poster_img_des">পোস্টার</string>
     <string name="play_with_app_name">ক্লাউডস্ট্রিম দিয়ে চালান</string>
@@ -148,4 +148,4 @@
     <string name="double_tap_to_seek_settings">আগাতে ডবল ট্যাপ করুন</string>
     <string name="eigengraumode_settings">আইজেনগ্রাভি মোড</string>
     <string name="update_started">আপডেট শুরু হয়েছে</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-bp/strings.xml b/app/src/main/res/values-bp/strings.xml
index acdf0ae0..13b34872 100644
--- a/app/src/main/res/values-bp/strings.xml
+++ b/app/src/main/res/values-bp/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- KEYS DON'T TRANSLATE -->
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
@@ -428,4 +429,4 @@
     <string name="autoplay_next_settings_des">Começa o próximo episódio quando o atual termina</string>
     <string name="enable_nsfw_on_providers">Ativar NSFW em fornecedores compatíveis</string>
     <string name="category_providers">Fornecedores</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 1a139511..1501a5d9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- KEYS DON'T TRANSLATE -->
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
@@ -553,4 +554,4 @@
     <string name="revert">Vrátit zpět</string>
     <string name="jsdelivr_proxy_summary">Pomocí jsdelivr lze obejít blokování GitHubu. Může dojít ke zpoždění aktualizací o několik dní.</string>
     <string name="pref_category_bypass">Obcházení ISP</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 911705d5..8fbcc2d0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Besetzung: %s</string>
@@ -529,4 +529,4 @@
     <string name="revert">Rückgängig</string>
     <string name="subscription_list_name">Abonniert</string>
     <string name="pref_category_bypass">ISP-Umgehungen</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 0d45b2c1..f07ce43c 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Αρχική</string>
     <string name="title_search">Αναζήτηση</string>
@@ -508,4 +509,4 @@
 \nΣυνδέσου σε έναν λογαριασμό που έχει βιβλιοθήκη, ή πρόσθεσε σειρές στην τοπική βιβλιοθήκη σου</string>
     <string name="safe_mode_file">Βρέθηκε αρχείο Ασφαλούς Λειτουργίας!
 \nΔεν πρόκειται να φορτωθούν extensions κατά το ξεκίνημα μέχρι να διαγραφεί το αρχείο.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 09e6941d..5eac8686 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="go_back_img_des">Reen</string>
     <string name="title_home">Hejmo</string>
@@ -78,4 +78,4 @@
     <string name="player_speed_text_format" formatted="true">Rapido (%.2fx)</string>
     <string name="search_hint">Serĉi…</string>
     <string name="download">Elŝuti</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f036653f..06c20aa5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="pref_category_extensions">Extensiones</string>
     <string name="setup_extensions_subtext">Descargue la lista de sitios que quiera utilizar</string>
@@ -529,4 +529,4 @@
     <string name="revert">Revertir</string>
     <string name="pref_category_bypass">ISP Bypasses</string>
     <string name="watch_quality_pref_data">Calidad de visualización preferida (Datos móviles)</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 81853674..e4c23628 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="delete">حذف</string>
     <string name="pause">مکث</string>
@@ -33,4 +33,4 @@
     <string name="next_episode_time_hour_format" formatted="true">%dساعت %dدقیقه</string>
     <string name="next_episode_time_min_format" formatted="true">%dدقیقه</string>
     <string name="home_main_poster_img_des">پوستر اصلی</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9fee8c3c..b96ff0cd 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Accueil</string>
     <string name="title_search">Rechercher</string>
@@ -523,4 +524,4 @@
     <string name="pref_category_bypass">Contournements de FAI</string>
     <string name="subscription_episode_released">L\'épisode %d est sorti !</string>
     <string name="test_failed">Échouer</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index f33a2336..833b76f4 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">रफ्तार (%.2fx)</string>
     <string name="new_update_format" formatted="true">नया अपडेट आया है!
@@ -146,4 +147,4 @@
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="result_poster_img_des">विज्ञापन</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 5366fe34..b4931377 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
     <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
@@ -554,4 +555,4 @@
     <string name="jsdelivr_enabled">Neuspješno dohvaćanje GitHuba, omogućavanje jsdelivr proxyja.</string>
     <string name="jsdelivr_proxy_summary">Koristeći jsdelivr, GitHub blokiranje se može zaobići. Može odgoditi ažuriranja za nekoliko dana.</string>
     <string name="watch_quality_pref_data">Preferirana kvaliteta gledanja (podatkovna mobilna mreža)</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 66526821..1389dff0 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="cast_format" formatted="true">Stáblista: %s</string>
     <string name="next_episode_time_day_format" formatted="true">%dn %dó%dp</string>
@@ -275,4 +275,4 @@
     <string name="show_hd">Minőségi jelzés</string>
     <string name="show_dub">Szinkroncímke</string>
     <string name="show_sub">Alcímke</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index f5af3877..02234c49 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Pemeran: %s</string>
@@ -552,4 +553,4 @@
     <string name="pref_category_bypass">Bypass ISP</string>
     <string name="revert">Pulihkan</string>
     <string name="watch_quality_pref_data">Nonton dengan kualitas yang di inginkan (Data Seluler)</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 4476b4a0..eca60da1 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
@@ -551,4 +552,4 @@
     <string name="subscription_in_progress_notification">Aggiornando shows a cui sei iscritto</string>
     <string name="subscription_episode_released">L\'episodio %d è stato rilasciato!</string>
     <string name="watch_quality_pref_data">Qualità di visualizzazione preferita (Dati mobili)</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 645724fd..b24f0c60 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="preview_background_img_des">הרקע של ההצגה לפני</string>
     <string name="cast_format" formatted="true">צוות שחקנים: %s</string>
@@ -506,4 +506,4 @@
     <string name="sort_alphabetical_z">אלפביתי (ת\' עד א\')</string>
     <string name="open_with">פתח עם</string>
     <string name="empty_library_logged_in_message">נראה שהרשימה הזו ריקה, נסו לעבור לרשימה אחרת</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a3d1d434..20641b20 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="next_episode_time_min_format" formatted="true">%d分</string>
     <string name="title_downloads">ダウンロード</string>
@@ -182,4 +182,4 @@
     <string name="check_for_update">アップデートを確認</string>
     <string name="show_title">作品名</string>
     <string name="update_notification_installing">アプリのアップデートをインストール中…</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 242653be..4b7b6869 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="app_dub_sub_episode_text_format" formatted="true">%sಎಪಿ%d</string>
     <string name="cast_format" formatted="true">ಕ್ಯಾಸ್ಟ್:%s</string>
@@ -125,4 +125,4 @@
     <string name="download_started">ಡೌನ್‌ಲೋಡ್ ಪ್ರಾರಂಭವಾಗಿದೆ</string>
     <string name="download_canceled">ಡೌನ್‌ಲೋಡ್ ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ</string>
     <string name="home_next_random_img_des">ಮುಂದಿನ ರಾಂಡಮ್</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 7251d0d7..811a09c5 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Брзина (%.2fx)</string>
     <string name="rated_format" formatted="true">Оценето: %.1f</string>
@@ -213,4 +214,4 @@
     <string name="subtitles_shadow">Сенка</string>
     <string name="subtitles_raised">Подигнат</string>
     <string name="history">Историја</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index b6ad3a80..d430d7cc 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">വേഗം (%.2fx)</string>
     <string name="rated_format" formatted="true">റേറ്റിംഗ്: %.1f</string>
@@ -169,4 +170,4 @@
     <string name="watch_quality_pref">ഔചിത്യ വീഡിയോ ക്വാളിറ്റി</string>
     <string name="history">ചരിത്രം</string>
     <string name="action_mark_as_watched">കണ്ടതാണെന്ന് അടയാളപ്പെടുത്തുക</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index a6b3daec..c757504a 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 3595a24a..766bcdc7 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
@@ -408,4 +409,4 @@
     <string name="library">Bibliotheek</string>
     <string name="browser">Browser</string>
     <string name="test_log">Logboek</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index b5132028..43738665 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="episode_more_options_des">Fleire val</string>
     <string name="title_home">Heim</string>
@@ -183,4 +183,4 @@
     <string name="duration">Varigheit</string>
     <string name="livestreams">Direktesendingar</string>
     <string name="pref_category_app_updates">Programoppdateringar</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index d9feb60c..fddd4919 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Plakat</string>
@@ -492,4 +492,4 @@
     <string name="update_started">Oppdatering startet</string>
     <string name="plugin_downloaded">Programtillegg nedlastet</string>
     <string name="delayed_update_notice">Programmet vil oppgraderes når du avslutter det</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 7fc0c887..a2a07dd7 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <string name="player_speed_text_format" formatted="true">Prędkość (%.2fx)</string>
     <string name="rated_format" formatted="true">Ocena: %.1f</string>
     <string name="new_update_format" formatted="true">Znaleziono nową aktualizację!
@@ -532,4 +533,4 @@
     <string name="jsdelivr_proxy_summary">Obchodzi blokadę GitHuba za pomocą jsdelivr, może spowodować opóźnienie aktualizacji o kilka dni.</string>
     <string name="jsdelivr_enabled">Nie udało się połączyć z GitHub, włączono serwer pośredniczący jsdelivr.</string>
     <string name="watch_quality_pref_data">Domyślna jakość (dane mobilne)</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 64ccb903..dd722f62 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
@@ -529,4 +529,4 @@
     <string name="pref_category_defaults">Configurações padrão</string>
     <string name="quality_sd">SD</string>
     <string name="audio_tracks">Faixas de áudio</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-qt/strings.xml b/app/src/main/res/values-qt/strings.xml
index aee3de91..eee28785 100644
--- a/app/src/main/res/values-qt/strings.xml
+++ b/app/src/main/res/values-qt/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <!-- For true intellectuals -->
     <string name="app_name">aauugghhaauuh</string>
@@ -248,4 +248,4 @@
     <string name="clear_history">aoaaaaaoooghhh</string>
     <string name="sort_save">oooooh uuaagh</string>
     <string name="action_open_play">@string/home_play</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 8cd24a3b..aa443783 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Distribuție: %s</string>
@@ -388,4 +389,4 @@
     <string name="test_log">Log</string>
     <string name="browser">Browser</string>
     <string name="play_with_app_name">Joacă cu CloudStream</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e9494040..9d8f6895 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="history">История</string>
     <string name="no">Нет</string>
@@ -529,4 +529,4 @@
     <string name="jsdelivr_proxy_summary">Обход ограничения доступа к GitHub с помощью jsdelivr может задержать обновления на несколько дней.</string>
     <string name="subscription_list_name">Подписные</string>
     <string name="subscription_deleted">Отказались от подписки на %s</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 96fbaff1..a1afd6d9 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="new_update_format" formatted="true">Našla sa nová aktualizácia!
 \n%s -&gt; %s</string>
@@ -104,4 +104,4 @@
     <string name="vpn_might_be_needed">Na správne fungovanie tohto poskytovateľa môže byť potrebná VPN</string>
     <string name="provider_info_meta">Stránka neposkytla žiadne metadáta, načítanie videa zlyhá, ak na stránke neexistuje.</string>
     <string name="torrent_plot">Popis</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
index b944b6b3..ce7d557a 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-so/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="cast_format" formatted="true">Metalaya: %s</string>
     <string name="next_episode_time_day_format" formatted="true">%dm %ds %dd</string>
@@ -487,4 +487,4 @@
     <string name="skip_type_op">Bilowga</string>
     <string name="skip_type_mixed_op">Bilow isku qasan</string>
     <string name="skip_type_creddits">Qoraalka dhamaadka</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 25066d7b..0b7ba89e 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <string name="rated_format">Betygsatt: %.1f</string>
     <string name="player_speed_text_format">Hastighet (%.2fx)</string>
     <string name="new_update_format">Ny uppdatering hittad!
@@ -368,4 +369,4 @@
     <string name="provider_languages_tip">Titta på videor på dessa språk</string>
     <string name="previous">Föregående</string>
     <string name="tracks">Spår</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index b2334c5f..4370e760 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="search_hint">தேடுக</string>
     <string name="search_hint_site" formatted="true">தேடல் %s…</string>
@@ -107,4 +107,4 @@
     <string name="double_tap_to_pause_settings">இடைநிறுத்துவதற்கு இருமுறை தட்டவும்</string>
     <string name="chromecast_subtitles_settings_des">Chromecast வசன அமைப்புகள்</string>
     <string name="use_system_brightness_settings_des">இருண்ட மேலடுக்குக்குப் பதிலாக ஆப் பிளேயரில் சிஸ்டம் பிரகாசத்தைப் பயன்படுத்தவும்</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 721c421c..cf3b1263 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- KEYS DON'T TRANSLATE -->
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format">%s Ep %d</string>
@@ -263,4 +264,4 @@
     <string name="add_account">Magdagdag ng Account</string>
     <string name="history">Kasaysayan</string>
     <string name="action_mark_as_watched">I-tanda bilang napanood na</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 975242b2..74754008 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
     <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
@@ -577,4 +578,4 @@
     <string name="subscription_deleted">%s kanalı aboneliğinden çıkıldı</string>
     <string name="test_log">Günlük</string>
     <string name="android_tv_interface_on_seek_settings_summary">Oynatıcı görünür durumdayken atlanacak süre miktarı</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index d9ec76bb..bd062394 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="search_poster_img_des">Постер</string>
     <string name="episode_poster_img_des">Постер до епізоду</string>
@@ -529,4 +529,4 @@
     <string name="pref_category_bypass">Обходи ISP</string>
     <string name="jsdelivr_proxy_summary">За допомогою jsdelivr можна обійти блокування GitHub. Можлива затримка оновлень на кілька днів.</string>
     <string name="watch_quality_pref_data">Бажана якість перегляду (Мобільні дані)</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 4a8bbf11..c19c6472 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="cast_format" formatted="true">کاسٹ: %s</string>
     <string name="next_episode_format" formatted="true">قسط %d جاری کیا جائے گا</string>
@@ -356,4 +356,4 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="subtitles_raised">اٹھایا</string>
     <string name="subtitle_offset_extra_hint_before_format">اگر سب ٹائٹلز %d ms بہت جلد دکھائے جائیں تو اسے استعمال کریں</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 74e748a3..520cfaa4 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- KEYS DON'T TRANSLATE -->
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Tập %d</string>
@@ -524,4 +525,4 @@
     <string name="test_failed">Thất bại</string>
     <string name="test_passed">Thành công</string>
     <string name="start">Bắt đầu</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 6aa41ff3..3364ea86 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
     <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
@@ -534,4 +535,4 @@
     <string name="pref_category_looks">外觀</string>
     <string name="pref_category_ui_features">功能</string>
     <string name="browser">瀏覽器</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 47807259..44b93430 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
     <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
@@ -577,4 +578,4 @@
     <string name="pref_category_bypass">ISP 绕过</string>
     <string name="revert">还原</string>
     <string name="watch_quality_pref_data">首选播放画质（移动数据）</string>
-</resources>
\ No newline at end of file
+</resources>

From 8fff809b792dc8f9885f71509bdde11427d9e378 Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Fri, 17 Mar 2023 16:07:28 +0100
Subject: [PATCH 266/273] Revert ffmpeg as it causes issues with subtitles :(

---
 app/build.gradle.kts                                          | 2 +-
 .../java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f70a575f..0bd56fe7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -160,7 +160,7 @@ dependencies {
     implementation("com.google.android.exoplayer:extension-mediasession:2.18.2")
     implementation("com.google.android.exoplayer:extension-okhttp:2.18.2")
     // Use the Jellyfin ffmpeg extension for easy ffmpeg audio decoding in exoplayer. Thank you Jellyfin <3
-    implementation("org.jellyfin.exoplayer:exoplayer-ffmpeg-extension:2.18.2+1")
+//    implementation("org.jellyfin.exoplayer:exoplayer-ffmpeg-extension:2.18.2+1")
 
     //implementation("com.google.android.exoplayer:extension-leanback:2.14.0")
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 2aaa3619..e0885671 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -674,9 +674,9 @@ class CS3IPlayer : IPlayer {
                 ExoPlayer.Builder(context)
                     .setRenderersFactory { eventHandler, videoRendererEventListener, audioRendererEventListener, textRendererOutput, metadataRendererOutput ->
                         DefaultRenderersFactory(context).apply {
-                            setEnableDecoderFallback(true)
+//                            setEnableDecoderFallback(true)
                             // Enable Ffmpeg extension
-                            setExtensionRendererMode(EXTENSION_RENDERER_MODE_ON)
+//                            setExtensionRendererMode(EXTENSION_RENDERER_MODE_ON)
                         }.createRenderers(
                                 eventHandler,
                                 videoRendererEventListener,

From 019399952f4516a1478875c0ca1c3918e55f0788 Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Fri, 17 Mar 2023 16:23:03 +0100
Subject: [PATCH 267/273] Better subtitle decoding :)

---
 .../ui/player/CustomSubtitleDecoderFactory.kt | 68 +++++++++++--------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt
index 690d3706..974a5d26 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt
@@ -4,13 +4,16 @@ import android.content.Context
 import android.util.Log
 import androidx.preference.PreferenceManager
 import com.google.android.exoplayer2.Format
-import com.google.android.exoplayer2.text.SubtitleDecoder
-import com.google.android.exoplayer2.text.SubtitleDecoderFactory
-import com.google.android.exoplayer2.text.SubtitleInputBuffer
-import com.google.android.exoplayer2.text.SubtitleOutputBuffer
+import com.google.android.exoplayer2.text.*
+import com.google.android.exoplayer2.text.cea.Cea608Decoder
+import com.google.android.exoplayer2.text.cea.Cea708Decoder
+import com.google.android.exoplayer2.text.dvb.DvbDecoder
+import com.google.android.exoplayer2.text.pgs.PgsDecoder
 import com.google.android.exoplayer2.text.ssa.SsaDecoder
 import com.google.android.exoplayer2.text.subrip.SubripDecoder
 import com.google.android.exoplayer2.text.ttml.TtmlDecoder
+import com.google.android.exoplayer2.text.tx3g.Tx3gDecoder
+import com.google.android.exoplayer2.text.webvtt.Mp4WebvttDecoder
 import com.google.android.exoplayer2.text.webvtt.WebvttDecoder
 import com.google.android.exoplayer2.util.MimeTypes
 import com.lagradost.cloudstream3.R
@@ -19,7 +22,11 @@ import org.mozilla.universalchardet.UniversalDetector
 import java.nio.ByteBuffer
 import java.nio.charset.Charset
 
-class CustomDecoder : SubtitleDecoder {
+/**
+ * @param fallbackFormat used to create a decoder based on mimetype if the subtitle string is not
+ * enough to identify the subtitle format.
+ **/
+class CustomDecoder(private val fallbackFormat: Format?) : SubtitleDecoder {
     companion object {
         fun updateForcedEncoding(context: Context) {
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
@@ -139,7 +146,7 @@ class CustomDecoder : SubtitleDecoder {
             val inputString = getStr(inputBuffer)
             if (realDecoder == null && !inputString.isNullOrBlank()) {
                 var str: String = inputString
-                // this way we read the subtitle file and decide what decoder to use instead of relying on mimetype
+                // this way we read the subtitle file and decide what decoder to use instead of relying fully on mimetype
                 Log.i(TAG, "Got data from queueInputBuffer")
                 //https://github.com/LagradOst/CloudStream-2/blob/ddd774ee66810137ff7bd65dae70bcf3ba2d2489/CloudStreamForms/CloudStreamForms/Script/MainChrome.cs#L388
                 realDecoder = when {
@@ -148,8 +155,31 @@ class CustomDecoder : SubtitleDecoder {
                     (str.startsWith(
                         "[Script Info]",
                         ignoreCase = true
-                    ) || str.startsWith("Title:", ignoreCase = true)) -> SsaDecoder()
+                    ) || str.startsWith("Title:", ignoreCase = true)) -> SsaDecoder(fallbackFormat?.initializationData)
                     str.startsWith("1", ignoreCase = true) -> SubripDecoder()
+                    fallbackFormat != null -> {
+                        when (val mimeType = fallbackFormat.sampleMimeType) {
+                            MimeTypes.TEXT_VTT -> WebvttDecoder()
+                            MimeTypes.TEXT_SSA -> SsaDecoder(fallbackFormat.initializationData)
+                            MimeTypes.APPLICATION_MP4VTT -> Mp4WebvttDecoder()
+                            MimeTypes.APPLICATION_TTML -> TtmlDecoder()
+                            MimeTypes.APPLICATION_SUBRIP -> SubripDecoder()
+                            MimeTypes.APPLICATION_TX3G -> Tx3gDecoder(fallbackFormat.initializationData)
+                            MimeTypes.APPLICATION_CEA608, MimeTypes.APPLICATION_MP4CEA608 -> Cea608Decoder(
+                                mimeType,
+                                fallbackFormat.accessibilityChannel,
+                                Cea608Decoder.MIN_DATA_CHANNEL_TIMEOUT_MS
+                            )
+                            MimeTypes.APPLICATION_CEA708 -> Cea708Decoder(
+                                fallbackFormat.accessibilityChannel,
+                                fallbackFormat.initializationData
+                            )
+                            MimeTypes.APPLICATION_DVBSUBS -> DvbDecoder(fallbackFormat.initializationData)
+                            MimeTypes.APPLICATION_PGS -> PgsDecoder()
+                            MimeTypes.TEXT_EXOPLAYER_CUES -> ExoplayerCuesDecoder()
+                            else -> null
+                        }
+                    }
                     else -> null
                 }
                 Log.i(
@@ -246,28 +276,6 @@ class CustomSubtitleDecoderFactory : SubtitleDecoderFactory {
     }
 
     override fun createDecoder(format: Format): SubtitleDecoder {
-        return CustomDecoder()
-        //return when (val mimeType = format.sampleMimeType) {
-        //    MimeTypes.TEXT_VTT -> WebvttDecoder()
-        //    MimeTypes.TEXT_SSA -> SsaDecoder(format.initializationData)
-        //    MimeTypes.APPLICATION_MP4VTT -> Mp4WebvttDecoder()
-        //    MimeTypes.APPLICATION_TTML -> TtmlDecoder()
-        //    MimeTypes.APPLICATION_SUBRIP -> SubripDecoder()
-        //    MimeTypes.APPLICATION_TX3G -> Tx3gDecoder(format.initializationData)
-        //    MimeTypes.APPLICATION_CEA608, MimeTypes.APPLICATION_MP4CEA608 -> return Cea608Decoder(
-        //        mimeType,
-        //        format.accessibilityChannel,
-        //        Cea608Decoder.MIN_DATA_CHANNEL_TIMEOUT_MS
-        //    )
-        //    MimeTypes.APPLICATION_CEA708 -> Cea708Decoder(
-        //        format.accessibilityChannel,
-        //        format.initializationData
-        //    )
-        //    MimeTypes.APPLICATION_DVBSUBS -> DvbDecoder(format.initializationData)
-        //    MimeTypes.APPLICATION_PGS -> PgsDecoder()
-        //    MimeTypes.TEXT_EXOPLAYER_CUES -> ExoplayerCuesDecoder()
-        //    // Default WebVttDecoder
-        //    else -> WebvttDecoder()
-        //}
+        return CustomDecoder(format)
     }
 }
\ No newline at end of file

From 9c40abc4d32f2003d84361828435683b031dc0e0 Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Fri, 17 Mar 2023 22:15:25 +0100
Subject: [PATCH 268/273] Added player intent

---
 app/src/main/AndroidManifest.xml              | 10 +++++++++
 .../lagradost/cloudstream3/MainActivity.kt    | 21 +++++++++++++++++++
 .../syncproviders/AccountManager.kt           |  1 +
 .../ui/download/DownloadFragment.kt           |  4 ++--
 .../ui/player/DownloadedPlayerActivity.kt     |  2 +-
 .../cloudstream3/ui/player/LinkGenerator.kt   | 17 ++++++++++-----
 6 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 871c4f69..563c82f8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -98,6 +98,16 @@
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
+
+            <!-- cloudstreamplayer://encodedUrl?name=Dune -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="cloudstreamplayer" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 7818e357..d054f504 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.Configuration
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.util.AttributeSet
@@ -57,6 +58,7 @@ import com.lagradost.cloudstream3.receivers.VideoDownloadRestartReceiver
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.OAuth2Apis
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.accountManagers
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appString
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringPlayer
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringRepo
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringResumeWatching
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringSearch
@@ -65,6 +67,9 @@ import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_NAVIGATE_TO
 import com.lagradost.cloudstream3.ui.home.HomeViewModel
+import com.lagradost.cloudstream3.ui.player.BasicLink
+import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
+import com.lagradost.cloudstream3.ui.player.LinkGenerator
 import com.lagradost.cloudstream3.ui.result.ResultViewModel2
 import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
 import com.lagradost.cloudstream3.ui.result.setImage
@@ -274,6 +279,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             isWebview: Boolean
         ): Boolean =
             with(activity) {
+                // TODO MUCH BETTER HANDLING
+
                 // Invalid URIs can crash
                 fun safeURI(uri: String) = normalSafeApiCall { URI(uri) }
 
@@ -329,6 +336,20 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                         // It might be better to use the QuickSearch.
                         nav_view?.selectedItemId = R.id.navigation_search
                         nav_rail_view?.selectedItemId = R.id.navigation_search
+                    } else if (safeURI(str)?.scheme == appStringPlayer) {
+                        val uri = Uri.parse(str)
+                        val name = uri.getQueryParameter("name")
+                        val url = URLDecoder.decode(uri.authority, "UTF-8")
+
+                        navigate(
+                            R.id.global_to_navigation_player,
+                            GeneratorPlayer.newInstance(
+                                LinkGenerator(
+                                    listOf(BasicLink(url, name)),
+                                    extract = true,
+                                )
+                            )
+                        )
                     } else if (safeURI(str)?.scheme == appStringResumeWatching) {
                         val id =
                             str.substringAfter("$appStringResumeWatching://").toIntOrNull()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
index f17086c1..8ce6bae2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
@@ -45,6 +45,7 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI {
 
         const val appString = "cloudstreamapp"
         const val appStringRepo = "cloudstreamrepo"
+        const val appStringPlayer = "cloudstreamplayer"
 
         // Instantly start the search given a query
         const val appStringSearch = "cloudstreamsearch"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
index f0340845..e80a8fa5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
@@ -24,7 +24,6 @@ import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
 import com.lagradost.cloudstream3.ui.player.LinkGenerator
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.loadResult
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE
@@ -40,6 +39,7 @@ import kotlinx.android.synthetic.main.stream_input.*
 import android.text.format.Formatter.formatShortFileSize
 import androidx.core.widget.doOnTextChanged
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.ui.player.BasicLink
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import java.net.URI
 
@@ -225,7 +225,7 @@ class DownloadFragment : Fragment() {
                         R.id.global_to_navigation_player,
                         GeneratorPlayer.newInstance(
                             LinkGenerator(
-                                listOf(url),
+                                listOf(BasicLink(url)),
                                 extract = true,
                                 referer = referer,
                                 isM3u8 = dialog.hls_switch?.isChecked
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
index dc1bbba3..6f40e145 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
@@ -42,7 +42,7 @@ class DownloadedPlayerActivity : AppCompatActivity() {
             R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
                 LinkGenerator(
                     listOf(
-                        url
+                        BasicLink(url)
                     )
                 )
             )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt
index 1f242481..0b560857 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt
@@ -5,8 +5,15 @@ import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.utils.*
 import java.net.URI
 
+/**
+ * Used to open the player more easily with the LinkGenerator
+ **/
+data class BasicLink(
+    val url: String,
+    val name: String? = null,
+)
 class LinkGenerator(
-    private val links: List<String>,
+    private val links: List<BasicLink>,
     private val extract: Boolean = true,
     private val referer: String? = null,
     private val isM3u8: Boolean? = null
@@ -47,7 +54,7 @@ class LinkGenerator(
         offset: Int
     ): Boolean {
         links.amap { link ->
-            if (!extract || !loadExtractor(link, referer, {
+            if (!extract || !loadExtractor(link.url, referer, {
                     subtitleCallback(PlayerSubtitleHelper.getSubtitleData(it))
                 }) {
                     callback(it to null)
@@ -57,11 +64,11 @@ class LinkGenerator(
                 callback(
                     ExtractorLink(
                         "",
-                        link,
-                        unshortenLinkSafe(link), // unshorten because it might be a raw link
+                        link.name ?: link.url,
+                        unshortenLinkSafe(link.url), // unshorten because it might be a raw link
                         referer ?: "",
                         Qualities.Unknown.value, isM3u8 ?: normalSafeApiCall {
-                            URI(link).path?.substringAfterLast(".")?.contains("m3u")
+                            URI(link.url).path?.substringAfterLast(".")?.contains("m3u")
                         } ?: false
                     ) to null
                 )

From 5245eff6e12a781bb2e072e75d7e610252c4135d Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sat, 18 Mar 2023 09:22:07 +0100
Subject: [PATCH 269/273] [skip ci] fix xml header being slightly wrong

---
 .github/locales.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/locales.py b/.github/locales.py
index 04d9cd13..9ab272b9 100644
--- a/.github/locales.py
+++ b/.github/locales.py
@@ -56,6 +56,8 @@ for file in glob.glob(f"{XML_NAME}*/strings.xml"):
             if child.text.startswith("\\@string/"):
                 print(f"[{file}] fixing {child.attrib['name']}")
                 child.text = child.text.replace("\\@string/", "@string/")
-        tree.write(file, encoding="utf-8", method="xml", pretty_print=True, xml_declaration=True)
+        with open(file, 'w') as fp:
+            fp.write('<?xml version="1.0" encoding="utf-8"?>\n')
+            tree.write(fp, encoding="utf-8", method="xml", pretty_print=True, xml_declaration=False)
     except ET.ParseError as ex:
-        print(f"[{file}] {ex}")
\ No newline at end of file
+        print(f"[{file}] {ex}")

From 4235c826a5f150c69af0f601e76855bbf12e9971 Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Sat, 18 Mar 2023 23:55:58 +0100
Subject: [PATCH 270/273] Better focus on Android TV (Thank you ocean for
 reporting)

---
 .../ui/home/HomeParentItemAdapter.kt          |  2 +-
 .../ui/result/LinearListLayout.kt             | 18 +++++++++----
 .../cloudstream3/ui/result/ResultFragment.kt  | 20 ++++++++++++++
 .../ui/settings/SettingsAccount.kt            | 22 +++++++++++++++
 .../main/res/layout/fragment_result_tv.xml    |  9 +++----
 .../main/res/layout/homepage_parent_tv.xml    | 27 +++++++++----------
 6 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
index e6999c9e..58c6dbe0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
@@ -185,7 +185,7 @@ open class ParentItemAdapter(
     ) :
         RecyclerView.ViewHolder(itemView) {
         val title: TextView = itemView.home_child_more_info
-        val recyclerView: RecyclerView = itemView.home_child_recyclerview
+        private val recyclerView: RecyclerView = itemView.home_child_recyclerview
 
         fun update(expand: HomeViewModel.ExpandableHomepageList) {
             val info = expand.list
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/LinearListLayout.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/LinearListLayout.kt
index 59a46264..affbcbb4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/LinearListLayout.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/LinearListLayout.kt
@@ -7,13 +7,13 @@ import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.mvvm.logError
 
 fun RecyclerView?.setLinearListLayout(isHorizontal: Boolean = true) {
-    if(this == null) return
+    if (this == null) return
     this.layoutManager =
         this.context?.let { LinearListLayout(it).apply { if (isHorizontal) setHorizontal() else setVertical() } }
             ?: this.layoutManager
 }
 
-class LinearListLayout(context: Context?) :
+open class LinearListLayout(context: Context?) :
     LinearLayoutManager(context) {
 
     fun setHorizontal() {
@@ -24,7 +24,8 @@ class LinearListLayout(context: Context?) :
         orientation = VERTICAL
     }
 
-    private fun getCorrectParent(focused: View): View? {
+    private fun getCorrectParent(focused: View?): View? {
+        if (focused == null) return null
         var current: View? = focused
         val last: ArrayList<View> = arrayListOf(focused)
         while (current != null && current !is RecyclerView) {
@@ -54,10 +55,17 @@ class LinearListLayout(context: Context?) :
         linearSmoothScroller.targetPosition = position
         startSmoothScroll(linearSmoothScroller)
     }*/
-
     override fun onInterceptFocusSearch(focused: View, direction: Int): View? {
         val dir = if (orientation == HORIZONTAL) {
-            if (direction == View.FOCUS_DOWN || direction == View.FOCUS_UP) return null
+            if (direction == View.FOCUS_DOWN || direction == View.FOCUS_UP) {
+                // This scrolls the recyclerview before doing focus search, which
+                // allows the focus search to work better.
+
+                // Without this the recyclerview focus location on the screen
+                // would change when scrolling between recyclerviews.
+                (focused.parent as? RecyclerView)?.focusSearch(direction)
+                return null
+            }
             if (direction == View.FOCUS_RIGHT) 1 else -1
         } else {
             if (direction == View.FOCUS_RIGHT || direction == View.FOCUS_LEFT) return null
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index bdef14b5..5a3e28b4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -22,6 +22,7 @@ import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.RecyclerView
 import com.discord.panels.OverlappingPanelsLayout
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
@@ -531,6 +532,25 @@ open class ResultFragment : ResultTrailerPlayer() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        result_cast_items?.layoutManager = object : LinearListLayout(view.context) {
+            override fun onRequestChildFocus(
+                parent: RecyclerView,
+                state: RecyclerView.State,
+                child: View,
+                focused: View?
+            ): Boolean {
+                // Make the cast always focus the first visible item when focused
+                // from somewhere else. Otherwise it jumps to the last item.
+                return if (parent.focusedChild == null) {
+                    scrollToPosition(this.findFirstCompletelyVisibleItemPosition())
+                    true
+                } else {
+                    super.onRequestChildFocus(parent, state, child, focused)
+                }
+            }
+        }.apply {
+            this.orientation = RecyclerView.HORIZONTAL
+        }
         result_cast_items?.adapter = ActorAdaptor()
 
         updateUIListener = ::updateUI
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
index f9627e46..1ef3cb55 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
@@ -157,6 +157,28 @@ class SettingsAccount : PreferenceFragmentCompat() {
                             )
                             dialog.dismissSafe()
                         }
+
+                        val displayedItems = listOf(
+                            dialog.login_username_input,
+                            dialog.login_email_input,
+                            dialog.login_server_input,
+                            dialog.login_password_input
+                        ).filter { it.isVisible }
+
+                        displayedItems.foldRight(displayedItems.firstOrNull()) { item, previous ->
+                            item?.id?.let { previous?.nextFocusDownId = it }
+                            previous?.id?.let { item?.nextFocusUpId = it }
+                            item
+                        }
+
+                        displayedItems.firstOrNull()?.let {
+                            dialog.create_account?.nextFocusDownId = it.id
+                            it.nextFocusUpId = dialog.create_account.id
+                        }
+                        dialog.apply_btt?.id?.let {
+                            displayedItems.lastOrNull()?.nextFocusDownId = it
+                        }
+
                         dialog.text1?.text = api.name
 
                         if (api.storesPasswordInPlainText) {
diff --git a/app/src/main/res/layout/fragment_result_tv.xml b/app/src/main/res/layout/fragment_result_tv.xml
index a29dc192..5eacdbe2 100644
--- a/app/src/main/res/layout/fragment_result_tv.xml
+++ b/app/src/main/res/layout/fragment_result_tv.xml
@@ -199,17 +199,13 @@
                                     android:id="@+id/result_back"
                                     android:layout_width="30dp"
                                     android:layout_height="30dp"
-
                                     android:layout_gravity="center_vertical"
                                     android:layout_marginEnd="10dp"
-
                                     android:background="?android:attr/selectableItemBackgroundBorderless"
                                     android:clickable="true"
                                     android:contentDescription="@string/go_back"
-
                                     android:focusable="true"
                                     android:gravity="center_vertical"
-
                                     android:nextFocusDown="@id/result_description"
                                     android:src="@drawable/ic_baseline_arrow_back_24"
                                     app:tint="?attr/white" />
@@ -385,8 +381,8 @@
 
 
                     <com.google.android.material.chip.ChipGroup
-                        style="@style/ChipParent"
                         android:id="@+id/result_tag"
+                        style="@style/ChipParent"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
@@ -423,11 +419,11 @@
 
 
                         <LinearLayout
-                            android:animateLayoutChanges="true"
                             android:id="@+id/result_movie_parent"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="5dp"
+                            android:animateLayoutChanges="true"
                             android:orientation="horizontal"
                             tools:visibility="visible">
 
@@ -568,6 +564,7 @@
                                 android:layout_weight="1"
                                 android:minWidth="250dp"
                                 android:nextFocusLeft="@id/result_movie_progress_downloaded_holder"
+                                android:nextFocusRight="@id/result_bookmark_button"
                                 android:nextFocusDown="@id/result_resume_series_button_play"
                                 android:text="@string/type_none"
                                 android:visibility="visible" />
diff --git a/app/src/main/res/layout/homepage_parent_tv.xml b/app/src/main/res/layout/homepage_parent_tv.xml
index d0c88c39..9dcf0bae 100644
--- a/app/src/main/res/layout/homepage_parent_tv.xml
+++ b/app/src/main/res/layout/homepage_parent_tv.xml
@@ -2,33 +2,30 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <TextView
-        android:layout_marginStart="@dimen/navbar_width"
         android:id="@+id/home_child_more_info"
-        android:padding="12dp"
+        style="@style/WatchHeaderText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="@style/WatchHeaderText"
+        android:layout_marginStart="@dimen/navbar_width"
         android:layout_marginEnd="0dp"
+        android:padding="12dp"
         tools:text="Trending" />
 
     <androidx.recyclerview.widget.RecyclerView
-        android:nextFocusUp="@id/home_child_more_info"
-
-        android:paddingEnd="5dp"
-        android:paddingStart="@dimen/navbar_width"
-        android:clipToPadding="false"
-
-        android:descendantFocusability="afterDescendants"
-
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         android:id="@+id/home_child_recyclerview"
-        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:descendantFocusability="afterDescendants"
+        android:nextFocusUp="@id/home_child_more_info"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/navbar_width"
+        android:paddingEnd="5dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listitem="@layout/home_result_grid" />
 </LinearLayout>
\ No newline at end of file

From 0cbee7068326a8f215f53c45d9c85d3601eac468 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sun, 19 Mar 2023 12:51:54 +0100
Subject: [PATCH 271/273] [skip ci] Update locales.py

---
 .github/locales.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/locales.py b/.github/locales.py
index 9ab272b9..7d6d6b90 100644
--- a/.github/locales.py
+++ b/.github/locales.py
@@ -56,8 +56,8 @@ for file in glob.glob(f"{XML_NAME}*/strings.xml"):
             if child.text.startswith("\\@string/"):
                 print(f"[{file}] fixing {child.attrib['name']}")
                 child.text = child.text.replace("\\@string/", "@string/")
-        with open(file, 'w') as fp:
-            fp.write('<?xml version="1.0" encoding="utf-8"?>\n')
+        with open(file, 'wb') as fp:
+            fp.write(b'<?xml version="1.0" encoding="utf-8"?>\n')
             tree.write(fp, encoding="utf-8", method="xml", pretty_print=True, xml_declaration=False)
     except ET.ParseError as ex:
         print(f"[{file}] {ex}")

From 52d495f425fa3a305a2c4018c36b93e9542751b5 Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Tue, 21 Mar 2023 20:50:13 +0000
Subject: [PATCH 272/273] Update README.md

---
 README.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 3430d626..e3d033ba 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,7 @@
 + Download and stream movies, tv-shows and anime
 + Chromecast
 
-### Screenshots:
-
-<img src="./.github/home.jpg" height="400"/><img src="./.github/search.jpg" height="400"/><img src="./.github/downloads.jpg" height="400"/><img src="./.github/results.jpg" height="400"/>
-<img src="./.github/player.jpg" height="200"/>
-
 ### Supported languages:
 <a href="https://hosted.weblate.org/engage/cloudstream/">
   <img src="https://hosted.weblate.org/widgets/cloudstream/-/app/multi-auto.svg" alt="Translation status" />
-</a>
\ No newline at end of file
+</a>

From 67b0549fd2a3fe4b94d0a6f03f490bfa8956258e Mon Sep 17 00:00:00 2001
From: LagradOst <46196380+Blatzar@users.noreply.github.com>
Date: Tue, 21 Mar 2023 21:01:47 +0000
Subject: [PATCH 273/273] remove images

---
 .github/downloads.jpg | Bin 59461 -> 0 bytes
 .github/home.jpg      | Bin 139384 -> 0 bytes
 .github/player.jpg    | Bin 49418 -> 0 bytes
 .github/results.jpg   | Bin 98562 -> 0 bytes
 .github/search.jpg    | Bin 152135 -> 0 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .github/downloads.jpg
 delete mode 100644 .github/home.jpg
 delete mode 100644 .github/player.jpg
 delete mode 100644 .github/results.jpg
 delete mode 100644 .github/search.jpg

diff --git a/.github/downloads.jpg b/.github/downloads.jpg
deleted file mode 100644
index ca14a664a2ce2b07cdc366343d54c690d9bacc01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 59461
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

diff --git a/.github/home.jpg b/.github/home.jpg
deleted file mode 100644
index 72370d3c98b1de23dfd90dfa79cf74cbcc761ff9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 139384
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

diff --git a/.github/player.jpg b/.github/player.jpg
deleted file mode 100644
index f6959cf31d27e5debc98e7d69b54688c589803a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 49418
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
XYzePFKFO8tiMu}5wmeAxx%z(q33~xj

diff --git a/.github/results.jpg b/.github/results.jpg
deleted file mode 100644
index 4dbc9b8d48abc68bf53b0d8a85e9d28951ce7ad6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 98562
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
T_iJ8Mtj&4^JWxLkp~e3JSo6U!

diff --git a/.github/search.jpg b/.github/search.jpg
deleted file mode 100644
index 784bec892550387282d3551e7ed8d830aa0a1cd8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 152135
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