morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser

Commits: 74b910cc by clairehurst at 2024-08-26T20:55:16+00:00 fixup! [android] Add Tor integration and UI

- - - - -

2 changed files:

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

Changes:

===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -1343,7 +1343,8 @@ class HomeFragment : Fragment(), UserInteractionHandler { else -> ColorStateList.valueOf(color) }

- binding.wordmarkText.imageTintList = tintColor +// tor-browser#42590 +// binding.wordmarkText.imageTintList = tintColor binding.privateBrowsingButton.imageTintList = tintColor }

===================================== mobile/android/fenix/app/src/main/res/layout/fragment_home.xml ===================================== @@ -48,10 +48,10 @@ app:layout_collapseParallaxMultiplier=".167"/> <!-- This value needs to be 1.67 * the wordmark parallax value as its 24dp vs 40 -->

- <LinearLayout + <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/wordmark" android:layout_width="wrap_content" - android:layout_height="40dp" + android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="18dp" android:layout_marginBottom="32dp" @@ -65,16 +65,21 @@

<ImageView android:id="@+id/wordmarkLogo" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginEnd="10.dp" + android:layout_width="50dp" + android:layout_height="50dp" android:adjustViewBounds="true" android:contentDescription="@null" app:srcCompat="@mipmap/ic_launcher_foreground" tools:ignore="ImageContrastCheck" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintEnd_toStartOf="@id/app_name" android:scaleX="1.5" android:scaleY="1.5" />

+ <!-- + tor-browser#42590 <ImageView android:id="@+id/wordmarkText" android:layout_width="wrap_content" @@ -83,7 +88,30 @@ android:contentDescription="@null" android:layout_marginTop="@dimen/wordmark_text_margin_top" app:srcCompat="?fenixWordmarkText" /> - </LinearLayout> + --> + + <TextView + android:id="@+id/app_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clickable="false" + android:focusable="false" + android:fontFamily="Roboto-Medium" + android:gravity="start" + android:importantForAccessibility="no" + android:maxLines="2" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:text="@string/app_name" + android:textColor="#DEFFFFFF" + android:textSize="20sp" + app:layout_constrainedWidth="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/wordmarkLogo" + app:layout_constraintTop_toTopOf="parent" /> + + </androidx.constraintlayout.widget.ConstraintLayout>

</com.google.android.material.appbar.CollapsingToolbarLayout>

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/74b910cc...