Merge branch 'develop' into fix/#64-errorcode-extraction

Team-Going · Jan 10, 2024 · fa004bb · fa004bb
2 parents b4058d0 + 70e0c49
commit fa004bb
Show file tree

Hide file tree

Showing 17 changed files with 687 additions and 17 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,11 +21,13 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <!-- Redirect URI: "kakao${NATIVE_APP_KEY}://oauth" -->
-                <data android:host="oauth"
+                <data
+                    android:host="oauth"
                     android:scheme="kakao${NATIVE_APP_KEY}" />
             </intent-filter>
         </activity>
@@ -90,7 +92,7 @@
         <activity
             android:name="com.going.presentation.starttrip.createtrip.CreateTripActivity"
             android:exported="false"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
 
         <activity
             android:name="com.going.presentation.starttrip.StartTripSplashActivity"
@@ -120,7 +122,12 @@
         <activity
             android:name="com.going.presentation.starttrip.finishtrip.FinishTripActivity"
             android:exported="false"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.going.presentation.setting.SettingActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
 
         <activity
             android:name="com.going.presentation.profile.ProfileActivity"

diff --git a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagActivity.kt b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagActivity.kt
@@ -26,7 +26,6 @@ class PreferenceTagActivity :
 
     }
 
-
     private fun initAdapter() {
         _adapter = PreferenceTagAdapter(this, this)
         binding.rvPreferenceTag.adapter = adapter

diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt
@@ -0,0 +1,87 @@
+package com.going.presentation.setting
+
+import android.os.Bundle
+import com.going.presentation.R
+import com.going.presentation.databinding.ActivitySettingBinding
+import com.going.ui.base.BaseActivity
+import com.going.ui.extension.setOnSingleClickListener
+
+class SettingActivity : BaseActivity<ActivitySettingBinding>(R.layout.activity_setting) {
+
+    private var quitDialog: SettingQuitDialogFragment? = null
+    private var logoutDialog: SettingLogoutDialogFragment? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        initProfileClickListener()
+        initInquireClickListener()
+        initPolicyClickListener()
+        initAboutDooripClickListener()
+        initLogoutClickListener()
+        initQuitClickListener()
+        setVersionCode()
+
+    }
+
+    private fun initProfileClickListener() {
+        binding.btnSettingProfileEnter.setOnSingleClickListener {
+
+        }
+    }
+
+    private fun initInquireClickListener() {
+        binding.btnSettingInquireEnter.setOnSingleClickListener {
+
+        }
+    }
+
+    private fun initPolicyClickListener() {
+        binding.btnSettingPolicyEnter.setOnSingleClickListener {
+
+        }
+    }
+
+    private fun initAboutDooripClickListener() {
+        binding.btnSettingAboutDooripEnter.setOnSingleClickListener {
+
+        }
+    }
+
+    private fun initLogoutClickListener() {
+        binding.btnSettingLogoutEnter.setOnSingleClickListener {
+            showLogoutAlertDialog()
+        }
+    }
+
+    private fun initQuitClickListener() {
+        binding.btnSettingQuit.setOnSingleClickListener {
+            showQuitAlertDialog()
+        }
+    }
+
+    private fun showLogoutAlertDialog() {
+        logoutDialog = SettingLogoutDialogFragment()
+        logoutDialog?.show(supportFragmentManager, logoutDialog?.tag)
+    }
+
+    private fun showQuitAlertDialog() {
+        quitDialog = SettingQuitDialogFragment()
+        quitDialog?.show(supportFragmentManager, quitDialog?.tag)
+    }
+
+    private fun setVersionCode() {
+        binding.tvSettingShowServiceVersion.text = VERSION_CODE
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        if (logoutDialog?.isAdded == true) logoutDialog?.dismiss()
+        if (quitDialog?.isAdded == true) quitDialog?.dismiss()
+    }
+
+    companion object {
+        private const val VERSION_CODE = "v1.0"
+    }
+
+}
diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingLogoutDialogFragment.kt b/presentation/src/main/java/com/going/presentation/setting/SettingLogoutDialogFragment.kt
@@ -0,0 +1,44 @@
+package com.going.presentation.setting
+
+import android.os.Bundle
+import android.view.View
+import android.view.WindowManager
+import com.going.presentation.R
+import com.going.presentation.databinding.FragmentSettingLogoutDialogBinding
+import com.going.ui.base.BaseDialog
+import com.going.ui.extension.setOnSingleClickListener
+
+class SettingLogoutDialogFragment :
+    BaseDialog<FragmentSettingLogoutDialogBinding>(R.layout.fragment_setting_logout_dialog) {
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initNegativeClickListener()
+        initPositiveClickListener()
+
+    }
+
+    override fun onStart() {
+        super.onStart()
+        dialog?.window?.apply {
+            setLayout(
+                WindowManager.LayoutParams.MATCH_PARENT,
+                WindowManager.LayoutParams.WRAP_CONTENT,
+            )
+        }
+    }
+
+    private fun initPositiveClickListener() {
+        binding.tvDialogPositive.setOnSingleClickListener {
+            // 로그아웃 버튼 눌렀을 때의 로직
+        }
+    }
+
+    private fun initNegativeClickListener() {
+        binding.btnDialogNegative.setOnSingleClickListener {
+            dismiss()
+        }
+    }
+
+}
diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingQuitDialogFragment.kt b/presentation/src/main/java/com/going/presentation/setting/SettingQuitDialogFragment.kt
@@ -0,0 +1,44 @@
+package com.going.presentation.setting
+
+import android.os.Bundle
+import android.view.View
+import android.view.WindowManager
+import com.going.presentation.R
+import com.going.presentation.databinding.FragmentSettingQuitDialogBinding
+import com.going.ui.base.BaseDialog
+import com.going.ui.extension.setOnSingleClickListener
+
+class SettingQuitDialogFragment :
+    BaseDialog<FragmentSettingQuitDialogBinding>(R.layout.fragment_setting_quit_dialog) {
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initNegativeClickListener()
+        initPositiveClickListener()
+
+    }
+
+    override fun onStart() {
+        super.onStart()
+        dialog?.window?.apply {
+            setLayout(
+                WindowManager.LayoutParams.MATCH_PARENT,
+                WindowManager.LayoutParams.WRAP_CONTENT,
+            )
+        }
+    }
+
+    private fun initPositiveClickListener() {
+        binding.tvDialogPositive.setOnSingleClickListener {
+            dismiss()
+        }
+    }
+
+    private fun initNegativeClickListener() {
+        // 탈퇴하기 버튼을 눌렀을 때의 로직
+    }
+
+}
+
+
diff --git a/presentation/src/main/res/drawable/ic_enter_large.xml b/presentation/src/main/res/drawable/ic_enter_large.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M10,18L16,12.5L10,7"
+      android:strokeLineJoin="round"
+      android:fillColor="#00000000"
+      android:strokeColor="#9093A8"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_unsubscribe.xml b/presentation/src/main/res/drawable/ic_unsubscribe.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <group>
+    <clip-path
+        android:pathData="M0,0h16v16h-16z"/>
+    <path
+        android:pathData="M-53.277,18.417L-61.734,9.927L-53.271,1.463L-51.668,-0.14V20.032V25.925L-48.334,29.282V39.138C-43.177,50.552 -34.349,59.953 -23.355,65.834H-12.04L-7.075,70.834H9.999V65.834H15.141V64.167H41.947L46.947,59.167H64.999V64.167H41.947L33.614,72.5H3.332C0.078,72.5 -3.112,72.226 -6.216,71.699L-7.075,70.834H-10.363C-14.939,69.698 -19.295,68.006 -23.355,65.834H-48.334V39.138C-49.721,36.071 -50.841,32.858 -51.668,29.529V25.925L-52.599,24.987C-52.948,22.835 -53.177,20.643 -53.277,18.417Z"
+        android:fillColor="#9093A8"/>
+    <path
+        android:pathData="M10.599,5.101C10.543,5.045 10.453,5.045 10.397,5.101L9.894,5.604C9.838,5.66 9.838,5.75 9.894,5.806L10.84,6.756C10.93,6.846 10.866,7 10.739,7H6.142C6.063,7 5.999,7.064 5.999,7.143V7.857C5.999,7.936 6.063,8 6.142,8H10.738C10.865,8 10.929,8.154 10.839,8.244L9.894,9.189C9.838,9.245 9.838,9.335 9.893,9.391L10.397,9.898C10.453,9.954 10.543,9.955 10.599,9.899L12.896,7.601C12.952,7.545 12.952,7.455 12.896,7.399L10.599,5.101ZM4,4.143C4,4.064 4.064,4 4.143,4H7.856C7.935,4 7.999,3.936 7.999,3.857V3.143C7.999,3.064 7.935,3 7.856,3H4C3.45,3 3,3.45 3,4V11C3,11.55 3.45,12 4,12H7.856C7.935,12 7.999,11.936 7.999,11.857V11.143C7.999,11.064 7.935,11 7.856,11H4.143C4.064,11 4,10.936 4,10.857V4.143Z"
+        android:fillColor="#9093A8"/>
+  </group>
+</vector>
diff --git a/presentation/src/main/res/drawable/shape_rect_2_white000_fill.xml b/presentation/src/main/res/drawable/shape_rect_2_white000_fill.xml
@@ -0,0 +1,6 @@
+<?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_000" />
+    <corners android:radius="2dp" />
+</shape>
diff --git a/presentation/src/main/res/drawable/shape_rect_6_white000_fill.xml b/presentation/src/main/res/drawable/shape_rect_6_white000_fill.xml
@@ -0,0 +1,6 @@
+<?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_000" />
+    <corners android:radius="6dp" />
+</shape>
diff --git a/presentation/src/main/res/layout/activity_preference_tag.xml b/presentation/src/main/res/layout/activity_preference_tag.xml
@@ -14,7 +14,7 @@
         tools:context=".preferencetag.PreferenceTagActivity">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/layout_preference_tag"
+            android:id="@+id/toolbar_preference_tag"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:background="@drawable/layer_list_preference_tag_gray200_line"
@@ -56,7 +56,7 @@
             app:layout_constraintBottom_toTopOf="@id/btn_preference_start"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/layout_preference_tag"
+            app:layout_constraintTop_toBottomOf="@id/toolbar_preference_tag"
             tools:listitem="@layout/item_preference_tag" />
 
         <ImageView