Skip to content

Commit 9023399

Browse files
farmerbbfarmerbb
committed
Migrate to AndroidX
1 parent 4a4eeac commit 9023399

19 files changed

Lines changed: 74 additions & 64 deletions

‎app/build.gradle‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
ext {
2-
SUPPORT_LIBRARY_VERSION = "28.0.0"
3-
}
4-
51
apply plugin: 'com.android.application'
62

73
repositories {
@@ -65,9 +61,9 @@ android {
6561
dependencies {
6662
implementation fileTree(dir: 'libs', include: ['*.jar'])
6763

68-
implementation "com.android.support:support-v4:${SUPPORT_LIBRARY_VERSION}"
69-
implementation "com.android.support:appcompat-v7:${SUPPORT_LIBRARY_VERSION}"
70-
implementation "com.android.support:design:${SUPPORT_LIBRARY_VERSION}"
64+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
65+
implementation 'androidx.appcompat:appcompat:1.0.2'
66+
implementation 'com.google.android.material:material:1.0.0'
7167
implementation 'org.apache.commons:commons-lang3:3.8.1'
7268
implementation 'us.feras.mdv:markdownview:1.1.0'
7369
}

‎app/src/main/java/com/farmerbb/notepad/activity/MainActivity.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,13 @@
2222
import android.print.PrintAttributes;
2323
import android.print.PrintDocumentAdapter;
2424
import android.print.PrintManager;
25-
import android.support.v4.app.DialogFragment;
26-
import android.support.v4.app.Fragment;
27-
import android.support.v4.app.FragmentTransaction;
2825
import android.content.ActivityNotFoundException;
2926
import android.content.Context;
3027
import android.content.Intent;
3128
import android.content.SharedPreferences;
3229
import android.net.Uri;
3330
import android.os.Build;
3431
import android.os.Bundle;
35-
import android.support.v4.content.LocalBroadcastManager;
36-
import android.support.v4.provider.DocumentFile;
3732
import android.util.Base64;
3833
import android.view.KeyEvent;
3934
import android.webkit.WebView;
@@ -66,6 +61,11 @@
6661
import java.util.Arrays;
6762
import java.util.Date;
6863

64+
import androidx.documentfile.provider.DocumentFile;
65+
import androidx.fragment.app.DialogFragment;
66+
import androidx.fragment.app.Fragment;
67+
import androidx.fragment.app.FragmentTransaction;
68+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
6969
import us.feras.mdv.MarkdownView;
7070

7171
public class MainActivity extends NotepadBaseActivity implements

‎app/src/main/java/com/farmerbb/notepad/activity/NoteEditActivity.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515

1616
package com.farmerbb.notepad.activity;
1717

18-
import android.support.v4.app.Fragment;
1918
import android.content.Context;
2019
import android.content.Intent;
2120
import android.content.SharedPreferences;
2221
import android.os.Build;
2322
import android.os.Bundle;
24-
import android.support.v4.app.DialogFragment;
25-
import android.support.v4.content.ContextCompat;
2623
import android.view.KeyEvent;
2724
import android.widget.EditText;
2825
import android.widget.LinearLayout;
@@ -40,6 +37,10 @@
4037
import java.io.InputStreamReader;
4138
import java.io.Reader;
4239

40+
import androidx.core.content.ContextCompat;
41+
import androidx.fragment.app.DialogFragment;
42+
import androidx.fragment.app.Fragment;
43+
4344
public class NoteEditActivity extends NotepadBaseActivity implements
4445
BackButtonDialogFragment.Listener,
4546
DeleteDialogFragment.Listener,

‎app/src/main/java/com/farmerbb/notepad/activity/NotepadBaseActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
import android.content.SharedPreferences;
44
import android.os.Build;
5-
import android.support.v4.content.ContextCompat;
6-
import android.support.v7.app.AppCompatActivity;
75
import android.view.View;
86
import android.view.Window;
97

108
import com.farmerbb.notepad.R;
119

10+
import androidx.appcompat.app.AppCompatActivity;
11+
import androidx.core.content.ContextCompat;
12+
1213
public abstract class NotepadBaseActivity extends AppCompatActivity {
1314
@Override
1415
protected void onResume() {

‎app/src/main/java/com/farmerbb/notepad/adapter/NoteListAdapter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import android.content.Context;
2020
import android.content.SharedPreferences;
2121
import android.graphics.Typeface;
22-
import android.support.v4.content.ContextCompat;
2322
import android.view.LayoutInflater;
2423
import android.view.View;
2524
import android.view.ViewGroup;
@@ -31,6 +30,8 @@
3130

3231
import java.util.ArrayList;
3332

33+
import androidx.core.content.ContextCompat;
34+
3435
public class NoteListAdapter extends ArrayAdapter<NoteListItem> {
3536
public NoteListAdapter(Context context, ArrayList<NoteListItem> notes) {
3637
super(context, R.layout.row_layout, notes);

‎app/src/main/java/com/farmerbb/notepad/adapter/NoteListDateAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
import android.content.Context;
2020
import android.content.SharedPreferences;
2121
import android.graphics.Typeface;
22-
import android.support.v4.content.ContextCompat;
2322
import android.view.LayoutInflater;
2423
import android.view.View;
2524
import android.view.ViewGroup;
2625
import android.widget.ArrayAdapter;
27-
import android.widget.LinearLayout;
2826
import android.widget.TextView;
2927

3028
import com.farmerbb.notepad.R;
3129
import com.farmerbb.notepad.util.NoteListItem;
3230

3331
import java.util.ArrayList;
3432

33+
import androidx.core.content.ContextCompat;
34+
3535
public class NoteListDateAdapter extends ArrayAdapter<NoteListItem> {
3636
public NoteListDateAdapter(Context context, ArrayList<NoteListItem> notes) {
3737
super(context, R.layout.row_layout_date, notes);

‎app/src/main/java/com/farmerbb/notepad/fragment/NoteEditFragment.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import android.app.ActivityManager;
2121
import android.graphics.Bitmap;
2222
import android.graphics.drawable.BitmapDrawable;
23-
import android.support.v4.app.Fragment;
24-
import android.support.v4.app.FragmentTransaction;
2523
import android.content.BroadcastReceiver;
2624
import android.content.Context;
2725
import android.content.Intent;
@@ -31,9 +29,6 @@
3129
import android.graphics.Typeface;
3230
import android.os.Build;
3331
import android.os.Bundle;
34-
import android.support.v4.content.ContextCompat;
35-
import android.support.v4.content.LocalBroadcastManager;
36-
import android.support.v7.app.AppCompatActivity;
3732
import android.view.KeyEvent;
3833
import android.view.LayoutInflater;
3934
import android.view.Menu;
@@ -54,6 +49,12 @@
5449
import java.io.FileOutputStream;
5550
import java.io.IOException;
5651

52+
import androidx.appcompat.app.AppCompatActivity;
53+
import androidx.core.content.ContextCompat;
54+
import androidx.fragment.app.Fragment;
55+
import androidx.fragment.app.FragmentTransaction;
56+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
57+
5758
public class NoteEditFragment extends Fragment {
5859

5960
private EditText noteContents;

‎app/src/main/java/com/farmerbb/notepad/fragment/NoteListFragment.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,13 @@
2222
import android.content.ActivityNotFoundException;
2323
import android.graphics.Bitmap;
2424
import android.graphics.drawable.BitmapDrawable;
25-
import android.support.design.widget.FloatingActionButton;
26-
import android.support.v4.app.DialogFragment;
27-
import android.support.v4.app.Fragment;
28-
import android.support.v4.app.FragmentTransaction;
2925
import android.content.BroadcastReceiver;
3026
import android.content.Context;
3127
import android.content.Intent;
3228
import android.content.IntentFilter;
3329
import android.content.SharedPreferences;
3430
import android.os.Build;
3531
import android.os.Bundle;
36-
import android.support.v4.content.ContextCompat;
37-
import android.support.v4.content.LocalBroadcastManager;
38-
import android.support.v7.app.AppCompatActivity;
3932
import android.view.ActionMode;
4033
import android.view.KeyEvent;
4134
import android.view.LayoutInflater;
@@ -58,6 +51,7 @@
5851
import com.farmerbb.notepad.fragment.dialog.AboutDialogFragment;
5952
import com.farmerbb.notepad.util.NoteListItem;
6053
import com.farmerbb.notepad.util.ScrollPositions;
54+
import com.google.android.material.floatingactionbutton.FloatingActionButton;
6155

6256
import org.apache.commons.lang3.ArrayUtils;
6357
import org.apache.commons.lang3.math.NumberUtils;
@@ -68,6 +62,13 @@
6862
import java.util.Collections;
6963
import java.util.List;
7064

65+
import androidx.appcompat.app.AppCompatActivity;
66+
import androidx.core.content.ContextCompat;
67+
import androidx.fragment.app.DialogFragment;
68+
import androidx.fragment.app.Fragment;
69+
import androidx.fragment.app.FragmentTransaction;
70+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
71+
7172
public class NoteListFragment extends Fragment {
7273

7374
String theme;

‎app/src/main/java/com/farmerbb/notepad/fragment/NoteViewFragment.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
import android.graphics.drawable.BitmapDrawable;
2424
import android.net.Uri;
2525
import android.os.FileUriExposedException;
26-
import android.support.v4.app.DialogFragment;
27-
import android.support.v4.app.Fragment;
28-
import android.support.v4.app.FragmentTransaction;
2926
import android.content.BroadcastReceiver;
3027
import android.content.Context;
3128
import android.content.Intent;
@@ -35,9 +32,6 @@
3532
import android.graphics.Typeface;
3633
import android.os.Build;
3734
import android.os.Bundle;
38-
import android.support.v4.content.ContextCompat;
39-
import android.support.v4.content.LocalBroadcastManager;
40-
import android.support.v7.app.AppCompatActivity;
4135
import android.util.Base64;
4236
import android.view.GestureDetector;
4337
import android.view.KeyEvent;
@@ -63,6 +57,12 @@
6357
import java.io.File;
6458
import java.io.IOException;
6559

60+
import androidx.appcompat.app.AppCompatActivity;
61+
import androidx.core.content.ContextCompat;
62+
import androidx.fragment.app.DialogFragment;
63+
import androidx.fragment.app.Fragment;
64+
import androidx.fragment.app.FragmentTransaction;
65+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
6666
import us.feras.mdv.MarkdownView;
6767

6868
public class NoteViewFragment extends Fragment {

‎app/src/main/java/com/farmerbb/notepad/fragment/WelcomeFragment.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,12 @@
2020
import android.content.ActivityNotFoundException;
2121
import android.graphics.Bitmap;
2222
import android.graphics.drawable.BitmapDrawable;
23-
import android.support.design.widget.FloatingActionButton;
24-
import android.support.v4.app.DialogFragment;
25-
import android.support.v4.app.Fragment;
26-
import android.support.v4.app.FragmentTransaction;
2723
import android.content.Context;
2824
import android.content.Intent;
2925
import android.content.SharedPreferences;
3026
import android.content.res.Configuration;
3127
import android.os.Build;
3228
import android.os.Bundle;
33-
import android.support.v4.content.ContextCompat;
34-
import android.support.v7.app.AppCompatActivity;
3529
import android.view.KeyEvent;
3630
import android.view.LayoutInflater;
3731
import android.view.Menu;
@@ -45,6 +39,13 @@
4539
import com.farmerbb.notepad.R;
4640
import com.farmerbb.notepad.activity.SettingsActivity;
4741
import com.farmerbb.notepad.fragment.dialog.AboutDialogFragment;
42+
import com.google.android.material.floatingactionbutton.FloatingActionButton;
43+
44+
import androidx.appcompat.app.AppCompatActivity;
45+
import androidx.core.content.ContextCompat;
46+
import androidx.fragment.app.DialogFragment;
47+
import androidx.fragment.app.Fragment;
48+
import androidx.fragment.app.FragmentTransaction;
4849

4950
public class WelcomeFragment extends Fragment {
5051

0 commit comments

Comments
 (0)