aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build.gradle14
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rw-r--r--wallet/build.gradle14
-rw-r--r--wallet/src/main/java/net/taler/wallet/MainViewModel.kt2
-rw-r--r--wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt16
-rw-r--r--wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt2
6 files changed, 20 insertions, 30 deletions
diff --git a/build.gradle b/build.gradle
index 375a561..972eceb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,24 +1,24 @@
buildscript {
ext {
- kotlin_version = '1.7.10'
+ kotlin_version = '1.7.20'
ktor_version = '2.1.0'
- nav_version = '2.5.1'
- material_version = '1.6.1'
+ nav_version = '2.5.3'
+ material_version = '1.7.0'
lifecycle_version = '2.5.1'
constraintlayout_version = '2.1.4'
- compose_version = '1.2.1'
+ compose_version = '1.3.0'
junit_version = "4.13.2"
// check https://android-rebuilds.beuc.net/ for availability of free build tools
- build_tools_version = "30.0.3"
+ build_tools_version = "33.0.0"
// should debug build types be minified with D8 as well? good for catching issues early
- minify_debug = true
+ minify_debug = false // DO NOT MERGE true
}
repositories {
google()
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.2.2'
+ classpath 'com.android.tools.build:gradle:7.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 581797b..17f9e71 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Fri Aug 27 15:56:47 CEST 2021
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 56ae636..bbde001 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -20,11 +20,11 @@ plugins {
id "com.android.application"
id "kotlin-android"
id "kotlinx-serialization"
- id "de.undercouch.download"
+ id "de.undercouch.download" version "5.3.0"
}
-def walletCoreVersion = "v0.9.0-dev.29"
-def walletCoreSha256 = "ac613a1624d6a29ff06bd9c8ff1febd341fa63fdd1f5365f6296b2c628c40477"
+def walletCoreVersion = "v0.9.0-dev.31"
+def walletCoreSha256 = "51ada82946e0676d3e9a8e2352728079c8592d7ac31afc04bf83cc475b071877"
static def versionCodeEpoch() {
return (new Date().getTime() / 1000).toInteger()
@@ -39,7 +39,7 @@ def gitCommit = { ->
}
android {
- compileSdkVersion 32
+ compileSdkVersion 33
buildToolsVersion "$build_tools_version"
defaultConfig {
@@ -91,7 +91,7 @@ android {
}
composeOptions {
- kotlinCompilerExtensionVersion "1.3.0"
+ kotlinCompilerExtensionVersion "1.3.2"
}
buildFeatures {
@@ -125,13 +125,13 @@ dependencies {
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
// Compose
- implementation 'androidx.activity:activity-compose:1.5.1'
+ implementation 'androidx.activity:activity-compose:1.6.1'
implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose.animation:animation:$compose_version"
implementation "androidx.compose.ui:ui-tooling:$compose_version"
implementation "androidx.compose.material:material-icons-extended:$compose_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
- implementation 'com.google.android.material:compose-theme-adapter:1.1.16'
+ implementation 'com.google.android.material:compose-theme-adapter:1.1.21'
// Lists and Selection
implementation "androidx.recyclerview:recyclerview:1.2.1"
diff --git a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
index aa9b0f1..e660676 100644
--- a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
+++ b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
@@ -71,7 +71,7 @@ class MainViewModel(val app: Application) : AndroidViewModel(app) {
private val api = WalletBackendApi(app) { payload ->
if (payload.optString("operation") == "init") {
val result = payload.getJSONObject("result")
- val versions = result.getJSONObject("supported_protocol_versions")
+ val versions = result.getJSONObject("versionInfo")
exchangeVersion = versions.getString("exchange")
merchantVersion = versions.getString("merchant")
} else if (payload.getString("type") != "waiting-for-retry") { // ignore ping
diff --git a/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt b/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt
index 74740ca..0af4262 100644
--- a/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt
@@ -162,7 +162,7 @@ class PaymentManager(
mDepositState.value = DepositState.Error(it.userFacingMsg)
}.onSuccess {
mDepositState.value = DepositState.FeesChecked(
- effectiveDepositAmount = it.effectiveDepositAmount.amount,
+ effectiveDepositAmount = it.effectiveDepositAmount,
)
}
}
@@ -195,8 +195,8 @@ class PaymentManager(
@Serializable
data class PrepareDepositResponse(
- val totalDepositCost: AmountJson,
- val effectiveDepositAmount: AmountJson,
+ val totalDepositCost: Amount,
+ val effectiveDepositAmount: Amount,
)
@Serializable
@@ -204,13 +204,3 @@ data class CreateDepositGroupResponse(
val depositGroupId: String,
val transactionId: String,
)
-
-@Serializable
-@Deprecated("no idea why this is now in the API")
-data class AmountJson(
- val currency: String,
- val value: Long,
- val fraction: Int,
-) {
- val amount = Amount(currency, value, fraction)
-}
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt
index 50f95c0..0e7ef07 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt
@@ -161,7 +161,7 @@ class TransactionsFragment : Fragment(), OnTransactionClickListener, ActionMode.
// workaround to avoid issues with some emulators and keyboard devices
// firing twice if a keyboard enter is used
// see https://code.google.com/p/android/issues/detail?id=24599
- item.actionView.clearFocus()
+ searchView.clearFocus()
onSearch(query)
return true
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 20:36:38 +0000