diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 25294e94..ca71dd62 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,13 +16,18 @@
android:theme="@style/Theme.BangWool"
android:usesCleartextTraffic="true"
tools:targetApi="31">
+
+
+
@@ -34,6 +39,7 @@
android:theme="@style/Theme.Splash">
+
@@ -46,23 +52,19 @@
-
->
-
-
\ No newline at end of file
diff --git a/app/src/main/java/com/example/bangwool/ui/mypage/EditPrivacyActivity.kt b/app/src/main/java/com/example/bangwool/ui/mypage/EditPrivacyActivity.kt
new file mode 100644
index 00000000..3832ec59
--- /dev/null
+++ b/app/src/main/java/com/example/bangwool/ui/mypage/EditPrivacyActivity.kt
@@ -0,0 +1,34 @@
+package com.example.bangwool.ui.mypage
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.view.View
+import com.example.bangwool.R
+import com.example.bangwool.databinding.ActivityEditPrivacyBinding
+import com.example.bangwool.databinding.ActivityTimerBinding
+
+class EditPrivacyActivity : AppCompatActivity() {
+ lateinit var binding: ActivityEditPrivacyBinding
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ binding = ActivityEditPrivacyBinding.inflate(layoutInflater)
+ binding.icBack.setOnClickListener{
+ finish()
+ }
+ val nickname = intent.getStringExtra("nickname")
+ val profileImage = intent.getStringExtra("profileImage")
+ val email = intent.getStringExtra("email")
+ binding.tvNickname.text = nickname
+ binding.tvEmail.text = email
+
+ binding.btnEditPasswordBefore.setOnClickListener{
+ binding.btnEditPasswordBefore.visibility = View.GONE
+ binding.clPassword.visibility = View.VISIBLE
+ binding.clCheckPassword.visibility = View.VISIBLE
+ binding.btnEditPasswordAfter.visibility = View.VISIBLE
+ binding.svMyInfo.isScrollbarFadingEnabled = false
+ }
+
+ setContentView(binding.root)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/bangwool/ui/mypage/MyPageFragment.kt b/app/src/main/java/com/example/bangwool/ui/mypage/MyPageFragment.kt
index 11671419..46161094 100644
--- a/app/src/main/java/com/example/bangwool/ui/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/example/bangwool/ui/mypage/MyPageFragment.kt
@@ -19,6 +19,7 @@ import com.example.bangwool.retrofit.MyPageResponse
import com.example.bangwool.retrofit.RetrofitInterface
import com.example.bangwool.retrofit.RetrofitUtil
import com.example.bangwool.retrofit.removeAccessToken
+import com.example.bangwool.ui.home.TimerEditActivity
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response
@@ -28,6 +29,9 @@ class MyPageFragment : Fragment() {
lateinit var binding: FragmentMypageBinding
private lateinit var retrofitInterface: RetrofitInterface
+ lateinit var nickname: String
+ lateinit var profileImage: String
+ lateinit var email: String
override fun onCreateView(
inflater: LayoutInflater,
@@ -70,6 +74,13 @@ class MyPageFragment : Fragment() {
binding.appinfoMenu.setOnClickListener {
UpdateDialogUtils.showUpdateDialog(requireContext())
}
+ binding.myinfo.setOnClickListener {
+ val i = Intent(requireContext(), EditPrivacyActivity::class.java)
+ i.putExtra("nickname", nickname)
+ i.putExtra("profileImage", profileImage)
+ i.putExtra("email", email)
+ startActivity(i)
+ }
}
private fun fetchMyPageData() {
@@ -77,8 +88,9 @@ class MyPageFragment : Fragment() {
override fun onResponse(call: Call, response: Response) {
if (response.isSuccessful) {
val myPageResponse = response.body()!!
- val nickname = myPageResponse.nickname
- val profileImage = myPageResponse.profileImage
+ nickname = myPageResponse.nickname
+ profileImage = myPageResponse.profileImage
+ email = myPageResponse.email
// 닉네임 업데이트 부분
diff --git a/app/src/main/res/layout/activity_edit_privacy.xml b/app/src/main/res/layout/activity_edit_privacy.xml
new file mode 100644
index 00000000..df75cadd
--- /dev/null
+++ b/app/src/main/res/layout/activity_edit_privacy.xml
@@ -0,0 +1,374 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file