[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-cashier-terminal-android] branch master updated: Fix a few lint w
From: |
gnunet |
Subject: |
[taler-cashier-terminal-android] branch master updated: Fix a few lint warnings |
Date: |
Fri, 21 Feb 2020 18:59:03 +0100 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository cashier-terminal-android.
The following commit(s) were added to refs/heads/master by this push:
new 42a5f0e Fix a few lint warnings
42a5f0e is described below
commit 42a5f0e0c286aad0b06e409b7d95117c074edbc4
Author: Torsten Grote <address@hidden>
AuthorDate: Fri Feb 21 14:58:34 2020 -0300
Fix a few lint warnings
---
.idea/dictionaries/user.xml | 4 ++++
app/lint.xml | 4 ++++
app/src/main/AndroidManifest.xml | 3 ++-
app/src/main/java/net/taler/cashier/Amount.kt | 1 +
app/src/main/java/net/taler/cashier/Utils.kt | 1 +
.../java/net/taler/cashier/withdraw/NfcManager.kt | 9 +++++----
app/src/main/res/drawable/ic_check.xml | 9 ---------
app/src/main/res/drawable/ic_launcher_foreground.xml | 6 ++++--
.../main/res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 -----
app/src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 3687 -> 0 bytes
app/src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 2408 -> 0 bytes
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 4875 -> 0 bytes
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 7673 -> 0 bytes
.../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 10362 -> 0 bytes
app/src/main/res/navigation/nav_graph.xml | 6 +++---
app/src/main/res/values/strings.xml | 2 --
app/src/main/res/xml/backup_descriptor.xml | 19 +++++++++++++++++++
17 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/.idea/dictionaries/user.xml b/.idea/dictionaries/user.xml
index 6a82105..a942bf9 100644
--- a/.idea/dictionaries/user.xml
+++ b/.idea/dictionaries/user.xml
@@ -1,7 +1,11 @@
<component name="ProjectDictionaryState">
<dictionary name="user">
<words>
+ <w>abcdef</w>
+ <w>apdu</w>
+ <w>snackbar</w>
<w>taler</w>
+ <w>testkudos</w>
</words>
</dictionary>
</component>
\ No newline at end of file
diff --git a/app/lint.xml b/app/lint.xml
new file mode 100644
index 0000000..164e244
--- /dev/null
+++ b/app/lint.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+
+</lint>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7dea3ac..f434144 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,9 +11,10 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
- android:roundIcon="@mipmap/ic_launcher_round"
+ android:fullBackupContent="@xml/backup_descriptor"
android:supportsRtl="true"
android:theme="@style/AppTheme"
+ android:roundIcon="@mipmap/ic_launcher"
tools:ignore="GoogleAppIndexingWarning">
<activity
diff --git a/app/src/main/java/net/taler/cashier/Amount.kt
b/app/src/main/java/net/taler/cashier/Amount.kt
index 3021050..97b60b6 100644
--- a/app/src/main/java/net/taler/cashier/Amount.kt
+++ b/app/src/main/java/net/taler/cashier/Amount.kt
@@ -22,6 +22,7 @@ data class Amount(val currency: String, val amount: String) {
private val SIGNED_REGEX = Regex("""([+\-])(\w+):([0-9.]+)""")
+ @Suppress("unused")
fun fromString(strAmount: String): Amount {
val components = strAmount.split(":")
return Amount(components[0], components[1])
diff --git a/app/src/main/java/net/taler/cashier/Utils.kt
b/app/src/main/java/net/taler/cashier/Utils.kt
index cb8aa08..e6cd761 100644
--- a/app/src/main/java/net/taler/cashier/Utils.kt
+++ b/app/src/main/java/net/taler/cashier/Utils.kt
@@ -40,6 +40,7 @@ object Utils {
private val HEX_CHARS_ARRAY = HEX_CHARS.toCharArray()
+ @Suppress("unused")
fun toHex(byteArray: ByteArray): String {
val result = StringBuffer()
diff --git a/app/src/main/java/net/taler/cashier/withdraw/NfcManager.kt
b/app/src/main/java/net/taler/cashier/withdraw/NfcManager.kt
index ec81d61..a487b5f 100644
--- a/app/src/main/java/net/taler/cashier/withdraw/NfcManager.kt
+++ b/app/src/main/java/net/taler/cashier/withdraw/NfcManager.kt
@@ -31,6 +31,9 @@ import java.io.ByteArrayOutputStream
import java.net.URL
import javax.net.ssl.HttpsURLConnection
+@Suppress("unused")
+private const val TALER_AID = "A0000002471001"
+
class NfcManager : NfcAdapter.ReaderCallback {
companion object {
@@ -40,7 +43,7 @@ class NfcManager : NfcAdapter.ReaderCallback {
* Returns true if NFC is supported and false otherwise.
*/
fun hasNfc(context: Context): Boolean {
- return getDefaultAdapter(context) != null
+ return getNfcAdapter(context) != null
}
/**
@@ -58,12 +61,10 @@ class NfcManager : NfcAdapter.ReaderCallback {
}
private fun getNfcAdapter(context: Context): NfcAdapter? {
- val test: android.nfc.NfcManager
- return NfcAdapter.getDefaultAdapter(context)
+ return getDefaultAdapter(context)
}
}
- private val TALER_AID = "A0000002471001"
private val flags = FLAG_READER_NFC_A or FLAG_READER_SKIP_NDEF_CHECK
private var tagString: String? = null
diff --git a/app/src/main/res/drawable/ic_check.xml
b/app/src/main/res/drawable/ic_check.xml
deleted file mode 100644
index 3c728c5..0000000
--- a/app/src/main/res/drawable/ic_check.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:fillColor="#FF000000"
- android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml
b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 581c480..fbaac05 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,13 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:width="108dp"
android:height="108dp"
android:viewportWidth="48"
android:viewportHeight="48">
- <group android:translateX="12"
+ <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"
- android:fillAlpha="1"/>
+ tools:ignore="VectorPath" />
</group>
</vector>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 7353dbd..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index c52928c..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null
differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index b97178b..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null
differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 8f92c07..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and
/dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 214cbea..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and
/dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index b959cd3..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and
/dev/null differ
diff --git a/app/src/main/res/navigation/nav_graph.xml
b/app/src/main/res/navigation/nav_graph.xml
index 624ac10..49f8881 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.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.
~
@@ -19,7 +18,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/nav_graph"
- app:startDestination="@id/balanceFragment">
+ app:startDestination="@id/balanceFragment"
+ tools:ignore="UnusedNavigation">
<fragment
android:id="@+id/configFragment"
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index 2d33169..c998151 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,7 +16,6 @@
<string name="action_lock">Lock</string>
<string name="withdraw_input_amount">Amount</string>
- <string name="withdraw_clear">clear amount</string>
<string name="withdraw_into">How much e-cash should be withdrawn?</string>
<string name="withdraw_error_zero">Enter positive amount</string>
<string name="withdraw_error_insufficient_balance">Insufficient
balance</string>
@@ -27,7 +26,6 @@
<string name="transaction_intro_scanned">Please confirm the
transaction!</string>
<string name="transaction_confirm">Confirm</string>
<string name="transaction_abort">Abort</string>
- <string name="transaction_success">Transaction successful</string>
<string name="transaction_error">Transaction error</string>
<string name="transaction_aborted">Transaction aborted</string>
<string name="transaction_button_back">Go back</string>
diff --git a/app/src/main/res/xml/backup_descriptor.xml
b/app/src/main/res/xml/backup_descriptor.xml
new file mode 100644
index 0000000..a298494
--- /dev/null
+++ b/app/src/main/res/xml/backup_descriptor.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ ~ This file is part of GNU Taler
+ ~ (C) 2020 Taler Systems S.A.
+ ~
+ ~ GNU Taler is free software; you can redistribute it and/or modify it under
the
+ ~ terms of the GNU General Public License as published by the Free Software
+ ~ Foundation; either version 3, or (at your option) any later version.
+ ~
+ ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT
ANY
+ ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR
+ ~ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License along
with
+ ~ GNU Taler; see the file COPYING. If not, see
<http://www.gnu.org/licenses/>
+ -->
+
+<full-backup-content>
+
+</full-backup-content>
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-cashier-terminal-android] branch master updated: Fix a few lint warnings,
gnunet <=