diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java index 8110aa000..04b94eb8e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java +++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java @@ -28,7 +28,7 @@ public class GlobalUserPreferences{ public static boolean disableSwipe; public static boolean disableDividers; public static boolean voteButtonForSingleChoice; - public static boolean showUniformPushNoticationIcons; + public static boolean uniformNotificationIcon; public static boolean enableDeleteNotifications; public static boolean relocatePublishButton; public static boolean reduceMotion; @@ -56,7 +56,7 @@ public class GlobalUserPreferences{ showReplies=prefs.getBoolean("showReplies", true); showBoosts=prefs.getBoolean("showBoosts", true); loadNewPosts=prefs.getBoolean("loadNewPosts", true); - showUniformPushNoticationIcons=prefs.getBoolean("showUniformPushNotificationIcons", true); + uniformNotificationIcon=prefs.getBoolean("uniformNotificationIcon", true); showFederatedTimeline=prefs.getBoolean("showFederatedTimeline", !BuildConfig.BUILD_TYPE.equals("playRelease")); showInteractionCounts=prefs.getBoolean("showInteractionCounts", false); alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false); @@ -68,6 +68,7 @@ public class GlobalUserPreferences{ enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", true); theme=ThemePreference.values()[prefs.getInt("theme", 0)]; recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>()); + publishButtonText=prefs.getString("publishButtonText", ""); try { if(android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S){ @@ -96,7 +97,7 @@ public class GlobalUserPreferences{ .putBoolean("disableSwipe", disableSwipe) .putBoolean("disableDividers", disableDividers) .putBoolean("relocatePublishButton", relocatePublishButton) - .putBoolean("showUniformPushNotificationIcons", showUniformPushNoticationIcons) + .putBoolean("uniformNotificationIcon", uniformNotificationIcon) .putBoolean("enableDeleteNotifications", enableDeleteNotifications) .putBoolean("reduceMotion", reduceMotion) .putString("publishButtonText", publishButtonText) diff --git a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java index 3a8f01861..00946de41 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java +++ b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java @@ -141,7 +141,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{ .setCategory(Notification.CATEGORY_SOCIAL) .setAutoCancel(true) .setColor(context.getColor(R.color.shortcut_icon_background)); - if(!GlobalUserPreferences.showUniformPushNoticationIcons){ + if(!GlobalUserPreferences.uniformNotificationIcon){ switch (pn.notificationType) { case FAVORITE -> builder.setSmallIcon(R.drawable.ic_fluent_star_24_filled); case REBLOG -> builder.setSmallIcon(R.drawable.ic_fluent_arrow_repeat_all_24_filled); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java index 78cfec4a5..0e3046c53 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -19,6 +19,8 @@ import android.view.WindowInsets; import android.view.WindowManager; import android.view.animation.LinearInterpolator; import android.widget.Button; +import android.widget.EditText; +import android.widget.FrameLayout; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -129,7 +131,6 @@ public class SettingsFragment extends MastodonToolbarFragment{ case NORD -> R.string.sk_color_palette_nord; }); })); - items.add(new SwitchItem(R.string.sk_settings_uniform_icon_for_notifications, R.drawable.ic_ntf_logo, GlobalUserPreferences.showUniformPushNoticationIcons, this::onNotificationStyleChanged)); items.add(new ButtonItem(R.string.sk_settings_publish_button_text, R.drawable.ic_fluent_send_24_regular, b->{ updatePublishText(b); @@ -443,7 +444,7 @@ public class SettingsFragment extends MastodonToolbarFragment{ } private void onNotificationStyleChanged(SwitchItem item){ - GlobalUserPreferences.showUniformPushNoticationIcons=item.checked; + GlobalUserPreferences.uniformNotificationIcon=item.checked; GlobalUserPreferences.save(); } diff --git a/mastodon/src/main/res/menu/profile_own.xml b/mastodon/src/main/res/menu/profile_own.xml index 4570b4433..07acdf591 100644 --- a/mastodon/src/main/res/menu/profile_own.xml +++ b/mastodon/src/main/res/menu/profile_own.xml @@ -3,6 +3,6 @@ - + \ No newline at end of file