Commit 64ceb809 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by brizental
Browse files

fixup! [android] Implement Android-native Connection Assist UI 

Fix 144 rebase Android build errors.
parent e8ffc52b

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt

+0 −1
Original line number Diff line number Diff line
@@ -1971,7 +1971,6 @@ abstract class BaseBrowserFragment : 
                requireContext().components.useCases.tabsUseCases.removeTab(currentTab.id)

                (requireActivity() as HomeActivity).navigateToHome(

                    findNavController(),

                    focusOnAddressBar = true

                )

            } else {

                // This just makes it not flash (be visible for a split second) before handleTabSelected() hides it again

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/ConnectAssistUiState.kt

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ package org.mozilla.fenix.tor 
import androidx.annotation.ColorRes

import androidx.annotation.DrawableRes

import androidx.annotation.StringRes

import mozilla.components.lib.crash.R as crashR

import org.mozilla.fenix.R



enum class ConnectAssistUiState(
@@ -294,7 +295,7 @@ enum class ConnectAssistUiState( 
        torBootstrapButton1TextStringResource = R.string.connection_assist_configure_connection_button,

        torBootstrapButton1ShouldOpenSettings = true,

        torBootstrapButton2Visible = true,

        torBootstrapButton2TextStringResource = R.string.mozac_lib_crash_dialog_button_restart,

        torBootstrapButton2TextStringResource = crashR.string.mozac_lib_crash_dialog_button_restart,

        torBootstrapButton2ShouldOpenSettings = false,

        torBootstrapButton2ShouldRestartApp = true,

    )

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import androidx.lifecycle.repeatOnLifecycle 
import androidx.navigation.fragment.findNavController

import kotlinx.coroutines.launch

import mozilla.components.support.base.feature.UserInteractionHandler

import mozilla.components.ui.colors.R as colorsR

import org.mozilla.fenix.HomeActivity

import org.mozilla.fenix.R

import org.mozilla.fenix.databinding.FragmentTorConnectionAssistBinding
@@ -301,7 +302,7 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler { 
                setTextColor(

                    AppCompatResources.getColorStateList(

                        requireContext(),

                        R.color.photonLightGrey05,

                        colorsR.color.photonLightGrey05,

                    ),

                )

            } else {

mobile/android/fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ 
        android:contentDescription="@string/app_name"

        android:scaleX="1.8"

        android:scaleY="1.8"

        app:srcCompat="@mipmap/ic_launcher_foreground"

        app:srcCompat="@drawable/ic_launcher_foreground"

        android:visibility="gone"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"