Skip to content

Commit 244793f

Browse files
Stypoxtossj
Stypox
authored and
tossj
committed
Merge pull request TeamNewPipe/NewPipe#5879 from TacoTheDank/clean-oncreatepreferences
Clean up unnecessary onCreate in settings fragments
1 parent 2f13cc5 commit 244793f

File tree

7 files changed

+42
-82
lines changed

7 files changed

+42
-82
lines changed

‎app/src/debug/java/org/schabi/newpipelegacy/settings/DebugSettingsFragment.java‎

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

33
import android.os.Bundle;
44

5-
import androidx.annotation.Nullable;
65
import androidx.preference.Preference;
76

87
import org.schabi.newpipelegacy.R;
@@ -11,8 +10,8 @@
1110

1211
public class DebugSettingsFragment extends BasePreferenceFragment {
1312
@Override
14-
public void onCreate(@Nullable final Bundle savedInstanceState) {
15-
super.onCreate(savedInstanceState);
13+
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
14+
addPreferencesFromResource(R.xml.debug_settings);
1615

1716
final Preference showMemoryLeaksPreference
1817
= findPreference(getString(R.string.show_memory_leaks_key));
@@ -31,9 +30,4 @@ public void onCreate(@Nullable final Bundle savedInstanceState) {
3130
throw new RuntimeException();
3231
});
3332
}
34-
35-
@Override
36-
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
37-
addPreferencesFromResource(R.xml.debug_settings);
38-
}
3933
}

‎app/src/main/java/org/schabi/newpipelegacy/settings/AppearanceSettingsFragment.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import android.provider.Settings;
88
import android.widget.Toast;
99

10-
import androidx.annotation.Nullable;
1110
import androidx.core.app.ActivityCompat;
1211
import androidx.preference.Preference;
1312

@@ -21,8 +20,8 @@ public class AppearanceSettingsFragment extends BasePreferenceFragment {
2120
private String captionSettingsKey;
2221

2322
@Override
24-
public void onCreate(@Nullable final Bundle savedInstanceState) {
25-
super.onCreate(savedInstanceState);
23+
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
24+
addPreferencesFromResource(R.xml.appearance_settings);
2625

2726
final String themeKey = getString(R.string.theme_key);
2827
// the key of the active theme when settings were opened (or recreated after theme change)
@@ -58,11 +57,6 @@ public void onCreate(@Nullable final Bundle savedInstanceState) {
5857
}
5958
}
6059

61-
@Override
62-
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
63-
addPreferencesFromResource(R.xml.appearance_settings);
64-
}
65-
6660
@Override
6761
public boolean onPreferenceTreeClick(final Preference preference) {
6862
if (preference.getKey().equals(captionSettingsKey) && CAPTIONING_SETTINGS_ACCESSIBLE) {

‎app/src/main/java/org/schabi/newpipelegacy/settings/ContentSettingsFragment.java‎

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import android.widget.Toast;
1111

1212
import androidx.annotation.NonNull;
13-
import androidx.annotation.Nullable;
1413
import androidx.core.content.ContextCompat;
1514
import androidx.preference.Preference;
1615
import androidx.preference.PreferenceManager;
@@ -50,8 +49,35 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
5049
private String initialLanguage;
5150

5251
@Override
53-
public void onCreate(@Nullable final Bundle savedInstanceState) {
54-
super.onCreate(savedInstanceState);
52+
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
53+
final File homeDir = ContextCompat.getDataDir(requireContext());
54+
manager = new ContentSettingsManager(new NewPipeFileLocator(homeDir));
55+
manager.deleteSettingsFile();
56+
57+
addPreferencesFromResource(R.xml.content_settings);
58+
59+
final Preference importDataPreference = findPreference(getString(R.string.import_data));
60+
importDataPreference.setOnPreferenceClickListener(p -> {
61+
final Intent i = new Intent(getActivity(), FilePickerActivityHelper.class)
62+
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
63+
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, false)
64+
.putExtra(FilePickerActivityHelper.EXTRA_MODE,
65+
FilePickerActivityHelper.MODE_FILE);
66+
startActivityForResult(i, REQUEST_IMPORT_PATH);
67+
return true;
68+
});
69+
70+
final Preference exportDataPreference = findPreference(getString(R.string.export_data));
71+
exportDataPreference.setOnPreferenceClickListener(p -> {
72+
final Intent i = new Intent(getActivity(), FilePickerActivityHelper.class)
73+
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
74+
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, true)
75+
.putExtra(FilePickerActivityHelper.EXTRA_MODE,
76+
FilePickerActivityHelper.MODE_DIR);
77+
startActivityForResult(i, REQUEST_EXPORT_PATH);
78+
return true;
79+
});
80+
5581
thumbnailLoadToggleKey = getString(R.string.download_thumbnail_key);
5682
youtubeRestrictedModeEnabledKey = getString(R.string.youtube_restricted_mode_enabled);
5783

@@ -103,37 +129,6 @@ public boolean onPreferenceTreeClick(final Preference preference) {
103129
return super.onPreferenceTreeClick(preference);
104130
}
105131

106-
@Override
107-
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
108-
final File homeDir = ContextCompat.getDataDir(requireContext());
109-
manager = new ContentSettingsManager(new NewPipeFileLocator(homeDir));
110-
manager.deleteSettingsFile();
111-
112-
addPreferencesFromResource(R.xml.content_settings);
113-
114-
final Preference importDataPreference = findPreference(getString(R.string.import_data));
115-
importDataPreference.setOnPreferenceClickListener(p -> {
116-
final Intent i = new Intent(getActivity(), FilePickerActivityHelper.class)
117-
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
118-
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, false)
119-
.putExtra(FilePickerActivityHelper.EXTRA_MODE,
120-
FilePickerActivityHelper.MODE_FILE);
121-
startActivityForResult(i, REQUEST_IMPORT_PATH);
122-
return true;
123-
});
124-
125-
final Preference exportDataPreference = findPreference(getString(R.string.export_data));
126-
exportDataPreference.setOnPreferenceClickListener(p -> {
127-
final Intent i = new Intent(getActivity(), FilePickerActivityHelper.class)
128-
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
129-
.putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, true)
130-
.putExtra(FilePickerActivityHelper.EXTRA_MODE,
131-
FilePickerActivityHelper.MODE_DIR);
132-
startActivityForResult(i, REQUEST_EXPORT_PATH);
133-
return true;
134-
});
135-
}
136-
137132
@Override
138133
public void onDestroy() {
139134
super.onDestroy();

‎app/src/main/java/org/schabi/newpipelegacy/settings/DownloadSettingsFragment.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import android.util.Log;
1313
import android.widget.Toast;
1414

15-
import androidx.annotation.Nullable;
1615
import androidx.annotation.StringRes;
1716
import androidx.preference.Preference;
1817

@@ -46,8 +45,8 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
4645
private Context ctx;
4746

4847
@Override
49-
public void onCreate(@Nullable final Bundle savedInstanceState) {
50-
super.onCreate(savedInstanceState);
48+
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
49+
addPreferencesFromResource(R.xml.download_settings);
5150

5251
downloadPathVideoPreference = getString(R.string.download_path_video_key);
5352
downloadPathAudioPreference = getString(R.string.download_path_audio_key);
@@ -76,11 +75,6 @@ public void onCreate(@Nullable final Bundle savedInstanceState) {
7675
});
7776
}
7877

79-
@Override
80-
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
81-
addPreferencesFromResource(R.xml.download_settings);
82-
}
83-
8478
@Override
8579
public void onAttach(final Context context) {
8680
super.onAttach(context);

‎app/src/main/java/org/schabi/newpipelegacy/settings/HistorySettingsFragment.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import android.widget.Toast;
66

77
import androidx.annotation.NonNull;
8-
import androidx.annotation.Nullable;
98
import androidx.appcompat.app.AlertDialog;
109
import androidx.preference.Preference;
1110

@@ -29,8 +28,9 @@ public class HistorySettingsFragment extends BasePreferenceFragment {
2928
private CompositeDisposable disposables;
3029

3130
@Override
32-
public void onCreate(@Nullable final Bundle savedInstanceState) {
33-
super.onCreate(savedInstanceState);
31+
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
32+
addPreferencesFromResource(R.xml.history_settings);
33+
3434
cacheWipeKey = getString(R.string.metadata_cache_wipe_key);
3535
viewsHistoryClearKey = getString(R.string.clear_views_history_key);
3636
playbackStatesClearKey = getString(R.string.clear_playback_states_key);
@@ -39,11 +39,6 @@ public void onCreate(@Nullable final Bundle savedInstanceState) {
3939
disposables = new CompositeDisposable();
4040
}
4141

42-
@Override
43-
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
44-
addPreferencesFromResource(R.xml.history_settings);
45-
}
46-
4742
@Override
4843
public boolean onPreferenceTreeClick(final Preference preference) {
4944
if (preference.getKey().equals(cacheWipeKey)) {

‎app/src/main/java/org/schabi/newpipelegacy/settings/UpdateSettingsFragment.java‎

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

33
import android.os.Bundle;
44

5-
import androidx.annotation.Nullable;
65
import androidx.preference.Preference;
76

87
import org.schabi.newpipelegacy.R;
@@ -16,15 +15,10 @@ public class UpdateSettingsFragment extends BasePreferenceFragment {
1615
};
1716

1817
@Override
19-
public void onCreate(@Nullable final Bundle savedInstanceState) {
20-
super.onCreate(savedInstanceState);
18+
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
19+
addPreferencesFromResource(R.xml.update_settings);
2120

2221
final String updateToggleKey = getString(R.string.update_app_key);
2322
findPreference(updateToggleKey).setOnPreferenceChangeListener(updatePreferenceChange);
2423
}
25-
26-
@Override
27-
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
28-
addPreferencesFromResource(R.xml.update_settings);
29-
}
3024
}

‎app/src/main/java/org/schabi/newpipelegacy/settings/VideoAudioSettingsFragment.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import android.text.format.DateUtils;
99
import android.widget.Toast;
1010

11-
import androidx.annotation.Nullable;
1211
import androidx.preference.ListPreference;
1312

1413
import com.google.android.material.snackbar.Snackbar;
@@ -23,8 +22,8 @@ public class VideoAudioSettingsFragment extends BasePreferenceFragment {
2322
private SharedPreferences.OnSharedPreferenceChangeListener listener;
2423

2524
@Override
26-
public void onCreate(@Nullable final Bundle savedInstanceState) {
27-
super.onCreate(savedInstanceState);
25+
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
26+
addPreferencesFromResource(R.xml.video_audio_settings);
2827

2928
updateSeekOptions();
3029

@@ -104,11 +103,6 @@ private void updateSeekOptions() {
104103
}
105104
}
106105

107-
@Override
108-
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
109-
addPreferencesFromResource(R.xml.video_audio_settings);
110-
}
111-
112106
@Override
113107
public void onResume() {
114108
super.onResume();

0 commit comments

Comments
 (0)