Skip to content

Commit

Permalink
Merge pull request #187 from ytai/RevertInheritence
Browse files Browse the repository at this point in the history
Revert "Changed inheritance from Activity to AppCompatActivity.
  • Loading branch information
hannesa2 authored Sep 4, 2020
2 parents df1a80a + 1e54656 commit 4f0ab48
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
1 change: 0 additions & 1 deletion software/IOIOLibAndroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ android {

dependencies {
api project(":IOIOLibCore")
api 'androidx.appcompat:appcompat:1.2.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 4f0ab48

Please sign in to comment.