From 5cd83038f5aed997010dd01fef7bf6467ef56b29 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 1 Apr 2020 15:34:47 -0300 Subject: [cashier] automatic code cleanup --- cashier/.gitlab-ci.yml | 4 ++-- cashier/src/main/AndroidManifest.xml | 4 ++-- .../src/main/java/net/taler/cashier/ConfigFragment.kt | 3 ++- cashier/src/main/java/net/taler/cashier/HttpHelper.kt | 4 ++-- cashier/src/main/java/net/taler/cashier/MainActivity.kt | 4 +++- cashier/src/main/res/drawable/ic_launcher_foreground.xml | 16 ++++++++-------- .../src/main/res/layout-w550dp/fragment_transaction.xml | 3 +-- cashier/src/main/res/layout/activity_main.xml | 3 +-- cashier/src/main/res/layout/fragment_balance.xml | 2 +- cashier/src/main/res/layout/fragment_error.xml | 3 +-- cashier/src/main/res/layout/fragment_transaction.xml | 3 +-- cashier/src/main/res/menu/balance.xml | 3 +-- cashier/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 4 ++-- cashier/src/main/res/values-night/colors.xml | 3 +-- 14 files changed, 28 insertions(+), 31 deletions(-) diff --git a/cashier/.gitlab-ci.yml b/cashier/.gitlab-ci.yml index 1b82411..792f3c5 100644 --- a/cashier/.gitlab-ci.yml +++ b/cashier/.gitlab-ci.yml @@ -24,8 +24,8 @@ cashier_deploy_nightly: - test -z "$DEBUG_KEYSTORE" && exit 0 # Rename nightly app - sed -i - 's,.*,Cashier Nightly,' - cashier/src/main/res/values*/strings.xml + 's,.*,Cashier Nightly,' + cashier/src/main/res/values*/strings.xml # Set time-based version code - export versionCode=$(date '+%s') - sed -i "s,^\(\s*versionCode\) *[0-9].*,\1 $versionCode," cashier/build.gradle diff --git a/cashier/src/main/AndroidManifest.xml b/cashier/src/main/AndroidManifest.xml index bdc5ec0..1d8b810 100644 --- a/cashier/src/main/AndroidManifest.xml +++ b/cashier/src/main/AndroidManifest.xml @@ -5,12 +5,12 @@ - - - + + + diff --git a/cashier/src/main/res/layout-w550dp/fragment_transaction.xml b/cashier/src/main/res/layout-w550dp/fragment_transaction.xml index 610ed28..3df5035 100644 --- a/cashier/src/main/res/layout-w550dp/fragment_transaction.xml +++ b/cashier/src/main/res/layout-w550dp/fragment_transaction.xml @@ -1,5 +1,4 @@ - -