nacabaro/vbhelper
1
0
Fork 0
mirror of https://github.com/nacabaro/vbhelper.git synced 2026-10-01 15:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
nacabaro
2026-06-24 21:28:22 +00:00
parent 5787069761
commit c8e035aee1
9 changed files with 1866 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/ScanScreen.kt
+12 -8
View File
@@ -9,6 +9,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.navigation.NavController
import androidx.navigation.compose.rememberNavController
@@ -88,15 +89,18 @@ fun ScanScreen(
}
)
} else {
val secretsNotInitialized = stringResource(id = R.string.scan_secrets_not_initialized)
val secretsNotImported = stringResource(id = R.string.scan_secrets_not_imported)
ChooseConnectOption(
onClickRead = when {
!launchedFromHomeScreen -> null
else -> {
{
if(secrets == null) {
Toast.makeText(context, context.getString(R.string.scan_secrets_not_initialized), Toast.LENGTH_SHORT).show()
} else if(secrets?.isMissingSecrets() == true) {
Toast.makeText(context, context.getString(R.string.scan_secrets_not_imported), Toast.LENGTH_SHORT).show()
if (secrets == null) {
Toast.makeText(context, secretsNotInitialized, Toast.LENGTH_SHORT).show()
} else if (secrets?.isMissingSecrets() == true) {
Toast.makeText(context, secretsNotImported, Toast.LENGTH_SHORT).show()
} else {
readingScreen = true // kicks off nfc adapter in DisposableEffect
}
@@ -107,10 +111,10 @@ fun ScanScreen(
nfcCharacter == null -> null
else -> {
{
if(secrets == null) {
Toast.makeText(context, context.getString(R.string.scan_secrets_not_initialized), Toast.LENGTH_SHORT).show()
} else if(secrets?.isMissingSecrets() == true) {
Toast.makeText(context, context.getString(R.string.scan_secrets_not_imported), Toast.LENGTH_SHORT).show()
if (secrets == null) {
Toast.makeText(context, secretsNotInitialized, Toast.LENGTH_SHORT).show()
} else if (secrets?.isMissingSecrets() == true) {
Toast.makeText(context, secretsNotImported, Toast.LENGTH_SHORT).show()
} else {
writingScreen = true // kicks off nfc adapter in DisposableEffect
}
app/src/main/java/com/github/nacabhelper/screens/BattlesScreen.kt
-1
View File
@@ -1 +0,0 @@
app/src/main/res/values-ja/strings.xml
-5
View File
@@ -48,9 +48,6 @@
<string name="card_adventure_missions_title">アドベンチャーミッション</string>
<string name="card_entry_characters_obtained">%1$d / %2$d のキャラクターを取得しました。</string>
<string name="card_entry_edit">編集</string>
<string name="card_entry_edit">編集</string>
<string name="card_entry_edit">編集</string>
<string name="card_entry_edit">編集</string>
<string name="card_entry_delete">削除</string>
<string name="home_vbdim_current_phase_win">フェーズ勝率 %</string>
<string name="home_vbdim_special_missions">スペシャルミッション</string>
@@ -92,7 +89,6 @@
<string name="battles_online_title">オンラインバトル</string>
<string name="obtained_item_you_also_got_credits">%1$d クレジットを獲得しました。</string>
<string name="obtained_item_dismiss">閉じる</string>
<string name="obtained_item_dismiss">閉じる</string>
<string name="nav_dex">図鑑</string>
<string name="action_place_near_reader">バイタルブレス本体を近くに置いて下さい。</string>
<string name="action_cancel">キャンセル</string>
@@ -100,7 +96,6 @@
<string name="dex_chara_icon_description">キャラクターアイコン</string>
<string name="dex_chara_name_icon_description">名前</string>
<string name="credits_section_reverse_engineering">リバースエンジニアリング</string>
<string name="credits_section_reverse_engineering">リバースエンジニアリング</string>
<string name="credits_section_app_development">アプリケーション開発</string>
<string name="credits_cyanic_description">" ファームウェアの解析を行い、開発をサポートしてくれました。"</string>
<string name="credits_cfogrady_description">" vb-lib-nfc開発およびアプリの開発に協力して頂きました。"</string>