Merge pull request #74 from uswLectureEvaluation/feature/#71-login

Feature/#71 login
uswLectureEvaluation · Dec 28, 2023 · 9d9660c · 9d9660c
2 parents 44844c3 + 21ccda8
commit 9d9660c
Show file tree

Hide file tree

Showing 57 changed files with 951 additions and 107 deletions.
diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts
@@ -18,6 +18,7 @@ android {
 }
 
 dependencies {
+  implementation(projects.core.designsystem)
   implementation(projects.feature.navigator)
 
   implementation(projects.remote.openmajor)
@@ -28,10 +29,12 @@ dependencies {
   implementation(projects.remote.signup)
   implementation(projects.remote.notice)
   implementation(projects.remote.user)
+  implementation(projects.remote.login)
 
   implementation(projects.local.openmajor)
   implementation(projects.local.timetable)
   implementation(projects.local.user)
+  implementation(projects.local.login)
 
   implementation(projects.data.openmajor)
   implementation(projects.data.timetable)
@@ -41,6 +44,7 @@ dependencies {
   implementation(projects.data.user)
   implementation(projects.data.notice)
   implementation(projects.data.signup)
+  implementation(projects.data.login)
 
   implementation(platform(libs.firebase.bom))
   implementation(libs.firebase.crashlytics)

diff --git a/app-compose/src/main/AndroidManifest.xml b/app-compose/src/main/AndroidManifest.xml
@@ -7,11 +7,12 @@
     android:allowBackup="false"
     android:dataExtractionRules="@xml/data_extraction_rules"
     android:fullBackupContent="false"
-    android:icon="@mipmap/ic_launcher"
+    android:icon="@mipmap/ic_logo"
     android:label="@string/app_name"
-    android:roundIcon="@mipmap/ic_launcher_round"
+    android:roundIcon="@mipmap/ic_logo"
     android:supportsRtl="true"
     android:theme="@style/Theme.Suwiki"
+    android:usesCleartextTraffic="true"
     tools:replace="android:allowBackup"
     tools:targetApi="s" />
 

diff --git a/app-compose/src/main/ic_logo-playstore.png b/app-compose/src/main/ic_logo-playstore.png
diff --git a/core/android/src/main/java/com/suwiki/core/android/ThrowUnknownException.kt b/core/android/src/main/java/com/suwiki/core/android/ThrowUnknownException.kt
@@ -2,11 +2,9 @@ package com.suwiki.core.android
 
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
-import com.suwiki.core.model.exception.UnknownException
 
-fun throwUnknownException(
+fun recordException(
   e: Throwable,
 ) {
   Firebase.crashlytics.recordException(e)
-  throw e.message?.let { UnknownException(it) } ?: UnknownException()
 }
diff --git a/core/designsystem/src/main/ic_logo-playstore.png b/core/designsystem/src/main/ic_logo-playstore.png
diff --git a/...tem/src/main/java/com/suwiki/core/designsystem/component/bottomsheet/SuwikiBottomSheet.kt b/...tem/src/main/java/com/suwiki/core/designsystem/component/bottomsheet/SuwikiBottomSheet.kt
@@ -1,45 +1,45 @@
 package com.suwiki.core.designsystem.component.bottomsheet
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.SheetState
 import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.suwiki.core.designsystem.component.align.SuwikiAlignContainer
 import com.suwiki.core.designsystem.theme.Gray95
 import com.suwiki.core.designsystem.theme.SuwikiTheme
 import com.suwiki.core.designsystem.theme.White
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SuwikiBottomSheet(
+  sheetState: SheetState = rememberModalBottomSheetState(),
   isSheetOpen: Boolean,
   onDismissRequest: () -> Unit = {},
-  bottomSheetItem: List<@Composable () -> Unit>,
+  content: @Composable ColumnScope.() -> Unit,
 ) {
   if (isSheetOpen) {
     ModalBottomSheet(
+      sheetState = sheetState,
+      shape = RoundedCornerShape(topStart = 28.dp, topEnd = 28.dp),
       onDismissRequest = onDismissRequest,
       containerColor = White,
       dragHandle = null,
     ) {
-      Spacer(modifier = Modifier.height(36.dp))
-      bottomSheetItem.forEach { item ->
-        item()
-      }
+      content()
     }
   }
 }
@@ -60,10 +60,10 @@ fun SuwikiBottomSheetItem(
   )
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Preview
 @Composable
 fun SuwikiBottomSheetPreview() {
-  var isChecked by remember { mutableStateOf(false) }
   var isSheetOpen by rememberSaveable { mutableStateOf(false) }
 
   // 테스트용 버튼
@@ -75,16 +75,7 @@ fun SuwikiBottomSheetPreview() {
     SuwikiBottomSheet(
       isSheetOpen = isSheetOpen,
       onDismissRequest = { isSheetOpen = !isSheetOpen },
-      bottomSheetItem = listOf(
-        { SuwikiBottomSheetItem(title = "타이틀") },
-        {
-          SuwikiAlignContainer(
-            text = "메뉴",
-            isChecked = isChecked,
-            onClick = { isChecked = !isChecked },
-          )
-        },
-      ),
+      content = {},
     )
   }
 }
diff --git a/.../designsystem/src/main/java/com/suwiki/core/designsystem/component/dialog/SuwikiDialog.kt b/.../designsystem/src/main/java/com/suwiki/core/designsystem/component/dialog/SuwikiDialog.kt
@@ -30,10 +30,10 @@ fun SuwikiDialog(
   headerText: String,
   bodyText: String,
   confirmButtonText: String,
-  dismissButtonText: String,
+  dismissButtonText: String? = null,
   onDismissRequest: () -> Unit,
   onClickConfirm: () -> Unit,
-  onClickDismiss: () -> Unit,
+  onClickDismiss: () -> Unit = {},
 ) {
   Dialog(
     onDismissRequest = onDismissRequest,
@@ -60,12 +60,14 @@ fun SuwikiDialog(
           modifier = Modifier.fillMaxWidth(),
           horizontalArrangement = Arrangement.End,
         ) {
-          Text(
-            modifier = Modifier.suwikiClickable(rippleEnabled = false, onClick = onClickDismiss),
-            text = dismissButtonText,
-            style = SuwikiTheme.typography.body4,
-            color = Gray95,
-          )
+          if (dismissButtonText != null) {
+            Text(
+              modifier = Modifier.suwikiClickable(rippleEnabled = false, onClick = onClickDismiss),
+              text = dismissButtonText,
+              style = SuwikiTheme.typography.body4,
+              color = Gray95,
+            )
+          }
 
           Spacer(modifier = Modifier.width(30.dp))
 

diff --git a/...esignsystem/src/main/java/com/suwiki/core/designsystem/component/loading/LoadingScreen.kt b/...esignsystem/src/main/java/com/suwiki/core/designsystem/component/loading/LoadingScreen.kt
@@ -0,0 +1,28 @@
+package com.suwiki.core.designsystem.component.loading
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import com.suwiki.core.designsystem.theme.Primary
+import com.suwiki.core.ui.extension.suwikiClickable
+
+@Composable
+fun LoadingScreen(modifier: Modifier = Modifier) {
+  Box(
+    modifier = modifier.fillMaxSize().suwikiClickable(rippleEnabled = false, onClick = {}),
+    contentAlignment = Alignment.Center,
+  ) {
+    CircularProgressIndicator(
+      modifier = Modifier.size(36.dp),
+      strokeWidth = 4.dp,
+      color = Primary,
+      trackColor = Color.Transparent,
+    )
+  }
+}
diff --git a/...onent/textfield/SuwikiTextFieldRegular.kt → ...onent/textfield/SuwikiRegularTextField.kt b/...onent/textfield/SuwikiTextFieldRegular.kt → ...onent/textfield/SuwikiRegularTextField.kt
@@ -12,10 +12,12 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -24,9 +26,14 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.suwiki.core.designsystem.R
 import com.suwiki.core.designsystem.component.button.TextFieldClearButton
 import com.suwiki.core.designsystem.theme.Black
 import com.suwiki.core.designsystem.theme.Error
@@ -36,9 +43,10 @@ import com.suwiki.core.designsystem.theme.GrayF6
 import com.suwiki.core.designsystem.theme.Primary
 import com.suwiki.core.designsystem.theme.SuwikiTheme
 import com.suwiki.core.designsystem.theme.White
+import com.suwiki.core.ui.extension.suwikiClickable
 
 @Composable
-fun SuwikiTextFieldRegular(
+fun SuwikiRegularTextField(
   modifier: Modifier = Modifier,
   label: String? = "",
   placeholder: String = "",
@@ -51,6 +59,9 @@ fun SuwikiTextFieldRegular(
   minLines: Int = 1,
   keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
   keyboardActions: KeyboardActions = KeyboardActions.Default,
+  showEyeIcon: Boolean = false,
+  onClickEyeIcon: () -> Unit = {},
+  showValue: Boolean = true,
   interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
 ) {
   val isFocused by interactionSource.collectIsFocusedAsState()
@@ -78,6 +89,7 @@ fun SuwikiTextFieldRegular(
     textStyle = SuwikiTheme.typography.header4.copy(color = Black),
     interactionSource = interactionSource,
     cursorBrush = SolidColor(Primary),
+    visualTransformation = if (showValue) VisualTransformation.None else PasswordVisualTransformation(),
     keyboardOptions = keyboardOptions,
     keyboardActions = keyboardActions,
     decorationBox = { innerText ->
@@ -116,9 +128,25 @@ fun SuwikiTextFieldRegular(
           }
 
           if (value.isNotEmpty()) {
-            TextFieldClearButton(
-              onClick = onClickClearButton,
-            )
+            Row(
+              horizontalArrangement = Arrangement.spacedBy(4.dp),
+            ) {
+              if (showEyeIcon) {
+                Icon(
+                  modifier = modifier
+                    .size(24.dp)
+                    .clip(CircleShape)
+                    .suwikiClickable(onClick = onClickEyeIcon),
+                  painter = painterResource(id = if (showValue) R.drawable.ic_eye_off else R.drawable.ic_eye_on),
+                  tint = Gray95,
+                  contentDescription = "",
+                )
+              }
+
+              TextFieldClearButton(
+                onClick = onClickClearButton,
+              )
+            }
           }
         }
 
@@ -145,7 +173,7 @@ fun SuwikiTextFieldRegular(
 
 @Preview(showBackground = true, backgroundColor = 0xFFFFFF)
 @Composable
-fun SuwikiTextFieldRegularPreview() {
+fun SuwikiRegularTextFieldPreview() {
   SuwikiTheme {
     var normalValue by remember {
       mutableStateOf("")
@@ -159,7 +187,7 @@ fun SuwikiTextFieldRegularPreview() {
       modifier = Modifier.background(White),
       verticalArrangement = Arrangement.spacedBy(10.dp),
     ) {
-      SuwikiTextFieldRegular(
+      SuwikiRegularTextField(
         label = "라벨",
         placeholder = "플레이스 홀더",
         value = normalValue,
@@ -168,7 +196,7 @@ fun SuwikiTextFieldRegularPreview() {
         helperText = "도움말 메세지",
       )
 
-      SuwikiTextFieldRegular(
+      SuwikiRegularTextField(
         label = "라벨",
         placeholder = "플레이스 홀더",
         value = errorValue,

diff --git a/...ponent/textfield/SuwikiTextFieldReview.kt → ...mponent/textfield/SuwikiReviewInputBox.kt b/...ponent/textfield/SuwikiTextFieldReview.kt → ...mponent/textfield/SuwikiReviewInputBox.kt
@@ -31,7 +31,7 @@ import com.suwiki.core.designsystem.theme.Primary
 import com.suwiki.core.designsystem.theme.SuwikiTheme
 
 @Composable
-fun SuwikiTextFieldReview(
+fun SuwikiReviewInputBox(
   modifier: Modifier = Modifier,
   hint: String = "",
   value: String = "",
@@ -74,7 +74,7 @@ fun SuwikiTextFieldReview(
 
 @Preview(showBackground = true, backgroundColor = 0xFFFFFF)
 @Composable
-fun SuwikiTextFieldReviewPreview() {
+fun SuwikiReviewInputBoxPreview() {
   SuwikiTheme {
     var normalValue by remember {
       mutableStateOf("")
@@ -84,13 +84,13 @@ fun SuwikiTextFieldReviewPreview() {
       modifier = Modifier.padding(20.dp),
       verticalArrangement = Arrangement.spacedBy(10.dp),
     ) {
-      SuwikiTextFieldReview(
+      SuwikiReviewInputBox(
         hint = "강의평가를 작성해주세요",
         value = normalValue,
         onValueChange = { normalValue = it },
       )
 
-      SuwikiTextFieldReview(
+      SuwikiReviewInputBox(
         hint = "강의평가를 작성해주세요",
         value = normalValue,
         isError = true,