kuring-98 학과 편집 화면 2.0 디자인 구현

app/build.gradle

@@ -110,6 +110,7 @@ dependencies {
     implementation project(":common:thirdparty")
     implementation project(":data:domain")
     implementation project(":feature:edit_subscription")
+    implementation project(":feature:edit_departments")
     implementation project(":feature:feedback")
     implementation project(":feature:my_notification")
     implementation project(":feature:notice_storage")

app/src/main/java/com/ku_stacks/ku_ring/navigator/KuringNavigatorImpl.kt

@@ -3,16 +3,15 @@ package com.ku_stacks.ku_ring.navigator
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import androidx.fragment.app.FragmentActivity
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import com.ku_stacks.ku_ring.R
 import com.ku_stacks.ku_ring.domain.Notice
 import com.ku_stacks.ku_ring.domain.WebViewNotice
 import com.ku_stacks.ku_ring.domain.mapper.toWebViewNotice
+import com.ku_stacks.ku_ring.edit_departments.EditDepartmentsActivity
 import com.ku_stacks.ku_ring.edit_subscription.EditSubscriptionActivity
 import com.ku_stacks.ku_ring.feedback.feedback.FeedbackActivity
 import com.ku_stacks.ku_ring.main.MainActivity
-import com.ku_stacks.ku_ring.main.notice.department.fragment_subscribe.DepartmentSubscribeBottomSheet
 import com.ku_stacks.ku_ring.my_notification.NotificationActivity
 import com.ku_stacks.ku_ring.notice_detail.NoticeWebActivity
 import com.ku_stacks.ku_ring.notice_storage.NoticeStorageActivity
@@ -34,12 +33,8 @@ class KuringNavigatorImpl @Inject constructor() : KuringNavigator {
         EditSubscriptionActivity.start(activity, isFirstRun)
     }
 
-    override fun navigateToEditSubscribedDepartment(fragmentActivity: FragmentActivity) {
-        DepartmentSubscribeBottomSheet.newInstance()
-            .show(
-                fragmentActivity.supportFragmentManager,
-                DepartmentSubscribeBottomSheet::class.java.name
-            )
+    override fun navigateToEditSubscribedDepartment(activity: Activity) {
+        EditDepartmentsActivity.start(activity)
     }
 
     override fun navigateToFeedback(activity: Activity) {

common/designsystem/src/main/java/com/ku_stacks/ku_ring/designsystem/components/DepartmentItems.kt

@@ -0,0 +1,238 @@
+package com.ku_stacks.ku_ring.designsystem.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.contentColorFor
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.ku_stacks.ku_ring.designsystem.R
+import com.ku_stacks.ku_ring.designsystem.theme.KuringTheme
+import com.ku_stacks.ku_ring.designsystem.theme.Pretendard
+import com.ku_stacks.ku_ring.domain.Department
+
+@Composable
+fun DepartmentWithDeleteIcon(
+    department: Department,
+    onDeleteDepartment: (Department) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Department(
+        department = department,
+        modifier = modifier,
+    ) {
+        if (department.isSelected) {
+            SelectedDepartmentMark()
+        }
+        Spacer(modifier = Modifier.weight(1f))
+        DeleteIconButton(onClick = { onDeleteDepartment(department) })
+    }
+}
+
+@Composable
+fun DepartmentWithAddIcon(
+    department: Department,
+    onAddDepartment: (Department) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Department(
+        department = department,
+        modifier = modifier,
+    ) {
+        Spacer(modifier = Modifier.weight(1f))
+        AddIconButton(onClick = { onAddDepartment(department) })
+    }
+}
+
+@Composable
+fun DepartmentWithCheckIcon(
+    department: Department,
+    onClickDepartment: (Department) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Department(
+        department = department,
+        modifier = modifier,
+    ) {
+        Spacer(modifier = Modifier.weight(1f))
+        CheckIconButton(onClick = { onClickDepartment(department) })
+    }
+}
+
+@Composable
+private fun SelectedDepartmentMark(
+    modifier: Modifier = Modifier,
+) {
+    val shape = RoundedCornerShape(50)
+    Box(
+        modifier = modifier
+            .clip(shape)
+            .background(MaterialTheme.colors.surface, shape)
+            .border(0.5.dp, MaterialTheme.colors.primary, shape)
+            .padding(horizontal = 8.dp),
+    ) {
+        Text(
+            text = stringResource(id = R.string.selected_department),
+            style = TextStyle(
+                fontSize = 11.sp,
+                lineHeight = 17.93.sp,
+                fontFamily = Pretendard,
+                fontWeight = FontWeight(600),
+                color = MaterialTheme.colors.primary,
+            ),
+        )
+    }
+}
+
+@Composable
+private fun DeleteIconButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+) {
+    IconButton(
+        onClick = onClick,
+        modifier = modifier,
+    ) {
+        Icon(
+            painter = painterResource(id = R.drawable.ic_trashcan),
+            contentDescription = contentDescription,
+            tint = contentColorFor(backgroundColor = MaterialTheme.colors.surface),
+        )
+    }
+}
+
+@Composable
+private fun AddIconButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+) {
+    IconButton(
+        onClick = onClick,
+        modifier = modifier,
+    ) {
+        Icon(
+            painter = painterResource(id = R.drawable.ic_add),
+            contentDescription = contentDescription,
+            tint = contentColorFor(backgroundColor = MaterialTheme.colors.surface),
+        )
+    }
+}
+
+@Composable
+private fun CheckIconButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+) {
+    IconButton(
+        onClick = onClick,
+        modifier = modifier,
+    ) {
+        Icon(
+            painter = painterResource(id = R.drawable.ic_check_checked),
+            contentDescription = contentDescription,
+            tint = MaterialTheme.colors.primary,
+        )
+    }
+}
+
+@Composable
+private fun Department(
+    department: Department,
+    modifier: Modifier = Modifier,
+    contents: @Composable RowScope.() -> Unit = {},
+) {
+    val backgroundColor = MaterialTheme.colors.surface
+    Row(
+        modifier = modifier
+            .background(backgroundColor)
+            .padding(start = 24.dp, end = 12.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        DepartmentTitle(
+            departmentName = department.koreanName,
+            textColor = contentColorFor(backgroundColor),
+        )
+        contents()
+    }
+}
+
+@Composable
+private fun DepartmentTitle(
+    departmentName: String,
+    modifier: Modifier = Modifier,
+    textColor: Color = Color.Unspecified,
+) {
+    Text(
+        text = departmentName,
+        style = TextStyle(
+            fontSize = 16.sp,
+            lineHeight = 24.sp,
+            fontFamily = Pretendard,
+            fontWeight = FontWeight(500),
+            color = textColor,
+        ),
+        modifier = modifier,
+    )
+}
+
+private val previewDepartment = Department(
+    name = "smart_ict",
+    shortName = "sicte",
+    koreanName = "스마트ICT융합공학과",
+    isSubscribed = true,
+    isSelected = true,
+    isNotificationEnabled = false,
+)
+
+@LightAndDarkPreview
+@Composable
+private fun DepartmentItemsPreview() {
+    KuringTheme {
+        Column(
+            modifier = Modifier
+                .background(Color.Gray)
+                .fillMaxWidth(),
+        ) {
+            DepartmentWithDeleteIcon(
+                department = previewDepartment,
+                onDeleteDepartment = {},
+                modifier = Modifier.fillMaxWidth(),
+            )
+            DepartmentWithAddIcon(
+                department = previewDepartment,
+                onAddDepartment = {},
+                modifier = Modifier.fillMaxWidth(),
+            )
+            DepartmentWithCheckIcon(
+                department = previewDepartment,
+                onClickDepartment = {},
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+    }
+}