v1.0.9 배포

.github/release-drafter.yml

@@ -0,0 +1,5 @@
+commitish: master
+template: |
+  ## What’s Changed
+
+  $CHANGES

.github/workflows/auto-release-note.yml

@@ -0,0 +1,17 @@
+name: auto create release note
+on:
+  push:
+    branches:
+      - master
+permissions:
+  contents: read
+jobs:
+  create-release-note:
+    permissions:
+      contents: write
+      pull-requests: read
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v6
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

app/build.gradle.kts

@@ -86,7 +86,6 @@ dependencies {
     implementation(libs.core.ktx)
     implementation(libs.kotlin.android)
     implementation(libs.kotlin.core)
-    implementation(libs.androidx.splash)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.espresso.core)

app/src/main/AndroidManifest.xml

@@ -19,12 +19,17 @@
         tools:targetApi="31">
 
         <activity
-            android:name=".MainActivity"
+            android:name=".splash.SplashActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 

app/src/main/java/com/mashup/dorabangs/MainActivity.kt

@@ -11,19 +11,14 @@ import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.activity.viewModels
-import androidx.compose.runtime.collectAsState
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.mashup.dorabangs.core.designsystem.theme.DorabangsTheme
 import com.mashup.dorabangs.navigation.DoraApp
 import com.mashup.dorabangs.splash.FirstEntryScreen
-import com.mashup.dorabangs.splash.SplashViewModel
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
-    private val splashViewModel: SplashViewModel by viewModels()
     private val overlayPermissionLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
             if (!Settings.canDrawOverlays(this)) {
@@ -36,26 +31,15 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         checkPermission()
 
-        val userId = Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
-        splashViewModel.checkUserToken(userId)
-
-        val url = intent.data?.path?.substring(1).orEmpty()
-
-        installSplashScreen().apply {
-            setKeepOnScreenCondition {
-                (splashViewModel.isSplashShow.value || splashViewModel.firstEntryScreen.value == FirstEntryScreen.Splash) &&
-                    url.isBlank()
-            }
-        }
+        val firstEntryScreen = intent.getStringExtra("firstEntry") ?: FirstEntryScreen.Onboarding.name
 
         setContent {
-            val firstEntryScreen = splashViewModel.firstEntryScreen.collectAsState()
-            if (firstEntryScreen.value != FirstEntryScreen.Splash) {
+            if (firstEntryScreen != FirstEntryScreen.Splash.name) {
                 val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
 
                 DorabangsTheme {
                     DoraApp(
-                        isFirstEntry = firstEntryScreen.value == FirstEntryScreen.Onboarding,
+                        isFirstEntry = firstEntryScreen == FirstEntryScreen.Onboarding.name,
                         hideKeyboardAction = {
                             currentFocus?.let {
                                 imm?.hideSoftInputFromWindow(it.windowToken, 0)

app/src/main/java/com/mashup/dorabangs/navigation/MainNavHost.kt

@@ -10,6 +10,9 @@ import com.dorabangs.feature.navigation.navigateToSaveLinkSelectFolder
 import com.dorabangs.feature.navigation.saveLinkNavigation
 import com.dorabangs.feature.navigation.saveLinkSelectFolder
 import com.mashup.core.navigation.NavigationRoute
+import com.mashup.dorabangs.core.model.AISummaryUiModel
+import com.mashup.dorabangs.core.summary.aiSummaryNavigation
+import com.mashup.dorabangs.core.summary.navigateToAISummary
 import com.mashup.dorabangs.core.webview.navigateToWebView
 import com.mashup.dorabangs.core.webview.webViewNavigation
 import com.mashup.dorabangs.feature.folders.model.FolderManageType
@@ -63,7 +66,14 @@ fun MainNavHost(
             },
             navigateToCreateFolder = { appState.navController.navigateToHomeCrateFolder() },
             navigateToHomeTutorial = { appState.navController.navigateToHomeTutorial() },
-            navigateToWebView = { url -> appState.navController.navigateToWebView(url = url) },
+            navigateToWebView = { cardInfo ->
+                val summaryUiModel = AISummaryUiModel(
+                    description = cardInfo.content,
+                    url = cardInfo.url,
+                    keywords = cardInfo.keywordList,
+                )
+                appState.navController.navigateToWebView(summaryUiModel = summaryUiModel)
+            },
             navigateToUnreadStorageDetail = { folder -> appState.navController.navigateToUnreadStorageDetail(folder) },
         )
         homeCreateFolderNavigation(
@@ -163,10 +173,24 @@ fun MainNavHost(
                 )
                 appState.navController.popBackStackWithClearFocus()
             },
-            navigateToWebView = { url -> appState.navController.navigateToWebView(url = url) },
+            navigateToWebView = { cardInfo ->
+                val summaryUiModel = AISummaryUiModel(
+                    description = cardInfo.content,
+                    url = cardInfo.url,
+                    keywords = cardInfo.keywordList,
+                )
+                appState.navController.navigateToWebView(summaryUiModel = summaryUiModel)
+            },
         )
         classificationNavigation(
-            navigateToWebView = { url -> appState.navController.navigateToWebView(url = url) },
+            navigateToWebView = { cardInfo ->
+                val summaryUiModel = AISummaryUiModel(
+                    description = cardInfo.content,
+                    url = cardInfo.url,
+                    keywords = cardInfo.keywordList,
+                )
+                appState.navController.navigateToWebView(summaryUiModel = summaryUiModel)
+            },
             onClickBackIcon = { appState.navController.popBackStackWithClearFocus() },
             navigateToHome = { appState.navController.popBackStackWithClearFocus() },
         )
@@ -193,6 +217,11 @@ fun MainNavHost(
         )
         webViewNavigation(
             navigateToPopBackStack = { appState.navController.popBackStackWithClearFocus() },
+            navigateToAISummary = { summary -> appState.navController.navigateToAISummary(summaryUiModel = summary) },
+        )
+
+        aiSummaryNavigation(
+            navigateToPopBackStack = { appState.navController.popBackStackWithClearFocus() },
         )
     }
 }

app/src/main/java/com/mashup/dorabangs/splash/SplashActivity.kt

@@ -0,0 +1,38 @@
+package com.mashup.dorabangs.splash
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.os.Bundle
+import android.provider.Settings
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.viewModels
+import androidx.compose.runtime.collectAsState
+import com.mashup.dorabangs.MainActivity
+import dagger.hilt.android.AndroidEntryPoint
+
+@SuppressLint("CustomSplashScreen")
+@AndroidEntryPoint
+class SplashActivity : ComponentActivity() {
+    private val splashViewModel: SplashViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val userId = Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
+        splashViewModel.checkUserToken(userId)
+
+        setContent {
+            SplashScreen()
+
+            val firstEntryScreen = splashViewModel.firstEntryScreen.collectAsState()
+            if (firstEntryScreen.value != FirstEntryScreen.Splash) {
+                val intent = Intent(this, MainActivity::class.java)
+                intent.putExtra("firstEntry", firstEntryScreen.value.name)
+                intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
+                startActivity(intent)
+                finish()
+            }
+        }
+    }
+}

app/src/main/java/com/mashup/dorabangs/splash/SplashScreen.kt

@@ -0,0 +1,21 @@
+package com.mashup.dorabangs.splash
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.mashup.dorabangs.core.designsystem.component.util.LottieLoader
+import com.mashup.dorabangs.core.designsystem.R as coreR
+
+@Composable
+fun SplashScreen() {
+    Box(modifier = Modifier.fillMaxSize()) {
+        LottieLoader(
+            lottieRes = coreR.raw.splash,
+            modifier = Modifier.align(Alignment.Center).size(126.dp),
+        )
+    }
+}

app/src/main/java/com/mashup/dorabangs/splash/SplashViewModel.kt

@@ -10,11 +10,11 @@ import com.mashup.dorabangs.domain.usecase.user.GetUserAccessTokenUseCase
 import com.mashup.dorabangs.domain.usecase.user.RegisterUserUseCase
 import com.mashup.dorabangs.domain.usecase.user.SetUserAccessTokenUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.withTimeout
 import javax.inject.Inject
 
 @HiltViewModel
@@ -40,19 +40,18 @@ class SplashViewModel @Inject constructor(
                     token
                 }.orEmpty()
 
-            withTimeout(SPLASH_SCREEN_TIME) {
-                if (userAccessToken.isNotEmpty()) {
-                    splashShowFlow.value = false
-                    _firstEntryScreen.value = if (getIsFirstEntryUseCase().firstOrNull() != false) FirstEntryScreen.Onboarding else FirstEntryScreen.Home
-                } else {
-                    // Todo :: 유저 토큰 가져오기 실패에 대한 처리 해줘야함 (Like 토스트 메시지)
-                }
+            if (userAccessToken.isNotEmpty()) {
+                delay(SPLASH_SCREEN_TIME)
+                splashShowFlow.value = false
+                _firstEntryScreen.value = if (getIsFirstEntryUseCase().firstOrNull() != false) FirstEntryScreen.Onboarding else FirstEntryScreen.Home
+            } else {
+                // Todo :: 유저 토큰 가져오기 실패에 대한 처리 해줘야함 (Like 토스트 메시지)
             }
         }
     }
 
     companion object {
-        private const val SPLASH_SCREEN_TIME = 1000L
+        private const val SPLASH_SCREEN_TIME = 3000L
     }
 }
 

core/designsystem/src/main/java/com/mashup/dorabangs/core/designsystem/component/bottomsheet/BottomSheetType.kt

@@ -75,7 +75,7 @@ object DoraBottomSheet : BottomSheetType {
     override fun MovingFolderBottomSheet(
         modifier: Modifier,
         isShowSheet: Boolean,
-        btnEnable: Boolean,
+        isBtnEnabled: Boolean,
         folderList: List<SelectableBottomSheetItemUIModel>,
         onDismissRequest: () -> Unit,
         onClickCreateFolder: () -> Unit,
@@ -145,7 +145,7 @@ object DoraBottomSheet : BottomSheetType {
                             modifier = Modifier
                                 .fillMaxWidth(),
                             buttonText = stringResource(id = R.string.moving_folder_bottom_sheet_complete),
-                            enabled = btnEnable,
+                            enabled = isBtnEnabled,
                             onClickButton = onClickCompleteButton,
                         )
                     }

core/designsystem/src/main/java/com/mashup/dorabangs/core/designsystem/component/chips/FeedUiModel.kt

@@ -7,6 +7,7 @@ import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
 import java.util.UUID
+import com.mashup.dorabangs.core.designsystem.R as CR
 
 sealed interface FeedUiModel {
     val uuid: String
@@ -60,8 +61,22 @@ sealed interface FeedUiModel {
         val title: String = "",
         val postCount: Int = 0,
         val folderId: String = "",
-        @DrawableRes val icon: Int? = com.mashup.dorabangs.core.designsystem.R.drawable.ic_3d_all_small,
+        val isAIGenerated: Boolean = false,
+        @DrawableRes val icon: Int? = CR.drawable.ic_3d_all_small,
     ) : FeedUiModel {
         override val uuid: String = UUID.randomUUID().toString()
+
+        companion object {
+            fun getDefaultModelList() = listOf(
+                DoraChipUiModel(
+                    title = "전체",
+                    icon = CR.drawable.ic_3d_all_small,
+                ),
+                DoraChipUiModel(
+                    title = "즐겨찾기",
+                    icon = CR.drawable.ic_3d_bookmark_small,
+                ),
+            )
+        }
     }
 }

core/designsystem/src/main/java/com/mashup/dorabangs/core/designsystem/component/topbar/DorabangsTopAppBar.kt

@@ -1,9 +1,9 @@
 package com.mashup.dorabangs.core.designsystem.component.topbar
 
-import androidx.annotation.DrawableRes
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -27,10 +27,9 @@ fun DoraTopAppBar(
     title: String,
     isTitleCenter: Boolean = false,
     isEnableBackNavigation: Boolean = false,
-    @DrawableRes actionIcon: Int? = null,
+    actionIcon: @Composable BoxScope.() -> Unit = {},
     isShowBottomDivider: Boolean = false,
     onClickBackIcon: () -> Unit = {},
-    onClickActonIcon: () -> Unit = {},
 ) {
     val isHomeAppBar = isTitleCenter && !isEnableBackNavigation
     Box(
@@ -81,16 +80,8 @@ fun DoraTopAppBar(
                 )
             }
         }
-        actionIcon?.let { icon ->
-            Icon(
-                modifier = Modifier
-                    .align(Alignment.CenterEnd)
-                    .padding(end = 20.dp)
-                    .clickable { onClickActonIcon() },
-                painter = painterResource(id = icon),
-                contentDescription = "action",
-            )
-        }
+        actionIcon()
+
         if (isShowBottomDivider) {
             DoraDivider(modifier = Modifier.align(Alignment.BottomCenter))
         }
@@ -124,9 +115,16 @@ fun PreviewBackWithActionIconTopBar() {
     DoraTopBar.BackWithActionIconTopBar(
         modifier = Modifier.fillMaxWidth(),
         title = "Dorabangs",
-        actionIcon = R.drawable.ic_plus,
+        actionIcon = {
+            Icon(
+                modifier = Modifier
+                    .align(Alignment.CenterEnd)
+                    .padding(end = 20.dp),
+                painter = painterResource(id = R.drawable.ic_more_gray),
+                contentDescription = "action",
+            )
+        },
         onClickBackIcon = {},
-        onClickActonIcon = {},
         isTitleCenter = true,
         isShowBottomDivider = true,
     )