Skip to content

Commit d1a1293

Browse files
fix(TikTok): Show correct dialog restart text, use correct font color for non-dark mode
1 parent dfac836 commit d1a1293

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
5353
* Set by subclasses if Strings cannot be added as a resource.
5454
*/
5555
@Nullable
56-
protected static String restartDialogButtonText, restartDialogTitle, confirmDialogTitle, restartDialogMessage;
56+
protected static String restartDialogTitle, restartDialogMessage, restartDialogButtonText, confirmDialogTitle;
5757

5858
private final SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> {
5959
try {
@@ -152,6 +152,7 @@ private void showSettingUserDialogConfirmation(Preference pref, Setting<?> setti
152152
);
153153

154154
dialogPair.first.setOnDismissListener(d -> showingUserDialogMessage = false);
155+
dialogPair.first.setCancelable(false);
155156

156157
// Show the dialog.
157158
dialogPair.first.show();

extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/TikTokPreferenceFragment.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
import android.preference.Preference;
44
import android.preference.PreferenceScreen;
5+
56
import androidx.annotation.NonNull;
7+
8+
import app.revanced.extension.shared.Utils;
69
import app.revanced.extension.shared.settings.Setting;
710
import app.revanced.extension.shared.settings.preference.AbstractPreferenceFragment;
811
import app.revanced.extension.tiktok.settings.preference.categories.DownloadsPreferenceCategory;
9-
import app.revanced.extension.tiktok.settings.preference.categories.FeedFilterPreferenceCategory;
1012
import app.revanced.extension.tiktok.settings.preference.categories.ExtensionPreferenceCategory;
13+
import app.revanced.extension.tiktok.settings.preference.categories.FeedFilterPreferenceCategory;
1114
import app.revanced.extension.tiktok.settings.preference.categories.SimSpoofPreferenceCategory;
1215

1316
/**
@@ -37,10 +40,14 @@ protected void initialize() {
3740

3841
// Currently no resources can be compiled for TikTok (fails with aapt error).
3942
// So all TikTok Strings are hard coded in the extension.
40-
restartDialogTitle = "Refresh and restart";
43+
restartDialogTitle = "Restart required";
44+
restartDialogMessage = "Restart the app for this change to take effect.";
4145
restartDialogButtonText = "Restart";
4246
confirmDialogTitle = "Do you wish to proceed?";
4347

48+
// App does not use dark mode.
49+
Utils.setIsDarkModeEnabled(false);
50+
4451
PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(context);
4552
setPreferenceScreen(preferenceScreen);
4653

0 commit comments

Comments
 (0)