From f1958995f6a30963ebf6e76a9609536f562f98d3 Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 7 Jul 2025 20:23:23 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=ED=95=98=EB=8B=A8=20=ED=83=AD=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/main/MainActivity.kt | 35 ++++-------------- .../vividnext/sodalive/main/MainViewModel.kt | 9 ++--- app/src/main/res/color/color_tabbar_title.xml | 2 +- app/src/main/res/drawable-mdpi/ic_chat.png | Bin 0 -> 401 bytes .../res/drawable-mdpi/ic_chat_selected.png | Bin 0 -> 519 bytes app/src/main/res/drawable-mdpi/ic_home.png | Bin 0 -> 394 bytes .../res/drawable-mdpi/ic_home_selected.png | Bin 0 -> 431 bytes app/src/main/res/drawable-mdpi/ic_live.png | Bin 0 -> 426 bytes .../res/drawable-mdpi/ic_live_selected.png | Bin 0 -> 764 bytes app/src/main/res/drawable-mdpi/ic_my.png | Bin 0 -> 320 bytes .../main/res/drawable-mdpi/ic_my_selected.png | Bin 0 -> 431 bytes .../main/res/drawable-mdpi/ic_subscribe.png | Bin 0 -> 439 bytes .../drawable-mdpi/ic_subscribe_selected.png | Bin 0 -> 631 bytes app/src/main/res/drawable/ic_tabbar_home.xml | 5 +++ app/src/main/res/drawable/ic_tabbar_live.xml | 4 +- app/src/main/res/drawable/ic_tabbar_my.xml | 4 +- app/src/main/res/layout/activity_main.xml | 9 +---- 17 files changed, 22 insertions(+), 46 deletions(-) create mode 100644 app/src/main/res/drawable-mdpi/ic_chat.png create mode 100644 app/src/main/res/drawable-mdpi/ic_chat_selected.png create mode 100644 app/src/main/res/drawable-mdpi/ic_home.png create mode 100644 app/src/main/res/drawable-mdpi/ic_home_selected.png create mode 100644 app/src/main/res/drawable-mdpi/ic_live.png create mode 100644 app/src/main/res/drawable-mdpi/ic_live_selected.png create mode 100644 app/src/main/res/drawable-mdpi/ic_my.png create mode 100644 app/src/main/res/drawable-mdpi/ic_my_selected.png create mode 100644 app/src/main/res/drawable-mdpi/ic_subscribe.png create mode 100644 app/src/main/res/drawable-mdpi/ic_subscribe_selected.png create mode 100644 app/src/main/res/drawable/ic_tabbar_home.xml diff --git a/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt index 33e36345..9efe2865 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt @@ -35,7 +35,6 @@ import kr.co.vividnext.sodalive.audio_content.main.v2.home.AudioContentMainTabHo import kr.co.vividnext.sodalive.audio_content.player.AudioContentPlayerFragment import kr.co.vividnext.sodalive.audio_content.player.AudioContentPlayerService import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity -import kr.co.vividnext.sodalive.audition.AuditionFragment import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.common.Constants import kr.co.vividnext.sodalive.common.LoadingDialog @@ -310,7 +309,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl } else if (messageId > 0) { startActivity(Intent(applicationContext, MessageActivity::class.java)) } else if (auditionId > 0) { - viewModel.clickTab(MainViewModel.CurrentTab.AUDITION) } } catch (_: IllegalStateException) { } @@ -377,14 +375,14 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl private fun setupBottomTabLayout() { setupTab( - binding = binding.tabContent, - title = "콘텐츠", - imageSrc = R.drawable.ic_tabbar_content, + binding = binding.tabHome, + title = "홈", + imageSrc = R.drawable.ic_tabbar_home, colorStateList = ContextCompat.getColorStateList( applicationContext, R.color.color_tabbar_title ), - tab = MainViewModel.CurrentTab.CONTENT + tab = MainViewModel.CurrentTab.HOME ) setupTab( @@ -398,17 +396,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl tab = MainViewModel.CurrentTab.LIVE ) - setupTab( - binding = binding.tabAudition, - title = "오디션", - imageSrc = R.drawable.ic_tabbar_audition, - colorStateList = ContextCompat.getColorStateList( - applicationContext, - R.color.color_tabbar_title - ), - tab = MainViewModel.CurrentTab.AUDITION - ) - setupTab( binding = binding.tabMy, title = "마이", @@ -421,25 +408,20 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl ) viewModel.currentTab.observe(this) { - setTabSelected(binding.tabContent, isSelected = false) + setTabSelected(binding.tabHome, isSelected = false) setTabSelected(binding.tabLive, isSelected = false) - setTabSelected(binding.tabAudition, isSelected = false) setTabSelected(binding.tabMy, isSelected = false) changeFragment(it) when (it) { - MainViewModel.CurrentTab.CONTENT -> { - setTabSelected(binding.tabContent, isSelected = true) + MainViewModel.CurrentTab.HOME -> { + setTabSelected(binding.tabHome, isSelected = true) } MainViewModel.CurrentTab.LIVE -> { setTabSelected(binding.tabLive, isSelected = true) } - MainViewModel.CurrentTab.AUDITION -> { - setTabSelected(binding.tabAudition, isSelected = true) - } - MainViewModel.CurrentTab.MY -> { setTabSelected(binding.tabMy, isSelected = true) } @@ -490,8 +472,7 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl if (fragment == null) { fragment = when (currentTab) { MainViewModel.CurrentTab.LIVE -> liveFragment - MainViewModel.CurrentTab.CONTENT -> AudioContentMainTabHomeFragment() - MainViewModel.CurrentTab.AUDITION -> AuditionFragment() + MainViewModel.CurrentTab.HOME -> AudioContentMainTabHomeFragment() MainViewModel.CurrentTab.MY -> MyPageFragment() } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/main/MainViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/main/MainViewModel.kt index f2221fbe..7d886a87 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/main/MainViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/main/MainViewModel.kt @@ -33,20 +33,17 @@ class MainViewModel( private val playbackTrackingRepository: PlaybackTrackingRepository ) : BaseViewModel() { enum class CurrentTab { - @SerializedName("CONTENT") - CONTENT, + @SerializedName("HOME") + HOME, @SerializedName("LIVE") LIVE, - @SerializedName("AUDITION") - AUDITION, - @SerializedName("MY") MY } - private val _currentTab = MutableLiveData(CurrentTab.CONTENT) + private val _currentTab = MutableLiveData(CurrentTab.HOME) val currentTab: LiveData get() = _currentTab diff --git a/app/src/main/res/color/color_tabbar_title.xml b/app/src/main/res/color/color_tabbar_title.xml index e6bf7b9d..b38425be 100644 --- a/app/src/main/res/color/color_tabbar_title.xml +++ b/app/src/main/res/color/color_tabbar_title.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable-mdpi/ic_chat.png b/app/src/main/res/drawable-mdpi/ic_chat.png new file mode 100644 index 0000000000000000000000000000000000000000..f8cc5755f9a70aef6ae0e7e56497c24e14c036fb GIT binary patch literal 401 zcmV;C0dD?@P)P000;W1^@s654Bdt00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP4NZwA z17=Q*WJXFOPp)Bgf$s?oh24xmA;{HaX2Z%z!U+d1rwnHIhLYtBm7Gh zkyF8u6mY64`y6+Y5h;Nqlmz!(j^ebX0YIOASA%8`s-hJ~`kBbLnPX3(?=%jVR=f|A z82Uy{R??$1WDPu^6CX(z7Rt3BPF6XMfZ2aSoVCyRuf|u1v-;)m^qjGVp#Pp3;{i?u z=?UVXdj`j^|2&Z76nxy=jQ5lRz@JY-#mWJ>=jO4>*+1$tr}AI|X`B|hB;domwSG9- v%9ZK~uracv`WD+@FWBt}IY&`+qeP000>X1^@s6#OZ}&00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP@CM)!yg@wyasu2D*jN((mOVl}L8~z)n#_An z303)z!V+lEaB>2qA9OLj&^TNTOEKs<0%%N|A_;(u5cn6!;jL zrVXP%h9pN5_gsC{VI7#8jp=JIRf0nFp$w1*i4uP=VBJ*&Fw_rbZapU15G4tMd=lak zNpT4S->7P-0i%^Cj$p(jNgxVuQI5#ZdE(SO!56=>)W#1JMtGqUpA|15ri;fj-3+gU zz=kBE39{lP8vo=Ao%qJ=#m($f`Ec$}cWXfq+7p&^1tow$qu+5zvbhE3;vKJtQ+Wq7 zRbsVNt0uIeC~AU?)Qz_MSP3(-0YwEst%nmmHp!6WcB_?%KKqW#Ttd|7wPR$rry_yI4Z%|NQ^}002ov JPDHLkV1kqb*=GO% literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_home.png b/app/src/main/res/drawable-mdpi/ic_home.png new file mode 100644 index 0000000000000000000000000000000000000000..1782cc121fe030703262b0e5a7ccbb0996b9051f GIT binary patch literal 394 zcmV;50d@X~P)P000>X1^@s6#OZ}&00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yPj(Fz#NosxM!cyrrTH+0+(DqTmQfJ-{wp7 zEwI*R%mcFkbLN7E0w>$qFiy;r`oaZ6v0#gTQ|1yCS=jDXA(2j!1w@>bhyyceyTM8Y z=COA0`daxHF@J&@!Jb+IRTV0B6LQ?Z;qH1)J%Do)tbIxZQ~Ch76e2e9Eu3ip*!os3 z-S-6lQ`j2~gNx2Pp%L(>oA5!-Lla=IO&IQar_8KF%nzPP1sj{9C2SG#OB#7!FW>tp z@Sw%I9+p{iQAWYl_I&N^^Bua%*q8rCD`1mTJz^@-<;Iav-KLT`GscuYC9c#X+SUgy oZrg0B3CV(EyXRDr`IL`^2d7%YV;=@~ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_home_selected.png b/app/src/main/res/drawable-mdpi/ic_home_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..8e4aa77bd6b1aab4cd79e4018feac7cddd641a12 GIT binary patch literal 431 zcmV;g0Z{&lP)P000;W1^@s654Bdt00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP~kG(L4}Q97|WP*j<0QNs&!GZ@(wEDdc%>)v$>CMqBB0Q8OuyraB0{}CKII9l ZC11aMbT+YOP5=M^002ovPDHLkV1hLXu;c&$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_live.png b/app/src/main/res/drawable-mdpi/ic_live.png new file mode 100644 index 0000000000000000000000000000000000000000..a9b1666710a898931e8fdfafd2bffaa1227dfd93 GIT binary patch literal 426 zcmV;b0agBqP)P000;W1^@s654Bdt00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP2tzN1f^L*$=!r+*AH0)P URt;*RW&i*H07*qoM6N<$g50>QfB*mh literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_live_selected.png b/app/src/main/res/drawable-mdpi/ic_live_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..bcec1adf8f54c3d6bf6efeae427708d314cf3f86 GIT binary patch literal 764 zcmVP000>X1^@s6#OZ}&00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP)U)u z*I}-Gd5BVW1Yik4K2I|i0!pj{fc4y`%fppH7(jrkX(vh@UF>eYOEbRM^G{f3u3Jk3 z63GpRh#Bx2m3lKM`gK@AIHUsQP`^4-c|4HgZ%ldlYAw!&9|pR z&I#`ayZ#6wb)bEC@;GRQTTYN??U3RNY&7l_{2HIJ69L2wF%TF93p35OO;WMALq7r41nxW{;@OtODnT zf3d~EMl z&PQ$#Whz5T?^S$B4XJIYn<*Ek_MB$bv7HKZTT3uAGYnYz_E&B=s?yEf5eoj;9m7VZ(xlS9)}s_`qpZy+q(WEO}=_-#NOB1}$&YpA;PoPEMT u2`@U-=1+tvFFd$k%v7srqa#P000>X1^@s6#OZ}&00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yPbAB6t8%`#3EhVrLkTZh=`B(>cp#ARw9maud~A&~+xT5>`mM!h~=c)fukg zuO@89v*2r7d}I>4OEg&=luHI`8DLnG1|Qe_74>KI?Dn>CpRjT_8>F^PqPeog-iVoBSiObcr)bOCA#Vjaqkw2`Dk&C&Gr` Z@eWWeX*Fm!J39aX002ovPDHLkV1fVxsvH0S literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_subscribe.png b/app/src/main/res/drawable-mdpi/ic_subscribe.png new file mode 100644 index 0000000000000000000000000000000000000000..4e071a74b85df3e878d67b94a8228a55433212d5 GIT binary patch literal 439 zcmV;o0Z9IdP)P000;W1^@s654Bdt00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yPmx%dD8 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_subscribe_selected.png b/app/src/main/res/drawable-mdpi/ic_subscribe_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..a896c516f480bc018ebebee4ceb89a49a908e86a GIT binary patch literal 631 zcmV--0*L*IP)P000>X1^@s6#OZ}&00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP1`Q`DHwZmJ(x-^LV5zOtH{b;L1`a`r zguye+1S2KRCYS`}lcH#LXXl$)&(8vE0H&y7(2c$1L#bt$117#Arj!5sepKWvzGPVc zKlkHG@*Xb?Q5%HB7-(6<^XdI%cASyuA!}`CVvuN$gwG)U$m=oCF%pCf|JFBx?e6+jluLX zqV7_XdOvPF5kRyxhNJMnAAT9!w$O1^PvG|M+2}Cb^M~bf+RP%V>KZJIBy+K?1iOP# z2PKQ-@;$enI>e{-vr!j@A`u-stt~hV;>}Mna0EqR%;~>xADe|qCfA18fmZ@kI{5S5 z@6D})( zB=YgMUnEHlRADWaw3c6*$*$+-Xke|6Ka`%gqaEXUVI~q08fy|Lyt{YM$l09{LU;oh zYp-YIyu#Oh9MDuWq7X=4YX^vABA!r6H*9fR9BOOhWZ)hU|DJL*`n&IkOG)z34v-`= zdb1HAJtvaJS!QM__d;_58^7O;OWRM`cl~#9sy!I*d>AE RlB56t002ovPDHLkV1l$`6$StR literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_tabbar_home.xml b/app/src/main/res/drawable/ic_tabbar_home.xml new file mode 100644 index 00000000..5c818270 --- /dev/null +++ b/app/src/main/res/drawable/ic_tabbar_home.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_tabbar_live.xml b/app/src/main/res/drawable/ic_tabbar_live.xml index b1c2c480..46be9509 100644 --- a/app/src/main/res/drawable/ic_tabbar_live.xml +++ b/app/src/main/res/drawable/ic_tabbar_live.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/drawable/ic_tabbar_my.xml b/app/src/main/res/drawable/ic_tabbar_my.xml index 0f0410de..1ee51e6e 100644 --- a/app/src/main/res/drawable/ic_tabbar_my.xml +++ b/app/src/main/res/drawable/ic_tabbar_my.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5630178b..9325afa3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -163,7 +163,7 @@ app:labelVisibilityMode="labeled"> - -