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

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

Title: GitLab

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

Commits:

  • a3680ba7
    by clairehurst at 2026-05-26T17:10:05-06:00 
    fixup! [android] Implement Android-native Connection Assist UI

Fix colors and bold text
  • 16fb8e0e
    by clairehurst at 2026-05-26T17:10:06-06:00 
    fixup! TB 40026 [android]: Implement Security Level settings on Android.

4 changed files:

Changes:

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt
    ... ... @@ -6,6 +6,7 @@ package org.mozilla.fenix.tor
    6 6
    7 7 
     import android.content.Intent
    8 8 
     import android.graphics.Color
    9 
    +import android.graphics.Typeface
    9 10 
     import android.os.Build
    10 11 
     import android.os.Bundle
    11 12 
     import android.text.SpannableString
    ... ... @@ -82,6 +83,9 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler, SystemIn
    82 83 
         override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
    83 84 
             super.onViewCreated(view, savedInstanceState)
    84 85
    86 
    +        binding.torBootstrapButton1.setTypeface(null, Typeface.BOLD)
    87 
    +        binding.torBootstrapButton2.setTypeface(null, Typeface.BOLD)
    88 
    +
    85 89 
             viewLifecycleOwner.lifecycleScope.launch {
    86 90 
                 repeatOnLifecycle(Lifecycle.State.STARTED) {
    87 91 
                     torConnectionAssistViewModel.torConnectScreen.collect { screen ->

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevelFragment.kt
    ... ... @@ -5,6 +5,7 @@
    5 5 
     package org.mozilla.fenix.tor
    6 6
    7 7 
     import android.content.Context
    8 
    +import android.graphics.Typeface
    8 9 
     import android.os.Bundle
    9 10 
     import android.util.Log
    10 11 
     import android.view.LayoutInflater
    ... ... @@ -44,6 +45,9 @@ class TorSecurityLevelFragment : Fragment(), SystemInsetsPaddedFragment {
    44 45
    45 46 
             binding.description.text = getString(R.string.tor_security_level_warning, getString(R.string.app_name))
    46 47
    48 
    +        binding.saveAndRestartButton.setTypeface(null, Typeface.BOLD)
    49 
    +        binding.cancelButton.setTypeface(null, Typeface.BOLD)
    50 
    +
    47 51 
             updateSaveAndRestartButtonUI()
    48 52
    49 53 
             val currentLevel: Int = requireContext().components.core.engine.settings.torSecurityLevel
    ... ... @@ -79,6 +83,11 @@ class TorSecurityLevelFragment : Fragment(), SystemInsetsPaddedFragment {
    79 83 
                 updateSaveAndRestartButtonUI()
    80 84 
             }
    81 85
    86 
    +        binding.saveAndRestartButton.backgroundTintList = AppCompatResources.getColorStateList(
    87 
    +            requireContext(),
    88 
    +            R.color.disabled_connect_button_purple,
    89 
    +        )
    90 
    +
    82 91 
             binding.saveAndRestartButton.setOnClickListener {
    83 92
    84 93 
                 Toast.makeText(
    ... ... @@ -111,6 +120,10 @@ class TorSecurityLevelFragment : Fragment(), SystemInsetsPaddedFragment {
    111 120 
                 (requireActivity() as HomeActivity).restartApplication()
    112 121 
             }
    113 122
    123 
    +        binding.cancelButton.backgroundTintList = AppCompatResources.getColorStateList(
    124 
    +            requireContext(),
    125 
    +            R.color.settings_button_white,
    126 
    +        )
    114 127 
             binding.cancelButton.setOnClickListener {
    115 128 
                 @Suppress("DEPRECATION")
    116 129 
                 requireActivity().onBackPressed()

  • mobile/android/fenix/app/src/main/res/layout/fragment_tor_security_level_preferences.xml
    ... ... @@ -82,7 +82,6 @@
    82 82 
             android:layout_marginEnd="24dp"
    83 83 
             android:layout_marginBottom="8dp"
    84 84 
             android:background="">"@drawable/rounded_corners"
    85 
    -        android:backgroundTint="@color/connect_button_purple"
    86 85 
             android:enabled="false"
    87 86 
             android:minWidth="360dp"
    88 87 
             android:text="@string/tor_security_level_save_and_restart_tor_browser"
    ... ... @@ -103,7 +102,6 @@
    103 102 
             android:layout_marginEnd="24dp"
    104 103 
             android:layout_marginBottom="8dp"
    105 104 
             android:background="">"@drawable/rounded_corners"
    106 
    -        android:backgroundTint="@color/configure_connection_button_white"
    107 105 
             android:minWidth="360dp"
    108 106 
             android:text="@string/btn_cancel"
    109 107 
             android:textAlignment="center"

  • mobile/android/fenix/app/src/main/res/values/colors.xml
    ... ... @@ -141,9 +141,9 @@
    141 141 
         <color name="fx_mobile_private_on_tertiary">@color/photonDarkGrey90</color>
    142 142 
         <color name="fx_mobile_private_tertiary_container">@color/photonPink80</color>
    143 143 
         <color name="fx_mobile_private_on_tertiary_container">@color/photonLightGrey05</color>
    144 
    -    <color name="fx_mobile_private_background">#FF342B4A</color>
    144 
    +    <color name="fx_mobile_private_background">#321C64</color>
    145 145 
         <color name="fx_mobile_private_on_background">@color/photonLightGrey05</color>
    146 
    -    <color name="fx_mobile_private_surface">#FF342B4A</color>
    146 
    +    <color name="fx_mobile_private_surface">#321C64</color>
    147 147 
         <color name="fx_mobile_private_on_surface">@color/photonLightGrey05</color>
    148 148 
         <color name="fx_mobile_private_surface_variant">#FF413857</color>
    149 149 
         <color name="fx_mobile_private_on_surface_variant">@color/photonLightGrey40</color>
    ... ... @@ -325,9 +325,9 @@
    325 325 
         <color name="mozac_ui_lock_slash_fill_critical" tools:ignore="UnusedResources">@color/fx_mobile_icon_color_critical</color>
    326 326
    327 327 
         <!-- Connection Assist -->
    328 
    -    <color name="connect_button_purple">#9059FF</color>
    329 
    -    <color name="disabled_connect_button_purple">#5C42A9</color>
    330 
    -    <color name="disabled_text_gray_purple">#8782A9</color>
    328 
    +    <color name="connect_button_purple">#7542E5</color>
    329 
    +    <color name="disabled_connect_button_purple">#542FA4</color>
    330 
    +    <color name="disabled_text_gray_purple">#9781C8</color>
    331 331 
         <color name="configure_connection_button_white">#E1E0E7</color>
    332 332 
         <color name="warning_yellow">#FFA436</color>
    333 333 
         <color name="progress_background_tint">#55148C</color>

    • —
    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/-/compare/641330aa21a52b8315bb6a49e835a54d34aa1ffb...16fb8e0e80ed2514464c18e1d38127cd126cb496 at 1779841079 

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