From af9295606d1dc0e91f3eb4b4bbb85bb2c772aeef Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 9 Jan 2024 23:41:29 +0900 Subject: [PATCH 01/16] =?UTF-8?q?[MOD/#44]=20tools=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preferencetag/PreferenceTagActivity.kt | 1 - .../res/layout/activity_trip_dash_board.xml | 4 ++-- .../res/layout/item_dash_board_ongoing.xml | 18 +++++++++--------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagActivity.kt b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagActivity.kt index c39ce00e..aa826a97 100644 --- 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/res/layout/activity_trip_dash_board.xml b/presentation/src/main/res/layout/activity_trip_dash_board.xml index f07c4091..d3a2495a 100644 --- a/presentation/src/main/res/layout/activity_trip_dash_board.xml +++ b/presentation/src/main/res/layout/activity_trip_dash_board.xml @@ -77,10 +77,10 @@ android:background="@drawable/sel_rounded_corner_button" android:backgroundTint="@color/gray_500" android:outlineProvider="none" + android:text="@string/dashboard_btn_create_trip" android:textColor="@color/white_000" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - tools:text="@string/dashboard_btn_create_trip" /> + app:layout_constraintStart_toStartOf="parent" /> diff --git a/presentation/src/main/res/layout/item_dash_board_ongoing.xml b/presentation/src/main/res/layout/item_dash_board_ongoing.xml index be503a15..a3544899 100644 --- a/presentation/src/main/res/layout/item_dash_board_ongoing.xml +++ b/presentation/src/main/res/layout/item_dash_board_ongoing.xml @@ -23,9 +23,9 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="16dp" - android:text="굉굉이들이랑 합숙" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + tools:text="굉굉이들이랑 합숙" /> + app:layout_constraintTop_toBottomOf="@id/tv_dashboard_trip_title" + tools:text="2024 .03 .24" /> + app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_dash" + tools:text="2024 .03 .31" /> Date: Wed, 10 Jan 2024 00:11:22 +0900 Subject: [PATCH 02/16] =?UTF-8?q?[ADD/#51]=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../going/presentation/setting/SettingActivity.kt | 14 ++++++++++++++ .../src/main/res/layout/activity_setting.xml | 15 +++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt create mode 100644 presentation/src/main/res/layout/activity_setting.xml diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt new file mode 100644 index 00000000..ecb096cd --- /dev/null +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -0,0 +1,14 @@ +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 + +class SettingActivity : BaseActivity(R.layout.activity_setting) { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + } + +} \ No newline at end of file diff --git a/presentation/src/main/res/layout/activity_setting.xml b/presentation/src/main/res/layout/activity_setting.xml new file mode 100644 index 00000000..0a6b1d9b --- /dev/null +++ b/presentation/src/main/res/layout/activity_setting.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + From 9e67ffab8c3c9fdbb1a59b0f3145522d3336869f Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 10 Jan 2024 01:09:52 +0900 Subject: [PATCH 03/16] =?UTF-8?q?[UI/#51]=20=EC=84=A4=EC=A0=95=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 13 +- .../src/main/res/drawable/ic_enter_large.xml | 13 + .../drawable/shape_rect6_white000_fill.xml | 6 + .../res/layout/activity_preference_tag.xml | 4 +- .../src/main/res/layout/activity_setting.xml | 256 +++++++++++++++++- presentation/src/main/res/values/strings.xml | 9 + 6 files changed, 295 insertions(+), 6 deletions(-) create mode 100644 presentation/src/main/res/drawable/ic_enter_large.xml create mode 100644 presentation/src/main/res/drawable/shape_rect6_white000_fill.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 313da73a..9fd89466 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,11 +21,13 @@ android:exported="true"> + - @@ -90,7 +92,7 @@ + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + + diff --git a/presentation/src/main/res/drawable/ic_enter_large.xml b/presentation/src/main/res/drawable/ic_enter_large.xml new file mode 100644 index 00000000..0c19b3d9 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_enter_large.xml @@ -0,0 +1,13 @@ + + + diff --git a/presentation/src/main/res/drawable/shape_rect6_white000_fill.xml b/presentation/src/main/res/drawable/shape_rect6_white000_fill.xml new file mode 100644 index 00000000..77ed6fbc --- /dev/null +++ b/presentation/src/main/res/drawable/shape_rect6_white000_fill.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/activity_preference_tag.xml b/presentation/src/main/res/layout/activity_preference_tag.xml index 215bbeec..a6f18065 100644 --- 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"> + android:layout_height="match_parent" + android:background="@color/gray_50"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 7b3d0aa3..1cd540e6 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -112,4 +112,13 @@ 입장하기 초대코드가 복사되었어요. + + 설정 + 프로필 + 문의하기 + 서비스 버전 + 약관 및 정책 + About doorip + 로그아웃 + From 5cd269b4cd22aaee1f8d24d85a2fe84d44afb00f Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 10 Jan 2024 01:56:38 +0900 Subject: [PATCH 04/16] =?UTF-8?q?[FEAT/#51]=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=ED=81=B4=EB=A6=AD=20=EB=A6=AC=EC=8A=A4=EB=84=88=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/setting/SettingActivity.kt | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index ecb096cd..ff734177 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -4,11 +4,57 @@ 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 +import com.skydoves.balloon.balloon class SettingActivity : BaseActivity(R.layout.activity_setting) { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + + initProfileClickListener() + initInquireClickListener() + initServiceVersionClickListener() + initPolicyClickListener() + initAboutDoorip() + initLogoutClickListener() + + } + + private fun initProfileClickListener(){ + binding.btnSettingProfileEnter.setOnSingleClickListener { + + } + } + + private fun initInquireClickListener(){ + binding.btnSettingInquireEnter.setOnSingleClickListener { + + } + } + + private fun initServiceVersionClickListener(){ + binding.btnSettingServiceVersionEnter.setOnSingleClickListener { + + } + } + + private fun initPolicyClickListener(){ + binding.btnSettingPolicyEnter.setOnSingleClickListener { + + } + } + + private fun initAboutDoorip(){ + binding.btnSettingAboutDooripEnter.setOnSingleClickListener { + + } + } + + private fun initLogoutClickListener(){ + binding.btnSettingLogoutEnter.setOnSingleClickListener { + + } } } \ No newline at end of file From aaba0be5895fd95de9e8cb76adf632a8a3a896f5 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 10 Jan 2024 03:59:41 +0900 Subject: [PATCH 05/16] =?UTF-8?q?[UI/#51]=20=EC=BB=A4=EC=8A=A4=ED=85=80=20?= =?UTF-8?q?UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/setting/CustomDialog.kt | 55 +++++++++++++++ .../presentation/setting/SettingActivity.kt | 25 ++++--- .../drawable/shape_rect2_white000_fill.xml | 6 ++ .../src/main/res/layout/custom_dialog.xml | 68 +++++++++++++++++++ presentation/src/main/res/values/strings.xml | 6 +- 5 files changed, 151 insertions(+), 9 deletions(-) create mode 100644 presentation/src/main/java/com/going/presentation/setting/CustomDialog.kt create mode 100644 presentation/src/main/res/drawable/shape_rect2_white000_fill.xml create mode 100644 presentation/src/main/res/layout/custom_dialog.xml diff --git a/presentation/src/main/java/com/going/presentation/setting/CustomDialog.kt b/presentation/src/main/java/com/going/presentation/setting/CustomDialog.kt new file mode 100644 index 00000000..abe9113a --- /dev/null +++ b/presentation/src/main/java/com/going/presentation/setting/CustomDialog.kt @@ -0,0 +1,55 @@ +package com.going.presentation.setting + +import android.app.Dialog +import android.view.Window + +import androidx.appcompat.app.AppCompatActivity + + +//class CustomDialog(private val context : AppCompatActivity) { +// +// private lateinit var binding : MyDialogBinding +// private val dlg = Dialog(context) //부모 액티비티의 context 가 들어감 +// +// private lateinit var listener : MyDialogOKClickedListener +// +// fun show(content : String) { +// binding = MyDialogBinding.inflate(context.layoutInflater) +// +// dlg.requestWindowFeature(Window.FEATURE_NO_TITLE) //타이틀바 제거 +// dlg.setContentView(binding.root) //다이얼로그에 사용할 xml 파일을 불러옴 +// dlg.setCancelable(false) //다이얼로그의 바깥 화면을 눌렀을 때 다이얼로그가 닫히지 않도록 함 +// +// +// binding.content.text = content //부모 액티비에서 전달 받은 텍스트 세팅 +// +// //ok 버튼 동작 +// binding.ok.setOnClickListener { +// +// listener.onOKClicked("확인을 눌렀습니다.") +// +// dlg.dismiss() +// } +// +// //cancel 버튼 동작 +// binding.cancel.setOnClickListener { +// dlg.dismiss() +// } +// +// dlg.show() +// } +// +// fun setOnOKClickedListener(listener: (String) -> Unit) { +// this.listener = object: MyDialogOKClickedListener { +// override fun onOKClicked(content: String) { +// listener(content) +// } +// } +// } +// +// +// interface MyDialogOKClickedListener { +// fun onOKClicked(content : String) +// } +// +//} diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index ff734177..9d9b2704 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -1,5 +1,6 @@ package com.going.presentation.setting +import android.app.AlertDialog import android.os.Bundle import com.going.presentation.R import com.going.presentation.databinding.ActivitySettingBinding @@ -14,7 +15,6 @@ class SettingActivity : BaseActivity(R.layout.activity_s initProfileClickListener() initInquireClickListener() - initServiceVersionClickListener() initPolicyClickListener() initAboutDoorip() initLogoutClickListener() @@ -33,12 +33,6 @@ class SettingActivity : BaseActivity(R.layout.activity_s } } - private fun initServiceVersionClickListener(){ - binding.btnSettingServiceVersionEnter.setOnSingleClickListener { - - } - } - private fun initPolicyClickListener(){ binding.btnSettingPolicyEnter.setOnSingleClickListener { @@ -53,8 +47,23 @@ class SettingActivity : BaseActivity(R.layout.activity_s private fun initLogoutClickListener(){ binding.btnSettingLogoutEnter.setOnSingleClickListener { - + showLogoutAlertDialog() } } + private fun showLogoutAlertDialog() = + AlertDialog.Builder(this) + .setTitle("정말 탈퇴하시겠어요?") + .setMessage("탈퇴시, 정보가 모두 없어져요.") + . setNegativeButton("탈퇴하기", + { dialog, id -> + // User cancelled the dialog + }) + .setPositiveButton( + "남아있기", + ) { _, _ -> + finishAffinity() + } + .create() + .show() } \ No newline at end of file diff --git a/presentation/src/main/res/drawable/shape_rect2_white000_fill.xml b/presentation/src/main/res/drawable/shape_rect2_white000_fill.xml new file mode 100644 index 00000000..3e32d1b3 --- /dev/null +++ b/presentation/src/main/res/drawable/shape_rect2_white000_fill.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/custom_dialog.xml b/presentation/src/main/res/layout/custom_dialog.xml new file mode 100644 index 00000000..204cd5e7 --- /dev/null +++ b/presentation/src/main/res/layout/custom_dialog.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 1cd540e6..0cf8e635 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -112,7 +112,7 @@ 입장하기 초대코드가 복사되었어요. - + 설정 프로필 문의하기 @@ -120,5 +120,9 @@ 약관 및 정책 About doorip 로그아웃 + 정말 탈퇴하시겠어요? + 탈퇴시, 정보가 모두 없어져요. + 탈퇴하기 + 남아있기 From ce5e1193d441da6afa021653dc1feac76c40ecf8 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 10 Jan 2024 05:21:27 +0900 Subject: [PATCH 06/16] =?UTF-8?q?[FEAT/#51]=20=EC=BB=A4=EC=8A=A4=ED=85=80?= =?UTF-8?q?=20=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/setting/CustomDialog.kt | 55 ------------------- .../setting/CustomDialogSettingFragment.kt | 38 +++++++++++++ .../presentation/setting/SettingActivity.kt | 33 +++++------ ...xml => fragment_custom_dialog_setting.xml} | 11 +++- 4 files changed, 60 insertions(+), 77 deletions(-) delete mode 100644 presentation/src/main/java/com/going/presentation/setting/CustomDialog.kt create mode 100644 presentation/src/main/java/com/going/presentation/setting/CustomDialogSettingFragment.kt rename presentation/src/main/res/layout/{custom_dialog.xml => fragment_custom_dialog_setting.xml} (94%) diff --git a/presentation/src/main/java/com/going/presentation/setting/CustomDialog.kt b/presentation/src/main/java/com/going/presentation/setting/CustomDialog.kt deleted file mode 100644 index abe9113a..00000000 --- a/presentation/src/main/java/com/going/presentation/setting/CustomDialog.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.going.presentation.setting - -import android.app.Dialog -import android.view.Window - -import androidx.appcompat.app.AppCompatActivity - - -//class CustomDialog(private val context : AppCompatActivity) { -// -// private lateinit var binding : MyDialogBinding -// private val dlg = Dialog(context) //부모 액티비티의 context 가 들어감 -// -// private lateinit var listener : MyDialogOKClickedListener -// -// fun show(content : String) { -// binding = MyDialogBinding.inflate(context.layoutInflater) -// -// dlg.requestWindowFeature(Window.FEATURE_NO_TITLE) //타이틀바 제거 -// dlg.setContentView(binding.root) //다이얼로그에 사용할 xml 파일을 불러옴 -// dlg.setCancelable(false) //다이얼로그의 바깥 화면을 눌렀을 때 다이얼로그가 닫히지 않도록 함 -// -// -// binding.content.text = content //부모 액티비에서 전달 받은 텍스트 세팅 -// -// //ok 버튼 동작 -// binding.ok.setOnClickListener { -// -// listener.onOKClicked("확인을 눌렀습니다.") -// -// dlg.dismiss() -// } -// -// //cancel 버튼 동작 -// binding.cancel.setOnClickListener { -// dlg.dismiss() -// } -// -// dlg.show() -// } -// -// fun setOnOKClickedListener(listener: (String) -> Unit) { -// this.listener = object: MyDialogOKClickedListener { -// override fun onOKClicked(content: String) { -// listener(content) -// } -// } -// } -// -// -// interface MyDialogOKClickedListener { -// fun onOKClicked(content : String) -// } -// -//} diff --git a/presentation/src/main/java/com/going/presentation/setting/CustomDialogSettingFragment.kt b/presentation/src/main/java/com/going/presentation/setting/CustomDialogSettingFragment.kt new file mode 100644 index 00000000..29bffed7 --- /dev/null +++ b/presentation/src/main/java/com/going/presentation/setting/CustomDialogSettingFragment.kt @@ -0,0 +1,38 @@ +package com.going.presentation.setting + + +import android.os.Bundle +import android.view.View +import android.view.WindowManager +import androidx.appcompat.app.AppCompatActivity +import com.going.presentation.R +import com.going.presentation.databinding.FragmentCustomDialogSettingBinding +import com.going.ui.base.BaseDialog + + +class CustomDialogSettingFragment : + BaseDialog(R.layout.fragment_custom_dialog_setting) { + + override fun onStart() { + super.onStart() + dialog?.window?.apply { + setLayout( + WindowManager.LayoutParams.MATCH_PARENT, + WindowManager.LayoutParams.MATCH_PARENT, + ) + setBackgroundDrawableResource(R.color.transparent_50) + setStatusBarTransparent() + } + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + // 탈퇴 버튼, 남아있기 버튼 눌렀을 때의 처리 + } + + private fun setStatusBarTransparent() { + + } +} + + diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index 9d9b2704..efc29390 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -2,6 +2,7 @@ package com.going.presentation.setting import android.app.AlertDialog import android.os.Bundle +import android.view.View import com.going.presentation.R import com.going.presentation.databinding.ActivitySettingBinding import com.going.ui.base.BaseActivity @@ -10,6 +11,8 @@ import com.skydoves.balloon.balloon class SettingActivity : BaseActivity(R.layout.activity_setting) { + private lateinit var settingDialog: CustomDialogSettingFragment + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -21,49 +24,39 @@ class SettingActivity : BaseActivity(R.layout.activity_s } - private fun initProfileClickListener(){ + private fun initProfileClickListener() { binding.btnSettingProfileEnter.setOnSingleClickListener { } } - private fun initInquireClickListener(){ + private fun initInquireClickListener() { binding.btnSettingInquireEnter.setOnSingleClickListener { } } - private fun initPolicyClickListener(){ + private fun initPolicyClickListener() { binding.btnSettingPolicyEnter.setOnSingleClickListener { } } - private fun initAboutDoorip(){ + private fun initAboutDoorip() { binding.btnSettingAboutDooripEnter.setOnSingleClickListener { } } - private fun initLogoutClickListener(){ + private fun initLogoutClickListener() { binding.btnSettingLogoutEnter.setOnSingleClickListener { showLogoutAlertDialog() } } - private fun showLogoutAlertDialog() = - AlertDialog.Builder(this) - .setTitle("정말 탈퇴하시겠어요?") - .setMessage("탈퇴시, 정보가 모두 없어져요.") - . setNegativeButton("탈퇴하기", - { dialog, id -> - // User cancelled the dialog - }) - .setPositiveButton( - "남아있기", - ) { _, _ -> - finishAffinity() - } - .create() - .show() + + private fun showLogoutAlertDialog() { + settingDialog = CustomDialogSettingFragment() + settingDialog.show(supportFragmentManager, settingDialog.tag ) + } } \ No newline at end of file diff --git a/presentation/src/main/res/layout/custom_dialog.xml b/presentation/src/main/res/layout/fragment_custom_dialog_setting.xml similarity index 94% rename from presentation/src/main/res/layout/custom_dialog.xml rename to presentation/src/main/res/layout/fragment_custom_dialog_setting.xml index 204cd5e7..33aa41ea 100644 --- a/presentation/src/main/res/layout/custom_dialog.xml +++ b/presentation/src/main/res/layout/fragment_custom_dialog_setting.xml @@ -1,15 +1,21 @@ + + + + + + android:layout_height="match_parent"> @@ -66,3 +72,4 @@ + From cb6a9ab04ff0c965a2c8bf56ec4f986308f5c928 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 10 Jan 2024 05:59:36 +0900 Subject: [PATCH 07/16] =?UTF-8?q?[FEAT/#51]=20=EC=83=81=ED=83=9C=EB=B0=94?= =?UTF-8?q?=20=ED=88=AC=EB=AA=85=EB=8F=84=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/setting/SettingActivity.kt | 11 +- ...ment.kt => SettingCustomDialogFragment.kt} | 10 +- .../src/main/res/layout/activity_setting.xml | 5 +- .../layout/fragment_custom_dialog_setting.xml | 116 +++++++++--------- 4 files changed, 68 insertions(+), 74 deletions(-) rename presentation/src/main/java/com/going/presentation/setting/{CustomDialogSettingFragment.kt => SettingCustomDialogFragment.kt} (76%) diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index efc29390..bc6ee056 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -1,17 +1,15 @@ package com.going.presentation.setting -import android.app.AlertDialog import android.os.Bundle -import android.view.View +import androidx.core.content.ContextCompat import com.going.presentation.R import com.going.presentation.databinding.ActivitySettingBinding import com.going.ui.base.BaseActivity import com.going.ui.extension.setOnSingleClickListener -import com.skydoves.balloon.balloon class SettingActivity : BaseActivity(R.layout.activity_setting) { - private lateinit var settingDialog: CustomDialogSettingFragment + private lateinit var settingDialog: SettingCustomDialogFragment override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -55,8 +53,9 @@ class SettingActivity : BaseActivity(R.layout.activity_s } private fun showLogoutAlertDialog() { - settingDialog = CustomDialogSettingFragment() - settingDialog.show(supportFragmentManager, settingDialog.tag ) + settingDialog = SettingCustomDialogFragment() + settingDialog.show(supportFragmentManager, settingDialog.tag) + window.statusBarColor = ContextCompat.getColor(this, R.color.transparent_50) } } \ No newline at end of file diff --git a/presentation/src/main/java/com/going/presentation/setting/CustomDialogSettingFragment.kt b/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt similarity index 76% rename from presentation/src/main/java/com/going/presentation/setting/CustomDialogSettingFragment.kt rename to presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt index 29bffed7..d17cca7f 100644 --- a/presentation/src/main/java/com/going/presentation/setting/CustomDialogSettingFragment.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt @@ -1,16 +1,14 @@ package com.going.presentation.setting - import android.os.Bundle import android.view.View import android.view.WindowManager -import androidx.appcompat.app.AppCompatActivity import com.going.presentation.R import com.going.presentation.databinding.FragmentCustomDialogSettingBinding import com.going.ui.base.BaseDialog -class CustomDialogSettingFragment : +class SettingCustomDialogFragment : BaseDialog(R.layout.fragment_custom_dialog_setting) { override fun onStart() { @@ -21,18 +19,14 @@ class CustomDialogSettingFragment : WindowManager.LayoutParams.MATCH_PARENT, ) setBackgroundDrawableResource(R.color.transparent_50) - setStatusBarTransparent() } } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - // 탈퇴 버튼, 남아있기 버튼 눌렀을 때의 처리 + // 탈퇴 버튼, 남아있기 버튼 눌렀을 때의 처리 } - private fun setStatusBarTransparent() { - - } } diff --git a/presentation/src/main/res/layout/activity_setting.xml b/presentation/src/main/res/layout/activity_setting.xml index ac311e1b..b70ca411 100644 --- a/presentation/src/main/res/layout/activity_setting.xml +++ b/presentation/src/main/res/layout/activity_setting.xml @@ -3,7 +3,6 @@ - + app:layout_constraintTop_toTopOf="parent" + tools:text="v1.0" /> diff --git a/presentation/src/main/res/layout/fragment_custom_dialog_setting.xml b/presentation/src/main/res/layout/fragment_custom_dialog_setting.xml index 33aa41ea..35734d78 100644 --- a/presentation/src/main/res/layout/fragment_custom_dialog_setting.xml +++ b/presentation/src/main/res/layout/fragment_custom_dialog_setting.xml @@ -4,72 +4,74 @@ - - + android:layout_height="match_parent"> - - - + app:layout_constraintTop_toTopOf="parent"> - + - + + + + + + + - From 23a9adb6e959ae6fa3c14d42b4c5fa85f0b1566f Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 10 Jan 2024 06:34:35 +0900 Subject: [PATCH 08/16] =?UTF-8?q?[FEAT/#51]=20=EC=83=81=ED=83=9C=EB=B0=94?= =?UTF-8?q?=20=ED=88=AC=EB=AA=85=EB=8F=84=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/setting/SettingActivity.kt | 4 ++- .../setting/SettingCustomDialogFragment.kt | 23 +++++++++++--- .../src/main/res/drawable/ic_unsubscribe.xml | 16 ++++++++++ .../src/main/res/layout/activity_setting.xml | 31 +++++++++++++++++++ presentation/src/main/res/values/colors.xml | 1 + presentation/src/main/res/values/strings.xml | 1 + 6 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 presentation/src/main/res/drawable/ic_unsubscribe.xml diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index bc6ee056..b3ad876d 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -1,5 +1,6 @@ package com.going.presentation.setting +import android.graphics.drawable.ColorDrawable import android.os.Bundle import androidx.core.content.ContextCompat import com.going.presentation.R @@ -55,7 +56,8 @@ class SettingActivity : BaseActivity(R.layout.activity_s private fun showLogoutAlertDialog() { settingDialog = SettingCustomDialogFragment() settingDialog.show(supportFragmentManager, settingDialog.tag) - window.statusBarColor = ContextCompat.getColor(this, R.color.transparent_50) + window.statusBarColor = ContextCompat.getColor(this, R.color.transparent_60) } + } \ No newline at end of file diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt b/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt index d17cca7f..1fcb8141 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt @@ -3,14 +3,21 @@ package com.going.presentation.setting import android.os.Bundle import android.view.View import android.view.WindowManager +import androidx.core.content.ContextCompat import com.going.presentation.R import com.going.presentation.databinding.FragmentCustomDialogSettingBinding import com.going.ui.base.BaseDialog - +import com.going.ui.extension.setOnSingleClickListener class SettingCustomDialogFragment : BaseDialog(R.layout.fragment_custom_dialog_setting) { + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + initNegativeClickListener() + initPositiveClickListener() + } + override fun onStart() { super.onStart() dialog?.window?.apply { @@ -18,13 +25,19 @@ class SettingCustomDialogFragment : WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT, ) - setBackgroundDrawableResource(R.color.transparent_50) + setBackgroundDrawableResource(R.color.transparent_60) } } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - // 탈퇴 버튼, 남아있기 버튼 눌렀을 때의 처리 + private fun initPositiveClickListener(){ + binding.tvDialogPositive.setOnSingleClickListener { + activity?.window?.statusBarColor = ContextCompat.getColor(requireContext(), R.color.white_000) + dismiss() + } + } + + private fun initNegativeClickListener(){ + } } diff --git a/presentation/src/main/res/drawable/ic_unsubscribe.xml b/presentation/src/main/res/drawable/ic_unsubscribe.xml new file mode 100644 index 00000000..4156c17b --- /dev/null +++ b/presentation/src/main/res/drawable/ic_unsubscribe.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/presentation/src/main/res/layout/activity_setting.xml b/presentation/src/main/res/layout/activity_setting.xml index b70ca411..b59821e0 100644 --- a/presentation/src/main/res/layout/activity_setting.xml +++ b/presentation/src/main/res/layout/activity_setting.xml @@ -263,6 +263,37 @@ + + + + + + diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml index 62ecdbeb..461a7e5b 100644 --- a/presentation/src/main/res/values/colors.xml +++ b/presentation/src/main/res/values/colors.xml @@ -24,6 +24,7 @@ #00000000 #B3000000 + #99000000 #80000000 #4D000000 diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 32781a18..ddaf3bd3 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -131,5 +131,6 @@ 탈퇴시, 정보가 모두 없어져요. 탈퇴하기 남아있기 + 회원탈퇴 From aa78d4fa69b642c3247b5afa4d24ea9515e1186d Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 10 Jan 2024 07:04:10 +0900 Subject: [PATCH 09/16] =?UTF-8?q?[FEAT/#51]=20=EC=8B=9C=EA=B0=84=EC=B0=A8?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/setting/SettingActivity.kt | 16 +++++++++++++++- .../setting/SettingCustomDialogFragment.kt | 17 +++++++++++++---- .../src/main/res/layout/activity_setting.xml | 6 +++--- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index b3ad876d..294dd1e7 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -7,6 +7,10 @@ import com.going.presentation.R import com.going.presentation.databinding.ActivitySettingBinding import com.going.ui.base.BaseActivity import com.going.ui.extension.setOnSingleClickListener +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch class SettingActivity : BaseActivity(R.layout.activity_setting) { @@ -20,6 +24,7 @@ class SettingActivity : BaseActivity(R.layout.activity_s initPolicyClickListener() initAboutDoorip() initLogoutClickListener() + initQuitClickListener() } @@ -56,8 +61,17 @@ class SettingActivity : BaseActivity(R.layout.activity_s private fun showLogoutAlertDialog() { settingDialog = SettingCustomDialogFragment() settingDialog.show(supportFragmentManager, settingDialog.tag) - window.statusBarColor = ContextCompat.getColor(this, R.color.transparent_60) + val scope = CoroutineScope(Dispatchers.Main) + scope.launch { + delay(190) + window.statusBarColor = ContextCompat.getColor(this@SettingActivity, R.color.transparent_60) + } } + private fun initQuitClickListener(){ + binding.btnSettingQuit.setOnSingleClickListener { + + } + } } \ No newline at end of file diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt b/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt index 1fcb8141..39c862ac 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt @@ -8,6 +8,10 @@ import com.going.presentation.R import com.going.presentation.databinding.FragmentCustomDialogSettingBinding import com.going.ui.base.BaseDialog import com.going.ui.extension.setOnSingleClickListener +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch class SettingCustomDialogFragment : BaseDialog(R.layout.fragment_custom_dialog_setting) { @@ -29,14 +33,19 @@ class SettingCustomDialogFragment : } } - private fun initPositiveClickListener(){ + private fun initPositiveClickListener() { binding.tvDialogPositive.setOnSingleClickListener { - activity?.window?.statusBarColor = ContextCompat.getColor(requireContext(), R.color.white_000) - dismiss() + val scopeDialog = CoroutineScope(Dispatchers.Main) + scopeDialog.launch { + delay(500) + activity?.window?.statusBarColor = + ContextCompat.getColor(requireContext(), R.color.white_000) + dismiss() + } } } - private fun initNegativeClickListener(){ + private fun initNegativeClickListener() { } diff --git a/presentation/src/main/res/layout/activity_setting.xml b/presentation/src/main/res/layout/activity_setting.xml index b59821e0..b99f515e 100644 --- a/presentation/src/main/res/layout/activity_setting.xml +++ b/presentation/src/main/res/layout/activity_setting.xml @@ -264,7 +264,7 @@ + app:layout_constraintStart_toStartOf="@id/btn_setting_quit" + app:layout_constraintTop_toBottomOf="@id/btn_setting_quit" /> From c42edb8023749fc18f2a8ddc0bb6cadc4c7375a4 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 10 Jan 2024 07:07:03 +0900 Subject: [PATCH 10/16] =?UTF-8?q?[MOD/#51]=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 348c98fa..930b25e7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -116,7 +116,7 @@ From e678a90acd8202b1c0d3bd6b4860db0388321dbd Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 10 Jan 2024 17:49:27 +0900 Subject: [PATCH 11/16] =?UTF-8?q?[MOD/#51]=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/setting/SettingActivity.kt | 23 ++++++------------- .../setting/SettingCustomDialogFragment.kt | 22 +++++++----------- ...xml => fragment_setting_custom_dialog.xml} | 0 3 files changed, 15 insertions(+), 30 deletions(-) rename presentation/src/main/res/layout/{fragment_custom_dialog_setting.xml => fragment_setting_custom_dialog.xml} (100%) diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index 294dd1e7..08beed13 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -1,16 +1,11 @@ package com.going.presentation.setting -import android.graphics.drawable.ColorDrawable import android.os.Bundle import androidx.core.content.ContextCompat import com.going.presentation.R import com.going.presentation.databinding.ActivitySettingBinding import com.going.ui.base.BaseActivity import com.going.ui.extension.setOnSingleClickListener -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch class SettingActivity : BaseActivity(R.layout.activity_setting) { @@ -54,6 +49,12 @@ class SettingActivity : BaseActivity(R.layout.activity_s private fun initLogoutClickListener() { binding.btnSettingLogoutEnter.setOnSingleClickListener { + + } + } + + private fun initQuitClickListener() { + binding.btnSettingQuit.setOnSingleClickListener { showLogoutAlertDialog() } } @@ -61,17 +62,7 @@ class SettingActivity : BaseActivity(R.layout.activity_s private fun showLogoutAlertDialog() { settingDialog = SettingCustomDialogFragment() settingDialog.show(supportFragmentManager, settingDialog.tag) - val scope = CoroutineScope(Dispatchers.Main) - scope.launch { - delay(190) - window.statusBarColor = ContextCompat.getColor(this@SettingActivity, R.color.transparent_60) - } - } - - private fun initQuitClickListener(){ - binding.btnSettingQuit.setOnSingleClickListener { - - } + window.statusBarColor = ContextCompat.getColor(this@SettingActivity, R.color.transparent_60) } } \ No newline at end of file diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt b/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt index 39c862ac..b2abd867 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt @@ -5,21 +5,19 @@ import android.view.View import android.view.WindowManager import androidx.core.content.ContextCompat import com.going.presentation.R -import com.going.presentation.databinding.FragmentCustomDialogSettingBinding +import com.going.presentation.databinding.FragmentSettingCustomDialogBinding import com.going.ui.base.BaseDialog import com.going.ui.extension.setOnSingleClickListener -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch class SettingCustomDialogFragment : - BaseDialog(R.layout.fragment_custom_dialog_setting) { + BaseDialog(R.layout.fragment_setting_custom_dialog) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + initNegativeClickListener() initPositiveClickListener() + } override fun onStart() { @@ -35,18 +33,14 @@ class SettingCustomDialogFragment : private fun initPositiveClickListener() { binding.tvDialogPositive.setOnSingleClickListener { - val scopeDialog = CoroutineScope(Dispatchers.Main) - scopeDialog.launch { - delay(500) - activity?.window?.statusBarColor = - ContextCompat.getColor(requireContext(), R.color.white_000) - dismiss() - } + activity?.window?.statusBarColor = + ContextCompat.getColor(requireContext(), R.color.white_000) + dismiss() } } private fun initNegativeClickListener() { - + // 탈퇴하기 버튼을 눌렀을 때의 처리 } } diff --git a/presentation/src/main/res/layout/fragment_custom_dialog_setting.xml b/presentation/src/main/res/layout/fragment_setting_custom_dialog.xml similarity index 100% rename from presentation/src/main/res/layout/fragment_custom_dialog_setting.xml rename to presentation/src/main/res/layout/fragment_setting_custom_dialog.xml From e024a0759561c64db0f38db185122656de5595a1 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 10 Jan 2024 18:07:36 +0900 Subject: [PATCH 12/16] =?UTF-8?q?[MOD/#51]=20=EC=83=81=ED=83=9C=EB=B0=94?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/going/presentation/setting/SettingActivity.kt | 1 - .../going/presentation/setting/SettingCustomDialogFragment.kt | 2 -- 2 files changed, 3 deletions(-) diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index 08beed13..45f6ad75 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -62,7 +62,6 @@ class SettingActivity : BaseActivity(R.layout.activity_s private fun showLogoutAlertDialog() { settingDialog = SettingCustomDialogFragment() settingDialog.show(supportFragmentManager, settingDialog.tag) - window.statusBarColor = ContextCompat.getColor(this@SettingActivity, R.color.transparent_60) } } \ No newline at end of file diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt b/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt index b2abd867..21a9fd50 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt @@ -33,8 +33,6 @@ class SettingCustomDialogFragment : private fun initPositiveClickListener() { binding.tvDialogPositive.setOnSingleClickListener { - activity?.window?.statusBarColor = - ContextCompat.getColor(requireContext(), R.color.white_000) dismiss() } } From 83f7707be2ca6c2192b479d5560cb203498e13de Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 10 Jan 2024 20:31:02 +0900 Subject: [PATCH 13/16] =?UTF-8?q?[FEAT/#51]=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EC=BB=A4=EC=8A=A4=ED=85=80=20=EB=8B=A4=EC=9D=B4?= =?UTF-8?q?=EC=96=BC=EB=A1=9C=EA=B7=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/setting/SettingActivity.kt | 17 +++-- .../setting/SettingLogoutDialogFragment.kt | 45 +++++++++++++ ...agment.kt => SettingQuitDialogFragment.kt} | 9 ++- .../src/main/res/layout/activity_setting.xml | 2 +- .../layout/fragment_setting_logout_dialog.xml | 65 +++++++++++++++++++ ...g.xml => fragment_setting_quit_dialog.xml} | 8 +-- presentation/src/main/res/values/strings.xml | 13 ++-- 7 files changed, 138 insertions(+), 21 deletions(-) create mode 100644 presentation/src/main/java/com/going/presentation/setting/SettingLogoutDialogFragment.kt rename presentation/src/main/java/com/going/presentation/setting/{SettingCustomDialogFragment.kt => SettingQuitDialogFragment.kt} (76%) create mode 100644 presentation/src/main/res/layout/fragment_setting_logout_dialog.xml rename presentation/src/main/res/layout/{fragment_setting_custom_dialog.xml => fragment_setting_quit_dialog.xml} (92%) diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index 45f6ad75..d5801998 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -1,7 +1,6 @@ package com.going.presentation.setting import android.os.Bundle -import androidx.core.content.ContextCompat import com.going.presentation.R import com.going.presentation.databinding.ActivitySettingBinding import com.going.ui.base.BaseActivity @@ -9,7 +8,8 @@ import com.going.ui.extension.setOnSingleClickListener class SettingActivity : BaseActivity(R.layout.activity_setting) { - private lateinit var settingDialog: SettingCustomDialogFragment + private lateinit var quitDialog: SettingQuitDialogFragment + private lateinit var logoutDialog: SettingLogoutDialogFragment override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -49,19 +49,24 @@ class SettingActivity : BaseActivity(R.layout.activity_s private fun initLogoutClickListener() { binding.btnSettingLogoutEnter.setOnSingleClickListener { - + showLogoutAlertDialog() } } private fun initQuitClickListener() { binding.btnSettingQuit.setOnSingleClickListener { - showLogoutAlertDialog() + showQuitAlertDialog() } } private fun showLogoutAlertDialog() { - settingDialog = SettingCustomDialogFragment() - settingDialog.show(supportFragmentManager, settingDialog.tag) + logoutDialog = SettingLogoutDialogFragment() + logoutDialog.show(supportFragmentManager, logoutDialog.tag) + } + + private fun showQuitAlertDialog() { + quitDialog = SettingQuitDialogFragment() + quitDialog.show(supportFragmentManager, quitDialog.tag) } } \ No newline at end of file diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingLogoutDialogFragment.kt b/presentation/src/main/java/com/going/presentation/setting/SettingLogoutDialogFragment.kt new file mode 100644 index 00000000..29609813 --- /dev/null +++ b/presentation/src/main/java/com/going/presentation/setting/SettingLogoutDialogFragment.kt @@ -0,0 +1,45 @@ +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(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.MATCH_PARENT, + ) + setBackgroundDrawableResource(R.color.transparent_60) + } + } + + private fun initPositiveClickListener() { + binding.tvDialogPositive.setOnSingleClickListener { + // 로그아웃 버튼 눌렀을 때의 로직 + } + } + + private fun initNegativeClickListener() { + binding.btnDialogNegative.setOnSingleClickListener { + dismiss() + } + } + +} diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt b/presentation/src/main/java/com/going/presentation/setting/SettingQuitDialogFragment.kt similarity index 76% rename from presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt rename to presentation/src/main/java/com/going/presentation/setting/SettingQuitDialogFragment.kt index 21a9fd50..a6818fa9 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingCustomDialogFragment.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingQuitDialogFragment.kt @@ -3,14 +3,13 @@ package com.going.presentation.setting import android.os.Bundle import android.view.View import android.view.WindowManager -import androidx.core.content.ContextCompat import com.going.presentation.R -import com.going.presentation.databinding.FragmentSettingCustomDialogBinding +import com.going.presentation.databinding.FragmentSettingQuitDialogBinding import com.going.ui.base.BaseDialog import com.going.ui.extension.setOnSingleClickListener -class SettingCustomDialogFragment : - BaseDialog(R.layout.fragment_setting_custom_dialog) { +class SettingQuitDialogFragment : + BaseDialog(R.layout.fragment_setting_quit_dialog) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) @@ -38,7 +37,7 @@ class SettingCustomDialogFragment : } private fun initNegativeClickListener() { - // 탈퇴하기 버튼을 눌렀을 때의 처리 + // 탈퇴하기 버튼을 눌렀을 때의 로직 } } diff --git a/presentation/src/main/res/layout/activity_setting.xml b/presentation/src/main/res/layout/activity_setting.xml index b99f515e..e0bc7aff 100644 --- a/presentation/src/main/res/layout/activity_setting.xml +++ b/presentation/src/main/res/layout/activity_setting.xml @@ -268,7 +268,7 @@ style="@style/TextAppearance.Doorip.Detail2.Regular" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/setting_dialog_quit" + android:text="@string/setting_quit_dialog_quit" android:textColor="@color/gray_300" app:layout_constraintBottom_toBottomOf="@id/iv_setting_quit" app:layout_constraintEnd_toStartOf="@id/iv_setting_quit" diff --git a/presentation/src/main/res/layout/fragment_setting_logout_dialog.xml b/presentation/src/main/res/layout/fragment_setting_logout_dialog.xml new file mode 100644 index 00000000..2af5a7a3 --- /dev/null +++ b/presentation/src/main/res/layout/fragment_setting_logout_dialog.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/layout/fragment_setting_custom_dialog.xml b/presentation/src/main/res/layout/fragment_setting_quit_dialog.xml similarity index 92% rename from presentation/src/main/res/layout/fragment_setting_custom_dialog.xml rename to presentation/src/main/res/layout/fragment_setting_quit_dialog.xml index 35734d78..2cec7c3a 100644 --- a/presentation/src/main/res/layout/fragment_setting_custom_dialog.xml +++ b/presentation/src/main/res/layout/fragment_setting_quit_dialog.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginTop="24dp" - android:text="@string/setting_dialog_title" + android:text="@string/setting_quit_dialog_title" android:textColor="@color/gray_600" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginTop="4dp" - android:text="@string/setting_dialog_message" + android:text="@string/setting_quit_dialog_message" android:textColor="@color/gray_300" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_dialog_title" /> @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="12dp" - android:text="@string/setting_dialog_negative" + android:text="@string/setting_quit_dialog_negative" android:textColor="@color/gray_200" app:layout_constraintBottom_toBottomOf="@id/tv_dialog_positive" app:layout_constraintEnd_toStartOf="@id/tv_dialog_positive" @@ -64,7 +64,7 @@ android:layout_marginTop="30dp" android:layout_marginEnd="16dp" android:layout_marginBottom="16dp" - android:text="@string/setting_dialog_positive" + android:text="@string/setting_quit_dialog_positive" android:textColor="@color/gray_600" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 9a1198cb..b5805b4f 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -127,11 +127,14 @@ 약관 및 정책 About doorip 로그아웃 - 정말 탈퇴하시겠어요? - 탈퇴시, 정보가 모두 없어져요. - 탈퇴하기 - 남아있기 - 회원탈퇴 + 정말 탈퇴하시겠어요? + 탈퇴시, 정보가 모두 없어져요. + 탈퇴하기 + 남아있기 + 회원탈퇴 + 정말 로그아웃하시겠어요? + 취소 + 로그아웃 프로필 생성 From 15203e9de07f0c73768d4623f0baa228c12019c8 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 10 Jan 2024 20:42:38 +0900 Subject: [PATCH 14/16] =?UTF-8?q?[FIX/#51]=20=ED=95=A8=EC=88=98=20?= =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/going/presentation/setting/SettingActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index d5801998..22c088ec 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -17,7 +17,7 @@ class SettingActivity : BaseActivity(R.layout.activity_s initProfileClickListener() initInquireClickListener() initPolicyClickListener() - initAboutDoorip() + initAboutDooripClickListener() initLogoutClickListener() initQuitClickListener() @@ -41,7 +41,7 @@ class SettingActivity : BaseActivity(R.layout.activity_s } } - private fun initAboutDoorip() { + private fun initAboutDooripClickListener() { binding.btnSettingAboutDooripEnter.setOnSingleClickListener { } From fdc6d6f48b771e41fa2dc72fcbdefe038cd29ca8 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 10 Jan 2024 21:14:58 +0900 Subject: [PATCH 15/16] =?UTF-8?q?[FIX/#51]=20=EB=B0=B0=EA=B2=BD=20?= =?UTF-8?q?=ED=88=AC=EB=AA=85=EB=8F=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/going/doorip/di/RetrofitModule.kt | 3 +- .../presentation/setting/SettingActivity.kt | 14 ++- .../setting/SettingLogoutDialogFragment.kt | 3 +- .../setting/SettingQuitDialogFragment.kt | 3 +- .../layout/fragment_setting_logout_dialog.xml | 9 +- .../layout/fragment_setting_quit_dialog.xml | 108 +++++++++--------- 6 files changed, 66 insertions(+), 74 deletions(-) diff --git a/app/src/main/java/com/going/doorip/di/RetrofitModule.kt b/app/src/main/java/com/going/doorip/di/RetrofitModule.kt index 435739aa..6ef017de 100644 --- a/app/src/main/java/com/going/doorip/di/RetrofitModule.kt +++ b/app/src/main/java/com/going/doorip/di/RetrofitModule.kt @@ -1,8 +1,7 @@ package com.going.doorip.di import com.going.doorip.BuildConfig.BASE_URL -import com.going.going.di.AuthInterceptor -import com.going.going.di.qualifier.JWT +import com.going.doorip.di.qualifier.JWT import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import dagger.Module import dagger.Provides diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index 22c088ec..ee8f024a 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -8,8 +8,8 @@ import com.going.ui.extension.setOnSingleClickListener class SettingActivity : BaseActivity(R.layout.activity_setting) { - private lateinit var quitDialog: SettingQuitDialogFragment - private lateinit var logoutDialog: SettingLogoutDialogFragment + private var quitDialog: SettingQuitDialogFragment ?= null + private var logoutDialog: SettingLogoutDialogFragment ?= null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -61,12 +61,18 @@ class SettingActivity : BaseActivity(R.layout.activity_s private fun showLogoutAlertDialog() { logoutDialog = SettingLogoutDialogFragment() - logoutDialog.show(supportFragmentManager, logoutDialog.tag) + logoutDialog?.show(supportFragmentManager, logoutDialog?.tag) } private fun showQuitAlertDialog() { quitDialog = SettingQuitDialogFragment() - quitDialog.show(supportFragmentManager, quitDialog.tag) + quitDialog?.show(supportFragmentManager, quitDialog?.tag) + } + + override fun onDestroy() { + super.onDestroy() + if(logoutDialog?.isAdded == true) logoutDialog?.dismiss() + if(quitDialog?.isAdded == true) quitDialog?.dismiss() } } \ No newline at end of file diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingLogoutDialogFragment.kt b/presentation/src/main/java/com/going/presentation/setting/SettingLogoutDialogFragment.kt index 29609813..7154636c 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingLogoutDialogFragment.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingLogoutDialogFragment.kt @@ -24,9 +24,8 @@ class SettingLogoutDialogFragment : dialog?.window?.apply { setLayout( WindowManager.LayoutParams.MATCH_PARENT, - WindowManager.LayoutParams.MATCH_PARENT, + WindowManager.LayoutParams.WRAP_CONTENT, ) - setBackgroundDrawableResource(R.color.transparent_60) } } diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingQuitDialogFragment.kt b/presentation/src/main/java/com/going/presentation/setting/SettingQuitDialogFragment.kt index a6818fa9..c89b983a 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingQuitDialogFragment.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingQuitDialogFragment.kt @@ -24,9 +24,8 @@ class SettingQuitDialogFragment : dialog?.window?.apply { setLayout( WindowManager.LayoutParams.MATCH_PARENT, - WindowManager.LayoutParams.MATCH_PARENT, + WindowManager.LayoutParams.WRAP_CONTENT, ) - setBackgroundDrawableResource(R.color.transparent_60) } } diff --git a/presentation/src/main/res/layout/fragment_setting_logout_dialog.xml b/presentation/src/main/res/layout/fragment_setting_logout_dialog.xml index 2af5a7a3..bd8b2bf6 100644 --- a/presentation/src/main/res/layout/fragment_setting_logout_dialog.xml +++ b/presentation/src/main/res/layout/fragment_setting_logout_dialog.xml @@ -5,12 +5,9 @@ - - - - diff --git a/presentation/src/main/res/layout/fragment_setting_quit_dialog.xml b/presentation/src/main/res/layout/fragment_setting_quit_dialog.xml index 2cec7c3a..c495e305 100644 --- a/presentation/src/main/res/layout/fragment_setting_quit_dialog.xml +++ b/presentation/src/main/res/layout/fragment_setting_quit_dialog.xml @@ -8,69 +8,63 @@ + android:layout_height="wrap_content" + android:layout_marginHorizontal="54dp" + android:background="@drawable/shape_rect2_white000_fill" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + app:layout_constraintTop_toTopOf="parent" /> - - - - - + - + - + From 6f540b942fc0b5727a01e158f77ab1ad61e46cec Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 10 Jan 2024 22:14:10 +0900 Subject: [PATCH 16/16] =?UTF-8?q?[FIX/#51]=20=EC=BD=94=EB=93=9C=EB=A6=AC?= =?UTF-8?q?=EB=B7=B0=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/setting/SettingActivity.kt | 17 +++++++++++++---- ..._fill.xml => shape_rect_2_white000_fill.xml} | 0 ..._fill.xml => shape_rect_6_white000_fill.xml} | 0 .../src/main/res/layout/activity_setting.xml | 14 +++++++------- .../layout/fragment_setting_logout_dialog.xml | 2 +- .../res/layout/fragment_setting_quit_dialog.xml | 2 +- 6 files changed, 22 insertions(+), 13 deletions(-) rename presentation/src/main/res/drawable/{shape_rect2_white000_fill.xml => shape_rect_2_white000_fill.xml} (100%) rename presentation/src/main/res/drawable/{shape_rect6_white000_fill.xml => shape_rect_6_white000_fill.xml} (100%) diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index ee8f024a..d806ed87 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -8,8 +8,8 @@ import com.going.ui.extension.setOnSingleClickListener class SettingActivity : BaseActivity(R.layout.activity_setting) { - private var quitDialog: SettingQuitDialogFragment ?= null - private var logoutDialog: SettingLogoutDialogFragment ?= null + private var quitDialog: SettingQuitDialogFragment? = null + private var logoutDialog: SettingLogoutDialogFragment? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -20,6 +20,7 @@ class SettingActivity : BaseActivity(R.layout.activity_s initAboutDooripClickListener() initLogoutClickListener() initQuitClickListener() + setVersionCode() } @@ -69,10 +70,18 @@ class SettingActivity : BaseActivity(R.layout.activity_s 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() + if (logoutDialog?.isAdded == true) logoutDialog?.dismiss() + if (quitDialog?.isAdded == true) quitDialog?.dismiss() + } + + companion object { + private const val VERSION_CODE = "v1.0" } } \ No newline at end of file diff --git a/presentation/src/main/res/drawable/shape_rect2_white000_fill.xml b/presentation/src/main/res/drawable/shape_rect_2_white000_fill.xml similarity index 100% rename from presentation/src/main/res/drawable/shape_rect2_white000_fill.xml rename to presentation/src/main/res/drawable/shape_rect_2_white000_fill.xml diff --git a/presentation/src/main/res/drawable/shape_rect6_white000_fill.xml b/presentation/src/main/res/drawable/shape_rect_6_white000_fill.xml similarity index 100% rename from presentation/src/main/res/drawable/shape_rect6_white000_fill.xml rename to presentation/src/main/res/drawable/shape_rect_6_white000_fill.xml diff --git a/presentation/src/main/res/layout/activity_setting.xml b/presentation/src/main/res/layout/activity_setting.xml index e0bc7aff..2ca65784 100644 --- a/presentation/src/main/res/layout/activity_setting.xml +++ b/presentation/src/main/res/layout/activity_setting.xml @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" android:layout_marginTop="40dp" - android:background="@drawable/shape_rect6_white000_fill" + android:background="@drawable/shape_rect_6_white000_fill" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar_preference_tag"> @@ -87,7 +87,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" android:layout_marginTop="8dp" - android:background="@drawable/shape_rect6_white000_fill" + android:background="@drawable/shape_rect_6_white000_fill" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/layout_setting_profile"> @@ -123,7 +123,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" android:layout_marginTop="8dp" - android:background="@drawable/shape_rect6_white000_fill" + android:background="@drawable/shape_rect_6_white000_fill" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/layout_setting_inquire"> @@ -141,7 +141,7 @@ app:layout_constraintTop_toTopOf="parent" /> @@ -197,7 +197,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" android:layout_marginTop="8dp" - android:background="@drawable/shape_rect6_white000_fill" + android:background="@drawable/shape_rect_6_white000_fill" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/layout_setting_policy"> @@ -233,7 +233,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" android:layout_marginTop="8dp" - android:background="@drawable/shape_rect6_white000_fill" + android:background="@drawable/shape_rect_6_white000_fill" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/layout_setting_about_doorip"> diff --git a/presentation/src/main/res/layout/fragment_setting_logout_dialog.xml b/presentation/src/main/res/layout/fragment_setting_logout_dialog.xml index bd8b2bf6..582c24f7 100644 --- a/presentation/src/main/res/layout/fragment_setting_logout_dialog.xml +++ b/presentation/src/main/res/layout/fragment_setting_logout_dialog.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="54dp" - android:background="@drawable/shape_rect2_white000_fill" + android:background="@drawable/shape_rect_2_white000_fill" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/presentation/src/main/res/layout/fragment_setting_quit_dialog.xml b/presentation/src/main/res/layout/fragment_setting_quit_dialog.xml index c495e305..869776e2 100644 --- a/presentation/src/main/res/layout/fragment_setting_quit_dialog.xml +++ b/presentation/src/main/res/layout/fragment_setting_quit_dialog.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="54dp" - android:background="@drawable/shape_rect2_white000_fill" + android:background="@drawable/shape_rect_2_white000_fill" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"