Title😂😂 (#109)

* small changes

* Changes
* new nest button for settings
* full language name in language selector
* tv banner
* hide lang selector if there is one language only
* and some small changes

* import fix

* alter dialog

* wont refresh if nothing is changed

app/src/main/AndroidManifest.xml

@@ -47,7 +47,7 @@
     <application
         android:name=".App"
         android:allowBackup="true"
-        android:banner="@drawable/ic_banner_foreground"
+        android:banner="@mipmap/ic_banner_foreground"
         android:icon="${icon_placeholder}"
         android:label="@string/app_name"
         android:largeHeap="true"

app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt

@@ -28,6 +28,7 @@ import ani.dantotsu.currActivity
 import ani.dantotsu.currContext
 import ani.dantotsu.download.DownloadedType
 import ani.dantotsu.download.DownloadsManager
+import ani.dantotsu.initActivity
 import ani.dantotsu.logger
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsActivity
@@ -129,6 +130,7 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
             gridView.visibility = View.GONE
             gridView = view.findViewById(R.id.gridView)
             gridView.adapter = adapter
+            gridView.scheduleLayoutAnimation()
             gridView.visibility = View.VISIBLE
             adapter.notifyNewGrid()
 
@@ -210,6 +212,7 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        initActivity(requireActivity())
         var height = statusBarHeight
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             val displayCutout = activity?.window?.decorView?.rootWindowInsets?.displayCutout

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

@@ -246,7 +246,7 @@ object Helper {
             .queryDownload(title, episode, DownloadedType.Type.ANIME)
 
         if (downloadCheck) {
-            AlertDialog.Builder(context)
+            AlertDialog.Builder(context , R.style.MyPopup)
                 .setTitle("Download Exists")
                 .setMessage("A download for this episode already exists. Do you want to overwrite it?")
                 .setPositiveButton("Yes") { _, _ ->

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

@@ -75,8 +75,6 @@ class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHold
             textInputLayout.boxBackgroundColor = (color and 0x00FFFFFF) or 0x28000000.toInt()
             materialCardView.setCardBackgroundColor((color and 0x00FFFFFF) or 0x28000000.toInt())
         }
-        val incognito = currContext()?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)
-            ?.getBoolean("incognito", false) ?: false
 
         binding.animeTitleContainer.updatePadding(top = statusBarHeight)
 

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

@@ -75,9 +75,6 @@ class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHold
             materialCardView.setCardBackgroundColor((color and 0x00FFFFFF) or 0x28000000.toInt())
         }
 
-        val incognito = currContext()?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)
-            ?.getBoolean("incognito", false) ?: false
-
         binding.mangaTitleContainer.updatePadding(top = statusBarHeight)
 
         if (uiSettings.smallView) binding.mangaTrendingContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {

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

@@ -1,23 +1,28 @@
 package ani.dantotsu.media.anime
 
 import android.annotation.SuppressLint
+import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
+import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.LinearLayout
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import ani.dantotsu.*
 import ani.dantotsu.databinding.ItemAnimeWatchBinding
 import ani.dantotsu.databinding.ItemChipBinding
+import ani.dantotsu.databinding.DialogLayoutBinding
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.media.SourceSearchDialogFragment
+import ani.dantotsu.others.LanguageMapper
 import ani.dantotsu.parsers.AnimeSources
 import ani.dantotsu.parsers.DynamicAnimeParser
 import ani.dantotsu.parsers.WatchSources
@@ -27,6 +32,7 @@ import com.google.android.material.chip.Chip
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 
+
 class AnimeWatchAdapter(
     private val media: Media,
     private val fragment: AnimeWatchFragment,
@@ -40,6 +46,8 @@ class AnimeWatchAdapter(
         val bind = ItemAnimeWatchBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(bind)
     }
+    private var nestedDialog: AlertDialog? = null
+
 
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@@ -147,8 +155,9 @@ class AnimeWatchAdapter(
             }
         }
 
+        //Icons
 
-        //Subscription
+        //subscribe
         subscribe = MediaDetailsActivity.PopImageButton(
             fragment.lifecycleScope,
             binding.animeSourceSubscribe,
@@ -167,44 +176,76 @@ class AnimeWatchAdapter(
             openSettings(fragment.requireContext(), getChannelId(true, media.id))
         }
 
-        //Icons
+        //Nested Button
-        var reversed = media.selected!!.recyclerReversed
+        binding.animeNestedButton.setOnClickListener {
-        var style = media.selected!!.recyclerStyle ?: fragment.uiSettings.animeDefaultView
+            val dialogView =
-        binding.animeSourceTop.rotation = if (reversed) -90f else 90f
+                LayoutInflater.from(fragment.requireContext()).inflate(R.layout.dialog_layout, null)
-        binding.animeSourceTop.setOnClickListener {
+            val dialogBinding = DialogLayoutBinding.bind(dialogView)
-            reversed = !reversed
+
-            binding.animeSourceTop.rotation = if (reversed) -90f else 90f
+            var run = false
-            fragment.onIconPressed(style, reversed)
+            var reversed = media.selected!!.recyclerReversed
-        }
+            var style = media.selected!!.recyclerStyle ?: fragment.uiSettings.animeDefaultView
-        var selected = when (style) {
+            dialogBinding.animeSourceTop.rotation = if (reversed) -90f else 90f
-            0 -> binding.animeSourceList
+            dialogBinding.sortText.text = if (reversed) "Down to Up" else "Up to Down"
-            1 -> binding.animeSourceGrid
+            dialogBinding.animeSourceTop.setOnClickListener {
-            2 -> binding.animeSourceCompact
+                reversed = !reversed
-            else -> binding.animeSourceList
+                dialogBinding.animeSourceTop.rotation = if (reversed) -90f else 90f
-        }
+                dialogBinding.sortText.text = if (reversed) "Down to Up" else "Up to Down"
-        selected.alpha = 1f
+                run = true
-        fun selected(it: ImageView) {
+            }
-            selected.alpha = 0.33f
+            //Grids
-            selected = it
+            var selected = when (style) {
+                0 -> dialogBinding.animeSourceList
+                1 -> dialogBinding.animeSourceGrid
+                2 -> dialogBinding.animeSourceCompact
+                else -> dialogBinding.animeSourceList
+            }
+            when (style) {
+                0 -> dialogBinding.layoutText.text = "List"
+                1 -> dialogBinding.layoutText.text = "Grid"
+                2 -> dialogBinding.layoutText.text = "Compact"
+                else -> dialogBinding.animeSourceList
+            }
             selected.alpha = 1f
+            fun selected(it: ImageButton) {
+                selected.alpha = 0.33f
+                selected = it
+                selected.alpha = 1f
+            }
+            dialogBinding.animeSourceList.setOnClickListener {
+                selected(it as ImageButton)
+                style = 0
+                dialogBinding.layoutText.text = "List"
+                run = true
+            }
+            dialogBinding.animeSourceGrid.setOnClickListener {
+                selected(it as ImageButton)
+                style = 1
+                dialogBinding.layoutText.text = "Grid"
+                run = true
+            }
+            dialogBinding.animeSourceCompact.setOnClickListener {
+                selected(it as ImageButton)
+                style = 2
+                dialogBinding.layoutText.text = "Compact"
+                run = true
+            }
+
+            //hidden
+            dialogBinding.animeScanlatorContainer.visibility = View.GONE
+            dialogBinding.animeDownloadContainer.visibility = View.GONE
+
+            nestedDialog = AlertDialog.Builder(fragment.requireContext() , R.style.MyPopup)
+                .setTitle("Options")
+                .setView(dialogView)
+                .setPositiveButton("OK") { _, _ ->
+                   if (run) fragment.onIconPressed(style, reversed)
+                }
+                .setNegativeButton("Cancel") { _, _ ->
+                }
+                .create()
+            nestedDialog?.show()
         }
-        binding.animeSourceList.setOnClickListener {
-            selected(it as ImageView)
-            style = 0
-            fragment.onIconPressed(style, reversed)
-        }
-        binding.animeSourceGrid.setOnClickListener {
-            selected(it as ImageView)
-            style = 1
-            fragment.onIconPressed(style, reversed)
-        }
-        binding.animeSourceCompact.setOnClickListener {
-            selected(it as ImageView)
-            style = 2
-            fragment.onIconPressed(style, reversed)
-        }
-        binding.animeScanlatorTop.visibility = View.GONE
-        binding.animeDownloadTop.visibility = View.GONE
         //Episode Handling
         handleEpisodes()
     }
@@ -351,12 +392,15 @@ class AnimeWatchAdapter(
                         parser.extension.sources.firstOrNull()?.lang ?: "Unknown"
                     )
                 }
-                binding?.animeSourceLanguage?.setAdapter(
+                val adapter = ArrayAdapter(
-                    ArrayAdapter(
+                    fragment.requireContext(),
-                        fragment.requireContext(),
+                    R.layout.item_dropdown,
-                        R.layout.item_dropdown,
+                    parser.extension.sources.map { LanguageMapper.mapLanguageCodeToName(it.lang) }
-                        parser.extension.sources.map { it.lang })
                 )
+                val items = adapter.count
+                if (items > 1) binding?.animeSourceLanguageContainer?.visibility  =  View.VISIBLE else binding?.animeSourceLanguageContainer?.visibility  =  View.GONE
+
+                binding?.animeSourceLanguage?.setAdapter(adapter)
 
             }
         }

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

@@ -31,7 +31,7 @@ class CustomMediaRouterChooserDialogFragment: MediaRouteChooserDialogFragment()
             context: Context,
             savedInstanceState: Bundle?
     ): MediaRouteChooserDialog =
-            MediaRouteChooserDialog(context)
+            MediaRouteChooserDialog(context, R.style.MyPopup)
 }
 
 class CustomMediaRouteControllerDialogFragment: MediaRouteControllerDialogFragment() {
@@ -39,5 +39,5 @@ class CustomMediaRouteControllerDialogFragment: MediaRouteControllerDialogFragme
             context: Context,
             savedInstanceState: Bundle?
     ): MediaRouteControllerDialog =
-            MediaRouteControllerDialog(context, R.style.ThemeOverlay_Dantotsu_MediaRouter)
+            MediaRouteControllerDialog(context, R.style.MyPopup)
 }

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

@@ -2,12 +2,14 @@ package ani.dantotsu.media.manga
 
 import android.annotation.SuppressLint
 import android.app.AlertDialog
+import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.ArrayAdapter
 import android.widget.CheckBox
+import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.NumberPicker
@@ -15,12 +17,14 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import ani.dantotsu.*
+import ani.dantotsu.databinding.DialogLayoutBinding
 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.media.anime.handleProgress
+import ani.dantotsu.others.LanguageMapper
 import ani.dantotsu.parsers.DynamicMangaParser
 import ani.dantotsu.parsers.MangaReadSources
 import ani.dantotsu.parsers.MangaSources
@@ -30,6 +34,7 @@ import com.google.android.material.chip.Chip
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 
+
 class MangaReadAdapter(
     private val media: Media,
     private val fragment: MangaReadFragment,
@@ -46,7 +51,7 @@ class MangaReadAdapter(
         val bind = ItemAnimeWatchBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(bind)
     }
-
+    private var nestedDialog: AlertDialog? = null
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val binding = holder.binding
@@ -117,7 +122,7 @@ class MangaReadAdapter(
             }
         }
 
-        //Subscription
+        //Grids
         subscribe = MediaDetailsActivity.PopImageButton(
             fragment.lifecycleScope,
             binding.animeSourceSubscribe,
@@ -136,98 +141,130 @@ class MangaReadAdapter(
             openSettings(fragment.requireContext(), getChannelId(true, media.id))
         }
 
-        //Icons
+        binding.animeNestedButton.setOnClickListener {
-        binding.animeSourceGrid.visibility = View.GONE
-        var reversed = media.selected!!.recyclerReversed
-        var style = media.selected!!.recyclerStyle ?: fragment.uiSettings.mangaDefaultView
-        binding.animeSourceTop.rotation = if (reversed) -90f else 90f
-        binding.animeSourceTop.setOnClickListener {
-            reversed = !reversed
-            binding.animeSourceTop.rotation = if (reversed) -90f else 90f
-            fragment.onIconPressed(style, reversed)
-        }
 
-        binding.animeScanlatorTop.setOnClickListener {
             val dialogView =
-                LayoutInflater.from(currContext()).inflate(R.layout.custom_dialog_layout, null)
+                LayoutInflater.from(fragment.requireContext()).inflate(R.layout.dialog_layout, null)
-            val checkboxContainer = dialogView.findViewById<LinearLayout>(R.id.checkboxContainer)
+            val dialogBinding = DialogLayoutBinding.bind(dialogView)
 
-            // Dynamically add checkboxes
+            var run = false
-
+            var reversed = media.selected!!.recyclerReversed
-            options.forEach { option ->
+            var style = media.selected!!.recyclerStyle ?: fragment.uiSettings.animeDefaultView
-                val checkBox = CheckBox(currContext()).apply {
+            dialogBinding.animeSourceTop.rotation = if (reversed) -90f else 90f
-                    text = option
+            dialogBinding.sortText.text = if (reversed) "Down to Up" else "Up to Down"
-                }
+            dialogBinding.animeSourceTop.setOnClickListener {
-                //set checked if it's already selected
+                reversed = !reversed
-                if (media.selected!!.scanlators != null) {
+                dialogBinding.animeSourceTop.rotation = if (reversed) -90f else 90f
-                    checkBox.isChecked = media.selected!!.scanlators?.contains(option) != true
+                dialogBinding.sortText.text = if (reversed) "Down to Up" else "Up to Down"
-                    scanlatorSelectionListener?.onScanlatorsSelected()
+                run = true
-                } else {
-                    checkBox.isChecked = true
-                }
-                checkboxContainer.addView(checkBox)
             }
 
-            // Create AlertDialog
+            //Grids
-            val dialog = AlertDialog.Builder(currContext(), R.style.MyPopup)
+            dialogBinding.animeSourceGrid.visibility = View.GONE
-                .setView(dialogView)
+            var selected = when (style) {
-                .setPositiveButton("OK") { dialog, which ->
+                0 -> dialogBinding.animeSourceList
-                    //add unchecked to hidden
+                1 -> dialogBinding.animeSourceCompact
-                    hiddenScanlators.clear()
+                else -> dialogBinding.animeSourceList
-                    for (i in 0 until checkboxContainer.childCount) {
+            }
-                        val checkBox = checkboxContainer.getChildAt(i) as CheckBox
+            when (style) {
-                        if (!checkBox.isChecked) {
+                0 -> dialogBinding.layoutText.text = "List"
-                            hiddenScanlators.add(checkBox.text.toString())
+                1 -> dialogBinding.layoutText.text = "Compact"
-                        }
+                else -> dialogBinding.animeSourceList
-                    }
-                    fragment.onScanlatorChange(hiddenScanlators)
-                    scanlatorSelectionListener?.onScanlatorsSelected()
-                }
-                .setNegativeButton("Cancel", null)
-                .show()
-            dialog.window?.setDimAmount(0.8f)
-        }
-
-        binding.animeDownloadTop.setOnClickListener {
-            //Alert dialog asking for the number of chapters to download
-            val alertDialog = AlertDialog.Builder(currContext(), R.style.MyPopup)
-            alertDialog.setTitle("Multi Chapter Downloader")
-            alertDialog.setMessage("Enter the number of chapters to download")
-            val input = NumberPicker(currContext())
-            input.minValue = 1
-            input.maxValue = 20
-            input.value = 1
-            alertDialog.setView(input)
-            alertDialog.setPositiveButton("OK") { dialog, which ->
-                fragment.multiDownload(input.value)
             }
-            alertDialog.setNegativeButton("Cancel") { dialog, _ -> dialog.cancel() }
-            val dialog = alertDialog.show()
-            dialog.window?.setDimAmount(0.8f)
-        }
-
-        var selected = when (style) {
-            0 -> binding.animeSourceList
-            1 -> binding.animeSourceCompact
-            else -> binding.animeSourceList
-        }
-        selected.alpha = 1f
-        fun selected(it: ImageView) {
-            selected.alpha = 0.33f
-            selected = it
             selected.alpha = 1f
-        }
+            fun selected(it: ImageButton) {
-        binding.animeSourceList.setOnClickListener {
+                selected.alpha = 0.33f
-            selected(it as ImageView)
+                selected = it
-            style = 0
+                selected.alpha = 1f
-            fragment.onIconPressed(style, reversed)
+            }
-        }
+            dialogBinding.animeSourceList.setOnClickListener {
-        binding.animeSourceCompact.setOnClickListener {
+                selected(it as ImageButton)
-            selected(it as ImageView)
+                style = 0
-            style = 1
+                dialogBinding.layoutText.text = "List"
-            fragment.onIconPressed(style, reversed)
+                run = true
-        }
+            }
+            dialogBinding.animeSourceCompact.setOnClickListener {
+                selected(it as ImageButton)
+                style = 1
+                dialogBinding.layoutText.text = "Compact"
+                run = true
+            }
 
+            //Multi download
+            dialogBinding.downloadNo.text = "0"
+            dialogBinding.animeDownloadTop.setOnClickListener {
+                //Alert dialog asking for the number of chapters to download
+                val alertDialog = AlertDialog.Builder(currContext(), R.style.MyPopup)
+                alertDialog.setTitle("Multi Chapter Downloader")
+                alertDialog.setMessage("Enter the number of chapters to download")
+                val input = NumberPicker(currContext())
+                input.minValue = 1
+                input.maxValue = 20
+                input.value = 1
+                alertDialog.setView(input)
+                alertDialog.setPositiveButton("OK") { dialog, which ->
+                    dialogBinding.downloadNo.text = "${input.value}"
+                }
+                alertDialog.setNegativeButton("Cancel") { dialog, _ -> dialog.cancel() }
+                val dialog = alertDialog.show()
+                dialog.window?.setDimAmount(0.8f)
+            }
+
+            //Scanlator
+            dialogBinding.animeScanlatorTop.setOnClickListener {
+                val dialogView2 =
+                    LayoutInflater.from(currContext()).inflate(R.layout.custom_dialog_layout, null)
+                val checkboxContainer = dialogView2.findViewById<LinearLayout>(R.id.checkboxContainer)
+
+                // Dynamically add checkboxes
+                options.forEach { option ->
+                    val checkBox = CheckBox(currContext()).apply {
+                        text = option
+                    }
+                    //set checked if it's already selected
+                    if (media.selected!!.scanlators != null) {
+                        checkBox.isChecked = media.selected!!.scanlators?.contains(option) != true
+                        scanlatorSelectionListener?.onScanlatorsSelected()
+                    } else {
+                        checkBox.isChecked = true
+                    }
+                    checkboxContainer.addView(checkBox)
+                }
+
+                // Create AlertDialog
+                val dialog = AlertDialog.Builder(currContext(), R.style.MyPopup)
+                    .setView(dialogView2)
+                    .setPositiveButton("OK") { dialog, which ->
+                        //add unchecked to hidden
+                        hiddenScanlators.clear()
+                        for (i in 0 until checkboxContainer.childCount) {
+                            val checkBox = checkboxContainer.getChildAt(i) as CheckBox
+                            if (!checkBox.isChecked) {
+                                hiddenScanlators.add(checkBox.text.toString())
+                            }
+                        }
+                        fragment.onScanlatorChange(hiddenScanlators)
+                        scanlatorSelectionListener?.onScanlatorsSelected()
+                    }
+                    .setNegativeButton("Cancel", null)
+                    .show()
+                dialog.window?.setDimAmount(0.8f)
+            }
+
+            nestedDialog = AlertDialog.Builder(fragment.requireContext() , R.style.MyPopup)
+                .setTitle("Options")
+                .setView(dialogView)
+                .setPositiveButton("OK") { _, _ ->
+                    if(run) fragment.onIconPressed(style, reversed)
+                    if (dialogBinding.downloadNo.text != "0"){
+                        fragment.multiDownload(dialogBinding.downloadNo.text.toString().toInt())
+                    }
+                }
+                .setNegativeButton("Cancel") { _, _ ->
+                }
+                .create()
+            nestedDialog?.show()
+        }
         //Chapter Handling
         handleChapters()
     }
@@ -385,12 +422,15 @@ class MangaReadAdapter(
                         parser.extension.sources.firstOrNull()?.lang ?: "Unknown"
                     )
                 }
-                binding?.animeSourceLanguage?.setAdapter(
+                val adapter = ArrayAdapter(
-                    ArrayAdapter(
+                    fragment.requireContext(),
-                        fragment.requireContext(),
+                    R.layout.item_dropdown,
-                        R.layout.item_dropdown,
+                    parser.extension.sources.map { LanguageMapper.mapLanguageCodeToName(it.lang) }
-                        parser.extension.sources.map { it.lang })
                 )
+                val items = adapter.count
+                if (items > 1) binding?.animeSourceLanguageContainer?.visibility  =  View.VISIBLE else binding?.animeSourceLanguageContainer?.visibility  =  View.GONE
+
+                binding?.animeSourceLanguage?.setAdapter(adapter)
 
             }
         }

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

@@ -24,7 +24,35 @@ class LanguageMapper {
                 "vi" -> "Vietnamese"
                 "zh" -> "Chinese"
                 "zh-Hans" -> "Chinese (Simplified)"
-                else -> ""
+                "es-419" -> "Spanish (Latin America)"
+                "hu" -> "Hungarian"
+                "zh-habt" -> "Chinese (Hakka)"
+                "zh-hant" -> "Chinese (Traditional)"
+                "ca" -> "Catalan"
+                "bg" -> "Bulgarian"
+                "fa" -> "Persian"
+                "mn" -> "Mongolian"
+                "ro" -> "Romanian"
+                "he" -> "Hebrew"
+                "ms" -> "Malay"
+                "tl" -> "Tagalog"
+                "hi" -> "Hindi"
+                "my" -> "Burmese"
+                "cs" -> "Czech"
+                "pt" -> "Portuguese"
+                "nl" -> "Dutch"
+                "sv" -> "Swedish"
+                "bn" -> "Bengali"
+                "no" -> "Norwegian"
+                "el" -> "Greek"
+                "sr" -> "Serbian"
+                "da" -> "Danish"
+                "lt" -> "Lithuanian"
+                "ml" -> "Malayalam"
+                "mr" -> "Marathi"
+                "ta" -> "Tamil"
+                "te" -> "Telugu"
+                else -> code
             }
         }
 

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

@@ -14,6 +14,7 @@ import ani.dantotsu.App.Companion.context
 import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.databinding.ActivityImageSearchBinding
+import ani.dantotsu.initActivity
 import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.others.LangSet
 import ani.dantotsu.themes.ThemeManager
@@ -49,6 +50,7 @@ class ImageSearchActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         LangSet.setLocale(this)
+        initActivity(this)
         ThemeManager(this).applyTheme()
         binding = ActivityImageSearchBinding.inflate(layoutInflater)
         setContentView(binding.root)

app/src/main/res/drawable-v24/ic_banner_foreground.xml

@@ -1,67 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="320dp"
-    android:height="180dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group android:scaleX="0.6666667"
-      android:scaleY="0.6666667"
-      android:translateX="18"
-      android:translateY="18">
-    <group android:scaleX="0.5625"
-        android:translateX="-5.535">
-      <path
-          android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-          android:fillType="evenOdd">
-        <aapt:attr name="android:fillColor">
-          <gradient
-              android:startY="49.59793"
-              android:startX="42.9492"
-              android:endY="92.4963"
-              android:endX="85.84757"
-              android:type="linear">
-            <item
-                android:color="#44000000"
-                android:offset="0"/>
-            <item
-                android:color="#00000000"
-                android:offset="1"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-
-      <path
-          android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-          android:fillColor="#3DDC84"
-          android:fillType="evenOdd"
-          android:strokeWidth="1"
-          android:strokeColor="#00000000"/>
-    </group>
-
-    <group android:scaleX="0.492"
-        android:scaleY="0.24750866"
-        android:translateX="277.2"
-        android:translateY="73.782364">
-      <group android:translateY="145.33594">
-        <path android:pathData="M12.796875,-0L12.796875,-101.109375L34.171875,-101.109375Q42.828125,-101.109375,50.234375,-100.234375Q57.65625,-99.359375,63.84375,-97.171875Q70.03125,-95,74.703125,-91.375Q79.390625,-87.75,82.765625,-82.125Q86.0625,-76.5,87.75,-68.765625Q89.4375,-61.03125,89.4375,-50.5625Q89.4375,-40.078125,87.75,-32.34375Q86.0625,-24.609375,82.765625,-18.984375Q79.390625,-13.359375,74.703125,-9.734375Q70.03125,-6.125,63.84375,-3.9375Q57.65625,-1.765625,50.234375,-0.875Q42.828125,-0,34.171875,-0L12.796875,-0ZM36.359375,-10.828125Q47.109375,-10.828125,54.59375,-12.96875Q62.09375,-15.125,66.875,-19.96875Q71.578125,-24.828125,73.71875,-32.3125Q75.875,-39.796875,75.875,-50.5625Q75.875,-61.3125,73.71875,-68.796875Q71.578125,-76.296875,66.875,-81.140625Q62.09375,-86,54.59375,-88.140625Q47.109375,-90.28125,36.359375,-90.28125L26.015625,-90.28125L26.015625,-10.828125L36.359375,-10.828125Z"
-            android:fillColor="#000000"/>
-        <path android:pathData="M113.109375,-60.1875L110.015625,-70.03125Q121.828125,-74.75,134.76562,-74.75Q146.07812,-74.75,152.0625,-70.953125Q158.875,-66.59375,158.875,-56.109375L158.875,-27.359375Q158.875,-21.59375,159.01562,-15.546875Q159.09375,-11.953125,159.71875,-8.09375Q160.28125,-4.4375,161.20312,-1.125L149.67188,1.40625Q148.04688,-3.3125,147.625,-9.140625L146.21875,-9.28125Q137.5,1.6875,124,1.6875Q114.15625,1.6875,108.171875,-3.765625Q102.203125,-9.21875,102.203125,-19.125Q102.203125,-26.515625,105.46875,-31.21875Q108.75,-35.9375,114.71875,-39.171875Q124.140625,-44.296875,141.09375,-44.296875Q143.34375,-44.296875,147.14062,-44.15625L147.14062,-54.84375Q147.14062,-59.90625,144.04688,-62.15625Q140.95312,-64.40625,134.34375,-64.40625Q124.703125,-64.40625,113.109375,-60.1875ZM147.14062,-20.53125L147.14062,-35.296875Q145.23438,-35.4375,141.57812,-35.4375Q135.39062,-35.4375,130.1875,-34.390625Q122.453125,-32.84375,118.203125,-29.5Q113.953125,-26.15625,113.953125,-19.90625Q113.953125,-8.65625,126.1875,-8.65625Q132.51562,-8.65625,138,-12.03125Q142.5,-14.84375,147.14062,-20.53125Z"
-            android:fillColor="#000000"/>
-        <path android:pathData="M179.5,-71.859375L191.17188,-74.46875Q192.5,-70.25,193.0625,-66.3125Q193.34375,-64.40625,193.76562,-58.78125L195.25,-58.78125Q199.10938,-65.890625,204.8125,-70.109375Q211.0625,-74.75,218.03125,-74.75Q228.5,-74.75,233.98438,-69.6875Q238.70312,-65.390625,240.53125,-56.53125Q241.71875,-50.484375,241.71875,-38.53125L241.71875,0L229.625,0L229.625,-41.90625Q229.625,-52.390625,227.59375,-56.890625Q224.5625,-63.5625,215.42188,-63.5625Q208.95312,-63.5625,202.76562,-57.375Q198.625,-53.234375,193.90625,-45.21875L193.90625,0L181.8125,0L181.8125,-45Q181.8125,-54.5,181.32812,-61.390625Q181.04688,-65.671875,179.5,-71.859375Z"
-            android:fillColor="#000000"/>
-        <path android:pathData="M269.28125,-89.859375L281.375,-89.859375L281.375,-73.125L305.98438,-73.125L305.98438,-62.9375L281.375,-62.9375L281.375,-20.953125Q281.375,-16.734375,281.625,-14.515625Q281.875,-12.3125,282.85938,-11.046875Q284.6875,-8.515625,290.23438,-8.515625Q293.32812,-8.515625,296.21875,-9.140625Q299.17188,-9.78125,301.625,-10.546875Q303.59375,-6.265625,305.21875,-1.125Q296.92188,1.6875,288.48438,1.6875Q282.35938,1.6875,278.67188,0.3125Q274.98438,-1.0625,272.875,-4.15625Q270.6875,-7.390625,269.98438,-11.890625Q269.28125,-16.390625,269.28125,-24.328125L269.28125,-62.9375L258.73438,-62.9375L258.73438,-73.125L269.28125,-73.125L269.28125,-89.859375Z"
-            android:fillColor="#000000"/>
-        <path android:pathData="M351.03125,-74.75Q354.46875,-74.75,358.1875,-74.21875Q361.92188,-73.6875,365.51562,-72.21875Q369.09375,-70.671875,372.29688,-68.03125Q375.5,-65.390625,377.95312,-61.171875Q380.42188,-56.890625,381.82812,-50.875Q383.23438,-44.859375,383.23438,-36.5625Q383.23438,-28.265625,381.82812,-22.25Q380.42188,-16.25,377.95312,-12.03125Q375.5,-7.734375,372.29688,-5.0625Q369.09375,-2.390625,365.51562,-0.921875Q361.92188,0.640625,358.1875,1.15625Q354.46875,1.6875,351.03125,1.6875Q347.65625,1.6875,343.95312,1.15625Q340.26562,0.640625,336.6875,-0.921875Q333.09375,-2.390625,329.92188,-5.0625Q326.76562,-7.734375,324.3125,-12.03125Q321.84375,-16.25,320.4375,-22.25Q319.03125,-28.265625,319.03125,-36.5625Q319.03125,-44.859375,320.4375,-50.875Q321.84375,-56.890625,324.3125,-61.171875Q326.76562,-65.390625,329.92188,-68.03125Q333.09375,-70.671875,336.6875,-72.21875Q340.26562,-73.6875,343.92188,-74.21875Q347.57812,-74.75,351.03125,-74.75ZM351.03125,-64.828125Q347.01562,-64.828125,343.46875,-63.5625Q339.92188,-62.296875,337.25,-59.140625Q334.5,-55.90625,332.875,-50.484375Q331.26562,-45.078125,331.26562,-36.5625Q331.26562,-28.125,332.875,-22.671875Q334.5,-17.234375,337.25,-14.0625Q339.92188,-10.828125,343.46875,-9.59375Q347.01562,-8.375,351.03125,-8.375Q355.10938,-8.375,358.71875,-9.59375Q362.34375,-10.828125,365.09375,-14.0625Q367.82812,-17.234375,369.40625,-22.671875Q371,-28.125,371,-36.5625Q371,-45.078125,369.40625,-50.484375Q367.82812,-55.90625,365.09375,-59.140625Q362.34375,-62.296875,358.71875,-63.5625Q355.10938,-64.828125,351.03125,-64.828125Z"
-            android:fillColor="#000000"/>
-        <path android:pathData="M408.28125,-89.859375L420.375,-89.859375L420.375,-73.125L444.98438,-73.125L444.98438,-62.9375L420.375,-62.9375L420.375,-20.953125Q420.375,-16.734375,420.625,-14.515625Q420.875,-12.3125,421.85938,-11.046875Q423.6875,-8.515625,429.23438,-8.515625Q432.32812,-8.515625,435.21875,-9.140625Q438.17188,-9.78125,440.625,-10.546875Q442.59375,-6.265625,444.21875,-1.125Q435.92188,1.6875,427.48438,1.6875Q421.35938,1.6875,417.67188,0.3125Q413.98438,-1.0625,411.875,-4.15625Q409.6875,-7.390625,408.98438,-11.890625Q408.28125,-16.390625,408.28125,-24.328125L408.28125,-62.9375L397.73438,-62.9375L397.73438,-73.125L408.28125,-73.125L408.28125,-89.859375Z"
-            android:fillColor="#000000"/>
-        <path android:pathData="M484.54688,-74.75Q490.3125,-74.75,496.10938,-73.546875Q501.90625,-72.359375,506.90625,-70.25Q505.92188,-68,504.85938,-65.8125Q503.8125,-63.640625,502.54688,-61.53125Q500.78125,-62.234375,498.64062,-62.9375Q496.5,-63.640625,494.14062,-64.125Q491.78125,-64.625,489.28125,-64.9375Q486.79688,-65.25,484.40625,-65.25Q481.79688,-65.25,479.375,-64.71875Q476.95312,-64.203125,475.07812,-63Q473.21875,-61.8125,472.09375,-59.875Q470.96875,-57.9375,470.96875,-55.0625Q470.96875,-52.109375,472.23438,-50.09375Q473.5,-48.09375,475.67188,-46.75Q477.85938,-45.421875,480.78125,-44.5Q483.70312,-43.59375,487,-42.828125Q492.14062,-41.5625,496.5625,-39.96875Q501,-38.390625,504.23438,-35.859375Q507.46875,-33.328125,509.29688,-29.59375Q511.125,-25.875,511.125,-20.390625Q511.125,-14.625,508.82812,-10.46875Q506.54688,-6.328125,502.64062,-3.625Q498.75,-0.921875,493.54688,0.375Q488.34375,1.6875,482.4375,1.6875Q479.34375,1.6875,476.0625,1.296875Q472.79688,0.921875,469.59375,0.171875Q466.40625,-0.5625,463.3125,-1.609375Q460.21875,-2.671875,457.46875,-3.9375Q458.45312,-6.1875,459.54688,-8.328125Q460.64062,-10.484375,461.82812,-12.59375Q464.15625,-11.609375,466.75,-10.71875Q469.35938,-9.84375,472.09375,-9.203125Q474.84375,-8.578125,477.51562,-8.1875Q480.1875,-7.8125,482.64062,-7.8125Q485.73438,-7.8125,488.65625,-8.515625Q491.57812,-9.21875,493.85938,-10.71875Q496.14062,-12.234375,497.51562,-14.625Q498.89062,-17.015625,498.89062,-20.390625Q498.89062,-23.5625,497.57812,-25.59375Q496.28125,-27.640625,494.09375,-29Q491.92188,-30.375,489,-31.25Q486.09375,-32.140625,482.85938,-32.90625Q477.9375,-34.109375,473.53125,-35.65625Q469.14062,-37.203125,465.875,-39.6875Q462.60938,-42.1875,460.67188,-45.875Q458.73438,-49.578125,458.73438,-55.0625Q458.73438,-60.1875,460.84375,-63.90625Q462.95312,-67.640625,466.5,-70.03125Q470.0625,-72.421875,474.73438,-73.578125Q479.40625,-74.75,484.54688,-74.75Z"
-            android:fillColor="#000000"/>
-        <path android:pathData="M590.28125,-1.265625L578.6094,1.34375Q577.28125,-2.890625,576.71875,-6.828125Q576.4375,-8.65625,576.0156,-14.28125L574.53125,-14.28125Q570.6719,-7.171875,564.96875,-2.953125Q558.71875,1.6875,551.75,1.6875Q541.28125,1.6875,535.7969,-3.375Q531.0781,-7.671875,529.25,-16.53125Q528.0625,-22.578125,528.0625,-34.53125L528.0625,-73.125L540.15625,-73.125L540.15625,-31.15625Q540.15625,-20.671875,542.1875,-16.171875Q545.21875,-9.5,554.3594,-9.5Q560.8281,-9.5,567.0156,-15.6875Q571.15625,-19.828125,575.875,-27.84375L575.875,-73.125L587.96875,-73.125L587.96875,-27.984375Q587.96875,-18.640625,588.4531,-11.75Q588.7344,-7.453125,590.28125,-1.265625Z"
-            android:fillColor="#000000"/>
-        <path android:pathData="M644.78125,0L644.78125,-95.984375L683.03125,-95.984375L683.03125,0L644.78125,0ZM649.5625,-4.78125L678.25,-4.78125L678.25,-91.203125L649.5625,-91.203125L649.5625,-4.78125Z"
-            android:fillColor="#000000"/>
-      </group>
-    </group>
-  </group>
-</vector>

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

@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M3,7C3,6.448 3.448,6 4,6H20C20.552,6 21,6.448 21,7C21,7.552 20.552,8 20,8H4C3.448,8 3,7.552 3,7ZM6,12C6,11.448 6.448,11 7,11H17C17.552,11 18,11.448 18,12C18,12.552 17.552,13 17,13H7C6.448,13 6,12.552 6,12ZM9,17C9,16.448 9.448,16 10,16H14C14.552,16 15,16.448 15,17C15,17.552 14.552,18 14,18H10C9.448,18 9,17.552 9,17Z"/>
+</vector>

app/src/main/res/layout/activity_image_search.xml

@@ -2,8 +2,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="fill_parent"
+    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:paddingTop="32dp">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/dialog_layout.xml

@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp">
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="170dp"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.58"
+                    android:fontFamily="@font/poppins_bold"
+                    android:text="@string/layout" />
+
+                <TextView
+                    android:id="@+id/layoutText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/poppins_bold"
+                    android:textColor="?attr/colorSecondary"
+                    tools:ignore="TextContrastCheck"
+                    tools:text="Continuous" />
+            </LinearLayout>
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"  />
+            <androidx.cardview.widget.CardView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@color/nav_bg_inv"
+                app:cardCornerRadius="16dp"
+                app:cardElevation="0dp">
+
+                <ImageButton
+                    android:id="@+id/animeSourceList"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:alpha="0.33"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:scaleX="-1"
+                    app:srcCompat="@drawable/ic_round_view_list_24"
+                    app:tint="?attr/colorOnBackground"
+                    tools:ignore="ContentDescription,SpeakableTextPresentCheck,ImageContrastCheck" />
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@color/nav_bg_inv"
+                app:cardCornerRadius="16dp"
+                app:cardElevation="0dp">
+
+                <ImageButton
+                    android:id="@+id/animeSourceGrid"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:alpha="0.33"
+                    android:background="?android:attr/selectableItemBackground"
+                    app:srcCompat="@drawable/ic_round_grid_view_24"
+                    app:tint="?attr/colorOnBackground"
+                    tools:ignore="ContentDescription,SpeakableTextPresentCheck,ImageContrastCheck" />
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@color/nav_bg_inv"
+                app:cardCornerRadius="16dp"
+                app:cardElevation="0dp">
+
+                <ImageButton
+                    android:id="@+id/animeSourceCompact"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:alpha="0.33"
+                    android:background="?android:attr/selectableItemBackground"
+                    app:srcCompat="@drawable/ic_round_view_comfy_24"
+                    app:tint="?attr/colorOnBackground"
+                    tools:ignore="ContentDescription,SpeakableTextPresentCheck,ImageContrastCheck" />
+            </androidx.cardview.widget.CardView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="265dp"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="152dp"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.58"
+                    android:fontFamily="@font/poppins_bold"
+                    android:text="Sort" />
+
+                <TextView
+                    android:id="@+id/sortText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/poppins_bold"
+                    android:textColor="?attr/colorSecondary"
+                    tools:ignore="TextContrastCheck"
+                    tools:text="Up to Down" />
+            </LinearLayout>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@color/nav_bg_inv"
+                app:cardCornerRadius="16dp"
+                app:cardElevation="0dp">
+
+                <ImageButton
+                    android:id="@+id/animeSourceTop"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:rotation="90"
+                    android:background="?android:attr/selectableItemBackground"
+                    app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
+                    app:tint="?attr/colorOnBackground"
+                    tools:ignore="ContentDescription,ImageContrastCheck" />
+            </androidx.cardview.widget.CardView>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:id="@+id/animeDownloadContainer"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:layout_width="265dp"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/poppins_bold"
+                    android:alpha="0.58"
+                    android:text="Download" />
+
+                <TextView
+                    android:id="@+id/downloadNo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/poppins_bold"
+                    android:textColor="?attr/colorSecondary"
+                    tools:ignore="TextContrastCheck"
+                    tools:text="number" />
+            </LinearLayout>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@color/nav_bg_inv"
+                app:cardCornerRadius="16dp"
+                app:cardElevation="0dp">
+
+                <ImageButton
+                    android:id="@+id/animeDownloadTop"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:background="?android:attr/selectableItemBackground"
+                    app:srcCompat="@drawable/ic_round_download_24"
+                    app:tint="?attr/colorOnBackground"
+                    tools:ignore="ContentDescription,ImageContrastCheck" />
+            </androidx.cardview.widget.CardView>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/animeScanlatorContainer">
+            <TextView
+                android:layout_width="265dp"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/poppins_bold"
+                android:alpha="0.58"
+                android:text="Scanlator"
+                android:gravity="center_vertical"/>
+            <androidx.cardview.widget.CardView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@color/nav_bg_inv"
+                app:cardCornerRadius="16dp"
+                app:cardElevation="0dp">
+                <ImageButton
+                    android:id="@+id/animeScanlatorTop"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:background="?android:attr/selectableItemBackground"
+                    app:srcCompat="@drawable/ic_round_edit_note_24"
+                    app:tint="?attr/colorOnBackground"
+                    tools:ignore="ContentDescription,ImageContrastCheck" />
+            </androidx.cardview.widget.CardView>
+        </LinearLayout>
+    </LinearLayout>
+</FrameLayout>

app/src/main/res/layout/item_anime_watch.xml

@@ -90,12 +90,12 @@
 
 
             <ImageView
-                android:id="@+id/animeSourceSubscribe"
+                android:id="@+id/animeSourceSettings"
                 android:layout_width="48dp"
                 android:layout_height="wrap_content"
                 android:padding="8dp"
                 android:layout_gravity="center_vertical"
-                app:srcCompat="@drawable/ic_round_notifications_none_24"
+                app:srcCompat="@drawable/ic_round_settings_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription,ImageContrastCheck" />
         </LinearLayout>
@@ -107,7 +107,7 @@
             <com.google.android.material.textfield.TextInputLayout
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                 android:layout_width="0dp"
-
+                android:id="@+id/animeSourceLanguageContainer"
                 android:layout_height="56dp"
                 android:layout_weight="1"
                 android:hint="Language"
@@ -135,15 +135,6 @@
                     tools:ignore="LabelFor,TextContrastCheck,DuplicateSpeakableTextCheck" />
             </com.google.android.material.textfield.TextInputLayout>
 
-            <ImageView
-                android:id="@+id/animeSourceSettings"
-                android:layout_width="48dp"
-                android:layout_height="wrap_content"
-                android:padding="8dp"
-                android:layout_gravity="center_vertical"
-                app:srcCompat="@drawable/ic_round_settings_24"
-                app:tint="?attr/colorOnBackground"
-                tools:ignore="ContentDescription,ImageContrastCheck" />
         </LinearLayout>
 
 
@@ -186,19 +177,26 @@
 
             </LinearLayout>
 
-            <TextView
+            <LinearLayout
-                android:id="@+id/animeSourceSearch"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_gravity="end"
-                android:clickable="true"
+                android:orientation="horizontal">
-                android:focusable="true"
+                <TextView
-                android:fontFamily="@font/poppins_bold"
+
-                android:padding="12dp"
+                    android:id="@+id/animeSourceSearch"
-                android:text="@string/wrong"
+                    android:layout_width="wrap_content"
-                android:textAlignment="textEnd"
+                    android:layout_height="wrap_content"
-                android:textColor="?attr/colorSecondary"
+                    android:layout_gravity="end"
-                tools:ignore="TextContrastCheck" />
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:fontFamily="@font/poppins_bold"
+                    android:padding="12dp"
+                    android:text="@string/wrong"
+                    android:textAlignment="textEnd"
+                    android:textColor="?attr/colorSecondary"
+                    tools:ignore="TextContrastCheck" />
+            </LinearLayout>
         </FrameLayout>
 
         <LinearLayout
@@ -215,65 +213,25 @@
                 android:fontFamily="@font/poppins_bold"
                 android:text="@string/eps"
                 android:textSize="16sp" />
-
             <ImageView
-                android:id="@+id/animeSourceList"
+                android:id="@+id/animeSourceSubscribe"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:alpha="0.33"
                 android:padding="8dp"
-                app:srcCompat="@drawable/ic_round_view_list_24"
+                android:layout_gravity="center_vertical"
+                app:srcCompat="@drawable/ic_round_notifications_none_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription,ImageContrastCheck" />
 
             <ImageView
-                android:id="@+id/animeSourceGrid"
+                android:id="@+id/animeNestedButton"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
-                android:alpha="0.33"
+                android:layout_gravity="end"
                 android:padding="8dp"
-                app:srcCompat="@drawable/ic_round_grid_view_24"
-                app:tint="?attr/colorOnBackground"
-                tools:ignore="ContentDescription,ImageContrastCheck" />
-
-            <ImageView
-                android:id="@+id/animeSourceCompact"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:alpha="0.33"
-                android:padding="8dp"
-                app:srcCompat="@drawable/ic_round_view_comfy_24"
-                app:tint="?attr/colorOnBackground"
-                tools:ignore="ContentDescription,ImageContrastCheck" />
-
-            <ImageView
-                android:id="@+id/animeDownloadTop"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:alpha="1"
-                android:padding="8dp"
+                app:srcCompat="@drawable/ic_round_filter_24"
-                app:srcCompat="@drawable/ic_round_download_24"
-                app:tint="?attr/colorOnBackground"
-                tools:ignore="ContentDescription,ImageContrastCheck" />
-
-            <ImageView
-                android:id="@+id/animeScanlatorTop"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:alpha="1"
-                android:padding="8dp"
-                app:srcCompat="@drawable/ic_round_edit_note_24"
-                app:tint="?attr/colorOnBackground"
-                tools:ignore="ContentDescription,ImageContrastCheck" />
-
-            <ImageView
-                android:id="@+id/animeSourceTop"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:alpha="1"
-                android:padding="8dp"
-                android:rotation="90"
-                app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription,ImageContrastCheck" />
         </LinearLayout>

app/src/main/res/mipmap-anydpi-v26/ic_banner.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_banner_background"/>
-    <foreground android:drawable="@drawable/ic_banner_foreground"/>
+    <foreground android:drawable="@mipmap/ic_banner_foreground"/>
 </adaptive-icon>

app/src/main/res/values/style.xml

@@ -65,7 +65,7 @@
         <item name="android:textColor">?attr/colorOnBackground</item>
         <item name="android:popupBackground">?attr/colorSurface</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:windowBackground">@drawable/shape_corner_16dp</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowNoTitle">true</item>