From 32d15b2729af0a21d32d2735b971e071d21a5c97 Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Mon, 10 Jul 2023 21:51:36 +0900 Subject: [PATCH] =?UTF-8?q?[Feat/#35]=20=EC=84=A4=EC=A0=95=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=ED=81=B4=EB=A6=AD=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/ManageAccountActivity.kt | 16 ++++++ .../presentation/setting/SettingFragment.kt | 19 +++++++ app/src/main/res/layout/activity_main.xml | 53 ++++++++++--------- .../res/layout/activity_manage_account.xml | 6 +-- app/src/main/res/layout/fragment_setting.xml | 4 +- 5 files changed, 67 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/setting/ManageAccountActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/setting/ManageAccountActivity.kt index ea170e81..cb33b5ef 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/setting/ManageAccountActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/setting/ManageAccountActivity.kt @@ -1,9 +1,25 @@ package com.sopt.umbba_android.presentation.setting +import android.content.Intent +import android.os.Bundle import com.sopt.umbba_android.R import com.sopt.umbba_android.databinding.ActivityManageAccountBinding import com.sopt.umbba_android.util.binding.BindingActivity class ManageAccountActivity: BindingActivity(R.layout.activity_manage_account) { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setClickEvent() + } + private fun setClickEvent(){ + with(binding){ + clLogout.setOnClickListener { + TODO("서버 로그아웃 API 연결") + } + clDeleteAccount.setOnClickListener { + startActivity(Intent(this@ManageAccountActivity,DeleteAccountActivity::class.java)) + } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/setting/SettingFragment.kt b/app/src/main/java/com/sopt/umbba_android/presentation/setting/SettingFragment.kt index 43160ee3..c987e31b 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/setting/SettingFragment.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/setting/SettingFragment.kt @@ -1,5 +1,6 @@ package com.sopt.umbba_android.presentation.setting +import android.content.Intent import android.os.Bundle import android.view.View import com.sopt.umbba_android.R @@ -9,5 +10,23 @@ import com.sopt.umbba_android.util.binding.BindingFragment class SettingFragment:BindingFragment(R.layout.fragment_setting) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + setClickEvent() } + private fun setClickEvent(){ + with(binding){ + clManageAccount.setOnClickListener { + startActivity(Intent(requireActivity(),ManageAccountActivity::class.java)) + } + clAboutUmbba.setOnClickListener{ + TODO("엄빠소개 노션으로 이동하도록 만들기. Uri 연결하기") + } + clTos.setOnClickListener { + TODO("이용약관 노션으로 이동하도록 만들기. Uri 연결하기") + } + clNotice.setOnClickListener { + TODO("개인정보처리방침 노션으로 이동하도록 만들기. Uri 연결하기") + } + } + } + } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4c56ac00..62aa082a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,32 +1,33 @@ - - + android:layout_height="match_parent" + tools:context=".presentation.MainActivity"> - - + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_manage_account.xml b/app/src/main/res/layout/activity_manage_account.xml index 82d2a810..79635d31 100644 --- a/app/src/main/res/layout/activity_manage_account.xml +++ b/app/src/main/res/layout/activity_manage_account.xml @@ -21,9 +21,9 @@ android:id="@+id/cl_logout" android:layout_width="match_parent" android:layout_height="72dp" + android:background="@drawable/sel_background_bottom_stroke" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - android:background="@drawable/sel_background_bottom_stroke" app:layout_constraintTop_toBottomOf="@id/layout_appbar"> @@ -56,8 +56,8 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginTop="26dp" - android:textColor="@color/umbba_black" android:text="@string/delete_account" + android:textColor="@color/umbba_black" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml index 1d1fba7e..b527aa37 100644 --- a/app/src/main/res/layout/fragment_setting.xml +++ b/app/src/main/res/layout/fragment_setting.xml @@ -88,15 +88,15 @@ android:layout_width="100dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" android:layout_marginEnd="12dp" + android:layout_marginBottom="8dp" + android:checked="false" android:paddingHorizontal="10dp" android:thumb="@drawable/shape_switch_thumb" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:showText="true" - android:checked="false" app:switchMinWidth="17dp" app:switchTextAppearance="@style/AndroidCaptionRegular10" app:trackTint="@color/sel_switch_track" />