parent
0eca317d03
commit
140da0dd0f
|
@ -6,6 +6,7 @@ package org.mozilla.fenix.components.toolbar
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
import androidx.appcompat.content.res.AppCompatResources
|
||||||
import androidx.navigation.NavOptions
|
import androidx.navigation.NavOptions
|
||||||
import androidx.navigation.Navigation
|
import androidx.navigation.Navigation
|
||||||
import com.airbnb.lottie.LottieCompositionFactory
|
import com.airbnb.lottie.LottieCompositionFactory
|
||||||
|
@ -70,9 +71,15 @@ class ToolbarIntegration(
|
||||||
context.settings.shouldUseTrackingProtection && FeatureFlags.etpCategories
|
context.settings.shouldUseTrackingProtection && FeatureFlags.etpCategories
|
||||||
|
|
||||||
toolbar.setTrackingProtectionIcons(
|
toolbar.setTrackingProtectionIcons(
|
||||||
iconOnNoTrackersBlocked = context.getDrawable(R.drawable.ic_tracking_protection_enabled)!!,
|
iconOnNoTrackersBlocked = AppCompatResources.getDrawable(
|
||||||
|
context,
|
||||||
|
R.drawable.ic_tracking_protection_enabled
|
||||||
|
)!!,
|
||||||
iconOnTrackersBlocked = lottieDrawable,
|
iconOnTrackersBlocked = lottieDrawable,
|
||||||
iconDisabledForSite = context.getDrawable(R.drawable.ic_tracking_protection_disabled)!!
|
iconDisabledForSite = AppCompatResources.getDrawable(
|
||||||
|
context,
|
||||||
|
R.drawable.ic_tracking_protection_disabled
|
||||||
|
)!!
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@ import android.app.Activity
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.view.Gravity
|
import android.view.Gravity
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
import androidx.appcompat.content.res.AppCompatResources
|
||||||
import androidx.coordinatorlayout.widget.CoordinatorLayout
|
import androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
import androidx.core.widget.NestedScrollView
|
import androidx.core.widget.NestedScrollView
|
||||||
import com.airbnb.lottie.LottieCompositionFactory
|
import com.airbnb.lottie.LottieCompositionFactory
|
||||||
|
@ -69,9 +70,15 @@ class CustomTabsIntegration(
|
||||||
toolbar.displaySeparatorView = false
|
toolbar.displaySeparatorView = false
|
||||||
|
|
||||||
toolbar.setTrackingProtectionIcons(
|
toolbar.setTrackingProtectionIcons(
|
||||||
iconOnNoTrackersBlocked = context.getDrawable(R.drawable.ic_tracking_protection_enabled)!!,
|
iconOnNoTrackersBlocked = AppCompatResources.getDrawable(
|
||||||
|
context,
|
||||||
|
R.drawable.ic_tracking_protection_enabled
|
||||||
|
)!!,
|
||||||
iconOnTrackersBlocked = lottieDrawable,
|
iconOnTrackersBlocked = lottieDrawable,
|
||||||
iconDisabledForSite = context.getDrawable(R.drawable.ic_tracking_protection_disabled)!!
|
iconDisabledForSite = AppCompatResources.getDrawable(
|
||||||
|
context,
|
||||||
|
R.drawable.ic_tracking_protection_disabled
|
||||||
|
)!!
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,18 +7,20 @@ package org.mozilla.fenix.trackingprotection
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.util.AttributeSet
|
import android.util.AttributeSet
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
|
import androidx.appcompat.content.res.AppCompatResources
|
||||||
import androidx.constraintlayout.widget.ConstraintLayout
|
import androidx.constraintlayout.widget.ConstraintLayout
|
||||||
import androidx.core.content.withStyledAttributes
|
import androidx.core.content.withStyledAttributes
|
||||||
import kotlinx.android.synthetic.main.switch_with_description.view.*
|
import kotlinx.android.synthetic.main.switch_with_description.view.*
|
||||||
import kotlinx.android.synthetic.main.tracking_protection_category.view.switchItemDescription
|
import kotlinx.android.synthetic.main.tracking_protection_category.view.switchItemDescription
|
||||||
import kotlinx.android.synthetic.main.tracking_protection_category.view.switchItemTitle
|
import kotlinx.android.synthetic.main.tracking_protection_category.view.switchItemTitle
|
||||||
|
import mozilla.components.support.ktx.android.view.putCompoundDrawablesRelativeWithIntrinsicBounds
|
||||||
import org.mozilla.fenix.R
|
import org.mozilla.fenix.R
|
||||||
|
|
||||||
class SwitchWithDescription @JvmOverloads constructor(
|
class SwitchWithDescription @JvmOverloads constructor(
|
||||||
context: Context,
|
context: Context,
|
||||||
attrs: AttributeSet? = null,
|
attrs: AttributeSet? = null,
|
||||||
defStyleAttr: Int = 0
|
defStyleAttr: Int = 0
|
||||||
) : ConstraintLayout(context, attrs) {
|
) : ConstraintLayout(context, attrs, defStyleAttr) {
|
||||||
|
|
||||||
init {
|
init {
|
||||||
LayoutInflater.from(context).inflate(R.layout.switch_with_description, this, true)
|
LayoutInflater.from(context).inflate(R.layout.switch_with_description, this, true)
|
||||||
|
@ -28,19 +30,19 @@ class SwitchWithDescription @JvmOverloads constructor(
|
||||||
R.styleable.SwitchWithDescription_switchIcon,
|
R.styleable.SwitchWithDescription_switchIcon,
|
||||||
R.drawable.ic_tracking_protection
|
R.drawable.ic_tracking_protection
|
||||||
)
|
)
|
||||||
switch_widget?.setCompoundDrawablesWithIntrinsicBounds(
|
switch_widget.putCompoundDrawablesRelativeWithIntrinsicBounds(
|
||||||
resources.getDrawable(
|
start = AppCompatResources.getDrawable(
|
||||||
id,
|
context,
|
||||||
context.theme
|
id
|
||||||
), null, null, null
|
)
|
||||||
)
|
)
|
||||||
switchItemTitle?.text = resources.getString(
|
switchItemTitle.text = resources.getString(
|
||||||
getResourceId(
|
getResourceId(
|
||||||
R.styleable.SwitchWithDescription_switchTitle,
|
R.styleable.SwitchWithDescription_switchTitle,
|
||||||
R.string.preference_enhanced_tracking_protection
|
R.string.preference_enhanced_tracking_protection
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
switchItemDescription?.text = resources.getString(
|
switchItemDescription.text = resources.getString(
|
||||||
getResourceId(
|
getResourceId(
|
||||||
R.styleable.SwitchWithDescription_switchDescription,
|
R.styleable.SwitchWithDescription_switchDescription,
|
||||||
R.string.preference_enhanced_tracking_protection_explanation
|
R.string.preference_enhanced_tracking_protection_explanation
|
||||||
|
|
|
@ -167,7 +167,7 @@
|
||||||
style="@style/QuickSettingsText.Icon"
|
style="@style/QuickSettingsText.Icon"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="@dimen/tracking_protection_item_height"
|
android:layout_height="@dimen/tracking_protection_item_height"
|
||||||
android:drawableStart="@drawable/ic_settings"
|
app:drawableStartCompat="@drawable/ic_settings"
|
||||||
android:paddingEnd="24dp"
|
android:paddingEnd="24dp"
|
||||||
android:text="@string/etp_settings"
|
android:text="@string/etp_settings"
|
||||||
app:layout_constraintTop_toBottomOf="@id/line_divider" />
|
app:layout_constraintTop_toBottomOf="@id/line_divider" />
|
||||||
|
|
|
@ -14,9 +14,9 @@
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:adjustViewBounds="true"
|
android:adjustViewBounds="true"
|
||||||
android:importantForAccessibility="no"
|
android:importantForAccessibility="no"
|
||||||
android:src="@drawable/ic_etp_artwork"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:srcCompat="@drawable/ic_etp_artwork" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@android:id/title"
|
android:id="@android:id/title"
|
||||||
|
@ -69,11 +69,11 @@
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:layout_marginStart="12dp"
|
android:layout_marginStart="12dp"
|
||||||
android:importantForAccessibility="no"
|
android:importantForAccessibility="no"
|
||||||
android:src="@drawable/ic_arrowhead_right"
|
|
||||||
android:tint="@color/primary_text_dark_theme"
|
android:tint="@color/primary_text_dark_theme"
|
||||||
app:layout_constraintBottom_toBottomOf="@id/learn_more"
|
app:layout_constraintBottom_toBottomOf="@id/learn_more"
|
||||||
app:layout_constraintStart_toEndOf="@id/learn_more"
|
app:layout_constraintStart_toEndOf="@id/learn_more"
|
||||||
app:layout_constraintTop_toTopOf="@id/learn_more" />
|
app:layout_constraintTop_toTopOf="@id/learn_more"
|
||||||
|
app:srcCompat="@drawable/ic_arrowhead_right" />
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Guideline
|
<androidx.constraintlayout.widget.Guideline
|
||||||
android:id="@+id/guideline"
|
android:id="@+id/guideline"
|
||||||
|
|
Loading…
Reference in New Issue