Merge branch 'refs/heads/develop' into setting/#15-compose-designsystem

build-logic/src/main/java/com/teamwable/wable/plugin/AndroidFeaturePlugin.kt

@@ -11,9 +11,13 @@ class AndroidFeaturePlugin : Plugin<Project> {
         plugins.apply("com.android.library")
         configureAndroidCommonPlugin()
 
+        with(plugins) {
+            apply("androidx.navigation.safeargs")
+        }
+
         val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
         dependencies {
             "implementation"(libs.findLibrary("androidx.constraintlayout").get())
         }
     }
-}
+}

build.gradle.kts

@@ -13,6 +13,7 @@ buildscript {
         classpath(libs.kotlin.gradleplugin)
         classpath(libs.hilt.plugin)
         classpath(libs.agp)
+        classpath(libs.androidx.navigation.safe.args)
     }
 }
 

core/common/src/main/res/drawable/ic_share_bottomsheet_bar.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="46dp"
+    android:height="4dp"
+    android:viewportWidth="46"
+    android:viewportHeight="4">
+  <path
+      android:pathData="M2,2H44"
+      android:strokeLineJoin="round"
+      android:strokeWidth="4"
+      android:fillColor="#00000000"
+      android:strokeColor="#AEAEAE"
+      android:strokeLineCap="round"/>
+</vector>

core/ui/src/main/java/com/teamwable/ui/util/Constants.kt

@@ -1,2 +1,11 @@
 package com.teamwable.ui.util
+
 // 전역적으로 쓰이는 키 값 관리
+object BottomSheetTag {
+    const val PROFILE_HAMBURGER_BOTTOM_SHEET = "ProfileHamburgerBottomSheet"
+}
+
+object DialogTag {
+    const val PROFILE_DELETE_DIALOG = "ProfileDeleteDialog"
+    const val LOGOUT_DIALOG = "LogoutDialog"
+}

core/ui/src/main/res/color/sel_bottom_btn_color.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/purple_50" android:state_enabled="true" />
+    <item android:color="@color/gray_200" android:state_enabled="false" />
+</selector>

core/ui/src/main/res/drawable/shape_fill_12_rect.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="12dp" />
+</shape>

core/ui/src/main/res/drawable/shape_fill_top_16_rect.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:topLeftRadius="16dp"
+        android:topRightRadius="16dp" />
+</shape>

core/ui/src/main/res/drawable/shape_gray200_line_16_rect.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/gray_200" />
+    <corners android:radius="16dp" />
+</shape>

feature/home/src/main/res/navigation/graph_home.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/graph_home"
+    app:startDestination="@id/navigation_home">
+
+    <fragment
+        android:id="@+id/navigation_home"
+        android:name="com.teamwable.home.HomeFragment"
+        android:label="HomeFragment"
+        tools:layout="@layout/fragment_home" />
+</navigation>

feature/main/src/main/java/com/teamwable/main/MainActivity.kt

@@ -51,16 +51,26 @@ class MainActivity : AppCompatActivity() {
     private fun initBottomNavigationChangedListener(navController: NavController) {
         navController.addOnDestinationChangedListener { controller, destination, arguments ->
             handleBottomNavigationVisibility(destination)
-            if (destination.id == R.id.navigation_notification) setBadgeOnNotification(false)
+            if (destination.id == com.teamwable.notification.R.id.navigation_notification) setBadgeOnNotification(false)
         }
     }
 
     private fun handleBottomNavigationVisibility(destination: NavDestination) {
-        binding.groupMainBnv.visible(destination.id != R.id.navigation_posting)
+        if (destination.id in listOf(
+                com.teamwable.home.R.id.navigation_home,
+                com.teamwable.news.R.id.navigation_news,
+                com.teamwable.notification.R.id.navigation_notification,
+                com.teamwable.profile.R.id.navigation_profile,
+            )
+        ) {
+            binding.groupMainBnv.visible(true)
+        } else {
+            binding.groupMainBnv.visible(false)
+        }
     }
 
     private fun setBadgeOnNotification(isVisible: Boolean) {
-        binding.bnvMain.getOrCreateBadge(R.id.navigation_notification).apply {
+        binding.bnvMain.getOrCreateBadge(R.id.graph_notification).apply {
             this.isVisible = isVisible
             horizontalOffset = 1
             if (isVisible) backgroundColor = colorOf(com.teamwable.ui.R.color.error) else clearNumber()

feature/main/src/main/res/menu/menu_main_navigation.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:id="@+id/navigation_home"
+        android:id="@+id/graph_home"
         android:icon="@drawable/sel_main_bnv_home"
         android:title="@string/label_bnv_home" />
     <item
-        android:id="@+id/navigation_news"
+        android:id="@+id/graph_news"
         android:icon="@drawable/sel_main_bnv_news"
         android:title="@string/label_bnv_news" />
     <item
-        android:id="@+id/navigation_notification"
+        android:id="@+id/graph_notification"
         android:icon="@drawable/sel_main_bnv_notification"
         android:title="@string/label_bnv_notification" />
     <item
-        android:id="@+id/navigation_profile"
+        android:id="@+id/graph_profile"
         android:icon="@drawable/sel_main_bnv_profile"
         android:title="@string/label_bnv_profile" />
 </menu>

feature/main/src/main/res/navigation/graph_main.xml

@@ -1,33 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/graph_main"
-    app:startDestination="@id/navigation_home">
+    app:startDestination="@id/graph_home">
 
-    <fragment
-        android:id="@+id/navigation_home"
-        android:name="com.teamwable.home.HomeFragment"
-        android:label="HomeFragment"
-        tools:layout="@layout/fragment_home" />
-    <fragment
-        android:id="@+id/navigation_news"
-        android:name="com.teamwable.news.NewsFragment"
-        android:label="NewsFragment"
-        tools:layout="@layout/fragment_news" />
-    <fragment
-        android:id="@+id/navigation_notification"
-        android:name="com.teamwable.notification.NotificationFragment"
-        android:label="NotificationFragment"
-        tools:layout="@layout/fragment_notification" />
-    <fragment
-        android:id="@+id/navigation_profile"
-        android:name="com.teamwable.profile.ProfileFragment"
-        android:label="ProfileFragment"
-        tools:layout="@layout/fragment_profile" />
-    <fragment
-        android:id="@+id/navigation_posting"
-        android:name="com.teamwable.posting.PostingFragment"
-        android:label="PostingFragment"
-        tools:layout="@layout/fragment_posting" />
+    <include app:graph="@navigation/graph_home" />
+    <include app:graph="@navigation/graph_news" />
+    <include app:graph="@navigation/graph_notification" />
+    <include app:graph="@navigation/graph_profile" />
+    <include app:graph="@navigation/graph_posting" />
 </navigation>

feature/news/src/main/res/navigation/graph_news.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/graph_news"
+    app:startDestination="@id/navigation_news">
+
+    <fragment
+        android:id="@+id/navigation_news"
+        android:name="com.teamwable.news.NewsFragment"
+        android:label="NewsFragment"
+        tools:layout="@layout/fragment_news" />
+</navigation>

feature/notification/src/main/res/navigation/graph_notification.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/graph_notification"
+    app:startDestination="@id/navigation_notification">
+
+    <fragment
+        android:id="@+id/navigation_notification"
+        android:name="com.teamwable.notification.NotificationFragment"
+        android:label="NotificationFragment"
+        tools:layout="@layout/fragment_notification" />
+</navigation>

feature/posting/src/main/res/navigation/graph_posting.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/graph_posting"
+    app:startDestination="@id/navigation_posting">
+
+    <fragment
+        android:id="@+id/navigation_posting"
+        android:name="com.teamwable.posting.PostingFragment"
+        android:label="PostingFragment"
+        tools:layout="@layout/fragment_posting" />
+</navigation>

feature/profile/src/main/java/com/teamwable/profile/LogoutDialogFragment.kt

@@ -0,0 +1,38 @@
+package com.teamwable.profile
+
+import com.teamwable.profile.databinding.FragmentDeleteDialogBinding
+import com.teamwable.ui.base.BindingDialogFragment
+import com.teamwable.ui.extensions.dialogFragmentResize
+import com.teamwable.ui.extensions.stringOf
+
+class LogoutDialogFragment : BindingDialogFragment<FragmentDeleteDialogBinding>(R.layout.fragment_delete_dialog, FragmentDeleteDialogBinding::inflate) {
+    override fun initView() {
+        initText()
+        initCancelBtnClickListener()
+        initDeleteBtnClickListener()
+    }
+
+    private fun initText() {
+        with(binding) {
+            tvDeleteDialogTitle.text = stringOf(R.string.tv_logout_dialog_title)
+            btnDeleteDialogDelete.text = stringOf(R.string.btn_logout_dialog_delete)
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        context?.dialogFragmentResize(this, 30.0f)
+    }
+
+    private fun initCancelBtnClickListener() {
+        binding.btnDeleteDialogCancel.setOnClickListener {
+            dismiss()
+        }
+    }
+
+    private fun initDeleteBtnClickListener() {
+        binding.btnDeleteDialogDelete.setOnClickListener {
+            // Todo : 나중에 추가해야 함
+        }
+    }
+}

feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt

@@ -0,0 +1,46 @@
+package com.teamwable.profile
+
+import androidx.navigation.fragment.findNavController
+import com.teamwable.profile.databinding.FragmentProfileDeleteConfirmBinding
+import com.teamwable.ui.base.BindingFragment
+import com.teamwable.ui.extensions.colorOf
+import com.teamwable.ui.extensions.stringOf
+import com.teamwable.ui.util.DialogTag.PROFILE_DELETE_DIALOG
+
+class ProfileDeleteConfirmFragment : BindingFragment<FragmentProfileDeleteConfirmBinding>(FragmentProfileDeleteConfirmBinding::inflate) {
+    override fun initView() {
+        setAppbarText()
+        initBackBtnClickListener()
+        initCheckBoxClickListener()
+    }
+
+    private fun initCheckBoxClickListener() {
+        binding.cbProfileDeleteConfirm.setOnClickListener {
+            binding.btnProfileDeleteConfirmNext.apply {
+                isEnabled = binding.cbProfileDeleteConfirm.isChecked
+                if (isEnabled) {
+                    setTextColor(colorOf(com.teamwable.ui.R.color.white))
+                    setOnClickListener {
+                        showToProfileDeleteDialogFragment()
+                    }
+                } else {
+                    setTextColor(colorOf(com.teamwable.ui.R.color.gray_600))
+                }
+            }
+        }
+    }
+
+    private fun setAppbarText() {
+        binding.viewProfileDeleteConfirmAppbar.tvProfileAppbarTitle.text = stringOf(R.string.appbar_profile_delete_title)
+    }
+
+    private fun initBackBtnClickListener() {
+        binding.viewProfileDeleteConfirmAppbar.btnProfileAppbarBack.setOnClickListener {
+            findNavController().popBackStack()
+        }
+    }
+
+    private fun showToProfileDeleteDialogFragment() {
+        ProfileDeleteDialogFragment().show(childFragmentManager, PROFILE_DELETE_DIALOG)
+    }
+}

feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteDialogFragment.kt

@@ -0,0 +1,37 @@
+package com.teamwable.profile
+
+import com.teamwable.profile.databinding.FragmentDeleteDialogBinding
+import com.teamwable.ui.base.BindingDialogFragment
+import com.teamwable.ui.extensions.dialogFragmentResize
+import com.teamwable.ui.extensions.stringOf
+
+class ProfileDeleteDialogFragment : BindingDialogFragment<FragmentDeleteDialogBinding>(R.layout.fragment_delete_dialog, FragmentDeleteDialogBinding::inflate) {
+    override fun initView() {
+        initText()
+        initCancelBtnClickListener()
+        initDeleteBtnClickListener()
+    }
+
+    private fun initText() {
+        with(binding) {
+            tvDeleteDialogTitle.text = stringOf(R.string.tv_profile_delete_dialog_title)
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        context?.dialogFragmentResize(this, 30.0f)
+    }
+
+    private fun initCancelBtnClickListener() {
+        binding.btnDeleteDialogCancel.setOnClickListener {
+            dismiss()
+        }
+    }
+
+    private fun initDeleteBtnClickListener() {
+        binding.btnDeleteDialogDelete.setOnClickListener {
+            // Todo : 나중에 추가해야 함
+        }
+    }
+}