From 7da0e2509c6c99ba4dc9f95e23cb791ada9d1bdf Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 4 Dec 2023 20:57:52 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EB=B0=A9=20?= =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EC=84=A4=EC=A0=95=20-=20=EB=8B=B9?= =?UTF-8?q?=EC=B2=A8=20=EB=82=B4=EC=97=AD=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roulette/config/RouletteConfigActivity.kt | 36 +++---------------- .../config/RouletteWinningDetailsFragment.kt | 19 ---------- .../res/layout/activity_roulette_config.xml | 17 --------- .../fragment_roulette_winning_details.xml | 6 ---- 4 files changed, 4 insertions(+), 74 deletions(-) delete mode 100644 app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteWinningDetailsFragment.kt delete mode 100644 app/src/main/res/layout/fragment_roulette_winning_details.xml diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteConfigActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteConfigActivity.kt index 88a0a13..d578578 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteConfigActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteConfigActivity.kt @@ -1,7 +1,6 @@ package kr.co.vividnext.sodalive.live.roulette.config import android.os.Bundle -import com.google.android.material.tabs.TabLayout import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.databinding.ActivityRouletteConfigBinding @@ -11,31 +10,15 @@ class RouletteConfigActivity : BaseActivity( ) { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - changeFragment("settings") + changeFragment() } override fun setupView() { binding.toolbar.tvBack.text = "룰렛설정" binding.toolbar.tvBack.setOnClickListener { finish() } - - val tabs = binding.tabs - tabs.addTab(tabs.newTab().setText("룰렛설정").setTag("settings")) - tabs.addTab(tabs.newTab().setText("당첨내역").setTag("winning-details")) - tabs.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener { - override fun onTabSelected(tab: TabLayout.Tab) { - val tag = tab.tag as String - changeFragment(tag) - } - - override fun onTabUnselected(tab: TabLayout.Tab) { - } - - override fun onTabReselected(tab: TabLayout.Tab) { - } - }) } - private fun changeFragment(tag: String) { + private fun changeFragment(tag: String = "settings") { val fragmentManager = supportFragmentManager val fragmentTransaction = fragmentManager.beginTransaction() @@ -44,19 +27,8 @@ class RouletteConfigActivity : BaseActivity( fragmentTransaction.hide(currentFragment) } - var fragment = fragmentManager.findFragmentByTag(tag) - if (fragment == null) { - fragment = if (tag == "settings") { - RouletteSettingsFragment() - } else { - RouletteWinningDetailsFragment() - } - - fragmentTransaction.add(R.id.container, fragment, tag) - } else { - fragmentTransaction.show(fragment) - } - + val fragment = RouletteSettingsFragment() + fragmentTransaction.add(R.id.container, fragment, tag) fragmentTransaction.setPrimaryNavigationFragment(fragment) fragmentTransaction.setReorderingAllowed(true) fragmentTransaction.commitNow() diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteWinningDetailsFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteWinningDetailsFragment.kt deleted file mode 100644 index d826b32..0000000 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteWinningDetailsFragment.kt +++ /dev/null @@ -1,19 +0,0 @@ -package kr.co.vividnext.sodalive.live.roulette.config - -import android.os.Bundle -import android.view.View -import kr.co.vividnext.sodalive.base.BaseFragment -import kr.co.vividnext.sodalive.databinding.FragmentRouletteWinningDetailsBinding - -class RouletteWinningDetailsFragment : BaseFragment( - FragmentRouletteWinningDetailsBinding::inflate -) { - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - setupView() - } - - private fun setupView() { - } -} diff --git a/app/src/main/res/layout/activity_roulette_config.xml b/app/src/main/res/layout/activity_roulette_config.xml index 03d60d3..5d57258 100644 --- a/app/src/main/res/layout/activity_roulette_config.xml +++ b/app/src/main/res/layout/activity_roulette_config.xml @@ -1,6 +1,5 @@ @@ -9,22 +8,6 @@ android:id="@+id/toolbar" layout="@layout/detail_toolbar" /> - - - - - - -