aboutsummaryrefslogtreecommitdiff
path: root/cashier
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2022-06-20 14:12:24 -0300
committerTorsten Grote <t@grobox.de>2022-06-20 14:12:24 -0300
commit0450b57c2d2104226196878a9e7217fe6eb3730e (patch)
treebdb498f62fb17b651effdda1df8038f3817564f2 /cashier
parent5b7bb5cf012fc41b2fbb6a41f6f858009c1ba092 (diff)
downloadtaler-android-0450b57c2d2104226196878a9e7217fe6eb3730e.tar.gz
taler-android-0450b57c2d2104226196878a9e7217fe6eb3730e.tar.bz2
taler-android-0450b57c2d2104226196878a9e7217fe6eb3730e.zip
Fix lint and CI issues
Note that I only fixes the most grave things that made things fail. I didn't address all issues introduces lately nor making sure the targetSdk bump to 32 has no unintented side-effects.
Diffstat (limited to 'cashier')
-rw-r--r--cashier/build.gradle4
-rw-r--r--cashier/src/main/AndroidManifest.xml2
-rw-r--r--cashier/src/main/java/net/taler/cashier/AboutDialogFragment.kt16
3 files changed, 10 insertions, 12 deletions
diff --git a/cashier/build.gradle b/cashier/build.gradle
index ea59f23..ab495a4 100644
--- a/cashier/build.gradle
+++ b/cashier/build.gradle
@@ -22,14 +22,14 @@ plugins {
}
android {
- compileSdkVersion 31
+ compileSdkVersion 32
//noinspection GradleDependency
buildToolsVersion "$build_tools_version"
defaultConfig {
applicationId "net.taler.cashier"
minSdkVersion 23
- targetSdkVersion 30
+ targetSdkVersion 32
versionCode 1
versionName "0.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/cashier/src/main/AndroidManifest.xml b/cashier/src/main/AndroidManifest.xml
index 37f941c..36a3b72 100644
--- a/cashier/src/main/AndroidManifest.xml
+++ b/cashier/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.NFC" />
<application
@@ -18,6 +19,7 @@
<activity
android:name=".MainActivity"
+ android:exported="true"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
diff --git a/cashier/src/main/java/net/taler/cashier/AboutDialogFragment.kt b/cashier/src/main/java/net/taler/cashier/AboutDialogFragment.kt
index 3da49d2..90becbd 100644
--- a/cashier/src/main/java/net/taler/cashier/AboutDialogFragment.kt
+++ b/cashier/src/main/java/net/taler/cashier/AboutDialogFragment.kt
@@ -17,19 +17,13 @@
package net.taler.cashier
import android.os.Bundle
-import android.os.Handler
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import android.view.WindowManager
-import android.widget.Button
-import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.Fragment
import net.taler.cashier.BuildConfig.VERSION_NAME
import net.taler.cashier.config.VERSION_BANK
import net.taler.cashier.databinding.FragmentAboutDialogBinding
-import net.taler.cashier.databinding.FragmentBalanceBinding
import net.taler.common.Version
class AboutDialogFragment : DialogFragment() {
@@ -39,8 +33,8 @@ class AboutDialogFragment : DialogFragment() {
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
- savedInstanceState: Bundle?
- ): View? {
+ savedInstanceState: Bundle?,
+ ): View {
ui = FragmentAboutDialogBinding.inflate(layoutInflater, container, false)
return ui.root
}
@@ -50,8 +44,10 @@ class AboutDialogFragment : DialogFragment() {
ui.versionView.text = getString(R.string.about_version, VERSION_NAME)
ui.bankVersionView.text = getString(R.string.about_supported_bank_api, VERSION_BANK.str())
- ui.licenseView.text = getString(R.string.about_license, getString(R.string.about_license_content))
- ui.copyrightView.text = getString(R.string.about_copyright, getString(R.string.about_copyright_holder))
+ ui.licenseView.text =
+ getString(R.string.about_license, getString(R.string.about_license_content))
+ ui.copyrightView.text =
+ getString(R.string.about_copyright, getString(R.string.about_copyright_holder))
ui.button.setOnClickListener { dismiss() }
}