Small refactoring

2025-08-12 17:55:24 -04:00
parent c17d66b7e9
commit 346fb61507
7 changed files with 27 additions and 51 deletions
@@ -21,8 +21,8 @@
 package com.vitorpamplona.amethyst.model

 import androidx.compose.runtime.Stable
-import com.vitorpamplona.amethyst.model.privateChats.ListChange
 import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
+import com.vitorpamplona.amethyst.ui.dal.ListChange
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
 import com.vitorpamplona.quartz.utils.LargeCache
@@ -25,6 +25,7 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.NotesGatherer
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
+import com.vitorpamplona.amethyst.ui.dal.ListChange
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip04Dm.messages.PrivateDmEvent
 import com.vitorpamplona.quartz.nip14Subject.subject
@@ -1,39 +0,0 @@
-/**
- * Copyright (c) 2025 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.vitorpamplona.amethyst.model.privateChats
-
-sealed class ListChange<out T> {
-    data class Addition<T>(
-        val item: T,
-    ) : ListChange<T>()
-
-    data class Deletion<T>(
-        val item: T,
-    ) : ListChange<T>()
-
-    data class SetAddition<T>(
-        val item: Set<T>,
-    ) : ListChange<T>()
-
-    data class SetDeletion<T>(
-        val item: Set<T>,
-    ) : ListChange<T>()
-}
@@ -20,9 +20,26 @@
 */
 package com.vitorpamplona.amethyst.ui.dal

-import com.vitorpamplona.amethyst.model.privateChats.ListChange
 import kotlinx.coroutines.flow.MutableSharedFlow

 interface ChangesFlowFilter<T> : IAdditiveFeedFilter<T> {
    fun changesFlow(): MutableSharedFlow<ListChange<T>>
 }
+
+sealed class ListChange<out T> {
+    data class Addition<T>(
+        val item: T,
+    ) : ListChange<T>()
+
+    data class Deletion<T>(
+        val item: T,
+    ) : ListChange<T>()
+
+    data class SetAddition<T>(
+        val item: Set<T>,
+    ) : ListChange<T>()
+
+    data class SetDeletion<T>(
+        val item: Set<T>,
+    ) : ListChange<T>()
+}
@@ -27,8 +27,8 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.privateChats.ListChange
 import com.vitorpamplona.amethyst.ui.dal.ChangesFlowFilter
+import com.vitorpamplona.amethyst.ui.dal.ListChange
 import com.vitorpamplona.amethyst.ui.feeds.FeedContentState
 import com.vitorpamplona.amethyst.ui.feeds.InvalidatableContent
 import com.vitorpamplona.quartz.nip17Dm.base.ChatroomKey
@@ -56,7 +56,6 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.IntSize
-import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.LocalCache
@@ -97,7 +96,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.profile.zaps.ZapTabHeader
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.profile.zaps.dal.UserProfileZapsFeedViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
-import kotlinx.coroutines.Dispatchers
+import com.vitorpamplona.amethyst.ui.theme.Size8dp
 import kotlinx.coroutines.launch

@Composable
@@ -112,12 +111,9 @@ fun ProfileScreen(

    if (userBase == null) {
        LaunchedEffect(userId) {
-            // waits to resolve.
-            launch(Dispatchers.IO) {
-                val newUserBase = LocalCache.checkGetOrCreateUser(userId)
-                if (newUserBase != userBase) {
-                    userBase = newUserBase
-                }
+            val newUserBase = LocalCache.checkGetOrCreateUser(userId)
+            if (newUserBase != userBase) {
+                userBase = newUserBase
            }
        }
    }
@@ -395,7 +391,7 @@ private fun RenderScreen(
            containerColor = Color.Transparent,
            contentColor = MaterialTheme.colorScheme.onBackground,
            selectedTabIndex = pagerState.currentPage,
-            edgePadding = 8.dp,
+            edgePadding = Size8dp,
            modifier = tabRowModifier,
            divider = { HorizontalDivider(thickness = DividerThickness) },
        ) {
@@ -90,6 +90,7 @@ val HalfDoubleVertSpacer = Modifier.height(7.dp)
 val Size0dp = 0.dp
 val Size5dp = 5.dp
 val Size6dp = 6.dp
+val Size8dp = 8.dp
 val Size10dp = 10.dp
 val Size12dp = 12.dp
 val Size13dp = 13.dp