[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

Title: GitLab

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:

Changes:

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

  • fenix/app/src/main/res/layout/fragment_home.xml
    ... ... @@ -70,9 +70,10 @@
    70 70 
                         android:layout_marginEnd="10.dp"
    71 71 
                         android:adjustViewBounds="true"
    72 72 
                         android:contentDescription="@null"
    73 
    -                    app:srcCompat="?fenixWordmarkLogo"
    73 
    +                    app:srcCompat="@mipmap/ic_launcher"
    74 74 
                         tools:ignore="ImageContrastCheck" />
    75 75
    76 
    +                <!--
    76 77 
                     <ImageView
    77 78 
                         android:id="@+id/wordmarkText"
    78 79 
                         android:layout_width="wrap_content"
    ... ... @@ -81,26 +82,28 @@
    81 82 
                         android:contentDescription="@null"
    82 83 
                         android:layout_marginTop="@dimen/wordmark_text_margin_top"
    83 84 
                         app:srcCompat="?fenixWordmarkText" />
    85 
    +                -->
    86 
    +
    87 
    +                <TextView
    88 
    +                    android:id="@+id/app_name"
    89 
    +                    android:layout_width="wrap_content"
    90 
    +                    android:layout_height="wrap_content"
    91 
    +                    android:layout_marginTop="9dp"
    92 
    +                    android:width="130dp"
    93 
    +                    android:height="60dp"
    94 
    +                    android:clickable="false"
    95 
    +                    android:focusable="false"
    96 
    +                    android:importantForAccessibility="no"
    97 
    +                    android:lines="2"
    98 
    +                    android:text="@string/app_name"
    99 
    +                    android:fontFamily="Roboto-Medium"
    100 
    +                    android:textColor="#DEFFFFFF"
    101 
    +                    android:textSize="20sp"
    102 
    +                    android:lineSpacingMultiplier="1.2" />
    103 
    +
    84 104 
                 </LinearLayout>
    85 105
    86 
    -            <TextView
    87 
    -                android:id="@+id/app_name"
    88 
    -                android:layout_width="wrap_content"
    89 
    -                android:layout_height="wrap_content"
    90 
    -                android:layout_marginStart="80dp"
    91 
    -                android:layout_marginTop="9dp"
    92 
    -                android:gravity="center_vertical"
    93 
    -                android:width="130dp"
    94 
    -                android:height="60dp"
    95 
    -                android:clickable="false"
    96 
    -                android:focusable="false"
    97 
    -                android:importantForAccessibility="no"
    98 
    -                android:lines="2"
    99 
    -                android:text="@string/app_name"
    100 
    -                android:fontFamily="Roboto-Medium"
    101 
    -                android:textColor="#DEFFFFFF"
    102 
    -                android:textSize="20sp"
    103 
    -                android:lineSpacingMultiplier="1.2" />
    106 
    +
    104 107
    105 108 
             </com.google.android.material.appbar.CollapsingToolbarLayout>
    106 109

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits