diff options
| -rw-r--r-- | cashier/build.gradle | 2 | ||||
| -rw-r--r-- | merchant-terminal/build.gradle | 3 | ||||
| -rw-r--r-- | taler-kotlin-android/build.gradle | 9 | ||||
| -rw-r--r-- | wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt | 12 |
4 files changed, 12 insertions, 14 deletions
diff --git a/cashier/build.gradle b/cashier/build.gradle index 7d5116a..cd64be5 100644 --- a/cashier/build.gradle +++ b/cashier/build.gradle @@ -22,7 +22,7 @@ plugins { } android { - compileSdkVersion 32 + compileSdkVersion 33 //noinspection GradleDependency buildToolsVersion "$build_tools_version" diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle index 00fe568..b4a2781 100644 --- a/merchant-terminal/build.gradle +++ b/merchant-terminal/build.gradle @@ -6,7 +6,7 @@ plugins { } android { - compileSdkVersion 32 + compileSdkVersion 33 //noinspection GradleDependency buildToolsVersion "$build_tools_version" @@ -54,7 +54,6 @@ android { } } - lint { abortOnError true ignore 'WrongConstant' diff --git a/taler-kotlin-android/build.gradle b/taler-kotlin-android/build.gradle index bb68992..69d2b75 100644 --- a/taler-kotlin-android/build.gradle +++ b/taler-kotlin-android/build.gradle @@ -57,8 +57,8 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.5.0' - implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.core:core-ktx:1.9.0' implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version" // Navigation @@ -72,10 +72,7 @@ dependencies { implementation 'com.google.zxing:core:3.5.0' // needs minSdkVersion 24+ or desugar // JSON parsing and serialization - api 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3' - - api 'com.github.thirdegg:lint-rules:0.1.0' - + api 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0' testImplementation "junit:junit:$junit_version" testImplementation 'org.json:json:20220320' } diff --git a/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt b/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt index d6f7280..bb903c3 100644 --- a/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt @@ -59,17 +59,19 @@ class SendFundsFragment : Fragment() { private val peerManager get() = model.peerManager override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, + inflater: LayoutInflater, + container: ViewGroup?, savedInstanceState: Bundle?, ): View = ComposeView(requireContext()).apply { setContent { MdcTheme { Surface { SendFundsIntro( - model.transactionManager.selectedCurrency ?: error("No currency selected"), - model::hasSufficientBalance, - this@SendFundsFragment::onDeposit, - this@SendFundsFragment::onPeerPush, + currency = model.transactionManager.selectedCurrency + ?: error("No currency selected"), + hasSufficientBalance = model::hasSufficientBalance, + onDeposit = this@SendFundsFragment::onDeposit, + onPeerPush = this@SendFundsFragment::onPeerPush, ) } } |