From 69b71706c578a758298b3ecee74b83983c83ab04 Mon Sep 17 00:00:00 2001
From: Norbel Ambanumben <aanorbel@gmail.com>
Date: Fri, 8 Sep 2023 13:59:44 +0100
Subject: [PATCH] Updated about activity

---
 app/src/dw/res/layout/activity_info.xml       | 82 ++++++++++---------
 app/src/dw/res/values/strings.xml             | 10 +--
 .../ooniprobe/activity/InfoActivity.java      |  3 +
 app/src/main/res/layout/activity_info.xml     |  1 +
 4 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/app/src/dw/res/layout/activity_info.xml b/app/src/dw/res/layout/activity_info.xml
index 573928883..46dcde9b4 100644
--- a/app/src/dw/res/layout/activity_info.xml
+++ b/app/src/dw/res/layout/activity_info.xml
@@ -45,53 +45,59 @@
 				app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
 		</com.google.android.material.appbar.CollapsingToolbarLayout>
 	</com.google.android.material.appbar.AppBarLayout>
-
-	<LinearLayout
+	<ScrollView
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			app:layout_behavior="@string/appbar_scrolling_view_behavior">
+		<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_margin="16dp"
+		android:paddingBottom="32dp"
 		android:gravity="center_horizontal"
 		android:orientation="vertical"
 		app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-		<TextView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/Settings_About_Content_Paragraph" />
+			<TextView
+				android:id="@+id/desc"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/Settings_About_Content_Paragraph" />
 
-		<Button
-			android:id="@+id/learnMore"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="16dp"
-			android:text="@string/Settings_About_Content_LearnMore"
-			android:textAllCaps="false"
-			app:cornerRadius="24dp" />
+			<Button
+				android:id="@+id/learnMore"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="16dp"
+				android:text="@string/Settings_About_Content_LearnMore"
+				android:textAllCaps="false"
+				app:cornerRadius="24dp" />
 
-		<Button
-			android:id="@+id/blog"
-			style="@style/Widget.MaterialComponents.Button.TextButton"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/Settings_About_Content_Blog"
-			android:textAllCaps="false"
-			app:cornerRadius="24dp" />
+			<Button
+				android:id="@+id/blog"
+				style="@style/Widget.MaterialComponents.Button.TextButton"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/Settings_About_Content_Blog"
+				android:textAllCaps="false"
+				app:cornerRadius="24dp" />
 
-		<Button
-			android:id="@+id/reports"
-			style="@style/Widget.MaterialComponents.Button.TextButton"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/Settings_About_Content_Reports"
-			android:textAllCaps="false"
-			app:cornerRadius="24dp" />
+			<Button
+				android:id="@+id/reports"
+				style="@style/Widget.MaterialComponents.Button.TextButton"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/Settings_About_Content_Reports"
+				android:textAllCaps="false"
+				app:cornerRadius="24dp" />
 
-		<Button
-			android:id="@+id/dataPolicy"
-			style="@style/Widget.MaterialComponents.Button.TextButton"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/Settings_About_Content_DataPolicy"
-			android:textAllCaps="false" />
-	</LinearLayout>
+			<Button
+				android:id="@+id/dataPolicy"
+				style="@style/Widget.MaterialComponents.Button.TextButton"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/Settings_About_Content_DataPolicy"
+				android:textAllCaps="false" />
+		</LinearLayout>
+	</ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/dw/res/values/strings.xml b/app/src/dw/res/values/strings.xml
index 54e528a6a..ed98b16d1 100644
--- a/app/src/dw/res/values/strings.xml
+++ b/app/src/dw/res/values/strings.xml
@@ -2,10 +2,10 @@
 <resources>
     <string name="General_AppName">DW Media Probe</string>
     <string name="Onboarding_WhatIsOONIProbe_Title">What is News Media Scan?</string>
-    <string name="Onboarding_WhatIsOONIProbe_Paragraph">Your app for measuring internet censorship. \n\nAre websites and social media apps blocked? Is your internet connection unusually slow?\n\nRun News Media Scan to find out!</string>
-    <string name="Onboarding_ThingsToKnow_Bullet_1">Measurement data is openly published by OONI and will include your network information.</string>
-    <string name="Onboarding_ThingsToKnow_Bullet_2">Anyone monitoring your internet connection will be able to see you are running News Media Scan</string>
-    <string name="Onboarding_ThingsToKnow_Bullet_3">You will be testing news websites which might be banned in your country</string>
+    <string name="Onboarding_WhatIsOONIProbe_Paragraph">Are news sites and social media apps blocked?\nIs your Internet connection unusually slow? \n\nRun News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public list by Github and not curated by DW. It represents an objective range of international and national news media providers.</string>
+    <string name="Onboarding_ThingsToKnow_Bullet_1">OONI will openly publish the measurement data you send, along with your network information.</string>
+    <string name="Onboarding_ThingsToKnow_Bullet_2">Anyone monitoring your Internet connection will be able to see you are running News Media Scan.</string>
+    <string name="Onboarding_ThingsToKnow_Bullet_3">You will be testing news websites that might be banned in the country where you currently find yourself.</string>
     <string name="Onboarding_AutomatedTesting_Paragraph">To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically. \n\nDon\’t worry, we\’ll be mindful of battery usage. \n\nYou can disable automated testing from the settings at any time.\n\n</string>
     <string name="Onboarding_Crash_Paragraph">To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team?</string>
     <string name="Onboarding_PopQuiz_1_Question">If someone is monitoring my internet activity, they will see that I am running News Media Scan.</string>
@@ -14,7 +14,7 @@
     <string name="Onboarding_PopQuiz_2_Wrong_Paragraph">To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings).</string>
     <string name="Settings_About_Label">About News Media Scan</string>
     <string name="Settings_Proxy_Label">Backend proxy</string>
-    <string name="Settings_About_Content_Paragraph">What is News Media Scan? Your app for measuring internet censorship. \n\nAre websites and social media apps blocked? Is your internet connection unusually slow? \n\nRun News Media Scan to find out!</string>
+    <string name="Settings_About_Content_Paragraph">This app is the product of close cooperation between Deutsche Welle (DW) and OONI.\n\n _About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media.\n\n Further information: [About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n _About OONI:_ is a non-profit free software project related to the Tor project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to our global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using.</string>
 
 
     <string name="Test_Websites_Fullname">News Media Websites</string>
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/InfoActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/InfoActivity.java
index 3a75eace3..2e0d9ea44 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/activity/InfoActivity.java
+++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/InfoActivity.java
@@ -14,10 +14,12 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import ru.noties.markwon.Markwon;
 
 public class InfoActivity extends AbstractActivity {
 	@BindView(R.id.toolbar) Toolbar toolbar;
 	@BindView(R.id.version) TextView version;
+	@BindView(R.id.desc) TextView description;
 
 	@Override protected void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -26,6 +28,7 @@ public class InfoActivity extends AbstractActivity {
 		setSupportActionBar(toolbar);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 		version.setText(getString(R.string.version, BuildConfig.SOFTWARE_NAME, BuildConfig.VERSION_NAME));
+		Markwon.setMarkdown(description, getString(R.string.Settings_About_Content_Paragraph));
 	}
 
 	@OnClick(R.id.blog) void onBlogClick() {
diff --git a/app/src/main/res/layout/activity_info.xml b/app/src/main/res/layout/activity_info.xml
index cd55d2700..0a69f8b0d 100644
--- a/app/src/main/res/layout/activity_info.xml
+++ b/app/src/main/res/layout/activity_info.xml
@@ -46,6 +46,7 @@
 		app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
 		<TextView
+			android:id="@+id/desc"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:text="@string/Settings_About_Content_Paragraph" />