Fix various build problems

11 files changed, 30 insertions, 28 deletions

diff --git a/GreekReference/build.gradle b/GreekReference/build.gradle
index 9d8e3db..9ec16ae 100644
--- a/GreekReference/build.gradle
+++ b/GreekReference/build.gradle
@@ -55,7 +55,9 @@ android {
 }
 
 dependencies {
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'androidx.drawerlayout:drawerlayout:1.2.0'
     implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1'
 }
diff --git a/GreekReference/src/main/java/com/benlinskey/greekreference/AboutPreference.java b/GreekReference/src/main/java/com/benlinskey/greekreference/AboutPreference.java
index f064975..3aa0ede 100644
--- a/GreekReference/src/main/java/com/benlinskey/greekreference/AboutPreference.java
+++ b/GreekReference/src/main/java/com/benlinskey/greekreference/AboutPreference.java
@@ -18,7 +18,7 @@ package com.benlinskey.greekreference;
 
 import android.content.Context;
 import android.preference.DialogPreference;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.util.AttributeSet;
diff --git a/GreekReference/src/main/java/com/benlinskey/greekreference/GreekTextView.java b/GreekReference/src/main/java/com/benlinskey/greekreference/GreekTextView.java
index e97089d..ea32e8c 100644
--- a/GreekReference/src/main/java/com/benlinskey/greekreference/GreekTextView.java
+++ b/GreekReference/src/main/java/com/benlinskey/greekreference/GreekTextView.java
@@ -39,7 +39,7 @@ import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.os.Build;
 import android.preference.PreferenceManager;
-import androidx.core.util.LruCache;
+import androidx.collection.LruCache;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.widget.TextView;
@@ -69,8 +69,8 @@ public class GreekTextView extends TextView
         implements SharedPreferences.OnSharedPreferenceChangeListener {
 
     private static final String NOTO_SERIF = "NotoSerif-Regular.ttf";
-    private static final int TEXT_COLOR = 
-            android.support.v7.appcompat.R.color.primary_text_default_material_light;
+    private static final int TEXT_COLOR =
+            androidx.appcompat.R.color.primary_text_default_material_light;
 
     /** An {@code LruCache} for previously loaded typefaces. */
     private static final LruCache<String, Typeface> sTypefaceCache = new LruCache<>(12);
diff --git a/GreekReference/src/main/java/com/benlinskey/greekreference/navigationdrawer/NavigationDrawerFragment.java b/GreekReference/src/main/java/com/benlinskey/greekreference/navigationdrawer/NavigationDrawerFragment.java
index cb12bde..c5619f0 100644
--- a/GreekReference/src/main/java/com/benlinskey/greekreference/navigationdrawer/NavigationDrawerFragment.java
+++ b/GreekReference/src/main/java/com/benlinskey/greekreference/navigationdrawer/NavigationDrawerFragment.java
@@ -23,10 +23,10 @@ import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import androidx.core.view.GravityCompat;
-import androidx.core.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
-import android.support.v7.app.ActionBarDrawerToggle;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.ActionBarDrawerToggle;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -300,7 +300,7 @@ public class NavigationDrawerFragment extends Fragment {
     }
 
     private ActionBar getActionBar() {
-        return ((ActionBarActivity) getActivity()).getSupportActionBar();
+        return ((AppCompatActivity) getActivity()).getSupportActionBar();
     }
 
     /**
diff --git a/GreekReference/src/main/java/com/benlinskey/greekreference/views/AbstractContainerActivity.java b/GreekReference/src/main/java/com/benlinskey/greekreference/views/AbstractContainerActivity.java
index a250c3c..a7887c6 100644
--- a/GreekReference/src/main/java/com/benlinskey/greekreference/views/AbstractContainerActivity.java
+++ b/GreekReference/src/main/java/com/benlinskey/greekreference/views/AbstractContainerActivity.java
@@ -25,8 +25,8 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.ActionBarActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.KeyEvent;
@@ -39,7 +39,7 @@ import com.benlinskey.greekreference.R;
 /**
  * Abstract class defining basic methods shared by all activities.
  */
-public abstract class AbstractContainerActivity extends ActionBarActivity {
+public abstract class AbstractContainerActivity extends AppCompatActivity {
 
     // TODO: Should we move any of this code to the presenter and/or call this code from the
     // presenter rather than directly calling it from the activity?
diff --git a/GreekReference/src/main/java/com/benlinskey/greekreference/views/MainActivity.java b/GreekReference/src/main/java/com/benlinskey/greekreference/views/MainActivity.java
index 3508f95..c00d03d 100644
--- a/GreekReference/src/main/java/com/benlinskey/greekreference/views/MainActivity.java
+++ b/GreekReference/src/main/java/com/benlinskey/greekreference/views/MainActivity.java
@@ -26,12 +26,12 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import androidx.core.view.MenuItemCompat;
-import androidx.core.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.SearchView;
-import android.support.v7.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/GreekReference/src/main/java/com/benlinskey/greekreference/views/PerseusToolActivity.java b/GreekReference/src/main/java/com/benlinskey/greekreference/views/PerseusToolActivity.java
index 6510608..8f1745c 100644
--- a/GreekReference/src/main/java/com/benlinskey/greekreference/views/PerseusToolActivity.java
+++ b/GreekReference/src/main/java/com/benlinskey/greekreference/views/PerseusToolActivity.java
@@ -25,10 +25,10 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.KeyEvent;
@@ -87,7 +87,7 @@ public class PerseusToolActivity extends AbstractContainerActivity {
         mWebView = (WebView) findViewById(R.id.perseus_tool_webview);
         WebSettings settings = mWebView.getSettings();
         settings.setJavaScriptEnabled(true);
-        final ActionBarActivity activity = this;
+        final AppCompatActivity activity = this;
         mWebView.setWebChromeClient(new WebChromeClient() {
             public void onProgressChanged(WebView view, int progress) {
                 if (100 == progress) {
diff --git a/GreekReference/src/main/java/com/benlinskey/greekreference/views/SettingsActivity.java b/GreekReference/src/main/java/com/benlinskey/greekreference/views/SettingsActivity.java
index 1c02015..d00cbbd 100644
--- a/GreekReference/src/main/java/com/benlinskey/greekreference/views/SettingsActivity.java
+++ b/GreekReference/src/main/java/com/benlinskey/greekreference/views/SettingsActivity.java
@@ -26,8 +26,8 @@ import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/GreekReference/src/main/java/com/benlinskey/greekreference/views/detail/AbstractDetailActivity.java b/GreekReference/src/main/java/com/benlinskey/greekreference/views/detail/AbstractDetailActivity.java
index 8013c20..e1ad2df 100644
--- a/GreekReference/src/main/java/com/benlinskey/greekreference/views/detail/AbstractDetailActivity.java
+++ b/GreekReference/src/main/java/com/benlinskey/greekreference/views/detail/AbstractDetailActivity.java
@@ -21,8 +21,8 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import com.benlinskey.greekreference.R;
diff --git a/GreekReference/src/main/java/com/benlinskey/greekreference/views/detail/lexicon/LexiconDetailActivity.java b/GreekReference/src/main/java/com/benlinskey/greekreference/views/detail/lexicon/LexiconDetailActivity.java
index 9a8e755..9f4a686 100644
--- a/GreekReference/src/main/java/com/benlinskey/greekreference/views/detail/lexicon/LexiconDetailActivity.java
+++ b/GreekReference/src/main/java/com/benlinskey/greekreference/views/detail/lexicon/LexiconDetailActivity.java
@@ -19,7 +19,7 @@ package com.benlinskey.greekreference.views.detail.lexicon;
 import android.content.Intent;
 import android.os.Bundle;
 import androidx.core.app.NavUtils;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/GreekReference/src/main/java/com/benlinskey/greekreference/views/detail/syntax/SyntaxDetailActivity.java b/GreekReference/src/main/java/com/benlinskey/greekreference/views/detail/syntax/SyntaxDetailActivity.java
index 0565f33..1fd23ee 100644
--- a/GreekReference/src/main/java/com/benlinskey/greekreference/views/detail/syntax/SyntaxDetailActivity.java
+++ b/GreekReference/src/main/java/com/benlinskey/greekreference/views/detail/syntax/SyntaxDetailActivity.java
@@ -19,7 +19,7 @@ package com.benlinskey.greekreference.views.detail.syntax;
 import android.content.Intent;
 import android.os.Bundle;
 import androidx.core.app.NavUtils;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import android.view.Menu;
 import android.view.MenuItem;