blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #2530 - Show report site issue and TP off globally in quick settings

master
Emily Kager 2019-05-21 14:34:03 -07:00 committed by Jeff Boek
parent 220a843534
commit 7492de321d
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsUIView.kt
View File

@ -44,6 +44,7 @@ class QuickSettingsUIView(
private val urlLabel: TextView
private val trackingProtectionSwitch: Switch
private val trackingProtectionAction: TextView
private val reportSiteIssueAction: TextView
private val cameraActionLabel: TextView
private val cameraLabel: TextView
private val microphoneActionLabel: TextView
@ -61,6 +62,7 @@ class QuickSettingsUIView(
securityInfoLabel = view.findViewById<AppCompatTextView>(R.id.security_info)
trackingProtectionSwitch = view.findViewById(R.id.tracking_protection)
trackingProtectionAction = view.findViewById(R.id.tracking_protection_action)
reportSiteIssueAction = view.findViewById(R.id.report_site_issue_action)
cameraActionLabel = view.findViewById<AppCompatTextView>(R.id.camera_action_label)
cameraLabel = view.findViewById<AppCompatTextView>(R.id.camera_icon)
microphoneActionLabel = view.findViewById<AppCompatTextView>(R.id.microphone_action_label)
@ -76,7 +78,8 @@ class QuickSettingsUIView(
is QuickSettingsState.Mode.Normal -> {
bindUrl(state.mode.url)
bindSecurityInfo(state.mode.isSecured)
bindTrackingProtectionAction(state.mode.url)
bindReportSiteIssueAction(state.mode.url)
bindTrackingProtectionAction()
bindTrackingProtectionInfo(state.mode.isTrackingProtectionOn)
bindPhoneFeatureItem(CAMERA, state.mode.sitePermissions)
bindPhoneFeatureItem(MICROPHONE, state.mode.sitePermissions)
@ -115,22 +118,21 @@ class QuickSettingsUIView(
}
}
private fun bindTrackingProtectionAction(url: String) {
private fun bindTrackingProtectionAction() {
val globalTPSetting = Settings.getInstance(context).shouldUseTrackingProtection
trackingProtectionAction.text =
if (globalTPSetting)
context.getString(R.string.browser_menu_report_issue) else
context.getString(R.string.preferences_tracking_protection_turned_off_globally)
trackingProtectionAction.visibility = if (globalTPSetting) View.GONE else View.VISIBLE
trackingProtectionAction.setOnClickListener {
if (globalTPSetting) {
actionEmitter.onNext(
QuickSettingsAction.SelectReportProblem(url)
)
} else {
actionEmitter.onNext(
QuickSettingsAction.SelectTrackingProtectionSettings
)
}
actionEmitter.onNext(
QuickSettingsAction.SelectTrackingProtectionSettings
)
}
}
private fun bindReportSiteIssueAction(url: String) {
reportSiteIssueAction.setOnClickListener {
actionEmitter.onNext(
QuickSettingsAction.SelectReportProblem(url)
)
}
}

16
app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml
View File

@ -65,11 +65,23 @@
android:layout_height="@dimen/quicksettings_item_height"
android:gravity="top"
android:paddingStart="48dp"
android:text="@string/preferences_tracking_protection_turned_off_globally"
android:textColor="?accentBright"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/report_site_issue_action"
app:layout_constraintTop_toBottomOf="@id/tracking_protection" />
<TextView
android:id="@+id/report_site_issue_action"
style="@style/QuickSettingsText.Icon"
android:layout_width="match_parent"
android:layout_height="@dimen/quicksettings_item_height"
android:gravity="top"
android:paddingStart="48dp"
android:text="@string/browser_menu_report_issue"
android:textColor="?accentBright"
android:textSize="12sp"
app:layout_constraintBottom_toTopOf="@id/line_divider"
app:layout_constraintTop_toBottomOf="@id/tracking_protection" />
app:layout_constraintTop_toBottomOf="@id/tracking_protection_action" />
<View
android:id="@+id/line_divider"