From 8ea7204cf652f99f6a967c4b585cfc89b63970ce Mon Sep 17 00:00:00 2001
From: FlyingP1g FlyingP1g <rukasmail@protonmail.com>
Date: Tue, 12 Jul 2022 21:10:29 +0300
Subject: [PATCH] About menu: Added changelog and fixed wording

---
 .../briar/android/settings/AboutFragment.java     | 15 +++++++++++++++
 .../src/main/res/layout/fragment_about.xml        | 11 ++++++++++-
 briar-android/src/main/res/values/strings.xml     |  5 +++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java
index bd3d8acb9..9f87ef2c5 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java
@@ -36,6 +36,7 @@ public class AboutFragment extends Fragment {
 	private TextView briarVersion;
 	private TextView briarWebsite;
 	private TextView briarSourceCode;
+	private TextView briarChangelog;
 
 	@Nullable
 	@Override
@@ -55,6 +56,7 @@ public class AboutFragment extends Fragment {
 				getString(R.string.briar_version, BuildConfig.VERSION_NAME));
 		briarWebsite = requireActivity().findViewById(R.id.BriarWebsite);
 		briarSourceCode = requireActivity().findViewById(R.id.BriarSourceCode);
+		briarChangelog = requireActivity().findViewById(R.id.BriarChangelog);
 		briarWebsite.setOnClickListener(View -> {
 			String url = "https://briarproject.org/";
 			Intent i = new Intent(Intent.ACTION_VIEW);
@@ -79,6 +81,19 @@ public class AboutFragment extends Fragment {
 						R.string.error_start_activity, LENGTH_LONG).show();
 			}
 		});
+		briarChangelog.setOnClickListener(View -> {
+			String url =
+					"https://code.briarproject.org/briar/briar/-/wikis/changelog";
+			Intent i = new Intent(Intent.ACTION_VIEW);
+			i.setData(Uri.parse(url));
+			try {
+				startActivity(i);
+			} catch (ActivityNotFoundException e) {
+				logException(LOG, WARNING, e);
+				Toast.makeText(requireContext(),
+						R.string.error_start_activity, LENGTH_LONG).show();
+			}
+		});
 	}
 
 }
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/fragment_about.xml b/briar-android/src/main/res/layout/fragment_about.xml
index c37d695eb..48f3355df 100644
--- a/briar-android/src/main/res/layout/fragment_about.xml
+++ b/briar-android/src/main/res/layout/fragment_about.xml
@@ -42,6 +42,15 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/BriarWebsite" />
 
+	<TextView
+		android:id="@+id/BriarChangelog"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/briar_changelog"
+		android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/BriarSourceCode" />
+
 	<TextView
 		android:id="@+id/TranslatorThanks"
 		android:layout_width="match_parent"
@@ -50,6 +59,6 @@
 		android:text="@string/translator_thanks"
 		android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/BriarSourceCode" />
+		app:layout_constraintTop_toBottomOf="@+id/BriarChangelog" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 8acd87bb9..e2f028edc 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -695,8 +695,9 @@
 	<string name="about_title">About</string>
 	<string name="briar_version">Briar Version: %s</string>
 	<string name="links">Links</string>
-	<string name="briar_website">\u2022 <a href="">Briar website</a></string>
-	<string name="briar_source_code">\u2022 <a href="">Briar source code</a></string>
+	<string name="briar_website">\u2022 <a href="">Website</a></string>
+	<string name="briar_source_code">\u2022 <a href="">Source code</a></string>
+	<string name="briar_changelog">\u2022 <a href="">Changelog</a></string>
 	<string name="translator_thanks">Thanks to all the contributors at the Localization Lab</string><!-- Here translators can add their names or Transifex usernames(eg "Thanks to all the contributors at the Localization Lab, especially Tom, Matthew and Jerry") -->
 
 	<!-- Conversation Settings -->