Fixing some padding issues with the changelog

This reverts commit e8a31cf867.

mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java

@@ -61,6 +61,7 @@ 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;
@@ -84,6 +85,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 					.remove("apkURL")
 					.remove("checkedByBuild")
 					.remove("downloadID")
+					.remove("changelog")
 					.apply();
 		}
 	}
@@ -116,6 +118,7 @@ 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);
@@ -151,6 +154,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 						UpdateInfo info=new UpdateInfo();
 						info.size=size;
 						info.version=version;
+						info.changelog=changelog;
 						this.info=info;
 
 						getPrefs().edit()
@@ -158,6 +162,7 @@ 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/fragments/SettingsFragment.java

@@ -839,7 +839,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 
 	private class UpdateViewHolder extends BindableViewHolder<UpdateItem>{
 
-		private final TextView text;
+		private final TextView text, changelog;
 		private final Button button;
 		private final ImageButton cancelBtn;
 		private final ProgressBar progress;
@@ -850,6 +850,7 @@ 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);
@@ -893,6 +894,8 @@ 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/updater/GithubSelfUpdater.java

@@ -50,6 +50,7 @@ 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="@color/bookmark_selected" android:state_selected="true"/>
+	<item android: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="@color/favorite_selected" android:state_selected="true"/>
+	<item android:color="?favorite_selected" android:state_selected="true"/>
 	<item android:color="?android:textColorSecondary"/>
 </selector>

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

@@ -7,69 +7,95 @@
 
 	<LinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:minHeight="64dp"
-		android:gravity="center_vertical"
-		android:paddingStart="16dp"
+		android:layout_height="match_parent"
 		android:background="@drawable/bg_settings_update"
-		android:orientation="horizontal">
+		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>
 
 		<TextView
-			android:id="@+id/text"
-			android:layout_width="0dp"
+			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: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"
-			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>
-
+			android:padding="16dp"
+			android:text="Changelog" />
 	</LinearLayout>
 
+
 </FrameLayout>

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

@@ -16,6 +16,8 @@
 	<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

@@ -312,6 +312,9 @@
 	<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_300">#c5c6d0</color>
 	<color name="nord_gray_200">#D5DCE6</color>

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

@@ -12,6 +12,8 @@
 		<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>
@@ -246,6 +248,9 @@
 		<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>

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

@@ -27,6 +27,7 @@
     <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>