From 7dc697e608a6efff45713585e0b085e4e2d165a9 Mon Sep 17 00:00:00 2001 From: Dusan Klinec Date: Sat, 6 Feb 2021 17:35:53 +0100 Subject: [PATCH] refactor android app to AndroidX --- remote-reader/app/build.gradle | 22 +++++++++---------- .../android/common/logger/LogFragment.java | 3 ++- .../app/AppCompatPreferenceActivity.java | 11 +++++----- .../app/MainActivity.java | 12 +++++----- .../app/MyLogFragment.java | 2 +- .../app/SettingsActivity.java | 6 +++-- .../remotesmartcardreader/app/VPCDWorker.java | 3 ++- .../app/src/main/res/layout/activity_main.xml | 16 +++++++------- .../app/src/main/res/layout/content_main.xml | 4 ++-- remote-reader/build.gradle | 4 +++- remote-reader/gradle.properties | 4 +++- .../gradle/wrapper/gradle-wrapper.properties | 3 +-- 12 files changed, 50 insertions(+), 40 deletions(-) diff --git a/remote-reader/app/build.gradle b/remote-reader/app/build.gradle index 004d282..eaa99e8 100644 --- a/remote-reader/app/build.gradle +++ b/remote-reader/app/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 29 + buildToolsVersion "23.0.3" defaultConfig { applicationId "com.vsmartcard.remotesmartcardreader.app" // NFC reader mode was added in KitKat minSdkVersion 19 - targetSdkVersion 23 + targetSdkVersion 29 versionCode 6 versionName "2.2" } @@ -38,7 +38,7 @@ android.applicationVariants.all { variant -> } else { newApkName = "${appName}-${output.baseName}-${variant.versionName}-unaligned.apk" } - output.outputFile = new File(output.outputFile.parent, newApkName) + //output.outputFile = new File(output.outputFile.parent, newApkName) } } @@ -47,12 +47,12 @@ repositories { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.2.1' - compile 'com.android.support:design:23.2.1' - compile 'com.android.support:support-v4:23.2.1' + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'junit:junit:4.12' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.3.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' - compile 'com.journeyapps:zxing-android-embedded:3.2.0@aar' - compile 'com.google.zxing:core:3.2.1' + implementation 'com.journeyapps:zxing-android-embedded:3.2.0@aar' + implementation 'com.google.zxing:core:3.2.1' } diff --git a/remote-reader/app/src/main/java/com/example/android/common/logger/LogFragment.java b/remote-reader/app/src/main/java/com/example/android/common/logger/LogFragment.java index b302acd..5695d9f 100644 --- a/remote-reader/app/src/main/java/com/example/android/common/logger/LogFragment.java +++ b/remote-reader/app/src/main/java/com/example/android/common/logger/LogFragment.java @@ -33,7 +33,6 @@ package com.example.android.common.logger; import android.graphics.Typeface; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.text.Editable; import android.text.TextWatcher; import android.view.Gravity; @@ -42,6 +41,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ScrollView; +import androidx.fragment.app.Fragment; + /** * Simple fraggment which contains a LogView and uses is to output log data it receives * through the LogNode interface. diff --git a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/AppCompatPreferenceActivity.java b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/AppCompatPreferenceActivity.java index 870efc0..79e3d30 100644 --- a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/AppCompatPreferenceActivity.java +++ b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/AppCompatPreferenceActivity.java @@ -3,15 +3,16 @@ package com.vsmartcard.remotesmartcardreader.app; import android.content.res.Configuration; import android.os.Bundle; import android.preference.PreferenceActivity; -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatDelegate; -import android.support.v7.widget.Toolbar; import android.view.MenuInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.LayoutRes; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.appcompat.widget.Toolbar; + /** * A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls * to be used with AppCompat. diff --git a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MainActivity.java b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MainActivity.java index aec7caa..21d5e1a 100644 --- a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MainActivity.java +++ b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MainActivity.java @@ -31,20 +31,21 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.Settings; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + import com.example.android.common.logger.Log; import com.example.android.common.logger.LogFragment; import com.example.android.common.logger.LogWrapper; import com.example.android.common.logger.MessageOnlyLogFilter; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; import com.vsmartcard.remotesmartcardreader.app.screaders.*; @TargetApi(Build.VERSION_CODES.KITKAT) @@ -231,6 +232,7 @@ public class MainActivity extends AppCompatActivity implements NfcAdapter.Reader @Override public void onNewIntent(Intent intent) { // onResume gets called after this to handle the intent + super.onNewIntent(intent); setIntent(intent); } diff --git a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MyLogFragment.java b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MyLogFragment.java index 43a5222..efcfc62 100644 --- a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MyLogFragment.java +++ b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MyLogFragment.java @@ -23,12 +23,12 @@ import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; import android.os.Bundle; -import android.support.design.widget.Snackbar; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import com.example.android.common.logger.LogFragment; +import com.google.android.material.snackbar.Snackbar; public class MyLogFragment extends LogFragment { diff --git a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/SettingsActivity.java b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/SettingsActivity.java index ba15b05..85b402f 100644 --- a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/SettingsActivity.java +++ b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/SettingsActivity.java @@ -32,11 +32,13 @@ import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceActivity; import android.provider.Settings; -import android.support.design.widget.Snackbar; -import android.support.v7.app.ActionBar; import android.preference.PreferenceFragment; import android.preference.PreferenceManager; import android.view.MenuItem; + +import androidx.appcompat.app.ActionBar; + +import com.google.android.material.snackbar.Snackbar; import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; diff --git a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/VPCDWorker.java b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/VPCDWorker.java index 63580f5..2de77cc 100644 --- a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/VPCDWorker.java +++ b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/VPCDWorker.java @@ -20,7 +20,8 @@ package com.vsmartcard.remotesmartcardreader.app; import android.os.AsyncTask; -import android.support.annotation.Nullable; + +import androidx.annotation.Nullable; import com.example.android.common.logger.Log; import com.vsmartcard.remotesmartcardreader.app.screaders.SCReader; diff --git a/remote-reader/app/src/main/res/layout/activity_main.xml b/remote-reader/app/src/main/res/layout/activity_main.xml index 26d7d00..d0ecb38 100644 --- a/remote-reader/app/src/main/res/layout/activity_main.xml +++ b/remote-reader/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - - - - - + + - - + diff --git a/remote-reader/app/src/main/res/layout/content_main.xml b/remote-reader/app/src/main/res/layout/content_main.xml index 4d4bdc7..fc97b0f 100644 --- a/remote-reader/app/src/main/res/layout/content_main.xml +++ b/remote-reader/app/src/main/res/layout/content_main.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/remote-reader/build.gradle b/remote-reader/build.gradle index e0b366a..c5e926e 100644 --- a/remote-reader/build.gradle +++ b/remote-reader/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:4.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/remote-reader/gradle.properties b/remote-reader/gradle.properties index 1d3591c..915f0e6 100644 --- a/remote-reader/gradle.properties +++ b/remote-reader/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/remote-reader/gradle/wrapper/gradle-wrapper.properties b/remote-reader/gradle/wrapper/gradle-wrapper.properties index f23df6e..6c9a224 100644 --- a/remote-reader/gradle/wrapper/gradle-wrapper.properties +++ b/remote-reader/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Oct 21 11:34:03 PDT 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip