No issue: Remove duplicate wordmark and update about page (#3590)

app/src/main/java/org/mozilla/fenix/settings/AboutFragment.kt

@@ -11,7 +11,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
+import androidx.annotation.RequiresApi
 import androidx.core.content.pm.PackageInfoCompat
 import androidx.fragment.app.Fragment
 import kotlinx.android.synthetic.main.fragment_about.*
@@ -20,6 +20,7 @@ import org.mozilla.fenix.R
 import org.mozilla.geckoview.BuildConfig as GeckoViewBuildConfig
 
 class AboutFragment : Fragment() {
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_about, container, false)
     }
@@ -27,35 +28,40 @@ class AboutFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val appName = requireContext().resources.getString(R.string.app_name)
-        (activity as AppCompatActivity).title = getString(R.string.preferences_about, appName)
-        val maybeGecko = if (SDK_INT < Build.VERSION_CODES.N) {
-            "GV: "
-        } else {
-            " \uD83E\uDD8E "
-        }
+        val appName = getString(R.string.app_name)
+        activity?.title = getString(R.string.preferences_about, appName)
 
         val aboutText = try {
             val packageInfo = requireContext().packageManager.getPackageInfo(requireContext().packageName, 0)
-            val geckoVersion = PackageInfoCompat.getLongVersionCode(packageInfo).toString() + maybeGecko +
-                    GeckoViewBuildConfig.MOZ_APP_VERSION + "-" + GeckoViewBuildConfig.MOZ_APP_BUILDID
+            val versionCode = PackageInfoCompat.getLongVersionCode(packageInfo).toString()
             val componentsVersion = mozilla.components.Build.version
+            val maybeGecko = if (SDK_INT >= Build.VERSION_CODES.N) GECKO_EMOJI else "GV"
+            val geckoVersion = GeckoViewBuildConfig.MOZ_APP_VERSION + "-" + GeckoViewBuildConfig.MOZ_APP_BUILDID
 
             String.format(
-                "%s (Build #%s)\nAC: %s",
+                "%s (Build #%s)\n%s: %s\n%s: %s",
                 packageInfo.versionName,
-                geckoVersion,
-                componentsVersion
+                versionCode,
+                COMPONENTS_EMOJI,
+                componentsVersion,
+                maybeGecko,
+                geckoVersion
             )
         } catch (e: PackageManager.NameNotFoundException) {
             ""
         }
 
         val buildDate = BuildConfig.BUILD_DATE
-        val content = resources.getString(R.string.about_content, appName)
+        val content = getString(R.string.about_content, appName)
 
         about_text.text = aboutText
         about_content.text = content
         build_date.text = buildDate
     }
+
+    companion object {
+        private const val COMPONENTS_EMOJI = "\uD83D\uDCE6"
+        @RequiresApi(Build.VERSION_CODES.N)
+        private const val GECKO_EMOJI = "\uD83E\uDD8E"
+    }
 }

app/src/main/res/drawable-night/ic_logo_wordmark_normal.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<inset xmlns:android="http://schemas.android.com/apk/res/android" android:drawable="@drawable/ic_logo_wordmark_private"/>

app/src/main/res/layout/fragment_about.xml

@@ -2,67 +2,71 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+<ScrollView
         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"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         tools:context="org.mozilla.fenix.settings.AboutFragment">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
         <ImageView
-            android:id="@+id/wordmark"
-            android:importantForAccessibility="no"
-            android:src="?fenixLogo"
-            android:layout_marginTop="24dp"
-            android:layout_height="80dp"
-            android:layout_width="0dp"
-            app:layout_constraintWidth_percent="0.75"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/wordmark"
+                android:layout_marginTop="24dp"
+                android:layout_width="0dp"
+                android:layout_height="80dp"
+                android:contentDescription="@string/app_name"
+                android:src="?fenixLogo"
+                app:layout_constraintWidth_percent="0.75"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"/>
 
         <TextView
-            android:id="@+id/about_text"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textSize="16sp"
-            android:textIsSelectable="true"
-            android:layout_marginTop="24dp"
-            app:layout_constraintWidth_percent="0.8"
-            app:layout_constraintTop_toBottomOf="@id/wordmark"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:textAlignment="center" />
+                android:id="@+id/about_text"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:textSize="16sp"
+                android:textIsSelectable="true"
+                android:layout_marginTop="24dp"
+                app:layout_constraintWidth_percent="0.8"
+                app:layout_constraintTop_toBottomOf="@id/wordmark"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                tools:text="1.0.x (Build #x 🦎 69.x-x)\nAC: 1.0.0"
+                android:textAlignment="center" />
 
         <TextView
-            android:id="@+id/about_content"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textSize="18sp"
-            android:layout_marginTop="16dp"
-            app:layout_constraintWidth_percent="0.8"
-            app:layout_constraintTop_toBottomOf="@id/about_text"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:textAlignment="center" />
+                android:id="@+id/about_content"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:layout_marginTop="16dp"
+                app:layout_constraintWidth_percent="0.8"
+                app:layout_constraintTop_toBottomOf="@id/about_text"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                tools:text="@string/about_content"
+                android:textAlignment="center" />
 
         <TextView
-            android:id="@+id/build_date"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:textSize="16sp"
-            android:textIsSelectable="true"
-            app:layout_constraintWidth_percent="0.8"
-            app:layout_constraintTop_toBottomOf="@id/about_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:textAlignment="center" />
+                android:id="@+id/build_date"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:textSize="16sp"
+                android:textIsSelectable="true"
+                app:layout_constraintWidth_percent="0.8"
+                app:layout_constraintTop_toBottomOf="@id/about_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                tools:text="Monday 1/2 @ 5:00 PM"
+                android:textAlignment="center" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</ScrollView>
+</ScrollView>