Bump version number

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 75
-		versionName "1.1.4+fork.75.moshinda"
+		versionCode 72
+		versionName "1.1.4+fork.72.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/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java

@@ -61,7 +61,6 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 			info=new UpdateInfo();
 			info.version=prefs.getString("version", null);
 			info.size=prefs.getLong("apkSize", 0);
-			info.changelog=prefs.getString("changelog", null);
 			downloadID=prefs.getLong("downloadID", 0);
 			if(downloadID==0 || !getUpdateApkFile().exists()){
 				state=UpdateState.UPDATE_AVAILABLE;
@@ -85,7 +84,6 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 					.remove("apkURL")
 					.remove("checkedByBuild")
 					.remove("downloadID")
-					.remove("changelog")
 					.apply();
 		}
 	}
@@ -118,7 +116,6 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 		Call call=MastodonAPIController.getHttpClient().newCall(req);
 		try(Response resp=call.execute()){
 			JsonObject obj=JsonParser.parseReader(resp.body().charStream()).getAsJsonObject();
-			String changelog=obj.get("body").getAsString();
 			String tag=obj.get("tag_name").getAsString();
 			Pattern pattern=Pattern.compile("v?(\\d+)\\.(\\d+)\\.(\\d+)\\+fork\\.(\\d+)");
 			Matcher matcher=pattern.matcher(tag);
@@ -154,7 +151,6 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 						UpdateInfo info=new UpdateInfo();
 						info.size=size;
 						info.version=version;
-						info.changelog=changelog;
 						this.info=info;
 
 						getPrefs().edit()
@@ -162,7 +158,6 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 								.putString("version", version)
 								.putString("apkURL", url)
 								.putInt("checkedByBuild", BuildConfig.VERSION_CODE)
-								.putString("changelog", changelog)
 								.remove("downloadID")
 								.apply();
 

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

@@ -27,7 +27,6 @@ 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;
 
@@ -51,7 +50,6 @@ 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);
@@ -65,7 +63,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.valueOf(prefs.getString("color", ColorPreference.PURPLE.name()));
+				color=ColorPreference.PURPLE;
 			}
 		} catch (IllegalArgumentException|ClassCastException ignored) {
 			// invalid color name or color was previously saved as integer
@@ -86,7 +84,6 @@ 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))
@@ -101,8 +98,7 @@ public class GlobalUserPreferences{
 		BLUE,
 		BROWN,
 		RED,
-		YELLOW,
-		NORD
+		YELLOW
 	}
 
 	public enum ThemePreference{

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

@@ -143,19 +143,14 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
 				.setColor(context.getColor(R.color.shortcut_icon_background));
-		if(GlobalUserPreferences.showDifferentiatedPushNoticationIcons){
-			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);
-				case FOLLOW -> builder.setSmallIcon(R.drawable.ic_fluent_person_add_24_filled);
-				case MENTION -> builder.setSmallIcon(R.drawable.ic_fluent_mention_24_filled);
-				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);
+		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);
+			case FOLLOW -> builder.setSmallIcon(R.drawable.ic_fluent_person_add_24_filled);
+			case MENTION -> builder.setSmallIcon(R.drawable.ic_fluent_mention_24_filled);
+			case POLL -> builder.setSmallIcon(R.drawable.ic_fluent_poll_24_filled);
+			default -> 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,7 +9,6 @@ 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;
@@ -51,6 +50,7 @@ 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;
@@ -102,25 +102,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.disableMarquee=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b->{
-			PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
-			popupMenu.inflate(R.menu.color_palettes);
-			popupMenu.getMenu().findItem(R.id.m3_color).setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S);
-			popupMenu.setOnMenuItemClickListener(SettingsFragment.this::onColorPreferenceClick);
-			b.setOnTouchListener(popupMenu.getDragToOpenListener());
-			b.setOnClickListener(v->popupMenu.show());
-			b.setText(switch(GlobalUserPreferences.color){
-				case MATERIAL3 -> R.string.sk_color_palette_material3;
-				case PINK -> R.string.sk_color_palette_pink;
-				case PURPLE -> R.string.sk_color_palette_purple;
-				case GREEN -> R.string.sk_color_palette_green;
-				case BLUE -> R.string.sk_color_palette_blue;
-				case BROWN -> R.string.sk_color_palette_brown;
-				case RED -> R.string.sk_color_palette_red;
-				case YELLOW -> R.string.sk_color_palette_yellow;
-				case NORD -> R.string.sk_color_palette_nord;
-			});
-		}));
+		items.add(new ColorPicker());
 
 		items.add(new HeaderItem(R.string.settings_behavior));
 		items.add(new SwitchItem(R.string.settings_gif, R.drawable.ic_fluent_gif_24_regular, GlobalUserPreferences.playGifs, i->{
@@ -144,8 +126,6 @@ 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->{
@@ -268,29 +248,13 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		restartActivityToApplyNewTheme();
 	}
 
-	private boolean onColorPreferenceClick(MenuItem item){
-		ColorPreference pref = null;
-		int id = item.getItemId();
+	private void onColorPreferenceClick(GlobalUserPreferences.ColorPreference color){
 
-		if (id == R.id.m3_color) pref = ColorPreference.MATERIAL3;
-		else if (id == R.id.pink_color) pref = ColorPreference.PINK;
-		else if (id == R.id.purple_color) pref = ColorPreference.PURPLE;
-		else if (id == R.id.green_color) pref = ColorPreference.GREEN;
-		else if (id == R.id.blue_color) pref = ColorPreference.BLUE;
-		else if (id == R.id.brown_color) pref = ColorPreference.BROWN;
-		else if (id == R.id.red_color) pref = ColorPreference.RED;
-		else if (id == R.id.yellow_color) pref = ColorPreference.YELLOW;
-		else if (id == R.id.nord_color) pref = ColorPreference.NORD;
-
-		if (pref == null) return false;
-
-		GlobalUserPreferences.color=pref;
+		GlobalUserPreferences.color=color;
 		GlobalUserPreferences.save();
 		restartActivityToApplyNewTheme();
-		return true;
 	}
 
-
 	private void onTrueBlackThemeChanged(SwitchItem item){
 		GlobalUserPreferences.trueBlackTheme=item.checked;
 		GlobalUserPreferences.save();
@@ -355,12 +319,6 @@ 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;
@@ -500,23 +458,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
-	public class ButtonItem extends Item{
-		private int text;
-		private int icon;
-		private Consumer<Button> buttonConsumer;
-
-		public ButtonItem(@StringRes int text, @DrawableRes int icon, Consumer<Button> buttonConsumer) {
-			this.text = text;
-			this.icon = icon;
-			this.buttonConsumer = buttonConsumer;
-		}
-
-		@Override
-		public int getViewType(){
-			return 8;
-		}
-	}
-
 	public class ColorPicker extends Item{
 		@Override
 		public int getViewType(){
@@ -608,7 +549,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 				case 5 -> new HeaderViewHolder(true);
 				case 6 -> new FooterViewHolder();
 				case 7 -> new UpdateViewHolder();
-				case 8 -> new ButtonViewHolder();
+				case 8 -> new ColorPickerViewHolder();
 				default -> throw new IllegalStateException("Unexpected value: "+viewType);
 			};
 		}
@@ -737,25 +678,78 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			}
 		}
 	}
-
-	private class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
+	private class ColorPickerViewHolder extends BindableViewHolder<ColorPicker>{
 		private final Button button;
+		private final PopupMenu popupMenu;
 		private final ImageView icon;
-		private final TextView text;
 
 		@SuppressLint("ClickableViewAccessibility")
-		public ButtonViewHolder(){
-			super(getActivity(), R.layout.item_settings_button, list);
-			text=findViewById(R.id.text);
+		public ColorPickerViewHolder(){
+			super(getActivity(), R.layout.item_settings_color_picker, list);
 			icon=findViewById(R.id.icon);
-			button=findViewById(R.id.button);
+			button=findViewById(R.id.color_picker_button);
+			popupMenu=new PopupMenu(getActivity(), button, Gravity.CENTER_HORIZONTAL);
+			popupMenu.inflate(R.menu.color_picker);
+			popupMenu.setOnMenuItemClickListener(item->{
+				GlobalUserPreferences.ColorPreference pref;
+				int id=item.getItemId();
+				if(id==R.id.pink_color) {
+					pref = GlobalUserPreferences.ColorPreference.PINK;
+					onColorPreferenceClick(pref);
+				}
+				else if(id==R.id.purple_color) {
+					pref = GlobalUserPreferences.ColorPreference.PURPLE;
+					onColorPreferenceClick(pref);
+				}
+				else if(id==R.id.green_color) {
+					pref = GlobalUserPreferences.ColorPreference.GREEN;
+					onColorPreferenceClick(pref);
+				}
+				else if(id==R.id.blue_color) {
+					pref = GlobalUserPreferences.ColorPreference.BLUE;
+					onColorPreferenceClick(pref);
+				}
+				else if(id==R.id.orange_color) {
+					pref = ColorPreference.BROWN;
+					onColorPreferenceClick(pref);
+				}
+				else if(id==R.id.yellow_color) {
+					pref = GlobalUserPreferences.ColorPreference.YELLOW;
+					onColorPreferenceClick(pref);
+				}
+				else if(id==R.id.red_color) {
+					pref = GlobalUserPreferences.ColorPreference.RED;
+					onColorPreferenceClick(pref);
+				}
+				else if(id==R.id.m3_color) {
+					if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+						pref = GlobalUserPreferences.ColorPreference.MATERIAL3;
+						onColorPreferenceClick(pref);
+					}
+				}
+				else
+					return false;
+				return true;
+			});
+//			UiUtils.enablePopupMenuIcons(getActivity(), popupMenu);
+			popupMenu.getMenu().findItem(R.id.m3_color).setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S);
+			button.setOnTouchListener(popupMenu.getDragToOpenListener());
+			button.setOnClickListener(v->popupMenu.show());
 		}
 
 		@Override
-		public void onBind(ButtonItem item){
-			text.setText(item.text);
-			icon.setImageResource(item.icon);
-			item.buttonConsumer.accept(button);
+		public void onBind(ColorPicker item){
+			icon.setImageResource(R.drawable.ic_fluent_color_24_regular);
+			button.setText(switch(GlobalUserPreferences.color){
+				case PINK -> R.string.sk_color_palette_pink;
+				case PURPLE -> R.string.sk_color_palette_purple;
+				case GREEN -> R.string.sk_color_palette_green;
+				case BLUE -> R.string.sk_color_palette_blue;
+				case BROWN -> R.string.sk_color_palette_brown;
+				case YELLOW -> R.string.sk_color_palette_yellow;
+				case RED -> R.string.sk_color_palette_red;
+				case MATERIAL3 -> R.string.sk_color_palette_material3;
+			});
 		}
 	}
 
@@ -839,7 +833,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 
 	private class UpdateViewHolder extends BindableViewHolder<UpdateItem>{
 
-		private final TextView text, changelog;
+		private final TextView text;
 		private final Button button;
 		private final ImageButton cancelBtn;
 		private final ProgressBar progress;
@@ -850,7 +844,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		public UpdateViewHolder(){
 			super(getActivity(), R.layout.item_settings_update, list);
 			text=findViewById(R.id.text);
-			changelog=findViewById(R.id.changelog);
 			button=findViewById(R.id.button);
 			cancelBtn=findViewById(R.id.cancel_btn);
 			progress=findViewById(R.id.progress);
@@ -894,8 +887,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 				progress.setVisibility(View.GONE);
 				progress.removeCallbacks(progressUpdater);
 			}
-			changelog.setText(info.changelog);
-//			changelog.setText(getString(R.string.sk_changelog, info.changelog));
 		}
 
 		private void updateProgress(){

mastodon/src/main/java/org/joinmastodon/android/ui/utils/ColorPalette.java

@@ -25,8 +25,7 @@ public class ColorPalette {
             ColorPreference.BLUE, new ColorPalette(R.style.ColorPalette_Blue),
             ColorPreference.BROWN, new ColorPalette(R.style.ColorPalette_Brown),
             ColorPreference.RED, new ColorPalette(R.style.ColorPalette_Red),
-            ColorPreference.YELLOW, new ColorPalette(R.style.ColorPalette_Yellow),
-            ColorPreference.NORD, new ColorPalette(R.style.ColorPalette_Nord)
+            ColorPreference.YELLOW, new ColorPalette(R.style.ColorPalette_Yellow)
     );
 
     private @StyleRes int base;

mastodon/src/main/java/org/joinmastodon/android/updater/GithubSelfUpdater.java

@@ -50,7 +50,6 @@ public abstract class GithubSelfUpdater{
 	}
 
 	public static class UpdateInfo{
-		public String changelog;
 		public String version;
 		public long size;
 	}

mastodon/src/main/res/color/bookmark_icon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?bookmark_selected" android:state_selected="true"/>
+	<item android:color="@color/bookmark_selected" android:state_selected="true"/>
 	<item android:color="?android:textColorSecondary"/>
 </selector>

mastodon/src/main/res/color/favorite_icon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?favorite_selected" android:state_selected="true"/>
+	<item android:color="@color/favorite_selected" android:state_selected="true"/>
 	<item android:color="?android:textColorSecondary"/>
 </selector>

mastodon/src/main/res/layout/item_settings_update.xml

@@ -7,95 +7,69 @@
 
 	<LinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
+		android:layout_height="wrap_content"
+		android:minHeight="64dp"
+		android:gravity="center_vertical"
+		android:paddingStart="16dp"
 		android:background="@drawable/bg_settings_update"
-		android:orientation="vertical">
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:background="@drawable/bg_settings_update"
-			android:gravity="center_vertical"
-			android:minHeight="64dp"
-			android:orientation="horizontal"
-			android:paddingStart="16dp">
-
-			<TextView
-				android:id="@+id/text"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="16dp"
-				android:layout_marginEnd="4dp"
-				android:layout_marginBottom="16dp"
-				android:layout_weight="1"
-				android:textAppearance="@style/m3_body_medium"
-				tools:text="@string/sk_update_available" />
-
-			<FrameLayout
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content">
-
-				<Button
-					android:id="@+id/button"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_gravity="center_vertical|end"
-					android:background="?android:selectableItemBackground"
-					android:paddingLeft="16dp"
-					android:paddingRight="16dp"
-					android:stateListAnimator="@null"
-					android:textAllCaps="true"
-					android:textColor="?android:textColorPrimary"
-					android:textSize="14dp"
-					tools:text="@string/install_update" />
-
-				<ImageButton
-					android:id="@+id/cancel_btn"
-					android:layout_width="40dp"
-					android:layout_height="40dp"
-					android:layout_gravity="end|center_vertical"
-					android:layout_marginEnd="16dp"
-					android:background="@drawable/bg_update_download_progress"
-					android:contentDescription="@string/cancel"
-					android:src="@drawable/ic_fluent_dismiss_16_filled"
-					android:tint="?colorSearchHint"
-					android:visibility="gone" />
-
-				<ProgressBar
-					android:id="@+id/progress"
-					android:layout_width="40dp"
-					android:layout_height="40dp"
-					android:layout_gravity="end|center_vertical"
-					android:layout_marginEnd="16dp"
-					android:indeterminate="false"
-					android:indeterminateOnly="false"
-					android:max="1000"
-					android:padding="0dp"
-					android:progressDrawable="@drawable/update_progress"
-					android:visibility="gone" />
-
-			</FrameLayout>
-
-		</LinearLayout>
+		android:orientation="horizontal">
 
 		<TextView
-			android:id="@+id/changelog_header"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:textColor="?android:textColorPrimary"
-			android:textStyle="bold"
-			android:textSize="16dp"
-			android:paddingStart="16dp"
-			android:text="@string/sk_changelog" />
-
-		<TextView
-			android:id="@+id/changelog"
-			android:layout_width="match_parent"
+			android:id="@+id/text"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginEnd="4dp"
+			android:layout_marginTop="16dp"
+			android:layout_marginBottom="16dp"
 			android:textAppearance="@style/m3_body_medium"
-			android:padding="16dp"
-			android:text="Changelog" />
+			tools:text="@string/sk_update_available"/>
+
+		<FrameLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content">
+
+			<Button
+				android:id="@+id/button"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical|end"
+				android:background="?android:selectableItemBackground"
+				android:textColor="?android:textColorPrimary"
+				android:textAllCaps="true"
+				android:textSize="14dp"
+				android:paddingLeft="16dp"
+				android:paddingRight="16dp"
+				android:stateListAnimator="@null"
+				tools:text="@string/install_update"/>
+
+			<ImageButton
+				android:id="@+id/cancel_btn"
+				android:layout_width="40dp"
+				android:layout_height="40dp"
+				android:layout_gravity="end|center_vertical"
+				android:layout_marginEnd="16dp"
+				android:background="@drawable/bg_update_download_progress"
+				android:tint="?colorSearchHint"
+				android:contentDescription="@string/cancel"
+				android:visibility="gone"
+				android:src="@drawable/ic_fluent_dismiss_16_filled"/>
+
+			<ProgressBar
+				android:id="@+id/progress"
+				android:layout_width="40dp"
+				android:layout_height="40dp"
+				android:layout_gravity="end|center_vertical"
+				android:layout_marginEnd="16dp"
+				android:progressDrawable="@drawable/update_progress"
+				android:max="1000"
+				android:padding="0dp"
+				android:visibility="gone"
+				android:indeterminateOnly="false"
+				android:indeterminate="false"/>
+
+		</FrameLayout>
+
 	</LinearLayout>
 
-
 </FrameLayout>

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

@@ -16,8 +16,6 @@
 	<attr name="colorSearchHint" format="color"/>
 	<attr name="colorTabInactive" format="color"/>
 	<attr name="colorAccentLightest" format="color"/>
-	<attr name="favorite_selected" format="color"/>
-	<attr name="bookmark_selected" format="color"/>
 	<attr name="profileHeaderBackground" format="color"/>
 	<attr name="toolbarBackground" format="color"/>
 

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

@@ -295,31 +295,21 @@
 
 	<color name="nord_primary_25">#fafaff</color>
 	<color name="nord_primary_50">#eff0ff</color>
-	<color name="nord_primary_100">#eceff4</color>
-	<color name="nord_primary_200">#e5e9f0</color>
-	<color name="nord_primary_300">#d8dee9</color>
-	<color name="nord_primary_400">#88c0d0</color>
-	<color name="nord_primary_500">#4c566a</color>
-	<color name="nord_primary_600">#4c566a</color>
-	<color name="nord_primary_700">#81a1c1</color>
-	<color name="nord_primary_800">#3b4252</color>
-	<color name="nord_primary_900">#2e3440</color>
+	<color name="nord_primary_100">#dfe1f2</color>
+	<color name="nord_primary_200">#c3c6d6</color>
+	<color name="nord_primary_300">#a8aaba</color>
+	<color name="nord_primary_400">#8f909f</color>
+	<color name="nord_primary_500">#727584</color>
+	<color name="nord_primary_600">#5b5e6c</color>
+	<color name="nord_primary_700">#434654</color>
+	<color name="nord_primary_800">#2d303d</color>
+	<color name="nord_primary_900">#181b27</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">#8C96B4</color>
-
-	<color name="nord_favorite_selected">#ebcb8b</color>
-	<color name="nord_bookmark_selected">#a3be8c</color>
-
-	<color name="nord_gray_400">#8C96B4</color>
+	<color name="nord_gray_400">#aaaab4</color>
 	<color name="nord_gray_300">#c5c6d0</color>
-	<color name="nord_gray_200">#D5DCE6</color>
-	<color name="nord_gray_100">#E2E7EE</color>
-	<color name="nord_gray_50t">#EAEDF2</color>
-	<color name="nord_gray_50">#EAEDF2</color>
+	<color name="nord_gray_200">#e2e2ec</color>
+	<color name="nord_gray_100">#eff0ff</color>
+	<color name="nord_gray_50t">#f0f0faca</color>
+	<color name="nord_gray_50">#f0f0fa</color>
 	<color name="nord_gray_25">#f7f8fa</color>
 </resources>

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

@@ -12,8 +12,6 @@
 		<item name="colorPrimary700">@color/primary_700</item>
 		<item name="colorPrimary800">@color/primary_800</item>
 		<item name="colorPrimary900">@color/primary_900</item>
-		<item name="bookmark_selected">@color/bookmark_selected</item>
-		<item name="favorite_selected">@color/favorite_selected</item>
 
 		<item name="colorGray900">@color/gray_900</item>
 		<item name="colorGray800t">@color/gray_800t</item>
@@ -235,7 +233,7 @@
 		<item name="colorGray25">@color/red_gray_25</item>
 	</style>
 
-	<style name="ColorPalette.Nord">
+	<style name="ColorPalette.Blueish">
 		<item name="colorPrimary25">@color/nord_primary_25</item>
 		<item name="colorPrimary50">@color/nord_primary_50</item>
 		<item name="colorPrimary100">@color/nord_primary_100</item>
@@ -248,15 +246,12 @@
 		<item name="colorPrimary800">@color/nord_primary_800</item>
 		<item name="colorPrimary900">@color/nord_primary_900</item>
 
-		<item name="bookmark_selected">@color/nord_bookmark_selected</item>
-		<item name="favorite_selected">@color/nord_favorite_selected</item>
-
-		<item name="colorGray900">@color/nord_gray_900</item>
-		<item name="colorGray800t">@color/nord_gray_800t</item>
-		<item name="colorGray800">@color/nord_gray_800</item>
-		<item name="colorGray700">@color/nord_gray_700</item>
-		<item name="colorGray600">@color/nord_gray_600</item>
-		<item name="colorGray500">@color/nord_gray_500</item>
+		<item name="colorGray900">@color/brownish_gray_900</item>
+		<item name="colorGray800t">@color/brownish_gray_800t</item>
+		<item name="colorGray800">@color/brownish_gray_800</item>
+		<item name="colorGray700">@color/brownish_gray_700</item>
+		<item name="colorGray600">@color/brownish_gray_600</item>
+		<item name="colorGray500">@color/brownish_gray_500</item>
 
 		<item name="colorGray400">@color/nord_gray_400</item>
 		<item name="colorGray300">@color/nord_gray_300</item>

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

@@ -27,7 +27,6 @@
     <string name="sk_federated_timeline_info_banner">These are the most recent posts by the people in your federation.</string>
     <string name="sk_update_available">Moshidon %s is ready to download.</string>
     <string name="sk_update_ready">Moshidon %s is downloaded and ready to install.</string>
-    <string name="sk_changelog">Changelog:</string>
     <string name="sk_check_for_update">Check for update</string>
     <string name="sk_no_update_available">No update available</string>
     <string name="sk_list_timelines">Lists</string>
@@ -79,7 +78,6 @@
     <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>