Feature/tgyuu/#63

app/build.gradle.kts

@@ -43,21 +43,21 @@ dependencies {
     androidTestImplementation(libs.androidx.test.espresso)
 }
 
-tasks.getByPath(":app:preBuild").dependsOn("installGitHook")
-
-tasks.register<Copy>("installGitHook") {
-    dependsOn("deletePreviousGitHook")
-    from("${rootProject.rootDir}/script/pre-commit")
-    into("${rootProject.rootDir}/.git/hooks")
-    eachFile {
-        fileMode = 777
-    }
-}
-
-tasks.register<Delete>("deletePreviousGitHook") {
-
-    val prePush = "${rootProject.rootDir}/.git/hooks/pre-commit"
-    if (file(prePush).exists()) {
-        delete(prePush)
-    }
-}
+// tasks.getByPath(":app:preBuild").dependsOn("installGitHook")
+//
+// tasks.register<Copy>("installGitHook") {
+//    dependsOn("deletePreviousGitHook")
+//    from("${rootProject.rootDir}/script/pre-commit")
+//    into("${rootProject.rootDir}/.git/hooks")
+//    eachFile {
+//        fileMode = 777
+//    }
+// }
+//
+// tasks.register<Delete>("deletePreviousGitHook") {
+//
+//    val prePush = "${rootProject.rootDir}/.git/hooks/pre-commit"
+//    if (file(prePush).exists()) {
+//        delete(prePush)
+//    }
+// }

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

@@ -3,7 +3,6 @@ package com.wap.wapp
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -44,9 +43,8 @@ class MainActivity : ComponentActivity() {
                 val navController = rememberNavController()
 
                 Scaffold(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .background(WappTheme.colors.black25),
+                    modifier = Modifier.fillMaxSize(),
+                    containerColor = WappTheme.colors.backgroundBlack,
                     bottomBar = {
                         val navBackStackEntry by
                         navController.currentBackStackEntryAsState()

app/src/main/java/com/wap/wapp/component/WappBottomBar.kt

@@ -5,8 +5,6 @@ import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.animation.with
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.BottomNavigation
 import androidx.compose.material.BottomNavigationItem
 import androidx.compose.material.Icon
@@ -34,9 +32,6 @@ internal fun WappBottomBar(
             slideInVertically { height -> height } with
                 slideOutVertically { height -> height }
         },
-        modifier = Modifier
-            .fillMaxWidth()
-            .background(WappTheme.colors.backgroundBlack),
     ) { isVisible ->
         if (isVisible) {
             BottomNavigation(

app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt

@@ -22,8 +22,12 @@ import com.wap.wapp.feature.management.registration.survey.navigation.navigateTo
 import com.wap.wapp.feature.management.registration.survey.navigation.surveyRegistrationScreen
 import com.wap.wapp.feature.notice.navigation.navigateToNotice
 import com.wap.wapp.feature.notice.navigation.noticeScreen
+import com.wap.wapp.feature.profile.navigation.navigateToProfile
+import com.wap.wapp.feature.profile.navigation.profileNavigationRoute
 import com.wap.wapp.feature.profile.navigation.profileScreen
 import com.wap.wapp.feature.profile.profilesetting.navigation.navigateToProfileSetting
+import com.wap.wapp.feature.profile.profilesetting.navigation.profileSettingNavigationRoute
+import com.wap.wapp.feature.profile.profilesetting.navigation.profileSettingScreen
 import com.wap.wapp.feature.splash.navigation.splashNavigationRoute
 import com.wap.wapp.feature.splash.navigation.splashScreen
 import com.wap.wapp.feature.survey.navigation.navigateToSurvey
@@ -53,29 +57,45 @@ fun WappNavHost(
         )
         signInScreen(
             signInUseCase = signInUseCase,
-            navigateToNotice = { navController.navigateToNotice() },
-            navigateToSignUp = { navController.navigateToSignUp() },
+            navigateToNotice = navController::navigateToNotice,
+            navigateToSignUp = navController::navigateToSignUp,
         )
         signUpScreen(
-            navigateToNotice = { navController.navigateToNotice() },
-            navigateToSignIn = { navController.navigateToSignIn() },
+            navigateToNotice = navController::navigateToNotice,
+            navigateToSignIn = navController::navigateToSignIn,
         )
         noticeScreen()
         surveyNavGraph(
             navigateToSurvey = navController::navigateToSurvey,
             navigateToSurveyAnswer = navController::navigateToSurveyAnswer,
         )
         surveyCheckScreen(
-            navigateToManagement = { navController.navigateToManagement() },
+            navigateToManagement = navController::navigateToManagement,
         )
         surveyRegistrationScreen(
-            navigateToManagement = { navController.navigateToManagement() },
+            navigateToManagement = navController::navigateToManagement,
         )
         eventRegistrationScreen(
-            navigateToManagement = { navController.navigateToManagement() },
+            navigateToManagement = navController::navigateToManagement,
         )
         profileScreen(
-            navigateToProfileSetting = { navController.navigateToProfileSetting() },
+            navigateToProfileSetting = navController::navigateToProfileSetting,
+            navigateToSignInScreen = {
+                navController.navigateToSignIn(
+                    navOptions {
+                        popUpTo(profileNavigationRoute)
+                    },
+                )
+            },
+        )
+        profileSettingScreen(
+            navigateToProfile = {
+                navController.navigateToProfile(
+                    navOptions {
+                        popUpTo(profileSettingNavigationRoute) { inclusive = true }
+                    },
+                )
+            },
         )
         managementScreen(
             navigateToSurveyRegistration = navController::navigateToSurveyRegistration,

core/designresource/src/main/res/drawable/ic_absent.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="20dp"
+    android:viewportWidth="30"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M0,6C0,2.686 2.686,0 6,0H24C27.314,0 30,2.686 30,6V14C30,17.314 27.314,20 24,20H6C2.686,20 0,17.314 0,14V6Z"
+      android:fillColor="#F88383"/>
+  <path
+      android:pathData="M13.1,5.74H13.93V10.35H13.1V5.74ZM10.24,6.18H11.14C11.14,8.46 9.57,9.92 6.93,10.56L6.64,9.88C8.98,9.34 10.24,8.15 10.24,6.59V6.18ZM7.11,6.18H10.62V6.86H7.11V6.18ZM10.82,7.04H13.24V7.7H10.82V7.04ZM10.74,8.77H13.19V9.42H10.74V8.77ZM8.11,10.77H13.93V12.99H8.96V14.43H8.14V12.35H13.11V11.44H8.11V10.77ZM8.14,14.03H14.23V14.69H8.14V14.03ZM20.339,7.63H22.479V8.32H20.339V7.63ZM17.949,6.2H18.629V7.14C18.629,8.88 17.659,10.31 16.139,10.89L15.709,10.23C17.069,9.73 17.949,8.52 17.949,7.14V6.2ZM18.099,6.2H18.769V7.18C18.769,8.42 19.669,9.58 20.969,10.04L20.529,10.69C19.079,10.14 18.099,8.77 18.099,7.18V6.2ZM17.099,11.58H23.129V14.78H22.299V12.25H17.099V11.58ZM22.299,5.74H23.129V11.08H22.299V5.74Z"
+      android:fillColor="#BE2323"/>
+</vector>

core/designresource/src/main/res/drawable/ic_attendance.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="20dp"
+    android:viewportWidth="30"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M0,6C0,2.686 2.686,0 6,0H24C27.314,0 30,2.686 30,6V14C30,17.314 27.314,20 24,20H6C2.686,20 0,17.314 0,14V6Z"
+      android:fillColor="#83F8AB"/>
+  <path
+      android:pathData="M10.16,10.24H10.99V11.61H10.16V10.24ZM6.5,9.75H14.66V10.39H6.5V9.75ZM10.17,5.68H10.99V6.78H10.17V5.68ZM10.13,6.86H10.86V7C10.86,8.42 9.17,9.18 7.17,9.35L6.93,8.71C8.71,8.6 10.13,7.97 10.13,7V6.86ZM10.3,6.86H11.03V7C11.03,7.97 12.45,8.6 14.22,8.71L13.98,9.35C11.98,9.18 10.3,8.42 10.3,7V6.86ZM7.33,6.53H13.83V7.16H7.33V6.53ZM7.48,11.21H13.62V13.2H8.32V14.29H7.5V12.61H12.8V11.84H7.48V11.21ZM7.5,14.05H13.89V14.68H7.5V14.05ZM20.339,7.63H22.479V8.32H20.339V7.63ZM17.949,6.2H18.629V7.14C18.629,8.88 17.659,10.31 16.139,10.89L15.709,10.23C17.069,9.73 17.949,8.52 17.949,7.14V6.2ZM18.099,6.2H18.769V7.18C18.769,8.42 19.669,9.58 20.969,10.04L20.529,10.69C19.079,10.14 18.099,8.77 18.099,7.18V6.2ZM17.099,11.58H23.129V14.78H22.299V12.25H17.099V11.58ZM22.299,5.74H23.129V11.08H22.299V5.74Z"
+      android:fillColor="#267151"/>
+</vector>

core/designresource/src/main/res/drawable/ic_back.xml

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="10dp"
-    android:height="20dp"
+    android:width="7dp"
+    android:height="14dp"
     android:viewportWidth="10"
     android:viewportHeight="20">
   <path

core/designresource/src/main/res/drawable/ic_check.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M10,0C4.48,0 0,4.48 0,10C0,15.52 4.48,20 10,20C15.52,20 20,15.52 20,10C20,4.48 15.52,0 10,0ZM10,18C5.59,18 2,14.41 2,10C2,5.59 5.59,2 10,2C14.41,2 18,5.59 18,10C18,14.41 14.41,18 10,18ZM13.88,6.29L8,12.17L6.12,10.29C5.73,9.9 5.1,9.9 4.71,10.29C4.32,10.68 4.32,11.31 4.71,11.7L7.3,14.29C7.69,14.68 8.32,14.68 8.71,14.29L15.3,7.7C15.69,7.31 15.69,6.68 15.3,6.29C14.91,5.9 14.27,5.9 13.88,6.29Z"
+      android:fillColor="#ffffff"/>
+</vector>

core/designresource/src/main/res/drawable/ic_forward.xml

@@ -1,5 +1,9 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#000000" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M6.23,20.23l1.77,1.77l10,-10l-10,-10l-1.77,1.77l8.23,8.23z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="7dp"
+    android:height="14dp"
+    android:viewportWidth="10"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M0,1.788L1.517,0L10,10L1.517,20L0,18.212L6.967,10L0,1.788Z"
+      android:fillColor="#ffffff"/>
 </vector>

core/designresource/src/main/res/drawable/ic_guest_cat.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="103dp"
+    android:height="69dp"
+    android:viewportWidth="103"
+    android:viewportHeight="69">
+  <path
+      android:pathData="M63.52,43.62C63.24,43.65 62.96,43.68 62.68,43.7C61.51,43.82 60.32,43.94 59.16,44.06C57.39,44.25 55.56,44.44 53.74,44.6C53.53,44.62 53.32,44.64 53.12,44.65C53.13,44.69 53.15,44.73 53.17,44.77C54.46,47.96 55.96,51.03 57.89,53.89C58.62,54.97 58.56,55.67 57.73,56.69C57.25,57.28 56.72,57.84 56.25,58.43C55.75,59.06 55.14,59.46 54.33,59.55C53.96,59.59 53.59,59.72 53.21,59.77C51.24,60.03 50.69,61.08 50.32,62.81C50.12,63.73 50.68,64.41 51.63,64.46C52.61,64.5 53.59,64.47 54.57,64.47C54.57,64.44 54.57,64.42 54.57,64.39C55.27,64.39 55.99,64.34 56.69,64.41C57.46,64.49 58.03,64.28 58.57,63.71C59.87,62.31 61.17,60.92 62.56,59.62C64.06,58.2 65.58,56.78 67.24,55.56C68.2,54.86 68.63,54.11 68.6,52.99C68.56,51.63 68.57,50.27 68.52,48.91C68.43,46.97 68.6,45.07 69.02,43.21C68.8,43.21 68.56,43.22 68.31,43.23C66.72,43.3 65.1,43.47 63.52,43.62Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M20.57,41.52C18.07,39.95 15.78,38.14 13.71,36.08C13.73,37.54 13.29,38.84 12.47,40.03C12.19,40.44 11.91,40.83 11.63,41.23C9.85,43.77 8.02,46.28 6.31,48.86C4.95,50.9 3.64,52.97 2,54.8C0.87,56.06 0.3,57.55 0.04,59.2C-0.21,60.85 0.69,62.01 2,62.03C3.46,61.99 4.51,61.7 5.13,60.67C5.54,59.98 5.95,59.22 6.09,58.45C6.31,57.23 6.96,56.39 7.86,55.62C10.34,53.49 12.88,51.4 15.84,50C17.88,49.03 19.2,47.6 20.25,45.67C20.85,44.57 21.57,43.57 22.41,42.67C21.93,42.37 21.44,42.06 20.96,41.76L20.57,41.52Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M24.33,7.57C24.16,10.08 24.17,12.2 23.31,14.18C22.9,15.11 23.49,15.95 23.66,16.81C23.7,17 24.19,17.21 24.47,17.2C25.83,17.15 27.21,17.17 28.53,16.9C30.61,16.48 32.65,15.85 34.7,15.3C40.6,13.73 46.56,13.04 52.65,13.61C55.21,13.85 57.76,14.09 60.23,14.75C63.77,15.71 67.23,16.92 70.29,19.1C70.78,19.45 71.26,19.59 71.82,19.47C75.67,18.66 79.13,19.85 82.48,21.67C83.79,22.38 85.11,23.05 86.44,23.71C88.67,24.83 91.03,25.06 93.45,24.65C95.44,24.32 96.99,23.3 97.99,21.41C100.21,17.2 99.93,11.56 96.98,7.94C95.03,5.54 91.75,4.9 89.13,6.41C87.32,7.45 86.32,9.05 86.17,11.21C86.14,11.61 86.17,12.01 86.13,12.41C86.06,13.06 85.64,13.4 85.08,13.57C84.58,13.72 84.03,13.45 83.76,12.83C83.57,12.37 83.48,11.85 83.44,11.35C83.2,8.04 85.82,4.62 88.27,3.46C93.17,1.13 98.61,3.1 101.02,8.14C101.21,8.55 101.4,8.96 101.58,9.37C103.92,14.65 103.29,19.71 100.3,24.44C97.99,28.1 94.58,29.75 90.37,29.47C89.89,29.44 89.39,29.34 88.94,29.16C87.52,28.6 86.1,28.02 84.71,27.38C83.57,26.85 82.47,26.22 81.35,25.63C80.12,24.97 78.81,24.62 77.44,24.51C76.96,24.48 76.47,24.59 75.99,24.65C75.73,24.69 75.61,24.87 75.75,25.12C75.91,25.42 76.1,25.7 76.29,25.98C78.13,28.73 80.07,31.41 81.8,34.24C86.2,41.42 90.57,48.64 94.82,55.92C96.09,58.09 96.97,60.51 97.93,62.86C98.69,64.72 97.78,66.29 96.86,67.79C96.68,68.08 96.25,68.28 95.9,68.37C94.36,68.75 92.81,69.06 91.22,68.99C90.03,68.93 89.36,68.41 89.15,67.22C88.92,65.94 88.68,64.59 89.87,63.6C90.17,63.35 90.23,63.07 90.06,62.71C88.44,59.32 86.28,56.46 83.01,54.66C81.9,54.05 80.82,53.39 79.7,52.8C76.88,51.3 74.6,49.15 72.61,46.61C72.44,46.39 72.27,46.17 72.1,45.94C70.63,44.03 70.63,43.98 68.26,44.09C66.36,44.18 64.47,44.39 62.57,44.59C59.6,44.89 56.63,45.26 53.65,45.52C51.92,45.68 50.17,45.82 48.44,45.74C45.73,45.61 43.03,45.25 40.36,44.68C40.09,44.63 39.83,44.56 39.56,44.53C38.95,44.47 38.78,44.69 38.95,45.34C39.08,45.83 39.23,46.33 39.42,46.8C39.89,47.94 39.94,49.1 39.66,50.3C39.23,52.12 38.77,53.94 38.44,55.78C38.23,56.89 38.09,58.05 38.18,59.16C38.29,60.58 38.08,61.88 37.57,63.15C37.32,63.78 37.03,64.4 36.8,65.04C36.39,66.16 35.6,66.76 34.51,66.99C33.33,67.24 32.16,67.43 30.95,67.17C30.37,67.05 29.76,67.04 29.17,67.06C28.52,67.09 28.02,66.65 28.05,65.71C28.11,64.08 29.03,62.95 30.58,62.58C30.79,62.53 31.01,62.53 31.23,62.51C31.64,62.47 31.78,62.2 31.79,61.81C31.8,60.79 31.88,59.76 31.8,58.74C31.66,57.05 31.46,55.35 31.2,53.67C30.96,52.13 30.35,50.74 29.44,49.49C28.28,47.9 26.99,46.44 25.39,45.31C23.99,44.33 22.56,43.4 21.13,42.46C16.49,39.43 12.65,35.53 9.61,30.79C8.88,29.66 8.32,28.41 7.79,27.17C7.38,26.22 6.93,25.37 6.12,24.71C4.61,23.46 3.82,21.69 3.17,19.87C2.54,18.09 2.88,16.27 3.25,14.48C3.31,14.21 3.38,13.93 3.5,13.67C4.13,12.3 4.17,10.85 4.17,9.35C4.16,6.67 4.59,4.03 5.27,1.44C5.72,-0.25 6.4,-0.42 7.69,0.76C9.05,2.01 10.22,3.44 11.1,5.09C11.57,5.98 12.13,6.25 13.06,6.16C14.54,6.03 16,6.2 17.23,7.24C17.67,7.6 18,7.5 18.33,7.06C19.18,5.94 20.11,4.9 21.28,4.14C21.65,3.9 22.02,3.64 22.43,3.5C23.25,3.2 23.88,3.52 24.02,4.42C24.22,5.59 24.26,6.79 24.33,7.57Z"
+      android:fillColor="#ffffff"/>
+</vector>

core/designresource/src/main/res/drawable/ic_guest_github.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="89dp"
+    android:height="82dp"
+    android:viewportWidth="89"
+    android:viewportHeight="82">
+  <path
+      android:pathData="M40,42m-40,0a40,40 0,1 1,80 0a40,40 0,1 1,-80 0"
+      android:fillColor="#747474"/>
+  <path
+      android:pathData="M40,0C30.502,0 21.314,3.466 14.08,9.777C6.846,16.087 2.038,24.831 0.517,34.444C-1.005,44.056 0.859,53.91 5.776,62.242C10.692,70.575 18.34,76.841 27.35,79.922C29.35,80.28 30.1,79.05 30.1,77.973C30.1,76.999 30.05,73.77 30.05,70.335C20,72.232 17.4,67.823 16.6,65.516C15.712,63.273 14.305,61.284 12.5,59.723C11.1,58.954 9.1,57.057 12.45,57.006C13.729,57.149 14.956,57.605 16.027,58.337C17.097,59.069 17.98,60.054 18.6,61.21C19.147,62.218 19.883,63.105 20.765,63.82C21.647,64.536 22.658,65.066 23.74,65.38C24.822,65.695 25.954,65.787 27.071,65.652C28.188,65.517 29.269,65.157 30.25,64.593C30.423,62.508 31.329,60.559 32.8,59.108C23.9,58.083 14.6,54.546 14.6,38.859C14.544,34.783 16.011,30.839 18.7,27.837C17.477,24.294 17.62,20.407 19.1,16.969C19.1,16.969 22.45,15.892 30.1,21.172C36.645,19.327 43.555,19.327 50.1,21.172C57.75,15.841 61.1,16.969 61.1,16.969C62.58,20.407 62.723,24.294 61.5,27.837C64.197,30.834 65.665,34.781 65.6,38.859C65.6,54.597 56.25,58.083 47.35,59.108C48.304,60.1 49.04,61.291 49.505,62.6C49.971,63.91 50.157,65.306 50.05,66.695C50.05,72.181 50,76.589 50,77.974C50,79.05 50.75,80.332 52.75,79.922C61.744,76.816 69.37,70.535 74.265,62.199C79.161,53.862 81.007,44.013 79.475,34.41C77.943,24.806 73.132,16.074 65.901,9.771C58.671,3.468 49.491,0.005 40,0Z"
+      android:fillColor="#ffffff"/>
+</vector>

core/designresource/src/main/res/drawable/ic_small_right_arrow.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="9dp"
+    android:height="16dp"
+    android:viewportWidth="9"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M1,1L7.619,7.619L1,14.238"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.8"
+      android:fillColor="#00000000"
+      android:strokeColor="#FBCF34"
+      android:strokeLineCap="round"/>
+</vector>

core/designresource/src/main/res/drawable/ic_yellow_check.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="14dp"
+    android:viewportWidth="20"
+    android:viewportHeight="14">
+  <path
+      android:pathData="M19,1L7,13L1,7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#FBCF34"
+      android:strokeLineCap="round"/>
+</vector>