feat: Mighty / Color chain + NP type detection implementation

app/src/main/java/io/github/fate_grand_automata/di/script/PreferencesModule.kt

@@ -7,6 +7,7 @@ import io.github.fate_grand_automata.scripts.models.AutoSkillCommand
 import io.github.fate_grand_automata.scripts.models.CardPriorityPerWave
 import io.github.fate_grand_automata.scripts.models.ServantPriorityPerWave
 import io.github.fate_grand_automata.scripts.models.SpamConfigPerTeamSlot
+import io.github.fate_grand_automata.scripts.models.battle.ChainPriorityPerWave
 import io.github.fate_grand_automata.scripts.prefs.IBattleConfig
 import io.github.fate_grand_automata.scripts.prefs.IPreferences
 import io.github.fate_grand_automata.scripts.prefs.ISupportPreferences
@@ -50,4 +51,9 @@ class PreferencesModule {
     @Provides
     fun provideServantPriority(battleConfig: IBattleConfig): ServantPriorityPerWave? =
         if (battleConfig.useServantPriority) battleConfig.servantPriority else null
+
+    @ScriptScope
+    @Provides
+    fun provideChainPriority(battleConfig: IBattleConfig): ChainPriorityPerWave? =
+        if (battleConfig.useChainPriority) battleConfig.chainPriority else null
 }

app/src/main/java/io/github/fate_grand_automata/ui/Theme.kt

@@ -159,6 +159,10 @@ private val DarkColors = darkColorScheme(
 fun FGAListItemColors() = ListItemDefaults.colors(
     containerColor = MaterialTheme.colorScheme.surfaceVariant
 )
+@Composable
+fun FGAListItemColorsDisabled() = ListItemDefaults.colors(
+    containerColor = Color.Gray
+)
 
 @Composable
 fun FGATheme(

app/src/main/java/io/github/fate_grand_automata/ui/card_priority/CardPriorityListItem.kt

@@ -2,12 +2,14 @@ package io.github.fate_grand_automata.ui.card_priority
 
 import androidx.compose.runtime.MutableState
 import io.github.fate_grand_automata.scripts.enums.BraveChainEnum
+import io.github.fate_grand_automata.scripts.enums.ChainTypeEnum
 import io.github.fate_grand_automata.scripts.models.CardScore
 import io.github.fate_grand_automata.scripts.models.TeamSlot
 
 data class CardPriorityListItem(
     val scores: MutableList<CardScore>,
     val servantPriority: MutableList<TeamSlot>,
+    val chainPriority: MutableList<ChainTypeEnum>,
     var rearrangeCards: MutableState<Boolean>,
     var braveChains: MutableState<BraveChainEnum>
 )

app/src/main/java/io/github/fate_grand_automata/ui/card_priority/CardPriorityScreen.kt

@@ -10,7 +10,8 @@ fun CardPriorityScreen(
 ) {
     CardPriorityView(
         items = vm.cardPriorityItems,
-        useServantPriority = vm.useServantPriority
+        useServantPriority = vm.useServantPriority,
+        useChainPriority = vm.useChainPriority
     )
 
     DisposableEffect(vm) {

app/src/main/java/io/github/fate_grand_automata/ui/card_priority/CardPriorityView.kt

@@ -31,7 +31,8 @@ import kotlinx.coroutines.launch
 @Composable
 fun CardPriorityView(
     items: SnapshotStateList<CardPriorityListItem>,
-    useServantPriority: Pref<Boolean>
+    useServantPriority: Pref<Boolean>,
+    useChainPriority: Pref<Boolean>
 ) {
     val pagerState = rememberPagerState(pageCount = {items.size},)
     val scope = rememberCoroutineScope()
@@ -50,6 +51,13 @@ fun CardPriorityView(
             val servantPriority by useServantPriority.remember()
             useServantPriority.SwitchPreference(
                 title = stringResource(R.string.p_battle_config_use_servant_priority),
+                modifier = Modifier
+                    .padding(bottom = 4.dp)
+            )
+
+            val chainPriority by useChainPriority.remember()
+            useChainPriority.SwitchPreference(
+                title = stringResource(R.string.p_battle_config_use_chain_priority),
                 modifier = Modifier
                     .padding(bottom = 16.dp)
             )
@@ -81,7 +89,8 @@ fun CardPriorityView(
                     }
 
                     items.getOrNull(it)?.Render(
-                        useServantPriority = servantPriority
+                        useServantPriority = servantPriority,
+                        useChainPriority = chainPriority
                     )
                 }
             }

app/src/main/java/io/github/fate_grand_automata/ui/card_priority/CardPriorityViewModel.kt

@@ -11,6 +11,7 @@ import io.github.fate_grand_automata.scripts.enums.BraveChainEnum
 import io.github.fate_grand_automata.scripts.models.CardPriority
 import io.github.fate_grand_automata.scripts.models.CardPriorityPerWave
 import io.github.fate_grand_automata.scripts.models.ServantPriorityPerWave
+import io.github.fate_grand_automata.scripts.models.battle.ChainPriorityPerWave
 import javax.inject.Inject
 
 @HiltViewModel
@@ -21,6 +22,7 @@ class CardPriorityViewModel @Inject constructor(
     val cardPriorityItems: SnapshotStateList<CardPriorityListItem> by lazy {
         val cardPriority = battleConfig.cardPriority.get()
         val servantPriority = battleConfig.servantPriority.get()
+        val chainPriority = battleConfig.chainPriority.get()
 
         val rearrangeCards = battleConfig.rearrangeCards.get()
         val braveChains = battleConfig.braveChains.get()
@@ -33,6 +35,7 @@ class CardPriorityViewModel @Inject constructor(
                 CardPriorityListItem(
                     it.value,
                     servantPriority.atWave(it.index).toMutableList(),
+                    chainPriority.atWave(it.index).toMutableList(),
                     mutableStateOf(rearrangeCards.getOrElse(it.index) { false }),
                     mutableStateOf(braveChains.getOrElse(it.index) { BraveChainEnum.None })
                 )
@@ -41,6 +44,7 @@ class CardPriorityViewModel @Inject constructor(
     }
 
     val useServantPriority = battleConfig.useServantPriority
+    val useChainPriority = battleConfig.useChainPriority
 
     fun save() {
         battleConfig.cardPriority.set(
@@ -55,6 +59,12 @@ class CardPriorityViewModel @Inject constructor(
             )
         )
 
+        battleConfig.chainPriority.set(
+            ChainPriorityPerWave.from(
+                cardPriorityItems.map { it.chainPriority }
+            )
+        )
+
         battleConfig.rearrangeCards.set(cardPriorityItems.map { it.rearrangeCards.value })
         battleConfig.braveChains.set(cardPriorityItems.map { it.braveChains.value })
     }

app/src/main/java/io/github/fate_grand_automata/ui/card_priority/CardPriorityWaveSelector.kt

@@ -108,6 +108,7 @@ fun CardPriorityWaveSelector(
                                     CardPriorityListItem(
                                         items[0].scores.toMutableList(),
                                         items[0].servantPriority.toMutableList(),
+                                        items[0].chainPriority.toMutableList(),
                                         mutableStateOf(false),
                                         mutableStateOf(BraveChainEnum.None)
                                     )

app/src/main/java/io/github/fate_grand_automata/ui/card_priority/Render.kt

@@ -21,6 +21,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import io.github.fate_grand_automata.R
 import io.github.fate_grand_automata.scripts.enums.BraveChainEnum
+import io.github.fate_grand_automata.scripts.enums.ChainTypeEnum
 import io.github.fate_grand_automata.scripts.models.TeamSlot
 import io.github.fate_grand_automata.ui.FGAListItemColors
 import io.github.fate_grand_automata.ui.drag_sort.DragSort
@@ -30,7 +31,8 @@ import io.github.fate_grand_automata.util.stringRes
 
 @Composable
 fun CardPriorityListItem.Render(
-    useServantPriority: Boolean
+    useServantPriority: Boolean,
+    useChainPriority: Boolean
 ) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally
@@ -53,15 +55,19 @@ fun CardPriorityListItem.Render(
                 val braveChainDialog = listDialog(
                     selected = braveChains,
                     onSelectedChange = { braveChains = it },
-                    entries = BraveChainEnum.entries
+                    entries = BraveChainEnum.entries.filter {
+                            useChainPriority || it != BraveChainEnum.Always
+                        }
                         .associateWith { stringResource(it.stringRes) },
                     title = stringResource(R.string.p_brave_chains)
                 )
 
                 ListItem(
                     modifier = Modifier
                         .weight(1f)
-                        .clickable { braveChainDialog.show() },
+                        .clickable {
+                            braveChainDialog.show()
+                        },
                     headlineContent = { Text(stringResource(R.string.p_brave_chains)) },
                     supportingContent = { Text(stringResource(braveChains.stringRes)) },
                     colors = FGAListItemColors()
@@ -85,6 +91,12 @@ fun CardPriorityListItem.Render(
             }
         }
 
+        if (useChainPriority) {
+            ChainPriority(
+                priorities = chainPriority
+            )
+        }
+
         if (useServantPriority) {
             ServantPriority(
                 priorities = servantPriority
@@ -98,7 +110,7 @@ private fun ServantPriority(
     priorities: MutableList<TeamSlot>
 ) {
     Text(
-        "Servant Priority".uppercase(),
+        stringResource(R.string.p_servant_priority).uppercase(),
         modifier = Modifier
             .padding(bottom = 5.dp, top = 16.dp)
     )
@@ -122,4 +134,59 @@ private fun ServantPriority(
             )
         }
     )
-}
+}
+
+@Composable
+private fun ChainPriority(
+    priorities: MutableList<ChainTypeEnum>
+) {
+    Text(
+        stringResource(R.string.p_chain_priority).uppercase(),
+        modifier = Modifier
+            .padding(bottom = 10.dp, top = 10.dp)
+    )
+
+    val context = LocalContext.current
+
+    val getForegroundColor = fun (enum: ChainTypeEnum): Int {
+        return (if (priorities.isAfterCutoff(enum)) context.getColor(R.color.colorDisabledText)
+        else when (enum) {
+            ChainTypeEnum.None -> Color.BLACK
+            else -> Color.WHITE
+        })
+    }
+    val getBackgroundColor = fun (enum: ChainTypeEnum): Int {
+        return (if (priorities.isAfterCutoff(enum)) R.color.colorDisabledBackground
+            else when (enum) {
+                ChainTypeEnum.Arts -> R.color.colorArts
+                ChainTypeEnum.Quick -> R.color.colorQuick
+                ChainTypeEnum.Buster -> R.color.colorBuster
+                ChainTypeEnum.Mighty -> R.color.colorPrimaryDark
+                ChainTypeEnum.Avoid -> R.color.colorAvoid
+                ChainTypeEnum.None -> R.color.colorDisabledBackground
+            }
+        ).let { res -> context.getColor(res) }
+    }
+    val localizedStringMap: MutableMap<ChainTypeEnum, String> = mutableMapOf()
+    ChainTypeEnum.entries.forEach {
+        localizedStringMap[it] = if (it == ChainTypeEnum.None) "│" else stringResource(it.stringRes)
+    }
+    DragSort(
+        items = priorities,
+        viewConfigGrabber = {
+            DragSortAdapter.ItemViewConfig(
+                foregroundColor = getForegroundColor(it),
+                backgroundColor = getBackgroundColor(it),
+                text = localizedStringMap.getOrElse(it) { it.name },
+            )
+        },
+        updateBackgroundColorOnMove = true
+    )
+}
+
+fun MutableList<ChainTypeEnum>.isAfterCutoff(chainTypeEnum: ChainTypeEnum, indexOfAvoid: Int? = null): Boolean {
+    val avoidIndex = indexOfAvoid ?: this.indexOf(ChainTypeEnum.Cutoff)
+    val enumIndex = this.indexOf(chainTypeEnum)
+    if (avoidIndex < 0) return false
+    return enumIndex > avoidIndex
+}

app/src/main/java/io/github/fate_grand_automata/ui/drag_sort/DragSort.kt

@@ -10,7 +10,8 @@ import io.github.fate_grand_automata.util.ItemTouchHelperCallback
 @Composable
 fun <T> DragSort(
     items: MutableList<T>,
-    viewConfigGrabber: (T) -> DragSortAdapter.ItemViewConfig
+    viewConfigGrabber: (T) -> DragSortAdapter.ItemViewConfig,
+    updateBackgroundColorOnMove: Boolean = false
 ) {
     AndroidView(
         factory = { context ->
@@ -23,9 +24,12 @@ fun <T> DragSort(
         update = {
             it.adapter = DragSortAdapter(
                 items,
-                viewConfigGrabber
+                viewConfigGrabber,
+                updateBackgroundColorOnMove
             ).also { adapter ->
-                val callback = ItemTouchHelperCallback(adapter)
+                val callback = ItemTouchHelperCallback(
+                    adapter = adapter
+                )
                 val itemTouchHelper = ItemTouchHelper(callback)
                 itemTouchHelper.attachToRecyclerView(it)
 

app/src/main/java/io/github/fate_grand_automata/ui/drag_sort/DragSortAdapter.kt

@@ -15,7 +15,8 @@ import io.github.fate_grand_automata.util.IItemTouchHelperViewHolder
 
 class DragSortAdapter<T>(
     private val items: MutableList<T>,
-    private val viewConfigGrabber: (T) -> ItemViewConfig
+    private val viewConfigGrabber: (T) -> ItemViewConfig,
+    val updateBackgroundColorOnMove: Boolean = false,
 ) : RecyclerView.Adapter<DragSortAdapter.ViewHolder>(), IItemTouchHelperAdapter {
     class ItemViewConfig(
         @ColorInt val foregroundColor: Int,
@@ -59,11 +60,24 @@ class DragSortAdapter<T>(
         holder.textView.setTextColor(viewConfig.foregroundColor)
     }
 
-    override fun onItemMove(From: Int, To: Int) {
-        val temp = items[From]
-        items[From] = items[To]
-        items[To] = temp
+    override fun onItemMove(from: Int, to: Int, origin: View?, target: View?) {
+        val temp = items[from]
+        items[from] = items[to]
+        items[to] = temp
 
-        notifyItemMoved(From, To)
+        // Swap views since the items also swapped
+        val views = listOf(target, origin)
+        for ((index, pos) in listOf(from, to).withIndex()) {
+            val currentItem = items[pos]
+            val viewConfig = viewConfigGrabber(currentItem)
+            val view = views[index]
+            if (updateBackgroundColorOnMove && view != null) {
+                view.setBackgroundColor(viewConfig.backgroundColor)
+                val textView: TextView = view.findViewById(R.id.drag_sort_text)
+                textView.setTextColor(viewConfig.foregroundColor)
+            }
+        }
+
+        notifyItemMoved(from, to)
     }
 }

app/src/main/java/io/github/fate_grand_automata/util/ItemTouchHelperCallback.kt

@@ -3,19 +3,26 @@ package io.github.fate_grand_automata.util
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 
-class ItemTouchHelperCallback(private val Adapter: IItemTouchHelperAdapter,
-    private val DragFlags: Int = ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) : ItemTouchHelper.Callback() {
+class ItemTouchHelperCallback(
+    private val adapter: IItemTouchHelperAdapter,
+    private val dragFlags: Int = ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT,
+) : ItemTouchHelper.Callback() {
 
     override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
-        return makeMovementFlags(DragFlags, 0)
+        return makeMovementFlags(dragFlags, 0)
     }
 
     override fun isLongPressDragEnabled() = true
 
     override fun isItemViewSwipeEnabled() = false
 
     override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
-        Adapter.onItemMove(viewHolder.bindingAdapterPosition, target.bindingAdapterPosition)
+        adapter.onItemMove(
+            viewHolder.bindingAdapterPosition,
+            target.bindingAdapterPosition,
+            viewHolder.itemView,
+            target.itemView
+        )
         return true
     }
 

app/src/main/java/io/github/fate_grand_automata/util/ItemTouchHelpers.kt

@@ -1,7 +1,9 @@
 package io.github.fate_grand_automata.util
 
+import android.view.View
+
 interface IItemTouchHelperAdapter {
-    fun onItemMove(From: Int, To: Int)
+    fun onItemMove(from: Int, to: Int, origin: View? = null, target: View? = null)
 }
 
 interface IItemTouchHelperViewHolder {