From f6e2a2cccbf5bce83e1624fb4cba780d310fb429 Mon Sep 17 00:00:00 2001 From: kadersutlu Date: Sun, 1 Sep 2024 02:22:28 +0300 Subject: [PATCH] =?UTF-8?q?fixed=20ego=20switch=20in=20the=20men=C3=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kekodchallenge1/ui/activity/MainActivity.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/kader/kekodchallenge1/ui/activity/MainActivity.kt b/app/src/main/java/com/kader/kekodchallenge1/ui/activity/MainActivity.kt index 8aa61be..3f64361 100644 --- a/app/src/main/java/com/kader/kekodchallenge1/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/kader/kekodchallenge1/ui/activity/MainActivity.kt @@ -51,23 +51,23 @@ class MainActivity : AppCompatActivity() { R.id.sadnessFragment to egoFragment.binding.switchSadness ) + val newSwitchIds = mutableListOf() switches.forEach { (fragmentId, switch) -> if (switch.isChecked) { if (!addedSwitchIds.contains(fragmentId)) { addedSwitchIds.add(fragmentId) } + newSwitchIds.add(fragmentId) } else { addedSwitchIds.remove(fragmentId) } } - addedSwitchIds.take(4).forEachIndexed { index, fragmentId -> + newSwitchIds.take(4).forEachIndexed { index, fragmentId -> val switchPair = switches.firstOrNull { it.first == fragmentId } - if (switchPair != null) { - val switch = switchPair.second - menu.add(0, fragmentId, index + 1, switch.text) - .setIconTintList(null) - .setIcon(getIconForFragment(fragmentId)) + switchPair?.let { (id, switch) -> + menu.add(0, id, index + 1, switch.text) + .setIcon(getIconForFragment(id)) } } @@ -81,7 +81,7 @@ class MainActivity : AppCompatActivity() { } } - binding.bottomNavigation.visibility = if (menu.size() > 1) View.VISIBLE else View.GONE + binding.bottomNavigation.visibility = if (menu.size() > 1 || menu.findItem(R.id.egoFragment) != null) View.VISIBLE else View.GONE } private fun showWarning() {