State 와 Event 분리

app/build.gradle.kts

@@ -57,6 +57,7 @@ dependencies {
     projects.core.domain,
     projects.core.network,
     projects.core.ui,
+    projects.core.util,
     projects.feature.complete,
     projects.feature.home,
     projects.feature.onboarding,

core/data/src/main/kotlin/com/nexters/bandalart/android/core/data/di/ServiceModule.kt

@@ -2,13 +2,14 @@ package com.nexters.bandalart.android.core.data.di
 
 import com.nexters.bandalart.android.core.data.service.BandalartService
 import com.nexters.bandalart.android.core.data.service.GuestLoginService
+import com.nexters.bandalart.android.core.network.di.BandalartApi
+import com.nexters.bandalart.android.core.network.di.LoginApi
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
 import retrofit2.Retrofit
-import javax.inject.Named
+import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -17,17 +18,15 @@ internal object ServiceModule {
   @Singleton
   @Provides
   internal fun provideBandalartService(
-    @Named("HttpClient")
-    retrofit: Retrofit,
+    @BandalartApi retrofit: Retrofit,
   ): BandalartService {
     return retrofit.create(BandalartService::class.java)
   }
 
   @Singleton
   @Provides
   internal fun provideGuestLoginService(
-    @Named("AuthHttpClient")
-    retrofit: Retrofit,
+    @LoginApi retrofit: Retrofit,
   ): GuestLoginService {
     return retrofit.create(GuestLoginService::class.java)
   }

core/network/src/main/kotlin/com/nexters/bandalart/android/core/network/di/NetworkModule.kt

@@ -19,8 +19,6 @@ import io.ktor.client.request.header
 import io.ktor.http.ContentType
 import io.ktor.http.contentType
 import io.ktor.serialization.kotlinx.json.json
-import java.util.concurrent.TimeUnit
-import javax.inject.Singleton
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.json.Json
 import okhttp3.Interceptor
@@ -29,7 +27,8 @@ import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import timber.log.Timber
-import javax.inject.Named
+import java.util.concurrent.TimeUnit
+import javax.inject.Singleton
 
 private const val MaxTimeoutMillis = 3000L
 private const val MaxRetryCount = 3
@@ -91,10 +90,10 @@ internal object NetworkModule {
     }
   }
 
+  @LoginApi
   @Singleton
   @Provides
-  @Named("AuthHttpClient")
-  internal fun provideRetrofitAuthHttpClient(
+  internal fun provideLoginApiRetrofit(
     httpLoggingInterceptor: HttpLoggingInterceptor,
   ): Retrofit {
     val contentType = "application/json".toMediaType()
@@ -110,10 +109,10 @@ internal object NetworkModule {
       .build()
   }
 
+  @BandalartApi
   @Singleton
   @Provides
-  @Named("HttpClient")
-  internal fun provideRetrofitHttpClient(
+  internal fun provideBandalartApiRetrofit(
     dataStoreProvider: DataStoreProvider,
     httpLoggingInterceptor: HttpLoggingInterceptor,
   ): Retrofit {

core/network/src/main/kotlin/com/nexters/bandalart/android/core/network/di/RetrofitQualifier.kt

@@ -0,0 +1,11 @@
+package com.nexters.bandalart.android.core.network.di
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class BandalartApi
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class LoginApi

core/ui/build.gradle.kts

@@ -16,6 +16,7 @@ android {
 dependencies {
   implementations(
     projects.core.designsystem,
+    projects.core.util,
     libs.kotlinx.datetime,
     libs.androidx.core,
     libs.lottie.compose,

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/extension/MultipleEventsCutter.kt → core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/MultipleEventsCutter.kt

@@ -1,4 +1,4 @@
-package com.nexters.bandalart.android.core.ui.extension
+package com.nexters.bandalart.android.core.ui
 
 internal interface MultipleEventsCutter {
   fun processEvent(event: () -> Unit)

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/ObserveEvent.kt

@@ -0,0 +1,23 @@
+package com.nexters.bandalart.android.core.ui
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.repeatOnLifecycle
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.withContext
+
+// https://www.youtube.com/watch?v=njchj9d_Lf8&t=1218s
+@Composable
+fun <T> ObserveAsEvents(flow: Flow<T>, onEvent: (T) -> Unit) {
+  val lifecycleOwner = LocalLifecycleOwner.current
+  LaunchedEffect(flow, lifecycleOwner.lifecycle) {
+    lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+      withContext(Dispatchers.Main.immediate) {
+        flow.collect(onEvent)
+      }
+    }
+  }
+}

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/extension/TextUnit.kt → core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/TextUnit.kt

@@ -1,4 +1,4 @@
-package com.nexters.bandalart.android.core.ui.extension
+package com.nexters.bandalart.android.core.ui
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalDensity

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/extension/ThemeColor.kt → core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/ThemeColor.kt

@@ -1,4 +1,4 @@
-package com.nexters.bandalart.android.core.ui.extension
+package com.nexters.bandalart.android.core.ui
 
 data class ThemeColor(
   val mainColor: String,

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/UiText.kt

@@ -0,0 +1,26 @@
+package com.nexters.bandalart.android.core.ui
+
+import android.content.Context
+import androidx.annotation.StringRes
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+
+sealed class UiText {
+  data class DirectString(val value: String) : UiText()
+
+  class StringResource(
+    @StringRes val resId: Int,
+    vararg val args: Any,
+  ) : UiText()
+
+  @Composable
+  fun asString() = when (this) {
+    is DirectString -> value
+    is StringResource -> stringResource(resId, *args)
+  }
+
+  fun asString(context: Context) = when (this) {
+    is DirectString -> value
+    is StringResource -> context.getString(resId, *args)
+  }
+}

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/extension/WindowInsets.kt → core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/WindowInsets.kt

@@ -1,4 +1,4 @@
-package com.nexters.bandalart.android.core.ui.extension
+package com.nexters.bandalart.android.core.ui
 
 import android.app.Activity
 import android.graphics.Rect
@@ -7,6 +7,8 @@ import androidx.compose.foundation.layout.systemBars
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 
 // https://sungbin.land/jetpack-compose-windowinsets-fa8f286f092b
 val NavigationBarHeightDp
@@ -33,3 +35,9 @@ val StatusBarHeightDp
       rectangle.top.toDp()
     }
   }
+
+// https://stackoverflow.com/questions/75123079/how-do-i-detect-which-type-of-navigation-bar-is-active
+@Composable
+fun getNavigationBarPadding(): Dp {
+  return if (NavigationBarHeightDp == 0.dp) 32.dp else NavigationBarHeightDp - 16.dp
+}

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/BandalartButton.kt

@@ -15,7 +15,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.nexters.bandalart.android.core.ui.extension.clickableSingle
-import com.nexters.bandalart.android.core.ui.extension.nonScaleSp
+import com.nexters.bandalart.android.core.ui.nonScaleSp
 import com.nexters.bandalart.android.core.designsystem.theme.Gray900
 import com.nexters.bandalart.android.core.designsystem.theme.White
 import com.nexters.bandalart.android.core.designsystem.theme.pretendard

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/BandalartDeleteAlertDialog.kt

@@ -25,19 +25,19 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import com.nexters.bandalart.android.core.ui.R
-import com.nexters.bandalart.android.core.ui.extension.nonScaleSp
+import com.nexters.bandalart.android.core.ui.nonScaleSp
 import com.nexters.bandalart.android.core.designsystem.theme.Gray200
 import com.nexters.bandalart.android.core.designsystem.theme.Gray400
 import com.nexters.bandalart.android.core.designsystem.theme.Gray900
 import com.nexters.bandalart.android.core.designsystem.theme.White
 
 @Composable
 fun BandalartDeleteAlertDialog(
-  modifier: Modifier = Modifier,
   title: String,
   message: String,
   onDeleteClicked: () -> Unit,
   onCancelClicked: () -> Unit,
+  modifier: Modifier = Modifier,
 ) {
   val context = LocalContext.current
   Dialog(onDismissRequest = { onCancelClicked() }) {

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/BandalartDropDownMenu.kt

@@ -23,17 +23,17 @@ import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.nexters.bandalart.android.core.ui.R
-import com.nexters.bandalart.android.core.ui.extension.nonScaleSp
+import com.nexters.bandalart.android.core.ui.nonScaleSp
 import com.nexters.bandalart.android.core.designsystem.theme.Error
 import com.nexters.bandalart.android.core.designsystem.theme.White
 import com.nexters.bandalart.android.core.designsystem.theme.pretendard
 
 @Composable
 fun BandalartDropDownMenu(
-  modifier: Modifier = Modifier,
   openDropDownMenu: (Boolean) -> Unit,
   isDropDownMenuOpened: Boolean,
   onDeleteClicked: () -> Unit,
+  modifier: Modifier = Modifier,
 ) {
   val context = LocalContext.current
   MaterialTheme(

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/CellText.kt

@@ -12,7 +12,7 @@ import androidx.compose.ui.text.style.LineBreak
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.nexters.bandalart.android.core.ui.extension.nonScaleSp
+import com.nexters.bandalart.android.core.ui.nonScaleSp
 import com.nexters.bandalart.android.core.designsystem.theme.pretendard
 
 val cellLineBreak = LineBreak(
@@ -23,10 +23,10 @@ val cellLineBreak = LineBreak(
 
 @Composable
 fun CellText(
-  modifier: Modifier = Modifier,
   cellText: String,
   cellTextColor: Color,
   fontWeight: FontWeight,
+  modifier: Modifier = Modifier,
   textAlpha: Float = 1f,
 ) {
   Text(

feature/home/src/main/kotlin/com/nexters/bandalart/android/feature/home/ui/CompletionRatioProgressBar.kt → core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/CompletionRatioProgressBar.kt

@@ -1,4 +1,4 @@
-package com.nexters.bandalart.android.feature.home.ui
+package com.nexters.bandalart.android.core.ui.component
 
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.LinearOutSlowInEasing
@@ -29,6 +29,7 @@ import com.nexters.bandalart.android.core.designsystem.theme.Gray100
 fun CompletionRatioProgressBar(
   completionRatio: Int,
   progressColor: Color,
+  modifier: Modifier = Modifier,
 ) {
   var progress by remember { mutableFloatStateOf(0f) }
 
@@ -46,7 +47,7 @@ fun CompletionRatioProgressBar(
   }
 
   Column(
-    modifier = Modifier
+    modifier = modifier
       .fillMaxWidth()
       .wrapContentSize(),
   ) {

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/EmojiText.kt

@@ -2,16 +2,19 @@ package com.nexters.bandalart.android.core.ui.component
 
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.TextUnit
-import com.nexters.bandalart.android.core.ui.extension.nonScaleSp
+import com.nexters.bandalart.android.core.ui.nonScaleSp
 
 @Composable
 fun EmojiText(
   emojiText: String?,
   fontSize: TextUnit,
+  modifier: Modifier = Modifier,
 ) {
   Text(
     text = emojiText ?: "",
+    modifier = modifier,
     fontSize = fontSize.nonScaleSp,
   )
 }

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/FixedSizeText.kt

@@ -8,16 +8,16 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.TextUnit
-import com.nexters.bandalart.android.core.ui.extension.nonScaleSp
+import com.nexters.bandalart.android.core.ui.nonScaleSp
 import com.nexters.bandalart.android.core.designsystem.theme.pretendard
 
 @Composable
 fun FixedSizeText(
   text: String,
-  modifier: Modifier = Modifier,
   color: Color,
   fontSize: TextUnit,
   fontWeight: FontWeight,
+  modifier: Modifier = Modifier,
   fontFamily: FontFamily = pretendard,
   letterSpacing: TextUnit = TextUnit.Unspecified,
   textAlign: TextAlign? = null,

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/LoadingScreen.kt

@@ -23,7 +23,9 @@ import com.nexters.bandalart.android.core.designsystem.theme.Black
 import com.nexters.bandalart.android.core.designsystem.theme.White
 
 @Composable
-fun LoadingScreen(modifier: Modifier = Modifier) {
+fun LoadingScreen(
+  modifier: Modifier = Modifier,
+) {
   Box(
     modifier = modifier.noRippleClickable { },
     contentAlignment = Alignment.Center,

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/NetworkErrorAlertDialog.kt

@@ -24,17 +24,17 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import com.nexters.bandalart.android.core.ui.R
-import com.nexters.bandalart.android.core.ui.extension.nonScaleSp
+import com.nexters.bandalart.android.core.ui.nonScaleSp
 import com.nexters.bandalart.android.core.designsystem.theme.Gray400
 import com.nexters.bandalart.android.core.designsystem.theme.Gray900
 import com.nexters.bandalart.android.core.designsystem.theme.White
 
 @Composable
 fun NetworkErrorAlertDialog(
-  modifier: Modifier = Modifier,
   title: String,
   message: String,
   onConfirmClick: () -> Unit,
+  modifier: Modifier = Modifier,
 ) {
   val context = LocalContext.current
   Dialog(onDismissRequest = {}) {
@@ -54,8 +54,8 @@ fun NetworkErrorAlertDialog(
         )
         Spacer(modifier = Modifier.height(8.dp))
         FixedSizeText(
-          modifier = Modifier.align(Alignment.CenterHorizontally),
           text = title,
+          modifier = Modifier.align(Alignment.CenterHorizontally),
           color = Gray900,
           fontSize = 20.sp,
           fontWeight = FontWeight.W700,
@@ -65,8 +65,8 @@ fun NetworkErrorAlertDialog(
         )
         Spacer(modifier = Modifier.height(8.dp))
         FixedSizeText(
-          modifier = Modifier.align(Alignment.CenterHorizontally),
           text = message,
+          modifier = Modifier.align(Alignment.CenterHorizontally),
           color = Gray400,
           fontSize = 14.sp,
           fontWeight = FontWeight.W500,