Feature/issue 295

presenter/src/main/java/com/mashup/twotoo/presenter/createChallenge/CreateChallenge.kt

@@ -5,13 +5,11 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
-import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.SnackbarHostState
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -20,7 +18,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -29,7 +26,7 @@ import com.mashup.twotoo.presenter.R
 import com.mashup.twotoo.presenter.createChallenge.model.ChallengeInfoModel
 import com.mashup.twotoo.presenter.designsystem.component.dialog.selection.SelectionDialogButtonContent
 import com.mashup.twotoo.presenter.designsystem.component.toast.SnackBarHost
-import com.mashup.twotoo.presenter.designsystem.component.toolbar.TwoTooBackToolbar
+import com.mashup.twotoo.presenter.designsystem.component.toolbar.TwoTooToolbar
 import com.mashup.twotoo.presenter.designsystem.theme.TwoTooTheme
 import com.mashup.twotoo.presenter.designsystem.theme.TwotooPink
 import com.mashup.twotoo.presenter.history.TwoTooSelectionDialog
@@ -197,29 +194,15 @@ fun CreateChallengeToolbar(
         else -> { "" }
     }
 
-    val moreIconButton: @Composable (Int) -> Unit =
-        {
-            IconButton(onClick = {
-                setDialogVisibility(true)
-            }) {
-                Icon(
-                    painter = painterResource(id = R.drawable.ic_more),
-                    contentDescription = null,
-                )
-            }
-        }
-
-    TwoTooBackToolbar(
+    TwoTooToolbar.CreateChallengeToolbar(
+        modifier = Modifier.fillMaxWidth(),
         title = toolbarTitle,
-        titleModifier = Modifier.offset(x = -16.dp),
-        onClickBackIcon = {
-            onClickBackButton()
-        },
-        actionIconButton = {
+        onClickActionButton = {
             if (BeforeChallengeState.isChallengeDeletionEnabled(homeState)) {
-                moreIconButton(challengeNo)
+                setDialogVisibility(true)
             }
         },
+        onClickBackIcon = onClickBackButton,
     )
 
     if (deleteDialogVisibility) {

presenter/src/main/java/com/mashup/twotoo/presenter/createChallenge/selectflower/SelectFlowerCard.kt

@@ -28,7 +28,7 @@ import com.mashup.twotoo.presenter.createChallenge.CreateChallengeSideEffect
 import com.mashup.twotoo.presenter.createChallenge.CreateChallengeViewModel
 import com.mashup.twotoo.presenter.createChallenge.model.ChallengeInfoModel
 import com.mashup.twotoo.presenter.designsystem.component.button.TwoTooTextButton
-import com.mashup.twotoo.presenter.designsystem.component.toolbar.TwoTooBackToolbar
+import com.mashup.twotoo.presenter.designsystem.component.toolbar.TwoTooToolbar
 import com.mashup.twotoo.presenter.designsystem.theme.TwoTooTheme
 import com.mashup.twotoo.presenter.designsystem.theme.TwotooPink
 import com.mashup.twotoo.presenter.home.model.BeforeChallengeState
@@ -81,9 +81,12 @@ fun SelectFlowerCard(
     var flowerName by remember { mutableStateOf("") }
     Column {
         Spacer(modifier = Modifier.height(5.dp))
-        TwoTooBackToolbar(onClickBackIcon = {
-            onClickBackButton()
-        })
+        TwoTooToolbar.BackToolbar(
+            modifier = Modifier.fillMaxWidth(),
+            onClickBackIcon = onClickBackButton,
+            onClickActionButton = {},
+            actionIcons = null,
+        )
         Box {
             Column(modifier = Modifier.padding(top = 11.dp)) {
                 SelectFlowerTitle()

presenter/src/main/java/com/mashup/twotoo/presenter/designsystem/component/toolbar/PreviewTwoToolToolbar.kt

@@ -0,0 +1,103 @@
+package com.mashup.twotoo.presenter.designsystem.component.toolbar
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.constraintlayout.compose.ConstraintLayout
+import com.mashup.twotoo.presenter.R
+
+@Preview
+@Composable
+private fun HelpCenterToolbar(
+    modifier: Modifier = Modifier,
+    onClickHelpIcon: () -> Unit = {},
+    text: String = "",
+) {
+    TwoTooToolbar.HelpCenterToolbar(
+        modifier = modifier.fillMaxWidth(),
+        onClickHelpIcon = onClickHelpIcon,
+        text = text,
+    )
+}
+
+@Preview
+@Composable
+private fun CalendarToolbar(
+    modifier: Modifier = Modifier,
+    onClickHelpIcon: () -> Unit = {},
+    onClickCalendarIcon: () -> Unit = {},
+    text: String = "",
+) {
+    TwoTooToolbar.CalendarToolbar(
+        modifier = modifier.fillMaxWidth(),
+        onClickHelpIcon = onClickHelpIcon,
+        onClickCalendarIcon = onClickCalendarIcon,
+    )
+}
+
+@Preview
+@Composable
+private fun BackToolbar(
+    modifier: Modifier = Modifier,
+    onClickBackIcon: () -> Unit = {},
+    onClickActionButton: () -> Unit = {},
+) {
+    TwoTooToolbar.BackToolbar(
+        modifier = modifier.fillMaxWidth(),
+        onClickBackIcon = onClickBackIcon,
+        onClickActionButton = onClickActionButton,
+        actionIcons = null,
+    )
+}
+
+@Preview
+@Composable
+private fun PreviewCreateChallengeToolbar() {
+    TwoTooToolbar.CreateChallengeToolbar(
+        modifier = Modifier.fillMaxWidth(),
+        title = stringResource(id = R.string.challenge_info),
+        onClickActionButton = {},
+        onClickBackIcon = {},
+    )
+}
+
+@Preview
+@Composable
+private fun HistoryToolbar(
+    modifier: Modifier = Modifier,
+) {
+    TwoTooToolbar.HistoryToolbar(
+        modifier = modifier.fillMaxWidth(),
+        onClickBackIcon = {},
+        onClickActionButton = {},
+    )
+}
+
+@Preview
+@Composable
+private fun DetailImageToolbar() {
+    ConstraintLayout {
+        val (topBar, dropDownMenu) = createRefs()
+        TwoTooToolbar.DetailImageToolbar(
+            modifier = Modifier.constrainAs(topBar) {
+                top.linkTo(parent.top)
+                start.linkTo(parent.start)
+                end.linkTo(parent.end)
+            },
+            dropDownModifier = Modifier
+                .wrapContentHeight()
+                .constrainAs(dropDownMenu) {
+                    top.linkTo(topBar.bottom)
+                    end.linkTo(parent.end)
+                },
+            onClickBackIcon = { },
+            onClickActionButton = { },
+            onDismiss = { },
+            onClickSaveButton = { },
+            expandedState = false,
+        )
+    }
+}