Fixing some padding issues with the changelog

This reverts commit e8a31cf867.

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 76
+		versionCode 75
-		versionName "1.1.4+fork.76.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/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/layout/item_settings_update.xml

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