diff --git a/android/app/src/main/java/com/created/team201/presentation/myPage/MyPageFragment.kt b/android/app/src/main/java/com/created/team201/presentation/myPage/MyPageFragment.kt index 929862792..765224cbb 100644 --- a/android/app/src/main/java/com/created/team201/presentation/myPage/MyPageFragment.kt +++ b/android/app/src/main/java/com/created/team201/presentation/myPage/MyPageFragment.kt @@ -6,6 +6,7 @@ import androidx.fragment.app.viewModels import com.created.team201.R import com.created.team201.databinding.FragmentMyPageBinding import com.created.team201.presentation.common.BindingFragment +import com.created.team201.presentation.setting.SettingActivity class MyPageFragment : BindingFragment(R.layout.fragment_my_page) { private val myPageViewModel: MyPageViewModel by viewModels { @@ -29,6 +30,7 @@ class MyPageFragment : BindingFragment(R.layout.fragment_ when (it.itemId) { R.id.menu_my_page_setting -> { // 설정 뷰 이동 + startActivity(SettingActivity.getIntent(requireContext())) true } diff --git a/android/app/src/main/java/com/created/team201/presentation/setting/SettingActivity.kt b/android/app/src/main/java/com/created/team201/presentation/setting/SettingActivity.kt index 3ef442562..a0e855670 100644 --- a/android/app/src/main/java/com/created/team201/presentation/setting/SettingActivity.kt +++ b/android/app/src/main/java/com/created/team201/presentation/setting/SettingActivity.kt @@ -1,6 +1,9 @@ package com.created.team201.presentation.setting +import android.content.Context +import android.content.Intent import android.os.Bundle +import android.view.MenuItem import com.created.team201.R import com.created.team201.databinding.ActivitySettingBinding import com.created.team201.presentation.common.BindingActivity @@ -8,5 +11,28 @@ import com.created.team201.presentation.common.BindingActivity class SettingActivity : BindingActivity(R.layout.activity_setting) { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + + initActionBar() + } + + private fun initActionBar() { + setSupportActionBar(binding.tbSetting) + supportActionBar?.setHomeActionContentDescription(R.string.toolbar_back_text) + supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_back) + supportActionBar?.setDisplayHomeAsUpEnabled(true) + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean = + when (item.itemId) { + android.R.id.home -> { + finish() + true + } + + else -> false + } + + companion object { + fun getIntent(context: Context): Intent = Intent(context, SettingActivity::class.java) } }