[UI] #47 세부 UI 수정

core/feature/src/main/java/pokitmons/pokit/core/feature/flow/CollectAsEffect.kt

@@ -0,0 +1,22 @@
+package pokitmons.pokit.core.feature.flow
+
+import android.annotation.SuppressLint
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
+
+@SuppressLint("ComposableNaming")
+@Composable
+fun <T> Flow<T>.collectAsEffect(
+    context: CoroutineContext = EmptyCoroutineContext,
+    block: (T) -> Unit,
+) {
+    LaunchedEffect(Unit) {
+        onEach(block).flowOn(context).launchIn(this)
+    }
+}

core/feature/src/main/java/pokitmons/pokit/core/feature/flow/EventFlow.kt

@@ -0,0 +1,47 @@
+package pokitmons.pokit.core.feature.flow
+
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.MutableSharedFlow
+import java.util.concurrent.atomic.AtomicBoolean
+
+interface EventFlow<out T> : Flow<T> {
+    companion object {
+        const val DEFAULT_REPLAY: Int = 1
+    }
+}
+
+interface MutableEventFlow<T> : EventFlow<T>, FlowCollector<T>
+
+fun <T> MutableEventFlow(
+    replay: Int = EventFlow.DEFAULT_REPLAY,
+): MutableEventFlow<T> = EventFlowImpl(replay)
+
+fun <T> MutableEventFlow<T>.asEventFlow(): EventFlow<T> = ReadOnlyEventFlow(this)
+
+private class ReadOnlyEventFlow<T>(flow: EventFlow<T>) : EventFlow<T> by flow
+
+private class EventFlowImpl<T>(
+    replay: Int,
+) : MutableEventFlow<T> {
+
+    private val flow: MutableSharedFlow<EventFlowSlot<T>> = MutableSharedFlow(replay = replay)
+
+    @InternalCoroutinesApi
+    override suspend fun collect(collector: FlowCollector<T>) = flow
+        .collect { slot ->
+            if (!slot.markConsumed()) {
+                collector.emit(slot.value)
+            }
+        }
+
+    override suspend fun emit(value: T) {
+        flow.emit(EventFlowSlot(value))
+    }
+}
+
+private class EventFlowSlot<T>(val value: T) {
+    private val consumed: AtomicBoolean = AtomicBoolean(false)
+    fun markConsumed(): Boolean = consumed.getAndSet(true)
+}

core/feature/src/main/java/pokitmons/pokit/core/feature/model/NetworkState.kt

@@ -0,0 +1,5 @@
+package pokitmons.pokit.core.feature.model
+
+enum class NetworkState {
+    IDLE, LOADING, ERROR
+}

core/feature/src/main/java/pokitmons/pokit/core/feature/navigation/args/LinkArg.kt

@@ -10,4 +10,5 @@ data class LinkArg(
     val thumbnail: String,
     val createdAt: String,
     val domain: String,
+    val pokitId: Int,
 ) : Parcelable

core/feature/src/main/java/pokitmons/pokit/core/feature/navigation/args/LinkUpdateEvent.kt

@@ -13,6 +13,9 @@ object LinkUpdateEvent {
     private val _removedLink = MutableSharedFlow<Int>()
     val removedLink = _removedLink.asSharedFlow()
 
+    private val _addedLink = MutableSharedFlow<LinkArg>()
+    val addedLink = _addedLink.asSharedFlow()
+
     fun modifySuccess(link: LinkArg) {
         CoroutineScope(Dispatchers.Default).launch {
             _updatedLink.emit(link)
@@ -24,4 +27,10 @@ object LinkUpdateEvent {
             _removedLink.emit(linkId)
         }
     }
+
+    fun createSuccess(link: LinkArg) {
+        CoroutineScope(Dispatchers.Default).launch {
+            _addedLink.emit(link)
+        }
+    }
 }

core/feature/src/main/java/pokitmons/pokit/core/feature/navigation/args/PokitUpdateEvent.kt

@@ -13,6 +13,9 @@ object PokitUpdateEvent {
     private val _removedPokitId = MutableSharedFlow<Int>()
     val removedPokitId = _removedPokitId.asSharedFlow()
 
+    private val _addedPokit = MutableSharedFlow<PokitArg>()
+    val addedPokit = _addedPokit.asSharedFlow()
+
     fun updatePokit(pokitArg: PokitArg) {
         CoroutineScope(Dispatchers.Default).launch {
             _updatedPokit.emit(pokitArg)
@@ -24,4 +27,10 @@ object PokitUpdateEvent {
             _removedPokitId.emit(pokitId)
         }
     }
+
+    fun createPokit(pokitArg: PokitArg) {
+        CoroutineScope(Dispatchers.Default).launch {
+            _addedPokit.emit(pokitArg)
+        }
+    }
 }

core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/loading/LoadingProgress.kt

@@ -0,0 +1,24 @@
+package pokitmons.pokit.core.ui.components.atom.loading
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import pokitmons.pokit.core.ui.theme.PokitTheme
+
+@Composable
+fun LoadingProgress(modifier: Modifier = Modifier) {
+    Box(
+        modifier = modifier,
+        contentAlignment = Alignment.Center
+    ) {
+        CircularProgressIndicator(
+            modifier = Modifier.width(64.dp),
+            color = PokitTheme.colors.brand,
+            trackColor = PokitTheme.colors.borderTertiary
+        )
+    }
+}

core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/linkcard/LinkCard.kt

@@ -40,7 +40,7 @@ fun<T> LinkCard(
     sub: String,
     painter: Painter,
     notRead: Boolean,
-    badgeText: String,
+    badgeText: String?,
     onClickKebab: (T) -> Unit,
     onClickItem: (T) -> Unit,
     modifier: Modifier = Modifier,
@@ -119,16 +119,18 @@ fun<T> LinkCard(
                     modifier = Modifier.fillMaxWidth(),
                     horizontalArrangement = Arrangement.spacedBy(6.dp)
                 ) {
-                    Text(
-                        text = badgeText,
-                        modifier = Modifier
-                            .background(
-                                color = PokitTheme.colors.backgroundPrimary,
-                                shape = RoundedCornerShape(4.dp)
-                            )
-                            .padding(horizontal = 8.dp, vertical = 4.dp),
-                        style = PokitTheme.typography.label4.copy(color = PokitTheme.colors.textTertiary)
-                    )
+                    badgeText?.let { badge ->
+                        Text(
+                            text = badge,
+                            modifier = Modifier
+                                .background(
+                                    color = PokitTheme.colors.backgroundPrimary,
+                                    shape = RoundedCornerShape(4.dp)
+                                )
+                                .padding(horizontal = 8.dp, vertical = 4.dp),
+                            style = PokitTheme.typography.label4.copy(color = PokitTheme.colors.textTertiary)
+                        )
+                    }
 
                     if (notRead) {
                         Text(

core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/pokittoast/PokitToast.kt

@@ -0,0 +1,60 @@
+package pokitmons.pokit.core.ui.components.block.pokittoast
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import pokitmons.pokit.core.ui.R
+import pokitmons.pokit.core.ui.theme.PokitTheme
+
+@Composable
+fun PokitToast(
+    modifier: Modifier = Modifier,
+    text: String,
+    onClick: (() -> Unit)? = null,
+    onClickClose: () -> Unit = {},
+) {
+    Row(
+        modifier = modifier
+            .clip(RoundedCornerShape(9999.dp))
+            .background(PokitTheme.colors.backgroundTertiary)
+            .clickable(
+                enabled = onClick != null,
+                onClick = onClick ?: {}
+            )
+            .padding(start = 20.dp, end = 14.dp, top = 12.dp, bottom = 12.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Text(
+            text = text,
+            style = PokitTheme.typography.body3Medium.copy(color = PokitTheme.colors.inverseWh),
+            modifier = Modifier.weight(1f)
+        )
+
+        Spacer(modifier = Modifier.width(12.dp))
+
+        IconButton(
+            onClick = onClickClose,
+            modifier = Modifier.size(36.dp)
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.icon_24_x),
+                contentDescription = null,
+                tint = PokitTheme.colors.inverseWh
+            )
+        }
+    }
+}

core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/pokittoast/Preview.kt

@@ -0,0 +1,28 @@
+package pokitmons.pokit.core.ui.components.block.pokittoast
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import pokitmons.pokit.core.ui.theme.PokitTheme
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview() {
+    PokitTheme {
+        Column(
+            modifier = Modifier.fillMaxSize(),
+            verticalArrangement = Arrangement.spacedBy(8.dp)
+        ) {
+            PokitToast(
+                modifier = Modifier.padding(20.dp),
+                text = "최대 30개의 포킷을 생성할 수 있습니다.\n포킷을 삭제한 뒤에 추가해주세요.",
+                onClick = {}
+            )
+        }
+    }
+}

core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/pokkiempty/EmptyPokki.kt

@@ -0,0 +1,48 @@
+package pokitmons.pokit.core.ui.components.template.pokkiempty
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import pokitmons.pokit.core.ui.R
+import pokitmons.pokit.core.ui.theme.PokitTheme
+
+@Composable
+fun EmptyPokki(
+    modifier: Modifier = Modifier,
+    title: String,
+    sub: String,
+) {
+    Box(
+        modifier = modifier,
+        contentAlignment = Alignment.Center
+    ) {
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Image(
+                modifier = Modifier
+                    .height(180.dp)
+                    .width(180.dp),
+                painter = painterResource(id = R.drawable.empty_pokki),
+                contentDescription = "empty"
+            )
+
+            Spacer(modifier = Modifier.height(16.dp))
+
+            Text(text = title, style = PokitTheme.typography.title2.copy(color = PokitTheme.colors.textPrimary))
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            Text(text = sub, style = PokitTheme.typography.body2Medium.copy(color = PokitTheme.colors.textSecondary))
+        }
+    }
+}

core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/pokkiempty/Preview.kt

@@ -0,0 +1,18 @@
+package pokitmons.pokit.core.ui.components.template.pokkiempty
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import pokitmons.pokit.core.ui.theme.PokitTheme
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview() {
+    PokitTheme {
+        Surface(modifier = Modifier.fillMaxSize()) {
+            EmptyPokki(title = "저장된 포킷이 없어요!", sub = "포킷을 생성해 링크를 저장해보세요")
+        }
+    }
+}