fix kukulkan showing on master skills (#1842)

Fate-Grand-Automata · Aug 14, 2024 · 54415c5 · 54415c5
1 parent b0565d8
commit 54415c5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/skill_maker/SkillMakerActivity.kt b/app/src/main/java/io/github/fate_grand_automata/ui/skill_maker/SkillMakerActivity.kt
@@ -152,6 +152,7 @@ fun SkillMakerUI(
                     onSpaceIshtar = {
                         navigate(SkillMakerNav.SpaceIshtar(nav.skill))
                     },
+                    showKukulkan = nav.skill !is Skill.Master,
                     onKukulkan = {
                         navigate(SkillMakerNav.Kukulkan(nav.skill))
                     },

diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/skill_maker/SkillMakerTarget.kt b/app/src/main/java/io/github/fate_grand_automata/ui/skill_maker/SkillMakerTarget.kt
@@ -28,6 +28,7 @@ fun SkillMakerTarget(
     onEmiya: () -> Unit,
     showSpaceIshtar: Boolean,
     onSpaceIshtar: () -> Unit,
+    showKukulkan: Boolean,
     onKukulkan: () -> Unit,
     showMelusine: Boolean,
     onMelusine: () -> Unit
@@ -72,8 +73,10 @@ fun SkillMakerTarget(
             modifier = Modifier
                 .fillMaxWidth()
         ) {
-            Button(onClick = onKukulkan) {
-                Text(stringResource(R.string.skill_maker_kukulkan))
+            if (showKukulkan) {
+                Button(onClick = onKukulkan) {
+                    Text(stringResource(R.string.skill_maker_kukulkan))
+                }
             }
 
             if (
@@ -118,14 +121,20 @@ fun TestSkillMakerTargetIshtar() = TestSkillMaker(showSpaceIshtar = true)
 fun TestSkillMakerOnlyKukulkan() = TestSkillMaker()
 
 @Composable
-private fun TestSkillMaker(showEmiya: Boolean = false, showSpaceIshtar: Boolean = false, showMelusine: Boolean = showEmiya) {
+private fun TestSkillMaker(
+    showEmiya: Boolean = false,
+    showKukulkan: Boolean = false, 
+    showSpaceIshtar: Boolean = false, 
+    showMelusine: Boolean = showEmiya
+) {
     FGATheme {
         SkillMakerTarget(
             onSkillTarget = {},
             showEmiya = showEmiya,
             onEmiya = {},
             showSpaceIshtar = showSpaceIshtar,
             onSpaceIshtar = {},
+            showKukulkan = showKukulkan,
             onKukulkan = {},
             showMelusine = showMelusine,
             onMelusine = {}