fix: quack 이슈로 인한 임시버튼 제거 (#674)

duckie-team · Nov 19, 2023 · 5dbd5b7 · 5dbd5b7
1 parent 5575ad6
commit 5dbd5b7
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 143 deletions.
diff --git a/...n/kotlin/team/duckie/app/android/common/compose/ui/temp/TempFlexiblePrimaryLargeButton.kt b/...n/kotlin/team/duckie/app/android/common/compose/ui/temp/TempFlexiblePrimaryLargeButton.kt
diff --git a/.../kotlin/team/duckie/app/android/common/compose/ui/temp/TempFlexibleSecondaryLargButton.kt b/.../kotlin/team/duckie/app/android/common/compose/ui/temp/TempFlexibleSecondaryLargButton.kt
diff --git a/...esult/src/main/java/team/duckie/app/android/feature/exam/result/common/ResultBottomBar.kt b/...esult/src/main/java/team/duckie/app/android/feature/exam/result/common/ResultBottomBar.kt
@@ -22,9 +22,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import team.duckie.app.android.common.compose.ui.quack.todo.QuackSurface
-import team.duckie.app.android.common.compose.ui.temp.TempFlexiblePrimaryLargeButton
 import team.duckie.app.android.feature.exam.result.R
 import team.duckie.quackquack.material.QuackColor
+import team.duckie.quackquack.ui.sugar.QuackPrimaryLargeButton
 import team.duckie.quackquack.ui.sugar.QuackSubtitle
 import team.duckie.quackquack.ui.util.ExperimentalQuackQuackApi
 
@@ -53,7 +53,7 @@ internal fun ResultBottomBar(
                 onClick = onClickRetryButton,
             )
         }
-        TempFlexiblePrimaryLargeButton(
+        QuackPrimaryLargeButton(
             modifier = Modifier.weight(1f),
             text = stringResource(id = R.string.exam_result_exit_exam),
             onClick = onClickExitButton,

diff --git a/...home/src/main/kotlin/team/duckie/app/android/feature/home/screen/guide/HomeGuideScreen.kt b/...home/src/main/kotlin/team/duckie/app/android/feature/home/screen/guide/HomeGuideScreen.kt
@@ -37,14 +37,14 @@ import kotlinx.coroutines.launch
 import org.orbitmvi.orbit.compose.collectAsState
 import team.duckie.app.android.common.compose.activityViewModel
 import team.duckie.app.android.common.compose.ui.Spacer
-import team.duckie.app.android.common.compose.ui.temp.TempFlexiblePrimaryLargeButton
 import team.duckie.app.android.feature.home.R
 import team.duckie.app.android.feature.home.constants.GuideStep
 import team.duckie.app.android.feature.home.viewmodel.guide.HomeGuideViewModel
 import team.duckie.quackquack.material.QuackColor
 import team.duckie.quackquack.material.QuackTypography
 import team.duckie.quackquack.material.quackClickable
 import team.duckie.quackquack.ui.QuackText
+import team.duckie.quackquack.ui.sugar.QuackPrimaryLargeButton
 import team.duckie.quackquack.ui.util.ExperimentalQuackQuackApi
 
 @Composable
@@ -148,7 +148,7 @@ private fun HomeGuideStartScreen(
             ),
         )
         Spacer(space = 20.dp)
-        TempFlexiblePrimaryLargeButton(
+        QuackPrimaryLargeButton(
             text = stringResource(id = R.string.guide_start_accept_message),
             modifier = Modifier.size(118.dp, 44.dp),
             enabled = true,

diff --git a/...e/src/main/kotlin/team/duckie/app/android/feature/home/screen/home/HomeRecommendScreen.kt b/...e/src/main/kotlin/team/duckie/app/android/feature/home/screen/home/HomeRecommendScreen.kt
@@ -63,7 +63,6 @@ import team.duckie.app.android.common.compose.ui.DuckTestCoverItem
 import team.duckie.app.android.common.compose.ui.DuckieHorizontalPagerIndicator
 import team.duckie.app.android.common.compose.ui.quack.todo.QuackAnnotatedText
 import team.duckie.app.android.common.compose.ui.skeleton
-import team.duckie.app.android.common.compose.ui.temp.TempFlexiblePrimaryLargeButton
 import team.duckie.app.android.common.kotlin.addHashTag
 import team.duckie.app.android.domain.exam.model.Exam
 import team.duckie.app.android.domain.recommendation.model.ExamType
@@ -76,6 +75,7 @@ import team.duckie.quackquack.material.QuackTypography
 import team.duckie.quackquack.ui.QuackText
 import team.duckie.quackquack.ui.sugar.QuackBody3
 import team.duckie.quackquack.ui.sugar.QuackLarge1
+import team.duckie.quackquack.ui.sugar.QuackPrimaryLargeButton
 import team.duckie.quackquack.ui.util.ExperimentalQuackQuackApi
 
 private val HomeHorizontalPadding = PaddingValues(horizontal = 16.dp)
@@ -240,7 +240,7 @@ private fun HomeRecommendJumbotronLayout(
         )
         Spacer(modifier = Modifier.height(24.dp))
 
-        TempFlexiblePrimaryLargeButton(
+        QuackPrimaryLargeButton(
             modifier = Modifier
                 .fillMaxWidth()
                 .skeleton(isLoading),

diff --git a/...onboard/src/main/kotlin/team/duckie/app/android/feature/onboard/screen/1_ProfileScreen.kt b/...onboard/src/main/kotlin/team/duckie/app/android/feature/onboard/screen/1_ProfileScreen.kt
@@ -70,7 +70,6 @@ import team.duckie.app.android.common.compose.ui.Spacer
 import team.duckie.app.android.common.compose.ui.constant.SharedIcon
 import team.duckie.app.android.common.compose.ui.quack.todo.QuackErrorableTextField
 import team.duckie.app.android.common.compose.ui.quack.todo.QuackErrorableTextFieldState
-import team.duckie.app.android.common.compose.ui.temp.TempFlexiblePrimaryLargeButton
 import team.duckie.app.android.common.kotlin.runIf
 import team.duckie.app.android.feature.onboard.R
 import team.duckie.app.android.feature.onboard.common.OnboardTopAppBar
@@ -83,6 +82,7 @@ import team.duckie.quackquack.material.quackClickable
 import team.duckie.quackquack.material.shape.SquircleShape
 import team.duckie.quackquack.ui.QuackImage
 import team.duckie.quackquack.ui.optin.ExperimentalDesignToken
+import team.duckie.quackquack.ui.sugar.QuackPrimaryLargeButton
 import team.duckie.quackquack.ui.util.ExperimentalQuackQuackApi
 
 private val currentStep = OnboardStep.Profile
@@ -229,7 +229,7 @@ internal fun ProfileScreen(vm: OnboardViewModel = activityViewModel()) {
             )
 
             Spacer(weight = 1f)
-            TempFlexiblePrimaryLargeButton(
+            QuackPrimaryLargeButton(
                 modifier = Modifier.fillMaxWidth(),
                 text = stringResource(R.string.button_next),
                 enabled = profileScreenState == ProfileScreenState.Valid &&

diff --git a/...nboard/src/main/kotlin/team/duckie/app/android/feature/onboard/screen/2_CategoryScreen.kt b/...nboard/src/main/kotlin/team/duckie/app/android/feature/onboard/screen/2_CategoryScreen.kt
@@ -6,6 +6,7 @@
  */
 
 @file:Suppress("ConstPropertyName", "PrivatePropertyName")
+@file:OptIn(ExperimentalQuackQuackApi::class)
 
 package team.duckie.app.android.feature.onboard.screen
 
@@ -35,7 +36,6 @@ import team.duckie.app.android.common.compose.systemBarPaddings
 import team.duckie.app.android.common.compose.ui.quack.todo.QuackGridLayout
 import team.duckie.app.android.common.compose.ui.quack.todo.QuackSelectableImage
 import team.duckie.app.android.common.compose.ui.quack.todo.QuackSelectableImageType
-import team.duckie.app.android.common.compose.ui.temp.TempFlexiblePrimaryLargeButton
 import team.duckie.app.android.common.kotlin.fastAny
 import team.duckie.app.android.common.kotlin.fastFirstOrNull
 import team.duckie.app.android.common.kotlin.fastMapIndexedNotNull
@@ -45,7 +45,9 @@ import team.duckie.app.android.feature.onboard.common.OnboardTopAppBar
 import team.duckie.app.android.feature.onboard.common.TitleAndDescription
 import team.duckie.app.android.feature.onboard.constant.OnboardStep
 import team.duckie.app.android.feature.onboard.viewmodel.OnboardViewModel
+import team.duckie.quackquack.ui.sugar.QuackPrimaryLargeButton
 import team.duckie.quackquack.ui.sugar.QuackTitle2
+import team.duckie.quackquack.ui.util.ExperimentalQuackQuackApi
 
 private val currentStep = OnboardStep.Category
 
@@ -157,7 +159,7 @@ internal fun CategoryScreen(vm: OnboardViewModel = activityViewModel()) {
                     )
                 }
             }
-            TempFlexiblePrimaryLargeButton(
+            QuackPrimaryLargeButton(
                 modifier = Modifier
                     .layoutId(CategoryScreenNextButtonLayoutId)
                     .fillMaxWidth()

diff --git a/...ure/onboard/src/main/kotlin/team/duckie/app/android/feature/onboard/screen/3_TagScreen.kt b/...ure/onboard/src/main/kotlin/team/duckie/app/android/feature/onboard/screen/3_TagScreen.kt
@@ -60,7 +60,6 @@ import team.duckie.app.android.common.compose.systemBarPaddings
 import team.duckie.app.android.common.compose.ui.domain.DuckieTagAddBottomSheet
 import team.duckie.app.android.common.compose.ui.quack.todo.QuackCircleTag
 import team.duckie.app.android.common.compose.ui.quack.todo.QuackOutLinedSingeLazyRowTag
-import team.duckie.app.android.common.compose.ui.temp.TempFlexiblePrimaryLargeButton
 import team.duckie.app.android.common.kotlin.AllowMagicNumber
 import team.duckie.app.android.common.kotlin.fastAny
 import team.duckie.app.android.common.kotlin.fastFirstOrNull
@@ -79,6 +78,7 @@ import team.duckie.quackquack.material.QuackColor
 import team.duckie.quackquack.material.QuackTypography
 import team.duckie.quackquack.material.quackClickable
 import team.duckie.quackquack.ui.QuackText
+import team.duckie.quackquack.ui.sugar.QuackPrimaryLargeButton
 import team.duckie.quackquack.ui.sugar.QuackTitle2
 import team.duckie.quackquack.ui.util.ExperimentalQuackQuackApi
 
@@ -179,10 +179,8 @@ internal fun TagScreen(vm: OnboardViewModel = activityViewModel()) {
                         },
                     )
 
-                    // TODO(riflockle7): 문제 있으므로 꽥꽥 이슈 해결할 때까지 주석 제거하지 않음
-                    // type = QuackLargeButtonType.Fill,
                     // isLoading = isLoadingToFinish,
-                    TempFlexiblePrimaryLargeButton(
+                    QuackPrimaryLargeButton(
                         modifier = Modifier
                             .layoutId(TagScreenQuackLargeButtonLayoutId)
                             .fillMaxWidth()

diff --git a/...profile/src/main/kotlin/team/duckie/app/android/feature/profile/screen/MyProfileScreen.kt b/...profile/src/main/kotlin/team/duckie/app/android/feature/profile/screen/MyProfileScreen.kt
@@ -24,7 +24,6 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import team.duckie.app.android.common.compose.ui.BackPressedHeadLineTopAppBar
 import team.duckie.app.android.common.compose.ui.DuckTestCoverItem
-import team.duckie.app.android.common.compose.ui.temp.TempFlexibleSecondaryLargeButton
 import team.duckie.app.android.common.kotlin.FriendsType
 import team.duckie.app.android.domain.exam.model.ProfileExam
 import team.duckie.app.android.domain.user.model.UserProfile
@@ -43,6 +42,7 @@ import team.duckie.quackquack.material.icon.quackicon.outlined.Notice
 import team.duckie.quackquack.material.icon.quackicon.outlined.Setting
 import team.duckie.quackquack.material.quackClickable
 import team.duckie.quackquack.ui.QuackIcon
+import team.duckie.quackquack.ui.sugar.QuackSecondaryLargeButton
 import team.duckie.quackquack.ui.util.ExperimentalQuackQuackApi
 
 @Suppress("UnusedPrivateMember") // 시험 생성하기를 추후에 다시 활용하기 위함
@@ -120,7 +120,7 @@ fun MyProfileScreen(
                 title = stringResource(id = R.string.my_favorite_tag),
                 tags = tags,
                 emptySection = {
-                    TempFlexibleSecondaryLargeButton(
+                    QuackSecondaryLargeButton(
                         modifier = Modifier.fillMaxWidth(),
                         text = stringResource(id = R.string.add_favorite_tag),
                         onClick = onClickEditTag,

diff --git a/.../main/java/team/duckie/app/android/feature/start/exam/screen/exam/StartExamInputScreen.kt b/.../main/java/team/duckie/app/android/feature/start/exam/screen/exam/StartExamInputScreen.kt
@@ -27,7 +27,6 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import team.duckie.app.android.common.compose.ui.BackPressedTopAppBar
 import team.duckie.app.android.common.compose.ui.ImeSpacer
-import team.duckie.app.android.common.compose.ui.temp.TempFlexiblePrimaryLargeButton
 import team.duckie.app.android.feature.start.exam.R
 import team.duckie.app.android.feature.start.exam.screen.StartExamScreen
 import team.duckie.app.android.feature.start.exam.viewmodel.StartExamState
@@ -36,6 +35,7 @@ import team.duckie.quackquack.material.QuackColor
 import team.duckie.quackquack.material.QuackTypography
 import team.duckie.quackquack.ui.QuackText
 import team.duckie.quackquack.ui.sugar.QuackHeadLine1
+import team.duckie.quackquack.ui.sugar.QuackPrimaryLargeButton
 import team.duckie.quackquack.ui.util.ExperimentalQuackQuackApi
 
 /**
@@ -84,7 +84,8 @@ internal fun StartExamInputScreen(modifier: Modifier, viewModel: StartExamViewMo
         Spacer(modifier = Modifier.weight(1f))
 
         // 시험시작 버튼
-        TempFlexiblePrimaryLargeButton(
+        QuackPrimaryLargeButton(
+
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(

diff --git a/.../main/java/team/duckie/app/android/feature/start/exam/screen/quiz/StartQuizInputScreen.kt b/.../main/java/team/duckie/app/android/feature/start/exam/screen/quiz/StartQuizInputScreen.kt
@@ -41,7 +41,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import team.duckie.app.android.common.compose.ui.BackPressedTopAppBar
 import team.duckie.app.android.common.compose.ui.ImeSpacer
 import team.duckie.app.android.common.compose.ui.Spacer
-import team.duckie.app.android.common.compose.ui.temp.TempFlexiblePrimaryLargeButton
 import team.duckie.app.android.common.compose.util.rememberUserInputState
 import team.duckie.app.android.feature.start.exam.R
 import team.duckie.app.android.feature.start.exam.screen.exam.StartExamTextField
@@ -52,6 +51,7 @@ import team.duckie.quackquack.material.QuackTypography
 import team.duckie.quackquack.ui.optin.ExperimentalDesignToken
 import team.duckie.quackquack.ui.sugar.QuackBody2
 import team.duckie.quackquack.ui.sugar.QuackHeadLine1
+import team.duckie.quackquack.ui.sugar.QuackPrimaryLargeButton
 import team.duckie.quackquack.ui.sugar.QuackTitle2
 import team.duckie.quackquack.ui.util.ExperimentalQuackQuackApi
 
@@ -107,7 +107,7 @@ internal fun StartQuizInputScreen(modifier: Modifier, viewModel: StartExamViewMo
             )
         }
         Spacer(modifier = Modifier.weight(1f))
-        TempFlexiblePrimaryLargeButton(
+        QuackPrimaryLargeButton(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(
@@ -118,6 +118,17 @@ internal fun StartQuizInputScreen(modifier: Modifier, viewModel: StartExamViewMo
             onClick = viewModel::startSolveProblem,
             enabled = certifyingStatementText.isNotEmpty(),
         )
+//        TempFlexiblePrimaryLargeButton(
+//            modifier = Modifier
+//                .fillMaxWidth()
+//                .padding(
+//                    vertical = 12.dp,
+//                    horizontal = 16.dp,
+//                ),
+//            text = stringResource(id = R.string.start_exam_quiz_start_button),
+//            onClick = viewModel::startSolveProblem,
+//            enabled = certifyingStatementText.isNotEmpty(),
+//        )
         ImeSpacer()
     }
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -114,7 +114,7 @@ quack-lint-compose = "1.0.2"
 # TODO(sungbin): quack-lint-writing
 
 # quack v2
-quack-v2-ui = "2.0.0-alpha14"
+quack-v2-ui = "2.0.0-alpha15"
 quack-v2-ui-plugin-interceptor-textfield ="2.0.0-alpha01"
 
 # test