From 7ac274261a220e5cfdeb6a2f5eab022e36f975e9 Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sun, 27 Oct 2019 17:36:36 -0700
Subject: [PATCH] Migrate to AppCompat

---
 .../main/java/android/widget/VerticalSeekBar.java    |  4 ++--
 .../org/deadc0de/apple2ix/Apple2AbstractMenu.java    |  2 +-
 .../java/org/deadc0de/apple2ix/Apple2Activity.java   | 12 ++++++------
 .../org/deadc0de/apple2ix/Apple2CrashHandler.java    |  2 +-
 .../deadc0de/apple2ix/Apple2DiskChooserActivity.java |  4 ++--
 .../java/org/deadc0de/apple2ix/Apple2DisksMenu.java  |  7 +++----
 .../java/org/deadc0de/apple2ix/Apple2MainMenu.java   |  6 +++---
 .../org/deadc0de/apple2ix/Apple2SettingsMenu.java    |  3 +--
 .../org/deadc0de/apple2ix/Apple2SplashScreen.java    |  2 +-
 Android/app/src/main/res/layout/a2disk.xml           |  2 +-
 Android/app/src/main/res/layout/a2preference.xml     |  2 +-
 .../app/src/main/res/layout/a2preference_slider.xml  |  2 +-
 Android/app/src/main/res/layout/activity_disks.xml   |  7 ++++---
 .../src/main/res/layout/activity_splash_screen.xml   |  5 +++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Android/app/src/main/java/android/widget/VerticalSeekBar.java b/Android/app/src/main/java/android/widget/VerticalSeekBar.java
index 8aa57dbc..8c7bad8e 100644
--- a/Android/app/src/main/java/android/widget/VerticalSeekBar.java
+++ b/Android/app/src/main/java/android/widget/VerticalSeekBar.java
@@ -10,11 +10,11 @@ package android.widget;
 
 import android.content.Context;
 import android.graphics.Canvas;
+import android.support.v7.widget.AppCompatSeekBar;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 
-public class VerticalSeekBar extends SeekBar {
+public class VerticalSeekBar extends AppCompatSeekBar {
 
     public VerticalSeekBar(Context context) {
         super(context);
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java
index b5518840..8bd55aae 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java
@@ -11,10 +11,10 @@
 
 package org.deadc0de.apple2ix;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.drawable.Drawable;
+import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
index 45d45044..4711d14c 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
@@ -12,8 +12,6 @@
 package org.deadc0de.apple2ix;
 
 import android.Manifest;
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
@@ -21,6 +19,8 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.StrictMode;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -28,6 +28,9 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
+import org.deadc0de.apple2ix.basic.BuildConfig;
+import org.deadc0de.apple2ix.basic.R;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -37,10 +40,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.deadc0de.apple2ix.basic.BuildConfig;
-import org.deadc0de.apple2ix.basic.R;
-
-public class Apple2Activity extends Activity implements Apple2DiskChooserActivity.Callback {
+public class Apple2Activity extends AppCompatActivity implements Apple2DiskChooserActivity.Callback {
 
     private final static String TAG = "Apple2Activity";
 
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2CrashHandler.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2CrashHandler.java
index 10ce8bb0..0acfcc84 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2CrashHandler.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2CrashHandler.java
@@ -11,7 +11,6 @@
 
 package org.deadc0de.apple2ix;
 
-import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -19,6 +18,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.View;
 import android.widget.ProgressBar;
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java
index 2a3601dc..0efbc98b 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java
@@ -11,7 +11,6 @@
 
 package org.deadc0de.apple2ix;
 
-import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -21,11 +20,12 @@ import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
 import android.provider.DocumentsContract;
 import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class Apple2DiskChooserActivity extends Activity {
+public class Apple2DiskChooserActivity extends AppCompatActivity {
 
     public static final AtomicBoolean sDiskChooserIsChoosing = new AtomicBoolean(false);
     public static Callback sDisksCallback;
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java
index 277e5a9e..e5b9dce7 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java
@@ -11,13 +11,13 @@
 
 package org.deadc0de.apple2ix;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -34,8 +34,10 @@ import android.widget.RadioButton;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import org.deadc0de.apple2ix.basic.R;
 import org.json.JSONArray;
 import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -43,9 +45,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.deadc0de.apple2ix.basic.R;
-import org.json.JSONObject;
-
 public class Apple2DisksMenu implements Apple2MenuView {
 
     private final static String TAG = "Apple2DisksMenu";
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2MainMenu.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2MainMenu.java
index a2aa07dd..d3070c2c 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2MainMenu.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2MainMenu.java
@@ -11,13 +11,14 @@
 
 package org.deadc0de.apple2ix;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -33,7 +34,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.deadc0de.apple2ix.basic.R;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
@@ -186,7 +186,7 @@ public class Apple2MainMenu {
         });
 
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.GINGERBREAD_MR1) {
-            mMainMenuPopup = new PopupWindow(mainPopupContainer, android.app.ActionBar.LayoutParams.WRAP_CONTENT, android.app.ActionBar.LayoutParams.WRAP_CONTENT, true);
+            mMainMenuPopup = new PopupWindow(mainPopupContainer, ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT, true);
         } else {
             // 2015/03/11 ... there may well be a less hackish way to support Gingerbread, but eh ... diminishing returns
             final int TOTAL_MARGINS = 16;
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java
index 81ff8fa6..cc8da812 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java
@@ -11,15 +11,14 @@
 
 package org.deadc0de.apple2ix;
 
-import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.TextView;
 
 import org.deadc0de.apple2ix.basic.BuildConfig;
 import org.deadc0de.apple2ix.basic.R;
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java
index da13bd71..595ea2fa 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java
@@ -11,9 +11,9 @@
 
 package org.deadc0de.apple2ix;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
diff --git a/Android/app/src/main/res/layout/a2disk.xml b/Android/app/src/main/res/layout/a2disk.xml
index d3119c1a..7cfa7d06 100644
--- a/Android/app/src/main/res/layout/a2disk.xml
+++ b/Android/app/src/main/res/layout/a2disk.xml
@@ -17,7 +17,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:minHeight="?attr/listPreferredItemHeight"
     android:gravity="center_vertical"
     android:paddingRight="?android:attr/scrollbarSize">
 
diff --git a/Android/app/src/main/res/layout/a2preference.xml b/Android/app/src/main/res/layout/a2preference.xml
index e30cc2ba..4febeccf 100644
--- a/Android/app/src/main/res/layout/a2preference.xml
+++ b/Android/app/src/main/res/layout/a2preference.xml
@@ -17,7 +17,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:minHeight="?attr/listPreferredItemHeight"
     android:gravity="center_vertical"
     android:paddingRight="?android:attr/scrollbarSize">
 
diff --git a/Android/app/src/main/res/layout/a2preference_slider.xml b/Android/app/src/main/res/layout/a2preference_slider.xml
index 225d3712..bc0f2cad 100644
--- a/Android/app/src/main/res/layout/a2preference_slider.xml
+++ b/Android/app/src/main/res/layout/a2preference_slider.xml
@@ -3,7 +3,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:minHeight="?attr/listPreferredItemHeight"
     android:gravity="center_vertical"
     android:paddingRight="?android:attr/scrollbarSize">
 
diff --git a/Android/app/src/main/res/layout/activity_disks.xml b/Android/app/src/main/res/layout/activity_disks.xml
index ebb5aa05..f991146d 100644
--- a/Android/app/src/main/res/layout/activity_disks.xml
+++ b/Android/app/src/main/res/layout/activity_disks.xml
@@ -2,6 +2,7 @@
 
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:layout_marginBottom="5dip"
@@ -108,7 +109,7 @@
             android:layout_weight="1" />
 
         <ImageView
-            android:src="@android:drawable/ic_menu_save"
+            app:srcCompat="@android:drawable/ic_menu_save"
             android:layout_gravity="center"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
@@ -123,7 +124,7 @@
         android:layout_alignStart="@id/disk_selection_newschool_chooser"
         android:layout_below="@id/disk_selection_newschool_chooser"
         android:gravity="center_vertical"
-        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:minHeight="?attr/listPreferredItemHeight"
         android:paddingLeft="0dp"
         android:paddingStart="0dp"
         android:paddingRight="?android:attr/scrollbarSize"
@@ -171,7 +172,7 @@
         android:layout_alignStart="@id/a2_newschool_driveA_layout"
         android:layout_below="@id/a2_newschool_driveA_layout"
         android:gravity="center_vertical"
-        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:minHeight="?attr/listPreferredItemHeight"
         android:paddingLeft="0dp"
         android:paddingStart="0dp"
         android:paddingRight="?android:attr/scrollbarSize"
diff --git a/Android/app/src/main/res/layout/activity_splash_screen.xml b/Android/app/src/main/res/layout/activity_splash_screen.xml
index 90bebdb4..11e5b63a 100644
--- a/Android/app/src/main/res/layout/activity_splash_screen.xml
+++ b/Android/app/src/main/res/layout/activity_splash_screen.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/splashScreen"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -16,14 +17,14 @@
         android:layout_height="fill_parent"
         android:adjustViewBounds="true"
         android:scaleType="centerCrop"
-        android:src="@drawable/apple_iie"
+        app:srcCompat="@drawable/apple_iie"
         android:id="@+id/splashView" />
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/imageView"
-        android:src="@drawable/ic_launcher"
+        app:srcCompat="@drawable/ic_launcher"
         android:layout_alignTop="@+id/startButton"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"