diff options
| author | Torsten Grote <t@grobox.de> | 2020-03-05 13:14:12 -0300 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2020-03-05 13:32:13 -0300 |
| commit | 9c7f53f6fccf55d4aa67063ab806f22c871c20e1 (patch) | |
| tree | 57036817518767a219609495d879172d0cafa228 | |
| parent | 9a707c24f8b9731c748640eaa94290a491d03d79 (diff) | |
| download | wallet-android-9c7f53f6fccf55d4aa67063ab806f22c871c20e1.tar.gz wallet-android-9c7f53f6fccf55d4aa67063ab806f22c871c20e1.tar.bz2 wallet-android-9c7f53f6fccf55d4aa67063ab806f22c871c20e1.zip | |
Download binary deps before building on CI
and fix lint issue
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | app/src/main/java/net/taler/wallet/history/WalletHistory.kt | 4 | ||||
| -rw-r--r-- | build.gradle | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4bfc45..3cdba25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,12 @@ stages: - test - deploy +default: + before_script: + - wget https://git.taler.net/wallet-android.git/plain/akono.aar?h=binary-deps -O akono/akono.aar + - mkdir -p app/src/main/assets + - wget https://git.taler.net/wallet-android.git/plain/taler-wallet-android.js?h=binary-deps -O app/src/main/assets/taler-wallet-android.js + test: stage: test script: ./gradlew lint assembleRelease diff --git a/app/src/main/java/net/taler/wallet/history/WalletHistory.kt b/app/src/main/java/net/taler/wallet/history/WalletHistory.kt index 76b11ea..bb37ffa 100644 --- a/app/src/main/java/net/taler/wallet/history/WalletHistory.kt +++ b/app/src/main/java/net/taler/wallet/history/WalletHistory.kt @@ -95,10 +95,10 @@ class WalletHistory : Fragment(), OnEventClickListener { addItemDecoration(myItemDecoration) } - model.historyProgress.observe(this, Observer { show -> + model.historyProgress.observe(viewLifecycleOwner, Observer { show -> historyProgressBar.visibility = if (show) VISIBLE else INVISIBLE }) - model.history.observe(this, Observer { history -> + model.history.observe(viewLifecycleOwner, Observer { history -> historyEmptyState.visibility = if (history.isEmpty()) VISIBLE else INVISIBLE historyAdapter.update(history) }) diff --git a/build.gradle b/build.gradle index a9d913c..ee7840e 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ */ buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.3.70' repositories { google() jcenter() |