Migrate to AndroidX

farmerbb · farmerbb · commit 9023399d6037 · 2019-04-07T12:25:32.000-06:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,7 +1,3 @@
-ext {
-    SUPPORT_LIBRARY_VERSION = "28.0.0"
-}
-
 apply plugin: 'com.android.application'
 
 repositories {
@@ -65,9 +61,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation "com.android.support:support-v4:${SUPPORT_LIBRARY_VERSION}"
-    implementation "com.android.support:appcompat-v7:${SUPPORT_LIBRARY_VERSION}"
-    implementation "com.android.support:design:${SUPPORT_LIBRARY_VERSION}"
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation 'org.apache.commons:commons-lang3:3.8.1'
     implementation 'us.feras.mdv:markdownview:1.1.0'
 }
diff --git a/app/src/main/java/com/farmerbb/notepad/activity/MainActivity.java b/app/src/main/java/com/farmerbb/notepad/activity/MainActivity.java
@@ -22,18 +22,13 @@
 import android.print.PrintAttributes;
 import android.print.PrintDocumentAdapter;
 import android.print.PrintManager;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v4.provider.DocumentFile;
 import android.util.Base64;
 import android.view.KeyEvent;
 import android.webkit.WebView;
@@ -66,6 +61,11 @@
 import java.util.Arrays;
 import java.util.Date;
 
+import androidx.documentfile.provider.DocumentFile;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import us.feras.mdv.MarkdownView;
 
 public class MainActivity extends NotepadBaseActivity implements
diff --git a/app/src/main/java/com/farmerbb/notepad/activity/NoteEditActivity.java b/app/src/main/java/com/farmerbb/notepad/activity/NoteEditActivity.java
@@ -15,14 +15,11 @@
 
 package com.farmerbb.notepad.activity;
 
-import android.support.v4.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.content.ContextCompat;
 import android.view.KeyEvent;
 import android.widget.EditText;
 import android.widget.LinearLayout;
@@ -40,6 +37,10 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+
 public class NoteEditActivity extends NotepadBaseActivity implements
 BackButtonDialogFragment.Listener, 
 DeleteDialogFragment.Listener, 
diff --git a/app/src/main/java/com/farmerbb/notepad/activity/NotepadBaseActivity.java b/app/src/main/java/com/farmerbb/notepad/activity/NotepadBaseActivity.java
@@ -2,13 +2,14 @@
 
 import android.content.SharedPreferences;
 import android.os.Build;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.Window;
 
 import com.farmerbb.notepad.R;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+
 public abstract class NotepadBaseActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
diff --git a/app/src/main/java/com/farmerbb/notepad/adapter/NoteListAdapter.java b/app/src/main/java/com/farmerbb/notepad/adapter/NoteListAdapter.java
@@ -19,7 +19,6 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Typeface;
-import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -31,6 +30,8 @@
 
 import java.util.ArrayList;
 
+import androidx.core.content.ContextCompat;
+
 public class NoteListAdapter extends ArrayAdapter<NoteListItem> {
     public NoteListAdapter(Context context, ArrayList<NoteListItem> notes) {
         super(context, R.layout.row_layout, notes);
diff --git a/app/src/main/java/com/farmerbb/notepad/adapter/NoteListDateAdapter.java b/app/src/main/java/com/farmerbb/notepad/adapter/NoteListDateAdapter.java
@@ -19,19 +19,19 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Typeface;
-import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.farmerbb.notepad.R;
 import com.farmerbb.notepad.util.NoteListItem;
 
 import java.util.ArrayList;
 
+import androidx.core.content.ContextCompat;
+
 public class NoteListDateAdapter extends ArrayAdapter<NoteListItem> {
     public NoteListDateAdapter(Context context, ArrayList<NoteListItem> notes) {
         super(context, R.layout.row_layout_date, notes);
diff --git a/app/src/main/java/com/farmerbb/notepad/fragment/NoteEditFragment.java b/app/src/main/java/com/farmerbb/notepad/fragment/NoteEditFragment.java
@@ -20,8 +20,6 @@
 import android.app.ActivityManager;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -31,9 +29,6 @@
 import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -54,6 +49,12 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 public class NoteEditFragment extends Fragment {
 
     private EditText noteContents;
diff --git a/app/src/main/java/com/farmerbb/notepad/fragment/NoteListFragment.java b/app/src/main/java/com/farmerbb/notepad/fragment/NoteListFragment.java
@@ -22,20 +22,13 @@
 import android.content.ActivityNotFoundException;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.ActionMode;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -58,6 +51,7 @@
 import com.farmerbb.notepad.fragment.dialog.AboutDialogFragment;
 import com.farmerbb.notepad.util.NoteListItem;
 import com.farmerbb.notepad.util.ScrollPositions;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -68,6 +62,13 @@
 import java.util.Collections;
 import java.util.List;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 public class NoteListFragment extends Fragment {
 
     String theme;
diff --git a/app/src/main/java/com/farmerbb/notepad/fragment/NoteViewFragment.java b/app/src/main/java/com/farmerbb/notepad/fragment/NoteViewFragment.java
@@ -23,9 +23,6 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.FileUriExposedException;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -35,9 +32,6 @@
 import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Base64;
 import android.view.GestureDetector;
 import android.view.KeyEvent;
@@ -63,6 +57,12 @@
 import java.io.File;
 import java.io.IOException;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import us.feras.mdv.MarkdownView;
 
 public class NoteViewFragment extends Fragment {
diff --git a/app/src/main/java/com/farmerbb/notepad/fragment/WelcomeFragment.java b/app/src/main/java/com/farmerbb/notepad/fragment/WelcomeFragment.java
@@ -20,18 +20,12 @@
 import android.content.ActivityNotFoundException;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -45,6 +39,13 @@
 import com.farmerbb.notepad.R;
 import com.farmerbb.notepad.activity.SettingsActivity;
 import com.farmerbb.notepad.fragment.dialog.AboutDialogFragment;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 
 public class WelcomeFragment extends Fragment {
 
diff --git a/app/src/main/java/com/farmerbb/notepad/fragment/dialog/AboutDialogFragment.java b/app/src/main/java/com/farmerbb/notepad/fragment/dialog/AboutDialogFragment.java
@@ -19,11 +19,8 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -33,6 +30,10 @@
 import com.farmerbb.notepad.R;
 import com.farmerbb.notepad.util.SignatureUtils;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
 public class AboutDialogFragment extends DialogFragment {
 
     TextView textView;
diff --git a/app/src/main/java/com/farmerbb/notepad/fragment/dialog/BackButtonDialogFragment.java b/app/src/main/java/com/farmerbb/notepad/fragment/dialog/BackButtonDialogFragment.java
@@ -16,14 +16,15 @@
 package com.farmerbb.notepad.fragment.dialog;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
-import android.support.v4.app.DialogFragment;
 import android.os.Bundle;
 
 import com.farmerbb.notepad.R;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
 public class BackButtonDialogFragment extends DialogFragment {
 
     /* The activity that creates an instance of this fragment must
diff --git a/app/src/main/java/com/farmerbb/notepad/fragment/dialog/DeleteDialogFragment.java b/app/src/main/java/com/farmerbb/notepad/fragment/dialog/DeleteDialogFragment.java
@@ -16,14 +16,15 @@
 package com.farmerbb.notepad.fragment.dialog;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
-import android.support.v4.app.DialogFragment;
 import android.os.Bundle;
 
 import com.farmerbb.notepad.R;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
 public class DeleteDialogFragment extends DialogFragment {
 
     /* The activity that creates an instance of this fragment must
diff --git a/app/src/main/java/com/farmerbb/notepad/fragment/dialog/FirstRunDialogFragment.java b/app/src/main/java/com/farmerbb/notepad/fragment/dialog/FirstRunDialogFragment.java
@@ -16,14 +16,15 @@
 package com.farmerbb.notepad.fragment.dialog;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
-import android.support.v4.app.DialogFragment;
 import android.os.Bundle;
 
 import com.farmerbb.notepad.R;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
 public class FirstRunDialogFragment extends DialogFragment {
 
     /* The activity that creates an instance of this fragment must
diff --git a/app/src/main/java/com/farmerbb/notepad/fragment/dialog/FirstViewDialogFragment.java b/app/src/main/java/com/farmerbb/notepad/fragment/dialog/FirstViewDialogFragment.java
@@ -15,14 +15,15 @@
 
 package com.farmerbb.notepad.fragment.dialog;
 
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
-import android.support.v4.app.DialogFragment;
 import android.os.Bundle;
 
 import com.farmerbb.notepad.R;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
 public class FirstViewDialogFragment extends DialogFragment {
 
     @NonNull
diff --git a/app/src/main/java/com/farmerbb/notepad/fragment/dialog/SaveButtonDialogFragment.java b/app/src/main/java/com/farmerbb/notepad/fragment/dialog/SaveButtonDialogFragment.java
@@ -17,13 +17,14 @@
 
 import android.app.Activity;
 import android.app.Dialog;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
 
 import com.farmerbb.notepad.R;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
 public class SaveButtonDialogFragment extends DialogFragment {
 
     /* The activity that creates an instance of this fragment must
diff --git a/app/src/main/res/layout/fragment_note_list.xml b/app/src/main/res/layout/fragment_note_list.xml
diff --git a/app/src/main/res/layout/fragment_welcome_alt.xml b/app/src/main/res/layout/fragment_welcome_alt.xml
diff --git a/gradle.properties b/gradle.properties
