Skip to content
This repository was archived by the owner on Jun 8, 2024. It is now read-only.

Commit 0f61dcf

Browse files
committed
Project: Update MaterialPreference to 2.0
Signed-off-by: Fung <fython@163.com>
1 parent bf2d102 commit 0f61dcf

12 files changed

Lines changed: 18 additions & 17 deletions

File tree

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ allprojects {
1313
jcenter()
1414
maven { url 'https://jitpack.io' }
1515
maven { url 'https://maven.google.com' }
16+
maven { url 'https://dl.bintray.com/rikkaw/MaterialPreference/' }
1617
}
1718
}
1819

mobile/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ dependencies {
3737
compile 'com.google.code.gson:gson:2.8.0'
3838
compile 'com.squareup.okhttp3:okhttp:3.6.0'
3939
compile 'com.rengwuxian.materialedittext:library:2.1.4'
40-
compile 'com.github.RikkaW:MaterialPreference:v1.4.4'
4140
compile 'de.hdodenhof:circleimageview:2.1.0'
4241
compile 'me.dm7.barcodescanner:zxing:1.9'
4342
compile 'com.tencent.bugly:crashreport:2.4.0'
4443
compile 'moe.feng:AlipayZeroSdk:1.1'
44+
compile 'moe.shizuku.preference:preference:2.0'
45+
compile 'moe.shizuku.preference:preference-simplemenu:2.0'
4546
}

mobile/src/main/java/info/papdt/express/helper/ui/fragment/settings/AbsPrefFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import info.papdt.express.helper.R;
1515
import info.papdt.express.helper.support.Settings;
1616
import info.papdt.express.helper.ui.SettingsActivity;
17-
import rikka.materialpreference.PreferenceFragment;
17+
import moe.shizuku.preference.PreferenceFragment;
1818

1919
abstract class AbsPrefFragment extends PreferenceFragment {
2020

mobile/src/main/java/info/papdt/express/helper/ui/fragment/settings/SettingsAutoDetect.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import info.papdt.express.helper.R;
88
import info.papdt.express.helper.services.ClipboardDetectService;
99
import info.papdt.express.helper.support.Settings;
10-
import rikka.materialpreference.Preference;
11-
import rikka.materialpreference.SwitchPreference;
10+
import moe.shizuku.preference.Preference;
11+
import moe.shizuku.preference.SwitchPreference;
1212

1313
public class SettingsAutoDetect extends AbsPrefFragment
1414
implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {

mobile/src/main/java/info/papdt/express/helper/ui/fragment/settings/SettingsContributors.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.os.Bundle;
44

55
import info.papdt.express.helper.R;
6-
import rikka.materialpreference.Preference;
6+
import moe.shizuku.preference.Preference;
77

88
public class SettingsContributors extends AbsPrefFragment implements Preference.OnPreferenceClickListener {
99

mobile/src/main/java/info/papdt/express/helper/ui/fragment/settings/SettingsMain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import info.papdt.express.helper.support.ClipboardUtils;
99
import info.papdt.express.helper.ui.SettingsActivity;
1010
import moe.feng.alipay.zerosdk.AlipayZeroSdk;
11-
import rikka.materialpreference.Preference;
11+
import moe.shizuku.preference.Preference;
1212

1313
public class SettingsMain extends AbsPrefFragment implements Preference.OnPreferenceClickListener {
1414

mobile/src/main/java/info/papdt/express/helper/ui/fragment/settings/SettingsNetwork.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import info.papdt.express.helper.R;
66
import info.papdt.express.helper.support.PushUtils;
77
import info.papdt.express.helper.support.Settings;
8-
import rikka.materialpreference.ListPreference;
9-
import rikka.materialpreference.Preference;
10-
import rikka.materialpreference.SwitchPreference;
8+
import moe.shizuku.preference.ListPreference;
9+
import moe.shizuku.preference.Preference;
10+
import moe.shizuku.preference.SwitchPreference;
1111

1212
public class SettingsNetwork extends AbsPrefFragment implements Preference.OnPreferenceChangeListener {
1313

mobile/src/main/java/info/papdt/express/helper/ui/fragment/settings/SettingsUi.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
import info.papdt.express.helper.R;
77
import info.papdt.express.helper.support.Settings;
8-
import rikka.materialpreference.ListPreference;
9-
import rikka.materialpreference.Preference;
10-
import rikka.materialpreference.SwitchPreference;
8+
import moe.shizuku.preference.ListPreference;
9+
import moe.shizuku.preference.Preference;
10+
import moe.shizuku.preference.SwitchPreference;
1111

1212
public class SettingsUi extends AbsPrefFragment implements Preference.OnPreferenceChangeListener {
1313

mobile/src/main/java/info/papdt/express/helper/ui/items/DetailsStatusItemBinder.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import android.support.v7.widget.CardView;
88
import android.support.v7.widget.RecyclerView;
99
import android.text.TextUtils;
10-
import android.util.SparseArray;
11-
import android.util.SparseBooleanArray;
1210
import android.view.LayoutInflater;
1311
import android.view.View;
1412
import android.view.ViewGroup;
@@ -153,7 +151,6 @@ void setData(Package.Status newData) {
153151
stepIcon.animate().scaleX(1f).scaleY(1f)
154152
.setStartDelay(150 * (indexInStatus + 1))
155153
.setDuration(500).setInterpolator(new OvershootInterpolator()).start();
156-
157154
}
158155
}
159156
}

mobile/src/main/java/rikka/materialpreference/FixedSimpleMenuPreference.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import android.content.Context;
44
import android.util.AttributeSet;
5+
import info.papdt.express.helper.R;
6+
import moe.shizuku.preference.SimpleMenuPreference;
57

68
/**
79
* A version of {@link ListPreference} that presents the options in a drop down menu rather than a dialog.

0 commit comments

Comments
 (0)