From 2496b40a88531881b1beb377e4b176aea43c9b03 Mon Sep 17 00:00:00 2001
From: vanous <petr@linuks.cz>
Date: Sun, 12 Jul 2020 10:38:56 +0200
Subject: [PATCH] Improve padding. Use better (i) icon. Add 'unlisted
 contributors'.

---
 .../activities/AboutActivity.java             |  14 +-
 app/src/main/res/drawable/ic_info_black.xml   |   9 ++
 app/src/main/res/layout/activity_about.xml    | 142 ++++++++++++------
 .../activity_controlcenterv2_main_drawer.xml  |   4 +-
 app/src/main/res/values/dimens.xml            |   1 +
 app/src/main/res/values/strings.xml           |   5 +-
 6 files changed, 116 insertions(+), 59 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_info_black.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
index 3933a46b6..d83f84a1e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
@@ -19,16 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.widget.TextView;
 
-import androidx.appcompat.widget.SearchView;
-import androidx.core.app.NavUtils;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,11 +37,11 @@ public class AboutActivity extends AbstractGBActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
-        TextView link1 = (TextView) findViewById(R.id.about4);
+        TextView link1 = (TextView) findViewById(R.id.links1);
         link1.setMovementMethod(LinkMovementMethod.getInstance());
-        TextView link2 = (TextView) findViewById(R.id.about5);
+        TextView link2 = (TextView) findViewById(R.id.links2);
         link2.setMovementMethod(LinkMovementMethod.getInstance());
-        TextView link3 = (TextView) findViewById(R.id.about6);
+        TextView link3 = (TextView) findViewById(R.id.links3);
         link3.setMovementMethod(LinkMovementMethod.getInstance());
 
     }
diff --git a/app/src/main/res/drawable/ic_info_black.xml b/app/src/main/res/drawable/ic_info_black.xml
new file mode 100644
index 000000000..b1a42e2f5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 9437fb1a5..6b425571b 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,8 +1,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:background="@drawable/gadgetbridge_img"
+    android:paddingLeft="@dimen/about_margin"
     tools:context="nodomain.freeyourgadget.gadgetbridge.activities.AboutActivity">
 
     <ScrollView
@@ -15,78 +17,130 @@
             android:orientation="vertical">
 
             <TextView
-                android:id="@+id/about1"
+                android:id="@+id/about_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="Gadgetbridge"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large"
                 android:textColor="@color/accent" />
 
-            <TextView
-                android:id="@+id/about2"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/about_description" />
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:paddingLeft="@dimen/about_margin">
+
+                <TextView
+                    android:id="@+id/about_desc"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/about_description" />
+            </LinearLayout>
 
             <TextView
-                android:id="@+id/about3"
+                android:id="@+id/links_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="Links"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large"
                 android:textColor="@color/accent" />
 
-            <TextView
-                android:id="@+id/about4"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/homepage_url" />
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:paddingLeft="@dimen/about_margin">
+
+                <TextView
+                    android:id="@+id/links1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/homepage_url" />
+
+                <TextView
+                    android:id="@+id/links2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/codeberg_url" />
+
+                <TextView
+                    android:id="@+id/links3"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fdroid_url" />
+            </LinearLayout>
 
             <TextView
-                android:id="@+id/about5"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/codeberg_url" />
-
-            <TextView
-                android:id="@+id/about6"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/fdroid_url" />
-
-            <TextView
-                android:id="@+id/about7"
+                android:id="@+id/contrib_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/about_contributors"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large"
                 android:textColor="@color/accent" />
 
-            <TextView
-                android:id="@+id/about8"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/about_core_team_title"
-                android:textColor="@color/accent" />
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:paddingLeft="@dimen/about_margin">
 
-            <TextView
-                android:id="@+id/about9"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/about_core_team_members" />
+                <TextView
+                    android:id="@+id/contrib_core_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/about_core_team_title"
+                    android:textColor="@color/accent" />
 
-            <TextView
-                android:id="@+id/about10"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/about_additional_device_support"
-                android:textColor="@color/accent" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:paddingLeft="@dimen/about_margin">
 
-            <TextView
-                android:id="@+id/about11"
+                    <TextView
+                        android:id="@+id/contrib_core_members"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/about_core_team_members" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/about_additional_contributors" />
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:paddingLeft="@dimen/about_margin">
+
+                <TextView
+                    android:id="@+id/contrib_add_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/about_additional_device_support"
+                    android:textColor="@color/accent" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:paddingLeft="@dimen/about_margin">
+
+                    <TextView
+                        android:id="@+id/contrib_add_members"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/about_additional_contributors" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/contrib_add_title2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/about_additional_contributions"
+                    android:textColor="@color/accent" />
+
+            </LinearLayout>
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml b/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml
index bd552fac4..897c277da 100644
--- a/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml
+++ b/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml
@@ -38,8 +38,8 @@
             android:icon="@drawable/ic_history_black" />
         <item
             android:id="@+id/about"
-            android:title="@string/about_title"
-            android:icon="@drawable/gadgetbridge_img" />
+            android:icon="@drawable/ic_info_black"
+            android:title="@string/about_title" />
 
     </group>
 </menu>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 8cc2ce917..319cf94e4 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,6 +7,7 @@
 Refer to App Widget Documentation for margin information
 http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
     -->
+    <dimen name="about_margin">4dp</dimen>
     <dimen name="widget_margin">8dp</dimen>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="nav_header_vertical_spacing">16dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 78ffe1e9b..4d8e626f8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -874,9 +874,10 @@
     <string name="about_description">A free and cloudless replacement for your gadget vendors\' closed source Android applications.</string>
     <string name="about_core_team_title">Core Team (in order of first code contribution)</string>
     <string name="about_contributors">Contributors</string>
-    <string name="about_core_team_members" translatable="false"> Andreas Shimokawa\n Carsten Pfeiffer\n Daniele Gobbetti</string>
+    <string name="about_core_team_members" translatable="false">Andreas Shimokawa\nCarsten Pfeiffer\nDaniele Gobbetti</string>
     <string name="about_additional_device_support">Additional device support</string>
-    <string name="about_additional_contributors" translatable="false"> João Paulo Barraca (HPlus)\n Vitaly Svyastyn (NO.1 F1)\n Sami Alaoui (Teclast H30)\n “ladbsoft” (XWatch)\n Sebastian Kranz (ZeTime)\n Vadim Kaushan (ID115)\n “maxirnilian” (Lenovo Watch 9)\n “ksiwczynski”, “mkusnierz”, “mamutcho” (Lenovo Watch X Plus)\n Andreas Böhler (Casio GB-6900B)\n Jean-François Greffier (Mi Scale 2)\n Johannes Schmitt (BFH-16)\n Lukas Schwichtenberg (Makibes HR3)\n Daniel Dakhno (Fossil Q Hybrid, Fossil Hybrid HR)\n Gordon Williams (Bangle.js)\n Pavel Elagin (JYou Y5)\n Taavi Eomäe (iTag)</string>
+    <string name="about_additional_contributors" translatable="false">João Paulo Barraca (HPlus)\nVitaly Svyastyn (NO.1 F1)\nSami Alaoui (Teclast H30)\n“ladbsoft” (XWatch)\nSebastian Kranz (ZeTime)\nVadim Kaushan (ID115)\n“maxirnilian” (Lenovo Watch 9)\n“ksiwczynski”, “mkusnierz”, “mamutcho” (Lenovo Watch X Plus)\nAndreas Böhler (Casio GB-6900B)\nJean-François Greffier (Mi Scale 2)\nJohannes Schmitt (BFH-16)\nLukas Schwichtenberg (Makibes HR3)\nDaniel Dakhno (Fossil Q Hybrid, Fossil Hybrid HR)\nGordon Williams (Bangle.js)\nPavel Elagin (JYou Y5)\nTaavi Eomäe (iTag)</string>
+    <string name="about_additional_contributions">Many thanks to all unlisted contributors for contributing code, support, ideas, motivation, bug reports, money... ✊</string>
 
     <plurals name="widget_alarm_target_hours">
         <item quantity="one">%d hour</item>