[tbb-commits] [Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Add Tor integration and UI

[Dan Ballard (@dan)]

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android


Commits:
cd1efeff by Dan Ballard at 2023-08-29T11:46:45-07:00
fixup! Add Tor integration and UI

Bug 42038: Remove firefox branding overlap on homescreen

- - - - -


2 changed files:

- fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
- fenix/app/src/main/res/layout/fragment_home.xml


Changes:

=====================================
fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
=====================================
@@ -1100,7 +1100,7 @@ class HomeFragment : Fragment() {
             else -> ColorStateList.valueOf(color)
         }
 
-        binding.wordmarkText.imageTintList = tintColor
+        //binding.wordmarkText.imageTintList = tintColor
         binding.privateBrowsingButton.imageTintList = tintColor
     }
 


=====================================
fenix/app/src/main/res/layout/fragment_home.xml
=====================================
@@ -70,9 +70,10 @@
                     android:layout_marginEnd="10.dp"
                     android:adjustViewBounds="true"
                     android:contentDescription="@null"
-                    app:srcCompat="?fenixWordmarkLogo"
+                    app:srcCompat="@mipmap/ic_launcher"
                     tools:ignore="ImageContrastCheck" />
 
+                <!--
                 <ImageView
                     android:id="@+id/wordmarkText"
                     android:layout_width="wrap_content"
@@ -81,26 +82,28 @@
                     android:contentDescription="@null"
                     android:layout_marginTop="@dimen/wordmark_text_margin_top"
                     app:srcCompat="?fenixWordmarkText" />
+                -->
+
+                <TextView
+                    android:id="@+id/app_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="9dp"
+                    android:width="130dp"
+                    android:height="60dp"
+                    android:clickable="false"
+                    android:focusable="false"
+                    android:importantForAccessibility="no"
+                    android:lines="2"
+                    android:text="@string/app_name"
+                    android:fontFamily="Roboto-Medium"
+                    android:textColor="#DEFFFFFF"
+                    android:textSize="20sp"
+                    android:lineSpacingMultiplier="1.2" />
+
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/app_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="80dp"
-                android:layout_marginTop="9dp"
-                android:gravity="center_vertical"
-                android:width="130dp"
-                android:height="60dp"
-                android:clickable="false"
-                android:focusable="false"
-                android:importantForAccessibility="no"
-                android:lines="2"
-                android:text="@string/app_name"
-                android:fontFamily="Roboto-Medium"
-                android:textColor="#DEFFFFFF"
-                android:textSize="20sp"
-                android:lineSpacingMultiplier="1.2" />
+
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 



View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/cd1efeff50ebbc709ab62d06884701464421d60b

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/cd1efeff50ebbc709ab62d06884701464421d60b
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20230906/03c9f698/attachment-0001.htm>