Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

Closes #1320: Customize site info panel dialog for custom tabs. (#2304)

Browse Source
nightly-build-test
Arturo Mejia 5 years ago committed by Colin Lee
parent c2704c3fec
commit 583b954c5a
4 changed files with 220 additions and 161 deletions
Show Stats Download Patch File Download Diff File

1
CHANGELOG.md
Unescape Escape View File

@ -43,6 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- #1955 - Added a confirmation dialog for QR code and barcode searches - #1955 - Added a confirmation dialog for QR code and barcode searches
- #1874 - Added a "Turn on Sync" fragment for Firefox Accounts login and sign up - #1874 - Added a "Turn on Sync" fragment for Firefox Accounts login and sign up
- #2308 - Update the deprecated BitmapDrawable constructor - #2308 - Update the deprecated BitmapDrawable constructor
- #1874 - Added TOP info panel dialog for custom tabs.
### Changed ### Changed
- #1429 - Updated site permissions ui for MVP - #1429 - Updated site permissions ui for MVP

17
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
Unescape Escape View File

@ -247,10 +247,20 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
view = view view = view
) )
val accentHighContrastColor = DefaultThemeManager.resolveAttribute(R.attr.accentHighContrast, requireContext())
sitePermissionsFeature.set( sitePermissionsFeature.set(
feature = SitePermissionsFeature( feature = SitePermissionsFeature(
anchorView = view.findInPageView, context = requireContext(),
sessionManager = sessionManager sessionManager = sessionManager,
fragmentManager = requireFragmentManager(),
promptsStyling = SitePermissionsFeature.PromptsStyling(
gravity = getAppropriateLayoutGravity(),
shouldWidthMatchParent = true,
positiveButtonBackgroundColor = accentHighContrastColor,
positiveButtonTextColor = R.color.photonWhite
),
sessionId = customTabSessionId
) { permissions -> ) { permissions ->
requestPermissions(permissions, REQUEST_CODE_APP_PERMISSIONS) requestPermissions(permissions, REQUEST_CODE_APP_PERMISSIONS)
}, },
@ -658,7 +668,8 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
url = session.url, url = session.url,
isSecured = session.securityInfo.secure, isSecured = session.securityInfo.secure,
isTrackingProtectionOn = Settings.getInstance(context!!).shouldUseTrackingProtection, isTrackingProtectionOn = Settings.getInstance(context!!).shouldUseTrackingProtection,
sitePermissions = sitePermissions sitePermissions = sitePermissions,
gravity = getAppropriateLayoutGravity()
) )
quickSettingsSheet.sitePermissions = sitePermissions quickSettingsSheet.sitePermissions = sitePermissions
quickSettingsSheet.show( quickSettingsSheet.show(

56
app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt
Unescape Escape View File

@ -4,15 +4,21 @@
package org.mozilla.fenix.settings.quicksettings package org.mozilla.fenix.settings.quicksettings
import android.app.Dialog
import android.content.Context import android.content.Context
import android.content.pm.PackageManager.PERMISSION_GRANTED import android.content.pm.PackageManager.PERMISSION_GRANTED
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.os.Bundle import android.os.Bundle
import android.view.Gravity.BOTTOM
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.LinearLayout
import androidx.appcompat.app.AppCompatDialogFragment
import androidx.appcompat.view.ContextThemeWrapper import androidx.appcompat.view.ContextThemeWrapper
import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.widget.NestedScrollView
import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.bottomsheet.BottomSheetDialog
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
@ -34,14 +40,16 @@ private const val KEY_URL = "KEY_URL"
private const val KEY_IS_SECURED = "KEY_IS_SECURED" private const val KEY_IS_SECURED = "KEY_IS_SECURED"
private const val KEY_SITE_PERMISSIONS = "KEY_SITE_PERMISSIONS" private const val KEY_SITE_PERMISSIONS = "KEY_SITE_PERMISSIONS"
private const val KEY_IS_TP_ON = "KEY_IS_TP_ON" private const val KEY_IS_TP_ON = "KEY_IS_TP_ON"
private const val KEY_DIALOG_GRAVITY = "KEY_DIALOG_GRAVITY"
private const val REQUEST_CODE_QUICK_SETTINGS_PERMISSIONS = 4 private const val REQUEST_CODE_QUICK_SETTINGS_PERMISSIONS = 4
@SuppressWarnings("TooManyFunctions") @SuppressWarnings("TooManyFunctions")
class QuickSettingsSheetDialogFragment : BottomSheetDialogFragment(), CoroutineScope { class QuickSettingsSheetDialogFragment : AppCompatDialogFragment(), CoroutineScope {
private val safeArguments get() = requireNotNull(arguments) private val safeArguments get() = requireNotNull(arguments)
private val url: String by lazy { safeArguments.getString(KEY_URL) } private val url: String by lazy { safeArguments.getString(KEY_URL) }
private val isSecured: Boolean by lazy { safeArguments.getBoolean(KEY_IS_SECURED) } private val isSecured: Boolean by lazy { safeArguments.getBoolean(KEY_IS_SECURED) }
private val isTrackingProtectionOn: Boolean by lazy { safeArguments.getBoolean(KEY_IS_TP_ON) } private val isTrackingProtectionOn: Boolean by lazy { safeArguments.getBoolean(KEY_IS_TP_ON) }
private val promptGravity: Int by lazy { safeArguments.getInt(KEY_DIALOG_GRAVITY) }
private lateinit var quickSettingsComponent: QuickSettingsComponent private lateinit var quickSettingsComponent: QuickSettingsComponent
private lateinit var job: Job private lateinit var job: Job
@ -62,23 +70,53 @@ class QuickSettingsSheetDialogFragment : BottomSheetDialogFragment(), CoroutineS
inflater: LayoutInflater, inflater: LayoutInflater,
container: ViewGroup?, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View? { ): View {
return inflateRootView(container)
}
private fun inflateRootView(container: ViewGroup? = null): View {
val contextThemeWrapper = ContextThemeWrapper( val contextThemeWrapper = ContextThemeWrapper(
activity, activity,
(activity as HomeActivity).themeManager.currentThemeResource (activity as HomeActivity).themeManager.currentThemeResource
) )
val localInflater = inflater.cloneInContext(contextThemeWrapper) return LayoutInflater.from(contextThemeWrapper).inflate(
return localInflater.inflate(
R.layout.fragment_quick_settings_dialog_sheet, R.layout.fragment_quick_settings_dialog_sheet,
container, container,
false false
) )
} }
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val customDialog = if (promptGravity == BOTTOM) {
return BottomSheetDialog(requireContext(), this.theme)
} else {
Dialog(requireContext())
}
return customDialog.applyCustomizationsForTopDialog(inflateRootView())
}
private fun Dialog.applyCustomizationsForTopDialog(rootView: View): Dialog {
addContentView(
rootView,
LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT
)
)
window?.apply {
setGravity(promptGravity)
setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
// This must be called after addContentView, or it won't fully fill to the edge.
setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
}
return this
}
override fun onViewCreated(rootView: View, savedInstanceState: Bundle?) { override fun onViewCreated(rootView: View, savedInstanceState: Bundle?) {
super.onViewCreated(rootView, savedInstanceState) super.onViewCreated(rootView, savedInstanceState)
quickSettingsComponent = QuickSettingsComponent( quickSettingsComponent = QuickSettingsComponent(
rootView as ConstraintLayout, ActionBusFactory.get(this), rootView as NestedScrollView, ActionBusFactory.get(this),
QuickSettingsState( QuickSettingsState(
QuickSettingsState.Mode.Normal( QuickSettingsState.Mode.Normal(
url, url,
@ -97,7 +135,8 @@ class QuickSettingsSheetDialogFragment : BottomSheetDialogFragment(), CoroutineS
url: String, url: String,
isSecured: Boolean, isSecured: Boolean,
isTrackingProtectionOn: Boolean, isTrackingProtectionOn: Boolean,
sitePermissions: SitePermissions? sitePermissions: SitePermissions?,
gravity: Int = BOTTOM
): QuickSettingsSheetDialogFragment { ): QuickSettingsSheetDialogFragment {
val fragment = QuickSettingsSheetDialogFragment() val fragment = QuickSettingsSheetDialogFragment()
@ -108,6 +147,7 @@ class QuickSettingsSheetDialogFragment : BottomSheetDialogFragment(), CoroutineS
putBoolean(KEY_IS_SECURED, isSecured) putBoolean(KEY_IS_SECURED, isSecured)
putBoolean(KEY_IS_TP_ON, isTrackingProtectionOn) putBoolean(KEY_IS_TP_ON, isTrackingProtectionOn)
putParcelable(KEY_SITE_PERMISSIONS, sitePermissions) putParcelable(KEY_SITE_PERMISSIONS, sitePermissions)
putInt(KEY_DIALOG_GRAVITY, gravity)
} }
fragment.arguments = arguments fragment.arguments = arguments
return fragment return fragment

307
app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml
Unescape Escape View File

@ -3,154 +3,161 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.core.widget.NestedScrollView
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/quick_action_sheet" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?foundation"
android:contentDescription="@string/quick_settings_sheet">
<TextView
android:id="@+id/url"
style="@style/QuickSettingsText"
android:layout_width="wrap_content"
android:layout_height="@dimen/quicksettings_item_height"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="https://wikipedia.org" />
<TextView
android:id="@+id/security_info"
style="@style/QuickSettingsText.Icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/quicksettings_item_height"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/url"
tools:drawableStartCompat="@drawable/mozac_ic_lock"
tools:drawableTint="@color/photonGreen50"
tools:text="Secure connection" />
<View
android:id="@+id/line_divider_security"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="match_parent"
android:layout_marginTop="8dp" android:fillViewport="true">
android:layout_marginBottom="8dp"
android:background="?neutralFaded" <androidx.constraintlayout.widget.ConstraintLayout
app:layout_constraintStart_toStartOf="parent" android:id="@+id/quick_action_sheet"
app:layout_constraintTop_toBottomOf="@id/security_info" /> android:layout_width="match_parent"
android:layout_height="wrap_content"
<Switch android:background="?foundation"
android:id="@+id/tracking_protection" android:contentDescription="@string/quick_settings_sheet">
style="@style/QuickSettingsText.Icon"
android:layout_width="match_parent" <TextView
android:layout_height="@dimen/quicksettings_item_height" android:id="@+id/url"
android:drawableStart="@drawable/ic_tracking_protection" style="@style/QuickSettingsText"
android:paddingEnd="24dp" android:layout_width="wrap_content"
android:text="@string/preferences_tracking_protection" android:layout_height="@dimen/quicksettings_item_height"
app:layout_constraintBottom_toTopOf="@id/report_problem" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/line_divider_security" /> app:layout_constraintTop_toTopOf="parent"
tools:text="https://wikipedia.org"/>
<TextView
android:id="@+id/report_problem" <TextView
style="@style/QuickSettingsText.Icon" android:id="@+id/security_info"
android:layout_width="match_parent" style="@style/QuickSettingsText.Icon"
android:layout_height="@dimen/quicksettings_item_height" android:layout_width="wrap_content"
android:gravity="top" android:layout_height="@dimen/quicksettings_item_height"
android:paddingStart="48dp" app:layout_constraintStart_toStartOf="parent"
android:text="@string/browser_menu_report_issue" app:layout_constraintTop_toBottomOf="@id/url"
android:textColor="?accentBright" tools:drawableStartCompat="@drawable/mozac_ic_lock"
android:textSize="12sp" tools:drawableTint="@color/photonGreen50"
app:layout_constraintBottom_toTopOf="@id/line_divider" tools:text="Secure connection"/>
app:layout_constraintTop_toBottomOf="@id/tracking_protection" />
<View
<View android:id="@+id/line_divider_security"
android:id="@+id/line_divider" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="1dp"
android:layout_height="1dp" android:layout_marginTop="8dp"
android:layout_marginTop="8dp" android:layout_marginBottom="8dp"
android:layout_marginBottom="8dp" android:background="?neutralFaded"
android:background="?neutralFaded" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/camera_icon" app:layout_constraintTop_toBottomOf="@id/security_info"/>
app:layout_constraintStart_toStartOf="parent" />
<Switch
<TextView android:id="@+id/tracking_protection"
android:id="@+id/camera_icon" style="@style/QuickSettingsText.Icon"
style="@style/QuickSettingsText.Icon" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="@dimen/quicksettings_item_height"
android:layout_height="@dimen/quicksettings_item_height" android:drawableStart="@drawable/ic_tracking_protection"
android:text="@string/preference_phone_feature_camera" android:paddingEnd="24dp"
app:drawableStartCompat="@drawable/ic_camera" android:text="@string/preferences_tracking_protection"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toTopOf="@id/report_problem"
app:layout_constraintTop_toBottomOf="@id/line_divider" /> app:layout_constraintTop_toBottomOf="@id/line_divider_security"/>
<TextView <TextView
android:id="@+id/camera_action_label" android:id="@+id/report_problem"
style="@style/QuickSettingsText.PermissionItemEnd" style="@style/QuickSettingsText.Icon"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="@dimen/quicksettings_item_height" android:layout_height="@dimen/quicksettings_item_height"
app:layout_constraintEnd_toEndOf="parent" android:gravity="top"
app:layout_constraintTop_toBottomOf="@id/line_divider" android:paddingStart="48dp"
tools:text="Allowed" /> android:text="@string/browser_menu_report_issue"
android:textColor="?accentBright"
<TextView android:textSize="12sp"
android:id="@+id/microphone_icon" app:layout_constraintBottom_toTopOf="@id/line_divider"
style="@style/QuickSettingsText.Icon" app:layout_constraintTop_toBottomOf="@id/tracking_protection"/>
android:layout_width="wrap_content"
android:layout_height="@dimen/quicksettings_item_height" <View
android:text="@string/preference_phone_feature_microphone" android:id="@+id/line_divider"
app:drawableStartCompat="@drawable/ic_microphone" android:layout_width="match_parent"
app:layout_constraintStart_toStartOf="parent" android:layout_height="1dp"
app:layout_constraintTop_toBottomOf="@id/camera_icon" /> android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="?neutralFaded"
<TextView app:layout_constraintBottom_toTopOf="@id/camera_icon"
android:id="@+id/microphone_action_label" app:layout_constraintStart_toStartOf="parent"/>
style="@style/QuickSettingsText.PermissionItemEnd"
android:layout_width="wrap_content" <TextView
android:layout_height="@dimen/quicksettings_item_height" android:id="@+id/camera_icon"
app:layout_constraintEnd_toEndOf="parent" style="@style/QuickSettingsText.Icon"
app:layout_constraintTop_toBottomOf="@id/camera_action_label" android:layout_width="wrap_content"
tools:text="Blocked by Android" /> android:layout_height="@dimen/quicksettings_item_height"
android:text="@string/preference_phone_feature_camera"
<TextView app:drawableStartCompat="@drawable/ic_camera"
android:id="@+id/notification_icon" app:layout_constraintStart_toStartOf="parent"
style="@style/QuickSettingsText.Icon" app:layout_constraintTop_toBottomOf="@id/line_divider"/>
android:layout_width="wrap_content"
android:layout_height="@dimen/quicksettings_item_height" <TextView
android:text="@string/preference_phone_feature_notification" android:id="@+id/camera_action_label"
app:drawableStartCompat="@drawable/ic_notification" style="@style/QuickSettingsText.PermissionItemEnd"
app:layout_constraintStart_toStartOf="parent" android:layout_width="wrap_content"
app:layout_constraintTop_toBottomOf="@id/microphone_icon" /> android:layout_height="@dimen/quicksettings_item_height"
app:layout_constraintEnd_toEndOf="parent"
<TextView app:layout_constraintTop_toBottomOf="@id/line_divider"
android:id="@+id/notification_action_label" tools:text="Allowed"/>
style="@style/QuickSettingsText.PermissionItemEnd"
android:layout_width="wrap_content" <TextView
android:layout_height="@dimen/quicksettings_item_height" android:id="@+id/microphone_icon"
app:layout_constraintEnd_toEndOf="parent" style="@style/QuickSettingsText.Icon"
app:layout_constraintTop_toBottomOf="@id/microphone_action_label" android:layout_width="wrap_content"
tools:text="Blocked" /> android:layout_height="@dimen/quicksettings_item_height"
android:text="@string/preference_phone_feature_microphone"
<TextView app:drawableStartCompat="@drawable/ic_microphone"
android:id="@+id/location_icon" app:layout_constraintStart_toStartOf="parent"
style="@style/QuickSettingsText.Icon" app:layout_constraintTop_toBottomOf="@id/camera_icon"/>
android:layout_width="wrap_content"
android:layout_height="@dimen/quicksettings_item_height"
android:text="@string/preference_phone_feature_location" <TextView
app:drawableStartCompat="@drawable/ic_location" android:id="@+id/microphone_action_label"
app:layout_constraintStart_toStartOf="parent" style="@style/QuickSettingsText.PermissionItemEnd"
app:layout_constraintTop_toBottomOf="@id/notification_icon" /> android:layout_width="wrap_content"
android:layout_height="@dimen/quicksettings_item_height"
<TextView app:layout_constraintEnd_toEndOf="parent"
android:id="@+id/location_action_label" app:layout_constraintTop_toBottomOf="@id/camera_action_label"
style="@style/QuickSettingsText.PermissionItemEnd" tools:text="Blocked by Android"/>
android:layout_width="wrap_content"
android:layout_height="@dimen/quicksettings_item_height" <TextView
app:layout_constraintEnd_toEndOf="parent" android:id="@+id/notification_icon"
app:layout_constraintTop_toBottomOf="@id/notification_action_label" style="@style/QuickSettingsText.Icon"
tools:text="Blocked" /> android:layout_width="wrap_content"
android:layout_height="@dimen/quicksettings_item_height"
</androidx.constraintlayout.widget.ConstraintLayout> android:text="@string/preference_phone_feature_notification"
app:drawableStartCompat="@drawable/ic_notification"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/microphone_icon"/>
<TextView
android:id="@+id/notification_action_label"
style="@style/QuickSettingsText.PermissionItemEnd"
android:layout_width="wrap_content"
android:layout_height="@dimen/quicksettings_item_height"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/microphone_action_label"
tools:text="Blocked"/>
<TextView
android:id="@+id/location_icon"
style="@style/QuickSettingsText.Icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/quicksettings_item_height"
android:text="@string/preference_phone_feature_location"
app:drawableStartCompat="@drawable/ic_location"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/notification_icon"/>
<TextView
android:id="@+id/location_action_label"
style="@style/QuickSettingsText.PermissionItemEnd"
android:layout_width="wrap_content"
android:layout_height="@dimen/quicksettings_item_height"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/notification_action_label"
tools:text="Blocked"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
Write Preview
Loading…
Cancel
Save