Merge branch 'develop' of https://github.com/pknu-wap/WAPP into featu…

…re/jaino/#87
pknu-wap · Jan 11, 2024 · 2aad7c3 · 2aad7c3
2 parents 3a4c7d1 + a90fafe
commit 2aad7c3
Show file tree

Hide file tree

Showing 48 changed files with 721 additions and 561 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
     implementation(project(":feature:profile"))
     implementation(project(":feature:management"))
     implementation(project(":feature:management-survey"))
+    implementation(project(":feature:management-event"))
     implementation(project(":feature:splash"))
     implementation(project(":core:designresource"))
     implementation(project(":core:designsystem"))

diff --git a/app/src/main/java/com/wap/wapp/MainActivity.kt b/app/src/main/java/com/wap/wapp/MainActivity.kt
@@ -25,7 +25,7 @@ import com.wap.wapp.component.WappBottomBar
 import com.wap.wapp.core.domain.usecase.auth.SignInUseCase
 import com.wap.wapp.feature.auth.signin.navigation.signInNavigationRoute
 import com.wap.wapp.feature.auth.signup.navigation.signUpNavigationRoute
-import com.wap.wapp.feature.management.registration.event.navigation.eventRegistrationNavigationRoute
+import com.wap.wapp.feature.management.event.navigation.eventRegistrationNavigationRoute
 import com.wap.wapp.feature.management.survey.navigation.ManagementSurveyRoute
 import com.wap.wapp.feature.profile.profilesetting.navigation.profileSettingNavigationRoute
 import com.wap.wapp.feature.splash.navigation.splashNavigationRoute

diff --git a/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt b/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt
@@ -12,12 +12,11 @@ import com.wap.wapp.feature.auth.signin.navigation.navigateToSignIn
 import com.wap.wapp.feature.auth.signin.navigation.signInScreen
 import com.wap.wapp.feature.auth.signup.navigation.navigateToSignUp
 import com.wap.wapp.feature.auth.signup.navigation.signUpScreen
-import com.wap.wapp.feature.management.edit.event.navigation.eventEditScreen
-import com.wap.wapp.feature.management.edit.event.navigation.navigateToEventEdit
+import com.wap.wapp.feature.management.event.navigation.managementEventNavGraph
+import com.wap.wapp.feature.management.event.navigation.navigateToEventEdit
+import com.wap.wapp.feature.management.event.navigation.navigateToEventRegistration
 import com.wap.wapp.feature.management.navigation.managementScreen
 import com.wap.wapp.feature.management.navigation.navigateToManagement
-import com.wap.wapp.feature.management.registration.event.navigation.eventRegistrationScreen
-import com.wap.wapp.feature.management.registration.event.navigation.navigateToEventRegistration
 import com.wap.wapp.feature.management.survey.navigation.navigateToSurveyFormEdit
 import com.wap.wapp.feature.management.survey.navigation.navigateToSurveyFormRegistration
 import com.wap.wapp.feature.management.survey.navigation.managementSurveyNavGraph
@@ -85,10 +84,7 @@ fun WappNavHost(
         managementSurveyNavGraph(
             navigateToManagement = navController::navigateToManagement,
         )
-        eventRegistrationScreen(
-            navigateToManagement = navController::navigateToManagement,
-        )
-        eventEditScreen(
+        managementEventNavGraph(
             navigateToManagement = navController::navigateToManagement,
         )
         profileScreen(

diff --git a/core/designsystem/src/main/java/com/wap/designsystem/component/Title.kt b/core/designsystem/src/main/java/com/wap/designsystem/component/Title.kt
@@ -15,10 +15,11 @@ import com.wap.designsystem.WappTheme
 fun WappTitle(
     title: String,
     content: String,
+    modifier: Modifier = Modifier,
 ) {
     Column(
         verticalArrangement = Arrangement.spacedBy(16.dp),
-        modifier = Modifier.fillMaxWidth(),
+        modifier = modifier.fillMaxWidth(),
     ) {
         Text(
             text = title,

diff --git a/feature/auth/src/main/java/com/wap/wapp/feature/auth/signin/SignInContent.kt b/feature/auth/src/main/java/com/wap/wapp/feature/auth/signin/SignInContent.kt
@@ -5,12 +5,14 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 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.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Text
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ElevatedButton
@@ -31,98 +33,103 @@ internal fun SignInContent(
     openSignInSheet: () -> Unit,
     navigateToNotice: () -> Unit,
 ) {
+    val scrollState = rememberScrollState()
+
     Column(
-        modifier = Modifier.fillMaxWidth(),
-        verticalArrangement = Arrangement.spacedBy(32.dp),
+        verticalArrangement = Arrangement.Center,
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(horizontal = 16.dp)
+            .verticalScroll(scrollState),
     ) {
-        Spacer(modifier = Modifier.height(32.dp))
-        Image(
-            painter = painterResource(id = R.drawable.img_white_cat),
+        Column(
+            verticalArrangement = Arrangement.Center,
             modifier = Modifier
-                .align(Alignment.CenterHorizontally)
-                .size(width = 230.dp, height = 230.dp),
-            contentDescription = "WAPP ICON",
-        )
-
-        Row(
-            modifier = Modifier.align(Alignment.CenterHorizontally),
+                .fillMaxSize()
+                .weight(1f),
         ) {
-            Column {
-                Spacer(modifier = Modifier.height(40.dp))
+            Image(
+                painter = painterResource(id = R.drawable.img_white_cat),
+                modifier = Modifier
+                    .align(Alignment.CenterHorizontally)
+                    .size(width = 230.dp, height = 230.dp),
+                contentDescription = stringResource(string.wapp_icon_description),
+            )
+            Row(
+                modifier = Modifier.align(Alignment.CenterHorizontally),
+            ) {
+                Column {
+                    Spacer(modifier = Modifier.height(40.dp))
+
+                    Text(
+                        text = stringResource(id = string.application_name),
+                        style = WappTheme.typography.titleBold,
+                        fontSize = 48.sp,
+                        color = WappTheme.colors.white,
+                    )
+                }
                 Text(
                     text = stringResource(id = string.application_name),
-                    style = WappTheme.typography.titleBold,
                     fontSize = 48.sp,
-                    color = WappTheme.colors.white,
+                    style = WappTheme.typography.titleBold,
+                    color = WappTheme.colors.yellow34,
                 )
             }
+        }
+        ElevatedButton(
+            modifier = Modifier
+                .align(Alignment.CenterHorizontally)
+                .fillMaxWidth(),
+            onClick = {
+                openSignInSheet()
+            },
+            colors = ButtonDefaults.elevatedButtonColors(
+                containerColor = WappTheme.colors.white,
+            ),
+            shape = RoundedCornerShape(10.dp),
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_github),
+                contentDescription = stringResource(
+                    id = string.sign_in_github_description,
+                ),
+                modifier = Modifier.size(40.dp),
+                tint = WappTheme.colors.black,
+            )
             Text(
-                text = stringResource(id = string.application_name),
-                fontSize = 48.sp,
-                style = WappTheme.typography.titleBold,
-                color = WappTheme.colors.yellow34,
+                text = stringResource(id = string.sign_in_github_content),
+                style = WappTheme.typography.contentMedium,
+                modifier = Modifier.padding(start = 16.dp),
             )
         }
 
-        Column {
-            ElevatedButton(
-                modifier = Modifier
-                    .align(Alignment.CenterHorizontally)
-                    .fillMaxWidth()
-                    .padding(horizontal = 16.dp),
-                onClick = {
-                    openSignInSheet()
-                },
-                colors = ButtonDefaults.elevatedButtonColors(
-                    containerColor = WappTheme.colors.white,
-                ),
-                shape = RoundedCornerShape(10.dp),
-            ) {
-                Icon(
-                    painter = painterResource(id = R.drawable.ic_github),
-                    contentDescription = stringResource(
-                        id = string.sign_in_github_description,
-                    ),
-                    modifier = Modifier.size(40.dp),
-                    tint = WappTheme.colors.black,
-                )
-                Spacer(modifier = Modifier.width(16.dp))
-                Text(
-                    text = stringResource(id = string.sign_in_github_content),
-                    style = WappTheme.typography.contentMedium,
-                )
-            }
-
-            Spacer(modifier = Modifier.height(12.dp))
-
-            ElevatedButton(
-                modifier = Modifier
-                    .align(Alignment.CenterHorizontally)
-                    .fillMaxWidth()
-                    .padding(horizontal = 16.dp),
-                onClick = {
-                    navigateToNotice()
-                },
-                colors = ButtonDefaults.elevatedButtonColors(
-                    containerColor = WappTheme.colors.yellow34,
-                    contentColor = WappTheme.colors.white,
+        ElevatedButton(
+            modifier = Modifier
+                .align(Alignment.CenterHorizontally)
+                .fillMaxWidth()
+                .padding(top = 20.dp, bottom = 60.dp),
+            onClick = {
+                navigateToNotice()
+            },
+            colors = ButtonDefaults.elevatedButtonColors(
+                containerColor = WappTheme.colors.yellow34,
+                contentColor = WappTheme.colors.white,
+            ),
+            shape = RoundedCornerShape(10.dp),
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_balloon),
+                contentDescription = stringResource(
+                    id = string.sign_in_non_member_description,
                 ),
-                shape = RoundedCornerShape(10.dp),
-            ) {
-                Icon(
-                    painter = painterResource(id = R.drawable.ic_balloon),
-                    contentDescription = stringResource(
-                        id = string.sign_in_non_member_description,
-                    ),
-                    modifier = Modifier.size(40.dp),
-                )
-                Spacer(modifier = Modifier.width(16.dp))
-                Text(
-                    text = stringResource(id = string.sign_in_non_member_content),
-                    style = WappTheme.typography.contentMedium,
-                    color = WappTheme.colors.white,
-                )
-            }
+                modifier = Modifier.size(40.dp),
+            )
+            Text(
+                text = stringResource(id = string.sign_in_non_member_content),
+                style = WappTheme.typography.contentMedium,
+                color = WappTheme.colors.white,
+                modifier = Modifier.padding(start = 16.dp),
+            )
         }
     }
 }
diff --git a/feature/auth/src/main/res/values/strings.xml b/feature/auth/src/main/res/values/strings.xml
@@ -5,6 +5,7 @@
     <string name="back_button_description">Back Icon</string>
     <string name="sign_in">로그인</string>
     <string name="sign_in_email">이메일</string>
+    <string name="wapp_icon_description">WAPP ICON</string>
     <string name="sign_in_email_hint">Github Email</string>
     <string name="sign_in_find_email">이메일을 까먹으셨나요?</string>
     <string name="sign_in_github_content">Github 로그인</string>

diff --git a/feature/management-event/.gitignore b/feature/management-event/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/feature/management-event/build.gradle.kts b/feature/management-event/build.gradle.kts
@@ -0,0 +1,38 @@
+plugins {
+    id("com.wap.wapp.feature")
+    id("com.wap.wapp.hilt")
+}
+
+android {
+    namespace = "com.wap.wapp.feature.management.event"
+
+    defaultConfig {
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
+        }
+    }
+}
+
+dependencies {
+    implementation(project(":core:domain"))
+    implementation(project(":core:model"))
+    implementation(project(":core:designsystem"))
+    implementation(project(":core:designresource"))
+    implementation(project(":core:common"))
+
+    implementation(libs.bundles.androidx)
+    implementation(libs.material)
+
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.test.junit)
+    androidTestImplementation(libs.androidx.test.espresso)
+}
diff --git a/feature/management-event/consumer-rules.pro b/feature/management-event/consumer-rules.pro
diff --git a/feature/management-event/proguard-rules.pro b/feature/management-event/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/...ent/src/androidTest/java/com/wap/wapp/feature/management/event/ExampleInstrumentedTest.kt b/...ent/src/androidTest/java/com/wap/wapp/feature/management/event/ExampleInstrumentedTest.kt
@@ -0,0 +1,23 @@
+package com.wap.wapp.feature.management.event
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Assert.assertEquals
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.wap.wapp.feature.management.event.test", appContext.packageName)
+    }
+}