Skip to content

Commit a59cd7f

Browse files
committed
fix: Height of TraceTree UI, little performance fix
1 parent b18ea12 commit a59cd7f

File tree

6 files changed

+14
-18
lines changed

6 files changed

+14
-18
lines changed

composeApp/icon/app_icon_beta.ico

100755100644
File mode changed.

composeApp/src/commonMain/kotlin/ui/components/CharacterTraceTree/CharacterTraceTree.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ import androidx.compose.ui.Alignment
3434
import androidx.compose.ui.Modifier
3535
import androidx.compose.ui.draw.clip
3636
import androidx.compose.ui.graphics.Color
37-
import androidx.compose.ui.layout.onGloballyPositioned
38-
import androidx.compose.ui.layout.onSizeChanged
3937
import androidx.compose.ui.platform.LocalDensity
4038
import androidx.compose.ui.text.font.FontStyle
4139
import androidx.compose.ui.unit.Dp
@@ -79,7 +77,6 @@ import utils.app.getAssetsURLByFileName
7977
import utils.app.getImageNameByRegistName
8078
import utils.app.htmlDescApplier
8179
import utils.app.newImageRequest
82-
import utils.app.pxToDp
8380
import utils.app.removeStrQuote
8481
import utils.starbase.StarbaseAPI
8582

@@ -502,7 +499,7 @@ fun TreePointDialogComponent(treeItemArray: ArrayList<TraceTreeItem>){
502499

503500
Spacer(Modifier.height(8.dp))
504501

505-
LazyRow(modifier = Modifier.fillMaxWidth().height(MATERIAL_CARD_HEIGHT)) {
502+
LazyRow(modifier = Modifier.fillMaxWidth().height(if (infoLevel.toInt() > 1) MATERIAL_CARD_HEIGHT else 0.dp)) {
506503
for ((index, key) in sortedMaterialKeyList.withIndex()) {
507504
item(key = key.officialId) {
508505
if (index != 0) {

composeApp/src/commonMain/kotlin/ui/screens/ActionOrderListPageScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ fun ActionOrderListPageScreen(
173173
if(!isInit.value){
174174
localCharList.value.addAll(UserAccount.INSTANCE.characterList)
175175
charList.value.forEach { char ->
176-
if(UserAccount.INSTANCE.characterList.filter { it.officialId == char.officialId }.isEmpty()){
176+
if(UserAccount.INSTANCE.characterList.none { it.officialId == char.officialId }){
177177
localCharList.value.add(char)
178178
}
179179
}

composeApp/src/commonMain/kotlin/ui/screens/CharacterInfoPageScreen.kt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ import types.ImageFolder
7070
import types.UserAccount
7171
import ui.components.BackIcon
7272
import ui.components.CharacterEidolon
73-
import ui.components.CharacterTraceTree.CharacterTraceTree
7473
import ui.components.HeaderData
7574
import ui.components.InfoAdviceLightcone
7675
import ui.components.InfoAdviceRelic
@@ -205,15 +204,15 @@ fun CharacterInfoPage(
205204
.align(Alignment.Center),
206205
verticalArrangement = Arrangement.spacedBy(30.dp)
207206
) {
208-
item { InfoBioColumn(charInfoJson, combatType, path, isUserOwned = !UserAccount.INSTANCE.characterList.none { it.officialId!! == characterId }, isFullEidolon = false, pageSize = pageSize) }
209-
item { InfoBasicStatus(charInfoJson, StatusType.CHARACTER) }
210-
item { CharacterTraceTree(charInfoJson, path, characterName, dialogTitle, dialogDisplay,dialogLastTrigType, dialogComponent) }
211-
item { CharacterEidolon(charInfoJson, characterName, dialogTitle, dialogDisplay, dialogLastTrigType, dialogComponent) }
212-
item { InfoAdviceLightcone(charWeightJsonObject) }
213-
item { InfoAdviceRelic(charWeightJsonObject) }
214-
item { InfoAdviceTeammate(charWeightJsonObject, characterId.toString(), dialogTitle, dialogDisplay, dialogLastTrigType, dialogComponent) }
215-
item { InfoStory(charInfoJson) }
216-
item { Box(modifier = Modifier.navigationBarsPadding().height(72.dp)) }
207+
item(key = "InfoBioColumn") { InfoBioColumn(charInfoJson, combatType, path, isUserOwned = !UserAccount.INSTANCE.characterList.none { it.officialId!! == characterId }, isFullEidolon = false, pageSize = pageSize) }
208+
item(key = "InfoBasicStatus") { InfoBasicStatus(charInfoJson, StatusType.CHARACTER) }
209+
//item(key = "CharacterTraceTree") { CharacterTraceTree(charInfoJson, path, characterName, dialogTitle, dialogDisplay,dialogLastTrigType, dialogComponent) }
210+
item(key = "CharacterEidolon") { CharacterEidolon(charInfoJson, characterName, dialogTitle, dialogDisplay, dialogLastTrigType, dialogComponent) }
211+
item(key = "InfoAdviceLightcone") { InfoAdviceLightcone(charWeightJsonObject) }
212+
item(key = "InfoAdviceRelic") { InfoAdviceRelic(charWeightJsonObject) }
213+
item(key = "InfoAdviceTeammate") { InfoAdviceTeammate(charWeightJsonObject, characterId.toString(), dialogTitle, dialogDisplay, dialogLastTrigType, dialogComponent) }
214+
item(key = "InfoStory") { InfoStory(charInfoJson) }
215+
item(key = "PaddingABox") { Box(modifier = Modifier.navigationBarsPadding().height(72.dp)) }
217216

218217
}
219218

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#Fri May 09 11:59:36 HKT 2025
1+
#Mon May 26 11:48:05 HKT 2025
22
APP_PLATFORM=Android
33
APP_PROFILE=BETA
4-
APP_VERSION=2025.05.09
4+
APP_VERSION=2025.05.26
55
APP_VERSION_BETA=3.0.1
6-
APP_VERSION_CODE=9175
6+
APP_VERSION_CODE=9197
77
APP_VERSION_CODENAME=Firefly
88
APP_VERSION_CODENAME_BETA=Echo
99
APP_VERSION_DESKTOP=1.0.4

gradlew

100755100644
File mode changed.

0 commit comments

Comments
 (0)