Skip to content

Commit d207a41

Browse files
PeratXPeratX
committed
androidx: move to new libs
1 parent b7c4ff9 commit d207a41

File tree

13 files changed

+56
-74
lines changed

13 files changed

+56
-74
lines changed

‎app/build.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,15 @@ dependencies {
5656
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
5757
implementation 'androidx.percentlayout:percentlayout:1.0.0'
5858
implementation 'androidx.cardview:cardview:1.0.0'
59-
implementation 'com.google.android.material:material:1.1.0-alpha10'
60-
implementation 'androidx.recyclerview:recyclerview:1.1.0-beta04'
59+
implementation 'com.google.android.material:material:1.1.0-beta01'
60+
implementation 'androidx.recyclerview:recyclerview:1.1.0-beta05'
61+
implementation "androidx.preference:preference:1.1.0"
6162
//DNS
62-
implementation 'org.pcap4j:pcap4j-core:1.7.6'
63-
implementation 'org.pcap4j:pcap4j-packetfactory-static:1.7.6'
63+
implementation 'org.pcap4j:pcap4j-core:1.8.2'
64+
implementation 'org.pcap4j:pcap4j-packetfactory-static:1.8.2'
6465
implementation 'org.minidns:minidns-client:0.3.4'
6566
implementation 'com.google.code.gson:gson:2.8.5'
66-
implementation 'com.squareup.okhttp3:okhttp:3.14.1'
67+
implementation 'com.squareup.okhttp3:okhttp:4.2.0'
6768

6869
//Analytics
6970
googleReleaseImplementation 'com.google.firebase:firebase-core:17.2.0'

‎app/src/main/java/org/itxtech/daedalus/Daedalus.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import android.net.Uri;
1111
import android.net.VpnService;
1212
import android.os.Build;
13-
import android.preference.PreferenceManager;
1413
import android.util.Log;
14+
import androidx.preference.PreferenceManager;
1515
import com.google.gson.Gson;
1616
import com.google.gson.GsonBuilder;
1717
import com.google.gson.JsonParseException;

‎app/src/main/java/org/itxtech/daedalus/activity/ConfigActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.itxtech.daedalus.activity;
22

3-
import android.app.FragmentManager;
4-
import android.app.FragmentTransaction;
53
import android.graphics.Color;
64
import android.graphics.drawable.Drawable;
75
import android.os.Bundle;
86
import androidx.appcompat.app.AppCompatActivity;
97
import androidx.appcompat.widget.Toolbar;
108
import androidx.core.content.ContextCompat;
119
import androidx.core.graphics.drawable.DrawableCompat;
10+
import androidx.fragment.app.FragmentManager;
11+
import androidx.fragment.app.FragmentTransaction;
1212
import org.itxtech.daedalus.Daedalus;
1313
import org.itxtech.daedalus.R;
1414
import org.itxtech.daedalus.fragment.ConfigFragment;
@@ -64,7 +64,7 @@ protected void onCreate(Bundle savedInstanceState) {
6464
toolbar.setOnMenuItemClickListener(fragment);
6565
toolbar.inflateMenu(R.menu.custom_config);
6666

67-
FragmentManager manager = getFragmentManager();
67+
FragmentManager manager = getSupportFragmentManager();
6868
fragment.setIntent(getIntent());
6969
FragmentTransaction fragmentTransaction = manager.beginTransaction();
7070
fragmentTransaction.replace(R.id.id_config, fragment);

‎app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.itxtech.daedalus.activity;
22

33
import android.app.Activity;
4-
import android.app.FragmentManager;
54
import android.content.Context;
65
import android.content.DialogInterface;
76
import android.content.Intent;
@@ -100,8 +99,7 @@ private void switchFragment(Class fragmentClass) {
10099
if (currentFragment == null || fragmentClass != currentFragment.getClass()) {
101100
try {
102101
ToolbarFragment fragment = (ToolbarFragment) fragmentClass.newInstance();
103-
FragmentManager fm = getFragmentManager();
104-
fm.beginTransaction().replace(R.id.id_content, fragment).commit();
102+
getSupportFragmentManager().beginTransaction().replace(R.id.id_content, fragment).commit();
105103
currentFragment = fragment;
106104
} catch (Exception e) {
107105
Logger.logException(e);
@@ -153,22 +151,14 @@ public void activateService() {
153151
new AlertDialog.Builder(this)
154152
.setTitle("觉得还不错？")
155153
.setMessage("您的支持是我动力来源！\n请考虑为我买杯咖啡醒醒脑，甚至其他…… ;)")
156-
.setPositiveButton("为我买杯咖啡", new DialogInterface.OnClickListener() {
157-
@Override
158-
public void onClick(DialogInterface dialog, int which) {
159-
Daedalus.donate();
160-
new AlertDialog.Builder(MainActivity.this)
161-
.setMessage("感谢您的支持！;)\n我会再接再厉！")
162-
.setPositiveButton("确认", null)
163-
.show();
164-
}
165-
})
166-
.setNeutralButton("不再显示", new DialogInterface.OnClickListener() {
167-
@Override
168-
public void onClick(DialogInterface dialog, int which) {
169-
Daedalus.configurations.setActivateCounter(-1);
170-
}
154+
.setPositiveButton("为我买杯咖啡", (dialog, which) -> {
155+
Daedalus.donate();
156+
new AlertDialog.Builder(MainActivity.this)
157+
.setMessage("感谢您的支持！;)\n我会再接再厉！")
158+
.setPositiveButton("确认", null)
159+
.show();
171160
})
161+
.setNeutralButton("不再显示", (dialog, which) -> Daedalus.configurations.setActivateCounter(-1))
172162
.setNegativeButton("取消", null)
173163
.show();
174164
}
@@ -182,6 +172,7 @@ public void onActivityResult(int request, int result, Intent data) {
182172
updateMainButton(R.string.button_text_deactivate);
183173
Daedalus.updateShortcut(getApplicationContext());
184174
}
175+
super.onActivityResult(request, result, data);
185176
}
186177

187178
private void updateMainButton(int id) {

‎app/src/main/java/org/itxtech/daedalus/fragment/ConfigFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.itxtech.daedalus.fragment;
22

33
import android.content.Intent;
4-
import android.preference.PreferenceFragment;
54
import androidx.appcompat.widget.Toolbar;
5+
import androidx.preference.PreferenceFragmentCompat;
66

77
/**
88
* Daedalus Project
@@ -15,7 +15,7 @@
1515
* the Free Software Foundation, either version 3 of the License, or
1616
* (at your option) any later version.
1717
*/
18-
abstract public class ConfigFragment extends PreferenceFragment implements Toolbar.OnMenuItemClickListener {
18+
abstract public class ConfigFragment extends PreferenceFragmentCompat implements Toolbar.OnMenuItemClickListener {
1919
protected Intent intent = null;
2020

2121
public void setIntent(Intent intent) {

‎app/src/main/java/org/itxtech/daedalus/fragment/DNSServerConfigFragment.java‎

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

33
import android.app.AlertDialog;
44
import android.os.Bundle;
5-
import android.preference.EditTextPreference;
5+
import androidx.preference.EditTextPreference;
66
import android.view.LayoutInflater;
77
import android.view.MenuItem;
88
import android.view.View;
@@ -29,28 +29,27 @@ public class DNSServerConfigFragment extends ConfigFragment {
2929
private int index;
3030

3131
@Override
32-
public void onCreate(Bundle savedInstanceState) {
33-
super.onCreate(savedInstanceState);
32+
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
3433
addPreferencesFromResource(R.xml.perf_server);
3534
}
3635

3736
@Override
3837
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
3938
View view = super.onCreateView(inflater, container, savedInstanceState);
4039

41-
EditTextPreference serverName = (EditTextPreference) findPreference("serverName");
40+
EditTextPreference serverName = findPreference("serverName");
4241
serverName.setOnPreferenceChangeListener((preference, newValue) -> {
4342
preference.setSummary((String) newValue);
4443
return true;
4544
});
4645

47-
EditTextPreference serverAddress = (EditTextPreference) findPreference("serverAddress");
46+
EditTextPreference serverAddress = findPreference("serverAddress");
4847
serverAddress.setOnPreferenceChangeListener((preference, newValue) -> {
4948
preference.setSummary((String) newValue);
5049
return true;
5150
});
5251

53-
EditTextPreference serverPort = (EditTextPreference) findPreference("serverPort");
52+
EditTextPreference serverPort = findPreference("serverPort");
5453
serverPort.setOnPreferenceChangeListener((preference, newValue) -> {
5554
preference.setSummary((String) newValue);
5655
return true;

‎app/src/main/java/org/itxtech/daedalus/fragment/GlobalConfigFragment.java‎

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

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.preference.*;
5+
import androidx.preference.*;
66
import org.itxtech.daedalus.Daedalus;
77
import org.itxtech.daedalus.R;
88
import org.itxtech.daedalus.activity.AppFilterActivity;
@@ -20,20 +20,18 @@
2020
* the Free Software Foundation, either version 3 of the License, or
2121
* (at your option) any later version.
2222
*/
23-
public class GlobalConfigFragment extends PreferenceFragment {
23+
public class GlobalConfigFragment extends PreferenceFragmentCompat {
2424

2525
@Override
26-
public void onCreate(Bundle savedInstanceState) {
27-
super.onCreate(savedInstanceState);
28-
26+
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
2927
Daedalus.getPrefs().edit()
3028
.putString("primary_server", DNSServerHelper.getPrimary())
3129
.putString("secondary_server", DNSServerHelper.getSecondary())
3230
.apply();
3331

3432
addPreferencesFromResource(R.xml.perf_settings);
3533

36-
ListPreference primaryServer = (ListPreference) findPreference("primary_server");
34+
ListPreference primaryServer = findPreference("primary_server");
3735
primaryServer.setEntries(DNSServerHelper.getNames(Daedalus.getInstance()));
3836
primaryServer.setEntryValues(DNSServerHelper.getIds());
3937
primaryServer.setSummary(DNSServerHelper.getDescription(primaryServer.getValue(), Daedalus.getInstance()));
@@ -42,7 +40,7 @@ public void onCreate(Bundle savedInstanceState) {
4240
return true;
4341
});
4442

45-
ListPreference secondaryServer = (ListPreference) findPreference("secondary_server");
43+
ListPreference secondaryServer = findPreference("secondary_server");
4644
secondaryServer.setEntries(DNSServerHelper.getNames(Daedalus.getInstance()));
4745
secondaryServer.setEntryValues(DNSServerHelper.getIds());
4846
secondaryServer.setSummary(DNSServerHelper.getDescription(secondaryServer.getValue(), Daedalus.getInstance()));
@@ -51,35 +49,35 @@ public void onCreate(Bundle savedInstanceState) {
5149
return true;
5250
});
5351

54-
EditTextPreference testDNSServers = (EditTextPreference) findPreference("dns_test_servers");
52+
EditTextPreference testDNSServers = findPreference("dns_test_servers");
5553
testDNSServers.setSummary(testDNSServers.getText());
5654
testDNSServers.setOnPreferenceChangeListener((preference, newValue) -> {
5755
preference.setSummary((String) newValue);
5856
return true;
5957
});
6058

61-
EditTextPreference logSize = (EditTextPreference) findPreference("settings_log_size");
59+
EditTextPreference logSize = findPreference("settings_log_size");
6260
logSize.setSummary(logSize.getText());
6361
logSize.setOnPreferenceChangeListener((preference, newValue) -> {
6462
preference.setSummary((String) newValue);
6563
return true;
6664
});
6765

68-
SwitchPreference darkTheme = (SwitchPreference) findPreference("settings_dark_theme");
66+
SwitchPreference darkTheme = findPreference("settings_dark_theme");
6967
darkTheme.setOnPreferenceChangeListener((preference, o) -> {
7068
getActivity().startActivity(new Intent(Daedalus.getInstance(), MainActivity.class)
7169
.putExtra(MainActivity.LAUNCH_FRAGMENT, MainActivity.FRAGMENT_SETTINGS)
7270
.putExtra(MainActivity.LAUNCH_NEED_RECREATE, true));
7371
return true;
7472
});
7573

76-
SwitchPreference advanced = (SwitchPreference) findPreference("settings_advanced_switch");
74+
SwitchPreference advanced = findPreference("settings_advanced_switch");
7775
advanced.setOnPreferenceChangeListener((preference, newValue) -> {
7876
updateOptions((boolean) newValue, "settings_advanced");
7977
return true;
8078
});
8179

82-
SwitchPreference appFilter = (SwitchPreference) findPreference("settings_app_filter_switch");
80+
SwitchPreference appFilter = findPreference("settings_app_filter_switch");
8381
appFilter.setOnPreferenceChangeListener((p, w) -> {
8482
updateOptions((boolean) w, "settings_app_filter");
8583
return true;
@@ -115,7 +113,7 @@ public void onCreate(Bundle savedInstanceState) {
115113
}
116114

117115
private void updateOptions(boolean checked, String pref) {
118-
PreferenceCategory category = (PreferenceCategory) findPreference(pref);
116+
PreferenceCategory category = findPreference(pref);
119117
for (int i = 1; i < category.getPreferenceCount(); i++) {
120118
Preference preference = category.getPreference(i);
121119
if (checked) {

‎app/src/main/java/org/itxtech/daedalus/fragment/RuleConfigFragment.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import android.os.Bundle;
88
import android.os.Handler;
99
import android.os.Message;
10-
import android.preference.EditTextPreference;
11-
import android.preference.ListPreference;
10+
import androidx.preference.EditTextPreference;
11+
import androidx.preference.ListPreference;
1212
import android.view.LayoutInflater;
1313
import android.view.MenuItem;
1414
import android.view.View;
@@ -72,10 +72,8 @@ private void stopThread() {
7272
}
7373
}
7474

75-
7675
@Override
77-
public void onCreate(Bundle savedInstanceState) {
78-
super.onCreate(savedInstanceState);
76+
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
7977
addPreferencesFromResource(R.xml.perf_rule);
8078
}
8179

@@ -85,13 +83,13 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
8583

8684
mHandler = new RuleConfigHandler().setView(view);
8785

88-
final EditTextPreference ruleName = (EditTextPreference) findPreference("ruleName");
86+
final EditTextPreference ruleName = findPreference("ruleName");
8987
ruleName.setOnPreferenceChangeListener((preference, newValue) -> {
9088
preference.setSummary((String) newValue);
9189
return true;
9290
});
9391

94-
final ListPreference ruleType = (ListPreference) findPreference("ruleType");
92+
final ListPreference ruleType = findPreference("ruleType");
9593
final String[] entries = {"Hosts", "DNSMasq"};
9694
String[] values = {"0", "1"};
9795
ruleType.setEntries(entries);
@@ -101,19 +99,19 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
10199
return true;
102100
});
103101

104-
final EditTextPreference ruleDownloadUrl = (EditTextPreference) findPreference("ruleDownloadUrl");
102+
final EditTextPreference ruleDownloadUrl = findPreference("ruleDownloadUrl");
105103
ruleDownloadUrl.setOnPreferenceChangeListener((preference, newValue) -> {
106104
preference.setSummary((String) newValue);
107105
return true;
108106
});
109107

110-
final EditTextPreference ruleFilename = (EditTextPreference) findPreference("ruleFilename");
108+
final EditTextPreference ruleFilename = findPreference("ruleFilename");
111109
ruleFilename.setOnPreferenceChangeListener((preference, newValue) -> {
112110
preference.setSummary((String) newValue);
113111
return true;
114112
});
115113

116-
ClickPreference ruleSync = (ClickPreference) findPreference("ruleSync");
114+
ClickPreference ruleSync = findPreference("ruleSync");
117115
ruleSync.setOnPreferenceClickListener(preference -> {
118116
save();
119117
if (mThread == null) {
@@ -167,7 +165,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
167165
return false;
168166
});
169167

170-
ListPreference ruleImportBuildIn = (ListPreference) findPreference("ruleImportBuildIn");
168+
ListPreference ruleImportBuildIn = findPreference("ruleImportBuildIn");
171169
ruleImportBuildIn.setEntries(Rule.getBuildInRuleNames());
172170
ruleImportBuildIn.setEntryValues(Rule.getBuildInRuleEntries());
173171
ruleImportBuildIn.setOnPreferenceChangeListener((preference, newValue) -> {
@@ -183,7 +181,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
183181
return true;
184182
});
185183

186-
ClickPreference ruleImportExternal = (ClickPreference) findPreference("ruleImportExternal");
184+
ClickPreference ruleImportExternal = findPreference("ruleImportExternal");
187185
ruleImportExternal.setOnPreferenceClickListener(preference -> {
188186
performFileSearch();
189187
return false;

‎app/src/main/java/org/itxtech/daedalus/fragment/SettingsFragment.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.itxtech.daedalus.fragment;
22

3-
import android.app.FragmentManager;
4-
import android.os.Build;
53
import android.os.Bundle;
64
import android.view.LayoutInflater;
75
import android.view.View;
@@ -28,13 +26,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
2826
@Override
2927
public void onViewCreated(View view, Bundle savedInstanceState) {
3028
super.onViewCreated(view, savedInstanceState);
31-
FragmentManager fm;
32-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
33-
fm = getChildFragmentManager();
34-
} else {
35-
fm = getFragmentManager();
36-
}
37-
fm.beginTransaction().replace(R.id.settings_content, new GlobalConfigFragment()).commit();
29+
getChildFragmentManager().beginTransaction().replace(R.id.settings_content, new GlobalConfigFragment()).commit();
3830
}
3931

4032
@Override

‎app/src/main/java/org/itxtech/daedalus/fragment/ToolbarFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.itxtech.daedalus.fragment;
22

3-
import android.app.Fragment;
43
import android.os.Bundle;
54
import android.view.Menu;
65
import android.view.View;
76
import androidx.appcompat.widget.Toolbar;
7+
import androidx.fragment.app.Fragment;
88
import com.google.android.material.navigation.NavigationView;
99
import org.itxtech.daedalus.R;
1010

0 commit comments

Comments
 (0)