ui tweaks

README.md

@@ -1,6 +1,4 @@
-# **Dantotsu** (🚧 ALPHA 🚧)
-
-> ⚠️ **WARNING**: This project is in alpha stage. Things may not work as expected.
+# **Dantotsu**
 
 <p align="center">
    <a href="https://discord.gg/4HPZ5nAWwM"><img src="https://img.shields.io/badge/Discord-7289DA?style=for-the-badge&logo=discord&logoColor=white"></a>
@@ -26,14 +24,14 @@ Dantotsu is crafted from the ashes of Saikou and based on simplistic yet state-o
 | Type             | Status  |
 | ---------------- | ------- |
 | Anime Extensions | Working |
-| Manga Extensions | "Working" |
+| Manga Extensions | Working |
 | Light Novel Extensions | Not Working |
 
 
 
 ## APP FEATURES
 
-- Easy and functional way to both, watch anime and read manga, ad-free.
+- Easy and functional way to both, watch anime and read manga.
 
 - A completely open source app with a nice UI & Animations :)
 
@@ -59,14 +57,16 @@ add your own extensions in the settings menu (Dantotsu has no affiliation with a
 
 ## Planned Stuff
 
-- get app out of alpha
+- TV Support
 
-- Accent Color Change (RIP Hot Pink Supremacy.)
+- LN Support
+
+- Offline Viewing
  
 
 ## Rejected Stuff (still rejected)
 
-- Sources of any language except English
+- Official support of any language except English
 
 - News Section in the App
  

app/build.gradle

@@ -21,7 +21,7 @@ android {
         minSdk 23
         targetSdk 34
         versionCode ((System.currentTimeMillis() / 60000).toInteger())
-        versionName "0.1.0"
+        versionName "1.0.0"
         signingConfig signingConfigs.debug
     }
 
@@ -65,6 +65,7 @@ dependencies {
 
     implementation 'com.github.Blatzar:NiceHttp:0.4.3'
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0'
+    implementation 'androidx.preference:preference:1.2.1'
 
 //    Glide
     ext.glide_version = '4.16.0'
@@ -96,6 +97,10 @@ dependencies {
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
     implementation 'com.alexvasilkov:gesture-views:2.8.3'
     implementation 'com.github.VipulOG:ebook-reader:0.1.6'
+    implementation 'androidx.paging:paging-runtime-ktx:3.2.1'
+
+//    string matching
+    implementation 'me.xdrop:fuzzywuzzy:1.4.0'
 
 //    Aniyomi
     implementation 'io.reactivex:rxjava:1.3.8'

app/src/debug/res/values/strings.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Dantotsu α</string>
+    <string name="app_name">Dantotsu</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -2,6 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
@@ -10,7 +17,8 @@
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
 
     <!-- For background jobs -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -47,7 +55,7 @@
         android:theme="@style/Theme.Dantotsu"
         android:usesCleartextTraffic="true"
         tools:ignore="AllowBackup"
-        >
+        android:banner="@drawable/ic_banner_foreground">
         <activity
             android:name="ani.dantotsu.media.novel.novelreader.NovelReaderActivity"
             android:configChanges="orientation|screenSize"
@@ -206,9 +214,12 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.Main"  />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
+            </intent-filter>
         </activity>
         <activity
             android:name="eu.kanade.tachiyomi.extension.manga.util.MangaExtensionInstallActivity"

app/src/main/java/ani/dantotsu/App.kt

@@ -11,6 +11,7 @@ import ani.dantotsu.aniyomi.anime.custom.PreferenceModule
 import eu.kanade.tachiyomi.data.notification.Notifications
 import tachiyomi.core.util.system.logcat
 import ani.dantotsu.others.DisabledReports
+import com.google.android.material.color.DynamicColors
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import logcat.AndroidLogcatLogger
@@ -33,6 +34,11 @@ class App : MultiDexApplication() {
 
     override fun onCreate() {
         super.onCreate()
+        val sharedPreferences = getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)
+        val useMaterialYou = sharedPreferences.getBoolean("use_material_you", false)
+        if(useMaterialYou) {
+            DynamicColors.applyToActivitiesIfAvailable(this)
+        }
         registerActivityLifecycleCallbacks(mFTActivityLifecycleCallbacks)
 
         Firebase.crashlytics.setCrashlyticsCollectionEnabled(!DisabledReports)

app/src/main/java/ani/dantotsu/Functions.kt

@@ -188,6 +188,9 @@ fun Activity.hideStatusBar() {
 open class BottomSheetDialogFragment : BottomSheetDialogFragment() {
     override fun onStart() {
         super.onStart()
+        val window = dialog?.window
+        val decorView: View = window?.decorView ?: return
+        decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
         if (this.resources.configuration.orientation != Configuration.ORIENTATION_PORTRAIT) {
             val behavior = BottomSheetBehavior.from(requireView().parent as View)
             behavior.state = BottomSheetBehavior.STATE_EXPANDED

app/src/main/java/ani/dantotsu/MainActivity.kt

@@ -1,21 +1,30 @@
 package ani.dantotsu
 
 import android.animation.ObjectAnimator
+import android.annotation.SuppressLint
+import android.content.BroadcastReceiver
+import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
 import android.content.pm.PackageManager
+import android.graphics.Color
 import android.graphics.drawable.Animatable
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.GradientDrawable
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.provider.Settings
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AnticipateInterpolator
 import android.widget.TextView
 import androidx.activity.addCallback
 import androidx.activity.viewModels
+import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.animation.doOnEnd
 import androidx.core.app.ActivityCompat
@@ -41,8 +50,10 @@ import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.others.CustomBottomDialog
 import ani.dantotsu.parsers.AnimeSources
 import ani.dantotsu.parsers.MangaSources
+import ani.dantotsu.settings.SettingsActivity
 import ani.dantotsu.settings.UserInterfaceSettings
 import ani.dantotsu.subcriptions.Subscription.Companion.startSubscription
+import ani.dantotsu.themes.ThemeManager
 import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
 import io.noties.markwon.Markwon
 import io.noties.markwon.SoftBreakAddsNewLinePlugin
@@ -53,6 +64,8 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import nl.joery.animatedbottombar.AnimatedBottomBar
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.io.Serializable
 
@@ -63,15 +76,32 @@ class MainActivity : AppCompatActivity() {
     private var load = false
 
     private var uiSettings = UserInterfaceSettings()
-    private val animeExtensionManager: AnimeExtensionManager by injectLazy()
-    private val mangaExtensionManager: MangaExtensionManager by injectLazy()
-
+    private val animeExtensionManager: AnimeExtensionManager = Injekt.get()
+    private val mangaExtensionManager: MangaExtensionManager = Injekt.get()
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
 
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        val _bottomBar = findViewById<AnimatedBottomBar>(R.id.navbar)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+
+            val backgroundDrawable = _bottomBar.background as GradientDrawable
+            val currentColor = backgroundDrawable.color?.defaultColor ?: 0
+            val semiTransparentColor = (currentColor and 0x00FFFFFF) or 0xE8000000.toInt()
+            backgroundDrawable.setColor(semiTransparentColor)
+            _bottomBar.background = backgroundDrawable
+        }
+        val colorOverflow = this.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)
+            .getBoolean("colorOverflow", false)
+        if (!colorOverflow) {
+            _bottomBar.background = ContextCompat.getDrawable(this, R.drawable.bottom_nav_gray)
+
+        }
+
+
         val animeScope = CoroutineScope(Dispatchers.Default)
         animeScope.launch {
             animeExtensionManager.findAvailableExtensions()
@@ -101,24 +131,40 @@ class MainActivity : AppCompatActivity() {
         binding.root.isMotionEventSplittingEnabled = false
 
         lifecycleScope.launch {
-            val splash = SplashScreenBinding.inflate(layoutInflater)
-            binding.root.addView(splash.root)
-            (splash.splashImage.drawable as Animatable).start()
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+                val splash = SplashScreenBinding.inflate(layoutInflater)
+                binding.root.addView(splash.root)
+                (splash.splashImage.drawable as Animatable).start()
 
-            // Wait for 2 seconds (2000 milliseconds)
-            delay(2000)
+                delay(1200)
 
-            // Now perform the animation
-            ObjectAnimator.ofFloat(
-                splash.root,
-                View.TRANSLATION_Y,
-                0f,
-                -splash.root.height.toFloat()
-            ).apply {
-                interpolator = AnticipateInterpolator()
-                duration = 200L
-                doOnEnd { binding.root.removeView(splash.root) }
-                start()
+                ObjectAnimator.ofFloat(
+                    splash.root,
+                    View.TRANSLATION_Y,
+                    0f,
+                    -splash.root.height.toFloat()
+                ).apply {
+                    interpolator = AnticipateInterpolator()
+                    duration = 200L
+                    doOnEnd { binding.root.removeView(splash.root) }
+                    start()
+                }
+            }
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            splashScreen.setOnExitAnimationListener { splashScreenView ->
+                ObjectAnimator.ofFloat(
+                    splashScreenView,
+                    View.TRANSLATION_Y,
+                    0f,
+                    -splashScreenView.height.toFloat()
+                ).apply {
+                    interpolator = AnticipateInterpolator()
+                    duration = 200L
+                    doOnEnd { splashScreenView.remove() }
+                    start()
+                }
             }
         }
 
@@ -228,6 +274,11 @@ class MainActivity : AppCompatActivity() {
 
     }
 
+    override fun onResume() {
+        super.onResume()
+    }
+
+
     //ViewPager
     private class ViewPagerAdapter(fragmentManager: FragmentManager, lifecycle: Lifecycle) :
         FragmentStateAdapter(fragmentManager, lifecycle) {
@@ -244,4 +295,4 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-}
+}

app/src/main/java/ani/dantotsu/aniyomi/anime/custom/InjektModules.kt

@@ -2,6 +2,8 @@ package ani.dantotsu.aniyomi.anime.custom
 
 
 import android.app.Application
+import android.content.Context
+import androidx.core.content.ContextCompat
 import ani.dantotsu.media.manga.MangaCache
 import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
 import tachiyomi.core.preference.PreferenceStore
@@ -10,7 +12,12 @@ import eu.kanade.domain.source.service.SourcePreferences
 import eu.kanade.tachiyomi.core.preference.AndroidPreferenceStore
 import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
 import eu.kanade.tachiyomi.network.NetworkHelper
+import eu.kanade.tachiyomi.network.NetworkPreferences
+import eu.kanade.tachiyomi.source.anime.AndroidAnimeSourceManager
+import eu.kanade.tachiyomi.source.manga.AndroidMangaSourceManager
 import kotlinx.serialization.json.Json
+import tachiyomi.domain.source.anime.service.AnimeSourceManager
+import tachiyomi.domain.source.manga.service.MangaSourceManager
 import uy.kohesive.injekt.api.InjektModule
 import uy.kohesive.injekt.api.InjektRegistrar
 import uy.kohesive.injekt.api.addSingleton
@@ -21,12 +28,17 @@ class AppModule(val app: Application) : InjektModule {
     override fun InjektRegistrar.registerInjectables() {
         addSingleton(app)
 
-        addSingletonFactory { NetworkHelper(app) }
+        addSingletonFactory { NetworkHelper(app, get()) }
 
         addSingletonFactory { AnimeExtensionManager(app) }
-
         addSingletonFactory { MangaExtensionManager(app) }
 
+        addSingletonFactory<AnimeSourceManager> { AndroidAnimeSourceManager(app, get()) }
+        addSingletonFactory<MangaSourceManager> { AndroidMangaSourceManager(app, get()) }
+
+        val sharedPreferences = app.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)
+        addSingleton(sharedPreferences)
+
         addSingletonFactory {
             Json {
                 ignoreUnknownKeys = true
@@ -35,6 +47,11 @@ class AppModule(val app: Application) : InjektModule {
         }
 
         addSingletonFactory { MangaCache() }
+
+        ContextCompat.getMainExecutor(app).execute {
+            get<AnimeSourceManager>()
+            get<MangaSourceManager>()
+        }
     }
 }
 
@@ -44,6 +61,13 @@ class PreferenceModule(val application: Application) : InjektModule {
             AndroidPreferenceStore(application)
         }
 
+        addSingletonFactory {
+            NetworkPreferences(
+                preferenceStore = get(),
+                verboseLogging = false,
+            )
+        }
+
         addSingletonFactory {
             SourcePreferences(get())
         }

app/src/main/java/ani/dantotsu/connections/UpdateProgress.kt

@@ -16,7 +16,7 @@ fun updateProgress(media: Media, number: String) {
     if (Anilist.userid != null) {
         CoroutineScope(Dispatchers.IO).launch {
             val a = number.toFloatOrNull()?.roundToInt()
-            if (a != media.userProgress) {
+            if ((a?:0) > (media.userProgress?:0)) {
                 Anilist.mutation.editList(
                     media.id,
                     a,

app/src/main/java/ani/dantotsu/connections/anilist/Login.kt

@@ -7,10 +7,12 @@ import androidx.appcompat.app.AppCompatActivity
 import ani.dantotsu.logError
 import ani.dantotsu.logger
 import ani.dantotsu.startMainActivity
+import ani.dantotsu.themes.ThemeManager
 
 class Login : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         val data: Uri? = intent?.data
         logger(data.toString())
         try {

app/src/main/java/ani/dantotsu/connections/anilist/UrlMedia.kt

@@ -6,10 +6,12 @@ import android.os.Bundle
 import androidx.core.os.bundleOf
 import ani.dantotsu.loadMedia
 import ani.dantotsu.startMainActivity
+import ani.dantotsu.themes.ThemeManager
 
 class UrlMedia : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         var id: Int? = intent?.extras?.getInt("media", 0) ?: 0
         var isMAL = false
         var continueMedia = true

app/src/main/java/ani/dantotsu/connections/discord/Login.kt

@@ -1,21 +1,32 @@
 package ani.dantotsu.connections.discord
 
 import android.annotation.SuppressLint
+import android.app.Application.getProcessName
+import android.os.Build
 import android.os.Bundle
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import ani.dantotsu.R
 import ani.dantotsu.connections.discord.Discord.saveToken
 import ani.dantotsu.startMainActivity
+import ani.dantotsu.themes.ThemeManager
 
 class Login : AppCompatActivity() {
+
     @SuppressLint("SetJavaScriptEnabled")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            val process = getProcessName()
+            if (packageName != process) WebView.setDataDirectorySuffix(process)
+        }
         setContentView(R.layout.activity_discord)
 
         val webView = findViewById<WebView>(R.id.discordWebview)
+
         webView.apply {
             settings.javaScriptEnabled = true
             settings.databaseEnabled = true

app/src/main/java/ani/dantotsu/connections/mal/Login.kt

@@ -7,12 +7,14 @@ import androidx.lifecycle.lifecycleScope
 import ani.dantotsu.*
 import ani.dantotsu.connections.mal.MAL.clientId
 import ani.dantotsu.connections.mal.MAL.saveResponse
+import ani.dantotsu.themes.ThemeManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 class Login : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         try {
             val data: Uri = intent?.data
                 ?: throw Exception(getString(R.string.mal_login_uri_not_found))

app/src/main/java/ani/dantotsu/download/video/Helper.kt

@@ -63,6 +63,7 @@ object Helper {
                         SubtitleType.VTT -> MimeTypes.TEXT_VTT
                         SubtitleType.ASS -> MimeTypes.TEXT_SSA
                         SubtitleType.SRT -> MimeTypes.APPLICATION_SUBRIP
+                        SubtitleType.UNKNOWN -> MimeTypes.TEXT_SSA
                     }
                 )
                 .build()

app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt

@@ -1,8 +1,11 @@
 package ani.dantotsu.home
 
+import android.content.Context
 import android.content.Intent
+import android.graphics.Color
 import android.os.Handler
 import android.os.Looper
+import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,7 +20,9 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import ani.dantotsu.media.GenreActivity
 import ani.dantotsu.MediaPageTransformer
+import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
+import ani.dantotsu.currContext
 import ani.dantotsu.databinding.ItemAnimePageBinding
 import ani.dantotsu.loadData
 import ani.dantotsu.loadImage
@@ -31,6 +36,8 @@ import ani.dantotsu.setSlideUp
 import ani.dantotsu.settings.SettingsDialogFragment
 import ani.dantotsu.settings.UserInterfaceSettings
 import ani.dantotsu.statusBarHeight
+import com.google.android.material.card.MaterialCardView
+import com.google.android.material.textfield.TextInputLayout
 
 class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHolder>() {
     val ready = MutableLiveData(false)
@@ -49,6 +56,23 @@ class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHold
         binding = holder.binding
         trendingViewPager = binding.animeTrendingViewPager
 
+        val textInputLayout = holder.itemView.findViewById<TextInputLayout>(R.id.animeSearchBar)
+        val currentColor = textInputLayout.boxBackgroundColor
+        val semiTransparentColor = (currentColor and 0x00FFFFFF) or 0xA8000000.toInt()
+        textInputLayout.boxBackgroundColor = semiTransparentColor
+        val materialCardView = holder.itemView.findViewById<MaterialCardView>(R.id.animeUserAvatarContainer)
+        materialCardView.setCardBackgroundColor(semiTransparentColor)
+        val typedValue = TypedValue()
+        currContext()?.theme?.resolveAttribute(android.R.attr.windowBackground, typedValue, true)
+        val color = typedValue.data
+
+
+        val colorOverflow = currContext()?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)?.getBoolean("colorOverflow", false) ?: false
+        if (!colorOverflow) {
+            textInputLayout.boxBackgroundColor = (color and 0x00FFFFFF) or 0x28000000.toInt()
+            materialCardView.setCardBackgroundColor((color and 0x00FFFFFF) or 0x28000000.toInt())
+        }
+
         binding.animeTitleContainer.updatePadding(top = statusBarHeight)
 
         if (uiSettings.smallView) binding.animeTrendingContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
@@ -163,6 +187,7 @@ class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHold
     fun updateAvatar() {
         if (Anilist.avatar != null && ready.value == true) {
             binding.animeUserAvatar.loadImage(Anilist.avatar)
+            binding.animeUserAvatar.imageTintList = null
         }
     }
 

app/src/main/java/ani/dantotsu/home/MangaPageAdapter.kt

@@ -1,8 +1,10 @@
 package ani.dantotsu.home
 
+import android.content.Context
 import android.content.Intent
 import android.os.Handler
 import android.os.Looper
+import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,7 +19,9 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import ani.dantotsu.media.GenreActivity
 import ani.dantotsu.MediaPageTransformer
+import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
+import ani.dantotsu.currContext
 import ani.dantotsu.databinding.ItemMangaPageBinding
 import ani.dantotsu.loadData
 import ani.dantotsu.loadImage
@@ -30,6 +34,8 @@ import ani.dantotsu.setSlideUp
 import ani.dantotsu.settings.SettingsDialogFragment
 import ani.dantotsu.settings.UserInterfaceSettings
 import ani.dantotsu.statusBarHeight
+import com.google.android.material.card.MaterialCardView
+import com.google.android.material.textfield.TextInputLayout
 
 class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHolder>() {
     val ready = MutableLiveData(false)
@@ -48,6 +54,23 @@ class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHold
         binding = holder.binding
         trendingViewPager = binding.mangaTrendingViewPager
 
+        val textInputLayout = holder.itemView.findViewById<TextInputLayout>(R.id.mangaSearchBar)
+        val currentColor = textInputLayout.boxBackgroundColor
+        val semiTransparentColor = (currentColor and 0x00FFFFFF) or 0xA8000000.toInt()
+        textInputLayout.boxBackgroundColor = semiTransparentColor
+        val materialCardView = holder.itemView.findViewById<MaterialCardView>(R.id.mangaUserAvatarContainer)
+        materialCardView.setCardBackgroundColor(semiTransparentColor)
+        val typedValue = TypedValue()
+        currContext()?.theme?.resolveAttribute(android.R.attr.windowBackground, typedValue, true)
+        val color = typedValue.data
+
+
+        val colorOverflow = currContext()?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)?.getBoolean("colorOverflow", false) ?: false
+        if (!colorOverflow) {
+            textInputLayout.boxBackgroundColor = (color and 0x00FFFFFF) or 0x28000000.toInt()
+            materialCardView.setCardBackgroundColor((color and 0x00FFFFFF) or 0x28000000.toInt())
+        }
+
         binding.mangaTitleContainer.updatePadding(top = statusBarHeight)
 
         if (uiSettings.smallView) binding.mangaTrendingContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
@@ -153,6 +176,7 @@ class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHold
     fun updateAvatar() {
         if (Anilist.avatar != null && ready.value == true) {
             binding.mangaUserAvatar.loadImage(Anilist.avatar)
+            binding.mangaUserAvatar.imageTintList = null
         }
     }
 

app/src/main/java/ani/dantotsu/home/NoInternet.kt

@@ -9,10 +9,12 @@ import ani.dantotsu.isOnline
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.startMainActivity
 import ani.dantotsu.statusBarHeight
+import ani.dantotsu.themes.ThemeManager
 
 class NoInternet : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
 
         val binding = ActivityNoInternetBinding.inflate(layoutInflater)
         setContentView(binding.root)

app/src/main/java/ani/dantotsu/media/AuthorActivity.kt

@@ -15,6 +15,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import ani.dantotsu.*
 import ani.dantotsu.databinding.ActivityAuthorBinding
 import ani.dantotsu.others.getSerialized
+import ani.dantotsu.themes.ThemeManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -28,6 +29,7 @@ class AuthorActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityAuthorBinding.inflate(layoutInflater)
         setContentView(binding.root)
 

app/src/main/java/ani/dantotsu/media/CalendarActivity.kt

@@ -2,7 +2,10 @@ package ani.dantotsu.media
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.View
+import android.view.Window
+import android.view.WindowManager
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@@ -11,7 +14,10 @@ import androidx.lifecycle.lifecycleScope
 import ani.dantotsu.R
 import ani.dantotsu.Refresh
 import ani.dantotsu.databinding.ActivityListBinding
+import ani.dantotsu.loadData
 import ani.dantotsu.media.user.ListViewPagerAdapter
+import ani.dantotsu.settings.UserInterfaceSettings
+import ani.dantotsu.themes.ThemeManager
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import kotlinx.coroutines.Dispatchers
@@ -27,10 +33,40 @@ class CalendarActivity : AppCompatActivity() {
     @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityListBinding.inflate(layoutInflater)
+
+
+        val typedValue = TypedValue()
+        theme.resolveAttribute(com.google.android.material.R.attr.colorOnPrimary, typedValue, true)
+        val primaryColor = typedValue.data
+        val typedValue2 = TypedValue()
+        theme.resolveAttribute(com.google.android.material.R.attr.colorPrimary, typedValue2, true)
+        val primaryTextColor = typedValue2.data
+        val typedValue3 = TypedValue()
+        theme.resolveAttribute(com.google.android.material.R.attr.colorSecondary, typedValue3, true)
+        val secondaryColor = typedValue3.data
+
+        window.statusBarColor = primaryColor
+        window.navigationBarColor = primaryColor
+        binding.listTabLayout.setBackgroundColor(primaryColor)
+        binding.listAppBar.setBackgroundColor(primaryColor)
+        binding.listTitle.setTextColor(primaryTextColor)
+        binding.listTabLayout.setTabTextColors(primaryTextColor, primaryTextColor)
+        binding.listTabLayout.setSelectedTabIndicatorColor(primaryTextColor)
+        val uiSettings = loadData<UserInterfaceSettings>("ui_settings") ?: UserInterfaceSettings()
+        if (!uiSettings.immersiveMode) {
+            this.window.statusBarColor =
+                ContextCompat.getColor(this, R.color.nav_bg_inv)
+            binding.root.fitsSystemWindows = true
+
+        }else{
+            binding.root.fitsSystemWindows = false
+            requestWindowFeature(Window.FEATURE_NO_TITLE)
+            window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
+        }
         setContentView(binding.root)
 
-        window.statusBarColor = ContextCompat.getColor(this, R.color.nav_bg)
         binding.listTitle.setText(R.string.release_calendar)
         binding.listSort.visibility = View.GONE
 

app/src/main/java/ani/dantotsu/media/CharacterDetailsActivity.kt

@@ -18,6 +18,7 @@ import ani.dantotsu.databinding.ActivityCharacterBinding
 import ani.dantotsu.others.ImageViewDialog
 import ani.dantotsu.others.getSerialized
 import ani.dantotsu.settings.UserInterfaceSettings
+import ani.dantotsu.themes.ThemeManager
 import com.google.android.material.appbar.AppBarLayout
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -33,6 +34,7 @@ class CharacterDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChang
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityCharacterBinding.inflate(layoutInflater)
         setContentView(binding.root)
 

app/src/main/java/ani/dantotsu/media/GenreActivity.kt

@@ -15,6 +15,7 @@ import ani.dantotsu.initActivity
 import ani.dantotsu.loadData
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.statusBarHeight
+import ani.dantotsu.themes.ThemeManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
@@ -25,6 +26,7 @@ class GenreActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityGenreBinding.inflate(layoutInflater)
         setContentView(binding.root)
         initActivity(this)

app/src/main/java/ani/dantotsu/media/Media.kt

@@ -113,6 +113,10 @@ data class Media(
         this.relation = mediaEdge.relationType?.toString()
     }
 
-    fun mainName() = nameMAL ?: name ?: nameRomaji
+    fun mainName() = name ?: nameMAL ?: nameRomaji
     fun mangaName() = if (countryOfOrigin != "JP") mainName() else nameRomaji
-}
+}
+
+object MediaSingleton {
+    var media: Media? = null
+}

app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt

@@ -47,6 +47,7 @@ import ani.dantotsu.saveData
 import ani.dantotsu.settings.UserInterfaceSettings
 import ani.dantotsu.snackString
 import ani.dantotsu.statusBarHeight
+import ani.dantotsu.themes.ThemeManager
 import com.flaviofaria.kenburnsview.RandomTransitionGenerator
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.navigation.NavigationBarView
@@ -71,6 +72,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
     @SuppressLint("SetTextI18n", "ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityMediaBinding.inflate(layoutInflater)
         setContentView(binding.root)
         screenWidth = resources.displayMetrics.widthPixels.toFloat()
@@ -79,7 +81,8 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
 
         initActivity(this)
         uiSettings = loadData<UserInterfaceSettings>("ui_settings") ?: UserInterfaceSettings()
-        if (!uiSettings.immersiveMode) this.window.statusBarColor = ContextCompat.getColor(this, R.color.nav_bg_inv)
+        if (!uiSettings.immersiveMode) this.window.statusBarColor =
+            ContextCompat.getColor(this, R.color.nav_bg_inv)
 
         binding.mediaBanner.updateLayoutParams { height += statusBarHeight }
         binding.mediaBannerNoKen.updateLayoutParams { height += statusBarHeight }
@@ -101,10 +104,14 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
 
         if (uiSettings.bannerAnimations) {
             val adi = AccelerateDecelerateInterpolator()
-            val generator = RandomTransitionGenerator((10000 + 15000 * (uiSettings.animationSpeed)).toLong(), adi)
+            val generator = RandomTransitionGenerator(
+                (10000 + 15000 * (uiSettings.animationSpeed)).toLong(),
+                adi
+            )
             binding.mediaBanner.setTransitionGenerator(generator)
         }
-        val banner = if (uiSettings.bannerAnimations) binding.mediaBanner else binding.mediaBannerNoKen
+        val banner =
+            if (uiSettings.bannerAnimations) binding.mediaBanner else binding.mediaBannerNoKen
         val viewPager = binding.mediaViewPager
         tabLayout = binding.mediaTab as NavigationBarView
         viewPager.isUserInputEnabled = false
@@ -162,13 +169,28 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
                     R.drawable.ic_round_favorite_24
                 )
             )
+            val typedValue = TypedValue()
+            this.theme.resolveAttribute(
+                com.google.android.material.R.attr.colorSecondary,
+                typedValue,
+                true
+            )
+            val color = typedValue.data
+            val typedValue2 = TypedValue()
+            this.theme.resolveAttribute(
+                com.google.android.material.R.attr.colorSecondary,
+                typedValue2,
+                true
+            )
+            val color2 = typedValue.data
+
             PopImageButton(
                 scope,
                 binding.mediaFav,
                 R.drawable.ic_round_favorite_24,
                 R.drawable.ic_round_favorite_border_24,
-                R.color.nav_tab,
-                R.color.fav,
+                R.color.bg_opp,
+                R.color.violet_400,//TODO: Change to colorSecondary
                 media.isFav
             ) {
                 media.isFav = it
@@ -180,17 +202,36 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
             null
         }
 
+        @SuppressLint("ResourceType")
         fun total() {
             val text = SpannableStringBuilder().apply {
-                val white = ContextCompat.getColor(this@MediaDetailsActivity, R.color.bg_opp)
+                val typedValue = TypedValue()
+                this@MediaDetailsActivity.theme.resolveAttribute(
+                    com.google.android.material.R.attr.colorOnBackground,
+                    typedValue,
+                    true
+                )
+                val white = typedValue.data
                 if (media.userStatus != null) {
                     append(if (media.anime != null) getString(R.string.watched_num) else getString(R.string.read_num))
                     val typedValue = TypedValue()
-                    theme.resolveAttribute(com.google.android.material.R.attr.colorSecondary, typedValue, true)
+                    theme.resolveAttribute(
+                        com.google.android.material.R.attr.colorSecondary,
+                        typedValue,
+                        true
+                    )
                     bold { color(typedValue.data) { append("${media.userProgress}") } }
-                    append(if (media.anime != null) getString(R.string.episodes_out_of) else getString(R.string.chapters_out_of))
+                    append(
+                        if (media.anime != null) getString(R.string.episodes_out_of) else getString(
+                            R.string.chapters_out_of
+                        )
+                    )
                 } else {
-                    append(if (media.anime != null) getString(R.string.episodes_total_of) else getString(R.string.chapters_total_of))
+                    append(
+                        if (media.anime != null) getString(R.string.episodes_total_of) else getString(
+                            R.string.chapters_total_of
+                        )
+                    )
                 }
                 if (media.anime != null) {
                     if (media.anime!!.nextAiringEpisode != null) {
@@ -206,8 +247,12 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
 
         fun progress() {
             val statuses: Array<String> = resources.getStringArray(R.array.status)
-            val statusStrings = if (media.manga==null) resources.getStringArray(R.array.status_anime) else resources.getStringArray(R.array.status_manga)
-            val userStatus = if(media.userStatus != null) statusStrings[statuses.indexOf(media.userStatus)] else statusStrings[0]
+            val statusStrings =
+                if (media.manga == null) resources.getStringArray(R.array.status_anime) else resources.getStringArray(
+                    R.array.status_manga
+                )
+            val userStatus =
+                if (media.userStatus != null) statusStrings[statuses.indexOf(media.userStatus)] else statusStrings[0]
 
             if (media.userStatus != null) {
                 binding.mediaTotal.visibility = View.VISIBLE
@@ -234,7 +279,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
             if (it != null) {
                 media = it
                 scope.launch {
-                    if(media.isFav!=favButton?.clicked) favButton?.clicked()
+                    if (media.isFav != favButton?.clicked) favButton?.clicked()
                 }
 
                 binding.mediaNotify.setOnClickListener {
@@ -258,10 +303,15 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
 
         tabLayout.menu.clear()
         if (media.anime != null) {
-            viewPager.adapter = ViewPagerAdapter(supportFragmentManager, lifecycle, SupportedMedia.ANIME)
+            viewPager.adapter =
+                ViewPagerAdapter(supportFragmentManager, lifecycle, SupportedMedia.ANIME)
             tabLayout.inflateMenu(R.menu.anime_menu_detail)
         } else if (media.manga != null) {
-            viewPager.adapter = ViewPagerAdapter(supportFragmentManager, lifecycle, if(media.format=="NOVEL") SupportedMedia.NOVEL else SupportedMedia.MANGA)
+            viewPager.adapter = ViewPagerAdapter(
+                supportFragmentManager,
+                lifecycle,
+                if (media.format == "NOVEL") SupportedMedia.NOVEL else SupportedMedia.MANGA
+            )
             tabLayout.inflateMenu(R.menu.manga_menu_detail)
             anime = false
         }
@@ -303,9 +353,10 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
 
     private fun selectFromID(id: Int) {
         when (id) {
-            R.id.info             -> {
+            R.id.info -> {
                 selected = 0
             }
+
             R.id.watch, R.id.read -> {
                 selected = 1
             }
@@ -329,9 +380,10 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
         super.onResume()
     }
 
-    private enum class SupportedMedia{
+    private enum class SupportedMedia {
         ANIME, MANGA, NOVEL
     }
+
     //ViewPager
     private class ViewPagerAdapter(
         fragmentManager: FragmentManager,
@@ -342,13 +394,14 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
 
         override fun getItemCount(): Int = 2
 
-        override fun createFragment(position: Int): Fragment = when (position){
+        override fun createFragment(position: Int): Fragment = when (position) {
             0 -> MediaInfoFragment()
-            1 -> when(media){
+            1 -> when (media) {
                 SupportedMedia.ANIME -> AnimeWatchFragment()
                 SupportedMedia.MANGA -> MangaReadFragment()
                 SupportedMedia.NOVEL -> NovelReadFragment()
             }
+
             else -> MediaInfoFragment()
         }
     }
@@ -363,27 +416,45 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
         if (mMaxScrollSize == 0) mMaxScrollSize = appBar.totalScrollRange
         val percentage = abs(i) * 100 / mMaxScrollSize
 
-        binding.mediaCover.visibility = if (binding.mediaCover.scaleX == 0f) View.GONE else View.VISIBLE
+        binding.mediaCover.visibility =
+            if (binding.mediaCover.scaleX == 0f) View.GONE else View.VISIBLE
         val duration = (200 * uiSettings.animationSpeed).toLong()
+        val typedValue = TypedValue()
+        this@MediaDetailsActivity.theme.resolveAttribute(
+            com.google.android.material.R.attr.colorSecondary,
+            typedValue,
+            true
+        )
+        val color = typedValue.data
         if (percentage >= percent && !isCollapsed) {
             isCollapsed = true
-            ObjectAnimator.ofFloat(binding.mediaTitle, "translationX", 0f).setDuration(duration).start()
-            ObjectAnimator.ofFloat(binding.mediaAccessContainer, "translationX", screenWidth).setDuration(duration).start()
-            ObjectAnimator.ofFloat(binding.mediaCover, "translationX", screenWidth).setDuration(duration).start()
-            ObjectAnimator.ofFloat(binding.mediaCollapseContainer, "translationX", screenWidth).setDuration(duration).start()
+            ObjectAnimator.ofFloat(binding.mediaTitle, "translationX", 0f).setDuration(duration)
+                .start()
+            ObjectAnimator.ofFloat(binding.mediaAccessContainer, "translationX", screenWidth)
+                .setDuration(duration).start()
+            ObjectAnimator.ofFloat(binding.mediaCover, "translationX", screenWidth)
+                .setDuration(duration).start()
+            ObjectAnimator.ofFloat(binding.mediaCollapseContainer, "translationX", screenWidth)
+                .setDuration(duration).start()
             binding.mediaBanner.pause()
-            if (!uiSettings.immersiveMode) this.window.statusBarColor = ContextCompat.getColor(this, R.color.nav_bg)
+            if (!uiSettings.immersiveMode) this.window.statusBarColor = color
         }
         if (percentage <= percent && isCollapsed) {
             isCollapsed = false
-            ObjectAnimator.ofFloat(binding.mediaTitle, "translationX", -screenWidth).setDuration(duration).start()
-            ObjectAnimator.ofFloat(binding.mediaAccessContainer, "translationX", 0f).setDuration(duration).start()
-            ObjectAnimator.ofFloat(binding.mediaCover, "translationX", 0f).setDuration(duration).start()
-            ObjectAnimator.ofFloat(binding.mediaCollapseContainer, "translationX", 0f).setDuration(duration).start()
+            ObjectAnimator.ofFloat(binding.mediaTitle, "translationX", -screenWidth)
+                .setDuration(duration).start()
+            ObjectAnimator.ofFloat(binding.mediaAccessContainer, "translationX", 0f)
+                .setDuration(duration).start()
+            ObjectAnimator.ofFloat(binding.mediaCover, "translationX", 0f).setDuration(duration)
+                .start()
+            ObjectAnimator.ofFloat(binding.mediaCollapseContainer, "translationX", 0f)
+                .setDuration(duration).start()
             if (uiSettings.bannerAnimations) binding.mediaBanner.resume()
-            if (!uiSettings.immersiveMode) this.window.statusBarColor = ContextCompat.getColor(this, R.color.nav_bg_inv)
+            if (!uiSettings.immersiveMode) this.window.statusBarColor = color
         }
-        if (percentage == 1 && model.scrolledToTop.value != false) model.scrolledToTop.postValue(false)
+        if (percentage == 1 && model.scrolledToTop.value != false) model.scrolledToTop.postValue(
+            false
+        )
         if (percentage == 0 && model.scrolledToTop.value != true) model.scrolledToTop.postValue(true)
     }
 
@@ -425,8 +496,10 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
             ObjectAnimator.ofFloat(image, "scaleX", 1f, 0f).setDuration(69).start()
             ObjectAnimator.ofFloat(image, "scaleY", 1f, 0f).setDuration(100).start()
             delay(100)
+
             if (clicked) {
-                ObjectAnimator.ofArgb(image,
+                ObjectAnimator.ofArgb(
+                    image,
                     "ColorFilter",
                     ContextCompat.getColor(context, c1),
                     ContextCompat.getColor(context, c2)
@@ -439,17 +512,19 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
             ObjectAnimator.ofFloat(image, "scaleX", 1.5f, 1f).setDuration(100).start()
             ObjectAnimator.ofFloat(image, "scaleY", 1.5f, 1f).setDuration(100).start()
             delay(200)
-            if (clicked) ObjectAnimator.ofArgb(
-                image,
-                "ColorFilter",
-                ContextCompat.getColor(context, c2),
-                ContextCompat.getColor(context, c1)
-            ).setDuration(200).start()
+            if (clicked) {
+                ObjectAnimator.ofArgb(
+                    image,
+                    "ColorFilter",
+                    ContextCompat.getColor(context, c2),
+                    ContextCompat.getColor(context, c1)
+                ).setDuration(200).start()
+            }
         }
 
         fun enabled(enabled: Boolean) {
             disabled = !enabled
-            image.alpha = if(disabled)  0.33f else 1f
+            image.alpha = if (disabled) 0.33f else 1f
         }
     }
 }

app/src/main/java/ani/dantotsu/media/MediaDetailsViewModel.kt

@@ -1,6 +1,8 @@
 package ani.dantotsu.media
 
 import android.app.Activity
+import android.content.Context
+import android.content.SharedPreferences
 import android.os.Handler
 import android.os.Looper
 import androidx.fragment.app.FragmentManager
@@ -40,6 +42,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 
 class MediaDetailsViewModel : ViewModel() {
     val scrolledToTop = MutableLiveData(true)
@@ -48,27 +52,18 @@ class MediaDetailsViewModel : ViewModel() {
         saveData("$id-select", data, activity)
     }
 
+
     fun loadSelected(media: Media): Selected {
+        val sharedPreferences = Injekt.get<SharedPreferences>()
         val data = loadData<Selected>("${media.id}-select") ?: Selected().let {
-            it.source = if (media.isAdult) "" else when (media.anime != null) {
-                true -> loadData("settings_def_anime_source") ?: ""
-                else -> loadData("settings_def_manga_source") ?: ""
+            it.sourceIndex = if (media.isAdult) 0 else when (media.anime != null) {
+                true -> sharedPreferences.getInt("settings_def_anime_source_s_r", 0)
+                else -> sharedPreferences.getInt(("settings_def_manga_source_s_r"), 0)
             }
             it.preferDub = loadData("settings_prefer_dub") ?: false
-            it.sourceIndex = loadSelectedStringLocation(it.source)
             saveSelected(media.id, it)
             it
         }
-        if (media.anime != null) {
-            val sources = if (media.isAdult) HAnimeSources else AnimeSources
-            data.sourceIndex = sources.list.indexOfFirst { it.name == data.source }
-        } else {
-            val sources = if (media.isAdult) HMangaSources else MangaSources
-            data.sourceIndex = sources.list.indexOfFirst { it.name == data.source }
-        }
-        if (data.sourceIndex == -1) {
-            data.sourceIndex = 0
-        }
         return data
     }
 
@@ -125,8 +120,8 @@ class MediaDetailsViewModel : ViewModel() {
     private val episodes = MutableLiveData<MutableMap<Int, MutableMap<String, Episode>>>(null)
     private val epsLoaded = mutableMapOf<Int, MutableMap<String, Episode>>()
     fun getEpisodes(): LiveData<MutableMap<Int, MutableMap<String, Episode>>> = episodes
-    suspend fun loadEpisodes(media: Media, i: Int) {
-        if (!epsLoaded.containsKey(i)) {
+    suspend fun loadEpisodes(media: Media, i: Int, invalidate: Boolean = false) {
+        if (!epsLoaded.containsKey(i) || invalidate) {
             epsLoaded[i] = watchSources?.loadEpisodesFromMedia(i, media) ?: return
         }
         episodes.postValue(epsLoaded)
@@ -194,8 +189,8 @@ class MediaDetailsViewModel : ViewModel() {
             val server = selected.server ?: return false
             val link = ep.link ?: return false
 
-            ep.extractors = mutableListOf(watchSources?.get(loadSelectedStringLocation(selected.source))?.let {
-                selected.sourceIndex = loadSelectedStringLocation(selected.source)
+            ep.extractors = mutableListOf(watchSources?.get(selected.sourceIndex)?.let {
+                selected.sourceIndex = selected.sourceIndex
                 if (!post && !it.allowsPreloading) null
                 else ep.sEpisode?.let { it1 ->
                     it.loadSingleVideoServer(server, link, ep.extra,
@@ -245,9 +240,9 @@ class MediaDetailsViewModel : ViewModel() {
     private val mangaChapters = MutableLiveData<MutableMap<Int, MutableMap<String, MangaChapter>>>(null)
     private val mangaLoaded = mutableMapOf<Int, MutableMap<String, MangaChapter>>()
     fun getMangaChapters(): LiveData<MutableMap<Int, MutableMap<String, MangaChapter>>> = mangaChapters
-    suspend fun loadMangaChapters(media: Media, i: Int) {
+    suspend fun loadMangaChapters(media: Media, i: Int, invalidate: Boolean = false) {
         logger("Loading Manga Chapters : $mangaLoaded")
-        if (!mangaLoaded.containsKey(i)) tryWithSuspend {
+        if (!mangaLoaded.containsKey(i) || invalidate) tryWithSuspend {
             mangaLoaded[i] = mangaReadSources?.loadChaptersFromMedia(i, media) ?: return@tryWithSuspend
         }
         mangaChapters.postValue(mangaLoaded)
@@ -266,7 +261,7 @@ class MediaDetailsViewModel : ViewModel() {
     suspend fun loadMangaChapterImages(chapter: MangaChapter, selected: Selected, post: Boolean = true): Boolean {
         return tryWithSuspend(true) {
             chapter.addImages(
-                mangaReadSources?.get(loadSelectedStringLocation(selected.source))?.loadImages(chapter.link, chapter.sChapter) ?: return@tryWithSuspend false
+                mangaReadSources?.get(selected.sourceIndex)?.loadImages(chapter.link, chapter.sChapter) ?: return@tryWithSuspend false
             )
             if (post) mangaChapter.postValue(chapter)
             true
@@ -289,7 +284,7 @@ class MediaDetailsViewModel : ViewModel() {
     }
 
     suspend fun autoSearchNovels(media: Media) {
-        val source = novelSources[loadSelectedStringLocation(media.selected?.source?:"")]
+        val source = novelSources[media.selected?.sourceIndex?:0]
         tryWithSuspend(post = true) {
             if (source != null) {
                 novelResponses.postValue(source.sortedSearch(media))

app/src/main/java/ani/dantotsu/media/MediaListDialogSmallFragment.kt

@@ -15,6 +15,7 @@ import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.databinding.BottomSheetMediaListSmallBinding
 import ani.dantotsu.connections.mal.MAL
 import ani.dantotsu.others.getSerialized
+import ani.dantotsu.themes.ThemeManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext

app/src/main/java/ani/dantotsu/media/SearchActivity.kt

@@ -16,6 +16,7 @@ import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.connections.anilist.AnilistSearch
 import ani.dantotsu.connections.anilist.SearchResults
 import ani.dantotsu.databinding.ActivitySearchBinding
+import ani.dantotsu.themes.ThemeManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.util.*
@@ -37,6 +38,7 @@ class SearchActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivitySearchBinding.inflate(layoutInflater)
         setContentView(binding.root)
         initActivity(this)

app/src/main/java/ani/dantotsu/media/Selected.kt

@@ -7,8 +7,9 @@ data class Selected(
     var recyclerStyle: Int? = null,
     var recyclerReversed: Boolean = false,
     var chip: Int = 0,
-    var source: String = "",
+    //var source: String = "",
     var sourceIndex: Int = 0,
+    var langIndex: Int = 0,
     var preferDub: Boolean = false,
     var server: String? = null,
     var video: Int = 0,

app/src/main/java/ani/dantotsu/media/StudioActivity.kt

@@ -15,6 +15,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import ani.dantotsu.*
 import ani.dantotsu.databinding.ActivityStudioBinding
 import ani.dantotsu.others.getSerialized
+import ani.dantotsu.themes.ThemeManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -28,6 +29,7 @@ class StudioActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityStudioBinding.inflate(layoutInflater)
         setContentView(binding.root)
 

app/src/main/java/ani/dantotsu/media/SubtitleDownloader.kt

@@ -0,0 +1,48 @@
+package ani.dantotsu.media
+
+import android.content.Context
+import android.os.Environment
+import ani.dantotsu.parsers.SubtitleType
+import eu.kanade.tachiyomi.network.NetworkHelper
+import okhttp3.Request
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.FileInputStream
+
+class SubtitleDownloader {
+
+    companion object {
+        //doesn't really download the subtitles -\_(o_o)_/-
+        suspend fun downloadSubtitles(context: Context, url: String): SubtitleType =
+            withContext(Dispatchers.IO) {
+                // Initialize the NetworkHelper instance. Replace this line based on how you usually initialize it
+                val networkHelper = Injekt.get<NetworkHelper>()
+                val request = Request.Builder()
+                    .url(url)
+                    .build()
+
+                val response = networkHelper.client.newCall(request).execute()
+
+                // Check if response is successful
+                if (response.isSuccessful) {
+                    val responseBody = response.body?.string()
+
+
+                    val subtitleType = when {
+                        responseBody?.contains("[Script Info]") == true -> SubtitleType.ASS
+                        responseBody?.contains("WEBVTT") == true -> SubtitleType.VTT
+                        else -> SubtitleType.SRT
+                    }
+
+                    return@withContext subtitleType
+                } else {
+                    return@withContext SubtitleType.UNKNOWN
+                }
+            }
+    }
+}

app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt

@@ -1,28 +1,47 @@
 package ani.dantotsu.media.anime
 
 import android.annotation.SuppressLint
+import android.app.AlertDialog
+import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
+import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
+import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.widget.ViewPager2
 import ani.dantotsu.*
 import ani.dantotsu.databinding.ItemAnimeWatchBinding
 import ani.dantotsu.databinding.ItemChipBinding
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.media.SourceSearchDialogFragment
+import ani.dantotsu.parsers.AnimeSources
+import ani.dantotsu.parsers.DynamicAnimeParser
 import ani.dantotsu.parsers.WatchSources
+import ani.dantotsu.settings.ExtensionsActivity
+import ani.dantotsu.settings.extensionprefs.AnimeSourcePreferencesFragment
 import ani.dantotsu.subcriptions.Notifications.Companion.openSettings
 import ani.dantotsu.subcriptions.Subscription.Companion.getChannelId
 import com.google.android.material.chip.Chip
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.textfield.TextInputLayout
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
+import eu.kanade.tachiyomi.extension.anime.model.AnimeExtension
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import java.lang.IndexOutOfBoundsException
 
 class AnimeWatchAdapter(
     private val media: Media,
@@ -68,7 +87,8 @@ class AnimeWatchAdapter(
         }
 
         //Source Selection
-        val source = media.selected!!.sourceIndex.let { if (it >= watchSources.names.size) 0 else it }
+        var source = media.selected!!.sourceIndex.let { if (it >= watchSources.names.size) 0 else it }
+        setLanguageList(media.selected!!.langIndex,source)
         if (watchSources.names.isNotEmpty() && source in 0 until watchSources.names.size) {
             binding.animeSource.setText(watchSources.names[source])
             watchSources[source].apply {
@@ -90,11 +110,41 @@ class AnimeWatchAdapter(
                 binding.animeSourceDubbed.isChecked = selectDub
                 changing = false
                 binding.animeSourceDubbedCont.visibility = if (isDubAvailableSeparately) View.VISIBLE else View.GONE
+                source = i
+                setLanguageList(0,i)
             }
             subscribeButton(false)
-            fragment.loadEpisodes(i)
+            fragment.loadEpisodes(i, false)
         }
 
+        binding.animeSourceLanguage.setOnItemClickListener { _, _, i, _ ->
+            // Check if 'extension' and 'selected' properties exist and are accessible
+            (watchSources[source] as? DynamicAnimeParser)?.let { ext ->
+                ext.sourceLanguage = i
+                fragment.onLangChange(i)
+                fragment.onSourceChange(media.selected!!.sourceIndex).apply {
+                    binding.animeSourceTitle.text = showUserText
+                    showUserTextListener = { MainScope().launch { binding.animeSourceTitle.text = it } }
+                    changing = true
+                    binding.animeSourceDubbed.isChecked = selectDub
+                    changing = false
+                    binding.animeSourceDubbedCont.visibility = if (isDubAvailableSeparately) View.VISIBLE else View.GONE
+                    setLanguageList(i, source)
+                }
+                subscribeButton(false)
+                fragment.loadEpisodes(media.selected!!.sourceIndex, true)
+            } ?: run {
+            }
+        }
+
+        //settings
+        binding.animeSourceSettings.setOnClickListener {
+            (watchSources[source] as? DynamicAnimeParser)?.let { ext ->
+                fragment.openSettings(ext.extension)
+            }
+        }
+
+
         //Subscription
         subscribe =  MediaDetailsActivity.PopImageButton(
             fragment.lifecycleScope,
@@ -176,6 +226,7 @@ class AnimeWatchAdapter(
                     binding.animeWatchChipScroll.smoothScrollTo((chip.left - screenWidth / 2) + (chip.width / 2), 0)
                 }
                 chip.text = "${names[limit * (position)]} - ${names[last - 1]}"
+                chip.setTextColor(ContextCompat.getColorStateList(fragment.requireContext(), R.color.chip_text_color))
 
                 chip.setOnClickListener {
                     selected()
@@ -260,6 +311,25 @@ class AnimeWatchAdapter(
         }
     }
 
+    fun setLanguageList(lang: Int, source: Int) {
+        val binding = _binding
+        if (watchSources is AnimeSources) {
+            val parser = watchSources[source] as? DynamicAnimeParser
+            if (parser != null) {
+                (watchSources[source] as? DynamicAnimeParser)?.let { ext ->
+                    ext.sourceLanguage = lang
+                }
+                try {
+                    binding?.animeSourceLanguage?.setText(parser.extension.sources[lang].lang)
+                }catch (e: IndexOutOfBoundsException) {
+                    binding?.animeSourceLanguage?.setText(parser.extension.sources.firstOrNull()?.lang ?: "Unknown")
+                }
+                binding?.animeSourceLanguage?.setAdapter(ArrayAdapter(fragment.requireContext(), R.layout.item_dropdown, parser.extension.sources.map { it.lang }))
+
+            }
+        }
+    }
+
     override fun getItemCount(): Int = 1
 
     inner class ViewHolder(val binding: ItemAnimeWatchBinding) : RecyclerView.ViewHolder(binding.root) {

app/src/main/java/ani/dantotsu/media/anime/AnimeWatchFragment.kt

@@ -1,11 +1,17 @@
 package ani.dantotsu.media.anime
 
 import android.annotation.SuppressLint
+import android.app.AlertDialog
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.Toast
+import androidx.cardview.widget.CardView
 import androidx.core.math.MathUtils
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
@@ -13,24 +19,38 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.viewpager2.widget.ViewPager2
 import ani.dantotsu.*
 import ani.dantotsu.databinding.FragmentAnimeWatchBinding
 import ani.dantotsu.media.Media
+import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.media.MediaDetailsViewModel
 import ani.dantotsu.parsers.AnimeParser
 import ani.dantotsu.parsers.AnimeSources
 import ani.dantotsu.parsers.HAnimeSources
+import ani.dantotsu.settings.ExtensionsActivity
+import ani.dantotsu.settings.InstalledAnimeExtensionsFragment
 import ani.dantotsu.settings.PlayerSettings
 import ani.dantotsu.settings.UserInterfaceSettings
+import ani.dantotsu.settings.extensionprefs.AnimeSourcePreferencesFragment
 import ani.dantotsu.subcriptions.Notifications
 import ani.dantotsu.subcriptions.Notifications.Group.ANIME_GROUP
 import ani.dantotsu.subcriptions.Subscription.Companion.getChannelId
 import ani.dantotsu.subcriptions.SubscriptionHelper
 import ani.dantotsu.subcriptions.SubscriptionHelper.Companion.saveSubscription
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.navigationrail.NavigationRailView
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.textfield.TextInputLayout
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
+import eu.kanade.tachiyomi.extension.anime.model.AnimeExtension
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.launch
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 import kotlin.math.ceil
 import kotlin.math.max
 import kotlin.math.roundToInt
@@ -214,6 +234,13 @@ class AnimeWatchFragment : Fragment() {
         return model.watchSources?.get(i)!!
     }
 
+    fun onLangChange(i: Int) {
+        val selected = model.loadSelected(media)
+        selected.langIndex = i
+        model.saveSelected(media.id, selected, requireActivity())
+        media.selected = selected
+    }
+
     fun onDubClicked(checked: Boolean) {
         val selected = model.loadSelected(media)
         model.watchSources?.get(selected.sourceIndex)?.selectDub = checked
@@ -223,8 +250,8 @@ class AnimeWatchFragment : Fragment() {
         lifecycleScope.launch(Dispatchers.IO) { model.forceLoadEpisode(media, selected.sourceIndex) }
     }
 
-    fun loadEpisodes(i: Int) {
-        lifecycleScope.launch(Dispatchers.IO) { model.loadEpisodes(media, i) }
+    fun loadEpisodes(i: Int, invalidate: Boolean) {
+        lifecycleScope.launch(Dispatchers.IO) { model.loadEpisodes(media, i, invalidate) }
     }
 
     fun onIconPressed(viewType: Int, rev: Boolean) {
@@ -262,45 +289,115 @@ class AnimeWatchFragment : Fragment() {
             else getString(R.string.unsubscribed_notification)
         )
     }
-
-    fun onEpisodeClick(i: String) {
-        model.continueMedia = false
-        model.saveSelected(media.id, media.selected!!, requireActivity())
-        model.onEpisodeClick(media, i, requireActivity().supportFragmentManager)
-    }
-
-    @SuppressLint("NotifyDataSetChanged")
-    private fun reload() {
-        val selected = model.loadSelected(media)
-
-        //Find latest episode for subscription
-        selected.latest = media.anime?.episodes?.values?.maxOfOrNull { it.number.toFloatOrNull() ?: 0f } ?: 0f
-        selected.latest = media.userProgress?.toFloat()?.takeIf { selected.latest < it } ?: selected.latest
-
-        model.saveSelected(media.id, selected, requireActivity())
-        headerAdapter.handleEpisodes()
-        episodeAdapter.notifyItemRangeRemoved(0, episodeAdapter.arr.size)
-        var arr: ArrayList<Episode> = arrayListOf()
-        if (media.anime!!.episodes != null) {
-            val end = if (end != null && end!! < media.anime!!.episodes!!.size) end else null
-            arr.addAll(
-                media.anime!!.episodes!!.values.toList()
-                    .slice(start..(end ?: (media.anime!!.episodes!!.size - 1)))
-            )
-            if (reverse)
-                arr = (arr.reversed() as? ArrayList<Episode>) ?: arr
+    fun openSettings(pkg: AnimeExtension.Installed){
+        val changeUIVisibility: (Boolean) -> Unit = { show ->
+            val activity = requireActivity() as MediaDetailsActivity
+            val visibility = if (show) View.VISIBLE else View.GONE
+            activity.findViewById<AppBarLayout>(R.id.mediaAppBar).visibility = visibility
+            activity.findViewById<ViewPager2>(R.id.mediaViewPager).visibility = visibility
+            activity.findViewById<CardView>(R.id.mediaCover).visibility = visibility
+            activity.findViewById<CardView>(R.id.mediaClose).visibility = visibility
+            try{
+                activity.findViewById<CustomBottomNavBar>(R.id.mediaTab).visibility = visibility
+            }catch (e: ClassCastException){
+                activity.findViewById<NavigationRailView>(R.id.mediaTab).visibility = visibility
+            }
+            activity.findViewById<FrameLayout>(R.id.fragmentExtensionsContainer).visibility =
+                if (show) View.GONE else View.VISIBLE
+        }
+        val allSettings = pkg.sources.filterIsInstance<ConfigurableAnimeSource>()
+        if (allSettings.isNotEmpty()) {
+            var selectedSetting = allSettings[0]
+            if (allSettings.size > 1) {
+                val names = allSettings.map { it.lang }.toTypedArray()
+                var selectedIndex = 0
+                AlertDialog.Builder(requireContext())
+                    .setTitle("Select a Source")
+                    .setSingleChoiceItems(names, selectedIndex) { _, which ->
+                        selectedIndex = which
+                    }
+                    .setPositiveButton("OK") { dialog, _ ->
+                        selectedSetting = allSettings[selectedIndex]
+                        dialog.dismiss()
+
+                        // Move the fragment transaction here
+                        val fragment =
+                            AnimeSourcePreferencesFragment().getInstance(selectedSetting.id){
+                                changeUIVisibility(true)
+                                loadEpisodes(media.selected!!.sourceIndex, true)
+                            }
+                        parentFragmentManager.beginTransaction()
+                            .setCustomAnimations(R.anim.slide_up, R.anim.slide_down)
+                            .replace(R.id.fragmentExtensionsContainer, fragment)
+                            .addToBackStack(null)
+                            .commit()
+                    }
+                    .setNegativeButton("Cancel") { dialog, _ ->
+                        dialog.cancel()
+                        changeUIVisibility(true)
+                        return@setNegativeButton
+                    }
+                    .show()
+            } else {
+                // If there's only one setting, proceed with the fragment transaction
+                val fragment = AnimeSourcePreferencesFragment().getInstance(selectedSetting.id){
+                    changeUIVisibility(true)
+                    loadEpisodes(media.selected!!.sourceIndex, true)
+                }
+                parentFragmentManager.beginTransaction()
+                    .setCustomAnimations(R.anim.slide_up, R.anim.slide_down)
+                    .replace(R.id.fragmentExtensionsContainer, fragment)
+                    .addToBackStack(null)
+                    .commit()
+            }
+
+            changeUIVisibility(false)
+        } else {
+            Toast.makeText(requireContext(), "Source is not configurable", Toast.LENGTH_SHORT)
+                .show()
         }
-        episodeAdapter.arr = arr
-        episodeAdapter.updateType(style ?: uiSettings.animeDefaultView)
-        episodeAdapter.notifyItemRangeInserted(0, arr.size)
     }
 
-    override fun onDestroy() {
-        model.watchSources?.flushText()
-        super.onDestroy()
-    }
+        fun onEpisodeClick(i: String) {
+            model.continueMedia = false
+            model.saveSelected(media.id, media.selected!!, requireActivity())
+            model.onEpisodeClick(media, i, requireActivity().supportFragmentManager)
+        }
 
-    var state: Parcelable? = null
+        @SuppressLint("NotifyDataSetChanged")
+        private fun reload() {
+            val selected = model.loadSelected(media)
+
+            //Find latest episode for subscription
+            selected.latest =
+                media.anime?.episodes?.values?.maxOfOrNull { it.number.toFloatOrNull() ?: 0f } ?: 0f
+            selected.latest =
+                media.userProgress?.toFloat()?.takeIf { selected.latest < it } ?: selected.latest
+
+            model.saveSelected(media.id, selected, requireActivity())
+            headerAdapter.handleEpisodes()
+            episodeAdapter.notifyItemRangeRemoved(0, episodeAdapter.arr.size)
+            var arr: ArrayList<Episode> = arrayListOf()
+            if (media.anime!!.episodes != null) {
+                val end = if (end != null && end!! < media.anime!!.episodes!!.size) end else null
+                arr.addAll(
+                    media.anime!!.episodes!!.values.toList()
+                        .slice(start..(end ?: (media.anime!!.episodes!!.size - 1)))
+                )
+                if (reverse)
+                    arr = (arr.reversed() as? ArrayList<Episode>) ?: arr
+            }
+            episodeAdapter.arr = arr
+            episodeAdapter.updateType(style ?: uiSettings.animeDefaultView)
+            episodeAdapter.notifyItemRangeInserted(0, arr.size)
+        }
+
+                override fun onDestroy() {
+            model.watchSources?.flushText()
+            super.onDestroy()
+        }
+
+        var state: Parcelable? = null
     override fun onResume() {
         super.onResume()
         binding.mediaInfoProgressBar.visibility = progress

app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt

@@ -53,6 +53,7 @@ import androidx.media3.datasource.okhttp.OkHttpDataSource
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
 import androidx.media3.exoplayer.trackselection.DefaultTrackSelector
+import androidx.media3.exoplayer.util.EventLogger
 import androidx.media3.session.MediaSession
 import androidx.media3.ui.*
 import androidx.media3.ui.CaptionStyleCompat.*
@@ -65,6 +66,7 @@ import ani.dantotsu.connections.updateProgress
 import ani.dantotsu.databinding.ActivityExoplayerBinding
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsViewModel
+import ani.dantotsu.media.SubtitleDownloader
 import ani.dantotsu.others.AniSkip
 import ani.dantotsu.others.AniSkip.getType
 import ani.dantotsu.others.Download.download
@@ -74,6 +76,7 @@ import ani.dantotsu.parsers.*
 import ani.dantotsu.settings.PlayerSettings
 import ani.dantotsu.settings.PlayerSettingsActivity
 import ani.dantotsu.settings.UserInterfaceSettings
+import ani.dantotsu.themes.ThemeManager
 import com.bumptech.glide.Glide
 import com.google.android.material.slider.Slider
 import com.lagradost.nicehttp.ignoreAllSSLErrors
@@ -81,12 +84,15 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import okhttp3.internal.immutableListOf
 import java.util.*
 import java.util.concurrent.*
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
 
+
 @UnstableApi
 @SuppressLint("SetTextI18n", "ClickableViewAccessibility")
 class ExoplayerView : AppCompatActivity(), Player.Listener {
@@ -183,7 +189,10 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
             val displayCutout = window.decorView.rootWindowInsets.displayCutout
             if (displayCutout != null) {
                 if (displayCutout.boundingRects.size > 0) {
-                    notchHeight = min(displayCutout.boundingRects[0].width(), displayCutout.boundingRects[0].height())
+                    notchHeight = min(
+                        displayCutout.boundingRects[0].width(),
+                        displayCutout.boundingRects[0].height()
+                    )
                     checkNotch()
                 }
             }
@@ -194,101 +203,104 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
     private fun checkNotch() {
         if (notchHeight != 0) {
             val orientation = resources.configuration.orientation
-            playerView.findViewById<View>(R.id.exo_controller_margin).updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                    marginStart = notchHeight
-                    marginEnd = notchHeight
-                    topMargin = 0
-                } else {
-                    topMargin = notchHeight
-                    marginStart = 0
-                    marginEnd = 0
+            playerView.findViewById<View>(R.id.exo_controller_margin)
+                .updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                    if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+                        marginStart = notchHeight
+                        marginEnd = notchHeight
+                        topMargin = 0
+                    } else {
+                        topMargin = notchHeight
+                        marginStart = 0
+                        marginEnd = 0
+                    }
                 }
-            }
             playerView.findViewById<View>(androidx.media3.ui.R.id.exo_buffering).translationY =
                 (if (orientation == Configuration.ORIENTATION_LANDSCAPE) 0 else (notchHeight + 8f.px)).dp
             exoBrightnessCont.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                marginEnd = if (orientation == Configuration.ORIENTATION_LANDSCAPE) notchHeight else 0
+                marginEnd =
+                    if (orientation == Configuration.ORIENTATION_LANDSCAPE) notchHeight else 0
             }
             exoVolumeCont.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                marginStart = if (orientation == Configuration.ORIENTATION_LANDSCAPE) notchHeight else 0
+                marginStart =
+                    if (orientation == Configuration.ORIENTATION_LANDSCAPE) notchHeight else 0
             }
         }
     }
 
     private fun setupSubFormatting(playerView: PlayerView, settings: PlayerSettings) {
         val primaryColor = when (settings.primaryColor) {
-            0    -> Color.BLACK
-            1    -> Color.DKGRAY
-            2    -> Color.GRAY
-            3    -> Color.LTGRAY
-            4    -> Color.WHITE
-            5    -> Color.RED
-            6    -> Color.YELLOW
-            7    -> Color.GREEN
-            8    -> Color.CYAN
-            9    -> Color.BLUE
-            10   -> Color.MAGENTA
-            11   -> Color.TRANSPARENT
+            0 -> Color.BLACK
+            1 -> Color.DKGRAY
+            2 -> Color.GRAY
+            3 -> Color.LTGRAY
+            4 -> Color.WHITE
+            5 -> Color.RED
+            6 -> Color.YELLOW
+            7 -> Color.GREEN
+            8 -> Color.CYAN
+            9 -> Color.BLUE
+            10 -> Color.MAGENTA
+            11 -> Color.TRANSPARENT
             else -> Color.WHITE
         }
         val secondaryColor = when (settings.secondaryColor) {
-            0    -> Color.BLACK
-            1    -> Color.DKGRAY
-            2    -> Color.GRAY
-            3    -> Color.LTGRAY
-            4    -> Color.WHITE
-            5    -> Color.RED
-            6    -> Color.YELLOW
-            7    -> Color.GREEN
-            8    -> Color.CYAN
-            9    -> Color.BLUE
-            10   -> Color.MAGENTA
-            11   -> Color.TRANSPARENT
+            0 -> Color.BLACK
+            1 -> Color.DKGRAY
+            2 -> Color.GRAY
+            3 -> Color.LTGRAY
+            4 -> Color.WHITE
+            5 -> Color.RED
+            6 -> Color.YELLOW
+            7 -> Color.GREEN
+            8 -> Color.CYAN
+            9 -> Color.BLUE
+            10 -> Color.MAGENTA
+            11 -> Color.TRANSPARENT
             else -> Color.BLACK
         }
         val outline = when (settings.outline) {
-            0    -> EDGE_TYPE_OUTLINE // Normal
-            1    -> EDGE_TYPE_DEPRESSED // Shine
-            2    -> EDGE_TYPE_DROP_SHADOW // Drop shadow
-            3    -> EDGE_TYPE_NONE // No outline
+            0 -> EDGE_TYPE_OUTLINE // Normal
+            1 -> EDGE_TYPE_DEPRESSED // Shine
+            2 -> EDGE_TYPE_DROP_SHADOW // Drop shadow
+            3 -> EDGE_TYPE_NONE // No outline
             else -> EDGE_TYPE_OUTLINE // Normal
         }
         val subBackground = when (settings.subBackground) {
-            0    -> Color.TRANSPARENT
-            1    -> Color.BLACK
-            2    -> Color.DKGRAY
-            3    -> Color.GRAY
-            4    -> Color.LTGRAY
-            5    -> Color.WHITE
-            6    -> Color.RED
-            7    -> Color.YELLOW
-            8    -> Color.GREEN
-            9    -> Color.CYAN
-            10   -> Color.BLUE
-            11   -> Color.MAGENTA
+            0 -> Color.TRANSPARENT
+            1 -> Color.BLACK
+            2 -> Color.DKGRAY
+            3 -> Color.GRAY
+            4 -> Color.LTGRAY
+            5 -> Color.WHITE
+            6 -> Color.RED
+            7 -> Color.YELLOW
+            8 -> Color.GREEN
+            9 -> Color.CYAN
+            10 -> Color.BLUE
+            11 -> Color.MAGENTA
             else -> Color.TRANSPARENT
         }
         val subWindow = when (settings.subWindow) {
-            0    -> Color.TRANSPARENT
-            1    -> Color.BLACK
-            2    -> Color.DKGRAY
-            3    -> Color.GRAY
-            4    -> Color.LTGRAY
-            5    -> Color.WHITE
-            6    -> Color.RED
-            7    -> Color.YELLOW
-            8    -> Color.GREEN
-            9    -> Color.CYAN
-            10   -> Color.BLUE
-            11   -> Color.MAGENTA
+            0 -> Color.TRANSPARENT
+            1 -> Color.BLACK
+            2 -> Color.DKGRAY
+            3 -> Color.GRAY
+            4 -> Color.LTGRAY
+            5 -> Color.WHITE
+            6 -> Color.RED
+            7 -> Color.YELLOW
+            8 -> Color.GREEN
+            9 -> Color.CYAN
+            10 -> Color.BLUE
+            11 -> Color.MAGENTA
             else -> Color.TRANSPARENT
         }
         val font = when (settings.font) {
-            0    -> ResourcesCompat.getFont(this, R.font.poppins_semi_bold)
-            1    -> ResourcesCompat.getFont(this, R.font.poppins_bold)
-            2    -> ResourcesCompat.getFont(this, R.font.poppins)
-            3    -> ResourcesCompat.getFont(this, R.font.poppins_thin)
+            0 -> ResourcesCompat.getFont(this, R.font.poppins_semi_bold)
+            1 -> ResourcesCompat.getFont(this, R.font.poppins_bold)
+            2 -> ResourcesCompat.getFont(this, R.font.poppins)
+            3 -> ResourcesCompat.getFont(this, R.font.poppins_thin)
             else -> ResourcesCompat.getFont(this, R.font.poppins_semi_bold)
         }
         playerView.subtitleView?.setStyle(
@@ -305,6 +317,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityExoplayerBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
@@ -316,8 +329,18 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
             finishAndRemoveTask()
         }
 
-        settings = loadData("player_settings") ?: PlayerSettings().apply { saveData("player_settings", this) }
-        uiSettings = loadData("ui_settings") ?: UserInterfaceSettings().apply { saveData("ui_settings", this) }
+        settings = loadData("player_settings") ?: PlayerSettings().apply {
+            saveData(
+                "player_settings",
+                this
+            )
+        }
+        uiSettings = loadData("ui_settings") ?: UserInterfaceSettings().apply {
+            saveData(
+                "ui_settings",
+                this
+            )
+        }
 
         playerView = findViewById(R.id.player_view)
         exoQuality = playerView.findViewById(R.id.exo_quality)
@@ -360,17 +383,20 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
                 requestedOrientation = rotation
                 it.visibility = View.GONE
             }
-            orientationListener = object : OrientationEventListener(this, SensorManager.SENSOR_DELAY_UI) {
-                override fun onOrientationChanged(orientation: Int) {
-                    if (orientation in 45..135) {
-                        if (rotation != ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) exoRotate.visibility = View.VISIBLE
-                        rotation = ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
-                    } else if (orientation in 225..315) {
-                        if (rotation != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) exoRotate.visibility = View.VISIBLE
-                        rotation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            orientationListener =
+                object : OrientationEventListener(this, SensorManager.SENSOR_DELAY_UI) {
+                    override fun onOrientationChanged(orientation: Int) {
+                        if (orientation in 45..135) {
+                            if (rotation != ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) exoRotate.visibility =
+                                View.VISIBLE
+                            rotation = ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
+                        } else if (orientation in 225..315) {
+                            if (rotation != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) exoRotate.visibility =
+                                View.VISIBLE
+                            rotation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+                        }
                     }
                 }
-            }
             orientationListener?.enable()
         }
 
@@ -378,7 +404,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
 
 
         playerView.subtitleView?.alpha = when (settings.subtitles) {
-            true  -> 1f
+            true -> 1f
             false -> 0f
         }
         val fontSize = settings.fontSize.toFloat()
@@ -401,7 +427,10 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
             isTimeStampsLoaded = true
             exoSkipOpEd.visibility = if (it != null) {
                 val adGroups = it.flatMap {
-                    listOf(it.interval.startTime.toLong() * 1000, it.interval.endTime.toLong() * 1000)
+                    listOf(
+                        it.interval.startTime.toLong() * 1000,
+                        it.interval.endTime.toLong() * 1000
+                    )
                 }.toLongArray()
                 val playedAdGroups = it.flatMap {
                     listOf(false, false)
@@ -441,7 +470,8 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
 
         // Picture-in-picture
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            pipEnabled = packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) && settings.pip
+            pipEnabled =
+                packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) && settings.pip
             if (pipEnabled) {
                 exoPip.visibility = View.VISIBLE
                 exoPip.setOnClickListener {
@@ -456,7 +486,8 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         val container = playerView.findViewById<View>(R.id.exo_controller_cont)
         val screen = playerView.findViewById<View>(R.id.exo_black_screen)
         val lockButton = playerView.findViewById<ImageButton>(R.id.exo_unlock)
-        val timeline = playerView.findViewById<ExtendedTimeBar>(androidx.media3.ui.R.id.exo_progress)
+        val timeline =
+            playerView.findViewById<ExtendedTimeBar>(androidx.media3.ui.R.id.exo_progress)
         playerView.findViewById<ImageButton>(R.id.exo_lock).setOnClickListener {
             locked = true
             screen.visibility = View.GONE
@@ -496,17 +527,22 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
                 dialog.findViewById<Slider>(R.id.seekbar).addOnChangeListener { _, value, _ ->
                     settings.skipTime = value.toInt()
                     saveData(player, settings)
-                    playerView.findViewById<TextView>(R.id.exo_skip_time).text = settings.skipTime.toString()
-                    dialog.findViewById<TextView>(R.id.seekbar_value).text = settings.skipTime.toString()
+                    playerView.findViewById<TextView>(R.id.exo_skip_time).text =
+                        settings.skipTime.toString()
+                    dialog.findViewById<TextView>(R.id.seekbar_value).text =
+                        settings.skipTime.toString()
                 }
-                dialog.findViewById<Slider>(R.id.seekbar).addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
-                    override fun onStartTrackingTouch(slider: Slider) {}
-                    override fun onStopTrackingTouch(slider: Slider) {
-                        dialog.dismiss()
-                    }
-                })
-                dialog.findViewById<TextView>(R.id.seekbar_title).text = getString(R.string.skip_time)
-                dialog.findViewById<TextView>(R.id.seekbar_value).text = settings.skipTime.toString()
+                dialog.findViewById<Slider>(R.id.seekbar)
+                    .addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
+                        override fun onStartTrackingTouch(slider: Slider) {}
+                        override fun onStopTrackingTouch(slider: Slider) {
+                            dialog.dismiss()
+                        }
+                    })
+                dialog.findViewById<TextView>(R.id.seekbar_title).text =
+                    getString(R.string.skip_time)
+                dialog.findViewById<TextView>(R.id.seekbar_value).text =
+                    settings.skipTime.toString()
                 @Suppress("DEPRECATION")
                 dialog.window?.decorView?.systemUiVisibility = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
                 dialog.show()
@@ -521,7 +557,8 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         val brightnessRunnable = Runnable {
             if (exoBrightnessCont.alpha == 1f)
                 lifecycleScope.launch {
-                    ObjectAnimator.ofFloat(exoBrightnessCont, "alpha", 1f, 0f).setDuration(gestureSpeed).start()
+                    ObjectAnimator.ofFloat(exoBrightnessCont, "alpha", 1f, 0f)
+                        .setDuration(gestureSpeed).start()
                     delay(gestureSpeed)
                     exoBrightnessCont.visibility = View.GONE
                     checkNotch()
@@ -530,7 +567,8 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         val volumeRunnable = Runnable {
             if (exoVolumeCont.alpha == 1f)
                 lifecycleScope.launch {
-                    ObjectAnimator.ofFloat(exoVolumeCont, "alpha", 1f, 0f).setDuration(gestureSpeed).start()
+                    ObjectAnimator.ofFloat(exoVolumeCont, "alpha", 1f, 0f).setDuration(gestureSpeed)
+                        .start()
                     delay(gestureSpeed)
                     exoVolumeCont.visibility = View.GONE
                     checkNotch()
@@ -548,25 +586,65 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         fun handleController() {
             if (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) !isInPictureInPictureMode else true) {
                 if (playerView.isControllerFullyVisible) {
-                    ObjectAnimator.ofFloat(playerView.findViewById(R.id.exo_controller), "alpha", 1f, 0f)
+                    ObjectAnimator.ofFloat(
+                        playerView.findViewById(R.id.exo_controller),
+                        "alpha",
+                        1f,
+                        0f
+                    )
                         .setDuration(controllerDuration).start()
-                    ObjectAnimator.ofFloat(playerView.findViewById(R.id.exo_bottom_cont), "translationY", 0f, 128f)
+                    ObjectAnimator.ofFloat(
+                        playerView.findViewById(R.id.exo_bottom_cont),
+                        "translationY",
+                        0f,
+                        128f
+                    )
                         .apply { interpolator = overshoot;duration = controllerDuration;start() }
-                    ObjectAnimator.ofFloat(playerView.findViewById(R.id.exo_timeline_cont), "translationY", 0f, 128f)
+                    ObjectAnimator.ofFloat(
+                        playerView.findViewById(R.id.exo_timeline_cont),
+                        "translationY",
+                        0f,
+                        128f
+                    )
                         .apply { interpolator = overshoot;duration = controllerDuration;start() }
-                    ObjectAnimator.ofFloat(playerView.findViewById(R.id.exo_top_cont), "translationY", 0f, -128f)
+                    ObjectAnimator.ofFloat(
+                        playerView.findViewById(R.id.exo_top_cont),
+                        "translationY",
+                        0f,
+                        -128f
+                    )
                         .apply { interpolator = overshoot;duration = controllerDuration;start() }
                     playerView.postDelayed({ playerView.hideController() }, controllerDuration)
                 } else {
                     checkNotch()
                     playerView.showController()
-                    ObjectAnimator.ofFloat(playerView.findViewById(R.id.exo_controller), "alpha", 0f, 1f)
+                    ObjectAnimator.ofFloat(
+                        playerView.findViewById(R.id.exo_controller),
+                        "alpha",
+                        0f,
+                        1f
+                    )
                         .setDuration(controllerDuration).start()
-                    ObjectAnimator.ofFloat(playerView.findViewById(R.id.exo_bottom_cont), "translationY", 128f, 0f)
+                    ObjectAnimator.ofFloat(
+                        playerView.findViewById(R.id.exo_bottom_cont),
+                        "translationY",
+                        128f,
+                        0f
+                    )
                         .apply { interpolator = overshoot;duration = controllerDuration;start() }
-                    ObjectAnimator.ofFloat(playerView.findViewById(R.id.exo_timeline_cont), "translationY", 128f, 0f)
+                    ObjectAnimator.ofFloat(
+                        playerView.findViewById(R.id.exo_timeline_cont),
+                        "translationY",
+                        128f,
+                        0f
+                    )
                         .apply { interpolator = overshoot;duration = controllerDuration;start() }
-                    ObjectAnimator.ofFloat(playerView.findViewById(R.id.exo_top_cont), "translationY", -128f, 0f)
+                    ObjectAnimator.ofFloat(
+                        playerView.findViewById(R.id.exo_top_cont),
+                        "translationY",
+                        -128f,
+                        0f
+                    )
                         .apply { interpolator = overshoot;duration = controllerDuration;start() }
                 }
             }
@@ -651,8 +729,10 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         }
 
         if (!settings.doubleTap) {
-            playerView.findViewById<View>(R.id.exo_fast_forward_button_cont).visibility = View.VISIBLE
-            playerView.findViewById<View>(R.id.exo_fast_rewind_button_cont).visibility = View.VISIBLE
+            playerView.findViewById<View>(R.id.exo_fast_forward_button_cont).visibility =
+                View.VISIBLE
+            playerView.findViewById<View>(R.id.exo_fast_rewind_button_cont).visibility =
+                View.VISIBLE
             playerView.findViewById<ImageButton>(R.id.exo_fast_forward_button).setOnClickListener {
                 if (isInitialized) {
                     seek(true)
@@ -696,7 +776,8 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
 
             exoBrightness.addOnChangeListener { _, value, _ ->
                 val lp = window.attributes
-                lp.screenBrightness = brightnessConverter((value.takeIf { !it.isNaN() } ?: 0f) / 10, false)
+                lp.screenBrightness =
+                    brightnessConverter((value.takeIf { !it.isNaN() } ?: 0f) / 10, false)
                 window.attributes = lp
                 brightnessHide()
             }
@@ -757,7 +838,8 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
                     }
                 }
 
-                override fun onSingleClick(event: MotionEvent) = if (isSeeking) doubleTap(false, event) else handleController()
+                override fun onSingleClick(event: MotionEvent) =
+                    if (isSeeking) doubleTap(false, event) else handleController()
             })
             val rewindArea = playerView.findViewById<View>(R.id.exo_rewind_area)
             rewindArea.isClickable = true
@@ -786,7 +868,8 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
                     }
                 }
 
-                override fun onSingleClick(event: MotionEvent) = if (isSeeking) doubleTap(true, event) else handleController()
+                override fun onSingleClick(event: MotionEvent) =
+                    if (isSeeking) doubleTap(true, event) else handleController()
             })
             val forwardArea = playerView.findViewById<View>(R.id.exo_forward_area)
             forwardArea.isClickable = true
@@ -817,7 +900,8 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         }
 
         model.watchSources = if (media.isAdult) HAnimeSources else AnimeSources
-        serverInfo.text = model.watchSources!!.names.getOrNull(media.selected!!.sourceIndex) ?: model.watchSources!!.names[0]
+        serverInfo.text = model.watchSources!!.names.getOrNull(media.selected!!.sourceIndex)
+            ?: model.watchSources!!.names[0]
 
         model.epChanged.observe(this) {
             epChanging = !it
@@ -906,7 +990,10 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
                 rpc?.send {
                     type = RPC.Type.WATCHING
                     activityName = media.userPreferredName
-                    details = ep.title?.takeIf { it.isNotEmpty() } ?: getString(R.string.episode_num, ep.number)
+                    details = ep.title?.takeIf { it.isNotEmpty() } ?: getString(
+                        R.string.episode_num,
+                        ep.number
+                    )
                     state = "Episode : ${ep.number}/${media.anime?.totalEpisodes ?: "??"}"
                     media.cover?.let { cover ->
                         largeImage = RPC.Link(media.userPreferredName, cover)
@@ -922,25 +1009,25 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         //FullScreen
         isFullscreen = loadData("${media.id}_fullscreenInt", this) ?: isFullscreen
         playerView.resizeMode = when (isFullscreen) {
-            0    -> AspectRatioFrameLayout.RESIZE_MODE_FIT
-            1    -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM
-            2    -> AspectRatioFrameLayout.RESIZE_MODE_FILL
+            0 -> AspectRatioFrameLayout.RESIZE_MODE_FIT
+            1 -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM
+            2 -> AspectRatioFrameLayout.RESIZE_MODE_FILL
             else -> AspectRatioFrameLayout.RESIZE_MODE_FIT
         }
 
         exoScreen.setOnClickListener {
             if (isFullscreen < 2) isFullscreen += 1 else isFullscreen = 0
             playerView.resizeMode = when (isFullscreen) {
-                0    -> AspectRatioFrameLayout.RESIZE_MODE_FIT
-                1    -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM
-                2    -> AspectRatioFrameLayout.RESIZE_MODE_FILL
+                0 -> AspectRatioFrameLayout.RESIZE_MODE_FIT
+                1 -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM
+                2 -> AspectRatioFrameLayout.RESIZE_MODE_FILL
                 else -> AspectRatioFrameLayout.RESIZE_MODE_FIT
             }
             snackString(
                 when (isFullscreen) {
-                    0    -> "Original"
-                    1    -> "Zoom"
-                    2    -> "Stretch"
+                    0 -> "Original"
+                    1 -> "Zoom"
+                    2 -> "Stretch"
                     else -> "Original"
                 }
             )
@@ -959,7 +1046,11 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
 
         //Settings
         exoSettings.setOnClickListener {
-            saveData("${media.id}_${media.anime!!.selectedEpisode}", exoPlayer.currentPosition, this)
+            saveData(
+                "${media.id}_${media.anime!!.selectedEpisode}",
+                exoPlayer.currentPosition,
+                this
+            )
             val intent = Intent(this, PlayerSettingsActivity::class.java).apply {
                 putExtra("subtitle", subtitle)
             }
@@ -979,7 +1070,8 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
 
         playbackParameters = PlaybackParameters(speeds[curSpeed])
         var speed: Float
-        val speedDialog = AlertDialog.Builder(this, R.style.DialogTheme).setTitle(getString(R.string.speed))
+        val speedDialog =
+            AlertDialog.Builder(this, R.style.DialogTheme).setTitle(getString(R.string.speed))
         exoSpeed.setOnClickListener {
             speedDialog.setSingleChoiceItems(speedsName, curSpeed) { dialog, i ->
                 if (isInitialized) {
@@ -1018,16 +1110,19 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
 
         isFullscreen = settings.resize
         playerView.resizeMode = when (settings.resize) {
-            0    -> AspectRatioFrameLayout.RESIZE_MODE_FIT
-            1    -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM
-            2    -> AspectRatioFrameLayout.RESIZE_MODE_FILL
+            0 -> AspectRatioFrameLayout.RESIZE_MODE_FIT
+            1 -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM
+            2 -> AspectRatioFrameLayout.RESIZE_MODE_FILL
             else -> AspectRatioFrameLayout.RESIZE_MODE_FIT
         }
 
         preloading = false
-        val showProgressDialog = if (settings.askIndividual) loadData<Boolean>("${media.id}_progressDialog") ?: true else false
+        val showProgressDialog =
+            if (settings.askIndividual) loadData<Boolean>("${media.id}_progressDialog")
+                ?: true else false
         if (showProgressDialog && Anilist.userid != null && if (media.isAdult) settings.updateForH else true)
-            AlertDialog.Builder(this, R.style.DialogTheme).setTitle(getString(R.string.auto_update, media.userPreferredName))
+            AlertDialog.Builder(this, R.style.DialogTheme)
+                .setTitle(getString(R.string.auto_update, media.userPreferredName))
                 .apply {
                     setOnCancelListener { hideSystemBars() }
                     setCancelable(false)
@@ -1074,16 +1169,16 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
 
         subtitle = intent.getSerialized("subtitle")
             ?: when (val subLang: String? = loadData("subLang_${media.id}", this)) {
-                null   -> {
+                null -> {
                     when (episode.selectedSubtitle) {
                         null -> null
-                        -1   -> ext.subtitles.find { it.language.trim() == "English" || it.language == "en-US" }
+                        -1 -> ext.subtitles.find { it.language.trim() == "English" || it.language == "en-US" }
                         else -> ext.subtitles.getOrNull(episode.selectedSubtitle!!)
                     }
                 }
 
                 "None" -> ext.subtitles.let { null }
-                else   -> ext.subtitles.find { it.language == subLang }
+                else -> ext.subtitles.find { it.language == subLang }
             }
 
         //Subtitles
@@ -1091,21 +1186,44 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         exoSubtitle.setOnClickListener {
             subClick()
         }
-
         var sub: MediaItem.SubtitleConfiguration? = null
         if (subtitle != null) {
-            sub = MediaItem.SubtitleConfiguration
-                .Builder(Uri.parse(subtitle!!.file.url))
-                .setSelectionFlags(C.SELECTION_FLAG_FORCED)
-                .setMimeType(
-                    when (subtitle?.type) {
-                        SubtitleType.VTT -> MimeTypes.TEXT_VTT
-                        SubtitleType.ASS -> MimeTypes.TEXT_SSA
-                        SubtitleType.SRT -> MimeTypes.APPLICATION_SUBRIP
-                        else             -> MimeTypes.TEXT_UNKNOWN
-                    }
-                )
-                .build()
+            //var localFile: String? = null
+            if (subtitle?.type == SubtitleType.UNKNOWN) {
+                val context = this
+                runBlocking {
+                    val type = SubtitleDownloader.downloadSubtitles(context, subtitle!!.file.url)
+                    val fileUri = Uri.parse(subtitle!!.file.url)
+                    sub = MediaItem.SubtitleConfiguration
+                        .Builder(fileUri)
+                        .setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
+                        .setMimeType(
+                            when (type) {
+                                SubtitleType.VTT -> MimeTypes.TEXT_SSA
+                                SubtitleType.ASS -> MimeTypes.TEXT_SSA
+                                SubtitleType.SRT -> MimeTypes.TEXT_SSA
+                                else -> MimeTypes.TEXT_SSA
+                            }
+                        )
+                        .setId("69")
+                        .build()
+                }
+                println("sub: $sub")
+            } else {
+                sub = MediaItem.SubtitleConfiguration
+                    .Builder(Uri.parse(subtitle!!.file.url))
+                    .setSelectionFlags(C.SELECTION_FLAG_FORCED)
+                    .setMimeType(
+                        when (subtitle?.type) {
+                            SubtitleType.VTT -> MimeTypes.TEXT_VTT
+                            SubtitleType.ASS -> MimeTypes.TEXT_SSA
+                            SubtitleType.SRT -> MimeTypes.APPLICATION_SUBRIP
+                            else -> MimeTypes.TEXT_UNKNOWN
+                        }
+                    )
+                    .setId("69")
+                    .build()
+            }
         }
 
         lifecycleScope.launch(Dispatchers.IO) {
@@ -1113,7 +1231,9 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         }
 
         val but = playerView.findViewById<ImageButton>(R.id.exo_download)
-        if (video?.format == VideoType.CONTAINER || (loadData<Int>("settings_download_manager") ?: 0) != 0) {
+        if (video?.format == VideoType.CONTAINER || (loadData<Int>("settings_download_manager")
+                ?: 0) != 0
+        ) {
             but.visibility = View.VISIBLE
             but.setOnClickListener {
                 download(this, episode, animeTitle.text.toString())
@@ -1146,12 +1266,15 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         val mimeType = when (video?.format) {
             VideoType.M3U8 -> MimeTypes.APPLICATION_M3U8
             VideoType.DASH -> MimeTypes.APPLICATION_MPD
-            else           -> MimeTypes.APPLICATION_MP4
+            else -> MimeTypes.APPLICATION_MP4
         }
 
         val builder = MediaItem.Builder().setUri(video!!.file.url).setMimeType(mimeType)
 
-        if (sub != null) builder.setSubtitleConfigurations(mutableListOf(sub))
+        if (sub != null) {
+            val listofnotnullsubs = immutableListOf(sub).filterNotNull()
+            builder.setSubtitleConfigurations(listofnotnullsubs)
+        }
         mediaItem = builder.build()
 
         //Source
@@ -1163,8 +1286,23 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         trackSelector = DefaultTrackSelector(this)
         trackSelector.setParameters(
             trackSelector.buildUponParameters()
-                .setMinVideoSize(loadData("maxWidth", this) ?: 720, loadData("maxHeight", this) ?: 480)
+                .setAllowVideoMixedMimeTypeAdaptiveness(true)
+                .setAllowVideoNonSeamlessAdaptiveness(true)
+                .setSelectUndeterminedTextLanguage(true)
+                .setAllowAudioMixedMimeTypeAdaptiveness(true)
+                .setAllowMultipleAdaptiveSelections(true)
+                .setPreferredTextLanguage(subtitle?.language ?: "en")
+                .setPreferredTextRoleFlags(C.ROLE_FLAG_SUBTITLE)
+                .setRendererDisabled(C.TRACK_TYPE_VIDEO, false)
+                .setRendererDisabled(C.TRACK_TYPE_AUDIO, false)
+                .setRendererDisabled(C.TRACK_TYPE_TEXT, false)
+                .setMinVideoSize(
+                    loadData("maxWidth", this) ?: 720,
+                    loadData("maxHeight", this) ?: 480
+                )
                 .setMaxVideoSize(1, 1)
+            //.setOverrideForType(
+           //     TrackSelectionOverride(trackSelector, 2))
         )
 
         if (playbackPosition != 0L && !changingServer && !settings.alwaysContinue) {
@@ -1181,7 +1319,8 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
                     )
                 )
             )
-            AlertDialog.Builder(this, R.style.DialogTheme).setTitle(getString(R.string.continue_from, time)).apply {
+            AlertDialog.Builder(this, R.style.DialogTheme)
+                .setTitle(getString(R.string.continue_from, time)).apply {
                 setCancelable(false)
                 setPositiveButton(getString(R.string.yes)) { d, _ ->
                     buildExoplayer()
@@ -1214,6 +1353,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
             }
         playerView.player = exoPlayer
 
+
         try {
             mediaSession = MediaSession.Builder(this, exoPlayer).build()
         } catch (e: Exception) {
@@ -1221,8 +1361,34 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         }
 
         exoPlayer.addListener(this)
+        exoPlayer.addAnalyticsListener(EventLogger())
         isInitialized = true
     }
+    /*private fun selectSubtitleTrack() {
+        // Get the current track groups
+        val trackGroups = exoPlayer.currentTrackGroups
+
+        // Prepare a track selector parameters builder
+        val parametersBuilder = DefaultTrackSelector.ParametersBuilder(this)
+
+        // Iterate through the track groups to find the subtitle tracks
+        for (i in 0 until trackGroups.length) {
+            val trackGroup = trackGroups[i]
+            for (j in 0 until trackGroup.length) {
+                val trackMetadata = trackGroup.getFormat(j)
+
+                // Check if the track is a subtitle track
+                if (MimeTypes.isText(trackMetadata.sampleMimeType)) {
+                    parametersBuilder.setRendererDisabled(i, false) // Enable the renderer for this track group
+                    parametersBuilder.setSelectionOverride(i, trackGroups, DefaultTrackSelector.SelectionOverride(j, 0)) // Override to select this track
+                    break
+                }
+            }
+        }
+
+        // Apply the track selector parameters to select the subtitle
+        trackSelector.setParameters(parametersBuilder)
+    }*/
 
     private fun releasePlayer() {
         isPlayerPlaying = exoPlayer.playWhenReady
@@ -1266,7 +1432,11 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         orientationListener?.disable()
         if (isInitialized) {
             playerView.player?.pause()
-            saveData("${media.id}_${media.anime!!.selectedEpisode}", exoPlayer.currentPosition, this)
+            saveData(
+                "${media.id}_${media.anime!!.selectedEpisode}",
+                exoPlayer.currentPosition,
+                this
+            )
         }
     }
 
@@ -1304,7 +1474,8 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
             playerView.keepScreenOn = isPlaying
             (exoPlay.drawable as Animatable?)?.start()
             if (!this.isDestroyed) Glide.with(this)
-                .load(if (isPlaying) R.drawable.anim_play_to_pause else R.drawable.anim_pause_to_play).into(exoPlay)
+                .load(if (isPlaying) R.drawable.anim_play_to_pause else R.drawable.anim_pause_to_play)
+                .into(exoPlay)
         }
     }
 
@@ -1383,7 +1554,10 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
                         exoPlayer.seekTo((new.interval.endTime * 1000).toLong())
                     }
                 }
-                if (settings.autoSkipOPED && (new.skipType == "op" || new.skipType == "ed") && !skippedTimeStamps.contains(new)) {
+                if (settings.autoSkipOPED && (new.skipType == "op" || new.skipType == "ed") && !skippedTimeStamps.contains(
+                        new
+                    )
+                ) {
                     exoPlayer.seekTo((new.interval.endTime * 1000).toLong())
                     skippedTimeStamps.add(new)
                 }
@@ -1400,6 +1574,27 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
     }
 
     override fun onTracksChanged(tracks: Tracks) {
+        tracks.groups.forEach {
+            println("Track__: $it")
+            println("Track__: ${it.length}")
+            println("Track__: ${it.isSelected}")
+            println("Track__: ${it.type}")
+            println("Track__: ${it.mediaTrackGroup.id}")
+            if (it.type == 3 && it.mediaTrackGroup.id == "1:"){
+                playerView.player?.trackSelectionParameters =
+                    playerView.player?.trackSelectionParameters?.buildUpon()
+                        ?.setOverrideForType(
+                        TrackSelectionOverride(it.mediaTrackGroup, it.length - 1))
+                        ?.build()!!
+            }else if(it.type == 3){
+                playerView.player?.trackSelectionParameters =
+                    playerView.player?.trackSelectionParameters?.buildUpon()
+                        ?.addOverride(
+                            TrackSelectionOverride(it.mediaTrackGroup, listOf()))
+                        ?.build()!!
+            }
+        }
+        println("Track: ${tracks.groups.size}")
         if (tracks.groups.size <= 2) exoQuality.visibility = View.GONE
         else {
             exoQuality.visibility = View.VISIBLE
@@ -1426,6 +1621,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
     private var isBuffering = true
     override fun onPlaybackStateChanged(playbackState: Int) {
         if (playbackState == ExoPlayer.STATE_READY) {
+
             exoPlayer.play()
             if (episodeLength == 0f) {
                 episodeLength = exoPlayer.duration.toFloat()
@@ -1453,7 +1649,9 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         var i = 1
         while (isFiller) {
             if (episodeArr.size > currentEpisodeIndex + i) {
-                isFiller = if (settings.autoSkipFiller) episodes[episodeArr[currentEpisodeIndex + i]]?.filler ?: false else false
+                isFiller =
+                    if (settings.autoSkipFiller) episodes[episodeArr[currentEpisodeIndex + i]]?.filler
+                        ?: false else false
                 if (!isFiller) runnable.invoke(i)
                 i++
             } else {
@@ -1509,7 +1707,10 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
         shareVideo.setDataAndType(Uri.parse(videoURL), "video/*")
         shareVideo.setPackage("com.instantbits.cast.webvideo")
         if (subtitle != null) shareVideo.putExtra("subtitle", subtitle!!.file.url)
-        shareVideo.putExtra("title", media.userPreferredName + " : Ep " + episodeTitleArr[currentEpisodeIndex])
+        shareVideo.putExtra(
+            "title",
+            media.userPreferredName + " : Ep " + episodeTitleArr[currentEpisodeIndex]
+        )
         shareVideo.putExtra("poster", episode.thumb?.url ?: media.cover)
         val headers = Bundle()
         defaultHeaders.forEach {
@@ -1579,7 +1780,10 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
     }
 
     @RequiresApi(Build.VERSION_CODES.O)
-    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {
+    override fun onPictureInPictureModeChanged(
+        isInPictureInPictureMode: Boolean,
+        newConfig: Configuration
+    ) {
         onPiPChanged(isInPictureInPictureMode)
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
     }

app/src/main/java/ani/dantotsu/media/anime/SelectorDialogFragment.kt

@@ -3,8 +3,10 @@ package ani.dantotsu.media.anime
 import android.annotation.SuppressLint
 import android.content.DialogInterface
 import android.content.Intent
+import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.HapticFeedbackConstants
 import android.view.LayoutInflater
 import android.view.View
@@ -23,6 +25,7 @@ import ani.dantotsu.media.MediaDetailsViewModel
 import ani.dantotsu.others.Download.download
 import ani.dantotsu.parsers.VideoExtractor
 import ani.dantotsu.parsers.VideoType
+import ani.dantotsu.themes.ThemeManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -52,6 +55,12 @@ class SelectorDialogFragment : BottomSheetDialogFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = BottomSheetSelectorBinding.inflate(inflater, container, false)
+        val window = dialog?.window
+        window?.statusBarColor = Color.TRANSPARENT
+        val typedValue = TypedValue()
+        val theme = requireContext().theme
+        theme.resolveAttribute(com.google.android.material.R.attr.colorSurface, typedValue, true)
+        window?.navigationBarColor = typedValue.data
         return binding.root
     }
 

app/src/main/java/ani/dantotsu/media/manga/MangaCache.kt

@@ -1,22 +1,33 @@
 package ani.dantotsu.media.manga
 
+import android.content.ContentResolver
+import android.content.ContentValues
+import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.provider.MediaStore
 import android.util.LruCache
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.online.HttpSource
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import java.io.File
+import java.io.FileOutputStream
 
 data class ImageData(
     val page: Page,
-    val source: HttpSource,
+    val source: HttpSource
 ){
-    suspend fun fetchAndProcessImage(page: Page, httpSource: HttpSource): Bitmap? {
+    suspend fun fetchAndProcessImage(page: Page, httpSource: HttpSource, context: Context): Bitmap? {
         return withContext(Dispatchers.IO) {
             try {
                 // Fetch the image
                 val response = httpSource.getImage(page)
+                println("Response: ${response.code}")
+                println("Response: ${response.message}")
 
                 // Convert the Response to an InputStream
                 val inputStream = response.body?.byteStream()
@@ -25,6 +36,7 @@ data class ImageData(
                 val bitmap = BitmapFactory.decodeStream(inputStream)
 
                 inputStream?.close()
+                saveImage(bitmap, context.contentResolver, page.imageUrl!!, Bitmap.CompressFormat.JPEG, 100)
 
                 return@withContext bitmap
             } catch (e: Exception) {
@@ -36,6 +48,39 @@ data class ImageData(
     }
 }
 
+fun saveImage(bitmap: Bitmap, contentResolver: ContentResolver, filename: String, format: Bitmap.CompressFormat, quality: Int) {
+    try {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            val contentValues = ContentValues().apply {
+                put(MediaStore.MediaColumns.DISPLAY_NAME, filename)
+                put(MediaStore.MediaColumns.MIME_TYPE, "image/${format.name.lowercase()}")
+                put(MediaStore.MediaColumns.RELATIVE_PATH, "${Environment.DIRECTORY_DOWNLOADS}/Dantotsu/Manga")
+            }
+
+            val uri: Uri? = contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
+
+            uri?.let {
+                contentResolver.openOutputStream(it)?.use { os ->
+                    bitmap.compress(format, quality, os)
+                }
+            }
+        } else {
+            val directory = File("${Environment.getExternalStorageDirectory()}${File.separator}Dantotsu${File.separator}Anime")
+            if (!directory.exists()) {
+                directory.mkdirs()
+            }
+
+            val file = File(directory, filename)
+            FileOutputStream(file).use { outputStream ->
+                bitmap.compress(format, quality, outputStream)
+            }
+        }
+    } catch (e: Exception) {
+        // Handle exception here
+        println("Exception while saving image: ${e.message}")
+    }
+}
+
 class MangaCache() {
     private val maxMemory = (Runtime.getRuntime().maxMemory() / 1024 / 2).toInt()
     private val cache = LruCache<String, ImageData>(maxMemory)

app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt

@@ -9,6 +9,8 @@ import ani.dantotsu.databinding.ItemEpisodeCompactBinding
 import ani.dantotsu.media.Media
 import ani.dantotsu.setAnimation
 import ani.dantotsu.connections.updateProgress
+import java.util.regex.Matcher
+import java.util.regex.Pattern
 
 class MangaChapterAdapter(
     private var type: Int,
@@ -61,14 +63,15 @@ class MangaChapterAdapter(
                 val binding = holder.binding
                 setAnimation(fragment.requireContext(), holder.binding.root, fragment.uiSettings)
                 val ep = arr[position]
-                binding.itemEpisodeNumber.text = ep.number
+                val parsedNumber = MangaNameAdapter.findChapterNumber(ep.number)?.toInt()
+                binding.itemEpisodeNumber.text = parsedNumber?.toString() ?: ep.number
                 if (media.userProgress != null) {
-                    if ((ep.number.toFloatOrNull() ?: 9999f) <= media.userProgress!!.toFloat())
+                    if ((MangaNameAdapter.findChapterNumber(ep.number) ?: 9999f) <= media.userProgress!!.toFloat())
                         binding.itemEpisodeViewedCover.visibility = View.VISIBLE
                     else {
                         binding.itemEpisodeViewedCover.visibility = View.GONE
                         binding.itemEpisodeCont.setOnLongClickListener {
-                            updateProgress(media, ep.number)
+                            updateProgress(media, MangaNameAdapter.findChapterNumber(ep.number).toString())
                             true
                         }
                     }
@@ -91,14 +94,14 @@ class MangaChapterAdapter(
                 } else binding.itemChapterTitle.visibility = View.GONE
 
                 if (media.userProgress != null) {
-                    if ((ep.number.toFloatOrNull() ?: 9999f) <= media.userProgress!!.toFloat()) {
+                    if ((MangaNameAdapter.findChapterNumber(ep.number) ?: 9999f) <= media.userProgress!!.toFloat()) {
                         binding.itemEpisodeViewedCover.visibility = View.VISIBLE
                         binding.itemEpisodeViewed.visibility = View.VISIBLE
                     } else {
                         binding.itemEpisodeViewedCover.visibility = View.GONE
                         binding.itemEpisodeViewed.visibility = View.GONE
                         binding.root.setOnLongClickListener {
-                            updateProgress(media, ep.number)
+                            updateProgress(media, MangaNameAdapter.findChapterNumber(ep.number).toString())
                             true
                         }
                     }
@@ -113,4 +116,6 @@ class MangaChapterAdapter(
     fun updateType(t: Int) {
         type = t
     }
+
+
 }

app/src/main/java/ani/dantotsu/media/manga/MangaNameAdapter.kt

@@ -0,0 +1,20 @@
+package ani.dantotsu.media.manga
+
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+
+class MangaNameAdapter {
+    companion object {
+        fun findChapterNumber(text: String): Float? {
+            val regex = "(chapter|chap|ch|c)[\\s:.\\-]*([\\d]+\\.?[\\d]*)"
+            val pattern: Pattern = Pattern.compile(regex, Pattern.CASE_INSENSITIVE)
+            val matcher: Matcher = pattern.matcher(text)
+
+            return if (matcher.find()) {
+                matcher.group(2)?.toFloat()
+            } else {
+                null
+            }
+        }
+    }
+}

app/src/main/java/ani/dantotsu/media/manga/MangaReadAdapter.kt

@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.ImageView
 import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import ani.dantotsu.*
@@ -16,12 +17,17 @@ import ani.dantotsu.databinding.ItemChipBinding
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.media.SourceSearchDialogFragment
+import ani.dantotsu.parsers.AnimeSources
+import ani.dantotsu.parsers.DynamicAnimeParser
+import ani.dantotsu.parsers.DynamicMangaParser
 import ani.dantotsu.parsers.MangaReadSources
+import ani.dantotsu.parsers.MangaSources
 import ani.dantotsu.subcriptions.Notifications.Companion.openSettings
 import ani.dantotsu.subcriptions.Subscription.Companion.getChannelId
 import com.google.android.material.chip.Chip
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
+import java.lang.IndexOutOfBoundsException
 
 class MangaReadAdapter(
     private val media: Media,
@@ -49,10 +55,10 @@ class MangaReadAdapter(
         }
 
         //Source Selection
-        val source = media.selected!!.sourceIndex.let { if (it >= mangaReadSources.names.size) 0 else it }
+        var source = media.selected!!.sourceIndex.let { if (it >= mangaReadSources.names.size) 0 else it }
+        setLanguageList(media.selected!!.langIndex,source)
         if (mangaReadSources.names.isNotEmpty() && source in 0 until mangaReadSources.names.size) {
             binding.animeSource.setText(mangaReadSources.names[source])
-
             mangaReadSources[source].apply {
                 binding.animeSourceTitle.text = showUserText
                 showUserTextListener = { MainScope().launch { binding.animeSourceTitle.text = it } }
@@ -64,9 +70,34 @@ class MangaReadAdapter(
             fragment.onSourceChange(i).apply {
                 binding.animeSourceTitle.text = showUserText
                 showUserTextListener = { MainScope().launch { binding.animeSourceTitle.text = it } }
+                source = i
+                setLanguageList(0,i)
             }
             subscribeButton(false)
-            fragment.loadChapters(i)
+            fragment.loadChapters(i, false)
+        }
+
+        binding.animeSourceLanguage.setOnItemClickListener { _, _, i, _ ->
+            // Check if 'extension' and 'selected' properties exist and are accessible
+            (mangaReadSources[source] as? DynamicMangaParser)?.let { ext ->
+                ext.sourceLanguage = i
+                fragment.onLangChange(i)
+                fragment.onSourceChange(media.selected!!.sourceIndex).apply {
+                    binding.animeSourceTitle.text = showUserText
+                    showUserTextListener = { MainScope().launch { binding.animeSourceTitle.text = it } }
+                    setLanguageList(i, source)
+                }
+                subscribeButton(false)
+                fragment.loadChapters(media.selected!!.sourceIndex, true)
+            } ?: run {
+            }
+        }
+
+        //settings
+        binding.animeSourceSettings.setOnClickListener {
+            (mangaReadSources[source] as? DynamicMangaParser)?.let { ext ->
+                fragment.openSettings(ext.extension)
+            }
         }
 
         //Subscription
@@ -145,6 +176,7 @@ class MangaReadAdapter(
                     binding.animeWatchChipScroll.smoothScrollTo((chip.left - screenWidth / 2) + (chip.width / 2), 0)
                 }
                 chip.text = "${names[limit * (position)]} - ${names[last - 1]}"
+                chip.setTextColor(ContextCompat.getColorStateList(fragment.requireContext(), R.color.chip_text_color))
 
                 chip.setOnClickListener {
                     selected()
@@ -174,7 +206,9 @@ class MangaReadAdapter(
                 val anilistEp = (media.userProgress ?: 0).plus(1)
                 val appEp = loadData<String>("${media.id}_current_chp")?.toIntOrNull() ?: 1
                 var continueEp = (if (anilistEp > appEp) anilistEp else appEp).toString()
-                if (chapters.contains(continueEp)) {
+                val formattedChapters = chapters.map { MangaNameAdapter.findChapterNumber(it)?.toInt()?.toString() }
+                if (formattedChapters.contains(continueEp)) {
+                    continueEp = chapters[formattedChapters.indexOf(continueEp)]
                     binding.animeSourceContinue.visibility = View.VISIBLE
                     handleProgress(
                         binding.itemEpisodeProgressCont,
@@ -220,6 +254,25 @@ class MangaReadAdapter(
         }
     }
 
+    fun setLanguageList(lang: Int, source: Int) {
+        val binding = _binding
+        if (mangaReadSources is MangaSources) {
+            val parser = mangaReadSources[source] as? DynamicMangaParser
+            if (parser != null) {
+                (mangaReadSources[source] as? DynamicMangaParser)?.let { ext ->
+                    ext.sourceLanguage = lang
+                }
+                try {
+                    binding?.animeSourceLanguage?.setText(parser.extension.sources[lang].lang)
+                }catch (e: IndexOutOfBoundsException) {
+                    binding?.animeSourceLanguage?.setText(parser.extension.sources.firstOrNull()?.lang ?: "Unknown")
+                }
+                binding?.animeSourceLanguage?.setAdapter(ArrayAdapter(fragment.requireContext(), R.layout.item_dropdown, parser.extension.sources.map { it.lang }))
+
+            }
+        }
+    }
+
     override fun getItemCount(): Int = 1
 
     inner class ViewHolder(val binding: ItemAnimeWatchBinding) : RecyclerView.ViewHolder(binding.root)

app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt

@@ -1,11 +1,15 @@
 package ani.dantotsu.media.manga
 
 import android.annotation.SuppressLint
+import android.app.AlertDialog
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.Toast
+import androidx.cardview.widget.CardView
 import androidx.core.math.MathUtils.clamp
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
@@ -13,20 +17,30 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.viewpager2.widget.ViewPager2
 import ani.dantotsu.*
 import ani.dantotsu.databinding.FragmentAnimeWatchBinding
 import ani.dantotsu.media.manga.mangareader.ChapterLoaderDialog
 import ani.dantotsu.media.Media
+import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.media.MediaDetailsViewModel
 import ani.dantotsu.parsers.HMangaSources
 import ani.dantotsu.parsers.MangaParser
 import ani.dantotsu.parsers.MangaSources
 import ani.dantotsu.settings.UserInterfaceSettings
+import ani.dantotsu.settings.extensionprefs.AnimeSourcePreferencesFragment
+import ani.dantotsu.settings.extensionprefs.MangaSourcePreferencesFragment
 import ani.dantotsu.subcriptions.Notifications
 import ani.dantotsu.subcriptions.Notifications.Group.MANGA_GROUP
 import ani.dantotsu.subcriptions.Subscription.Companion.getChannelId
 import ani.dantotsu.subcriptions.SubscriptionHelper
 import ani.dantotsu.subcriptions.SubscriptionHelper.Companion.saveSubscription
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.navigationrail.NavigationRailView
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.extension.anime.model.AnimeExtension
+import eu.kanade.tachiyomi.extension.manga.model.MangaExtension
+import eu.kanade.tachiyomi.source.ConfigurableSource
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlin.math.ceil
@@ -185,8 +199,16 @@ open class MangaReadFragment : Fragment() {
         return model.mangaReadSources?.get(i)!!
     }
 
-    fun loadChapters(i: Int) {
-        lifecycleScope.launch(Dispatchers.IO) { model.loadMangaChapters(media, i) }
+    fun onLangChange(i: Int) {
+        val selected = model.loadSelected(media)
+        selected.langIndex = i
+        model.saveSelected(media.id, selected, requireActivity())
+        media.selected = selected
+    }
+
+
+    fun loadChapters(i: Int, invalidate: Boolean) {
+        lifecycleScope.launch(Dispatchers.IO) { model.loadMangaChapters(media, i, invalidate) }
     }
 
     fun onIconPressed(viewType: Int, rev: Boolean) {
@@ -225,6 +247,75 @@ open class MangaReadFragment : Fragment() {
         )
     }
 
+    fun openSettings(pkg: MangaExtension.Installed){
+        val changeUIVisibility: (Boolean) -> Unit = { show ->
+            val activity = requireActivity() as MediaDetailsActivity
+            val visibility = if (show) View.VISIBLE else View.GONE
+            activity.findViewById<AppBarLayout>(R.id.mediaAppBar).visibility = visibility
+            activity.findViewById<ViewPager2>(R.id.mediaViewPager).visibility = visibility
+            activity.findViewById<CardView>(R.id.mediaCover).visibility = visibility
+            activity.findViewById<CardView>(R.id.mediaClose).visibility = visibility
+            try{
+                activity.findViewById<CustomBottomNavBar>(R.id.mediaTab).visibility = visibility
+            }catch (e: ClassCastException){
+                activity.findViewById<NavigationRailView>(R.id.mediaTab).visibility = visibility
+            }
+            activity.findViewById<FrameLayout>(R.id.fragmentExtensionsContainer).visibility =
+                if (show) View.GONE else View.VISIBLE
+        }
+        val allSettings = pkg.sources.filterIsInstance<ConfigurableSource>()
+        if (allSettings.isNotEmpty()) {
+            var selectedSetting = allSettings[0]
+            if (allSettings.size > 1) {
+                val names = allSettings.map { it.lang }.toTypedArray()
+                var selectedIndex = 0
+                AlertDialog.Builder(requireContext())
+                    .setTitle("Select a Source")
+                    .setSingleChoiceItems(names, selectedIndex) { _, which ->
+                        selectedIndex = which
+                    }
+                    .setPositiveButton("OK") { dialog, _ ->
+                        selectedSetting = allSettings[selectedIndex]
+                        dialog.dismiss()
+
+                        // Move the fragment transaction here
+                        val fragment =
+                            MangaSourcePreferencesFragment().getInstance(selectedSetting.id){
+                                changeUIVisibility(true)
+                                loadChapters(media.selected!!.sourceIndex, true)
+                            }
+                        parentFragmentManager.beginTransaction()
+                            .setCustomAnimations(R.anim.slide_up, R.anim.slide_down)
+                            .replace(R.id.fragmentExtensionsContainer, fragment)
+                            .addToBackStack(null)
+                            .commit()
+                    }
+                    .setNegativeButton("Cancel") { dialog, _ ->
+                        dialog.cancel()
+                        changeUIVisibility(true)
+                        return@setNegativeButton
+                    }
+                    .show()
+            } else {
+                // If there's only one setting, proceed with the fragment transaction
+                val fragment = MangaSourcePreferencesFragment().getInstance(selectedSetting.id){
+                    changeUIVisibility(true)
+                    loadChapters(media.selected!!.sourceIndex, true)
+                }
+                parentFragmentManager.beginTransaction()
+                    .setCustomAnimations(R.anim.slide_up, R.anim.slide_down)
+                    .replace(R.id.fragmentExtensionsContainer, fragment)
+                    .addToBackStack(null)
+                    .commit()
+            }
+
+            changeUIVisibility(false)
+        } else {
+            Toast.makeText(requireContext(), "Source is not configurable", Toast.LENGTH_SHORT)
+                .show()
+        }
+    }
+
     fun onMangaChapterClick(i: String) {
         model.continueMedia = false
         media.manga?.chapters?.get(i)?.let {

app/src/main/java/ani/dantotsu/media/manga/mangareader/BaseImageAdapter.kt

@@ -116,10 +116,10 @@ abstract class BaseImageAdapter(
     abstract suspend fun loadImage(position: Int, parent: View): Boolean
 
     companion object {
-        /*suspend fun Context.loadBitmap(link: FileUrl, transforms: List<BitmapTransformation>): Bitmap? {
+        suspend fun Context.loadBitmap_old(link: FileUrl, transforms: List<BitmapTransformation>): Bitmap? {
             return tryWithSuspend {
                 withContext(Dispatchers.IO) {
-                    Glide.with(this@loadBitmap)
+                    Glide.with(this@loadBitmap_old)
                         .asBitmap()
                         .let {
                             if (link.url.startsWith("file://")) {
@@ -142,7 +142,7 @@ abstract class BaseImageAdapter(
                         .get()
                 }
             }
-        }*/
+        }
 
         suspend fun Context.loadBitmap(link: FileUrl, transforms: List<BitmapTransformation>): Bitmap? {
             return tryWithSuspend {
@@ -156,12 +156,8 @@ abstract class BaseImageAdapter(
                                     .skipMemoryCache(true)
                                     .diskCacheStrategy(DiskCacheStrategy.NONE)
                             } else {
-                                println("bitmap from cache")
-                                println(link.url)
-                                println(mangaCache.get(link.url))
-                                println("cache size: ${mangaCache.size()}")
                                 mangaCache.get(link.url)?.let { imageData ->
-                                    val bitmap = imageData.fetchAndProcessImage(imageData.page, imageData.source)
+                                    val bitmap = imageData.fetchAndProcessImage(imageData.page, imageData.source, context = this@loadBitmap)
                                     it.load(bitmap)
                                         .skipMemoryCache(true)
                                         .diskCacheStrategy(DiskCacheStrategy.NONE)

app/src/main/java/ani/dantotsu/media/manga/mangareader/ChapterLoaderDialog.kt

@@ -1,7 +1,9 @@
 package ani.dantotsu.media.manga.mangareader
 
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -14,6 +16,7 @@ import ani.dantotsu.currActivity
 import ani.dantotsu.databinding.BottomSheetSelectorBinding
 import ani.dantotsu.media.manga.MangaChapter
 import ani.dantotsu.media.MediaDetailsViewModel
+import ani.dantotsu.media.MediaSingleton
 import ani.dantotsu.others.getSerialized
 import ani.dantotsu.tryWith
 import kotlinx.coroutines.Dispatchers
@@ -49,7 +52,8 @@ class ChapterLoaderDialog : BottomSheetDialogFragment() {
                         activity?.runOnUiThread {
                             tryWith { dismiss() }
                             if(launch) {
-                                val intent = Intent(activity, MangaReaderActivity::class.java).apply { putExtra("media", m) }
+                                MediaSingleton.media = m
+                                val intent = Intent(activity, MangaReaderActivity::class.java)//.apply { putExtra("media", m) }
                                 activity.startActivity(intent)
                             }
                         }
@@ -61,6 +65,12 @@ class ChapterLoaderDialog : BottomSheetDialogFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = BottomSheetSelectorBinding.inflate(inflater, container, false)
+        val window = dialog?.window
+        window?.statusBarColor = Color.TRANSPARENT
+        val typedValue = TypedValue()
+        val theme = requireContext().theme
+        theme.resolveAttribute(com.google.android.material.R.attr.colorSurface, typedValue, true)
+        window?.navigationBarColor = typedValue.data
         return binding.root
     }
 

app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt

@@ -30,8 +30,10 @@ import ani.dantotsu.connections.updateProgress
 import ani.dantotsu.databinding.ActivityMangaReaderBinding
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsViewModel
+import ani.dantotsu.media.MediaSingleton
 import ani.dantotsu.media.manga.MangaCache
 import ani.dantotsu.media.manga.MangaChapter
+import ani.dantotsu.media.manga.MangaNameAdapter
 import ani.dantotsu.others.ImageViewDialog
 import ani.dantotsu.others.getSerialized
 import ani.dantotsu.parsers.HMangaSources
@@ -43,10 +45,16 @@ import ani.dantotsu.settings.CurrentReaderSettings.DualPageModes.*
 import ani.dantotsu.settings.CurrentReaderSettings.Layouts.*
 import ani.dantotsu.settings.ReaderSettings
 import ani.dantotsu.settings.UserInterfaceSettings
+import ani.dantotsu.themes.ThemeManager
 import com.alexvasilkov.gestures.views.GestureFrameLayout
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
+import com.google.firebase.crashlytics.ktx.crashlytics
+import com.google.firebase.ktx.Firebase
+import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -118,6 +126,7 @@ class MangaReaderActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityMangaReaderBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
@@ -164,10 +173,13 @@ class MangaReaderActivity : AppCompatActivity() {
 
         media = if (model.getMedia().value == null)
             try {
-                (intent.getSerialized("media")) ?: return
+                //(intent.getSerialized("media")) ?: return
+                MediaSingleton.media ?: return
             } catch (e: Exception) {
                 logError(e)
                 return
+            } finally {
+                MediaSingleton.media = null
             }
         else model.getMedia().value ?: return
         model.setMedia(media)
@@ -180,6 +192,29 @@ class MangaReaderActivity : AppCompatActivity() {
 
         model.mangaReadSources = if (media.isAdult) HMangaSources else MangaSources
         binding.mangaReaderSource.visibility = if (settings.showSource) View.VISIBLE else View.GONE
+        if(model.mangaReadSources!!.names.isEmpty()){
+            //try to reload sources
+            try {
+            if (media.isAdult) {
+                val mangaSources = MangaSources
+                val scope = lifecycleScope
+                scope.launch(Dispatchers.IO) {
+                    mangaSources.init(Injekt.get<MangaExtensionManager>().installedExtensionsFlow)
+                }
+                model.mangaReadSources = mangaSources
+            }else{
+                val mangaSources = HMangaSources
+                val scope = lifecycleScope
+                scope.launch(Dispatchers.IO) {
+                    mangaSources.init(Injekt.get<MangaExtensionManager>().installedExtensionsFlow)
+                }
+                model.mangaReadSources = mangaSources
+            }
+            }catch (e: Exception){
+                Firebase.crashlytics.recordException(e)
+                logError(e)
+            }
+        }
         binding.mangaReaderSource.text = model.mangaReadSources!!.names[media.selected!!.sourceIndex]
 
         binding.mangaReaderTitle.text = media.userPreferredName
@@ -677,7 +712,7 @@ class MangaReaderActivity : AppCompatActivity() {
                 progressDialog?.setCancelable(false)
                     ?.setPositiveButton(getString(R.string.yes)) { dialog, _ ->
                         saveData("${media.id}_save_progress", true)
-                        updateProgress(media, media.manga!!.selectedChapter!!)
+                        updateProgress(media, MangaNameAdapter.findChapterNumber(media.manga!!.selectedChapter!!).toString())
                         dialog.dismiss()
                         runnable.run()
                     }
@@ -689,7 +724,7 @@ class MangaReaderActivity : AppCompatActivity() {
                 progressDialog?.show()
             } else {
                 if (loadData<Boolean>("${media.id}_save_progress") != false && if (media.isAdult) settings.updateForH else true)
-                    updateProgress(media, media.manga!!.selectedChapter!!)
+                    updateProgress(media, MangaNameAdapter.findChapterNumber(media.manga!!.selectedChapter!!).toString())
                 runnable.run()
             }
         } else {

app/src/main/java/ani/dantotsu/media/novel/BookDialog.kt

@@ -13,6 +13,7 @@ import ani.dantotsu.loadImage
 import ani.dantotsu.media.MediaDetailsViewModel
 import ani.dantotsu.others.getSerialized
 import ani.dantotsu.parsers.ShowResponse
+import ani.dantotsu.themes.ThemeManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 

app/src/main/java/ani/dantotsu/media/novel/novelreader/NovelReaderActivity.kt

@@ -34,6 +34,7 @@ import ani.dantotsu.settings.CurrentReaderSettings
 import ani.dantotsu.settings.NovelReaderSettings
 import ani.dantotsu.settings.UserInterfaceSettings
 import ani.dantotsu.snackString
+import ani.dantotsu.themes.ThemeManager
 import ani.dantotsu.tryWith
 import com.google.android.material.slider.Slider
 import com.vipulog.ebookreader.Book
@@ -135,6 +136,7 @@ class NovelReaderActivity : AppCompatActivity(), EbookReaderEventListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityNovelReaderBinding.inflate(layoutInflater)
         setContentView(binding.root)
 

app/src/main/java/ani/dantotsu/media/user/ListActivity.kt

@@ -2,7 +2,10 @@ package ani.dantotsu.media.user
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.View
+import android.view.Window
+import android.view.WindowManager
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.PopupMenu
@@ -12,6 +15,9 @@ import androidx.lifecycle.lifecycleScope
 import ani.dantotsu.R
 import ani.dantotsu.Refresh
 import ani.dantotsu.databinding.ActivityListBinding
+import ani.dantotsu.loadData
+import ani.dantotsu.settings.UserInterfaceSettings
+import ani.dantotsu.themes.ThemeManager
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import kotlinx.coroutines.Dispatchers
@@ -26,10 +32,39 @@ class ListActivity : AppCompatActivity() {
     @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityListBinding.inflate(layoutInflater)
+
+        val typedValue = TypedValue()
+        theme.resolveAttribute(com.google.android.material.R.attr.colorOnPrimary, typedValue, true)
+        val primaryColor = typedValue.data
+        val typedValue2 = TypedValue()
+        theme.resolveAttribute(com.google.android.material.R.attr.colorPrimary, typedValue2, true)
+        val primaryTextColor = typedValue2.data
+        val typedValue3 = TypedValue()
+        theme.resolveAttribute(com.google.android.material.R.attr.colorSecondary, typedValue3, true)
+        val secondaryColor = typedValue3.data
+
+        window.statusBarColor = primaryColor
+        window.navigationBarColor = primaryColor
+        binding.listTabLayout.setBackgroundColor(primaryColor)
+        binding.listAppBar.setBackgroundColor(primaryColor)
+        binding.listTitle.setTextColor(primaryTextColor)
+        binding.listTabLayout.setTabTextColors(primaryTextColor, primaryTextColor)
+        binding.listTabLayout.setSelectedTabIndicatorColor(primaryTextColor)
+        val uiSettings = loadData<UserInterfaceSettings>("ui_settings") ?: UserInterfaceSettings()
+        if (!uiSettings.immersiveMode) {
+            this.window.statusBarColor =
+                ContextCompat.getColor(this, R.color.nav_bg_inv)
+            binding.root.fitsSystemWindows = true
+
+        }else{
+            binding.root.fitsSystemWindows = false
+            requestWindowFeature(Window.FEATURE_NO_TITLE)
+            window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
+        }
         setContentView(binding.root)
 
-        window.statusBarColor = ContextCompat.getColor(this, R.color.nav_bg)
         val anime = intent.getBooleanExtra("anime", true)
         binding.listTitle.text = intent.getStringExtra("username") + "'s " + (if (anime) "Anime" else "Manga") + " List"
 

app/src/main/java/ani/dantotsu/media/user/ListFragment.kt

@@ -11,6 +11,7 @@ import ani.dantotsu.databinding.FragmentListBinding
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaAdaptor
 import ani.dantotsu.media.OtherDetailsViewModel
+import ani.dantotsu.themes.ThemeManager
 
 class ListFragment : Fragment() {
     private var _binding: FragmentListBinding? = null

app/src/main/java/ani/dantotsu/others/CustomBottomDialog.kt

@@ -1,6 +1,8 @@
 package ani.dantotsu.others
 
+import android.graphics.Color
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -46,6 +48,12 @@ open class CustomBottomDialog : BottomSheetDialogFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = BottomSheetCustomBinding.inflate(inflater, container, false)
+        val window = dialog?.window
+        window?.statusBarColor = Color.TRANSPARENT
+        val typedValue = TypedValue()
+        val theme = requireContext().theme
+        theme.resolveAttribute(com.google.android.material.R.attr.colorSurface, typedValue, true)
+        window?.navigationBarColor = typedValue.data
         return binding.root
     }
 

app/src/main/java/ani/dantotsu/others/ImageViewDialog.kt

@@ -12,12 +12,14 @@ import ani.dantotsu.FileUrl
 import ani.dantotsu.R
 import ani.dantotsu.databinding.BottomSheetImageBinding
 import ani.dantotsu.media.manga.mangareader.BaseImageAdapter.Companion.loadBitmap
+import ani.dantotsu.media.manga.mangareader.BaseImageAdapter.Companion.loadBitmap_old
 import ani.dantotsu.media.manga.mangareader.BaseImageAdapter.Companion.mergeBitmap
 import ani.dantotsu.openLinkInBrowser
 import ani.dantotsu.saveImageToDownloads
 import ani.dantotsu.setSafeOnClickListener
 import ani.dantotsu.shareImage
 import ani.dantotsu.snackString
+import ani.dantotsu.themes.ThemeManager
 import ani.dantotsu.toast
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
 import com.davemorrissey.labs.subscaleview.ImageSource
@@ -72,12 +74,17 @@ class ImageViewDialog : BottomSheetDialogFragment() {
             if (image2 != null) openLinkInBrowser(image2.url)
             true
         }
+        val context = requireContext()
 
-        lifecycleScope.launch {
+        viewLifecycleOwner.lifecycleScope.launch {
             val binding = _binding ?: return@launch
 
-            var bitmap = requireContext().loadBitmap(image, trans1 ?: listOf())
-            val bitmap2 = if (image2 != null) requireContext().loadBitmap(image2, trans2 ?: listOf()) else null
+            var bitmap = context.loadBitmap_old(image, trans1 ?: listOf())
+            var bitmap2 = if (image2 != null) context.loadBitmap_old(image2, trans2 ?: listOf()) else null
+            if (bitmap == null) {
+                bitmap = context.loadBitmap(image, trans1 ?: listOf())
+                bitmap2 = if (image2 != null) context.loadBitmap(image2, trans2 ?: listOf()) else null
+            }
 
             bitmap = if (bitmap2 != null && bitmap != null) mergeBitmap(bitmap, bitmap2,) else bitmap
 

app/src/main/java/ani/dantotsu/others/imagesearch/ImageSearchActivity.kt

@@ -15,6 +15,7 @@ import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.databinding.ActivityImageSearchBinding
 import ani.dantotsu.media.MediaDetailsActivity
+import ani.dantotsu.themes.ThemeManager
 import ani.dantotsu.toast
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -46,6 +47,7 @@ class ImageSearchActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityImageSearchBinding.inflate(layoutInflater)
         setContentView(binding.root)
 

app/src/main/java/ani/dantotsu/parsers/AnimeParser.kt

@@ -32,8 +32,10 @@ abstract class AnimeParser : BaseParser() {
      * Returns null, if no latest episode is found.
      * **/
     open suspend fun getLatestEpisode(animeLink: String, extra: Map<String, String>?, sAnime: SAnime, latest: Float): Episode?{
-        return loadEpisodes(animeLink, extra, sAnime)
+        val episodes = loadEpisodes(animeLink, extra, sAnime)
+        val max = episodes
             .maxByOrNull { it.number.toFloatOrNull()?:0f }
+        return max
             ?.takeIf { latest < (it.number.toFloatOrNull() ?: 0.001f) }
     }
 
@@ -171,6 +173,17 @@ abstract class AnimeParser : BaseParser() {
     }
 }
 
+class EmptyAnimeParser: AnimeParser() {
+    override val name: String = "None"
+    override val saveName: String = "None"
+
+    override val isDubAvailableSeparately: Boolean = false
+    override suspend fun loadEpisodes(animeLink: String, extra: Map<String, String>?, sAnime: SAnime): List<Episode> = emptyList()
+    override suspend fun loadVideoServers(episodeLink: String, extra: Map<String, String>?, sEpisode: SEpisode): List<VideoServer> = emptyList()
+
+    override suspend fun search(query: String): List<ShowResponse> = emptyList()
+}
+
 /**
  * A class for containing Episode data of a particular parser
  * **/

app/src/main/java/ani/dantotsu/parsers/AniyomiAdapter.kt

@@ -2,6 +2,7 @@ package ani.dantotsu.parsers
 
 import android.content.ContentResolver
 import android.content.ContentValues
+import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.net.Uri
@@ -17,6 +18,8 @@ import ani.dantotsu.currContext
 import ani.dantotsu.logger
 import ani.dantotsu.media.manga.ImageData
 import ani.dantotsu.media.manga.MangaCache
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
@@ -37,7 +40,10 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
+import okhttp3.Request
 import java.io.File
 import java.io.FileOutputStream
 import java.io.OutputStream
@@ -58,6 +64,7 @@ class AniyomiAdapter {
 
 class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
     val extension: AnimeExtension.Installed
+    var sourceLanguage = 0
     init {
         this.extension = extension
     }
@@ -65,8 +72,14 @@ class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
     override val saveName = extension.name
     override val hostUrl = extension.sources.first().name
     override val isDubAvailableSeparately = false
+    override val isNSFW = extension.isNsfw
     override suspend fun loadEpisodes(animeLink: String, extra: Map<String, String>?, sAnime: SAnime): List<Episode> {
-        val source = extension.sources.first()
+        val source = try{
+            extension.sources[sourceLanguage]
+        }catch (e: Exception){
+            sourceLanguage = 0
+            extension.sources[sourceLanguage]
+        }
         if (source is AnimeCatalogueSource) {
             try {
                 val res = source.getEpisodeList(sAnime)
@@ -86,7 +99,12 @@ class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
     }
 
     override suspend fun loadVideoServers(episodeLink: String, extra: Map<String, String>?, sEpisode: SEpisode): List<VideoServer> {
-        val source = extension.sources.first() as? AnimeCatalogueSource ?: return emptyList()
+        val source = try{
+            extension.sources[sourceLanguage]
+        }catch (e: Exception){
+            sourceLanguage = 0
+            extension.sources[sourceLanguage]
+        } as? AnimeCatalogueSource ?: return emptyList()
 
         return try {
             val videos = source.getVideoList(sEpisode)
@@ -103,8 +121,12 @@ class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
     }
 
     override suspend fun search(query: String): List<ShowResponse> {
-        val source = extension.sources.first() as? AnimeCatalogueSource ?: return emptyList()
-
+        val source = try{
+            extension.sources[sourceLanguage]
+        }catch (e: Exception){
+            sourceLanguage = 0
+            extension.sources[sourceLanguage]
+        } as? AnimeCatalogueSource ?: return emptyList()
         return try {
             val res = source.fetchSearchAnime(1, query, AnimeFilterList()).toBlocking().first()
             convertAnimesPageToShowResponse(res)
@@ -169,15 +191,22 @@ class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
 class DynamicMangaParser(extension: MangaExtension.Installed) : MangaParser() {
     val mangaCache = Injekt.get<MangaCache>()
     val extension: MangaExtension.Installed
+    var sourceLanguage = 0
     init {
         this.extension = extension
     }
     override val name = extension.name
     override val saveName = extension.name
     override val hostUrl = extension.sources.first().name
+    override val isNSFW = extension.isNsfw
 
     override suspend fun loadChapters(mangaLink: String, extra: Map<String, String>?, sManga: SManga): List<MangaChapter> {
-        val source = extension.sources.first() as? CatalogueSource ?: return emptyList()
+        val source = try{
+            extension.sources[sourceLanguage]
+        }catch (e: Exception){
+            sourceLanguage = 0
+            extension.sources[sourceLanguage]
+        } as? HttpSource ?: return emptyList()
 
         return try {
             val res = source.getChapterList(sManga)
@@ -195,16 +224,23 @@ class DynamicMangaParser(extension: MangaExtension.Installed) : MangaParser() {
 
 
     override suspend fun loadImages(chapterLink: String, sChapter: SChapter): List<MangaImage> {
-        val source = extension.sources.first() as? HttpSource ?: return emptyList()
+        val source = try{
+            extension.sources[sourceLanguage]
+        }catch (e: Exception){
+            sourceLanguage = 0
+            extension.sources[sourceLanguage]
+        } as? HttpSource ?: return emptyList()
 
         return coroutineScope {
             try {
+            println("source.name " + source.name)
                 val res = source.getPageList(sChapter)
                 val reIndexedPages = res.mapIndexed { index, page -> Page(index, page.url, page.imageUrl, page.uri) }
 
                 val deferreds = reIndexedPages.map { page ->
                     async(Dispatchers.IO) {
                         mangaCache.put(page.imageUrl ?: "", ImageData(page, source))
+                        logger("put page: ${page.imageUrl}")
                         pageToMangaImage(page)
                     }
                 }
@@ -212,11 +248,44 @@ class DynamicMangaParser(extension: MangaExtension.Installed) : MangaParser() {
                 deferreds.awaitAll()
             } catch (e: Exception) {
                 logger("loadImages Exception: $e")
+                Toast.makeText(currContext(), "Failed to load images: $e", Toast.LENGTH_SHORT).show()
                 emptyList()
             }
         }
     }
 
+    suspend fun fetchAndProcessImage(page: Page, httpSource: HttpSource, context: Context): Bitmap? {
+        return withContext(Dispatchers.IO) {
+            try {
+                // Fetch the image
+                val response = httpSource.getImage(page)
+                println("Response: ${response.code}")
+                println("Response: ${response.message}")
+
+                // Convert the Response to an InputStream
+                val inputStream = response.body?.byteStream()
+
+                // Convert InputStream to Bitmap
+                val bitmap = BitmapFactory.decodeStream(inputStream)
+
+                inputStream?.close()
+                ani.dantotsu.media.manga.saveImage(
+                    bitmap,
+                    context.contentResolver,
+                    page.imageUrl!!,
+                    Bitmap.CompressFormat.JPEG,
+                    100
+                )
+
+                return@withContext bitmap
+            } catch (e: Exception) {
+                // Handle any exceptions
+                println("An error occurred: ${e.message}")
+                return@withContext null
+            }
+        }
+    }
+
 
 
     fun fetchAndSaveImage(page: Page, httpSource: HttpSource, contentResolver: ContentResolver) {
@@ -280,7 +349,12 @@ class DynamicMangaParser(extension: MangaExtension.Installed) : MangaParser() {
 
 
     override suspend fun search(query: String): List<ShowResponse> {
-        val source = extension.sources.first() as? HttpSource ?: return emptyList()
+        val source = try{
+            extension.sources[sourceLanguage]
+        }catch (e: Exception){
+            sourceLanguage = 0
+            extension.sources[sourceLanguage]
+        } as? HttpSource ?: return emptyList()
 
         return try {
             val res = source.fetchSearchManga(1, query, FilterList()).toBlocking().first()
@@ -349,22 +423,22 @@ class DynamicMangaParser(extension: MangaExtension.Installed) : MangaParser() {
 
 
     private fun SChapterToMangaChapter(sChapter: SChapter): MangaChapter {
-        val parsedChapterTitle = parseChapterTitle(sChapter.name)
+        /*val parsedChapterTitle = parseChapterTitle(sChapter.name)
         val number = if (sChapter.chapter_number.toInt() != -1){
             sChapter.chapter_number.toString()
         } else if(parsedChapterTitle.first != null || parsedChapterTitle.second != null){
             (parsedChapterTitle.first ?: "") + "." + (parsedChapterTitle.second ?: "")
         }else{
             sChapter.name
-        }
+        }*/
         return MangaChapter(
-            number,
+            sChapter.name,
             sChapter.url,
-            if (parsedChapterTitle.first != null || parsedChapterTitle.second != null) {
-                parsedChapterTitle.third
-            } else {
-                sChapter.name
-            },
+            //if (parsedChapterTitle.first != null || parsedChapterTitle.second != null) {
+            //    parsedChapterTitle.third
+            //} else {
+                sChapter.name,
+            //},
             null,
             sChapter
         )
@@ -460,7 +534,24 @@ class VideoServerPassthrough(val videoServer: VideoServer) : VideoExtractor() {
         }
     }
 
-    private fun TrackToSubtitle(track: Track, type: SubtitleType = SubtitleType.VTT): Subtitle {
-        return Subtitle(track.lang, track.url, type)
+    private fun TrackToSubtitle(track: Track): Subtitle {
+        //use Dispatchers.IO to make a HTTP request to determine the subtitle type
+        var type: SubtitleType? = null
+        runBlocking {
+            type = findSubtitleType(track.url)
+        }
+        return Subtitle(track.lang, track.url, type?: SubtitleType.SRT)
+    }
+
+    private fun findSubtitleType(url: String): SubtitleType? {
+        // First, try to determine the type based on the URL file extension
+        var type: SubtitleType? = when {
+            url.endsWith(".vtt", true) -> SubtitleType.VTT
+            url.endsWith(".ass", true) -> SubtitleType.ASS
+            url.endsWith(".srt", true) -> SubtitleType.SRT
+            else -> SubtitleType.UNKNOWN
+        }
+
+        return type
     }
 }

app/src/main/java/ani/dantotsu/parsers/BaseParser.kt

@@ -7,6 +7,8 @@ import eu.kanade.tachiyomi.source.model.SManga
 import java.io.Serializable
 import java.net.URLDecoder
 import java.net.URLEncoder
+import me.xdrop.fuzzywuzzy.FuzzySearch
+
 
 abstract class BaseParser {
 
@@ -55,21 +57,41 @@ abstract class BaseParser {
             setUserText("Searching : ${mediaObj.mainName()}")
             val results = search(mediaObj.mainName())
             val sortedResults = if (results.isNotEmpty()) {
-                StringMatcher.closestShowMovedToTop(mediaObj.mainName(), results)
+                results.sortedByDescending { FuzzySearch.ratio(it.name.lowercase(), mediaObj.mainName().lowercase()) }
             } else {
                 emptyList()
             }
             response = sortedResults.firstOrNull()
 
-            if (response == null) {
+            if (response == null || FuzzySearch.ratio(response.name.lowercase(), mediaObj.mainName().lowercase()) < 100) {
                 setUserText("Searching : ${mediaObj.nameRomaji}")
                 val romajiResults = search(mediaObj.nameRomaji)
                 val sortedRomajiResults = if (romajiResults.isNotEmpty()) {
-                    StringMatcher.closestShowMovedToTop(mediaObj.nameRomaji, romajiResults)
+                    romajiResults.sortedByDescending { FuzzySearch.ratio(it.name.lowercase(), mediaObj.nameRomaji.lowercase()) }
                 } else {
                     emptyList()
                 }
-                response = sortedRomajiResults.firstOrNull()
+                val closestRomaji = sortedRomajiResults.firstOrNull()
+                logger("Closest match from RomajiResults: ${closestRomaji?.name ?: "None"}")
+
+                response = if (response == null) {
+                    logger("No exact match found in results. Using closest match from RomajiResults.")
+                    closestRomaji
+                } else {
+                    val romajiRatio = FuzzySearch.ratio(closestRomaji?.name?.lowercase() ?: "", mediaObj.nameRomaji.lowercase())
+                    val mainNameRatio = FuzzySearch.ratio(response.name.lowercase(), mediaObj.mainName().lowercase())
+                    logger("Fuzzy ratio for closest match in results: $mainNameRatio for ${response.name.lowercase()}")
+                    logger("Fuzzy ratio for closest match in RomajiResults: $romajiRatio for ${closestRomaji?.name?.lowercase() ?: "None"}")
+
+                    if (romajiRatio > mainNameRatio) {
+                        logger("RomajiResults has a closer match. Replacing response.")
+                        closestRomaji
+                    } else {
+                        logger("Results has a closer or equal match. Keeping existing response.")
+                        response
+                    }
+                }
+
             }
             saveShowResponse(mediaObj.id, response)
         }

app/src/main/java/ani/dantotsu/parsers/BaseSources.kt

@@ -11,9 +11,11 @@ import eu.kanade.tachiyomi.animesource.model.SAnime
 abstract class WatchSources : BaseSources() {
 
     override operator fun get(i: Int): AnimeParser {
-        return (list.getOrNull(i)?:list[0]).get.value as AnimeParser
+        return (list.getOrNull(i) ?: list.firstOrNull())?.get?.value as? AnimeParser
+            ?: EmptyAnimeParser()
     }
 
+
     suspend fun loadEpisodesFromMedia(i: Int, media: Media): MutableMap<String, Episode> {
         return tryWithSuspend(true) {
             val res = get(i).autoSearch(media) ?: return@tryWithSuspend mutableMapOf()
@@ -40,7 +42,8 @@ abstract class WatchSources : BaseSources() {
 abstract class MangaReadSources : BaseSources() {
 
     override operator fun get(i: Int): MangaParser {
-        return (list.getOrNull(i)?:list[0]).get.value as MangaParser
+        return (list.getOrNull(i)?:list.firstOrNull())?.get?.value as? MangaParser
+            ?: EmptyMangaParser()
     }
 
     suspend fun loadChaptersFromMedia(i: Int, media: Media): MutableMap<String, MangaChapter> {

app/src/main/java/ani/dantotsu/parsers/MangaParser.kt

@@ -3,6 +3,7 @@ package ani.dantotsu.parsers
 import android.graphics.Bitmap
 import ani.dantotsu.FileUrl
 import ani.dantotsu.media.Media
+import ani.dantotsu.media.manga.MangaNameAdapter
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
@@ -23,9 +24,11 @@ abstract class MangaParser : BaseParser() {
      * Returns null, if no latest chapter is found.
      * **/
     open suspend fun getLatestChapter(mangaLink: String, extra: Map<String, String>?, sManga: SManga, latest: Float): MangaChapter? {
-        return loadChapters(mangaLink, extra, sManga)
-            .maxByOrNull { it.number.toFloatOrNull() ?: 0f }
-            ?.takeIf { latest < (it.number.toFloatOrNull() ?: 0.001f) }
+        val chapter =  loadChapters(mangaLink, extra, sManga)
+        val max =  chapter
+            .maxByOrNull { MangaNameAdapter.findChapterNumber(it.number) ?: 0f }
+        return max
+            ?.takeIf { latest < (MangaNameAdapter.findChapterNumber(it.number) ?: 0.001f) }
     }
 
     /**
@@ -33,26 +36,21 @@ abstract class MangaParser : BaseParser() {
      * **/
     abstract suspend fun loadImages(chapterLink: String, sChapter: SChapter): List<MangaImage>
 
-    override suspend fun autoSearch(mediaObj: Media): ShowResponse? {
-        var response = loadSavedShowResponse(mediaObj.id)
-        if (response != null) {
-            saveShowResponse(mediaObj.id, response, true)
-        } else {
-            setUserText("Searching : ${mediaObj.mangaName()}")
-            response = search(mediaObj.mangaName()).let { if (it.isNotEmpty()) it[0] else null }
-
-            if (response == null) {
-                setUserText("Searching : ${mediaObj.nameRomaji}")
-                response = search(mediaObj.nameRomaji).let { if (it.isNotEmpty()) it[0] else null }
-            }
-            saveShowResponse(mediaObj.id, response)
-        }
-        return response
-    }
 
     open fun getTransformation(): BitmapTransformation? = null
 }
 
+class EmptyMangaParser: MangaParser() {
+    override val name: String = "None"
+    override val saveName: String = "None"
+
+    override suspend fun loadChapters(mangaLink: String, extra: Map<String, String>?, sManga: SManga): List<MangaChapter> = emptyList()
+
+    override suspend fun loadImages(chapterLink: String, sChapter: SChapter): List<MangaImage> = emptyList()
+
+    override suspend fun search(query: String): List<ShowResponse> = emptyList()
+}
+
 data class MangaChapter(
     /**
      * Number of the Chapter in "String",

app/src/main/java/ani/dantotsu/parsers/MangaSources.kt

@@ -29,7 +29,9 @@ object MangaSources : MangaReadSources() {
 }
 
 object HMangaSources : MangaReadSources() {
-    val aList: List<Lazier<BaseParser>> = lazyList(
-    )
+    val aList: List<Lazier<BaseParser>> = lazyList()
+    suspend fun init(fromExtensions: StateFlow<List<MangaExtension.Installed>>) {
+         //todo
+    }
     override val list = listOf(aList,MangaSources.list).flatten()
 }

app/src/main/java/ani/dantotsu/parsers/StringMatcher.kt

@@ -1,5 +1,7 @@
 package ani.dantotsu.parsers
 
+import ani.dantotsu.logger
+
 class StringMatcher {
     companion object {
         private fun levenshteinDistance(s1: String, s2: String): Int {
@@ -52,8 +54,10 @@ class StringMatcher {
             val closestShowAndIndex = closestShow(target, shows)
             val closestIndex = closestShowAndIndex.second
             if (closestIndex == -1) {
+                logger("No closest show found for $target")
                 return shows // Return original list if no closest show found
             }
+            logger("Closest show found for $target is ${closestShowAndIndex.first.name}")
             return listOf(shows[closestIndex]) + shows.subList(0, closestIndex) + shows.subList(closestIndex + 1, shows.size)
         }
 

app/src/main/java/ani/dantotsu/parsers/VideoExtractor.kt

@@ -159,5 +159,5 @@ enum class VideoType{
 }
 
 enum class SubtitleType{
-    VTT, ASS, SRT
+    VTT, ASS, SRT, UNKNOWN
 }

app/src/main/java/ani/dantotsu/settings/AnimeExtensionsFragment.kt

@@ -2,57 +2,86 @@ package ani.dantotsu.settings
 
 import android.app.NotificationManager
 import android.content.Context
-import android.graphics.drawable.Drawable
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat.getSystemService
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import ani.dantotsu.R
 import ani.dantotsu.databinding.FragmentAnimeExtensionsBinding
-import com.bumptech.glide.Glide
+import ani.dantotsu.settings.paging.AnimeExtensionAdapter
+import ani.dantotsu.settings.paging.AnimeExtensionsViewModel
+import ani.dantotsu.settings.paging.AnimeExtensionsViewModelFactory
+import ani.dantotsu.settings.paging.OnAnimeInstallClickListener
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
 import eu.kanade.tachiyomi.extension.anime.model.AnimeExtension
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import rx.android.schedulers.AndroidSchedulers
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
-class AnimeExtensionsFragment : Fragment(), SearchQueryHandler {
+class AnimeExtensionsFragment : Fragment(),
+    SearchQueryHandler, OnAnimeInstallClickListener {
     private var _binding: FragmentAnimeExtensionsBinding? = null
     private val binding get() = _binding!!
 
-    private lateinit var extensionsRecyclerView: RecyclerView
-    private lateinit var allextenstionsRecyclerView: RecyclerView
-    private val animeExtensionManager: AnimeExtensionManager = Injekt.get<AnimeExtensionManager>()
-    private val extensionsAdapter = AnimeExtensionsAdapter { pkgName ->
-        animeExtensionManager.uninstallExtension(pkgName)
+    private val viewModel: AnimeExtensionsViewModel by viewModels {
+        AnimeExtensionsViewModelFactory(animeExtensionManager)
     }
-    private val allExtensionsAdapter = AllAnimeExtensionsAdapter(lifecycleScope) { pkgName ->
 
+    private val adapter by lazy {
+        AnimeExtensionAdapter(this)
+    }
+
+    private val animeExtensionManager: AnimeExtensionManager = Injekt.get()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentAnimeExtensionsBinding.inflate(inflater, container, false)
+
+        binding.allAnimeExtensionsRecyclerView.isNestedScrollingEnabled = false
+        binding.allAnimeExtensionsRecyclerView.adapter = adapter
+        binding.allAnimeExtensionsRecyclerView.layoutManager = LinearLayoutManager(context)
+        (binding.allAnimeExtensionsRecyclerView.layoutManager as LinearLayoutManager).isItemPrefetchEnabled = true
+
+        lifecycleScope.launch {
+            viewModel.pagerFlow.collectLatest {
+                adapter.submitData(it)
+            }
+        }
+
+        viewModel.invalidatePager() // Force a refresh of the pager
+
+        return binding.root
+    }
+
+    override fun updateContentBasedOnQuery(query: String?) {
+        viewModel.setSearchQuery(query ?: "")
+    }
+
+    override fun onInstallClick(pkg: AnimeExtension.Available) {
+        val context = requireContext()
+        if (isAdded) {
             val notificationManager =
                 requireContext().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
             // Start the installation process
-            animeExtensionManager.installExtension(pkgName)
+            animeExtensionManager.installExtension(pkg)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                     { installStep ->
                         val builder = NotificationCompat.Builder(
-                            requireContext(),
+                            context,
                             Notifications.CHANNEL_DOWNLOADER_PROGRESS
                         )
                             .setSmallIcon(R.drawable.ic_round_sync_24)
@@ -62,73 +91,31 @@ class AnimeExtensionsFragment : Fragment(), SearchQueryHandler {
                         notificationManager.notify(1, builder.build())
                     },
                     { error ->
+                        FirebaseCrashlytics.getInstance().recordException(error)
                         val builder = NotificationCompat.Builder(
-                            requireContext(),
+                            context,
                             Notifications.CHANNEL_DOWNLOADER_ERROR
                         )
                             .setSmallIcon(R.drawable.ic_round_info_24)
-                            .setContentTitle("Installation failed")
+                            .setContentTitle("Installation failed: ${error.message}")
                             .setContentText("Error: ${error.message}")
                             .setPriority(NotificationCompat.PRIORITY_HIGH)
                         notificationManager.notify(1, builder.build())
                     },
                     {
                         val builder = NotificationCompat.Builder(
-                            requireContext(),
+                            context,
                             Notifications.CHANNEL_DOWNLOADER_PROGRESS
                         )
-                            .setSmallIcon(androidx.media3.ui.R.drawable.exo_ic_check)
+                            .setSmallIcon(R.drawable.ic_round_download_24)
                             .setContentTitle("Installation complete")
                             .setContentText("The extension has been successfully installed.")
                             .setPriority(NotificationCompat.PRIORITY_LOW)
                         notificationManager.notify(1, builder.build())
+                        viewModel.invalidatePager()
                     }
                 )
         }
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        _binding = FragmentAnimeExtensionsBinding.inflate(inflater, container, false)
-
-        extensionsRecyclerView = binding.animeExtensionsRecyclerView
-        extensionsRecyclerView.layoutManager = LinearLayoutManager( requireContext())
-        extensionsRecyclerView.adapter = extensionsAdapter
-
-        allextenstionsRecyclerView = binding.allAnimeExtensionsRecyclerView
-        allextenstionsRecyclerView.layoutManager = LinearLayoutManager( requireContext())
-        allextenstionsRecyclerView.adapter = allExtensionsAdapter
-
-        lifecycleScope.launch {
-            animeExtensionManager.installedExtensionsFlow.collect { extensions ->
-                extensionsAdapter.updateData(extensions)
-            }
-        }
-        lifecycleScope.launch {
-            combine(
-                animeExtensionManager.availableExtensionsFlow,
-                animeExtensionManager.installedExtensionsFlow
-            ) { availableExtensions, installedExtensions ->
-                // Pair of available and installed extensions
-                Pair(availableExtensions, installedExtensions)
-            }.collect { pair ->
-                val (availableExtensions, installedExtensions) = pair
-                allExtensionsAdapter.updateData(availableExtensions, installedExtensions)
-            }
-        }
-        val extensionsRecyclerView: RecyclerView = binding.animeExtensionsRecyclerView
-
-        return binding.root
-    }
-
-    override fun updateContentBasedOnQuery(query: String?) {
-        if (query.isNullOrEmpty()) {
-            allExtensionsAdapter.filter("")  // Reset the filter
-            allextenstionsRecyclerView.visibility = View.VISIBLE
-            extensionsRecyclerView.visibility = View.VISIBLE
-            println("asdf: ${allExtensionsAdapter.getItemCount()}")
-        } else {
-            allExtensionsAdapter.filter(query)
-            allextenstionsRecyclerView.visibility = View.VISIBLE
-            extensionsRecyclerView.visibility = View.GONE
-        }
     }
 
     override fun onDestroyView() {
@@ -136,101 +123,4 @@ class AnimeExtensionsFragment : Fragment(), SearchQueryHandler {
     }
 
 
-    private class AnimeExtensionsAdapter(private val onUninstallClicked: (String) -> Unit) : RecyclerView.Adapter<AnimeExtensionsAdapter.ViewHolder>() {
-
-        private var extensions: List<AnimeExtension.Installed> = emptyList()
-
-        fun updateData(newExtensions: List<AnimeExtension.Installed>) {
-            extensions = newExtensions
-            notifyDataSetChanged()
-        }
-
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-            val view = LayoutInflater.from(parent.context)
-                .inflate(R.layout.item_extension, parent, false)
-            return ViewHolder(view)
-        }
-
-        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-            val extension = extensions[position]
-            holder.extensionNameTextView.text = extension.name
-            holder.extensionIconImageView.setImageDrawable(extension.icon)
-            holder.closeTextView.text = "Uninstall"
-            holder.closeTextView.setOnClickListener {
-                onUninstallClicked(extension.pkgName)
-            }
-        }
-
-        override fun getItemCount(): Int = extensions.size
-
-        inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-            val extensionNameTextView: TextView = view.findViewById(R.id.extensionNameTextView)
-            val extensionIconImageView: ImageView = view.findViewById(R.id.extensionIconImageView)
-            val closeTextView: TextView = view.findViewById(R.id.closeTextView)
-        }
-    }
-
-    private class AllAnimeExtensionsAdapter(private val coroutineScope: CoroutineScope,
-                                       private val onButtonClicked: (AnimeExtension.Available) -> Unit) : RecyclerView.Adapter<AllAnimeExtensionsAdapter.ViewHolder>() {
-        private var extensions: List<AnimeExtension.Available> = emptyList()
-
-        fun updateData(newExtensions: List<AnimeExtension.Available>, installedExtensions: List<AnimeExtension.Installed> = emptyList()) {
-            val installedPkgNames = installedExtensions.map { it.pkgName }.toSet()
-            extensions = newExtensions.filter { it.pkgName !in installedPkgNames }
-            filteredExtensions = extensions
-            notifyDataSetChanged()
-        }
-
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AllAnimeExtensionsAdapter.ViewHolder {
-            val view = LayoutInflater.from(parent.context)
-                .inflate(R.layout.item_extension_all, parent, false)
-            return ViewHolder(view)
-        }
-
-        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-            val extension = filteredExtensions[position]
-            holder.extensionNameTextView.text = extension.name
-            coroutineScope.launch {
-                val drawable = urlToDrawable(holder.itemView.context, extension.iconUrl)
-                holder.extensionIconImageView.setImageDrawable(drawable)
-            }
-            holder.closeTextView.text = "Install"
-            holder.closeTextView.setOnClickListener {
-                onButtonClicked(extension)
-            }
-        }
-
-        override fun getItemCount(): Int = filteredExtensions.size
-
-        private var filteredExtensions: List<AnimeExtension.Available> = emptyList()
-
-        fun filter(query: String) {
-            filteredExtensions = if (query.isEmpty()) {
-                extensions
-            } else {
-                extensions.filter { it.name.contains(query, ignoreCase = true) }
-            }
-            notifyDataSetChanged()
-        }
-
-        inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-            val extensionNameTextView: TextView = view.findViewById(R.id.extensionNameTextView)
-            val extensionIconImageView: ImageView = view.findViewById(R.id.extensionIconImageView)
-            val closeTextView: TextView = view.findViewById(R.id.closeTextView)
-        }
-
-        suspend fun urlToDrawable(context: Context, url: String): Drawable? {
-            return withContext(Dispatchers.IO) {
-                try {
-                    return@withContext Glide.with(context)
-                        .load(url)
-                        .submit()
-                        .get()
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    return@withContext null
-                }
-            }
-        }
-    }
 }

app/src/main/java/ani/dantotsu/settings/DevelopersDialogFragment.kt

@@ -13,26 +13,8 @@ class DevelopersDialogFragment : BottomSheetDialogFragment() {
     private val binding get() = _binding!!
 
     private val developers = arrayOf(
-        Developer("vorobyovgabriel","https://avatars.githubusercontent.com/u/99561687?s=120&v=4","Owner","https://github.com/vorobyovgabriel"),
-        Developer("brahmkshtriya","https://avatars.githubusercontent.com/u/69040506?s=120&v=4","Maintainer","https://github.com/brahmkshatriya"),
-        Developer("jeelpatel231","https://avatars.githubusercontent.com/u/33726155?s=120&v=4","Contributor","https://github.com/jeelpatel231"),
-        Developer("blatzar","https://avatars.githubusercontent.com/u/46196380?s=120&v=4","Contributor","https://github.com/Blatzar"),
-        Developer("bilibox","https://avatars.githubusercontent.com/u/1800580?s=120&v=4","Contributor","https://github.com/Bilibox"),
-        Developer("sutslec","https://avatars.githubusercontent.com/u/27722281?s=120&v=4","Contributor","https://github.com/Sutslec"),
-        Developer("4jx","https://avatars.githubusercontent.com/u/79868816?s=120&v=4","Contributor","https://github.com/4JX"),
-        Developer("xtrm-en","https://avatars.githubusercontent.com/u/26600206?s=120&v=4","Contributor","https://github.com/xtrm-en"),
-        Developer("scrazzz","https://avatars.githubusercontent.com/u/70033559?s=120&v=4","Contributor","https://github.com/scrazzz"),
-        Developer("defcoding","https://avatars.githubusercontent.com/u/39608887?s=120&v=4","Contributor","https://github.com/defcoding"),
-        Developer("adolar0042","https://avatars.githubusercontent.com/u/39769465?s=120&v=4","Contributor","https://github.com/adolar0042"),
-        Developer("diegopyl1209","https://avatars.githubusercontent.com/u/80992641?s=120&v=4","Contributor","https://github.com/diegopyl1209"),
-        Developer("sreekrishna2001","https://avatars.githubusercontent.com/u/67505103?s=120&v=4","Contributor","https://github.com/Sreekrishna2001"),
-        Developer("riimuru","https://avatars.githubusercontent.com/u/57333995?s=120&v=4","Contributor","https://github.com/riimuru"),
-        Developer("vu nguyen","https://avatars.githubusercontent.com/u/68330291?s=120&v=4","Contributor","https://github.com/hoangvu12"),
-        Developer("animejeff","https://avatars.githubusercontent.com/u/101831300?s=120&v=4","Contributor","https://github.com/AnimeJeff"),
-        Developer("antonydp","https://avatars.githubusercontent.com/u/38143733?s=120&v=4","Contributor","https://github.com/antonydp"),
-        Developer("tobybridle","https://avatars.githubusercontent.com/u/52335751?s=120&v=4","Contributor","https://github.com/TobyBridle"),
-        Developer("enimax","https://avatars.githubusercontent.com/u/107899019?s=120&v=4","Contributor","https://github.com/enimax-anime"),
-        Developer("vipulog","https://avatars.githubusercontent.com/u/90324465?s=120&v=4","Contributor","https://github.com/VipulOG")
+        Developer("rebelonion","https://avatars.githubusercontent.com/u/87634197?v=4","Owner and Maintainer","https://github.com/rebelonion"),
+        Developer("Wai What", "https://cdn.discordapp.com/avatars/928202695611908126/aeac4c867acbb8c3783356497055a426.webp?size=80", "Icon Designer", ""),
     )
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {

app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt

@@ -1,68 +1,38 @@
 package ani.dantotsu.settings
 
 import android.annotation.SuppressLint
-import android.app.NotificationManager
-import android.content.Context
-import android.content.pm.PackageManager
-import android.graphics.drawable.Drawable
 import android.os.Build.*
 import android.os.Build.VERSION.*
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
+import android.text.Editable
+import android.text.TextWatcher
 import android.view.ViewGroup
-import android.widget.ImageView
+import android.widget.AutoCompleteTextView
 import android.widget.LinearLayout
 import android.widget.SearchView
-import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.app.ActivityCompat
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import ani.dantotsu.*
-import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
-import eu.kanade.tachiyomi.extension.anime.model.AnimeExtension
 import ani.dantotsu.databinding.ActivityExtensionsBinding
-import ani.dantotsu.home.AnimeFragment
-import ani.dantotsu.home.MangaFragment
-import com.bumptech.glide.Glide
+import ani.dantotsu.themes.ThemeManager
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
-import eu.kanade.tachiyomi.data.notification.Notifications
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import rx.android.schedulers.AndroidSchedulers
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
-import javax.inject.Inject
 
-
-class ExtensionsActivity : AppCompatActivity() {
+class ExtensionsActivity : AppCompatActivity()  {
     private val restartMainActivity = object : OnBackPressedCallback(false) {
         override fun handleOnBackPressed() = startMainActivity(this@ExtensionsActivity)
     }
     lateinit var binding: ActivityExtensionsBinding
 
 
-
-
-
-
     @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityExtensionsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
@@ -71,12 +41,14 @@ class ExtensionsActivity : AppCompatActivity() {
         val viewPager = findViewById<ViewPager2>(R.id.viewPager)
 
         viewPager.adapter = object : FragmentStateAdapter(this) {
-            override fun getItemCount(): Int = 2
+            override fun getItemCount(): Int = 4
 
             override fun createFragment(position: Int): Fragment {
                 return when (position) {
-                    0 -> AnimeExtensionsFragment()
-                    1 -> MangaExtensionsFragment()
+                    0 -> InstalledAnimeExtensionsFragment()
+                    1 -> AnimeExtensionsFragment()
+                    2 -> InstalledMangaExtensionsFragment()
+                    3 -> MangaExtensionsFragment()
                     else -> AnimeExtensionsFragment()
                 }
             }
@@ -84,28 +56,29 @@ class ExtensionsActivity : AppCompatActivity() {
 
         TabLayoutMediator(tabLayout, viewPager) { tab, position ->
             tab.text = when (position) {
-                0 -> "Anime" // Your tab title
-                1 -> "Manga" // Your tab title
+                0 -> "Installed Anime"
+                1 -> "Available Anime"
+                2 -> "Installed Manga"
+                3 -> "Available Manga"
                 else -> null
             }
         }.attach()
 
 
-        val searchView: SearchView = findViewById(R.id.searchView)
+        val searchView: AutoCompleteTextView = findViewById(R.id.searchViewText)
 
-        val extensionsHeader: LinearLayout = findViewById(R.id.extensionsHeader)
-        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-            override fun onQueryTextSubmit(query: String?): Boolean {
-                return false
+        searchView.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
             }
 
-            override fun onQueryTextChange(newText: String?): Boolean {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
                 val currentFragment = supportFragmentManager.findFragmentByTag("f${viewPager.currentItem}")
                 if (currentFragment is SearchQueryHandler) {
-                    currentFragment.updateContentBasedOnQuery(newText)
+                    currentFragment.updateContentBasedOnQuery(s?.toString()?.trim())
                 }
-
-                return true
             }
         })
 
@@ -132,4 +105,4 @@ class ExtensionsActivity : AppCompatActivity() {
 
 interface SearchQueryHandler {
     fun updateContentBasedOnQuery(query: String?)
-}
+}

app/src/main/java/ani/dantotsu/settings/FAQActivity.kt

@@ -7,33 +7,105 @@ import ani.dantotsu.R
 import ani.dantotsu.currContext
 import ani.dantotsu.databinding.ActivityFaqBinding
 import ani.dantotsu.initActivity
+import ani.dantotsu.themes.ThemeManager
 
 class FAQActivity : AppCompatActivity() {
     private lateinit var binding: ActivityFaqBinding
 
-    private val faqs = listOf(
+    private val faqs by lazy {
+        listOf(
 
-        Triple(R.drawable.ic_round_help_24, currContext()!!.getString(R.string.question_1), currContext()!!.getString(R.string.answer_1)),
-        Triple(R.drawable.ic_round_auto_awesome_24, currContext()!!.getString(R.string.question_2), currContext()!!.getString(R.string.answer_2)),
-        Triple(R.drawable.ic_round_auto_awesome_24, currContext()!!.getString(R.string.question_17), currContext()!!.getString(R.string.answer_17)),
-        Triple(R.drawable.ic_round_download_24, currContext()!!.getString(R.string.question_3), currContext()!!.getString(R.string.answer_3)),
-        Triple(R.drawable.ic_round_help_24, currContext()!!.getString(R.string.question_16), currContext()!!.getString(R.string.answer_16)),
-        Triple(R.drawable.ic_round_dns_24, currContext()!!.getString(R.string.question_4), currContext()!!.getString(R.string.answer_4)),
-        Triple(R.drawable.ic_baseline_screen_lock_portrait_24, currContext()!!.getString(R.string.question_5), currContext()!!.getString(R.string.answer_5)),
-        Triple(R.drawable.ic_anilist, currContext()!!.getString(R.string.question_6), currContext()!!.getString(R.string.answer_6)),
-        Triple(R.drawable.ic_round_movie_filter_24, currContext()!!.getString(R.string.question_7), currContext()!!.getString(R.string.answer_7)),
-        Triple(R.drawable.ic_round_menu_book_24, currContext()!!.getString(R.string.question_8), currContext()!!.getString(R.string.answer_8)),
-        Triple(R.drawable.ic_round_lock_open_24, currContext()!!.getString(R.string.question_9), currContext()!!.getString(R.string.answer_9)),
-        Triple(R.drawable.ic_round_smart_button_24, currContext()!!.getString(R.string.question_10), currContext()!!.getString(R.string.answer_10)),
-        Triple(R.drawable.ic_round_smart_button_24, currContext()!!.getString(R.string.question_11), currContext()!!.getString(R.string.answer_11)),
-        Triple(R.drawable.ic_round_info_24, currContext()!!.getString(R.string.question_12), currContext()!!.getString(R.string.answer_12)),
-        Triple(R.drawable.ic_round_help_24, currContext()!!.getString(R.string.question_13), currContext()!!.getString(R.string.answer_13)),
-        Triple(R.drawable.ic_round_art_track_24, currContext()!!.getString(R.string.question_14), currContext()!!.getString(R.string.answer_14)),
-        Triple(R.drawable.ic_round_video_settings_24, currContext()!!.getString(R.string.question_15), currContext()!!.getString(R.string.answer_15))
+            Triple(
+                R.drawable.ic_round_help_24,
+                currContext()!!.getString(R.string.question_1),
+                currContext()!!.getString(R.string.answer_1)
+            ),
+            Triple(
+                R.drawable.ic_round_auto_awesome_24,
+                currContext()!!.getString(R.string.question_2),
+                currContext()!!.getString(R.string.answer_2)
+            ),
+            Triple(
+                R.drawable.ic_round_auto_awesome_24,
+                currContext()!!.getString(R.string.question_17),
+                currContext()!!.getString(R.string.answer_17)
+            ),
+            Triple(
+                R.drawable.ic_round_download_24,
+                currContext()!!.getString(R.string.question_3),
+                currContext()!!.getString(R.string.answer_3)
+            ),
+            Triple(
+                R.drawable.ic_round_help_24,
+                currContext()!!.getString(R.string.question_16),
+                currContext()!!.getString(R.string.answer_16)
+            ),
+            Triple(
+                R.drawable.ic_round_dns_24,
+                currContext()!!.getString(R.string.question_4),
+                currContext()!!.getString(R.string.answer_4)
+            ),
+            Triple(
+                R.drawable.ic_baseline_screen_lock_portrait_24,
+                currContext()!!.getString(R.string.question_5),
+                currContext()!!.getString(R.string.answer_5)
+            ),
+            Triple(
+                R.drawable.ic_anilist,
+                currContext()!!.getString(R.string.question_6),
+                currContext()!!.getString(R.string.answer_6)
+            ),
+            Triple(
+                R.drawable.ic_round_movie_filter_24,
+                currContext()!!.getString(R.string.question_7),
+                currContext()!!.getString(R.string.answer_7)
+            ),
+            Triple(
+                R.drawable.ic_round_menu_book_24,
+                currContext()!!.getString(R.string.question_8),
+                currContext()!!.getString(R.string.answer_8)
+            ),
+            Triple(
+                R.drawable.ic_round_lock_open_24,
+                currContext()!!.getString(R.string.question_9),
+                currContext()!!.getString(R.string.answer_9)
+            ),
+            Triple(
+                R.drawable.ic_round_smart_button_24,
+                currContext()!!.getString(R.string.question_10),
+                currContext()!!.getString(R.string.answer_10)
+            ),
+            Triple(
+                R.drawable.ic_round_smart_button_24,
+                currContext()!!.getString(R.string.question_11),
+                currContext()!!.getString(R.string.answer_11)
+            ),
+            Triple(
+                R.drawable.ic_round_info_24,
+                currContext()!!.getString(R.string.question_12),
+                currContext()!!.getString(R.string.answer_12)
+            ),
+            Triple(
+                R.drawable.ic_round_help_24,
+                currContext()!!.getString(R.string.question_13),
+                currContext()!!.getString(R.string.answer_13)
+            ),
+            Triple(
+                R.drawable.ic_round_art_track_24,
+                currContext()!!.getString(R.string.question_14),
+                currContext()!!.getString(R.string.answer_14)
+            ),
+            Triple(
+                R.drawable.ic_round_video_settings_24,
+                currContext()!!.getString(R.string.question_15),
+                currContext()!!.getString(R.string.answer_15)
+            )
         )
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityFaqBinding.inflate(layoutInflater)
         setContentView(binding.root)
 

app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt

@@ -0,0 +1,263 @@
+package ani.dantotsu.settings
+
+import android.app.AlertDialog
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.core.app.NotificationCompat
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.widget.ViewPager2
+import ani.dantotsu.R
+import ani.dantotsu.databinding.FragmentAnimeExtensionsBinding
+import ani.dantotsu.loadData
+import ani.dantotsu.settings.extensionprefs.AnimeSourcePreferencesFragment
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.textfield.TextInputLayout
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.data.notification.Notifications
+import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
+import eu.kanade.tachiyomi.extension.anime.model.AnimeExtension
+import kotlinx.coroutines.launch
+import rx.android.schedulers.AndroidSchedulers
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class InstalledAnimeExtensionsFragment : Fragment() {
+
+
+    private var _binding: FragmentAnimeExtensionsBinding? = null
+    private val binding get() = _binding!!
+    private lateinit var extensionsRecyclerView: RecyclerView
+    val skipIcons = loadData("skip_extension_icons") ?: false
+    private val animeExtensionManager: AnimeExtensionManager = Injekt.get()
+    private val extensionsAdapter = AnimeExtensionsAdapter({ pkg ->
+        val allSettings = pkg.sources.filterIsInstance<ConfigurableAnimeSource>()
+        if (allSettings.isNotEmpty()) {
+            var selectedSetting = allSettings[0]
+            if (allSettings.size > 1) {
+                val names = allSettings.map { it.lang }.toTypedArray()
+                var selectedIndex = 0
+                AlertDialog.Builder(requireContext())
+                    .setTitle("Select a Source")
+                    .setSingleChoiceItems(names, selectedIndex) { _, which ->
+                        selectedIndex = which
+                    }
+                    .setPositiveButton("OK") { dialog, _ ->
+                        selectedSetting = allSettings[selectedIndex]
+                        dialog.dismiss()
+
+                        // Move the fragment transaction here
+                        val fragment = AnimeSourcePreferencesFragment().getInstance(selectedSetting.id){
+                            val activity = requireActivity() as ExtensionsActivity
+                            activity.findViewById<ViewPager2>(R.id.viewPager).visibility = View.VISIBLE
+                            activity.findViewById<TabLayout>(R.id.tabLayout).visibility = View.VISIBLE
+                            activity.findViewById<TextInputLayout>(R.id.searchView).visibility = View.VISIBLE
+                            activity.findViewById<FrameLayout>(R.id.fragmentExtensionsContainer).visibility =
+                                View.GONE
+                        }
+                        parentFragmentManager.beginTransaction()
+                            .setCustomAnimations(R.anim.slide_up, R.anim.slide_down)
+                            .replace(R.id.fragmentExtensionsContainer, fragment)
+                            .addToBackStack(null)
+                            .commit()
+                    }
+                    .setNegativeButton("Cancel") { dialog, _ ->
+                        dialog.cancel()
+                        return@setNegativeButton
+                    }
+                    .show()
+            } else {
+                // If there's only one setting, proceed with the fragment transaction
+                val fragment = AnimeSourcePreferencesFragment().getInstance(selectedSetting.id){
+                    val activity = requireActivity() as ExtensionsActivity
+                    activity.findViewById<ViewPager2>(R.id.viewPager).visibility = View.VISIBLE
+                    activity.findViewById<TabLayout>(R.id.tabLayout).visibility = View.VISIBLE
+                    activity.findViewById<TextInputLayout>(R.id.searchView).visibility = View.VISIBLE
+                    activity.findViewById<FrameLayout>(R.id.fragmentExtensionsContainer).visibility =
+                        View.GONE
+                }
+                parentFragmentManager.beginTransaction()
+                    .setCustomAnimations(R.anim.slide_up, R.anim.slide_down)
+                    .replace(R.id.fragmentExtensionsContainer, fragment)
+                    .addToBackStack(null)
+                    .commit()
+            }
+
+            // Hide ViewPager2 and TabLayout
+            val activity = requireActivity() as ExtensionsActivity
+            activity.findViewById<ViewPager2>(R.id.viewPager).visibility = View.GONE
+            activity.findViewById<TabLayout>(R.id.tabLayout).visibility = View.GONE
+            activity.findViewById<TextInputLayout>(R.id.searchView).visibility = View.GONE
+            activity.findViewById<FrameLayout>(R.id.fragmentExtensionsContainer).visibility = View.VISIBLE
+        } else {
+            Toast.makeText(requireContext(), "Source is not configurable", Toast.LENGTH_SHORT)
+                .show()
+        }
+    },
+        { pkg ->
+            if (isAdded) {  // Check if the fragment is currently added to its activity
+                val context = requireContext()  // Store context in a variable
+                val notificationManager =
+                    context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager  // Initialize NotificationManager once
+
+                if (pkg.hasUpdate) {
+                    animeExtensionManager.updateExtension(pkg)
+                        .observeOn(AndroidSchedulers.mainThread())  // Observe on main thread
+                        .subscribe(
+                            { installStep ->
+                                val builder = NotificationCompat.Builder(
+                                    context,
+                                    Notifications.CHANNEL_DOWNLOADER_PROGRESS
+                                )
+                                    .setSmallIcon(R.drawable.ic_round_sync_24)
+                                    .setContentTitle("Updating extension")
+                                    .setContentText("Step: $installStep")
+                                    .setPriority(NotificationCompat.PRIORITY_LOW)
+                                notificationManager.notify(1, builder.build())
+                            },
+                            { error ->
+                                FirebaseCrashlytics.getInstance().recordException(error)
+                                Log.e("AnimeExtensionsAdapter", "Error: ", error)  // Log the error
+                                val builder = NotificationCompat.Builder(
+                                    context,
+                                    Notifications.CHANNEL_DOWNLOADER_ERROR
+                                )
+                                    .setSmallIcon(R.drawable.ic_round_info_24)
+                                    .setContentTitle("Update failed: ${error.message}")
+                                    .setContentText("Error: ${error.message}")
+                                    .setPriority(NotificationCompat.PRIORITY_HIGH)
+                                notificationManager.notify(1, builder.build())
+                            },
+                            {
+                                val builder = NotificationCompat.Builder(
+                                    context,
+                                    Notifications.CHANNEL_DOWNLOADER_PROGRESS
+                                )
+                                    .setSmallIcon(androidx.media3.ui.R.drawable.exo_ic_check)
+                                    .setContentTitle("Update complete")
+                                    .setContentText("The extension has been successfully updated.")
+                                    .setPriority(NotificationCompat.PRIORITY_LOW)
+                                notificationManager.notify(1, builder.build())
+                            }
+                        )
+                } else {
+                    animeExtensionManager.uninstallExtension(pkg.pkgName)
+                }
+            }
+        }, skipIcons
+    )
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentAnimeExtensionsBinding.inflate(inflater, container, false)
+
+        extensionsRecyclerView = binding.allAnimeExtensionsRecyclerView
+        extensionsRecyclerView.layoutManager = LinearLayoutManager(requireContext())
+        extensionsRecyclerView.adapter = extensionsAdapter
+
+
+        lifecycleScope.launch {
+            animeExtensionManager.installedExtensionsFlow.collect { extensions ->
+                extensionsAdapter.updateData(extensions)
+            }
+        }
+        val extensionsRecyclerView: RecyclerView = binding.allAnimeExtensionsRecyclerView
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView();_binding = null
+    }
+
+
+    private class AnimeExtensionsAdapter(
+        private val onSettingsClicked: (AnimeExtension.Installed) -> Unit,
+        private val onUninstallClicked: (AnimeExtension.Installed) -> Unit,
+        skipIcons: Boolean
+    ) : ListAdapter<AnimeExtension.Installed, AnimeExtensionsAdapter.ViewHolder>(
+        DIFF_CALLBACK_INSTALLED
+    ) {
+
+        val skipIcons = skipIcons
+
+        fun updateData(newExtensions: List<AnimeExtension.Installed>) {
+            submitList(newExtensions)  // Use submitList instead of manual list handling
+        }
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+            val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.item_extension, parent, false)
+            return ViewHolder(view)
+        }
+
+        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+            val extension = getItem(position)  // Use getItem() from ListAdapter
+            holder.extensionNameTextView.text = extension.name
+            if (!skipIcons) {
+                holder.extensionIconImageView.setImageDrawable(extension.icon)
+            }
+            if (extension.hasUpdate) {
+                holder.closeTextView.text = "Update"
+                holder.closeTextView.setTextColor(
+                    ContextCompat.getColor(
+                        holder.itemView.context,
+                        R.color.warning
+                    )
+                )
+            } else {
+                holder.closeTextView.text = "Uninstall"
+            }
+            holder.closeTextView.setOnClickListener {
+                onUninstallClicked(extension)
+            }
+            holder.settingsImageView.setOnClickListener {
+                onSettingsClicked(extension)
+            }
+        }
+
+        inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+            val extensionNameTextView: TextView = view.findViewById(R.id.extensionNameTextView)
+            val settingsImageView: ImageView = view.findViewById(R.id.settingsImageView)
+            val extensionIconImageView: ImageView = view.findViewById(R.id.extensionIconImageView)
+            val closeTextView: TextView = view.findViewById(R.id.closeTextView)
+        }
+
+        companion object {
+            val DIFF_CALLBACK_INSTALLED =
+                object : DiffUtil.ItemCallback<AnimeExtension.Installed>() {
+                    override fun areItemsTheSame(
+                        oldItem: AnimeExtension.Installed,
+                        newItem: AnimeExtension.Installed
+                    ): Boolean {
+                        return oldItem.pkgName == newItem.pkgName
+                    }
+
+                    override fun areContentsTheSame(
+                        oldItem: AnimeExtension.Installed,
+                        newItem: AnimeExtension.Installed
+                    ): Boolean {
+                        return oldItem == newItem
+                    }
+                }
+        }
+    }
+
+}

app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt

@@ -0,0 +1,258 @@
+package ani.dantotsu.settings
+
+
+import android.app.AlertDialog
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.core.app.NotificationCompat
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.widget.ViewPager2
+import ani.dantotsu.R
+import ani.dantotsu.databinding.FragmentMangaExtensionsBinding
+import ani.dantotsu.loadData
+import ani.dantotsu.settings.extensionprefs.MangaSourcePreferencesFragment
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.textfield.TextInputLayout
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import eu.kanade.tachiyomi.data.notification.Notifications
+import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
+import eu.kanade.tachiyomi.extension.manga.model.MangaExtension
+import eu.kanade.tachiyomi.source.ConfigurableSource
+import kotlinx.coroutines.launch
+import rx.android.schedulers.AndroidSchedulers
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class InstalledMangaExtensionsFragment : Fragment() {
+    private var _binding: FragmentMangaExtensionsBinding? = null
+    private val binding get() = _binding!!
+    private lateinit var extensionsRecyclerView: RecyclerView
+    val skipIcons = loadData("skip_extension_icons") ?: false
+    private val mangaExtensionManager: MangaExtensionManager = Injekt.get()
+    private val extensionsAdapter = MangaExtensionsAdapter({ pkg ->
+        val changeUIVisibility: (Boolean) -> Unit = { show ->
+            val activity = requireActivity() as ExtensionsActivity
+            val visibility = if (show) View.VISIBLE else View.GONE
+            activity.findViewById<ViewPager2>(R.id.viewPager).visibility = visibility
+            activity.findViewById<TabLayout>(R.id.tabLayout).visibility = visibility
+            activity.findViewById<TextInputLayout>(R.id.searchView).visibility = visibility
+            activity.findViewById<FrameLayout>(R.id.fragmentExtensionsContainer).visibility =
+                if (show) View.GONE else View.VISIBLE
+        }
+        val allSettings = pkg.sources.filterIsInstance<ConfigurableSource>()
+        if (allSettings.isNotEmpty()) {
+            var selectedSetting = allSettings[0]
+            if (allSettings.size > 1) {
+                val names = allSettings.map { it.lang }.toTypedArray()
+                var selectedIndex = 0
+                AlertDialog.Builder(requireContext())
+                    .setTitle("Select a Source")
+                    .setSingleChoiceItems(names, selectedIndex) { _, which ->
+                        selectedIndex = which
+                    }
+                    .setPositiveButton("OK") { dialog, _ ->
+                        selectedSetting = allSettings[selectedIndex]
+                        dialog.dismiss()
+
+                        // Move the fragment transaction here
+                        val fragment = MangaSourcePreferencesFragment().getInstance(selectedSetting.id){
+                            changeUIVisibility(true)
+                        }
+                        parentFragmentManager.beginTransaction()
+                            .setCustomAnimations(R.anim.slide_up, R.anim.slide_down)
+                            .replace(R.id.fragmentExtensionsContainer, fragment)
+                            .addToBackStack(null)
+                            .commit()
+                    }
+                    .setNegativeButton("Cancel") { dialog, _ ->
+                        dialog.cancel()
+                        changeUIVisibility(true)
+                        return@setNegativeButton
+                    }
+                    .show()
+            } else {
+                // If there's only one setting, proceed with the fragment transaction
+                val fragment = MangaSourcePreferencesFragment().getInstance(selectedSetting.id){
+                    changeUIVisibility(true)
+                }
+                parentFragmentManager.beginTransaction()
+                    .setCustomAnimations(R.anim.slide_up, R.anim.slide_down)
+                    .replace(R.id.fragmentExtensionsContainer, fragment)
+                    .addToBackStack(null)
+                    .commit()
+            }
+
+            // Hide ViewPager2 and TabLayout
+            changeUIVisibility(false)
+        } else {
+            Toast.makeText(requireContext(), "Source is not configurable", Toast.LENGTH_SHORT)
+                .show()
+        }
+    },
+        { pkg ->
+        if (isAdded) {  // Check if the fragment is currently added to its activity
+            val context = requireContext()  // Store context in a variable
+            val notificationManager =
+                context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager  // Initialize NotificationManager once
+
+            if (pkg.hasUpdate) {
+                mangaExtensionManager.updateExtension(pkg)
+                    .observeOn(AndroidSchedulers.mainThread())  // Observe on main thread
+                    .subscribe(
+                        { installStep ->
+                            val builder = NotificationCompat.Builder(
+                                context,
+                                Notifications.CHANNEL_DOWNLOADER_PROGRESS
+                            )
+                                .setSmallIcon(R.drawable.ic_round_sync_24)
+                                .setContentTitle("Updating extension")
+                                .setContentText("Step: $installStep")
+                                .setPriority(NotificationCompat.PRIORITY_LOW)
+                            notificationManager.notify(1, builder.build())
+                        },
+                        { error ->
+                            FirebaseCrashlytics.getInstance().recordException(error)
+                            Log.e("MangaExtensionsAdapter", "Error: ", error)  // Log the error
+                            val builder = NotificationCompat.Builder(
+                                context,
+                                Notifications.CHANNEL_DOWNLOADER_ERROR
+                            )
+                                .setSmallIcon(R.drawable.ic_round_info_24)
+                                .setContentTitle("Update failed: ${error.message}")
+                                .setContentText("Error: ${error.message}")
+                                .setPriority(NotificationCompat.PRIORITY_HIGH)
+                            notificationManager.notify(1, builder.build())
+                        },
+                        {
+                            val builder = NotificationCompat.Builder(
+                                context,
+                                Notifications.CHANNEL_DOWNLOADER_PROGRESS
+                            )
+                                .setSmallIcon(androidx.media3.ui.R.drawable.exo_ic_check)
+                                .setContentTitle("Update complete")
+                                .setContentText("The extension has been successfully updated.")
+                                .setPriority(NotificationCompat.PRIORITY_LOW)
+                            notificationManager.notify(1, builder.build())
+                        }
+                    )
+            } else {
+                mangaExtensionManager.uninstallExtension(pkg.pkgName)
+            }
+        }
+    }, skipIcons)
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentMangaExtensionsBinding.inflate(inflater, container, false)
+
+        extensionsRecyclerView = binding.allMangaExtensionsRecyclerView
+        extensionsRecyclerView.layoutManager = LinearLayoutManager(requireContext())
+        extensionsRecyclerView.adapter = extensionsAdapter
+
+
+        lifecycleScope.launch {
+            mangaExtensionManager.installedExtensionsFlow.collect { extensions ->
+                extensionsAdapter.updateData(extensions)
+            }
+        }
+        val extensionsRecyclerView: RecyclerView = binding.allMangaExtensionsRecyclerView
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView();_binding = null
+    }
+
+
+    private class MangaExtensionsAdapter(
+        private val onSettingsClicked: (MangaExtension.Installed) -> Unit,
+        private val onUninstallClicked: (MangaExtension.Installed) -> Unit,
+        skipIcons: Boolean
+    ) : ListAdapter<MangaExtension.Installed, MangaExtensionsAdapter.ViewHolder>(
+        DIFF_CALLBACK_INSTALLED
+    ) {
+
+        val skipIcons = skipIcons
+
+        fun updateData(newExtensions: List<MangaExtension.Installed>) {
+            submitList(newExtensions)  // Use submitList instead of manual list handling
+        }
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+            val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.item_extension, parent, false)
+            return ViewHolder(view)
+        }
+
+        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+            val extension = getItem(position)  // Use getItem() from ListAdapter
+            holder.extensionNameTextView.text = extension.name
+            if (!skipIcons) {
+                holder.extensionIconImageView.setImageDrawable(extension.icon)
+            }
+            if (extension.hasUpdate) {
+                holder.closeTextView.text = "Update"
+                holder.closeTextView.setTextColor(
+                    ContextCompat.getColor(
+                        holder.itemView.context,
+                        R.color.warning
+                    )
+                )
+            } else {
+                holder.closeTextView.text = "Uninstall"
+            }
+            holder.closeTextView.setOnClickListener {
+                onUninstallClicked(extension)
+            }
+            holder.settingsImageView.setOnClickListener {
+                onSettingsClicked(extension)
+            }
+        }
+
+        inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+            val extensionNameTextView: TextView = view.findViewById(R.id.extensionNameTextView)
+            val settingsImageView: ImageView = view.findViewById(R.id.settingsImageView)
+            val extensionIconImageView: ImageView = view.findViewById(R.id.extensionIconImageView)
+            val closeTextView: TextView = view.findViewById(R.id.closeTextView)
+        }
+
+        companion object {
+            val DIFF_CALLBACK_INSTALLED =
+                object : DiffUtil.ItemCallback<MangaExtension.Installed>() {
+                    override fun areItemsTheSame(
+                        oldItem: MangaExtension.Installed,
+                        newItem: MangaExtension.Installed
+                    ): Boolean {
+                        return oldItem.pkgName == newItem.pkgName
+                    }
+
+                    override fun areContentsTheSame(
+                        oldItem: MangaExtension.Installed,
+                        newItem: MangaExtension.Installed
+                    ): Boolean {
+                        return oldItem == newItem
+                    }
+                }
+        }
+    }
+
+
+}

app/src/main/java/ani/dantotsu/settings/MangaExtensionsFragment.kt

@@ -2,57 +2,89 @@ package ani.dantotsu.settings
 
 import android.app.NotificationManager
 import android.content.Context
-import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.app.NotificationCompat
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
+import androidx.paging.PagingData
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import ani.dantotsu.R
-import ani.dantotsu.databinding.FragmentMangaBinding
 import ani.dantotsu.databinding.FragmentMangaExtensionsBinding
-import com.bumptech.glide.Glide
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
 import eu.kanade.tachiyomi.extension.manga.model.MangaExtension
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import rx.android.schedulers.AndroidSchedulers
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import ani.dantotsu.settings.paging.MangaExtensionAdapter
+import ani.dantotsu.settings.paging.MangaExtensionsViewModel
+import ani.dantotsu.settings.paging.MangaExtensionsViewModelFactory
+import ani.dantotsu.settings.paging.OnMangaInstallClickListener
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collectLatest
 
-class MangaExtensionsFragment : Fragment(), SearchQueryHandler {
+class MangaExtensionsFragment : Fragment(),
+    SearchQueryHandler, OnMangaInstallClickListener {
     private var _binding: FragmentMangaExtensionsBinding? = null
     private val binding get() = _binding!!
 
-    private lateinit var extensionsRecyclerView: RecyclerView
-    private lateinit var allextenstionsRecyclerView: RecyclerView
-    private val mangaExtensionManager:MangaExtensionManager = Injekt.get<MangaExtensionManager>()
-    private val extensionsAdapter = MangaExtensionsAdapter { pkgName ->
-        mangaExtensionManager.uninstallExtension(pkgName)
+    private val viewModel: MangaExtensionsViewModel by viewModels {
+        MangaExtensionsViewModelFactory(mangaExtensionManager)
     }
-    private val allExtensionsAdapter =
-        AllMangaExtensionsAdapter(lifecycleScope) { pkgName ->
 
+    private val adapter by lazy {
+        MangaExtensionAdapter(this)
+    }
+
+    private val mangaExtensionManager: MangaExtensionManager = Injekt.get()
+
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentMangaExtensionsBinding.inflate(inflater, container, false)
+
+        binding.allMangaExtensionsRecyclerView.isNestedScrollingEnabled = false
+        binding.allMangaExtensionsRecyclerView.adapter = adapter
+        binding.allMangaExtensionsRecyclerView.layoutManager = LinearLayoutManager(context)
+        (binding.allMangaExtensionsRecyclerView.layoutManager as LinearLayoutManager).isItemPrefetchEnabled = true
+
+        lifecycleScope.launch {
+            viewModel.pagerFlow.collectLatest { pagingData ->
+                adapter.submitData(pagingData)
+            }
+        }
+
+        viewModel.invalidatePager() // Force a refresh of the pager
+
+        return binding.root
+    }
+
+    override fun updateContentBasedOnQuery(query: String?) {
+        viewModel.setSearchQuery(query ?: "")
+    }
+
+    override fun onInstallClick(pkg: MangaExtension.Available) {
+        if (isAdded) {  // Check if the fragment is currently added to its activity
+            val context = requireContext()
             val notificationManager =
-                requireContext().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+                context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
             // Start the installation process
-            mangaExtensionManager.installExtension(pkgName)
+            mangaExtensionManager.installExtension(pkg)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                     { installStep ->
                         val builder = NotificationCompat.Builder(
-                            requireContext(),
+                            context,
                             Notifications.CHANNEL_DOWNLOADER_PROGRESS
                         )
                             .setSmallIcon(R.drawable.ic_round_sync_24)
@@ -62,173 +94,37 @@ class MangaExtensionsFragment : Fragment(), SearchQueryHandler {
                         notificationManager.notify(1, builder.build())
                     },
                     { error ->
+                        FirebaseCrashlytics.getInstance().recordException(error)
                         val builder = NotificationCompat.Builder(
-                            requireContext(),
+                            context,
                             Notifications.CHANNEL_DOWNLOADER_ERROR
                         )
                             .setSmallIcon(R.drawable.ic_round_info_24)
-                            .setContentTitle("Installation failed")
+                            .setContentTitle("Installation failed: ${error.message}")
                             .setContentText("Error: ${error.message}")
                             .setPriority(NotificationCompat.PRIORITY_HIGH)
                         notificationManager.notify(1, builder.build())
                     },
                     {
                         val builder = NotificationCompat.Builder(
-                            requireContext(),
+                            context,
                             Notifications.CHANNEL_DOWNLOADER_PROGRESS
                         )
-                            .setSmallIcon(androidx.media3.ui.R.drawable.exo_ic_check)
+                            .setSmallIcon(R.drawable.ic_round_download_24)
                             .setContentTitle("Installation complete")
                             .setContentText("The extension has been successfully installed.")
                             .setPriority(NotificationCompat.PRIORITY_LOW)
                         notificationManager.notify(1, builder.build())
+                        viewModel.invalidatePager()
                     }
                 )
         }
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        _binding = FragmentMangaExtensionsBinding.inflate(inflater, container, false)
-
-        extensionsRecyclerView = binding.mangaExtensionsRecyclerView
-        extensionsRecyclerView.layoutManager = LinearLayoutManager( requireContext())
-        extensionsRecyclerView.adapter = extensionsAdapter
-
-        allextenstionsRecyclerView = binding.allMangaExtensionsRecyclerView
-        allextenstionsRecyclerView.layoutManager = LinearLayoutManager( requireContext())
-        allextenstionsRecyclerView.adapter = allExtensionsAdapter
-
-        lifecycleScope.launch {
-            mangaExtensionManager.installedExtensionsFlow.collect { extensions ->
-                extensionsAdapter.updateData(extensions)
-            }
-        }
-        lifecycleScope.launch {
-            combine(
-                mangaExtensionManager.availableExtensionsFlow,
-                mangaExtensionManager.installedExtensionsFlow
-            ) { availableExtensions, installedExtensions ->
-                // Pair of available and installed extensions
-                Pair(availableExtensions, installedExtensions)
-            }.collect { pair ->
-                val (availableExtensions, installedExtensions) = pair
-                allExtensionsAdapter.updateData(availableExtensions, installedExtensions)
-            }
-        }
-        val extensionsRecyclerView: RecyclerView = binding.mangaExtensionsRecyclerView
-
-        return binding.root
-    }
-
-    override fun updateContentBasedOnQuery(query: String?) {
-        if (query.isNullOrEmpty()) {
-            allExtensionsAdapter.filter("")  // Reset the filter
-            allextenstionsRecyclerView.visibility = View.VISIBLE
-            extensionsRecyclerView.visibility = View.VISIBLE
-        } else {
-            allExtensionsAdapter.filter(query)
-            allextenstionsRecyclerView.visibility = View.VISIBLE
-            extensionsRecyclerView.visibility = View.GONE
-        }
     }
 
     override fun onDestroyView() {
         super.onDestroyView();_binding = null
     }
 
-    private class MangaExtensionsAdapter(private val onUninstallClicked: (String) -> Unit) : RecyclerView.Adapter<MangaExtensionsAdapter.ViewHolder>() {
 
-        private var extensions: List<MangaExtension.Installed> = emptyList()
 
-        fun updateData(newExtensions: List<MangaExtension.Installed>) {
-            extensions = newExtensions
-            notifyDataSetChanged()
-        }
-
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-            val view = LayoutInflater.from(parent.context)
-                .inflate(R.layout.item_extension, parent, false)
-            return ViewHolder(view)
-        }
-
-        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-            val extension = extensions[position]
-            holder.extensionNameTextView.text = extension.name
-            holder.extensionIconImageView.setImageDrawable(extension.icon)
-            holder.closeTextView.text = "Uninstall"
-            holder.closeTextView.setOnClickListener {
-                onUninstallClicked(extension.pkgName)
-            }
-        }
-
-        override fun getItemCount(): Int = extensions.size
-
-        inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-            val extensionNameTextView: TextView = view.findViewById(R.id.extensionNameTextView)
-            val extensionIconImageView: ImageView = view.findViewById(R.id.extensionIconImageView)
-            val closeTextView: TextView = view.findViewById(R.id.closeTextView)
-        }
-    }
-
-    private class AllMangaExtensionsAdapter(private val coroutineScope: CoroutineScope,
-                                            private val onButtonClicked: (MangaExtension.Available) -> Unit) : RecyclerView.Adapter<AllMangaExtensionsAdapter.ViewHolder>() {
-        private var extensions: List<MangaExtension.Available> = emptyList()
-
-        fun updateData(newExtensions: List<MangaExtension.Available>, installedExtensions: List<MangaExtension.Installed> = emptyList()) {
-            val installedPkgNames = installedExtensions.map { it.pkgName }.toSet()
-            extensions = newExtensions.filter { it.pkgName !in installedPkgNames }
-            filteredExtensions = extensions
-            notifyDataSetChanged()
-        }
-
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AllMangaExtensionsAdapter.ViewHolder {
-            val view = LayoutInflater.from(parent.context)
-                .inflate(R.layout.item_extension_all, parent, false)
-            return ViewHolder(view)
-        }
-
-        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-            val extension = filteredExtensions[position]
-            holder.extensionNameTextView.text = extension.name
-            coroutineScope.launch {
-                val drawable = urlToDrawable(holder.itemView.context, extension.iconUrl)
-                holder.extensionIconImageView.setImageDrawable(drawable)
-            }
-            holder.closeTextView.text = "Install"
-            holder.closeTextView.setOnClickListener {
-                onButtonClicked(extension)
-            }
-        }
-
-        override fun getItemCount(): Int = filteredExtensions.size
-
-        private var filteredExtensions: List<MangaExtension.Available> = emptyList()
-
-        fun filter(query: String) {
-            filteredExtensions = if (query.isEmpty()) {
-                extensions
-            } else {
-                extensions.filter { it.name.contains(query, ignoreCase = true) }
-            }
-            notifyDataSetChanged()
-        }
-
-        inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-            val extensionNameTextView: TextView = view.findViewById(R.id.extensionNameTextView)
-            val extensionIconImageView: ImageView = view.findViewById(R.id.extensionIconImageView)
-            val closeTextView: TextView = view.findViewById(R.id.closeTextView)
-        }
-
-        suspend fun urlToDrawable(context: Context, url: String): Drawable? {
-            return withContext(Dispatchers.IO) {
-                try {
-                    return@withContext Glide.with(context)
-                        .load(url)
-                        .submit()
-                        .get()
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    return@withContext null
-                }
-            }
-        }
-    }
 }

app/src/main/java/ani/dantotsu/settings/PlayerSettingsActivity.kt

@@ -16,6 +16,7 @@ import ani.dantotsu.databinding.ActivityPlayerSettingsBinding
 import ani.dantotsu.media.Media
 import ani.dantotsu.others.getSerialized
 import ani.dantotsu.parsers.Subtitle
+import ani.dantotsu.themes.ThemeManager
 import com.google.android.material.snackbar.Snackbar
 import kotlin.math.roundToInt
 
@@ -30,6 +31,7 @@ class PlayerSettingsActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityPlayerSettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 

app/src/main/java/ani/dantotsu/settings/ReaderSettingsActivity.kt

@@ -12,12 +12,14 @@ import ani.dantotsu.navBarHeight
 import ani.dantotsu.saveData
 import ani.dantotsu.snackString
 import ani.dantotsu.statusBarHeight
+import ani.dantotsu.themes.ThemeManager
 
 class ReaderSettingsActivity : AppCompatActivity() {
     lateinit var binding: ActivityReaderSettingsBinding
     private val reader = "reader_settings"
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityReaderSettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 

app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt

@@ -2,6 +2,7 @@ package ani.dantotsu.settings
 
 import android.annotation.SuppressLint
 import android.app.AlertDialog
+import android.content.Context
 import android.content.Intent
 import android.graphics.drawable.Animatable
 import android.os.Build.*
@@ -11,6 +12,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.TextView
+import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@@ -30,7 +32,10 @@ import ani.dantotsu.subcriptions.Notifications.Companion.openSettings
 import ani.dantotsu.subcriptions.Subscription.Companion.defaultTime
 import ani.dantotsu.subcriptions.Subscription.Companion.startSubscription
 import ani.dantotsu.subcriptions.Subscription.Companion.timeMinutes
+import ani.dantotsu.themes.ThemeManager
+import com.google.android.material.snackbar.Snackbar
 import eu.kanade.domain.base.BasePreferences
+import eu.kanade.tachiyomi.network.NetworkPreferences
 import io.noties.markwon.Markwon
 import io.noties.markwon.SoftBreakAddsNewLinePlugin
 import kotlinx.coroutines.Dispatchers
@@ -47,10 +52,12 @@ class SettingsActivity : AppCompatActivity() {
     }
     lateinit var binding: ActivitySettingsBinding
     private val extensionInstaller = Injekt.get<BasePreferences>().extensionInstaller()
+    private val networkPreferences = Injekt.get<NetworkPreferences>()
 
     @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivitySettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
@@ -92,18 +99,43 @@ OS Version: $CODENAME $RELEASE ($SDK_INT)
             onBackPressedDispatcher.onBackPressed()
         }
 
-        val animeSourceName = loadData<String>("settings_def_anime_source") ?: AnimeSources.names[0]
-        // Set the dropdown item in the UI if the name exists in the list.
-        if (AnimeSources.names.contains(animeSourceName)) {
-            binding.animeSource.setText(animeSourceName, false)
+        binding.settingsUseMaterialYou.isChecked = getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getBoolean("use_material_you", false)
+        binding.settingsUseMaterialYou.setOnCheckedChangeListener { _, isChecked ->
+            getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putBoolean("use_material_you", isChecked).apply()
+            restartApp()
+        }
+
+        binding.settingsUseOLED.isChecked = getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getBoolean("use_oled", false)
+        binding.settingsUseOLED.setOnCheckedChangeListener { _, isChecked ->
+            getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putBoolean("use_oled", isChecked).apply()
+            restartApp()
+        }
+
+        val themeString  = getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getString("theme", "PURPLE")!!
+        binding.themeSwitcher.setText(themeString.substring(0, 1) + themeString.substring(1).lowercase())
+
+        binding.themeSwitcher.setAdapter(ArrayAdapter(this, R.layout.item_dropdown, ThemeManager.Companion.Theme.values().map { it.theme.substring(0, 1) + it.theme.substring(1).lowercase() }))
+
+        binding.themeSwitcher.setOnItemClickListener { _, _, i, _ ->
+            getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putString("theme", ThemeManager.Companion.Theme.values()[i].theme).apply()
+            //ActivityHelper.shouldRefreshMainActivity = true
+            binding.themeSwitcher.clearFocus()
+            restartApp()
+
+        }
+
+        //val animeSource = loadData<Int>("settings_def_anime_source_s")?.let { if (it >= AnimeSources.names.size) 0 else it } ?: 0
+        val animeSource = getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getInt("settings_def_anime_source_s_r", 0)
+        if (AnimeSources.names.isNotEmpty() && animeSource in 0 until AnimeSources.names.size) {
+            binding.animeSource.setText(AnimeSources.names[animeSource], false)
+
         }
 
         binding.animeSource.setAdapter(ArrayAdapter(this, R.layout.item_dropdown, AnimeSources.names))
-        // Set up the item click listener for the dropdown.
+
         binding.animeSource.setOnItemClickListener { _, _, i, _ ->
-            val selectedName = AnimeSources.names[i]
-            // Save the string name of the selected item.
-            saveData("settings_def_anime_source", selectedName)
+            //saveData("settings_def_anime_source_s", i)
+            getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putInt("settings_def_anime_source_s_r", i).apply()
             binding.animeSource.clearFocus()
         }
 
@@ -131,6 +163,26 @@ OS Version: $CODENAME $RELEASE ($SDK_INT)
             }
         }
 
+        binding.skipExtensionIcons.isChecked = loadData("skip_extension_icons") ?: false
+        binding.skipExtensionIcons.setOnCheckedChangeListener { _, isChecked ->
+            saveData("skip_extension_icons", isChecked)
+        }
+
+        binding.userAgent.setText(networkPreferences.defaultUserAgent().get())
+        binding.userAgent.setOnEditorActionListener { _, _, _ ->
+            networkPreferences.defaultUserAgent().set(binding.userAgent.text.toString())
+            true
+        }
+
+        val exDns = listOf("None", "Cloudflare", "Google", "AdGuard", "Quad9", "AliDNS", "DNSPod", "360", "Quad101", "Mullvad", "Controld", "Njalla", "Shecan")
+        binding.settingsExtensionDns.setText(exDns[networkPreferences.dohProvider().get()], false)
+        binding.settingsExtensionDns.setAdapter(ArrayAdapter(this, R.layout.item_dropdown, exDns))
+        binding.settingsExtensionDns.setOnItemClickListener { _, _, i, _ ->
+            networkPreferences.dohProvider().set(i)
+            binding.settingsExtensionDns.clearFocus()
+            Toast.makeText(this, "Restart app to apply changes", Toast.LENGTH_LONG).show()
+        }
+
         binding.settingsDownloadInSd.isChecked = loadData("sd_dl") ?: false
         binding.settingsDownloadInSd.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
@@ -169,12 +221,10 @@ OS Version: $CODENAME $RELEASE ($SDK_INT)
             saveData("settings_prefer_dub", isChecked)
         }
 
-        // Load the saved manga source name from data storage.
-        val mangaSourceName = loadData<String>("settings_def_manga_source") ?: MangaSources.names[0]
-
-        // Set the dropdown item in the UI if the name exists in the list.
-        if (MangaSources.names.contains(mangaSourceName)) {
-            binding.mangaSource.setText(mangaSourceName, false)
+            //val mangaSource = loadData<Int>("settings_def_manga_source_s")?.let { if (it >= MangaSources.names.size) 0 else it } ?: 0
+            val mangaSource = getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getInt("settings_def_manga_source_s_r", 0)
+            if (MangaSources.names.isNotEmpty() && mangaSource in 0 until MangaSources.names.size) {
+                binding.mangaSource.setText(MangaSources.names[mangaSource], false)
         }
 
         // Set up the dropdown adapter.
@@ -182,9 +232,8 @@ OS Version: $CODENAME $RELEASE ($SDK_INT)
 
         // Set up the item click listener for the dropdown.
         binding.mangaSource.setOnItemClickListener { _, _, i, _ ->
-            val selectedName = MangaSources.names[i]
-            // Save the string name of the selected item.
-            saveData("settings_def_manga_source", selectedName)
+            //saveData("settings_def_manga_source_s", i)
+            getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putInt("settings_def_manga_source_s_r", i).apply()
             binding.mangaSource.clearFocus()
         }
 
@@ -365,7 +414,7 @@ OS Version: $CODENAME $RELEASE ($SDK_INT)
             }
         }
 
-        var curTime = loadData<Int>("subscriptions_time") ?: defaultTime
+        var curTime = loadData<Int>("subscriptions_time_s") ?: defaultTime
         val timeNames = timeMinutes.map {
             val mins = it % 60
             val hours = it / 60
@@ -378,7 +427,7 @@ OS Version: $CODENAME $RELEASE ($SDK_INT)
             speedDialog.setSingleChoiceItems(timeNames, curTime) { dialog, i ->
                 curTime = i
                 binding.settingsSubscriptionsTime.text = getString(R.string.subscriptions_checking_time_s, timeNames[i])
-                saveData("subscriptions_time", curTime)
+                saveData("subscriptions_time_s", curTime)
                 dialog.dismiss()
                 startSubscription(true)
             }.show()
@@ -522,7 +571,7 @@ OS Version: $CODENAME $RELEASE ($SDK_INT)
                         title = "Enjoying the App?"
                         addView(TextView(this@SettingsActivity).apply {
                             text =
-                                "Consider donating!r"
+                                "Consider donating!"
                         })
 
                         setNegativeButton("no moners :(") {
@@ -541,4 +590,18 @@ OS Version: $CODENAME $RELEASE ($SDK_INT)
             }
         }
     }
+    private fun restartApp() {
+        Snackbar.make(
+            binding.root,
+            R.string.restart_app, Snackbar.LENGTH_SHORT
+        ).apply {
+            val mainIntent =
+                Intent.makeRestartActivityTask(context.packageManager.getLaunchIntentForPackage(context.packageName)!!.component)
+            setAction("Do it!") {
+                context.startActivity(mainIntent)
+                Runtime.getRuntime().exit(0)
+            }
+            show()
+        }
+    }
 }

app/src/main/java/ani/dantotsu/settings/SettingsDialogFragment.kt

@@ -3,8 +3,10 @@ package ani.dantotsu.settings
 import android.app.DownloadManager
 import android.content.ActivityNotFoundException
 import android.content.Intent
+import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -26,6 +28,12 @@ class SettingsDialogFragment : BottomSheetDialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        val window = dialog?.window
+        window?.statusBarColor = Color.CYAN
+        val typedValue = TypedValue()
+        val theme = requireContext().theme
+        theme.resolveAttribute(com.google.android.material.R.attr.colorSurface, typedValue, true)
+        window?.navigationBarColor = typedValue.data
 
         if (Anilist.token != null) {
             binding.settingsLogin.setText(R.string.logout)

app/src/main/java/ani/dantotsu/settings/UserInterfaceSettingsActivity.kt

@@ -8,6 +8,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.updateLayoutParams
 import ani.dantotsu.*
 import ani.dantotsu.databinding.ActivityUserInterfaceSettingsBinding
+import ani.dantotsu.themes.ThemeManager
 import com.google.android.material.snackbar.Snackbar
 
 class UserInterfaceSettingsActivity : AppCompatActivity() {
@@ -15,6 +16,7 @@ class UserInterfaceSettingsActivity : AppCompatActivity() {
     private val ui = "ui_settings"
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
         binding = ActivityUserInterfaceSettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 

app/src/main/java/ani/dantotsu/settings/extensionprefs/AnimePreferenceFragmentCompat.kt

@@ -0,0 +1,88 @@
+package ani.dantotsu.settings.extensionprefs
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.util.Log
+import android.util.TypedValue
+import android.view.View
+import android.widget.FrameLayout
+import androidx.core.os.bundleOf
+import androidx.lifecycle.lifecycleScope
+import androidx.preference.DialogPreference
+import androidx.preference.EditTextPreference
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.forEach
+import androidx.preference.getOnBindEditTextListener
+import androidx.viewpager2.widget.ViewPager2
+import ani.dantotsu.R
+import ani.dantotsu.settings.ExtensionsActivity
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.textfield.TextInputLayout
+import eu.kanade.tachiyomi.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.data.preference.SharedPreferencesDataStore
+import eu.kanade.tachiyomi.source.anime.getPreferenceKey
+import eu.kanade.tachiyomi.widget.TachiyomiTextInputEditText.Companion.setIncognito
+import tachiyomi.domain.source.anime.service.AnimeSourceManager
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class AnimeSourcePreferencesFragment : PreferenceFragmentCompat() {
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        preferenceScreen = populateAnimePreferenceScreen()
+        //set background color
+        val color = TypedValue()
+        requireContext().theme.resolveAttribute(com.google.android.material.R.attr.backgroundColor, color, true)
+        view?.setBackgroundColor(color.data)
+    }
+    private var onCloseAction: (() -> Unit)? = null
+
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        onCloseAction?.invoke()
+    }
+
+    fun populateAnimePreferenceScreen(): PreferenceScreen {
+        val sourceId = requireArguments().getLong(SOURCE_ID)
+        val source = Injekt.get<AnimeSourceManager>().get(sourceId)!!
+        check(source is ConfigurableAnimeSource)
+        val sharedPreferences = requireContext().getSharedPreferences(source.getPreferenceKey(), Context.MODE_PRIVATE)
+        val dataStore = SharedPreferencesDataStore(sharedPreferences)
+        preferenceManager.preferenceDataStore = dataStore
+        val sourceScreen = preferenceManager.createPreferenceScreen(requireContext())
+        source.setupPreferenceScreen(sourceScreen)
+        sourceScreen.forEach { pref ->
+            pref.isIconSpaceReserved = false
+            if (pref is DialogPreference) {
+                pref.dialogTitle = pref.title
+                println("pref.dialogTitle: ${pref.dialogTitle}")
+            }
+            for (entry in sharedPreferences.all.entries) {
+                Log.d("Preferences", "Key: ${entry.key}, Value: ${entry.value}")
+            }
+
+            // Apply incognito IME for EditTextPreference
+            if (pref is EditTextPreference) {
+                val setListener = pref.getOnBindEditTextListener()
+                pref.setOnBindEditTextListener {
+                    setListener?.onBindEditText(it)
+                    it.setIncognito(lifecycleScope)
+                }
+            }
+        }
+
+        return sourceScreen
+    }
+    fun getInstance(sourceId: Long, onCloseAction: (() -> Unit)? = null): AnimeSourcePreferencesFragment {
+        val fragment = AnimeSourcePreferencesFragment()
+        fragment.arguments = bundleOf(SOURCE_ID to sourceId)
+        fragment.onCloseAction = onCloseAction
+        return fragment
+    }
+
+    companion object { //idk why it needs both
+        private const val SOURCE_ID = "source_id"
+    }
+}

app/src/main/java/ani/dantotsu/settings/extensionprefs/MangaPreferenceFragmentCompat.kt

@@ -0,0 +1,78 @@
+package ani.dantotsu.settings.extensionprefs
+
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import android.widget.FrameLayout
+import androidx.core.os.bundleOf
+import androidx.lifecycle.lifecycleScope
+import androidx.preference.DialogPreference
+import androidx.preference.EditTextPreference
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.forEach
+import androidx.preference.getOnBindEditTextListener
+import androidx.viewpager2.widget.ViewPager2
+import ani.dantotsu.R
+import ani.dantotsu.settings.ExtensionsActivity
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.textfield.TextInputLayout
+import eu.kanade.tachiyomi.PreferenceScreen
+import eu.kanade.tachiyomi.data.preference.SharedPreferencesDataStore
+import eu.kanade.tachiyomi.source.ConfigurableSource
+import eu.kanade.tachiyomi.source.manga.getPreferenceKey
+import eu.kanade.tachiyomi.widget.TachiyomiTextInputEditText.Companion.setIncognito
+import tachiyomi.domain.source.manga.service.MangaSourceManager
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class MangaSourcePreferencesFragment : PreferenceFragmentCompat() {
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        preferenceScreen = populateMangaPreferenceScreen()
+    }
+    private var onCloseAction: (() -> Unit)? = null
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        onCloseAction?.invoke()
+
+    }
+
+    fun populateMangaPreferenceScreen(): PreferenceScreen {
+        val sourceId = requireArguments().getLong(SOURCE_ID)
+        val source = Injekt.get<MangaSourceManager>().get(sourceId)!!
+        check(source is ConfigurableSource)
+        val sharedPreferences = requireContext().getSharedPreferences(source.getPreferenceKey(), Context.MODE_PRIVATE)
+        val dataStore = SharedPreferencesDataStore(sharedPreferences)
+        preferenceManager.preferenceDataStore = dataStore
+        val sourceScreen = preferenceManager.createPreferenceScreen(requireContext())
+        source.setupPreferenceScreen(sourceScreen)
+        sourceScreen.forEach { pref ->
+            pref.isIconSpaceReserved = false
+            if (pref is DialogPreference) {
+                pref.dialogTitle = pref.title
+                println("pref.dialogTitle: ${pref.dialogTitle}")
+            }
+
+            // Apply incognito IME for EditTextPreference
+            if (pref is EditTextPreference) {
+                val setListener = pref.getOnBindEditTextListener()
+                pref.setOnBindEditTextListener {
+                    setListener?.onBindEditText(it)
+                    it.setIncognito(lifecycleScope)
+                }
+            }
+        }
+
+        return sourceScreen
+    }
+    fun getInstance(sourceId: Long, onCloseAction: (() -> Unit)? = null): MangaSourcePreferencesFragment {
+        val fragment = MangaSourcePreferencesFragment()
+        fragment.arguments = bundleOf(SOURCE_ID to sourceId)
+        fragment.onCloseAction = onCloseAction
+        return fragment
+    }
+
+    companion object {
+        private const val SOURCE_ID = "source_id"
+    }
+}

app/src/main/java/ani/dantotsu/settings/paging/AnimePagingSource.kt

@@ -0,0 +1,162 @@
+package ani.dantotsu.settings.paging
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
+import androidx.paging.PagingDataAdapter
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import androidx.paging.cachedIn
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import ani.dantotsu.databinding.ItemExtensionAllBinding
+import ani.dantotsu.loadData
+import com.bumptech.glide.Glide
+import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
+import eu.kanade.tachiyomi.extension.anime.model.AnimeExtension
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flatMapLatest
+
+
+class AnimeExtensionsViewModelFactory(
+    private val animeExtensionManager: AnimeExtensionManager
+) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return AnimeExtensionsViewModel(animeExtensionManager) as T
+    }
+}
+
+
+class AnimeExtensionsViewModel(
+    private val animeExtensionManager: AnimeExtensionManager
+) : ViewModel() {
+    private val searchQuery = MutableStateFlow("")
+    private var currentPagingSource: AnimeExtensionPagingSource? = null
+    fun setSearchQuery(query: String) {
+        searchQuery.value = query
+    }
+    fun invalidatePager() {
+        currentPagingSource?.invalidate()
+    }
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val pagerFlow: Flow<PagingData<AnimeExtension.Available>> = searchQuery.flatMapLatest { query ->
+        Pager(
+            PagingConfig(
+                pageSize = 15,
+                initialLoadSize = 15,
+                prefetchDistance = 15
+            )
+        ) {
+            AnimeExtensionPagingSource(
+                animeExtensionManager.availableExtensionsFlow,
+                animeExtensionManager.installedExtensionsFlow,
+                searchQuery
+            ).also { currentPagingSource = it }
+        }.flow
+    }.cachedIn(viewModelScope)
+}
+
+class AnimeExtensionPagingSource(
+    private val availableExtensionsFlow: StateFlow<List<AnimeExtension.Available>>,
+    private val installedExtensionsFlow: StateFlow<List<AnimeExtension.Installed>>,
+    private val searchQuery: StateFlow<String>
+) : PagingSource<Int, AnimeExtension.Available>() {
+
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, AnimeExtension.Available> {
+        val position = params.key ?: 0
+        val installedExtensions = installedExtensionsFlow.first().map { it.pkgName }.toSet()
+        val availableExtensions = availableExtensionsFlow.first().filterNot { it.pkgName in installedExtensions }
+        val query = searchQuery.first()
+        val filteredExtensions = if (query.isEmpty()) {
+            availableExtensions
+        } else {
+            availableExtensions.filter { it.name.contains(query, ignoreCase = true) }
+        }
+
+        return try {
+            val sublist = filteredExtensions.subList(
+                fromIndex = position,
+                toIndex = (position + params.loadSize).coerceAtMost(filteredExtensions.size)
+            )
+            LoadResult.Page(
+                data = sublist,
+                prevKey = if (position == 0) null else position - params.loadSize,
+                nextKey = if (position + params.loadSize >= filteredExtensions.size) null else position + params.loadSize
+            )
+        } catch (e: Exception) {
+            LoadResult.Error(e)
+        }
+    }
+
+    override fun getRefreshKey(state: PagingState<Int, AnimeExtension.Available>): Int? {
+        return null
+    }
+}
+
+class AnimeExtensionAdapter(private val clickListener: OnAnimeInstallClickListener) :
+    PagingDataAdapter<AnimeExtension.Available, AnimeExtensionAdapter.AnimeExtensionViewHolder>(
+        DIFF_CALLBACK
+    ) {
+
+    private val skipIcons = loadData("skip_extension_icons") ?: false
+
+    companion object {
+        private val DIFF_CALLBACK = object : DiffUtil.ItemCallback<AnimeExtension.Available>() {
+            override fun areItemsTheSame(oldItem: AnimeExtension.Available, newItem: AnimeExtension.Available): Boolean {
+                // Your logic here
+                return oldItem.pkgName == newItem.pkgName
+            }
+
+            override fun areContentsTheSame(oldItem: AnimeExtension.Available, newItem: AnimeExtension.Available): Boolean {
+                // Your logic here
+                return oldItem == newItem
+            }
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AnimeExtensionViewHolder {
+        val binding = ItemExtensionAllBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return AnimeExtensionViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: AnimeExtensionViewHolder, position: Int) {
+        val extension = getItem(position)
+        if (extension != null) {
+            if (!skipIcons) {
+                Glide.with(holder.itemView.context)
+                    .load(extension.iconUrl)
+                    .into(holder.extensionIconImageView)
+            }
+            holder.bind(extension)
+        }
+    }
+
+    inner class AnimeExtensionViewHolder(private val binding: ItemExtensionAllBinding) : RecyclerView.ViewHolder(binding.root) {
+        init {
+            binding.closeTextView.setOnClickListener {
+                val extension = getItem(bindingAdapterPosition)
+                if (extension != null) {
+                    clickListener.onInstallClick(extension)
+                }
+            }
+        }
+        val extensionIconImageView: ImageView = binding.extensionIconImageView
+        fun bind(extension: AnimeExtension.Available) {
+            binding.extensionNameTextView.text = extension.name
+        }
+    }
+}
+
+interface OnAnimeInstallClickListener {
+    fun onInstallClick(pkg: AnimeExtension.Available)
+}

app/src/main/java/ani/dantotsu/settings/paging/MangaPagingSource.kt

@@ -0,0 +1,164 @@
+package ani.dantotsu.settings.paging
+
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
+import androidx.paging.PagingDataAdapter
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import androidx.paging.cachedIn
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import ani.dantotsu.databinding.ItemExtensionAllBinding
+import ani.dantotsu.loadData
+import com.bumptech.glide.Glide
+import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
+import eu.kanade.tachiyomi.extension.manga.model.MangaExtension
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flatMapLatest
+import java.lang.Math.min
+
+class MangaExtensionsViewModelFactory(
+    private val mangaExtensionManager: MangaExtensionManager
+) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return MangaExtensionsViewModel(mangaExtensionManager) as T
+    }
+}
+
+class MangaExtensionsViewModel(
+    private val mangaExtensionManager: MangaExtensionManager
+) : ViewModel() {
+    private val searchQuery = MutableStateFlow("")
+    private var currentPagingSource: MangaExtensionPagingSource? = null
+
+    fun setSearchQuery(query: String) {
+        searchQuery.value = query
+    }
+
+    fun invalidatePager() {
+        currentPagingSource?.invalidate()
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val pagerFlow: Flow<PagingData<MangaExtension.Available>> = searchQuery.flatMapLatest { query ->
+        Pager(
+            PagingConfig(
+                pageSize = 15,
+                initialLoadSize = 15,
+                prefetchDistance = 15
+            )
+        ) {
+            MangaExtensionPagingSource(
+                mangaExtensionManager.availableExtensionsFlow,
+                mangaExtensionManager.installedExtensionsFlow,
+                searchQuery
+            ).also { currentPagingSource = it }
+        }.flow
+    }.cachedIn(viewModelScope)
+}
+
+
+class MangaExtensionPagingSource(
+    private val availableExtensionsFlow: StateFlow<List<MangaExtension.Available>>,
+    private val installedExtensionsFlow: StateFlow<List<MangaExtension.Installed>>,
+    private val searchQuery: StateFlow<String>
+) : PagingSource<Int, MangaExtension.Available>() {
+
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, MangaExtension.Available> {
+        val position = params.key ?: 0
+        val installedExtensions = installedExtensionsFlow.first().map { it.pkgName }.toSet()
+        val availableExtensions = availableExtensionsFlow.first().filterNot { it.pkgName in installedExtensions }
+        val query = searchQuery.first()
+        val filteredExtensions = if (query.isEmpty()) {
+            availableExtensions
+        } else {
+            availableExtensions.filter { it.name.contains(query, ignoreCase = true) }
+        }
+
+        return try {
+            val sublist = filteredExtensions.subList(
+                fromIndex = position,
+                toIndex = (position + params.loadSize).coerceAtMost(filteredExtensions.size)
+            )
+            LoadResult.Page(
+                data = sublist,
+                prevKey = if (position == 0) null else position - params.loadSize,
+                nextKey = if (position + params.loadSize >= filteredExtensions.size) null else position + params.loadSize
+            )
+        } catch (e: Exception) {
+            LoadResult.Error(e)
+        }
+    }
+
+    override fun getRefreshKey(state: PagingState<Int, MangaExtension.Available>): Int? {
+        return null
+    }
+}
+
+class MangaExtensionAdapter(private val clickListener: OnMangaInstallClickListener) :
+    PagingDataAdapter<MangaExtension.Available, MangaExtensionAdapter.MangaExtensionViewHolder>(
+        DIFF_CALLBACK
+    ) {
+
+    private val skipIcons = loadData("skip_extension_icons") ?: false
+
+    companion object {
+        private val DIFF_CALLBACK = object : DiffUtil.ItemCallback<MangaExtension.Available>() {
+            override fun areItemsTheSame(oldItem: MangaExtension.Available, newItem: MangaExtension.Available): Boolean {
+                return oldItem.pkgName == newItem.pkgName
+            }
+
+            override fun areContentsTheSame(oldItem: MangaExtension.Available, newItem: MangaExtension.Available): Boolean {
+                return oldItem == newItem
+            }
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MangaExtensionViewHolder {
+        val binding = ItemExtensionAllBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return MangaExtensionViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: MangaExtensionViewHolder, position: Int) {
+        val extension = getItem(position)
+        if (extension != null) {
+            if (!skipIcons) {
+                Glide.with(holder.itemView.context)
+                    .load(extension.iconUrl)
+                    .into(holder.extensionIconImageView)
+            }
+            holder.bind(extension)
+        }
+    }
+
+    inner class MangaExtensionViewHolder(private val binding: ItemExtensionAllBinding) : RecyclerView.ViewHolder(binding.root) {
+        init {
+            binding.closeTextView.setOnClickListener {
+                val extension = getItem(bindingAdapterPosition)
+                if (extension != null) {
+                    clickListener.onInstallClick(extension)
+                }
+            }
+        }
+        val extensionIconImageView: ImageView = binding.extensionIconImageView
+        fun bind(extension: MangaExtension.Available) {
+            binding.extensionNameTextView.text = extension.name
+        }
+    }
+}
+
+interface OnMangaInstallClickListener {
+    fun onInstallClick(pkg: MangaExtension.Available)
+}

app/src/main/java/ani/dantotsu/subcriptions/AlarmReceiver.kt

@@ -40,7 +40,7 @@ class AlarmReceiver : BroadcastReceiver() {
                 PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
             )
             val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-            val curTime = loadData<Int>("subscriptions_time", context) ?: defaultTime
+            val curTime = loadData<Int>("subscriptions_time_s", context) ?: defaultTime
 
             if (timeMinutes[curTime] > 0)
                 alarmManager.setRepeating(

app/src/main/java/ani/dantotsu/subcriptions/Subscription.kt

@@ -16,8 +16,8 @@ import kotlinx.coroutines.launch
 @SuppressLint("MissingPermission")
 class Subscription {
     companion object {
-        const val defaultTime = 8
-        val timeMinutes = arrayOf(0L, 5, 10, 15, 30, 45, 60, 90, 120, 180, 240, 360, 480, 720, 1440)
+        const val defaultTime = 1
+        val timeMinutes = arrayOf(0L, 720, 1440)
 
         private var alreadyStarted = false
         fun Context.startSubscription(force: Boolean = false) {

app/src/main/java/ani/dantotsu/subcriptions/SubscriptionHelper.kt

@@ -9,27 +9,21 @@ import ani.dantotsu.parsers.*
 import ani.dantotsu.saveData
 import ani.dantotsu.tryWithSuspend
 import ani.dantotsu.R
+import ani.dantotsu.media.manga.MangaNameAdapter
 import kotlinx.coroutines.withTimeoutOrNull
 
 class SubscriptionHelper {
     companion object {
         private fun loadSelected(context: Context, mediaId: Int, isAdult: Boolean, isAnime: Boolean): Selected {
+            val sharedPreferences = context.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)
             val data = loadData<Selected>("${mediaId}-select", context) ?: Selected().let {
-                it.source =
-                    if (isAdult) ""
-                    else if (isAnime) {loadData("settings_def_anime_source", context) ?: ""}
-                    else loadData("settings_def_manga_source", context) ?: ""
+                it.sourceIndex =
+                    if (isAdult) 0
+                    else if (isAnime) {sharedPreferences.getInt("settings_def_anime_source_s_r",0)}
+                    else {sharedPreferences.getInt("settings_def_manga_source_s_r",0)}
                 it.preferDub = loadData("settings_prefer_dub", context) ?: false
                 it
             }
-            if (isAnime){
-                val sources = if (isAdult) HAnimeSources else AnimeSources
-                data.sourceIndex = sources.list.indexOfFirst { it.name == data.source }
-            }else{
-                val sources = if (isAdult) HMangaSources else MangaSources
-                data.sourceIndex = sources.list.indexOfFirst { it.name == data.source }
-            }
-            if (data.sourceIndex == -1) {data.sourceIndex = 0}
             return data
         }
 
@@ -40,9 +34,7 @@ class SubscriptionHelper {
         fun getAnimeParser(context: Context, isAdult: Boolean, id: Int): AnimeParser {
             val sources = if (isAdult) HAnimeSources else AnimeSources
             val selected = loadSelected(context, id, isAdult, true)
-            var location = sources.list.indexOfFirst { it.name == selected.source }
-            if (location == -1) {location = 0}
-            val parser = sources[location]
+            val parser = sources[selected.sourceIndex]
             parser.selectDub = selected.preferDub
             return parser
         }
@@ -69,9 +61,7 @@ class SubscriptionHelper {
         fun getMangaParser(context: Context, isAdult: Boolean, id: Int): MangaParser {
             val sources = if (isAdult) HMangaSources else MangaSources
             val selected = loadSelected(context, id, isAdult, false)
-            var location = sources.list.indexOfFirst { it.name == selected.source }
-            if (location == -1) {location = 0}
-            return sources[location]
+            return sources[selected.sourceIndex]
         }
 
         suspend fun getChapter(context: Context, parser: MangaParser, id: Int, isAdult: Boolean): MangaChapter? {
@@ -87,7 +77,7 @@ class SubscriptionHelper {
             }
 
             return chp?.apply {
-                selected.latest = number.toFloat()
+                selected.latest = MangaNameAdapter.findChapterNumber(number) ?: 0f
                 saveSelected(context, id, selected)
             }
         }

app/src/main/java/ani/dantotsu/subcriptions/SubscriptionWorker.kt

@@ -22,7 +22,7 @@ class SubscriptionWorker(val context: Context, params: WorkerParameters) : Corou
 
         private const val SUBSCRIPTION_WORK_NAME = "work_subscription"
         fun enqueue(context: Context) {
-            val curTime = loadData<Int>("subscriptions_time") ?: defaultTime
+            val curTime = loadData<Int>("subscriptions_time_s") ?: defaultTime
             if(timeMinutes[curTime]>0L) {
                 val constraints = Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()
                 val periodicSyncDataWork = PeriodicWorkRequest.Builder(

app/src/main/java/ani/dantotsu/themes/ThemeManager.kt

@@ -0,0 +1,56 @@
+package ani.dantotsu.themes
+
+import android.content.Context
+import android.content.res.Configuration
+import ani.dantotsu.R
+
+class ThemeManager(private val context: Context) {
+    fun applyTheme() {
+        val useOLED = context.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getBoolean("use_oled", false) && isDarkThemeActive(context)
+        if(context.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getBoolean("use_material_you", false)){
+            return
+        }
+        val theme = context.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getString("theme", "PURPLE")!!
+
+        val themeToApply = when (theme) {
+            "PURPLE" -> if (useOLED) R.style.Theme_Dantotsu_PurpleOLED else R.style.Theme_Dantotsu_Purple
+            "BLUE" -> if (useOLED) R.style.Theme_Dantotsu_BlueOLED else R.style.Theme_Dantotsu_Blue
+            "GREEN" -> if (useOLED) R.style.Theme_Dantotsu_GreenOLED else R.style.Theme_Dantotsu_Green
+            "PINK" -> if (useOLED) R.style.Theme_Dantotsu_PinkOLED else R.style.Theme_Dantotsu_Pink
+            "RED" -> if (useOLED) R.style.Theme_Dantotsu_RedOLED else R.style.Theme_Dantotsu_Red
+            "LAVENDER" -> if (useOLED) R.style.Theme_Dantotsu_LavenderOLED else R.style.Theme_Dantotsu_Lavender
+            "MONOCHROME (BETA)" -> if (useOLED) R.style.Theme_Dantotsu_MonochromeOLED else R.style.Theme_Dantotsu_Monochrome
+            else -> if (useOLED) R.style.Theme_Dantotsu_PurpleOLED else R.style.Theme_Dantotsu_Purple
+        }
+
+        context.setTheme(themeToApply)
+    }
+
+    private fun isDarkThemeActive(context: Context): Boolean {
+        return when (context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            Configuration.UI_MODE_NIGHT_NO -> false
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+            else -> false
+        }
+    }
+
+
+    companion object{
+        enum class Theme(val theme: String) {
+            PURPLE("PURPLE"),
+            BLUE("BLUE"),
+            GREEN("GREEN"),
+            PINK("PINK"),
+            RED("RED"),
+            LAVENDER("LAVENDER"),
+            MONOCHROME("MONOCHROME (BETA)");
+
+            companion object {
+                fun fromString(value: String): Theme {
+                    return values().find { it.theme == value } ?: PURPLE
+                }
+            }
+        }
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/animesource/UnmeteredSource.kt

@@ -0,0 +1,8 @@
+package eu.kanade.tachiyomi.animesource
+
+/**
+ * A source that explicitly doesn't require traffic considerations.
+ *
+ * This typically applies for self-hosted sources.
+ */
+interface UnmeteredSource

app/src/main/java/eu/kanade/tachiyomi/animesource/model/Video.kt

@@ -6,18 +6,25 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import okhttp3.Headers
 import rx.subjects.Subject
+import java.io.IOException
+import java.io.ObjectInputStream
+import java.io.ObjectOutputStream
+import java.io.Serializable
 
-data class Track(val url: String, val lang: String)
+data class Track(val url: String, val lang: String) : Serializable
 
 open class Video(
     val url: String = "",
     val quality: String = "",
     var videoUrl: String? = null,
-    val headers: Headers? = null,
+    headers: Headers? = null,
     // "url", "language-label-2", "url2", "language-label-2"
     val subtitleTracks: List<Track> = emptyList(),
     val audioTracks: List<Track> = emptyList(),
-) : ProgressListener {
+) : Serializable, ProgressListener {
+
+    @Transient
+    var headers: Headers? = headers
 
     @Suppress("UNUSED_PARAMETER")
     constructor(
@@ -89,4 +96,27 @@ open class Video(
         READY,
         ERROR,
     }
+
+    @Throws(IOException::class)
+    private fun writeObject(out: ObjectOutputStream) {
+        out.defaultWriteObject()
+        val headersMap: Map<String, List<String>> = headers?.toMultimap() ?: emptyMap()
+        out.writeObject(headersMap)
+    }
+
+    @Throws(IOException::class, ClassNotFoundException::class)
+    private fun readObject(input: ObjectInputStream) {
+        input.defaultReadObject()
+        val headersMap = input.readObject() as? Map<String, List<String>>
+        headers = headersMap?.let { map ->
+            val builder = Headers.Builder()
+            for ((key, values) in map) {
+                for (value in values) {
+                    builder.add(key, value)
+                }
+            }
+            builder.build()
+        }
+
+    }
 }

app/src/main/java/eu/kanade/tachiyomi/data/preference/SharedPreferencesDataStore.kt

@@ -0,0 +1,68 @@
+package eu.kanade.tachiyomi.data.preference
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import androidx.preference.PreferenceDataStore
+
+class SharedPreferencesDataStore(private val prefs: SharedPreferences) : PreferenceDataStore() {
+
+    override fun getBoolean(key: String?, defValue: Boolean): Boolean {
+        return prefs.getBoolean(key, defValue)
+    }
+
+    override fun putBoolean(key: String?, value: Boolean) {
+        prefs.edit {
+            putBoolean(key, value)
+        }
+    }
+
+    override fun getInt(key: String?, defValue: Int): Int {
+        return prefs.getInt(key, defValue)
+    }
+
+    override fun putInt(key: String?, value: Int) {
+        prefs.edit {
+            putInt(key, value)
+        }
+    }
+
+    override fun getLong(key: String?, defValue: Long): Long {
+        return prefs.getLong(key, defValue)
+    }
+
+    override fun putLong(key: String?, value: Long) {
+        prefs.edit {
+            putLong(key, value)
+        }
+    }
+
+    override fun getFloat(key: String?, defValue: Float): Float {
+        return prefs.getFloat(key, defValue)
+    }
+
+    override fun putFloat(key: String?, value: Float) {
+        prefs.edit {
+            putFloat(key, value)
+        }
+    }
+
+    override fun getString(key: String?, defValue: String?): String? {
+        return prefs.getString(key, defValue)
+    }
+
+    override fun putString(key: String?, value: String?) {
+        prefs.edit {
+            putString(key, value)
+        }
+    }
+
+    override fun getStringSet(key: String?, defValues: MutableSet<String>?): MutableSet<String>? {
+        return prefs.getStringSet(key, defValues)
+    }
+
+    override fun putStringSet(key: String?, values: MutableSet<String>?) {
+        prefs.edit {
+            putStringSet(key, values)
+        }
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/extension/anime/util/AnimeExtensionInstallActivity.kt

@@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.extension.anime.util
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import ani.dantotsu.themes.ThemeManager
 import eu.kanade.tachiyomi.extension.InstallStep
 import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
 import eu.kanade.tachiyomi.util.system.hasMiuiPackageInstaller
@@ -24,6 +25,7 @@ class AnimeExtensionInstallActivity : Activity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
 
         val installIntent = Intent(Intent.ACTION_INSTALL_PACKAGE)
             .setDataAndType(intent.data, intent.type)

app/src/main/java/eu/kanade/tachiyomi/extension/anime/util/AnimeExtensionInstaller.kt

@@ -108,8 +108,11 @@ internal class AnimeExtensionInstaller(private val context: Context) {
             // Get the current download status
             .map {
                 downloadManager.query(query).use { cursor ->
-                    cursor.moveToFirst()
-                    cursor.getInt(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_STATUS))
+                    if (cursor.moveToFirst()) {
+                        cursor.getInt(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_STATUS))
+                    } else {
+                        DownloadManager.STATUS_FAILED
+                    }
                 }
             }
             // Ignore duplicate results

app/src/main/java/eu/kanade/tachiyomi/extension/manga/util/MangaExtensionInstallActivity.kt

@@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.extension.manga.util
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import ani.dantotsu.themes.ThemeManager
 import eu.kanade.tachiyomi.extension.InstallStep
 import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
 import eu.kanade.tachiyomi.util.system.hasMiuiPackageInstaller
@@ -24,6 +25,7 @@ class MangaExtensionInstallActivity : Activity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
 
         val installIntent = Intent(Intent.ACTION_INSTALL_PACKAGE)
             .setDataAndType(intent.data, intent.type)

app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt

@@ -11,11 +11,13 @@ import eu.kanade.tachiyomi.network.interceptor.UncaughtExceptionInterceptor
 import eu.kanade.tachiyomi.network.interceptor.UserAgentInterceptor
 import okhttp3.Cache
 import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
 import java.io.File
 import java.util.concurrent.TimeUnit
 
 class NetworkHelper(
     context: Context,
+    private val preferences: NetworkPreferences,
 ) {
 
     private val cacheDir = File(context.cacheDir, "network_cache")
@@ -40,18 +42,17 @@ class NetworkHelper(
                 .addInterceptor(UncaughtExceptionInterceptor())
                 .addInterceptor(userAgentInterceptor)
 
-            /*if (preferences.verboseLogging().get()) {
+            if (preferences.verboseLogging().get()) {
                 val httpLoggingInterceptor = HttpLoggingInterceptor().apply {
                     level = HttpLoggingInterceptor.Level.HEADERS
                 }
                 builder.addNetworkInterceptor(httpLoggingInterceptor)
-            }*/
+            }
 
-            //when (preferences.dohProvider().get()) {
-            when (PREF_DOH_CLOUDFLARE) {
+            when (preferences.dohProvider().get()) {
                 PREF_DOH_CLOUDFLARE -> builder.dohCloudflare()
                 PREF_DOH_GOOGLE -> builder.dohGoogle()
-                /*PREF_DOH_ADGUARD -> builder.dohAdGuard()
+                PREF_DOH_ADGUARD -> builder.dohAdGuard()
                 PREF_DOH_QUAD9 -> builder.dohQuad9()
                 PREF_DOH_ALIDNS -> builder.dohAliDNS()
                 PREF_DOH_DNSPOD -> builder.dohDNSPod()
@@ -60,7 +61,7 @@ class NetworkHelper(
                 PREF_DOH_MULLVAD -> builder.dohMullvad()
                 PREF_DOH_CONTROLD -> builder.dohControlD()
                 PREF_DOH_NJALLA -> builder.dohNajalla()
-                PREF_DOH_SHECAN -> builder.dohShecan()*/
+                PREF_DOH_SHECAN -> builder.dohShecan()
             }
 
             return builder
@@ -75,5 +76,5 @@ class NetworkHelper(
             .build()
     }
 
-    fun defaultUserAgentProvider() = "Mozilla/5.0 (Linux; Android %s; %s) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Mobile Safari/537.36"//preferences.defaultUserAgent().get().trim()
+    fun defaultUserAgentProvider() = preferences.defaultUserAgent().get().trim()
 }

app/src/main/java/eu/kanade/tachiyomi/network/NetworkPreferences.kt

@@ -0,0 +1,22 @@
+package eu.kanade.tachiyomi.network
+
+import tachiyomi.core.preference.Preference
+import tachiyomi.core.preference.PreferenceStore
+
+class NetworkPreferences(
+    private val preferenceStore: PreferenceStore,
+    private val verboseLogging: Boolean = false,
+) {
+
+    fun verboseLogging(): Preference<Boolean> {
+        return preferenceStore.getBoolean("verbose_logging", verboseLogging)
+    }
+
+    fun dohProvider(): Preference<Int> {
+        return preferenceStore.getInt("doh_provider", 0)
+    }
+
+    fun defaultUserAgent(): Preference<String> {
+        return preferenceStore.getString("default_user_agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:110.0) Gecko/20100101 Firefox/110.0")
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/source/anime/AndroidAnimeSourceManager.kt

@@ -0,0 +1,85 @@
+package eu.kanade.tachiyomi.source.anime
+
+import android.content.Context
+import eu.kanade.tachiyomi.animesource.AnimeCatalogueSource
+import eu.kanade.tachiyomi.animesource.AnimeSource
+import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
+import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import tachiyomi.domain.source.anime.model.AnimeSourceData
+import tachiyomi.domain.source.anime.model.StubAnimeSource
+import tachiyomi.domain.source.anime.service.AnimeSourceManager
+import tachiyomi.source.local.entries.anime.LocalAnimeSource
+import java.util.concurrent.ConcurrentHashMap
+
+class AndroidAnimeSourceManager(
+    private val context: Context,
+    private val extensionManager: AnimeExtensionManager,
+) : AnimeSourceManager {
+
+    private val scope = CoroutineScope(Job() + Dispatchers.IO)
+
+    private val sourcesMapFlow = MutableStateFlow(ConcurrentHashMap<Long, AnimeSource>())
+
+    private val stubSourcesMap = ConcurrentHashMap<Long, StubAnimeSource>()
+
+    override val catalogueSources: Flow<List<AnimeCatalogueSource>> = sourcesMapFlow.map { it.values.filterIsInstance<AnimeCatalogueSource>() }
+
+    init {
+        scope.launch {
+            extensionManager.installedExtensionsFlow
+                .collectLatest { extensions ->
+                    val mutableMap = ConcurrentHashMap<Long, AnimeSource>(
+                        mapOf(
+                            LocalAnimeSource.ID to LocalAnimeSource(
+                                context,
+                            ),
+                        ),
+                    )
+                    extensions.forEach { extension ->
+                        extension.sources.forEach {
+                            mutableMap[it.id] = it
+                            registerStubSource(it.toSourceData())
+                        }
+                    }
+                    sourcesMapFlow.value = mutableMap
+                }
+        }
+
+    }
+
+    override fun get(sourceKey: Long): AnimeSource? {
+        return sourcesMapFlow.value[sourceKey]
+    }
+
+    override fun getOrStub(sourceKey: Long): AnimeSource {
+        return sourcesMapFlow.value[sourceKey] ?: stubSourcesMap.getOrPut(sourceKey) {
+            runBlocking { createStubSource(sourceKey) }
+        }
+    }
+
+    override fun getOnlineSources() = sourcesMapFlow.value.values.filterIsInstance<AnimeHttpSource>()
+
+    override fun getCatalogueSources() = sourcesMapFlow.value.values.filterIsInstance<AnimeCatalogueSource>()
+
+    override fun getStubSources(): List<StubAnimeSource> {
+        val onlineSourceIds = getOnlineSources().map { it.id }
+        return stubSourcesMap.values.filterNot { it.id in onlineSourceIds }
+    }
+
+    private fun registerStubSource(sourceData: AnimeSourceData) {
+
+    }
+
+    private suspend fun createStubSource(id: Long): StubAnimeSource {
+        return StubAnimeSource(AnimeSourceData(id, "", ""))
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/source/anime/AnimeSourceExtensions.kt

@@ -0,0 +1,34 @@
+package eu.kanade.tachiyomi.source.anime
+
+import android.graphics.drawable.Drawable
+import eu.kanade.domain.source.service.SourcePreferences
+import eu.kanade.tachiyomi.animesource.AnimeSource
+import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
+import tachiyomi.domain.source.anime.model.AnimeSourceData
+import tachiyomi.domain.source.anime.model.StubAnimeSource
+import tachiyomi.source.local.entries.anime.isLocal
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+fun AnimeSource.icon(): Drawable? = Injekt.get<AnimeExtensionManager>().getAppIconForSource(this.id)
+
+fun AnimeSource.getPreferenceKey(): String = "source_$id"
+
+fun AnimeSource.toSourceData(): AnimeSourceData = AnimeSourceData(id = id, lang = lang, name = name)
+
+fun AnimeSource.getNameForAnimeInfo(): String {
+    val preferences = Injekt.get<SourcePreferences>()
+    val enabledLanguages = preferences.enabledLanguages().get()
+        .filterNot { it in listOf("all", "other") }
+    val hasOneActiveLanguages = enabledLanguages.size == 1
+    val isInEnabledLanguages = lang in enabledLanguages
+    return when {
+        // For edge cases where user disables a source they got manga of in their library.
+        hasOneActiveLanguages && !isInEnabledLanguages -> toString()
+        // Hide the language tag when only one language is used.
+        hasOneActiveLanguages && isInEnabledLanguages -> name
+        else -> toString()
+    }
+}
+
+fun AnimeSource.isLocalOrStub(): Boolean = isLocal() || this is StubAnimeSource

app/src/main/java/eu/kanade/tachiyomi/source/manga/AndroidMangaSourceManager.kt

@@ -0,0 +1,84 @@
+package eu.kanade.tachiyomi.source.manga
+
+import android.content.Context
+import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
+import eu.kanade.tachiyomi.source.CatalogueSource
+import eu.kanade.tachiyomi.source.MangaSource
+import eu.kanade.tachiyomi.source.online.HttpSource
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import tachiyomi.domain.source.manga.model.MangaSourceData
+import tachiyomi.domain.source.manga.model.StubMangaSource
+import tachiyomi.domain.source.manga.service.MangaSourceManager
+import tachiyomi.source.local.entries.manga.LocalMangaSource
+import java.util.concurrent.ConcurrentHashMap
+
+class AndroidMangaSourceManager(
+    private val context: Context,
+    private val extensionManager: MangaExtensionManager,
+) : MangaSourceManager {
+
+    private val scope = CoroutineScope(Job() + Dispatchers.IO)
+
+    private val sourcesMapFlow = MutableStateFlow(ConcurrentHashMap<Long, MangaSource>())
+
+    private val stubSourcesMap = ConcurrentHashMap<Long, StubMangaSource>()
+
+    override val catalogueSources: Flow<List<CatalogueSource>> = sourcesMapFlow.map { it.values.filterIsInstance<CatalogueSource>() }
+
+    init {
+        scope.launch {
+            extensionManager.installedExtensionsFlow
+                .collectLatest { extensions ->
+                    val mutableMap = ConcurrentHashMap<Long, MangaSource>(
+                        mapOf(
+                            LocalMangaSource.ID to LocalMangaSource(
+                                context,
+                            ),
+                        ),
+                    )
+                    extensions.forEach { extension ->
+                        extension.sources.forEach {
+                            mutableMap[it.id] = it
+                            registerStubSource(it.toSourceData())
+                        }
+                    }
+                    sourcesMapFlow.value = mutableMap
+                }
+        }
+    }
+
+    override fun get(sourceKey: Long): MangaSource? {
+        return sourcesMapFlow.value[sourceKey]
+    }
+
+    override fun getOrStub(sourceKey: Long): MangaSource {
+        return sourcesMapFlow.value[sourceKey] ?: stubSourcesMap.getOrPut(sourceKey) {
+            runBlocking { createStubSource(sourceKey) }
+        }
+    }
+
+    override fun getOnlineSources() = sourcesMapFlow.value.values.filterIsInstance<HttpSource>()
+
+    override fun getCatalogueSources() = sourcesMapFlow.value.values.filterIsInstance<CatalogueSource>()
+
+    override fun getStubSources(): List<StubMangaSource> {
+        val onlineSourceIds = getOnlineSources().map { it.id }
+        return stubSourcesMap.values.filterNot { it.id in onlineSourceIds }
+    }
+
+    private fun registerStubSource(sourceData: MangaSourceData) {
+
+    }
+
+    private suspend fun createStubSource(id: Long): StubMangaSource {
+        return StubMangaSource(MangaSourceData(id, "", ""))
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/source/manga/MangaSourceExtensions.kt

@@ -0,0 +1,34 @@
+package eu.kanade.tachiyomi.source.manga
+
+import android.graphics.drawable.Drawable
+import eu.kanade.domain.source.service.SourcePreferences
+import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
+import eu.kanade.tachiyomi.source.MangaSource
+import tachiyomi.domain.source.manga.model.MangaSourceData
+import tachiyomi.domain.source.manga.model.StubMangaSource
+import tachiyomi.source.local.entries.manga.isLocal
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+fun MangaSource.icon(): Drawable? = Injekt.get<MangaExtensionManager>().getAppIconForSource(this.id)
+
+fun MangaSource.getPreferenceKey(): String = "source_$id"
+
+fun MangaSource.toSourceData(): MangaSourceData = MangaSourceData(id = id, lang = lang, name = name)
+
+fun MangaSource.getNameForMangaInfo(): String {
+    val preferences = Injekt.get<SourcePreferences>()
+    val enabledLanguages = preferences.enabledLanguages().get()
+        .filterNot { it in listOf("all", "other") }
+    val hasOneActiveLanguages = enabledLanguages.size == 1
+    val isInEnabledLanguages = lang in enabledLanguages
+    return when {
+        // For edge cases where user disables a source they got manga of in their library.
+        hasOneActiveLanguages && !isInEnabledLanguages -> toString()
+        // Hide the language tag when only one language is used.
+        hasOneActiveLanguages && isInEnabledLanguages -> name
+        else -> toString()
+    }
+}
+
+fun MangaSource.isLocalOrStub(): Boolean = isLocal() || this is StubMangaSource

app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt

@@ -0,0 +1,117 @@
+package eu.kanade.tachiyomi.util.storage
+
+import android.content.Context
+import android.media.MediaScannerConnection
+import android.net.Uri
+import android.os.Environment
+import android.os.StatFs
+import androidx.core.content.ContextCompat
+import com.hippo.unifile.UniFile
+import eu.kanade.tachiyomi.util.lang.Hash
+import java.io.File
+
+object DiskUtil {
+
+    fun hashKeyForDisk(key: String): String {
+        return Hash.md5(key)
+    }
+
+    fun getDirectorySize(f: File): Long {
+        var size: Long = 0
+        if (f.isDirectory) {
+            for (file in f.listFiles().orEmpty()) {
+                size += getDirectorySize(file)
+            }
+        } else {
+            size = f.length()
+        }
+        return size
+    }
+
+    /**
+     * Gets the available space for the disk that a file path points to, in bytes.
+     */
+    fun getAvailableStorageSpace(f: UniFile): Long {
+        return try {
+            val stat = StatFs(f.uri.path)
+            stat.availableBlocksLong * stat.blockSizeLong
+        } catch (_: Exception) {
+            -1L
+        }
+    }
+
+    /**
+     * Returns the root folders of all the available external storages.
+     */
+    fun getExternalStorages(context: Context): List<File> {
+        return ContextCompat.getExternalFilesDirs(context, null)
+            .filterNotNull()
+            .mapNotNull {
+                val file = File(it.absolutePath.substringBefore("/Android/"))
+                val state = Environment.getExternalStorageState(file)
+                if (state == Environment.MEDIA_MOUNTED || state == Environment.MEDIA_MOUNTED_READ_ONLY) {
+                    file
+                } else {
+                    null
+                }
+            }
+    }
+
+    /**
+     * Don't display downloaded chapters in gallery apps creating `.nomedia`.
+     */
+    fun createNoMediaFile(dir: UniFile?, context: Context?) {
+        if (dir != null && dir.exists()) {
+            val nomedia = dir.findFile(NOMEDIA_FILE)
+            if (nomedia == null) {
+                dir.createFile(NOMEDIA_FILE)
+                context?.let { scanMedia(it, dir.uri) }
+            }
+        }
+    }
+
+    /**
+     * Scans the given file so that it can be shown in gallery apps, for example.
+     */
+    fun scanMedia(context: Context, uri: Uri) {
+        MediaScannerConnection.scanFile(context, arrayOf(uri.path), null, null)
+    }
+
+    /**
+     * Mutate the given filename to make it valid for a FAT filesystem,
+     * replacing any invalid characters with "_". This method doesn't allow hidden files (starting
+     * with a dot), but you can manually add it later.
+     */
+    fun buildValidFilename(origName: String): String {
+        val name = origName.trim('.', ' ')
+        if (name.isEmpty()) {
+            return "(invalid)"
+        }
+        val sb = StringBuilder(name.length)
+        name.forEach { c ->
+            if (isValidFatFilenameChar(c)) {
+                sb.append(c)
+            } else {
+                sb.append('_')
+            }
+        }
+        // Even though vfat allows 255 UCS-2 chars, we might eventually write to
+        // ext4 through a FUSE layer, so use that limit minus 15 reserved characters.
+        return sb.toString().take(240)
+    }
+
+    /**
+     * Returns true if the given character is a valid filename character, false otherwise.
+     */
+    private fun isValidFatFilenameChar(c: Char): Boolean {
+        if (0x00.toChar() <= c && c <= 0x1f.toChar()) {
+            return false
+        }
+        return when (c) {
+            '"', '*', '/', ':', '<', '>', '?', '\\', '|', 0x7f.toChar() -> false
+            else -> true
+        }
+    }
+
+    const val NOMEDIA_FILE = ".nomedia"
+}

app/src/main/java/eu/kanade/tachiyomi/util/view/EditTextPreferenceExtensions.kt

@@ -0,0 +1,10 @@
+@file:Suppress("PackageDirectoryMismatch")
+
+package androidx.preference
+
+/**
+ * Returns package-private [EditTextPreference.getOnBindEditTextListener]
+ */
+fun EditTextPreference.getOnBindEditTextListener(): EditTextPreference.OnBindEditTextListener? {
+    return onBindEditTextListener
+}

app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiTextInputEditText.kt

@@ -0,0 +1,62 @@
+package eu.kanade.tachiyomi.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.EditText
+import androidx.core.view.inputmethod.EditorInfoCompat
+import com.google.android.material.textfield.TextInputEditText
+import eu.kanade.domain.base.BasePreferences
+import eu.kanade.tachiyomi.widget.TachiyomiTextInputEditText.Companion.setIncognito
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+/**
+ * A custom [TextInputEditText] that sets [EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING] to imeOptions
+ * if [BasePreferences.incognitoMode] is true. Some IMEs may not respect this flag.
+ *
+ * @see setIncognito
+ */
+class TachiyomiTextInputEditText @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0,
+) : TextInputEditText(context, attrs, defStyleAttr) {
+
+    private var scope: CoroutineScope? = null
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+        setIncognito(scope!!)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        scope?.cancel()
+        scope = null
+    }
+
+    companion object {
+        /**
+         * Sets Flow to this [EditText] that sets [EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING] to imeOptions
+         * if [BasePreferences.incognitoMode] is true. Some IMEs may not respect this flag.
+         */
+        fun EditText.setIncognito(viewScope: CoroutineScope) {
+            Injekt.get<BasePreferences>().incognitoMode().changes()
+                .onEach {
+                    imeOptions = if (it) {
+                        imeOptions or EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING
+                    } else {
+                        imeOptions and EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING.inv()
+                    }
+                }
+                .launchIn(viewScope)
+        }
+    }
+}

app/src/main/java/tachiyomi/core/metadata/tachiyomi/AnimeDetails.kt

@@ -0,0 +1,13 @@
+package tachiyomi.core.metadata.tachiyomi
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+class AnimeDetails(
+    val title: String? = null,
+    val author: String? = null,
+    val artist: String? = null,
+    val description: String? = null,
+    val genre: List<String>? = null,
+    val status: Int? = null,
+)

app/src/main/java/tachiyomi/core/metadata/tachiyomi/MangaDetails.kt

@@ -0,0 +1,13 @@
+package tachiyomi.core.metadata.tachiyomi
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+class MangaDetails(
+    val title: String? = null,
+    val author: String? = null,
+    val artist: String? = null,
+    val description: String? = null,
+    val genre: List<String>? = null,
+    val status: Int? = null,
+)

app/src/main/java/tachiyomi/domain/entries/TriStateFilter.kt

@@ -0,0 +1,22 @@
+package tachiyomi.domain.entries
+
+enum class TriStateFilter {
+    DISABLED, // Disable filter
+    ENABLED_IS, // Enabled with "is" filter
+    ENABLED_NOT, // Enabled with "not" filter
+    ;
+
+    fun next(): TriStateFilter {
+        return when (this) {
+            DISABLED -> ENABLED_IS
+            ENABLED_IS -> ENABLED_NOT
+            ENABLED_NOT -> DISABLED
+        }
+    }
+}
+
+inline fun applyFilter(filter: TriStateFilter, predicate: () -> Boolean): Boolean = when (filter) {
+    TriStateFilter.DISABLED -> true
+    TriStateFilter.ENABLED_IS -> predicate()
+    TriStateFilter.ENABLED_NOT -> !predicate()
+}

app/src/main/java/tachiyomi/domain/entries/anime/model/Anime.kt

@@ -0,0 +1,134 @@
+package tachiyomi.domain.entries.anime.model
+
+import eu.kanade.tachiyomi.source.model.UpdateStrategy
+import tachiyomi.domain.entries.TriStateFilter
+import java.io.Serializable
+import kotlin.math.pow
+
+data class Anime(
+    val id: Long,
+    val source: Long,
+    val favorite: Boolean,
+    val lastUpdate: Long,
+    val nextUpdate: Long,
+    val calculateInterval: Int,
+    val dateAdded: Long,
+    val viewerFlags: Long,
+    val episodeFlags: Long,
+    val coverLastModified: Long,
+    val url: String,
+    val title: String,
+    val artist: String?,
+    val author: String?,
+    val description: String?,
+    val genre: List<String>?,
+    val status: Long,
+    val thumbnailUrl: String?,
+    val updateStrategy: UpdateStrategy,
+    val initialized: Boolean,
+) : Serializable {
+
+    val sorting: Long
+        get() = episodeFlags and EPISODE_SORTING_MASK
+
+    val displayMode: Long
+        get() = episodeFlags and EPISODE_DISPLAY_MASK
+
+    val unseenFilterRaw: Long
+        get() = episodeFlags and EPISODE_UNSEEN_MASK
+
+    val downloadedFilterRaw: Long
+        get() = episodeFlags and EPISODE_DOWNLOADED_MASK
+
+    val bookmarkedFilterRaw: Long
+        get() = episodeFlags and EPISODE_BOOKMARKED_MASK
+
+    val skipIntroLength: Int
+        get() = (viewerFlags and ANIME_INTRO_MASK).toInt()
+
+    val nextEpisodeToAir: Int
+        get() = (viewerFlags and ANIME_AIRING_EPISODE_MASK).removeHexZeros(zeros = 2).toInt()
+
+    val nextEpisodeAiringAt: Long
+        get() = (viewerFlags and ANIME_AIRING_TIME_MASK).removeHexZeros(zeros = 6)
+
+    val unseenFilter: TriStateFilter
+        get() = when (unseenFilterRaw) {
+            EPISODE_SHOW_UNSEEN -> TriStateFilter.ENABLED_IS
+            EPISODE_SHOW_SEEN -> TriStateFilter.ENABLED_NOT
+            else -> TriStateFilter.DISABLED
+        }
+
+    val bookmarkedFilter: TriStateFilter
+        get() = when (bookmarkedFilterRaw) {
+            EPISODE_SHOW_BOOKMARKED -> TriStateFilter.ENABLED_IS
+            EPISODE_SHOW_NOT_BOOKMARKED -> TriStateFilter.ENABLED_NOT
+            else -> TriStateFilter.DISABLED
+        }
+
+    fun sortDescending(): Boolean {
+        return episodeFlags and EPISODE_SORT_DIR_MASK == EPISODE_SORT_DESC
+    }
+
+    private fun Long.removeHexZeros(zeros: Int): Long {
+        val hex = 16.0
+        return this.div(hex.pow(zeros)).toLong()
+    }
+
+    companion object {
+        // Generic filter that does not filter anything
+        const val SHOW_ALL = 0x00000000L
+
+        const val EPISODE_SORT_DESC = 0x00000000L
+        const val EPISODE_SORT_ASC = 0x00000001L
+        const val EPISODE_SORT_DIR_MASK = 0x00000001L
+
+        const val EPISODE_SHOW_UNSEEN = 0x00000002L
+        const val EPISODE_SHOW_SEEN = 0x00000004L
+        const val EPISODE_UNSEEN_MASK = 0x00000006L
+
+        const val EPISODE_SHOW_DOWNLOADED = 0x00000008L
+        const val EPISODE_SHOW_NOT_DOWNLOADED = 0x00000010L
+        const val EPISODE_DOWNLOADED_MASK = 0x00000018L
+
+        const val EPISODE_SHOW_BOOKMARKED = 0x00000020L
+        const val EPISODE_SHOW_NOT_BOOKMARKED = 0x00000040L
+        const val EPISODE_BOOKMARKED_MASK = 0x00000060L
+
+        const val EPISODE_SORTING_SOURCE = 0x00000000L
+        const val EPISODE_SORTING_NUMBER = 0x00000100L
+        const val EPISODE_SORTING_UPLOAD_DATE = 0x00000200L
+        const val EPISODE_SORTING_MASK = 0x00000300L
+
+        const val EPISODE_DISPLAY_NAME = 0x00000000L
+        const val EPISODE_DISPLAY_NUMBER = 0x00100000L
+        const val EPISODE_DISPLAY_MASK = 0x00100000L
+
+        const val ANIME_INTRO_MASK = 0x000000000000FFL
+        const val ANIME_AIRING_EPISODE_MASK = 0x00000000FFFF00L
+        const val ANIME_AIRING_TIME_MASK = 0xFFFFFFFF000000L
+
+        fun create() = Anime(
+            id = -1L,
+            url = "",
+            title = "",
+            source = -1L,
+            favorite = false,
+            lastUpdate = 0L,
+            nextUpdate = 0L,
+            calculateInterval = 0,
+            dateAdded = 0L,
+            viewerFlags = 0L,
+            episodeFlags = 0L,
+            coverLastModified = 0L,
+            artist = null,
+            author = null,
+            description = null,
+            genre = null,
+            status = 0L,
+            thumbnailUrl = null,
+            updateStrategy = UpdateStrategy.ALWAYS_UPDATE,
+            initialized = false,
+        )
+    }
+}

app/src/main/java/tachiyomi/domain/entries/manga/model/Manga.kt

@@ -0,0 +1,115 @@
+package tachiyomi.domain.entries.manga.model
+
+import eu.kanade.tachiyomi.source.model.UpdateStrategy
+import tachiyomi.domain.entries.TriStateFilter
+import java.io.Serializable
+
+data class Manga(
+    val id: Long,
+    val source: Long,
+    val favorite: Boolean,
+    val lastUpdate: Long,
+    val nextUpdate: Long,
+    val calculateInterval: Int,
+    val dateAdded: Long,
+    val viewerFlags: Long,
+    val chapterFlags: Long,
+    val coverLastModified: Long,
+    val url: String,
+    val title: String,
+    val artist: String?,
+    val author: String?,
+    val description: String?,
+    val genre: List<String>?,
+    val status: Long,
+    val thumbnailUrl: String?,
+    val updateStrategy: UpdateStrategy,
+    val initialized: Boolean,
+) : Serializable {
+
+    val sorting: Long
+        get() = chapterFlags and CHAPTER_SORTING_MASK
+
+    val displayMode: Long
+        get() = chapterFlags and CHAPTER_DISPLAY_MASK
+
+    val unreadFilterRaw: Long
+        get() = chapterFlags and CHAPTER_UNREAD_MASK
+
+    val downloadedFilterRaw: Long
+        get() = chapterFlags and CHAPTER_DOWNLOADED_MASK
+
+    val bookmarkedFilterRaw: Long
+        get() = chapterFlags and CHAPTER_BOOKMARKED_MASK
+
+    val unreadFilter: TriStateFilter
+        get() = when (unreadFilterRaw) {
+            CHAPTER_SHOW_UNREAD -> TriStateFilter.ENABLED_IS
+            CHAPTER_SHOW_READ -> TriStateFilter.ENABLED_NOT
+            else -> TriStateFilter.DISABLED
+        }
+
+    val bookmarkedFilter: TriStateFilter
+        get() = when (bookmarkedFilterRaw) {
+            CHAPTER_SHOW_BOOKMARKED -> TriStateFilter.ENABLED_IS
+            CHAPTER_SHOW_NOT_BOOKMARKED -> TriStateFilter.ENABLED_NOT
+            else -> TriStateFilter.DISABLED
+        }
+
+    fun sortDescending(): Boolean {
+        return chapterFlags and CHAPTER_SORT_DIR_MASK == CHAPTER_SORT_DESC
+    }
+
+    companion object {
+        // Generic filter that does not filter anything
+        const val SHOW_ALL = 0x00000000L
+
+        const val CHAPTER_SORT_DESC = 0x00000000L
+        const val CHAPTER_SORT_ASC = 0x00000001L
+        const val CHAPTER_SORT_DIR_MASK = 0x00000001L
+
+        const val CHAPTER_SHOW_UNREAD = 0x00000002L
+        const val CHAPTER_SHOW_READ = 0x00000004L
+        const val CHAPTER_UNREAD_MASK = 0x00000006L
+
+        const val CHAPTER_SHOW_DOWNLOADED = 0x00000008L
+        const val CHAPTER_SHOW_NOT_DOWNLOADED = 0x00000010L
+        const val CHAPTER_DOWNLOADED_MASK = 0x00000018L
+
+        const val CHAPTER_SHOW_BOOKMARKED = 0x00000020L
+        const val CHAPTER_SHOW_NOT_BOOKMARKED = 0x00000040L
+        const val CHAPTER_BOOKMARKED_MASK = 0x00000060L
+
+        const val CHAPTER_SORTING_SOURCE = 0x00000000L
+        const val CHAPTER_SORTING_NUMBER = 0x00000100L
+        const val CHAPTER_SORTING_UPLOAD_DATE = 0x00000200L
+        const val CHAPTER_SORTING_MASK = 0x00000300L
+
+        const val CHAPTER_DISPLAY_NAME = 0x00000000L
+        const val CHAPTER_DISPLAY_NUMBER = 0x00100000L
+        const val CHAPTER_DISPLAY_MASK = 0x00100000L
+
+        fun create() = Manga(
+            id = -1L,
+            url = "",
+            title = "",
+            source = -1L,
+            favorite = false,
+            lastUpdate = 0L,
+            nextUpdate = 0L,
+            calculateInterval = 0,
+            dateAdded = 0L,
+            viewerFlags = 0L,
+            chapterFlags = 0L,
+            coverLastModified = 0L,
+            artist = null,
+            author = null,
+            description = null,
+            genre = null,
+            status = 0L,
+            thumbnailUrl = null,
+            updateStrategy = UpdateStrategy.ALWAYS_UPDATE,
+            initialized = false,
+        )
+    }
+}

app/src/main/java/tachiyomi/domain/items/episode/service/EpisodeRecognition.kt

@@ -0,0 +1,119 @@
+package tachiyomi.domain.items.episode.service
+
+/**
+ * -R> = regex conversion.
+ */
+object EpisodeRecognition {
+
+    private const val NUMBER_PATTERN = """([0-9]+)(\.[0-9]+)?(\.?[a-z]+)?"""
+
+    /**
+     * All cases with Ch.xx
+     * Mokushiroku Alice Vol.1 Ch. 4: Misrepresentation -R> 4
+     */
+    private val basic = Regex("""(?<=ep\.) *$NUMBER_PATTERN""")
+
+    /**
+     * Example: Bleach 567: Down With Snowwhite -R> 567
+     */
+    private val number = Regex(NUMBER_PATTERN)
+
+    /**
+     * Regex used to remove unwanted tags
+     * Example Prison School 12 v.1 vol004 version1243 volume64 -R> Prison School 12
+     */
+    private val unwanted = Regex("""\b(?:v|ver|vol|version|volume|season|s)[^a-z]?[0-9]+""")
+
+    /**
+     * Regex used to remove unwanted whitespace
+     * Example One Piece 12 special -R> One Piece 12special
+     */
+    private val unwantedWhiteSpace = Regex("""\s(?=extra|special|omake)""")
+
+    fun parseEpisodeNumber(animeTitle: String, episodeName: String, episodeNumber: Float? = null): Float {
+        // If episode number is known return.
+        if (episodeNumber != null && (episodeNumber == -2f || episodeNumber > -1f)) {
+            return episodeNumber
+        }
+
+        // Get chapter title with lower case
+        var name = episodeName.lowercase()
+
+        // Remove anime title from episode title.
+        name = name.replace(animeTitle.lowercase(), "").trim()
+
+        // Remove comma's or hyphens.
+        name = name.replace(',', '.').replace('-', '.')
+
+        // Remove unwanted white spaces.
+        name = unwantedWhiteSpace.replace(name, "")
+
+        // Remove unwanted tags.
+        name = unwanted.replace(name, "")
+
+        // Check base case ch.xx
+        basic.find(name)?.let { return getEpisodeNumberFromMatch(it) }
+
+        // Take the first number encountered.
+        number.find(name)?.let { return getEpisodeNumberFromMatch(it) }
+
+        return episodeNumber ?: -1f
+    }
+
+    /**
+     * Check if episode number is found and return it
+     * @param match result of regex
+     * @return chapter number if found else null
+     */
+    private fun getEpisodeNumberFromMatch(match: MatchResult): Float {
+        return match.let {
+            val initial = it.groups[1]?.value?.toFloat()!!
+            val subChapterDecimal = it.groups[2]?.value
+            val subChapterAlpha = it.groups[3]?.value
+            val addition = checkForDecimal(subChapterDecimal, subChapterAlpha)
+            initial.plus(addition)
+        }
+    }
+
+    /**
+     * Check for decimal in received strings
+     * @param decimal decimal value of regex
+     * @param alpha alpha value of regex
+     * @return decimal/alpha float value
+     */
+    private fun checkForDecimal(decimal: String?, alpha: String?): Float {
+        if (!decimal.isNullOrEmpty()) {
+            return decimal.toFloat()
+        }
+
+        if (!alpha.isNullOrEmpty()) {
+            if (alpha.contains("extra")) {
+                return .99f
+            }
+
+            if (alpha.contains("omake")) {
+                return .98f
+            }
+
+            if (alpha.contains("special")) {
+                return .97f
+            }
+
+            val trimmedAlpha = alpha.trimStart('.')
+            if (trimmedAlpha.length == 1) {
+                return parseAlphaPostFix(trimmedAlpha[0])
+            }
+        }
+
+        return .0f
+    }
+
+    /**
+     * x.a -> x.1, x.b -> x.2, etc
+     */
+    private fun parseAlphaPostFix(alpha: Char): Float {
+        val number = alpha.code - ('a'.code - 1)
+        if (number >= 10) return 0f
+        return number / 10f
+    }
+}

app/src/main/java/tachiyomi/domain/source/anime/model/AnimeSource.kt

@@ -0,0 +1,25 @@
+package tachiyomi.domain.source.anime.model
+
+data class AnimeSource(
+    val id: Long,
+    val lang: String,
+    val name: String,
+    val supportsLatest: Boolean,
+    val isStub: Boolean,
+    val pin: Pins = Pins.unpinned,
+    val isUsedLast: Boolean = false,
+) {
+
+    val visualName: String
+        get() = when {
+            lang.isEmpty() -> name
+            else -> "$name (${lang.uppercase()})"
+        }
+
+    val key: () -> String = {
+        when {
+            isUsedLast -> "$id-lastused"
+            else -> "$id"
+        }
+    }
+}