bugfixes and themes

2023-10-27 00:47:44 -05:00 · 2023-10-27 00:47:44 -05:00 · 9c0ef7a788
commit 9c0ef7a788
parent 960c2b4113
57 changed files with 699 additions and 381 deletions
--- a/app/src/main/java/ani/dantotsu/Functions.kt
+++ b/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
--- a/app/src/main/java/ani/dantotsu/MainActivity.kt
+++ b/app/src/main/java/ani/dantotsu/MainActivity.kt
@ -90,7 +90,7 @@ class MainActivity : AppCompatActivity() {
            val bottomBar = findViewById<AnimatedBottomBar>(R.id.navbar)
            val backgroundDrawable = bottomBar.background as GradientDrawable
            val currentColor = backgroundDrawable.color?.defaultColor ?: 0
-            val semiTransparentColor = (currentColor and 0x00FFFFFF) or 0x80000000.toInt()
+            val semiTransparentColor = (currentColor and 0x00FFFFFF) or 0xE8000000.toInt()
            backgroundDrawable.setColor(semiTransparentColor)
            bottomBar.background = backgroundDrawable
        }
@ -125,24 +125,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()
+                }
            }
        }

--- a/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt
@ -54,7 +54,7 @@ class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHold

        val textInputLayout = holder.itemView.findViewById<TextInputLayout>(R.id.animeSearchBar)
        val currentColor = textInputLayout.boxBackgroundColor
-        val semiTransparentColor = (currentColor and 0x00FFFFFF) or 0x80000000.toInt()
+        val semiTransparentColor = (currentColor and 0x00FFFFFF) or 0xA8000000.toInt()
        textInputLayout.boxBackgroundColor = semiTransparentColor
        val materialCardView = holder.itemView.findViewById<MaterialCardView>(R.id.animeUserAvatarContainer)
        materialCardView.setCardBackgroundColor(semiTransparentColor)
--- a/app/src/main/java/ani/dantotsu/home/MangaPageAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/home/MangaPageAdapter.kt
@ -53,7 +53,7 @@ class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHold

        val textInputLayout = holder.itemView.findViewById<TextInputLayout>(R.id.mangaSearchBar)
        val currentColor = textInputLayout.boxBackgroundColor
-        val semiTransparentColor = (currentColor and 0x00FFFFFF) or 0x80000000.toInt()
+        val semiTransparentColor= (currentColor and 0x00FFFFFF) or 0xA8000000.toInt()
        textInputLayout.boxBackgroundColor = semiTransparentColor
        val materialCardView = holder.itemView.findViewById<MaterialCardView>(R.id.mangaUserAvatarContainer)
        materialCardView.setCardBackgroundColor(semiTransparentColor)
--- a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt
@ -10,6 +10,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.*
@ -177,6 +178,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()
--- a/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt
@ -63,7 +63,8 @@ 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 ((MangaNameAdapter.findChapterNumber(ep.number) ?: 9999f) <= media.userProgress!!.toFloat())
                        binding.itemEpisodeViewedCover.visibility = View.VISIBLE
--- a/app/src/main/java/ani/dantotsu/media/manga/MangaReadAdapter.kt
+++ b/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.*
@ -145,6 +146,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()
--- a/app/src/main/java/ani/dantotsu/others/CustomBottomDialog.kt
+++ b/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
    }

--- a/app/src/main/java/ani/dantotsu/others/ImageViewDialog.kt
+++ b/app/src/main/java/ani/dantotsu/others/ImageViewDialog.kt
@ -74,15 +74,16 @@ 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_old(image, trans1 ?: listOf())
-            var bitmap2 = if (image2 != null) requireContext().loadBitmap_old(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 = requireContext().loadBitmap(image, trans1 ?: listOf())
-                bitmap2 = if (image2 != null) requireContext().loadBitmap(image2, trans2 ?: listOf()) else 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
--- a/app/src/main/java/ani/dantotsu/settings/AnimeExtensionsFragment.kt
+++ b/app/src/main/java/ani/dantotsu/settings/AnimeExtensionsFragment.kt
@ -49,10 +49,10 @@ class AnimeExtensionsFragment : Fragment(),
    ): View {
        _binding = FragmentAnimeExtensionsBinding.inflate(inflater, container, false)

-        binding.allAnimeExtensionsRecyclerView.isNestedScrollingEnabled = true
+        binding.allAnimeExtensionsRecyclerView.isNestedScrollingEnabled = false
        binding.allAnimeExtensionsRecyclerView.adapter = adapter
        binding.allAnimeExtensionsRecyclerView.layoutManager = LinearLayoutManager(context)
-        (binding.allAnimeExtensionsRecyclerView.layoutManager as LinearLayoutManager).isItemPrefetchEnabled = false
+        (binding.allAnimeExtensionsRecyclerView.layoutManager as LinearLayoutManager).isItemPrefetchEnabled = true

        lifecycleScope.launch {
            viewModel.pagerFlow.collectLatest {
@ -60,6 +60,8 @@ class AnimeExtensionsFragment : Fragment(),
            }
        }

+        viewModel.invalidatePager() // Force a refresh of the pager
+
        return binding.root
    }

--- a/app/src/main/java/ani/dantotsu/settings/DevelopersDialogFragment.kt
+++ b/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 {
--- a/app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt
@ -1,55 +1,26 @@
 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.ProgressBar
 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 ani.dantotsu.themes.ThemeManager
-import com.bumptech.glide.Glide
 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()  {
    private val restartMainActivity = object : OnBackPressedCallback(false) {
@ -94,21 +65,20 @@ class ExtensionsActivity : AppCompatActivity()  {
        }.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
            }
        })

--- a/app/src/main/java/ani/dantotsu/settings/MangaExtensionsFragment.kt
+++ b/app/src/main/java/ani/dantotsu/settings/MangaExtensionsFragment.kt
@ -10,6 +10,7 @@ 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 ani.dantotsu.R
 import ani.dantotsu.databinding.FragmentMangaExtensionsBinding
@ -25,6 +26,7 @@ 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(),
@ -50,17 +52,19 @@ class MangaExtensionsFragment : Fragment(),
    ): View {
        _binding = FragmentMangaExtensionsBinding.inflate(inflater, container, false)

-        binding.allMangaExtensionsRecyclerView.isNestedScrollingEnabled = true
+        binding.allMangaExtensionsRecyclerView.isNestedScrollingEnabled = false
        binding.allMangaExtensionsRecyclerView.adapter = adapter
        binding.allMangaExtensionsRecyclerView.layoutManager = LinearLayoutManager(context)
-        (binding.allMangaExtensionsRecyclerView.layoutManager as LinearLayoutManager).isItemPrefetchEnabled = false
+        (binding.allMangaExtensionsRecyclerView.layoutManager as LinearLayoutManager).isItemPrefetchEnabled = true

        lifecycleScope.launch {
-            viewModel.pagerFlow.collectLatest {
-                adapter.submitData(it)
+            viewModel.pagerFlow.collectLatest { pagingData ->
+                adapter.submitData(pagingData)
            }
        }

+        viewModel.invalidatePager() // Force a refresh of the pager
+
        return binding.root
    }

--- a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
@ -105,6 +105,12 @@ OS Version: $CODENAME $RELEASE ($SDK_INT)
            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())

@ -408,7 +414,7 @@ OS Version: $CODENAME $RELEASE ($SDK_INT)
            }
        }

-        var curTime = loadData<Int>("subscriptions_time_r") ?: defaultTime
+        var curTime = loadData<Int>("subscriptions_time_s") ?: defaultTime
        val timeNames = timeMinutes.map {
            val mins = it % 60
            val hours = it / 60
@ -421,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_r", curTime)
+                saveData("subscriptions_time_s", curTime)
                dialog.dismiss()
                startSubscription(true)
            }.show()
--- a/app/src/main/java/ani/dantotsu/settings/SettingsDialogFragment.kt
+++ b/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)
--- a/app/src/main/java/ani/dantotsu/settings/paging/MangaPagingSource.kt
+++ b/app/src/main/java/ani/dantotsu/settings/paging/MangaPagingSource.kt
@ -117,12 +117,10 @@ class MangaExtensionAdapter(private val clickListener: OnMangaInstallClickListen
    companion object {
        private val DIFF_CALLBACK = object : DiffUtil.ItemCallback<MangaExtension.Available>() {
            override fun areItemsTheSame(oldItem: MangaExtension.Available, newItem: MangaExtension.Available): Boolean {
-                // Your logic here
                return oldItem.pkgName == newItem.pkgName
            }

            override fun areContentsTheSame(oldItem: MangaExtension.Available, newItem: MangaExtension.Available): Boolean {
-                // Your logic here
                return oldItem == newItem
            }
        }
--- a/app/src/main/java/ani/dantotsu/subcriptions/AlarmReceiver.kt
+++ b/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_r", context) ?: defaultTime
+            val curTime = loadData<Int>("subscriptions_time_s", context) ?: defaultTime

            if (timeMinutes[curTime] > 0)
                alarmManager.setRepeating(
--- a/app/src/main/java/ani/dantotsu/subcriptions/Subscription.kt
+++ b/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 = 3
-        val timeMinutes = arrayOf(0L, 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) {
--- a/app/src/main/java/ani/dantotsu/subcriptions/SubscriptionWorker.kt
+++ b/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_r") ?: 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(
--- a/app/src/main/java/ani/dantotsu/themes/ThemeManager.kt
+++ b/app/src/main/java/ani/dantotsu/themes/ThemeManager.kt
@ -1,41 +1,41 @@
 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
        }
-        when (context.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getString("theme", "PURPLE")!!) {
-            "PURPLE" -> {
-                context.setTheme(R.style.Theme_Dantotsu_Purple)
-            }
-            "BLUE" -> {
-                context.setTheme(R.style.Theme_Dantotsu_Blue)
-            }
-            "GREEN" -> {
-                context.setTheme(R.style.Theme_Dantotsu_Green)
-            }
-            "PINK" -> {
-                context.setTheme(R.style.Theme_Dantotsu_Pink)
-            }
-            "RED" -> {
-                context.setTheme(R.style.Theme_Dantotsu_Red)
-            }
-            "LAVENDER" -> {
-                context.setTheme(R.style.Theme_Dantotsu_Lavender)
-            }
-            "MONOCHROME (BETA)" -> {
-                context.setTheme(R.style.Theme_Dantotsu_Monochrome)
-            }
-            else -> {
-                context.setTheme(R.style.Theme_Dantotsu_Purple)
-            }
+        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"),