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 @@
+
+
+
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 @@
-
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/about_margin">
+
+
+
-
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/about_margin">
+
+
+
+
+
+
+
-
-
-
-
-
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/about_margin">
-
+
-
+
-
+
+
+
+
+
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/about_margin">
+
+
+
+
+
+
+
+
+
+
+
+
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" />
+ android:icon="@drawable/ic_info_black"
+ android:title="@string/about_title" />
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
-->
+ 4dp
8dp
16dp
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 @@
A free and cloudless replacement for your gadget vendors\' closed source Android applications.
Core Team (in order of first code contribution)
Contributors
- Andreas Shimokawa\n Carsten Pfeiffer\n Daniele Gobbetti
+ Andreas Shimokawa\nCarsten Pfeiffer\nDaniele Gobbetti
Additional device support
- 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)
+ 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)
+ Many thanks to all unlisted contributors for contributing code, support, ideas, motivation, bug reports, money... ✊
- %d hour