Implement proper about screen

babybuddy · Feb 1, 2022 · fe350cc · fe350cc
1 parent 3077394
commit fe350cc
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 25 deletions.
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/AboutFragment.java b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/AboutFragment.java
@@ -80,7 +80,7 @@ public Range(int start, int end) {
         }
     }
 
-    private static Pattern HREF_DETECTOR_PATTERN = Pattern.compile("<a .*href=[\"']([^\"]+)[\"'][^>]*>([^<]*)</a>");
+    private static Pattern HREF_DETECTOR_PATTERN = Pattern.compile("<a .*href=[\"']([^\"']+)[\"'][^>]*>([^<]*)</a>");
 
     private void filterLinksFromTextFields(ViewGroup root) {
         for (int i = 0; i < root.getChildCount(); i++) {
@@ -207,7 +207,7 @@ public void updateDrawState(@NonNull TextPaint ds) {
 
         filterLinksFromTextFields(binding.root);
 
-        return binding.root;
+        return binding.getRoot();
     }
 
     @Override

diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml
@@ -1,35 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="8dp"
     tools:context=".AboutFragment">
 
-    <TextView
+    <LinearLayout
+        android:id="@+id/root"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/about_text" />
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/aboutLicenseTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/autostring_about_license_title"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/about_text" />
 
-    <TextView
-        android:id="@+id/aboutLicenseText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/autostring_about_license_text" />
+        <TextView
+            android:id="@+id/aboutLicenseTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/autostring_about_license_title"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="External Resources"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+        <TextView
+            android:id="@+id/aboutLicenseText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/autostring_about_license_text" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/about_external_media_resources_title"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+
+    </LinearLayout>
 
-</LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -21,7 +21,8 @@
 
     <string name="app_name">Baby Buddy</string>
 
-    <string name="about_text">This Android application is Open Source software licensed under the MIT License (see below).\n\nThe source code of the application is available at &lt;a href=\'https://github.com/MrApplejuice/BabyBuddyAndroid/\'&gt;https://github.com/MrApplejuice/BabyBuddyAndroid/&lt;/a&gt;.\n\nThe application uses third-party media under attribution licenes listed below.</string>
+    <string name="about_text">This Android application is Open Source software created by &lt;a href=\'http://www.craftware.info\'&gt;Paul Konstantin Gerke&lt;/a&gt; and licensed under the MIT License (see below).\n\nThe source code of the application is available at &lt;a href=\'https://github.com/MrApplejuice/BabyBuddyAndroid/\'&gt;https://github.com/MrApplejuice/BabyBuddyAndroid/&lt;/a&gt;.\n\nThe application uses third-party media under attribution licenes listed below.</string>
+    <string name="about_external_media_resources_title">Third party media</string>
 
     <!-- Strings used for fragments for navigation -->
     <string name="action_settings">Settings</string>