klaus/sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(main-v2): 메인 하단 내비게이션을 추가한다

Browse Source
This commit is contained in:
klaus
2026-05-19 15:55:03 +09:00
parent 751b031627
commit 99b7a6ce99
41 changed files with 1646 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt
View File

@@ -50,6 +50,7 @@ import kr.co.vividnext.sodalive.settings.notice.NoticeActivity
import kr.co.vividnext.sodalive.settings.notice.NoticeDetailActivity
import kr.co.vividnext.sodalive.settings.notification.MemberRole
import kr.co.vividnext.sodalive.splash.SplashActivity
import kr.co.vividnext.sodalive.v2.main.MainV2Activity
import org.koin.android.ext.android.inject
@UnstableApi
@@ -275,19 +276,19 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat
binding.rlProfileContainer.visibility = View.GONE
binding.llProfileLoginContainer.visibility = View.VISIBLE
binding.llProfileLoginContainer.setOnClickListener {
(requireActivity() as MainActivity).showLoginActivity()
showLoginActivity()
}
binding.tvCanAmount.text =
SodaLiveApplicationHolder.get().getString(R.string.common_zero)
binding.tvCanAmount.setOnClickListener {
(requireActivity() as MainActivity).showLoginActivity()
showLoginActivity()
}
binding.tvPointAmount.text =
SodaLiveApplicationHolder.get().getString(R.string.common_zero)
binding.tvPointAmount.setOnClickListener {
(requireActivity() as MainActivity).showLoginActivity()
showLoginActivity()
}
binding.tvChargeCan.visibility = View.INVISIBLE
@@ -499,4 +500,10 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat
}
}
private fun showLoginActivity() {
when (val activity = requireActivity()) {
is MainActivity -> activity.showLoginActivity()
is MainV2Activity -> activity.showLoginActivity()
}
}
}

4
app/src/main/java/kr/co/vividnext/sodalive/mypage/can/status/CanStatusActivity.kt
View File

@@ -11,10 +11,10 @@ import kr.co.vividnext.sodalive.base.BaseActivity
import kr.co.vividnext.sodalive.common.LoadingDialog
import kr.co.vividnext.sodalive.databinding.ActivityCanStatusBinding
import kr.co.vividnext.sodalive.extensions.moneyFormat
import kr.co.vividnext.sodalive.main.MainActivity
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
import kr.co.vividnext.sodalive.mypage.can.status.charge.CanChargeStatusFragment
import kr.co.vividnext.sodalive.mypage.can.status.use.CanUseStatusFragment
import kr.co.vividnext.sodalive.v2.main.MainV2Activity
import org.koin.android.ext.android.inject
class CanStatusActivity : BaseActivity<ActivityCanStatusBinding>(
@@ -137,7 +137,7 @@ class CanStatusActivity : BaseActivity<ActivityCanStatusBinding>(
}
private fun onClickBackButton() {
val intent = Intent(applicationContext, MainActivity::class.java)
val intent = Intent(applicationContext, MainV2Activity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
startActivity(intent)

4
app/src/main/java/kr/co/vividnext/sodalive/mypage/point/PointStatusActivity.kt
View File

@@ -11,9 +11,9 @@ import kr.co.vividnext.sodalive.base.BaseActivity
import kr.co.vividnext.sodalive.common.LoadingDialog
import kr.co.vividnext.sodalive.databinding.ActivityPointStatusBinding
import kr.co.vividnext.sodalive.extensions.moneyFormat
import kr.co.vividnext.sodalive.main.MainActivity
import kr.co.vividnext.sodalive.mypage.point.reward.PointRewardStatusFragment
import kr.co.vividnext.sodalive.mypage.point.use.PointUseStatusFragment
import kr.co.vividnext.sodalive.v2.main.MainV2Activity
import org.koin.android.ext.android.inject
class PointStatusActivity : BaseActivity<ActivityPointStatusBinding>(
@@ -120,7 +120,7 @@ class PointStatusActivity : BaseActivity<ActivityPointStatusBinding>(
}
private fun onClickBackButton() {
val intent = Intent(applicationContext, MainActivity::class.java)
val intent = Intent(applicationContext, MainV2Activity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
startActivity(intent)