[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 01/04: [cashier] automatic code cleanup
|
From: |
gnunet |
|
Subject: |
[taler-taler-android] 01/04: [cashier] automatic code cleanup |
|
Date: |
Thu, 02 Apr 2020 18:59:52 +0200 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
commit 5cd83038f5aed997010dd01fef7bf6467ef56b29
Author: Torsten Grote <address@hidden>
AuthorDate: Wed Apr 1 15:34:47 2020 -0300
[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,<string name="app_name">.*</string>,<string name="app_name">Cashier
Nightly</string>,'
- cashier/src/main/res/values*/strings.xml
+ 's,<string name="app_name">.*</string>,<string name="app_name">Cashier
Nightly</string>,'
+ 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 @@
<application
android:allowBackup="true"
+ android:fullBackupContent="@xml/backup_descriptor"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
- android:fullBackupContent="@xml/backup_descriptor"
+ android:roundIcon="@mipmap/ic_launcher"
android:supportsRtl="true"
android:theme="@style/AppTheme"
- android:roundIcon="@mipmap/ic_launcher"
tools:ignore="GoogleAppIndexingWarning">
<activity
diff --git a/cashier/src/main/java/net/taler/cashier/ConfigFragment.kt
b/cashier/src/main/java/net/taler/cashier/ConfigFragment.kt
index 2225ff6..ccbb1a6 100644
--- a/cashier/src/main/java/net/taler/cashier/ConfigFragment.kt
+++ b/cashier/src/main/java/net/taler/cashier/ConfigFragment.kt
@@ -94,7 +94,8 @@ class ConfigFragment : Fragment() {
// focus on password if it is the only missing value (like after
locking)
if (urlView.editText!!.text.isNotBlank()
&& usernameView.editText!!.text.isNotBlank()
- && passwordView.editText!!.text.isBlank()) {
+ && passwordView.editText!!.text.isBlank()
+ ) {
passwordView.editText!!.requestFocus()
}
}
diff --git a/cashier/src/main/java/net/taler/cashier/HttpHelper.kt
b/cashier/src/main/java/net/taler/cashier/HttpHelper.kt
index 43ba4d8..63eaddf 100644
--- a/cashier/src/main/java/net/taler/cashier/HttpHelper.kt
+++ b/cashier/src/main/java/net/taler/cashier/HttpHelper.kt
@@ -39,8 +39,8 @@ object HttpHelper {
.build()
val response = try {
getHttpClient(config.username, config.password)
- .newCall(request)
- .execute()
+ .newCall(request)
+ .execute()
} catch (e: Exception) {
Log.e(TAG, "Error retrieving $url", e)
return HttpJsonResult.Error(500)
diff --git a/cashier/src/main/java/net/taler/cashier/MainActivity.kt
b/cashier/src/main/java/net/taler/cashier/MainActivity.kt
index b238054..0559b38 100644
--- a/cashier/src/main/java/net/taler/cashier/MainActivity.kt
+++ b/cashier/src/main/java/net/taler/cashier/MainActivity.kt
@@ -17,7 +17,9 @@
package net.taler.cashier
import android.content.Intent
-import android.content.Intent.*
+import android.content.Intent.ACTION_MAIN
+import android.content.Intent.CATEGORY_HOME
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
import android.os.Bundle
import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity
diff --git a/cashier/src/main/res/drawable/ic_launcher_foreground.xml
b/cashier/src/main/res/drawable/ic_launcher_foreground.xml
index fbaac05..06c4ddd 100644
--- a/cashier/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/cashier/src/main/res/drawable/ic_launcher_foreground.xml
@@ -4,12 +4,12 @@
android:height="108dp"
android:viewportWidth="48"
android:viewportHeight="48">
- <group
- android:translateX="12"
- android:translateY="12">
- <path
- android:pathData="M6,3L6,6L9,6L9,7L6.25,7C5.05,7 4.0508,8
4.0508,9L3.5,16L20.5,16L20,9C19.8,8 18.8008,7
17.8008,7L11,7L11,6L14,6L14,3L6,3zM7,4L13,4L13,5L7,5L7,4zM6,9L8,9L8,10L6,10L6,9zM9,9L11,9L11,10L9,10L9,9zM13,9L18,9L18,11L13,11L13,9zM6,11L8,11L8,12L6,12L6,11zM9,11L11,11L11,12L9,12L9,11zM6,13L8,13L8,14L6,14L6,13zM9,13L11,13L11,14L9,14L9,13zM2,17L2,21L22,21L22,17L2,17zM4.7422,17.291L7.2695,17.291L7.2695,17.7793L6.3574,17.7793L6.3574,20.6777L5.6543,20.6777L5.6543,17.7793L4.7422,
[...]
- android:fillColor="#f9f9f9"
- tools:ignore="VectorPath" />
- </group>
+ <group
+ android:translateX="12"
+ android:translateY="12">
+ <path
+ android:fillColor="#f9f9f9"
+ android:pathData="M6,3L6,6L9,6L9,7L6.25,7C5.05,7 4.0508,8
4.0508,9L3.5,16L20.5,16L20,9C19.8,8 18.8008,7
17.8008,7L11,7L11,6L14,6L14,3L6,3zM7,4L13,4L13,5L7,5L7,4zM6,9L8,9L8,10L6,10L6,9zM9,9L11,9L11,10L9,10L9,9zM13,9L18,9L18,11L13,11L13,9zM6,11L8,11L8,12L6,12L6,11zM9,11L11,11L11,12L9,12L9,11zM6,13L8,13L8,14L6,14L6,13zM9,13L11,13L11,14L9,14L9,13zM2,17L2,21L22,21L22,17L2,17zM4.7422,17.291L7.2695,17.291L7.2695,17.7793L6.3574,17.7793L6.3574,20.6777L5.6543,20.6777L5.6543,17.7793L4.7
[...]
+ tools:ignore="VectorPath" />
+ </group>
</vector>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ This file is part of GNU Taler
~ (C) 2020 Taler Systems S.A.
~
diff --git a/cashier/src/main/res/layout/activity_main.xml
b/cashier/src/main/res/layout/activity_main.xml
index e41b842..a56b647 100644
--- a/cashier/src/main/res/layout/activity_main.xml
+++ b/cashier/src/main/res/layout/activity_main.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ This file is part of GNU Taler
~ (C) 2020 Taler Systems S.A.
~
diff --git a/cashier/src/main/res/layout/fragment_balance.xml
b/cashier/src/main/res/layout/fragment_balance.xml
index b50cfa9..fcd0e0a 100644
--- a/cashier/src/main/res/layout/fragment_balance.xml
+++ b/cashier/src/main/res/layout/fragment_balance.xml
@@ -65,9 +65,9 @@
android:id="@+id/balanceView"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:gravity="center"
android:paddingStart="@dimen/default_margin"
android:paddingTop="8dp"
- android:gravity="center"
android:paddingEnd="@dimen/default_margin"
android:paddingBottom="@dimen/default_margin"
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
diff --git a/cashier/src/main/res/layout/fragment_error.xml
b/cashier/src/main/res/layout/fragment_error.xml
index ac34c85..fe1db37 100644
--- a/cashier/src/main/res/layout/fragment_error.xml
+++ b/cashier/src/main/res/layout/fragment_error.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ This file is part of GNU Taler
~ (C) 2020 Taler Systems S.A.
~
diff --git a/cashier/src/main/res/layout/fragment_transaction.xml
b/cashier/src/main/res/layout/fragment_transaction.xml
index 3affbf2..499b362 100644
--- a/cashier/src/main/res/layout/fragment_transaction.xml
+++ b/cashier/src/main/res/layout/fragment_transaction.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ This file is part of GNU Taler
~ (C) 2020 Taler Systems S.A.
~
diff --git a/cashier/src/main/res/menu/balance.xml
b/cashier/src/main/res/menu/balance.xml
index bc64af3..eac38d6 100644
--- a/cashier/src/main/res/menu/balance.xml
+++ b/cashier/src/main/res/menu/balance.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ This file is part of GNU Taler
~ (C) 2020 Taler Systems S.A.
~
diff --git a/cashier/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
b/cashier/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd..ac94b34 100644
--- a/cashier/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/cashier/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android";>
- <background android:drawable="@color/ic_launcher_background"/>
- <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+ <background android:drawable="@color/ic_launcher_background" />
+ <foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
\ No newline at end of file
diff --git a/cashier/src/main/res/values-night/colors.xml
b/cashier/src/main/res/values-night/colors.xml
index 55dde58..c46823c 100644
--- a/cashier/src/main/res/values-night/colors.xml
+++ b/cashier/src/main/res/values-night/colors.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ This file is part of GNU Taler
~ (C) 2020 Taler Systems S.A.
~
--
To stop receiving notification emails like this one, please contact
address@hidden.