mirror of
https://github.com/nacabaro/vbhelper.git
synced 2026-07-30 00:31:54 +00:00
Fixes
This commit is contained in:
parent
5787069761
commit
c8e035aee1
2
.gitignore
vendored
2
.gitignore
vendored
@ -17,3 +17,5 @@ app/src/main/assets/battle_sprites
|
||||
app/src/main/assets/extracted_audio
|
||||
|
||||
API-ACR122USAM-2.01.pdf
|
||||
|
||||
build/
|
||||
|
||||
@ -4,7 +4,7 @@ plugins {
|
||||
alias(libs.plugins.android.application)
|
||||
alias(libs.plugins.kotlin.android)
|
||||
alias(libs.plugins.kotlin.compose)
|
||||
id("com.google.devtools.ksp") version "2.3.0"
|
||||
id("com.google.devtools.ksp") version "2.3.2"
|
||||
id("com.google.protobuf")
|
||||
}
|
||||
|
||||
|
||||
1826
app/lint-baseline.xml
Normal file
1826
app/lint-baseline.xml
Normal file
File diff suppressed because it is too large
Load Diff
@ -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()
|
||||
Toast.makeText(context, secretsNotInitialized, Toast.LENGTH_SHORT).show()
|
||||
} else if (secrets?.isMissingSecrets() == true) {
|
||||
Toast.makeText(context, context.getString(R.string.scan_secrets_not_imported), Toast.LENGTH_SHORT).show()
|
||||
Toast.makeText(context, secretsNotImported, Toast.LENGTH_SHORT).show()
|
||||
} else {
|
||||
readingScreen = true // kicks off nfc adapter in DisposableEffect
|
||||
}
|
||||
@ -108,9 +112,9 @@ fun ScanScreen(
|
||||
else -> {
|
||||
{
|
||||
if (secrets == null) {
|
||||
Toast.makeText(context, context.getString(R.string.scan_secrets_not_initialized), Toast.LENGTH_SHORT).show()
|
||||
Toast.makeText(context, secretsNotInitialized, Toast.LENGTH_SHORT).show()
|
||||
} else if (secrets?.isMissingSecrets() == true) {
|
||||
Toast.makeText(context, context.getString(R.string.scan_secrets_not_imported), Toast.LENGTH_SHORT).show()
|
||||
Toast.makeText(context, secretsNotImported, Toast.LENGTH_SHORT).show()
|
||||
} else {
|
||||
writingScreen = true // kicks off nfc adapter in DisposableEffect
|
||||
}
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -21,3 +21,13 @@ kotlin.code.style=official
|
||||
# resources declared in the library itself and none from the library's dependencies,
|
||||
# thereby reducing the size of the R class for that library
|
||||
android.nonTransitiveRClass=true
|
||||
android.defaults.buildfeatures.resvalues=true
|
||||
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
|
||||
android.enableAppCompileTimeRClass=false
|
||||
android.usesSdkInManifest.disallowed=false
|
||||
android.uniquePackageNames=false
|
||||
android.dependency.useConstraints=true
|
||||
android.r8.strictFullModeForKeepRules=false
|
||||
android.r8.optimizedResourceShrinking=false
|
||||
android.builtInKotlin=false
|
||||
android.newDsl=false
|
||||
@ -1,19 +1,19 @@
|
||||
[versions]
|
||||
agp = "8.13.2"
|
||||
datastore = "1.2.0"
|
||||
datastorePreferences = "1.2.0"
|
||||
kotlin = "2.3.0"
|
||||
coreKtx = "1.17.0"
|
||||
agp = "9.2.1"
|
||||
datastore = "1.2.1"
|
||||
datastorePreferences = "1.2.1"
|
||||
kotlin = "2.4.0"
|
||||
coreKtx = "1.19.0"
|
||||
junit = "4.13.2"
|
||||
junitVersion = "1.3.0"
|
||||
espressoCore = "3.7.0"
|
||||
lifecycleRuntimeKtx = "2.10.0"
|
||||
activityCompose = "1.12.2"
|
||||
composeBom = "2026.01.00"
|
||||
material = "1.13.0"
|
||||
navigationCompose = "2.9.6"
|
||||
protobufGradlePlugin = "0.9.6"
|
||||
protobufJavalite = "4.33.4"
|
||||
lifecycleRuntimeKtx = "2.11.0"
|
||||
activityCompose = "1.13.0"
|
||||
composeBom = "2026.06.00"
|
||||
material = "1.14.0"
|
||||
navigationCompose = "2.9.8"
|
||||
protobufGradlePlugin = "0.10.0"
|
||||
protobufJavalite = "4.35.1"
|
||||
roomRuntime = "2.8.4"
|
||||
vbNfcReader = "0.2.0-SNAPSHOT"
|
||||
dimReader = "2.1.0"
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
#Tue Dec 24 10:55:57 UTC 2024
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user