Feature/jaino/#38

app/src/main/java/com/wap/wapp/MainActivity.kt

@@ -5,6 +5,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.ui.setupWithNavController
 import com.wap.wapp.databinding.ActivityMainBinding
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -27,6 +28,7 @@ class MainActivity : AppCompatActivity() {
         navController = navHostFragment.navController
 
         bnvMainBottomNaviView.itemIconTintList = null
+        bnvMainBottomNaviView.setupWithNavController(navController)
 
         setBottomNavigationVisiblity()
     }

app/src/main/res/menu/menu_main.xml

@@ -16,7 +16,7 @@
         android:icon="@drawable/selector_profile" />
 
     <item
-        android:id="@+id/nav_manage"
+        android:id="@+id/nav_management"
         android:title="@string/manage"
         android:icon="@drawable/selector_manage" />
-</menu>
+</menu>

app/src/main/res/navigation/nav_main.xml

@@ -5,7 +5,7 @@
     app:startDestination="@id/nav_splash">
 
     <include app:graph="@navigation/nav_auth" />
-    <include app:graph="@navigation/nav_manage" />
+    <include app:graph="@navigation/nav_management" />
     <include app:graph="@navigation/nav_notice" />
     <include app:graph="@navigation/nav_profile" />
     <include app:graph="@navigation/nav_survey" />

core/common/src/main/java/com/wap/wapp/core/commmon/extensions/ContextExtensions.kt

@@ -0,0 +1,12 @@
+package com.wap.wapp.core.commmon.extensions
+
+import android.app.Activity
+import android.widget.Toast
+
+fun Activity.showToast(message: String) {
+    Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+}
+
+fun Activity.showLongToast(message: String) {
+    Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+}

core/data/src/main/java/com/wap/wapp/core/data/repository/manage/ManageRepository.kt

@@ -1,9 +1,9 @@
 package com.wap.wapp.core.data.repository.manage
 
 interface ManageRepository {
-    suspend fun getManager(userId: String): Result<Unit>
+    suspend fun getManager(userId: String): Result<Boolean>
 
     suspend fun postManager(userId: String): Result<Unit>
 
-    suspend fun getManagerCode(code: String): Result<Boolean>
+    suspend fun getManageCode(code: String): Result<Boolean>
 }

core/data/src/main/java/com/wap/wapp/core/data/repository/manage/ManageRepositoryImpl.kt

@@ -6,15 +6,12 @@ import javax.inject.Inject
 class ManageRepositoryImpl @Inject constructor(
     private val manageDataSource: ManageDataSource,
 ) : ManageRepository {
-    override suspend fun getManager(userId: String): Result<Unit> {
-        return manageDataSource.getManager(userId)
-    }
+    override suspend fun getManager(userId: String): Result<Boolean> {
 
     override suspend fun postManager(userId: String): Result<Unit> {
         return manageDataSource.postManager(userId)
     }
 
-    override suspend fun getManagerCode(code: String): Result<Boolean> {
-        return manageDataSource.getManagerCode(code)
-    }
+    override suspend fun getManageCode(code: String): Result<Boolean> {
+        return manageDataSource.getManageCode(code)
 }

core/designsystem/src/main/java/com/wap/designsystem/Color.kt

@@ -9,23 +9,23 @@ import androidx.compose.ui.graphics.Color
 val White = Color(0xFFFFFFFF)
 val Black = Color(0xFF000000)
 val BackgroundBlack = Color(0xFF131313)
-val Black3 = Color(0xFF828282)
-val Black2 = Color(0xFF424242)
-val Black1 = Color(0xFF252424)
-val Gray2 = Color(0xFFF4F4F4)
-val Gray1 = Color(0xFFA2A2A2)
+val Black82 = Color(0xFF828282) // 3
+val Black42 = Color(0xFF424242) // 2
+val Black25 = Color(0xFF252424) // 1
+val GrayF4 = Color(0xFFF4F4F4) // 2
+val GrayA2 = Color(0xFFA2A2A2) // 1
 val Yellow = Color(0xFFFBCF34)
 
 @Stable
 class WappColor(
     white: Color = White,
     black: Color = Black,
     backgroundBlack: Color = BackgroundBlack,
-    black1: Color = Black1,
-    black2: Color = Black2,
-    black3: Color = Black3,
-    gray1: Color = Gray1,
-    gray2: Color = Gray2,
+    black25: Color = Black25,
+    black42: Color = Black42,
+    black82: Color = Black82,
+    grayA2: Color = GrayA2,
+    grayF4: Color = GrayF4,
     yellow: Color = Yellow,
 ) {
     var white by mutableStateOf(white)
@@ -34,15 +34,15 @@ class WappColor(
         private set
     var backgroundBlack by mutableStateOf(backgroundBlack)
         private set
-    var black1 by mutableStateOf(black1)
+    var black25 by mutableStateOf(Black25)
         private set
-    var black2 by mutableStateOf(black2)
+    var black42 by mutableStateOf(Black42)
         private set
-    var black3 by mutableStateOf(black3)
+    var black82 by mutableStateOf(Black82)
         private set
-    var gray1 by mutableStateOf(gray1)
+    var grayA2 by mutableStateOf(GrayA2)
         private set
-    var gray2 by mutableStateOf(gray2)
+    var grayF4 by mutableStateOf(GrayF4)
         private set
     var yellow by mutableStateOf(yellow)
         private set

core/designsystem/src/main/java/com/wap/designsystem/Type.kt

@@ -86,21 +86,21 @@ class WappTypography internal constructor(
 fun WappTypography(): WappTypography {
     return WappTypography(
         titleBold = TextStyle(
-            fontSize = 22.sp,
+            fontSize = 18.sp,
             fontFamily = NotoSansBold,
             platformStyle = PlatformTextStyle(
                 includeFontPadding = false,
             ),
         ),
         titleMedium = TextStyle(
-            fontSize = 22.sp,
+            fontSize = 18.sp,
             fontFamily = NotoSansMedium,
             platformStyle = PlatformTextStyle(
                 includeFontPadding = false,
             ),
         ),
         titleRegular = TextStyle(
-            fontSize = 22.sp,
+            fontSize = 18.sp,
             fontFamily = NotoSansRegular,
             platformStyle = PlatformTextStyle(
                 includeFontPadding = false,

core/designsystem/src/main/java/com/wap/designsystem/component/Button.kt

@@ -0,0 +1,39 @@
+package com.wap.designsystem.component
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.wap.designsystem.WappTheme
+import com.wap.wapp.core.designsystem.R
+
+@Composable
+fun WappButton(
+    modifier: Modifier = Modifier,
+    @StringRes textRes: Int = R.string.done,
+    onClick: () -> Unit,
+    isEnabled: Boolean = true,
+) {
+    Button(
+        modifier = modifier
+            .fillMaxWidth()
+            .height(48.dp),
+        onClick = { onClick() },
+        enabled = isEnabled,
+        colors = ButtonDefaults.buttonColors(
+            contentColor = WappTheme.colors.black,
+            containerColor = WappTheme.colors.yellow,
+            disabledContentColor = WappTheme.colors.white,
+            disabledContainerColor = WappTheme.colors.grayA2,
+        ),
+        shape = RoundedCornerShape(10.dp),
+        content = { Text(text = stringResource(textRes)) },
+    )
+}

core/designsystem/src/main/java/com/wap/designsystem/component/TextField.kt

@@ -0,0 +1,44 @@
+package com.wap.designsystem.component
+
+import androidx.annotation.StringRes
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import com.wap.designsystem.WappTheme
+
+@Composable
+fun WappTextField(
+    value: String,
+    onValueChanged: (String) -> Unit,
+    @StringRes label: Int,
+    isError: Boolean = false,
+    supportingText: String = "",
+) {
+    TextField(
+        value = value,
+        onValueChange = { value -> onValueChanged(value) },
+        colors = TextFieldDefaults.colors(
+            unfocusedContainerColor = WappTheme.colors.black25,
+            focusedContainerColor = WappTheme.colors.black25,
+            errorContainerColor = WappTheme.colors.black25,
+            unfocusedLabelColor = WappTheme.colors.white,
+            focusedLabelColor = WappTheme.colors.white,
+            unfocusedTextColor = WappTheme.colors.white,
+            focusedTextColor = WappTheme.colors.white,
+            errorTextColor = WappTheme.colors.white,
+            unfocusedSupportingTextColor = WappTheme.colors.white,
+            focusedSupportingTextColor = WappTheme.colors.white,
+            focusedIndicatorColor = WappTheme.colors.yellow,
+            cursorColor = WappTheme.colors.yellow,
+        ),
+        label = {
+            Text(text = stringResource(label))
+        },
+        isError = isError,
+        supportingText = {
+            Text(text = supportingText)
+        },
+    )
+}

core/designsystem/src/main/java/com/wap/designsystem/component/TopBar.kt

@@ -0,0 +1,145 @@
+package com.wap.designsystem.component
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Surface
+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.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.wap.designsystem.WappTheme
+import com.wap.wapp.core.designsystem.R
+
+@Composable
+fun WappTopBar(
+    @StringRes titleRes: Int,
+    modifier: Modifier = Modifier,
+    showLeftButton: Boolean = false,
+    showRightButton: Boolean = false,
+    onClickLeftButton: () -> Unit = {},
+    onClickRightButton: () -> Unit = {},
+    @StringRes leftButtonDescriptionRes: Int = R.string.back_button,
+    @StringRes rightButtonDescriptionRes: Int = R.string.close_button,
+    @DrawableRes leftButtonDrawableRes: Int = R.drawable.ic_back,
+    @DrawableRes rightButtonDrawableRes: Int = R.drawable.ic_close,
+) {
+    Row(
+        modifier = modifier,
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        if (showLeftButton) {
+            Icon(
+                modifier = Modifier
+                    .size(20.dp)
+                    .clickable { onClickLeftButton() },
+                painter = painterResource(leftButtonDrawableRes),
+                contentDescription = stringResource(leftButtonDescriptionRes),
+                tint = WappTheme.colors.white,
+            )
+        }
+
+        Text(
+            text = stringResource(titleRes),
+            textAlign = TextAlign.Center,
+            modifier = Modifier.weight(1f),
+            style = WappTheme.typography.titleBold,
+            color = WappTheme.colors.white,
+        )
+
+        if (showRightButton) {
+            Icon(
+                modifier = Modifier
+                    .size(20.dp)
+                    .clickable { onClickRightButton() },
+                painter = painterResource(rightButtonDrawableRes),
+                contentDescription = stringResource(rightButtonDescriptionRes),
+                tint = WappTheme.colors.white,
+            )
+        }
+    }
+}
+
+@Preview("without Button TopBar")
+@Composable
+fun WappTopBarWithoutButton() {
+    WappTheme {
+        Surface(
+            color = WappTheme.colors.backgroundBlack,
+        ) {
+            WappTopBar(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp),
+                titleRes = R.string.notice,
+            )
+        }
+    }
+}
+
+@Preview("with Right Button TopBar")
+@Composable
+fun WappTopBarWithRightButton() {
+    WappTheme {
+        Surface(
+            color = WappTheme.colors.backgroundBlack,
+        ) {
+            WappTopBar(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp),
+                titleRes = R.string.notice,
+                showRightButton = true,
+            )
+        }
+    }
+}
+
+@Preview("with Left Button TopBar")
+@Composable
+fun WappTopBarWithLeftButton() {
+    WappTheme {
+        Surface(
+            color = WappTheme.colors.backgroundBlack,
+        ) {
+            WappTopBar(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp),
+                titleRes = R.string.notice,
+                showLeftButton = true,
+            )
+        }
+    }
+}
+
+@Preview("with Both Button TopBar")
+@Composable
+fun WappTopBarWithBothButton() {
+    WappTheme {
+        Surface(
+            color = WappTheme.colors.backgroundBlack,
+        ) {
+            WappTopBar(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp),
+                titleRes = R.string.notice,
+                showRightButton = true,
+                showLeftButton = true,
+            )
+        }
+    }
+}