diff --git a/app/src/main/java/sopt/uni/presentation/invite/AskActivity.kt b/app/src/main/java/sopt/uni/presentation/invite/AskActivity.kt new file mode 100644 index 0000000..de7e0d3 --- /dev/null +++ b/app/src/main/java/sopt/uni/presentation/invite/AskActivity.kt @@ -0,0 +1,44 @@ +package sopt.uni.presentation.invite + +import android.content.Intent +import android.os.Bundle +import sopt.uni.R +import sopt.uni.databinding.ActivtiyAskBinding +import sopt.uni.presentation.WebViewActivity +import sopt.uni.presentation.mypage.MypageAccountCoupleDisconnectDialogFragment +import sopt.uni.util.binding.BindingActivity +import sopt.uni.util.extension.setOnSingleClickListener + +class AskActivity : BindingActivity(R.layout.activtiy_ask) { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(binding.root) + + setupBackButton() + moveToAskPage() + secesstionUser() + } + + private fun setupBackButton() { + binding.btnAskBack.setOnSingleClickListener { + finish() + } + } + + private fun moveToAskPage() { + binding.clAskQna.setOnSingleClickListener { + Intent(this, WebViewActivity::class.java).apply { + putExtra("url", resources.getString(R.string.ask_url)) + }.run(::startActivity) + } + } + + private fun secesstionUser() { + binding.clAskSecession.setOnSingleClickListener { + MypageAccountCoupleDisconnectDialogFragment().show( + supportFragmentManager, + "MypageAccountCoupleDisconnectDialogFragment", + ) + } + } +} diff --git a/app/src/main/java/sopt/uni/presentation/invite/NickNameActivity.kt b/app/src/main/java/sopt/uni/presentation/invite/NickNameActivity.kt index 7f55287..1b4aed4 100644 --- a/app/src/main/java/sopt/uni/presentation/invite/NickNameActivity.kt +++ b/app/src/main/java/sopt/uni/presentation/invite/NickNameActivity.kt @@ -1,7 +1,6 @@ package sopt.uni.presentation.invite import android.content.Context -import android.content.Intent import android.graphics.Rect import android.os.Bundle import android.view.MotionEvent @@ -12,7 +11,6 @@ import androidx.activity.viewModels import dagger.hilt.android.AndroidEntryPoint import sopt.uni.R import sopt.uni.databinding.ActivityNicknameBinding -import sopt.uni.presentation.WebViewActivity import sopt.uni.presentation.mypage.MypageAccountLogoutDialogFragment import sopt.uni.util.binding.BindingActivity import sopt.uni.util.extension.setOnSingleClickListener @@ -64,9 +62,7 @@ class NickNameActivity : BindingActivity(R.layout.activ private fun moveToAskPage() { binding.tvAsk.setOnSingleClickListener { - Intent(this, WebViewActivity::class.java).apply { - putExtra("url", resources.getString(R.string.ask_url)) - }.run(::startActivity) + startActivity() } } diff --git a/app/src/main/res/layout/activtiy_ask.xml b/app/src/main/res/layout/activtiy_ask.xml new file mode 100644 index 0000000..916a532 --- /dev/null +++ b/app/src/main/res/layout/activtiy_ask.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 427c280..7ab5897 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -266,6 +266,7 @@ 더 이상 기록에 접근할 수 없습니다. 존재하지 않는 사용자입니다. 다시 로그인해주세요 이미 게임이 생성되었습니다 + QnA 이미 생성된 승부가 있어요.