From c21d89cf6009ddbc7fcc0051ba3a55f29728d620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Tue, 25 Oct 2022 19:58:26 +0200 Subject: [PATCH] [UI] Fix SettingsAboutCard having duplicate items. --- .../ui/settings/cards/SettingsAboutCard.kt | 17 +++++++---------- .../ui/settings/cards/SettingsRegisterCard.kt | 2 -- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsAboutCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsAboutCard.kt index 5057d1b4..1d4da496 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsAboutCard.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsAboutCard.kt @@ -39,16 +39,13 @@ class SettingsAboutCard(util: SettingsUtil) : SettingsCard(util), CoroutineScope MediaPlayer.create(activity, R.raw.ogarnij_sie) } - override fun buildCard(): MaterialAboutCard = - util.createCard( - null, - items = ::getItems, - itemsMore = ::getItemsMore, - backgroundColor = 0xff1976d2.toInt(), - theme = R.style.AppTheme_Dark - ).also { - it.items.addAll(getItems(it)) - } + override fun buildCard() = util.createCard( + null, + items = ::getItems, + itemsMore = ::getItemsMore, + backgroundColor = 0xff1976d2.toInt(), + theme = R.style.AppTheme_Dark + ) private val versionDetailsItem by lazy { util.createActionItem( diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsRegisterCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsRegisterCard.kt index 4f0f1078..7b689b47 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsRegisterCard.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsRegisterCard.kt @@ -4,9 +4,7 @@ package pl.szczodrzynski.edziennik.ui.settings.cards -import com.danielstone.materialaboutlibrary.items.MaterialAboutItem import com.danielstone.materialaboutlibrary.model.MaterialAboutCard -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial import eu.szkolny.font.SzkolnyFont import pl.szczodrzynski.edziennik.App