From c593e06e4c0d842fa6c78626dab0c2f150827c60 Mon Sep 17 00:00:00 2001 From: Omni Devel Date: Sun, 28 Jun 2026 16:52:38 +0300 Subject: [PATCH] refactor: cleaned code --- .../src/main/java/ru/omni_devel/cards/MainActivity.kt | 10 +--------- .../omni_devel/cards/presentation/MessagesReciever.kt | 5 +++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/mobile/src/main/java/ru/omni_devel/cards/MainActivity.kt b/mobile/src/main/java/ru/omni_devel/cards/MainActivity.kt index 30a9532..9040d6e 100644 --- a/mobile/src/main/java/ru/omni_devel/cards/MainActivity.kt +++ b/mobile/src/main/java/ru/omni_devel/cards/MainActivity.kt @@ -9,8 +9,6 @@ import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.expandVertically import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut -import androidx.compose.animation.scaleIn -import androidx.compose.animation.scaleOut import androidx.compose.animation.shrinkVertically import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -42,14 +40,12 @@ import androidx.compose.ui.unit.dp import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable -import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshots.SnapshotStateList import androidx.compose.ui.Alignment import androidx.compose.ui.draw.alpha import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.stringResource -import kotlinx.serialization.json.Json import ru.omni_devel.cards.ui.theme.OmniCardsTheme import sh.calvin.reorderable.ReorderableItem import sh.calvin.reorderable.rememberReorderableLazyListState @@ -184,11 +180,7 @@ fun MainPage( cardNameCleaned = cardNameCleaned.replace(from, to) } - if (cardNameCleaned.contains(queryCleaned)) { - return@filter true - } - - return@filter false + return@filter cardNameCleaned.contains(queryCleaned) } LazyColumn( diff --git a/wear/src/main/java/ru/omni_devel/cards/presentation/MessagesReciever.kt b/wear/src/main/java/ru/omni_devel/cards/presentation/MessagesReciever.kt index 4e57147..d347b06 100644 --- a/wear/src/main/java/ru/omni_devel/cards/presentation/MessagesReciever.kt +++ b/wear/src/main/java/ru/omni_devel/cards/presentation/MessagesReciever.kt @@ -26,6 +26,11 @@ class MessagesReceiver : WearableListenerService() { val json = String(event.data, Charsets.UTF_8) val cards = Json.decodeFromString>(json) + val oldCards = db.getCards() + + if (cards == oldCards) { + return + } db.clearDatabase() db.addCards(cards)