From 65ecbc4521a1bc7f589ac08f8bc2cf293ddde72b Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Wed, 31 Mar 2021 20:43:49 +0200
Subject: [PATCH] EGM2008: add reference to about activity.

---
 src/main/res/layout/about.xml            | 57 +++++++++++++++---------
 src/main/res/values/do_not_translate.xml |  5 +++
 src/main/res/values/strings.xml          |  1 +
 3 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/main/res/layout/about.xml b/src/main/res/layout/about.xml
index 1d0ceb53f..5e2d538d9 100644
--- a/src/main/res/layout/about.xml
+++ b/src/main/res/layout/about.xml
@@ -16,31 +16,28 @@
             android:orientation="vertical"
             android:padding="20dp">
 
-            <ImageView
-                android:id="@+id/imageView"
-                android:layout_width="match_parent"
-                android:layout_height="239dp"
-                android:contentDescription="@string/app_name"
-                android:scaleType="fitCenter"
-                android:src="@drawable/ic_logo_color_24dp" />
-
-            <TextView
-                style="@style/TextLarge"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="@string/app_name"
-                android:textSize="24sp" />
+                android:orientation="horizontal"
+                android:layout_margin="8dp">
 
-            <View style="@style/StatsHorizontalLine" />
+                <ImageView
+                    android:id="@+id/imageView"
+                    android:layout_width="30dp"
+                    android:layout_height="match_parent"
+                    android:contentDescription="@string/app_name"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_logo_color_24dp" />
 
-            <TextView
-                android:id="@+id/about_text_description"
-                style="@style/TextMedium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:padding="12dp" />
+                <TextView
+                    android:id="@+id/about_text_description"
+                    style="@style/TextMedium"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:padding="12dp" />
+            </LinearLayout>
 
             <View style="@style/StatsHorizontalLine" />
 
@@ -74,12 +71,28 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:padding="6dp"
                 android:linksClickable="true"
+                android:padding="6dp"
                 android:text="@string/about_history" />
 
             <View style="@style/StatsHorizontalLine" />
 
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:padding="12dp"
+                android:text="@string/about_third_party_data" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:padding="12dp"
+                android:text="@string/third_party_data" />
+
+            <View style="@style/StatsHorizontalLine" />
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/src/main/res/values/do_not_translate.xml b/src/main/res/values/do_not_translate.xml
index 5e8aa2bdb..3d3ca342f 100644
--- a/src/main/res/values/do_not_translate.xml
+++ b/src/main/res/values/do_not_translate.xml
@@ -17,6 +17,11 @@ limitations under the License.
     <string name="app_web_url" translatable="false">https://github.com/OpenTracksApp/OpenTracks</string>
     <string name="app_name" translatable="false">OpenTracks</string>
 
+    <string name="third_party_data" translatable="false">
+        <a href="https://earth-info.nga.mil/">National Geospatial-Intelligence Agency (NGA)\'s EGM2008 model</a> 5\' minute resolution.
+        Data provided by <a href="https://geographiclib.sourceforge.io/html/geoid.html">GeographicLib</a>.
+    </string>
+
     <!-- List here all used libraries (will be shown in the about activity -->
     <string name="third_party_libraries" translatable="false">
         <a href="https://developer.android.com/topic/libraries/support-library/">Google\'s androidX support</a> (Apache License, Version 2.0) \n
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f2440509a..faf1fb114 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -20,6 +20,7 @@ limitations under the License.
     <string name="about_version_name">Version name: %1$s</string>
     <string name="about_version_code">Version code: %1$d</string>
     <string name="about_history">OpenTracks is a fork of <a href="https://code.google.com/archive/p/mytracks/"><i>Google\'s MyTracks</i></a> (discontinued in 2016).</string>
+    <string name="about_third_party_data">Third-party data</string>
     <string name="about_libraries">Libraries</string>
     <!-- Help -->
     <string name="help_feature_title">OpenTracks has the following features:</string>