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

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-150.0a1-16.0-2] fixup! [android] Implement Android-native Connection Assist UI

Title: GitLab

Dan Ballard pushed to branch tor-browser-150.0a1-16.0-2 at The Tor Project / Applications / Tor Browser

Commits:

  • 5fa6338b
    by clairehurst at 2026-04-29T13:15:00-07:00 
    fixup! [android] Implement Android-native Connection Assist UI

Fix color styling presented in one of the rebases between 140 and 150.

3 changed files:

Changes:

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt
    ... ... @@ -136,6 +136,10 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler, SystemIn
    136 136 
         }
    137 137
    138 138 
         private fun setSettingsButton(screen: ConnectAssistUiState) {
    139 
    +        binding.settingsButtonImage.imageTintList = AppCompatResources.getColorStateList(
    140 
    +            requireContext(),
    141 
    +            R.color.settings_button_white,
    142 
    +        )
    139 143 
             binding.settingsButton.visibility = if (screen.settingsButtonVisible) View.VISIBLE else View.GONE
    140 144 
             binding.settingsButton.setOnClickListener {
    141 145 
                 openSettings()
    ... ... @@ -143,6 +147,10 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler, SystemIn
    143 147 
         }
    144 148
    145 149 
         private fun setBackButton(screen: ConnectAssistUiState) {
    150 
    +        binding.backButtonImage.imageTintList = AppCompatResources.getColorStateList(
    151 
    +            requireContext(),
    152 
    +            R.color.settings_button_white,
    153 
    +        )
    146 154 
             binding.backButton.visibility = if (screen.backButtonVisible) View.VISIBLE else View.INVISIBLE
    147 155 
             binding.backButton.setOnClickListener {
    148 156 
                 onBackPressed()
    ... ... @@ -323,6 +331,10 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler, SystemIn
    323 331 
         }
    324 332
    325 333 
         private fun setButton2(screen: ConnectAssistUiState) {
    334 
    +        binding.torBootstrapButton2.backgroundTintList = AppCompatResources.getColorStateList(
    335 
    +            requireContext(),
    336 
    +            R.color.configure_connection_button_white,
    337 
    +        )
    326 338 
             binding.torBootstrapButton2.visibility =
    327 339 
                 if (screen.torBootstrapButton2Visible) View.VISIBLE else View.GONE
    328 340 
             if (screen.torBootstrapButton2ShouldRestartApp) {

  • mobile/android/fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml
    ... ... @@ -28,6 +28,7 @@
    28 28 
             app:layout_constraintTop_toTopOf="parent">
    29 29
    30 30 
             <ImageView
    31 
    +            android:id="@+id/settings_button_image"
    31 32 
                 android:layout_width="wrap_content"
    32 33 
                 android:layout_height="wrap_content"
    33 34 
                 android:contentDescription="@string/settings"
    ... ... @@ -50,6 +51,7 @@
    50 51 
             app:layout_constraintTop_toTopOf="parent">
    51 52
    52 53 
             <ImageView
    54 
    +            android:id="@+id/back_button_image"
    53 55 
                 android:layout_width="wrap_content"
    54 56 
                 android:layout_height="wrap_content"
    55 57 
                 android:contentDescription="@string/settings"
    ... ... @@ -154,7 +156,6 @@
    154 156 
             android:layout_marginEnd="24dp"
    155 157 
             android:layout_marginBottom="8dp"
    156 158 
             android:background="">"@drawable/rounded_corners"
    157 
    -        android:backgroundTint="@color/connect_button_purple"
    158 159 
             android:minWidth="360dp"
    159 160 
             android:text="@string/tor_bootstrap_connect"
    160 161 
             android:textAlignment="center"
    ... ... @@ -174,7 +175,6 @@
    174 175 
             android:layout_marginEnd="24dp"
    175 176 
             android:layout_marginBottom="8dp"
    176 177 
             android:background="">"@drawable/rounded_corners"
    177 
    -        android:backgroundTint="@color/configure_connection_button_white"
    178 178 
             android:minWidth="360dp"
    179 179 
             android:text="@string/connection_assist_configure_connection_button"
    180 180 
             android:textAlignment="center"

  • mobile/android/fenix/app/src/main/res/values/colors.xml
    ... ... @@ -332,4 +332,5 @@
    332 332 
         <color name="configure_connection_button_white">#E1E0E7</color>
    333 333 
         <color name="warning_yellow">#FFA436</color>
    334 334 
         <color name="progress_background_tint">#55148C</color>
    335 
    +    <color name="settings_button_white">#FBFBFE</color>
    335 336 
     </resources>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5fa6338b442d9a2b5dc274aba70c806285b9804f at 1777493891 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx