Bump version number

# Conflicts:
#	mastodon/src/main/res/values/colors.xml

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 73
+		versionCode 75
-		versionName "1.1.4+fork.73.moshinda"
+		versionName "1.1.4+fork.75.moshinda"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "nl-rNL", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
 	}

mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java

@@ -27,6 +27,7 @@ public class GlobalUserPreferences{
 	public static boolean disableMarquee;
 	public static boolean disableSwipe;
 	public static boolean voteButtonForSingleChoice;
+	public static boolean showDifferentiatedPushNoticationIcons;
 	public static ThemePreference theme;
 	public static ColorPreference color;
 
@@ -50,6 +51,7 @@ public class GlobalUserPreferences{
 		showReplies=prefs.getBoolean("showReplies", true);
 		showBoosts=prefs.getBoolean("showBoosts", true);
 		loadNewPosts=prefs.getBoolean("loadNewPosts", true);
+		showDifferentiatedPushNoticationIcons=prefs.getBoolean("showDifferentiatedPushNoticationIcons", false);
 		showFederatedTimeline=prefs.getBoolean("showFederatedTimeline", !BuildConfig.BUILD_TYPE.equals("playRelease"));
 		showInteractionCounts=prefs.getBoolean("showInteractionCounts", false);
 		alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false);
@@ -63,7 +65,7 @@ public class GlobalUserPreferences{
 			if(android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S){
 				color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.MATERIAL3.name()));
 			}else{
-				color=ColorPreference.PURPLE;
+				color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PURPLE.name()));
 			}
 		} catch (IllegalArgumentException|ClassCastException ignored) {
 			// invalid color name or color was previously saved as integer
@@ -84,6 +86,7 @@ public class GlobalUserPreferences{
 				.putBoolean("alwaysExpandContentWarnings", alwaysExpandContentWarnings)
 				.putBoolean("disableMarquee", disableMarquee)
 				.putBoolean("disableSwipe", disableSwipe)
+				.putBoolean("showDifferentiatedPushNoticationIcons", showDifferentiatedPushNoticationIcons)
 				.putInt("theme", theme.ordinal())
 				.putString("color", color.name())
 				.putString("recentLanguages", gson.toJson(recentLanguages))

mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java

@@ -143,14 +143,19 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
 				.setColor(context.getColor(R.color.shortcut_icon_background));
-		switch (pn.notificationType) {
+		if(GlobalUserPreferences.showDifferentiatedPushNoticationIcons){
-			case FAVORITE -> builder.setSmallIcon(R.drawable.ic_fluent_star_24_filled);
+			switch (pn.notificationType) {
-			case REBLOG -> builder.setSmallIcon(R.drawable.ic_fluent_arrow_repeat_all_24_filled);
+				case FAVORITE -> builder.setSmallIcon(R.drawable.ic_fluent_star_24_filled);
-			case FOLLOW -> builder.setSmallIcon(R.drawable.ic_fluent_person_add_24_filled);
+				case REBLOG -> builder.setSmallIcon(R.drawable.ic_fluent_arrow_repeat_all_24_filled);
-			case MENTION -> builder.setSmallIcon(R.drawable.ic_fluent_mention_24_filled);
+				case FOLLOW -> builder.setSmallIcon(R.drawable.ic_fluent_person_add_24_filled);
-			case POLL -> builder.setSmallIcon(R.drawable.ic_fluent_poll_24_filled);
+				case MENTION -> builder.setSmallIcon(R.drawable.ic_fluent_mention_24_filled);
-			default -> builder.setSmallIcon(R.drawable.ic_ntf_logo);
+				case POLL -> builder.setSmallIcon(R.drawable.ic_fluent_poll_24_filled);
+				default -> builder.setSmallIcon(R.drawable.ic_ntf_logo);
+			}
+		}else{
+			builder.setSmallIcon(R.drawable.ic_ntf_logo);
 		}
+
 		if(avatar!=null){
 			builder.setLargeIcon(UiUtils.getBitmapFromDrawable(avatar));
 		}

mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java

@@ -9,6 +9,7 @@ import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -18,8 +19,6 @@ 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.PopupMenu;
@@ -52,7 +51,6 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
 
 import java.util.ArrayList;
-import java.util.Objects;
 import java.util.function.Consumer;
 
 import androidx.annotation.DrawableRes;
@@ -146,6 +144,8 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.save();
 			needAppRestart=true;
 		}));
+		items.add(new SwitchItem(R.string.sk_settings_show_differentiated_notification_icons, R.drawable.ic_fluent_earth_24_regular, GlobalUserPreferences.showDifferentiatedPushNoticationIcons, this::onNotificationStyleChanged));
+
 
 		items.add(new HeaderItem(R.string.home_timeline));
 		items.add(new SwitchItem(R.string.sk_settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{
@@ -355,6 +355,12 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		needUpdateNotificationSettings=true;
 	}
 
+	private void onNotificationStyleChanged(SwitchItem item){
+		GlobalUserPreferences.showDifferentiatedPushNoticationIcons=item.checked;
+		GlobalUserPreferences.save();
+	}
+
+
 	private void onNotificationsPolicyChanged(PushSubscription.Policy policy){
 		PushSubscription subscription=getPushSubscription();
 		PushSubscription.Policy prevPolicy=subscription.policy;

mastodon/src/main/res/values/colors.xml

@@ -295,24 +295,24 @@
 
 	<color name="nord_primary_25">#fafaff</color>
 	<color name="nord_primary_50">#eff0ff</color>
-	<color name="nord_primary_100">#dfe1f2</color>
+	<color name="nord_primary_100">#eceff4</color>
-	<color name="nord_primary_200">#c3c6d6</color>
+	<color name="nord_primary_200">#e5e9f0</color>
-	<color name="nord_primary_300">#a8aaba</color>
+	<color name="nord_primary_300">#d8dee9</color>
-	<color name="nord_primary_400">#8f909f</color>
+	<color name="nord_primary_400">#88c0d0</color>
-	<color name="nord_primary_500">#727584</color>
+	<color name="nord_primary_500">#4c566a</color>
-	<color name="nord_primary_600">#5b5e6c</color>
+	<color name="nord_primary_600">#4c566a</color>
-	<color name="nord_primary_700">#434654</color>
+	<color name="nord_primary_700">#81a1c1</color>
-	<color name="nord_primary_800">#2d303d</color>
+	<color name="nord_primary_800">#3b4252</color>
-	<color name="nord_primary_900">#181b27</color>
+	<color name="nord_primary_900">#2e3440</color>
 
-	<color name="nord_gray_900">#110c10</color>
+	<color name="nord_gray_900">#3B4252</color>
 	<color name="nord_gray_800t">#cc2D343F</color>
 	<color name="nord_gray_800">#2D343F</color>
 	<color name="nord_gray_700">#3A4250</color>
 	<color name="nord_gray_600">#404C5C</color>
-	<color name="nord_gray_500">#495668</color>
+	<color name="nord_gray_500">#8C96B4</color>
 
-	<color name="nord_gray_400">#c5c6d0</color>
+	<color name="nord_gray_400">#8C96B4</color>
 	<color name="nord_gray_300">#c5c6d0</color>
 	<color name="nord_gray_200">#D5DCE6</color>
 	<color name="nord_gray_100">#E2E7EE</color>

mastodon/src/main/res/values/strings_sk.xml

@@ -78,6 +78,7 @@
     <string name="sk_clear_all_notifications_confirm_action">Delete all</string>
     <string name="sk_clear_all_notifications_confirm">Are you sure you want to clear all notifications\?</string>
     <string name="sk_enable_delete_notifications">Enable deleting notifications</string>
+    <string name="sk_settings_show_differentiated_notification_icons">Custom icons for interactions</string>
     <string name="sk_settings_publish_button_text">Publish button text</string>
     <string name="sk_settings_publish_button_text_title">Customize Publish button text</string>
     <string name="sk_settings_hide_translate_in_timeline">Hide translate button in timeline</string>