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: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevelFragment.kt - mobile/android/fenix/app/src/main/res/layout/fragment_tor_security_level_preferences.xml - mobile/android/fenix/app/src/main/res/values/colors.xml Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt ===================================== @@ -6,6 +6,7 @@ package org.mozilla.fenix.tor import android.content.Intent import android.graphics.Color +import android.graphics.Typeface import android.os.Build import android.os.Bundle import android.text.SpannableString @@ -82,6 +83,9 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler, SystemIn override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + binding.torBootstrapButton1.setTypeface(null, Typeface.BOLD) + binding.torBootstrapButton2.setTypeface(null, Typeface.BOLD) + viewLifecycleOwner.lifecycleScope.launch { repeatOnLifecycle(Lifecycle.State.STARTED) { torConnectionAssistViewModel.torConnectScreen.collect { screen -> ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevelFragment.kt ===================================== @@ -5,6 +5,7 @@ package org.mozilla.fenix.tor import android.content.Context +import android.graphics.Typeface import android.os.Bundle import android.util.Log import android.view.LayoutInflater @@ -44,6 +45,9 @@ class TorSecurityLevelFragment : Fragment(), SystemInsetsPaddedFragment { binding.description.text = getString(R.string.tor_security_level_warning, getString(R.string.app_name)) + binding.saveAndRestartButton.setTypeface(null, Typeface.BOLD) + binding.cancelButton.setTypeface(null, Typeface.BOLD) + updateSaveAndRestartButtonUI() val currentLevel: Int = requireContext().components.core.engine.settings.torSecurityLevel @@ -79,6 +83,11 @@ class TorSecurityLevelFragment : Fragment(), SystemInsetsPaddedFragment { updateSaveAndRestartButtonUI() } + binding.saveAndRestartButton.backgroundTintList = AppCompatResources.getColorStateList( + requireContext(), + R.color.disabled_connect_button_purple, + ) + binding.saveAndRestartButton.setOnClickListener { Toast.makeText( @@ -111,6 +120,10 @@ class TorSecurityLevelFragment : Fragment(), SystemInsetsPaddedFragment { (requireActivity() as HomeActivity).restartApplication() } + binding.cancelButton.backgroundTintList = AppCompatResources.getColorStateList( + requireContext(), + R.color.settings_button_white, + ) binding.cancelButton.setOnClickListener { @Suppress("DEPRECATION") requireActivity().onBackPressed() ===================================== mobile/android/fenix/app/src/main/res/layout/fragment_tor_security_level_preferences.xml ===================================== @@ -82,7 +82,6 @@ android:layout_marginEnd="24dp" android:layout_marginBottom="8dp" android:background="@drawable/rounded_corners" - android:backgroundTint="@color/connect_button_purple" android:enabled="false" android:minWidth="360dp" android:text="@string/tor_security_level_save_and_restart_tor_browser" @@ -103,7 +102,6 @@ android:layout_marginEnd="24dp" android:layout_marginBottom="8dp" android:background="@drawable/rounded_corners" - android:backgroundTint="@color/configure_connection_button_white" android:minWidth="360dp" android:text="@string/btn_cancel" android:textAlignment="center" ===================================== mobile/android/fenix/app/src/main/res/values/colors.xml ===================================== @@ -141,9 +141,9 @@ <color name="fx_mobile_private_on_tertiary">@color/photonDarkGrey90</color> <color name="fx_mobile_private_tertiary_container">@color/photonPink80</color> <color name="fx_mobile_private_on_tertiary_container">@color/photonLightGrey05</color> - <color name="fx_mobile_private_background">#FF342B4A</color> + <color name="fx_mobile_private_background">#321C64</color> <color name="fx_mobile_private_on_background">@color/photonLightGrey05</color> - <color name="fx_mobile_private_surface">#FF342B4A</color> + <color name="fx_mobile_private_surface">#321C64</color> <color name="fx_mobile_private_on_surface">@color/photonLightGrey05</color> <color name="fx_mobile_private_surface_variant">#FF413857</color> <color name="fx_mobile_private_on_surface_variant">@color/photonLightGrey40</color> @@ -325,9 +325,9 @@ <color name="mozac_ui_lock_slash_fill_critical" tools:ignore="UnusedResources">@color/fx_mobile_icon_color_critical</color> <!-- Connection Assist --> - <color name="connect_button_purple">#9059FF</color> - <color name="disabled_connect_button_purple">#5C42A9</color> - <color name="disabled_text_gray_purple">#8782A9</color> + <color name="connect_button_purple">#7542E5</color> + <color name="disabled_connect_button_purple">#542FA4</color> + <color name="disabled_text_gray_purple">#9781C8</color> <color name="configure_connection_button_white">#E1E0E7</color> <color name="warning_yellow">#FFA436</color> <color name="progress_background_tint">#55148C</color> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/641330a... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/641330a... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help
participants (1)
-
Dan Ballard (@dan)