From c0942e87ed7aba87b1b47c7cb439ae5bb17db415 Mon Sep 17 00:00:00 2001 From: SangHyun Ko <87695921+kkosang@users.noreply.github.com> Date: Mon, 12 Aug 2024 12:53:30 +0900 Subject: [PATCH] =?UTF-8?q?[0.2.0.alpha/AN=5FUI]=20=ED=99=88=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EB=A9=94=EB=89=B4=20=EC=B6=94=EA=B0=80=20(#204)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ui: 홈 메뉴와 관련된 아이콘 추가 * ui: 추가된 메뉴 xml 작성 * feat: 바이옴 화면 추가 * feat: 아이템 화면 추가 * feat: 홈 화면과 연결 * style: ktFormat --- android/app/src/main/AndroidManifest.xml | 10 +- .../presentation/biome/BiomeActivity.kt | 19 ++ .../presentation/home/HomeActionHandler.kt | 6 + .../helper/presentation/home/HomeActivity.kt | 18 ++ .../presentation/home/HomeNavigateEvent.kt | 6 + .../helper/presentation/home/HomeViewModel.kt | 18 ++ .../helper/presentation/item/ItemActivity.kt | 19 ++ .../main/res/drawable/icon_home_battle.png | Bin 0 -> 2302 bytes .../src/main/res/drawable/icon_home_biome.png | Bin 0 -> 3033 bytes .../src/main/res/drawable/icon_home_item.png | Bin 0 -> 1911 bytes .../src/main/res/layout/activity_biome.xml | 25 ++ .../app/src/main/res/layout/activity_home.xml | 263 ++++++++++++++---- .../app/src/main/res/layout/activity_item.xml | 25 ++ android/app/src/main/res/values/strings.xml | 9 + 14 files changed, 362 insertions(+), 56 deletions(-) create mode 100644 android/app/src/main/java/poke/rogue/helper/presentation/biome/BiomeActivity.kt create mode 100644 android/app/src/main/java/poke/rogue/helper/presentation/item/ItemActivity.kt create mode 100644 android/app/src/main/res/drawable/icon_home_battle.png create mode 100644 android/app/src/main/res/drawable/icon_home_biome.png create mode 100644 android/app/src/main/res/drawable/icon_home_item.png create mode 100644 android/app/src/main/res/layout/activity_biome.xml create mode 100644 android/app/src/main/res/layout/activity_item.xml diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e179719d..4803229e 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -25,8 +25,8 @@ android:exported="true" /> + android:exported="true" + android:launchMode="singleTask"> @@ -39,6 +39,12 @@ + + diff --git a/android/app/src/main/java/poke/rogue/helper/presentation/biome/BiomeActivity.kt b/android/app/src/main/java/poke/rogue/helper/presentation/biome/BiomeActivity.kt new file mode 100644 index 00000000..83e2842c --- /dev/null +++ b/android/app/src/main/java/poke/rogue/helper/presentation/biome/BiomeActivity.kt @@ -0,0 +1,19 @@ +package poke.rogue.helper.presentation.biome + +import android.content.Context +import android.content.Intent +import androidx.appcompat.widget.Toolbar +import poke.rogue.helper.R +import poke.rogue.helper.databinding.ActivityBiomeBinding +import poke.rogue.helper.presentation.toolbar.ToolbarActivity + +class BiomeActivity : ToolbarActivity(R.layout.activity_biome) { + override val toolbar: Toolbar + get() = binding.toolbarBiome + + companion object { + fun intent(context: Context): Intent { + return Intent(context, BiomeActivity::class.java) + } + } +} diff --git a/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeActionHandler.kt b/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeActionHandler.kt index 5dc67f90..f39e4a55 100644 --- a/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeActionHandler.kt +++ b/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeActionHandler.kt @@ -10,4 +10,10 @@ interface HomeActionHandler { fun navigateToTip() fun navigateToPokeRogue() + + fun navigateToBiome() + + fun navigateToItem() + + fun navigateToBattle() } diff --git a/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeActivity.kt b/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeActivity.kt index a2ccc80d..54b224a3 100644 --- a/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeActivity.kt +++ b/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeActivity.kt @@ -11,7 +11,9 @@ import poke.rogue.helper.analytics.AnalyticsLogger import poke.rogue.helper.analytics.analyticsLogger import poke.rogue.helper.databinding.ActivityHomeBinding import poke.rogue.helper.presentation.ability.AbilityActivity +import poke.rogue.helper.presentation.biome.BiomeActivity import poke.rogue.helper.presentation.dex.PokemonActivity +import poke.rogue.helper.presentation.item.ItemActivity import poke.rogue.helper.presentation.tip.TipActivity import poke.rogue.helper.presentation.toolbar.ToolbarActivity import poke.rogue.helper.presentation.type.TypeActivity @@ -64,6 +66,19 @@ class HomeActivity : ToolbarActivity(R.layout.activity_home logger.logClickEvent(NAVIGATE_TO_TIP) } + is HomeNavigateEvent.ToBiome -> + startActivity { + logger.logClickEvent(NAVIGATE_TO_BIOME) + } + + is HomeNavigateEvent.ToItem -> { + startActivity { + logger.logClickEvent(NAVIGATE_TO_ITEM) + } + } + + is HomeNavigateEvent.ToBattle -> {} + is HomeNavigateEvent.ToLogo -> navigateToPokeRogue() } } @@ -86,6 +101,9 @@ class HomeActivity : ToolbarActivity(R.layout.activity_home private const val NAVIGATE_TO_DEX = "Nav_Dex" private const val NAVIGATE_TO_ABILITY = "Nav_Ability" private const val NAVIGATE_TO_TIP = "Nav_Tip" + private const val NAVIGATE_TO_BIOME = "Nav_Biome" + private const val NAVIGATE_TO_ITEM = "Nav_Item" + private const val NAVIGATE_TO_BATTLE = "Nav_Battle" // todo 배틀 화면 fun intent(context: Context): Intent { return Intent(context, HomeActivity::class.java) diff --git a/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeNavigateEvent.kt b/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeNavigateEvent.kt index 9b8afd4c..9fa9a0d6 100644 --- a/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeNavigateEvent.kt +++ b/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeNavigateEvent.kt @@ -10,4 +10,10 @@ sealed interface HomeNavigateEvent { data object ToTip : HomeNavigateEvent data object ToLogo : HomeNavigateEvent + + data object ToBiome : HomeNavigateEvent + + data object ToItem : HomeNavigateEvent + + data object ToBattle : HomeNavigateEvent } diff --git a/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeViewModel.kt b/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeViewModel.kt index f7df8009..2dd55f7f 100644 --- a/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeViewModel.kt +++ b/android/app/src/main/java/poke/rogue/helper/presentation/home/HomeViewModel.kt @@ -40,4 +40,22 @@ class HomeViewModel : ViewModel(), HomeActionHandler { _navigationEvent.emit(HomeNavigateEvent.ToLogo) } } + + override fun navigateToBiome() { + viewModelScope.launch { + _navigationEvent.emit(HomeNavigateEvent.ToBiome) + } + } + + override fun navigateToItem() { + viewModelScope.launch { + _navigationEvent.emit(HomeNavigateEvent.ToItem) + } + } + + override fun navigateToBattle() { + viewModelScope.launch { + _navigationEvent.emit(HomeNavigateEvent.ToBattle) + } + } } diff --git a/android/app/src/main/java/poke/rogue/helper/presentation/item/ItemActivity.kt b/android/app/src/main/java/poke/rogue/helper/presentation/item/ItemActivity.kt new file mode 100644 index 00000000..20d61441 --- /dev/null +++ b/android/app/src/main/java/poke/rogue/helper/presentation/item/ItemActivity.kt @@ -0,0 +1,19 @@ +package poke.rogue.helper.presentation.item + +import android.content.Context +import android.content.Intent +import androidx.appcompat.widget.Toolbar +import poke.rogue.helper.R +import poke.rogue.helper.databinding.ActivityItemBinding +import poke.rogue.helper.presentation.toolbar.ToolbarActivity + +class ItemActivity : ToolbarActivity(R.layout.activity_item) { + override val toolbar: Toolbar + get() = binding.toolbarItem + + companion object { + fun intent(context: Context): Intent { + return Intent(context, ItemActivity::class.java) + } + } +} diff --git a/android/app/src/main/res/drawable/icon_home_battle.png b/android/app/src/main/res/drawable/icon_home_battle.png new file mode 100644 index 0000000000000000000000000000000000000000..94f72ccd9212a82b2f0592ee44aa945a5ab8e664 GIT binary patch literal 2302 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 bryc(Xg^?rt?t$g(00000NkvXXu0mjfMnA}8 literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable/icon_home_item.png b/android/app/src/main/res/drawable/icon_home_item.png new file mode 100644 index 0000000000000000000000000000000000000000..e06ced56effa0926ab5965c142875ab277df9214 GIT binary patch literal 1911 zcmV--2Z;EIP)K~#7F?VDXp z6jv0-|I5HE3k$m-yOfBqZKbuPv5H!?M!^S@hNSVKiA|a&ElqsrL&e0$KB(_D)ueqe zX;V#YA51m&#b~q&V%4e@jkHqGvIw$(d<^V|%j{S0%$=ECc6N8xS%}RtKQh^~XYStJ zGjq;8=gz$VOAHeh2^Rqi1LtwBgZi;5CvFbEIEU9xiksSAGF$h zWIJGIOe}JxCwS!(xXv|eG&@e>yaQRFH-7hq*8>$|jgxBp`+fBI?Jwn|3aAF@?gO*DcYO87$r3cyuGs2}bsjsI= zyvAySg+a<3p@UG7#RR5GeX$Bk;y;%uV8lZ}7$Es@IsI&`&`w_LQZu`%4=gb<-r-j6 zT}Aeu9)cF*r4B@-tB!)joR{b)YlD5KvN71Hq#~!O01Wq83QsGhK^?;4=$Q3f7*y*Zr)k|-GB~{lMT?Wgu6p`0R z1!lI2V)*H?BPtikwt)xe?Ubxex(r2Fy$GsqtXGIoeTEmhIU`}zjg>)!q2R@v= zH)J$eNI5Cl{Fx%I_&n~e{rltY+Hf$nzP_Cp+(6~QBY;1}R}7cOCo1(bgD?lCRBc8% z&-~EJ5+g0;I~iU2dSjC!Z#KV*7r|vqA*PFHnc47U01j?il;z2PG6PNr1|3dOc85sC zmK5F@4Gyvi^{lxJFM>Jp5Mj1}j$r;+6y+KNRG489U}}JFriYTZ`AGY=6SJ7qiR+GO=^=ODyN#Q0cq*L2%Ik^bit*kESWE z;u<*nbt-#2q)wgR)^O>3C+qp}gyXy-Ut(^hY}5GmM#Ri?gj~1&6|hA#@!$S)03n|0 zAKd#5|9HDZxoUbVipX-PKrj|c*=I!ji;A+(`WNObLn+!smB)oVJBCbTZLlxC9EsjE zZFVl-jnY#3#ISiw6OrlqkZ;BYzdtC-1CLK)EKGlNJy(a4NIfzUC4UhqKK&NAXmlKme(0t4rCQjmG>vUqy&ZKm zD@A!|!h@LrjoT+rgi7yD+CH*2xU8gHk)2M9A`1hCa0vMQJTX}9G(I0s&QXK;Py~7r zR{Z7fvX+!#nY~JsrvrWjLNw18Xsk;cE}g_dSvY?3+x@cKUem5L*tGE-a@S~4(c9|* zFI7}sT|uxc?S5n=u5Vhk0VZJi0T-B%xp8zr98(YkFHYN}QsS00WGVtj@^GC6(vDDK?3BA+rg zrX^x*Ov{Eu_ujYfFe)k>qP%WpBg{p)?~zU<(RC9^a^p7Q#>bEahD+x=dUubt$-?>b zKYz`##o`vf4yzr744n2ck37-=crS002ovPDHLkV1fh2k>UUV literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/layout/activity_biome.xml b/android/app/src/main/res/layout/activity_biome.xml new file mode 100644 index 00000000..8f54dc95 --- /dev/null +++ b/android/app/src/main/res/layout/activity_biome.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + diff --git a/android/app/src/main/res/layout/activity_home.xml b/android/app/src/main/res/layout/activity_home.xml index 8e50a04c..7eac450d 100644 --- a/android/app/src/main/res/layout/activity_home.xml +++ b/android/app/src/main/res/layout/activity_home.xml @@ -45,11 +45,11 @@ app:layout_constraintTop_toTopOf="parent" /> - + + android:layout_marginTop="24dp" + android:src="@drawable/img_home_type" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + android:textAppearance="@style/TextAppearance.Poke.TitleBold" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + + + + + + + + + + + + + + + - + + + android:layout_marginTop="24dp" + android:src="@drawable/img_home_dex" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + android:textAppearance="@style/TextAppearance.Poke.TitleBold" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + + - + + + android:layout_marginTop="24dp" + android:src="@drawable/img_home_ability" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + android:textAppearance="@style/TextAppearance.Poke.TitleBold" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + + + + + + + + + + + + + + + + + + + + + + + + - + + + android:layout_marginTop="24dp" + android:src="@drawable/img_home_tip" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + android:textAppearance="@style/TextAppearance.Poke.TitleBold" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + + diff --git a/android/app/src/main/res/layout/activity_item.xml b/android/app/src/main/res/layout/activity_item.xml new file mode 100644 index 00000000..0b24d7b7 --- /dev/null +++ b/android/app/src/main/res/layout/activity_item.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 3084e1d9..4714da86 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -23,6 +23,9 @@ 포켓몬 도감 특성 도감 꿀팁 + 배틀 구도 + 바이옴 도감 + 아이템 도감 포켓몬 도감 @@ -38,6 +41,12 @@ 잘못된 abilityId값(-1) 입니다. 잘못된 containerId값(-1) 입니다. + + 바이옴 도감 + + + 아이템 도감 + 알수없는 문제가 발생했습니다.. 네트워크 에러 이미지