blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #3568 - Use correct styling for QR and Share Alert Dialogs

master
Emily Kager 2019-07-12 09:44:36 -07:00 committed by Emily Kager
parent ef8d9604ae
commit 867067537a
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
View File

@ -11,7 +11,6 @@ import android.graphics.Typeface.BOLD
import android.graphics.Typeface.ITALIC import android.graphics.Typeface.ITALIC
import android.os.Bundle import android.os.Bundle
import android.text.style.StyleSpan import android.text.style.StyleSpan
import android.view.ContextThemeWrapper
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -134,12 +133,7 @@ class SearchFragment : Fragment(), BackHandler {
onScanResult = { result -> onScanResult = { result ->
search_scan_button.isChecked = false search_scan_button.isChecked = false
activity?.let { activity?.let {
AlertDialog.Builder( AlertDialog.Builder(it).apply {
ContextThemeWrapper(
it,
R.style.DialogStyle
)
).apply {
val spannable = resources.getSpannable( val spannable = resources.getSpannable(
R.string.qr_scanner_confirmation_dialog_message, R.string.qr_scanner_confirmation_dialog_message,
listOf( listOf(

33
app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt
View File

@ -10,7 +10,6 @@ import android.content.Intent.EXTRA_TEXT
import android.content.Intent.FLAG_ACTIVITY_NEW_TASK import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
import android.os.Bundle import android.os.Bundle
import android.os.Parcelable import android.os.Parcelable
import android.view.ContextThemeWrapper
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -41,7 +40,11 @@ class ShareFragment : AppCompatDialogFragment() {
setStyle(STYLE_NO_TITLE, R.style.ShareDialogStyle) setStyle(STYLE_NO_TITLE, R.style.ShareDialogStyle)
} }
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
val view = inflater.inflate(R.layout.fragment_share, container, false) val view = inflater.inflate(R.layout.fragment_share, container, false)
val args = ShareFragmentArgs.fromBundle(arguments!!) val args = ShareFragmentArgs.fromBundle(arguments!!)
if (args.url == null && args.tabs.isNullOrEmpty()) { if (args.url == null && args.tabs.isNullOrEmpty()) {
@ -77,31 +80,31 @@ class ShareFragment : AppCompatDialogFragment() {
dismiss() dismiss()
} }
ShareAction.SignInClicked -> { ShareAction.SignInClicked -> {
val directions = ShareFragmentDirections.actionShareFragmentToTurnOnSyncFragment() val directions =
ShareFragmentDirections.actionShareFragmentToTurnOnSyncFragment()
nav(R.id.shareFragment, directions) nav(R.id.shareFragment, directions)
dismiss() dismiss()
} }
ShareAction.AddNewDeviceClicked -> { ShareAction.AddNewDeviceClicked -> {
AlertDialog.Builder( context?.let {
ContextThemeWrapper( AlertDialog.Builder(it).apply {
context, setMessage(R.string.sync_connect_device_dialog)
R.style.DialogStyle setPositiveButton(R.string.sync_confirmation_button) { dialog, _ -> dialog.cancel() }
) create()
).apply { }.show()
setMessage(R.string.sync_connect_device_dialog) }
setPositiveButton(R.string.sync_confirmation_button) { dialog, _ -> dialog.cancel() }
create()
}.show()
} }
is ShareAction.ShareDeviceClicked -> { is ShareAction.ShareDeviceClicked -> {
val authAccount = requireComponents.backgroundServices.accountManager.authenticatedAccount() val authAccount =
requireComponents.backgroundServices.accountManager.authenticatedAccount()
authAccount?.run { authAccount?.run {
sendSendTab(this, it.device.id, tabs) sendSendTab(this, it.device.id, tabs)
} }
dismiss() dismiss()
} }
is ShareAction.SendAllClicked -> { is ShareAction.SendAllClicked -> {
val authAccount = requireComponents.backgroundServices.accountManager.authenticatedAccount() val authAccount =
requireComponents.backgroundServices.accountManager.authenticatedAccount()
authAccount?.run { authAccount?.run {
it.devices.forEach { device -> it.devices.forEach { device ->
sendSendTab(this, device.id, tabs) sendSendTab(this, device.id, tabs)

6
app/src/main/res/values/styles.xml
View File

@ -53,19 +53,19 @@
<style name="NormalTheme" parent="NormalThemeBase" /> <style name="NormalTheme" parent="NormalThemeBase" />
<style name="DialogStyle" parent="Theme.MaterialComponents.Dialog.Alert"> <style name="BaseDialogStyle" parent="Theme.MaterialComponents.Dialog.Alert">
<item name="dialogCornerRadius">@dimen/tab_corner_radius</item> <item name="dialogCornerRadius">@dimen/tab_corner_radius</item>
<item name="android:colorBackground">?above</item> <item name="android:colorBackground">?above</item>
<item name="colorAccent">?accent</item> <item name="colorAccent">?accent</item>
<item name="android:textColorPrimary">?primaryText</item> <item name="android:textColorPrimary">?primaryText</item>
</style> </style>
<style name="DialogStyleLight" parent="DialogStyle"> <style name="DialogStyleLight" parent="BaseDialogStyle">
<item name="buttonBarNegativeButtonStyle">@style/DialogButtonStyleLight</item> <item name="buttonBarNegativeButtonStyle">@style/DialogButtonStyleLight</item>
<item name="buttonBarPositiveButtonStyle">@style/DialogButtonStyleLight</item> <item name="buttonBarPositiveButtonStyle">@style/DialogButtonStyleLight</item>
</style> </style>
<style name="DialogStyleDark" parent="DialogStyle"> <style name="DialogStyleDark" parent="BaseDialogStyle">
<item name="buttonBarNegativeButtonStyle">@style/DialogButtonStyleDark</item> <item name="buttonBarNegativeButtonStyle">@style/DialogButtonStyleDark</item>
<item name="buttonBarPositiveButtonStyle">@style/DialogButtonStyleDark</item> <item name="buttonBarPositiveButtonStyle">@style/DialogButtonStyleDark</item>
</style> </style>