From db479921997a320410abb1231d7509a361901167 Mon Sep 17 00:00:00 2001
From: vanous <petr@linuks.cz>
Date: Thu, 10 Sep 2020 10:46:09 +0200
Subject: [PATCH] Re-do logo logic for AboutScreen to keep aspect ratio

---
 .../activities/AboutActivity.java             | 19 -----------
 app/src/main/res/layout/activity_about.xml    | 34 +++++++++++++------
 2 files changed, 24 insertions(+), 29 deletions(-)

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 a537af7ee..590fb23d9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
@@ -17,42 +17,23 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
-import android.graphics.LightingColorFilter;
-import android.graphics.drawable.InsetDrawable;
 import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
-import android.widget.RelativeLayout;
-import android.widget.ScrollView;
 import android.widget.TextView;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 
-
 public class AboutActivity extends AbstractGBActivity {
-    private static final Logger LOG = LoggerFactory.getLogger(AboutActivity.class);
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
-        ScrollView aboutBackground = findViewById(R.id.about_background);
-
-        if (!GBApplication.isDarkThemeEnabled()) {
-            aboutBackground.getBackground().setColorFilter(new LightingColorFilter(0x0, 0x00EEEEEE));
-        } else {
-            aboutBackground.getBackground().setColorFilter(new LightingColorFilter(0x0, 0x00404040));
-        }
-
         TextView link1 = findViewById(R.id.links1);
         link1.setMovementMethod(LinkMovementMethod.getInstance());
         TextView link2 = findViewById(R.id.links2);
         link2.setMovementMethod(LinkMovementMethod.getInstance());
         TextView link3 = findViewById(R.id.links3);
         link3.setMovementMethod(LinkMovementMethod.getInstance());
-
     }
 }
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index f234c0796..c735b7202 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,12 +1,27 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<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:id="@+id/about_background"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/gadgetbridge_img"
-    android:paddingLeft="@dimen/about_margin"
-    android:paddingRight="@dimen/about_margin"
-    tools:context="nodomain.freeyourgadget.gadgetbridge.activities.AboutActivity">
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/no_items_bg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:alpha="0.1"
+        android:contentDescription="@string/icon_placeholder"
+        android:tint="?attr/textColorPrimary"
+        app:srcCompat="@drawable/gadgetbridge_img" />
+
+    <ScrollView
+        android:id="@+id/about_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="@dimen/about_margin"
+        android:paddingRight="@dimen/about_margin"
+        tools:context="nodomain.freeyourgadget.gadgetbridge.activities.AboutActivity">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -144,7 +159,6 @@
                     android:textColor="@color/accent" />
 
             </LinearLayout>
-
         </LinearLayout>
-
-</ScrollView>
+    </ScrollView>
+</RelativeLayout>