From 1e5465670d3c9c50e1e1bfca98cff31df5846441 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Thu, 3 Sep 2020 08:04:46 +0200 Subject: [PATCH] Revert "Changed inheritance from Activity to AppCompatActivity. Main motivation behind this change was to allow for plug-n-play with Google's MLKit sample code which require the base activity to be an AppCompatActivity. I had previously added a wrapped to the IOIOActivity class which implemented many of these requirements, but it was getting unwieldy." This reverts commit 7397a935f41b0921021d6aad3780ddb19954bc0d. --- software/IOIOLibAndroid/build.gradle | 1 - .../src/main/java/ioio/lib/util/android/IOIOActivity.java | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/software/IOIOLibAndroid/build.gradle b/software/IOIOLibAndroid/build.gradle index 741c5dc0a..afd02f18f 100644 --- a/software/IOIOLibAndroid/build.gradle +++ b/software/IOIOLibAndroid/build.gradle @@ -25,5 +25,4 @@ android { dependencies { api project(":IOIOLibCore") - api 'androidx.appcompat:appcompat:1.2.0' } diff --git a/software/IOIOLibAndroid/src/main/java/ioio/lib/util/android/IOIOActivity.java b/software/IOIOLibAndroid/src/main/java/ioio/lib/util/android/IOIOActivity.java index 99f023e4a..9192d4cca 100644 --- a/software/IOIOLibAndroid/src/main/java/ioio/lib/util/android/IOIOActivity.java +++ b/software/IOIOLibAndroid/src/main/java/ioio/lib/util/android/IOIOActivity.java @@ -31,15 +31,14 @@ import ioio.lib.impl.SocketIOIOConnection; import ioio.lib.util.IOIOLooper; import ioio.lib.util.IOIOLooperProvider; -import androidx.appcompat.app.AppCompatActivity; +import android.app.Activity; import android.content.Intent; import android.os.Bundle; - /** * A convenience class for easy creation of IOIO-based activities. * - * It is used by creating a concrete {@link AppCompatActivity} in your application, which + * It is used by creating a concrete {@link Activity} in your application, which * extends this class. This class then takes care of proper creation and * abortion of the IOIO connection and of a dedicated thread for IOIO * communication. @@ -69,7 +68,7 @@ * example, in the case of {@link SocketIOIOConnection}, the second argument * will contain an {@link Integer} representing the local port number. */ -public abstract class IOIOActivity extends AppCompatActivity implements +public abstract class IOIOActivity extends Activity implements IOIOLooperProvider { private final IOIOAndroidApplicationHelper helper_ = new IOIOAndroidApplicationHelper(this, this);