From 0483097fc34eeca34ebacddd1d5067e8465727d1 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Tue, 13 Apr 2021 18:53:10 -0400
Subject: [PATCH] Cleanup

---
 .../tachiyomi/ui/manga/EditMangaDialog.kt       | 13 +++++++------
 .../merged/EditMergedSettingsHeaderAdapter.kt   | 17 ++++++++++++++---
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
index 0af8fae64..7b6195b29 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
@@ -218,8 +218,8 @@ class EditMangaDialog : DialogController {
     private fun ChipGroup.setChips(items: List<String>) {
         removeAllViews()
 
-        items.forEach { item ->
-            val chip = Chip(context).apply {
+        items.asSequence().map { item ->
+            Chip(context).apply {
                 text = item
 
                 isCloseIconVisible = true
@@ -228,15 +228,16 @@ class EditMangaDialog : DialogController {
                     removeView(this)
                 }
             }
-
-            addView(chip)
+        }.forEach {
+            addView(it)
         }
 
         val addTagChip = Chip(context).apply {
             setText(R.string.add_tag)
 
-            chipIcon = ContextCompat.getDrawable(context, R.drawable.ic_add_24dp)
-            chipIcon?.setTint(context.getResourceColor(R.attr.colorAccent))
+            chipIcon = ContextCompat.getDrawable(context, R.drawable.ic_add_24dp)?.apply {
+                setTint(context.getResourceColor(R.attr.colorAccent))
+            }
             textStartPadding = 0F
 
             clicks().onEach {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt
index c2abe8cf3..8576de22e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt
@@ -85,7 +85,13 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings
 
             val mergedMangas = controller.mergedMangas
 
-            val mangaInfoAdapter: ArrayAdapter<String> = ArrayAdapter(itemView.context, android.R.layout.simple_spinner_item, mergedMangas.map { sourceManager.getOrStub(it.second.mangaSourceId).toString() + " " + it.first?.title })
+            val mangaInfoAdapter: ArrayAdapter<String> = ArrayAdapter(
+                itemView.context,
+                android.R.layout.simple_spinner_item,
+                mergedMangas.map {
+                    sourceManager.getOrStub(it.second.mangaSourceId).toString() + " " + it.first?.title
+                }
+            )
             mangaInfoAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
             binding.mangaInfoSpinner.adapter = mangaInfoAdapter
 
@@ -102,11 +108,16 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings
                     position: Int,
                     id: Long
                 ) {
-                    controller.mergedMangas.find { mergedManga -> mergedManga.second.id == mergedMangas.getOrNull(position)?.second?.id }?.second?.let { newInfoManga ->
+                    val mergedInfoManga = controller.mergedMangas
+                        .find { mergedManga ->
+                            mergedManga.second.id == mergedMangas.getOrNull(position)?.second?.id
+                        }
+
+                    if (mergedInfoManga != null) {
                         controller.mergedMangas.onEach {
                             it.second.isInfoManga = false
                         }
-                        newInfoManga.isInfoManga = true
+                        mergedInfoManga.second.isInfoManga = true
                     }
                 }