From 55f3d8ae75bf9f30189ef7ec6fe5b3617da687d1 Mon Sep 17 00:00:00 2001 From: Ahmet Inan Date: Wed, 13 Nov 2019 15:38:07 +0100 Subject: [PATCH] refactored for AndroidX --- app/build.gradle | 6 +++--- app/src/main/java/xdsopl/robot36/Decoder.java | 6 +++--- app/src/main/java/xdsopl/robot36/MainActivity.java | 12 ++++++------ app/src/main/res/menu/menu_main.xml | 2 +- gradle.properties | 4 +++- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2589e92..8e5441c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { applicationId "xdsopl.robot36" minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 39 versionName "1.38" renderscriptTargetApi 11 @@ -21,5 +21,5 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0' } diff --git a/app/src/main/java/xdsopl/robot36/Decoder.java b/app/src/main/java/xdsopl/robot36/Decoder.java index c739938..d5f9463 100644 --- a/app/src/main/java/xdsopl/robot36/Decoder.java +++ b/app/src/main/java/xdsopl/robot36/Decoder.java @@ -20,9 +20,9 @@ import android.graphics.Bitmap; import android.media.AudioFormat; import android.media.AudioRecord; import android.media.MediaRecorder; -import android.support.v8.renderscript.Allocation; -import android.support.v8.renderscript.Element; -import android.support.v8.renderscript.RenderScript; +import androidx.renderscript.Allocation; +import androidx.renderscript.Element; +import androidx.renderscript.RenderScript; public class Decoder { private boolean drawImage = true, quitThread = false; diff --git a/app/src/main/java/xdsopl/robot36/MainActivity.java b/app/src/main/java/xdsopl/robot36/MainActivity.java index f6ddd66..96a6bc0 100644 --- a/app/src/main/java/xdsopl/robot36/MainActivity.java +++ b/app/src/main/java/xdsopl/robot36/MainActivity.java @@ -36,12 +36,12 @@ import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.provider.MediaStore; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.NotificationCompat; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.MenuItemCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.ShareActionProvider; +import androidx.core.app.ActivityCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.content.ContextCompat; +import androidx.core.view.MenuItemCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.ShareActionProvider; import android.util.Log; import android.view.Gravity; import android.view.Menu; diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index a5bad04..56ee309 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -15,7 +15,7 @@ android:id="@+id/menu_item_share" support:showAsAction="always" android:title="@string/action_share" - support:actionProviderClass="android.support.v7.widget.ShareActionProvider" /> + support:actionProviderClass="androidx.appcompat.widget.ShareActionProvider" />