Skip to content

Commit

Permalink
Merge pull request #221 from topherbuckley/AppCompatActivity
Browse files Browse the repository at this point in the history
Updated all references for Activity to AppCompatActivity
  • Loading branch information
hannesa2 authored Dec 6, 2020
2 parents 353e381 + fb46fb5 commit 111a3d4
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
import ioio.lib.util.IOIOLooper;
import ioio.lib.util.IOIOLooperProvider;

import android.app.Activity;
import androidx.appcompat.app.AppCompatActivity;
import android.content.Intent;
import android.os.Bundle;

/**
* A convenience class for easy creation of IOIO-based activities.
* <p>
* It is used by creating a concrete {@link Activity} in your application, which
* It is used by creating a concrete {@link AppCompatActivity} 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 +69,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 Activity implements
public abstract class IOIOActivity extends AppCompatActivity implements
IOIOLooperProvider {
private final IOIOAndroidApplicationHelper helper_ = new IOIOAndroidApplicationHelper(this, this);

Expand Down
2 changes: 1 addition & 1 deletion applications/HelloIOIO/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package="ioio.examples.hello">

<application
android:theme="@style/Theme.AppCompat"
android:theme="@style/Theme.AppCompat.NoActionBar"
android:extractNativeLibs="true"
android:icon="@drawable/icon"
android:label="@string/app_name"
Expand Down
2 changes: 1 addition & 1 deletion applications/HelloIOIOService/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package="ioio.examples.hello_service">

<application
android:theme="@style/Theme.AppCompat"
android:theme="@style/Theme.AppCompat.NoActionBar"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name">
<uses-library
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package ioio.examples.hello_service;

import android.app.Activity;
import androidx.appcompat.app.AppCompatActivity;
import android.content.Intent;
import android.os.Bundle;

public class MainActivity extends Activity {
public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand Down
2 changes: 1 addition & 1 deletion applications/HolidayIOIO/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:required="true" />

<application
android:theme="@style/Theme.AppCompat"
android:theme="@style/Theme.AppCompat.NoActionBar"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name">
<activity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<uses-permission android:name="android.permission.BLUETOOTH" />

<application
android:theme="@style/Theme.AppCompat"
android:theme="@style/Theme.AppCompat.NoActionBar"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name">
<uses-library
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import java.util.Iterator;

import android.app.Activity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
Expand All @@ -17,7 +17,7 @@

import com.google.common.collect.SortedMultiset;

public class IOIOConnectionTesterActivity extends Activity implements
public class IOIOConnectionTesterActivity extends AppCompatActivity implements
IOIOConnectionThreadProvider {
static {
IOIOConnectionRegistry
Expand Down
2 changes: 1 addition & 1 deletion applications/IOIOManager/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<supports-screens android:anyDensity="true" />

<application
android:theme="@style/Theme.AppCompat"
android:theme="@style/Theme.AppCompat.NoActionBar"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
tools:ignore="AllowBackup">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*/
package ioio.manager;

import android.app.Activity;
import androidx.appcompat.app.AppCompatActivity;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
Expand All @@ -43,7 +43,7 @@
import java.net.URL;
import java.net.URLConnection;

public class DownloadUrlActivity extends Activity implements Runnable, FileReturner {
public class DownloadUrlActivity extends AppCompatActivity implements Runnable, FileReturner {
public static final String URL_EXTRA = "URL";
private ProgressDialog dialog_;
private String url_;
Expand Down
2 changes: 1 addition & 1 deletion applications/IOIOSimpleApp/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package="ioio.examples.simple">

<application
android:theme="@style/Theme.AppCompat"
android:theme="@style/Theme.AppCompat.NoActionBar"
android:icon="@drawable/icon"
android:label="@string/app_name">
<uses-library
Expand Down
2 changes: 1 addition & 1 deletion applications/IOIOTestBed/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package="ioio.test_bed">

<application
android:theme="@style/Theme.AppCompat"
android:theme="@style/Theme.AppCompat.NoActionBar"
android:icon="@drawable/icon"
android:label="@string/app_name">
<activity
Expand Down
2 changes: 1 addition & 1 deletion applications/IOIOTortureTest/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<uses-permission android:name="android.permission.WAKE_LOCK" />
<application
android:theme="@style/Theme.AppCompat"
android:theme="@style/Theme.AppCompat.NoActionBar"
android:icon="@drawable/icon"
android:label="@string/app_name">
<uses-library
Expand Down
2 changes: 1 addition & 1 deletion applications/ShoeBot/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<uses-permission android:name="android.permission.WAKE_LOCK" />
<application
android:theme="@style/Theme.AppCompat"
android:theme="@style/Theme.AppCompat.NoActionBar"
android:icon="@drawable/icon"
android:label="@string/app_name">
<uses-library
Expand Down

0 comments on commit 111a3d4

Please sign in to comment.