Skip to content
This repository was archived by the owner on Nov 25, 2022. It is now read-only.

Commit d962d24

Browse files
M66BM66B
committed
Android Pie support
1 parent 80d8a34 commit d962d24

26 files changed

+127
-129
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/local.properties
44
/.idea/workspace.xml
55
/.idea/libraries
6+
/.idea/caches
67
.DS_Store
78
/build
89
/captures

‎.idea/caches/build_file_checksums.ser

-535 Bytes
Binary file not shown.

‎.idea/gradle.xml

+3-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

+4-28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle

+27-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 27
5-
buildToolsVersion "27.0.3"
4+
compileSdkVersion 28
5+
buildToolsVersion "28.0.3"
66

77
defaultConfig {
88
applicationId "eu.faircode.xlua"
99
minSdkVersion 23
10-
targetSdkVersion 27
11-
versionCode 124
12-
versionName "1.23.23"
10+
targetSdkVersion 28
11+
versionCode 125
12+
versionName "1.24"
1313
archivesBaseName = "XPrivacyLua-v$versionName-$versionCode"
1414
}
1515

@@ -30,19 +30,34 @@ android {
3030
}
3131

3232
dependencies {
33+
def appcompat_version = "1.0.2"
34+
def recyclerview_version = "1.0.0"
35+
def constraintlayout_version = "1.1.3"
36+
def material_version = "1.0.0"
37+
3338
implementation fileTree(dir: 'libs', include: ['*.jar'])
3439

35-
// https://developer.android.com/topic/libraries/support-library/revisions.html
36-
implementation 'com.android.support:appcompat-v7:27.+'
37-
implementation 'com.android.support.constraint:constraint-layout:1.1.+'
38-
implementation 'com.android.support:recyclerview-v7:27.+'
39-
implementation 'com.android.support:design:27.+'
40+
// https://mvnrepository.com/artifact/androidx.appcompat/appcompat
41+
implementation "androidx.appcompat:appcompat:$appcompat_version"
42+
43+
// https://mvnrepository.com/artifact/androidx.recyclerview/recyclerview
44+
implementation "androidx.recyclerview:recyclerview:$recyclerview_version"
45+
//implementation "androidx.recyclerview:recyclerview-selection:$recyclerview_version"
46+
47+
// https://mvnrepository.com/artifact/androidx.constraintlayout/constraintlayout
48+
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
49+
50+
// https://mvnrepository.com/artifact/com.google.android.material/material
51+
implementation "com.google.android.material:material:$material_version"
4052

4153
// https://bumptech.github.io/glide/
4254
// https://mvnrepository.com/artifact/com.github.bumptech.glide/glide
4355
// { exclude group: "com.android.support" }
44-
implementation 'com.github.bumptech.glide:glide:4.6.1'
45-
annotationProcessor 'com.github.bumptech.glide:compiler:4.6.1'
56+
implementation('com.github.bumptech.glide:glide:4.8.0') {
57+
exclude group: "com.android.support"
58+
}
59+
annotationProcessor 'androidx.annotation:annotation:1.0.1'
60+
annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
4661

4762
// https://github.com/rovo89/XposedBridge/wiki/Using-the-Xposed-Framework-API
4863
// https://bintray.com/rovo89/de.robv.android.xposed/api

‎app/src/main/java/eu/faircode/xlua/ActivityBase.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
package eu.faircode.xlua;
2121

2222
import android.os.Bundle;
23-
import android.support.v7.app.AppCompatActivity;
23+
24+
import androidx.appcompat.app.AppCompatActivity;
2425

2526
public class ActivityBase extends AppCompatActivity {
2627
private String theme;

‎app/src/main/java/eu/faircode/xlua/ActivityHelp.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package eu.faircode.xlua;
2121

2222
import android.os.Bundle;
23-
import android.support.v4.app.NavUtils;
2423
import android.text.Html;
2524
import android.text.method.LinkMovementMethod;
2625
import android.util.Log;
@@ -31,6 +30,8 @@
3130

3231
import java.util.Calendar;
3332

33+
import androidx.core.app.NavUtils;
34+
3435
public class ActivityHelp extends ActivityBase {
3536
private static final String TAG = "XLua.Help";
3637

‎app/src/main/java/eu/faircode/xlua/ActivityMain.java

+10-8
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,6 @@
2828
import android.net.Uri;
2929
import android.os.Bundle;
3030
import android.preference.PreferenceManager;
31-
import android.support.annotation.NonNull;
32-
import android.support.design.widget.Snackbar;
33-
import android.support.v4.app.FragmentManager;
34-
import android.support.v4.app.FragmentTransaction;
35-
import android.support.v4.widget.DrawerLayout;
36-
import android.support.v7.app.ActionBarDrawerToggle;
37-
import android.support.v7.app.AlertDialog;
38-
import android.support.v7.widget.SearchView;
3931
import android.text.Html;
4032
import android.text.method.LinkMovementMethod;
4133
import android.util.Log;
@@ -51,10 +43,20 @@
5143
import android.widget.ListView;
5244
import android.widget.TextView;
5345

46+
import com.google.android.material.snackbar.Snackbar;
47+
5448
import java.util.Calendar;
5549
import java.util.concurrent.ExecutorService;
5650
import java.util.concurrent.Executors;
5751

52+
import androidx.annotation.NonNull;
53+
import androidx.appcompat.app.ActionBarDrawerToggle;
54+
import androidx.appcompat.app.AlertDialog;
55+
import androidx.appcompat.widget.SearchView;
56+
import androidx.drawerlayout.widget.DrawerLayout;
57+
import androidx.fragment.app.FragmentManager;
58+
import androidx.fragment.app.FragmentTransaction;
59+
5860
public class ActivityMain extends ActivityBase {
5961
private final static String TAG = "XLua.Main";
6062

‎app/src/main/java/eu/faircode/xlua/AdapterApp.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,11 @@
2222
import android.content.Context;
2323
import android.content.Intent;
2424
import android.content.pm.PackageManager;
25-
import android.content.pm.ResolveInfo;
2625
import android.content.res.ColorStateList;
2726
import android.content.res.Resources;
2827
import android.net.Uri;
2928
import android.os.Bundle;
3029
import android.os.Process;
31-
import android.support.constraint.Group;
32-
import android.support.design.widget.Snackbar;
33-
import android.support.v7.util.DiffUtil;
34-
import android.support.v7.widget.AppCompatCheckBox;
35-
import android.support.v7.widget.LinearLayoutManager;
36-
import android.support.v7.widget.RecyclerView;
3730
import android.text.TextUtils;
3831
import android.util.Log;
3932
import android.util.TypedValue;
@@ -49,6 +42,7 @@
4942
import com.bumptech.glide.load.DecodeFormat;
5043
import com.bumptech.glide.load.engine.DiskCacheStrategy;
5144
import com.bumptech.glide.request.RequestOptions;
45+
import com.google.android.material.snackbar.Snackbar;
5246

5347
import java.text.Collator;
5448
import java.util.ArrayList;
@@ -61,6 +55,12 @@
6155
import java.util.concurrent.ExecutorService;
6256
import java.util.concurrent.Executors;
6357

58+
import androidx.appcompat.widget.AppCompatCheckBox;
59+
import androidx.constraintlayout.widget.Group;
60+
import androidx.recyclerview.widget.DiffUtil;
61+
import androidx.recyclerview.widget.LinearLayoutManager;
62+
import androidx.recyclerview.widget.RecyclerView;
63+
6464
public class AdapterApp extends RecyclerView.Adapter<AdapterApp.ViewHolder> implements Filterable {
6565
private static final String TAG = "XLua.App";
6666

‎app/src/main/java/eu/faircode/xlua/AdapterGroup.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
import android.content.Context;
2323
import android.content.res.ColorStateList;
2424
import android.content.res.Resources;
25-
import android.support.v7.app.AlertDialog;
26-
import android.support.v7.widget.AppCompatCheckBox;
27-
import android.support.v7.widget.RecyclerView;
2825
import android.text.Html;
2926
import android.text.format.DateUtils;
3027
import android.view.LayoutInflater;
@@ -43,6 +40,10 @@
4340
import java.util.Locale;
4441
import java.util.Map;
4542

43+
import androidx.appcompat.app.AlertDialog;
44+
import androidx.appcompat.widget.AppCompatCheckBox;
45+
import androidx.recyclerview.widget.RecyclerView;
46+
4647
public class AdapterGroup extends RecyclerView.Adapter<AdapterGroup.ViewHolder> {
4748
private static final String TAG = "XLua.Group";
4849

‎app/src/main/java/eu/faircode/xlua/FragmentMain.java

+14-13
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,6 @@
2727
import android.database.Cursor;
2828
import android.os.Bundle;
2929
import android.os.Parcel;
30-
import android.support.annotation.NonNull;
31-
import android.support.annotation.Nullable;
32-
import android.support.constraint.Group;
33-
import android.support.design.widget.Snackbar;
34-
import android.support.v4.app.Fragment;
35-
import android.support.v4.app.LoaderManager;
36-
import android.support.v4.content.AsyncTaskLoader;
37-
import android.support.v4.content.Loader;
38-
import android.support.v4.widget.SwipeRefreshLayout;
39-
import android.support.v7.app.AppCompatActivity;
40-
import android.support.v7.widget.LinearLayoutManager;
41-
import android.support.v7.widget.RecyclerView;
4230
import android.util.Log;
4331
import android.view.LayoutInflater;
4432
import android.view.View;
@@ -50,13 +38,26 @@
5038
import android.widget.Spinner;
5139
import android.widget.TextView;
5240

41+
import com.google.android.material.snackbar.Snackbar;
42+
5343
import java.text.Collator;
5444
import java.util.ArrayList;
5545
import java.util.Collections;
5646
import java.util.Comparator;
5747
import java.util.List;
5848
import java.util.Locale;
5949

50+
import androidx.annotation.NonNull;
51+
import androidx.annotation.Nullable;
52+
import androidx.constraintlayout.widget.Group;
53+
import androidx.fragment.app.Fragment;
54+
import androidx.loader.app.LoaderManager;
55+
import androidx.loader.content.AsyncTaskLoader;
56+
import androidx.loader.content.Loader;
57+
import androidx.recyclerview.widget.LinearLayoutManager;
58+
import androidx.recyclerview.widget.RecyclerView;
59+
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
60+
6061
public class FragmentMain extends Fragment {
6162
private final static String TAG = "XLua.Fragment";
6263

@@ -143,7 +144,7 @@ private void updateSelection() {
143144
public void onClick(View view) {
144145
XGroup selected = (XGroup) spGroup.getSelectedItem();
145146
Util.areYouSure(
146-
(AppCompatActivity) getActivity(),
147+
(ActivityBase) getActivity(),
147148
getString(R.string.msg_restrict_sure, selected.title),
148149
new Util.DoubtListener() {
149150
@Override

‎app/src/main/java/eu/faircode/xlua/Util.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
import android.app.Notification;
2424
import android.app.NotificationChannel;
2525
import android.app.NotificationManager;
26-
import android.arch.lifecycle.Lifecycle;
27-
import android.arch.lifecycle.LifecycleObserver;
28-
import android.arch.lifecycle.LifecycleOwner;
29-
import android.arch.lifecycle.OnLifecycleEvent;
3026
import android.content.Context;
3127
import android.content.DialogInterface;
3228
import android.content.pm.PackageInfo;
@@ -35,8 +31,6 @@
3531
import android.os.Build;
3632
import android.os.Process;
3733
import android.os.UserHandle;
38-
import android.support.v7.app.AlertDialog;
39-
import android.support.v7.app.AppCompatActivity;
4034
import android.text.TextUtils;
4135
import android.util.Log;
4236
import android.util.TypedValue;
@@ -45,6 +39,12 @@
4539
import java.lang.reflect.Method;
4640
import java.security.MessageDigest;
4741

42+
import androidx.appcompat.app.AlertDialog;
43+
import androidx.lifecycle.Lifecycle;
44+
import androidx.lifecycle.LifecycleObserver;
45+
import androidx.lifecycle.LifecycleOwner;
46+
import androidx.lifecycle.OnLifecycleEvent;
47+
4848
class Util {
4949
private final static String TAG = "XLua.Util";
5050

@@ -178,7 +178,7 @@ public static int resolveColor(Context context, int attr) {
178178
return typedValue.data;
179179
}
180180

181-
static void areYouSure(AppCompatActivity activity, String question, final DoubtListener listener) {
181+
static void areYouSure(ActivityBase activity, String question, final DoubtListener listener) {
182182
final DialogObserver observer = new DialogObserver();
183183
AlertDialog ad = new AlertDialog.Builder(activity)
184184
.setMessage(question)

‎app/src/main/java/eu/faircode/xlua/VXP.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import android.net.Uri;
77
import android.os.Bundle;
88
import android.os.RemoteException;
9-
import android.support.annotation.NonNull;
10-
import android.support.annotation.Nullable;
119
import android.util.Log;
1210

11+
import androidx.annotation.NonNull;
12+
import androidx.annotation.Nullable;
1313
import de.robv.android.xposed.XposedBridge;
1414

1515
public class VXP extends ContentProvider {

‎app/src/main/java/eu/faircode/xlua/XLua.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package eu.faircode.xlua;
2121

2222
import android.app.Application;
23-
import android.content.ContentResolver;
2423
import android.content.Context;
2524
import android.content.Intent;
2625
import android.content.IntentFilter;
@@ -31,7 +30,6 @@
3130
import android.os.Parcel;
3231
import android.os.Process;
3332
import android.os.SystemClock;
34-
import android.support.annotation.NonNull;
3533
import android.util.Log;
3634

3735
import org.luaj.vm2.Globals;
@@ -62,6 +60,7 @@
6260
import java.util.TimerTask;
6361
import java.util.WeakHashMap;
6462

63+
import androidx.annotation.NonNull;
6564
import de.robv.android.xposed.IXposedHookLoadPackage;
6665
import de.robv.android.xposed.IXposedHookZygoteInit;
6766
import de.robv.android.xposed.XC_MethodHook;

0 commit comments

Comments
 (0)