mirror of
https://github.com/nacabaro/vbhelper.git
synced 2026-07-30 00:31:54 +00:00
Merge pull request #59 from b13st/chore/visual-improvements
improving various visuals
This commit is contained in:
GitHub
commit
2760af5d2b
@ -2124,8 +2124,8 @@ fun BattlesScreen() {
|
||||
|
||||
// Create APIBattleCharacter from database character
|
||||
val playerCharacter = APIBattleCharacter(
|
||||
name = "Player Digimon", // We could get this from the database if needed
|
||||
namekey = "player_digimon", // Name key for the character
|
||||
name = "Player Character", // We could get this from the database if needed
|
||||
namekey = "player_digimon", // Name key for the character (functional lookup key, not shown)
|
||||
charaId = formattedCardId, // Use the formatted card ID for sprite loading
|
||||
stage = characterData.stage,
|
||||
attribute = characterData.attribute.ordinal, // Convert enum to int
|
||||
@ -2232,10 +2232,10 @@ fun BattlesScreen() {
|
||||
) {
|
||||
// Show active character info
|
||||
activeUserCharacter?.let { character ->
|
||||
Text("Active Digimon:")
|
||||
Text("Active character:")
|
||||
Text("Stage: ${character.stage}")
|
||||
activeCardId?.let { cardId ->
|
||||
Text("Digimon ID: $cardId", fontSize = 14.sp, color = Color.Blue, fontWeight = FontWeight.Bold)
|
||||
Text("Character ID: $cardId", fontSize = 14.sp, color = Color.Blue, fontWeight = FontWeight.Bold)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
@ -2336,7 +2336,7 @@ fun BattlesScreen() {
|
||||
textAlign = TextAlign.Center)
|
||||
}
|
||||
} else {
|
||||
Text("Your Digimon must be at least Stage 2 to battle",
|
||||
Text("Your character must be at least Stage 2 to battle",
|
||||
fontSize = 16.sp,
|
||||
color = Color.Red,
|
||||
textAlign = TextAlign.Center)
|
||||
|
||||
@ -43,7 +43,7 @@ fun ChooseConnectOption(
|
||||
.padding(contentPadding)
|
||||
) {
|
||||
Text(
|
||||
text = "Bandai Toys = Vital Bracelet, Vital Hero, BE Bracelet",
|
||||
text = "VB, VH, VBBE",
|
||||
fontSize = 14.sp,
|
||||
modifier = Modifier.padding(bottom = 24.dp)
|
||||
)
|
||||
|
||||
@ -231,9 +231,7 @@ class ScanScreenControllerImpl(
|
||||
val proto = VitalWearCharacterExporter(componentActivity, database).buildCharacterProto(characterId)
|
||||
val client = VitalWearHceReaderClient(isoDep)
|
||||
client.sendCharacterToWatch(proto)
|
||||
database.userCharacterDao().deleteCharacterById(characterId)
|
||||
pendingExportCharacterId = null
|
||||
Log.i("NFC_WRITE", "Character sent to VitalWear and deleted from app (id=$characterId)")
|
||||
Log.i("NFC_WRITE", "Character sent to VitalWear (id=$characterId), deletion deferred to WritingScreen")
|
||||
componentActivity.runOnUiThread {
|
||||
Toast.makeText(componentActivity, componentActivity.getString(R.string.scan_sent_character_success), Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
|
||||
@ -104,7 +104,7 @@ fun TransferAnimationScreen(
|
||||
) {
|
||||
Image(
|
||||
bitmap = preview.imageBitmap,
|
||||
contentDescription = "Transferred Digimon sprite",
|
||||
contentDescription = "Transferred character sprite",
|
||||
modifier = Modifier
|
||||
.size(preview.dpWidth, preview.dpHeight)
|
||||
.padding(8.dp),
|
||||
|
||||
@ -136,7 +136,7 @@ class SettingsScreenControllerImpl(
|
||||
secrets = secretsImporter.importSecrets(it)
|
||||
} catch (e: Exception) {
|
||||
context.runOnUiThread {
|
||||
Toast.makeText(context, "Secrets import failed. Please only select the official Vital Arena App 2.1.0 APK.", Toast.LENGTH_SHORT).show()
|
||||
Toast.makeText(context, "Secrets import failed. Please only select the official app APK.", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
return@launch
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
<string name="scan_sent_dim_success">DIMの転送に成功しました。</string>
|
||||
<string name="scan_nfc_must_be_enabled">NFC機能を有効にして下さい。</string>
|
||||
<string name="settings_title">設定</string>
|
||||
<string name="scan_missing_secrets">Vital ArenaのAPKを読み込みして下さい。</string>
|
||||
<string name="scan_missing_secrets">公式アプリのAPKを読み込みして下さい。</string>
|
||||
<string name="scan_sent_character_success">転送が成功しました。</string>
|
||||
<string name="scan_error_generic">エラー</string>
|
||||
<string name="settings_about_desc">このアプリについて</string>
|
||||
@ -64,7 +64,7 @@
|
||||
<string name="settings_section_dim_bem">DiM / BEm管理</string>
|
||||
<string name="settings_section_data">データ管理</string>
|
||||
<string name="settings_import_apk_title">アプリのインポート</string>
|
||||
<string name="settings_import_apk_desc">Vital Arena 2.1.0のAPKファイルを読み込みします。</string>
|
||||
<string name="settings_import_apk_desc">公式アプリのAPKファイルを読み込みします。</string>
|
||||
<string name="settings_import_card_title">カードのインポート</string>
|
||||
<string name="settings_section_about">概要 / クレジット</string>
|
||||
<string name="dex_chara_fusions_button">ジョグレス</string>
|
||||
|
||||
@ -43,13 +43,13 @@
|
||||
Os segredos ainda não foram importados. Vá em Configurações e importe o APK.
|
||||
</string>
|
||||
|
||||
<string name="scan_title">Escanear um Vital Bracelet</string>
|
||||
<string name="scan_vb_to_app">Vital Bracelet para o app</string>
|
||||
<string name="scan_app_to_vb">App para o Vital Bracelet</string>
|
||||
<string name="scan_title">Escanear um VB</string>
|
||||
<string name="scan_vb_to_app">VB para o app</string>
|
||||
<string name="scan_app_to_vb">App para o VB</string>
|
||||
|
||||
<string name="scan_no_nfc_on_device">O dispositivo não possui NFC!</string>
|
||||
<string name="scan_tag_not_vb">A tag detectada não é do Vital Bracelet.</string>
|
||||
<string name="scan_missing_secrets">" Segredos ausentes. Vá em Configurações e importe o APK do Vital Arena. "</string>
|
||||
<string name="scan_tag_not_vb">A tag detectada não é do VB.</string>
|
||||
<string name="scan_missing_secrets">" Segredos ausentes. Vá em Configurações e importe o APK do app oficial. "</string>
|
||||
<string name="scan_sent_character_success">Personagem enviado com sucesso!</string>
|
||||
<string name="scan_error_generic">Ops!</string>
|
||||
<string name="scan_sent_dim_success">DIM enviado com sucesso!</string>
|
||||
@ -64,7 +64,7 @@
|
||||
|
||||
<string name="settings_import_apk_title">Importar APK</string>
|
||||
<string name="settings_import_apk_desc">
|
||||
Importar segredos do APK do Vital Arena 2.1.0
|
||||
Importar segredos do APK do app oficial
|
||||
</string>
|
||||
|
||||
<string name="settings_import_card_title">Importar card</string>
|
||||
@ -106,7 +106,7 @@
|
||||
Responsável pelo design do ícone do aplicativo em SVG.
|
||||
</string>
|
||||
|
||||
<string name="action_place_near_reader">Aproxime o seu Vital Bracelet do leitor...</string>
|
||||
<string name="action_place_near_reader">Aproxime o seu VB do leitor...</string>
|
||||
<string name="action_cancel">Cancelar</string>
|
||||
|
||||
<string name="read_character_title">Ler personagem</string>
|
||||
|
||||
@ -43,13 +43,13 @@
|
||||
Secrets not yet imported. Go to Settings and Import APK.
|
||||
</string>
|
||||
|
||||
<string name="scan_title">Scan a Vital Bracelet</string>
|
||||
<string name="scan_title">Scan a VB</string>
|
||||
<string name="scan_vb_to_app">Watch to VBH</string>
|
||||
<string name="scan_app_to_vb">VBH to Watch</string>
|
||||
|
||||
<string name="scan_no_nfc_on_device">No NFC on device!</string>
|
||||
<string name="scan_tag_not_vb">Tag detected is not VB</string>
|
||||
<string name="scan_missing_secrets">" Missing Secrets. Go to settings and import Vital Arena APK. "</string>
|
||||
<string name="scan_missing_secrets">" Missing Secrets. Go to settings and import the official app APK. "</string>
|
||||
<string name="scan_sent_character_success">Sent character successfully!</string>
|
||||
<string name="scan_error_generic">Whoops</string>
|
||||
<string name="scan_sent_dim_success">Sent DIM successfully!</string>
|
||||
@ -65,7 +65,7 @@
|
||||
|
||||
<string name="settings_import_apk_title">Import APK</string>
|
||||
<string name="settings_import_apk_desc">
|
||||
Import Secrets From Vital Arena APK
|
||||
Import Secrets From the official app APK
|
||||
</string>
|
||||
|
||||
<string name="settings_import_card_title">Import card</string>
|
||||
@ -109,7 +109,7 @@
|
||||
<string name="credits_RedEyez_description">
|
||||
Devout Debugger.
|
||||
</string>
|
||||
<string name="action_place_near_reader">Place your Vital Bracelet near the reader...</string>
|
||||
<string name="action_place_near_reader">Place your VB near the reader...</string>
|
||||
<string name="action_cancel">Cancel</string>
|
||||
|
||||
<string name="read_character_title">Read character</string>
|
||||
@ -220,10 +220,10 @@
|
||||
<string name="home_special_mission_delete_remove">Remove</string>
|
||||
|
||||
<string name="settings_companion_import_card_image_title">Import Card Image</string>
|
||||
<string name="companion_validation_connect_vb">Connect Vital Bracelet</string>
|
||||
<string name="companion_validation_connect_vb">Connect VB</string>
|
||||
<string name="companion_card_import_success">Card imported successfully!</string>
|
||||
<string name="companion_firmware_no_watch">No watch found!</string>
|
||||
<string name="companion_validation_insert_card">Insert card into Vital Bracelet</string>
|
||||
<string name="companion_validation_insert_card">Insert card into VB</string>
|
||||
<string name="companion_validation_success">Validation successful!</string>
|
||||
<string name="companion_loading_select_firmware">Select firmware file</string>
|
||||
<string name="companion_firmware_sent_success">Firmware sent successfully!</string>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user