Merge pull request #1531 from BCSDLab/feature/#1496-move-profile-to-external-module

[Refactor] profile 외부 모듈로 분리 및 파일 오류 수정

Author: TTRR1007

feature/home/src/main/java/in/koreatech/koin/feature/home/profile/Constant.kt

@@ -0,0 +1,27 @@
+plugins {
+    alias(libs.plugins.koin.feature)
+    alias(libs.plugins.koin.hilt)
+    alias(libs.plugins.koin.library.orbit)
+}
+
+android {
+    namespace = "in.koreatech.koin.feature.profile"
+}
+
+dependencies {
+    implementation(projects.core)
+    implementation(projects.domain)
+    implementation(projects.core.onboarding)
+    implementation(projects.core.designsystem)
+    implementation(projects.core.analytics)
+    implementation(projects.core.navigation)
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    implementation(libs.kotlinx.collections.immutable)
+    implementation(libs.coil.compose)
+    implementation(libs.timber)
+
+    testImplementation(libs.kotlinx.coroutines.test)
+}

feature/profile/build.gradle.kts

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.13.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.13.0)" variant="all" version="8.13.0">
+
+</issues>

feature/profile/consumer-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

feature/profile/lint-baseline.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+    </application>
+
+</manifest>

feature/profile/proguard-rules.pro

@@ -0,0 +1,2 @@
+package `in`.koreatech.koin.feature.profile
+internal const val DEEPLINK_MAIN_PROFILE = "koin://main/navigation"

feature/profile/src/main/AndroidManifest.xml

@@ -1,8 +1,9 @@
-package `in`.koreatech.koin.feature.home.profile
+package `in`.koreatech.koin.feature.profile
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -34,11 +35,9 @@ import `in`.koreatech.koin.core.analytics.EventLogger
 import `in`.koreatech.koin.core.designsystem.noRippleClickable
 import `in`.koreatech.koin.core.designsystem.theme.RebrandKoinTheme
 import `in`.koreatech.koin.core.navigation.utils.rememberNavigator
-import `in`.koreatech.koin.feature.home.R
-import `in`.koreatech.koin.feature.home.component.HomeSection
-import `in`.koreatech.koin.feature.home.profile.component.ProfileCard
-import `in`.koreatech.koin.feature.home.profile.component.ProfileTimetable
-import `in`.koreatech.koin.feature.home.profile.model.ProfileTimetableLecture
+import `in`.koreatech.koin.feature.profile.component.ProfileCard
+import `in`.koreatech.koin.feature.profile.component.ProfileTimetable
+import `in`.koreatech.koin.feature.profile.model.ProfileTimetableLecture
 import kotlinx.collections.immutable.ImmutableList
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
@@ -79,10 +78,12 @@ fun ProfileScreen(
                 }
             },
             onSettingClick = {
-                if (!uiState.isLoggedIn) {
+                if (uiState.isLoggedIn) {
+                    onNavigateToSetting()
+                } else {
                     EventLogger.logCampusClickEvent(AnalyticsConstant.Label.LOGIN_PROMPT, "설정(비로그인)")
+                    navigator.navigateToSignIn(context, DEEPLINK_MAIN_PROFILE).let { context.startActivity(it) }
                 }
-                onNavigateToSetting()
             },
             onNotificationClick = {
                 EventLogger.logCampusClickEvent(AnalyticsConstant.Label.NOTIFICATION, "알림 아이콘")
@@ -137,17 +138,22 @@ private fun HeaderSection(
     ) {
         Image(
             imageVector = ImageVector.vectorResource(R.drawable.ic_bcsd_symbol),
-            contentDescription = ""
+            contentDescription = null
+        )
+
+        Image(
+            imageVector = ImageVector.vectorResource(R.drawable.ic_koin_text),
+            contentDescription = null
         )
 
         Spacer(modifier = Modifier.weight(1f))
 
         Image(
             modifier = Modifier.noRippleClickable { onNotificationClick() },
             imageVector = if (isNewNotificationReceived) {
-                ImageVector.vectorResource(R.drawable.ic_home_notification_dot)
+                ImageVector.vectorResource(R.drawable.ic_profile_notification_dot)
             } else {
-                ImageVector.vectorResource(R.drawable.ic_home_notification)
+                ImageVector.vectorResource(R.drawable.ic_profile_notification)
             },
             contentDescription = null
         )
@@ -159,23 +165,23 @@ private fun TimetableSection(
     lectures: ImmutableList<ProfileTimetableLecture>,
     modifier: Modifier = Modifier
 ) {
-    HomeSection(
-        modifier = modifier.fillMaxWidth(),
-        text = {
-            Text(
-                text = stringResource(R.string.profile_timetable_section),
-                style = RebrandKoinTheme.typography.medium18
-            )
-        },
-        more = {}
+    Column(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(top = 16.dp, start = 24.dp, end = 24.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp)
     ) {
+        Text(
+            text = stringResource(R.string.profile_timetable_section),
+            style = RebrandKoinTheme.typography.bold18
+        )
         Column(
             modifier = Modifier
                 .fillMaxWidth()
                 .border(0.5.dp, Color(0xFFE6E6E6), RoundedCornerShape(16.dp))
                 .clip(RoundedCornerShape(16.dp))
                 .background(RebrandKoinTheme.colors.neutral0)
-                .padding(vertical = 16.dp, horizontal = 16.dp)
+                .padding(16.dp)
         ) {
             ProfileTimetable(lectures = lectures)
         }

feature/profile/src/main/java/in/koreatech/koin/feature/profile/Constant.kt

@@ -1,4 +1,4 @@
-package `in`.koreatech.koin.feature.home.profile
+package `in`.koreatech.koin.feature.profile
 
 sealed class ProfileSideEffect {
     data object LogoutSuccess : ProfileSideEffect()

…in/feature/home/profile/ProfileScreen.kt …ch/koin/feature/profile/ProfileScreen.ktfeature/home/src/main/java/in/koreatech/koin/feature/home/profile/ProfileScreen.kt renamed to feature/profile/src/main/java/in/koreatech/koin/feature/profile/ProfileScreen.kt feature/home/src/main/java/in/koreatech/koin/feature/home/profile/ProfileScreen.kt renamed to feature/profile/src/main/java/in/koreatech/koin/feature/profile/ProfileScreen.kt

@@ -1,6 +1,6 @@
-package `in`.koreatech.koin.feature.home.profile
+package `in`.koreatech.koin.feature.profile
 
-import `in`.koreatech.koin.feature.home.profile.model.ProfileTimetableLecture
+import `in`.koreatech.koin.feature.profile.model.ProfileTimetableLecture
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
@@ -9,6 +9,5 @@ data class ProfileState(
     val name: String = "",
     val studentNumber: String = "",
     val timetable: ImmutableList<ProfileTimetableLecture> = persistentListOf(),
-    val isNewNotificationReceived: Boolean = false,
-    val showLogoutDialog: Boolean = false
+    val isNewNotificationReceived: Boolean = false
 )