Make Tooltip Focusable (#247)
* Make Tooltip PopUp Window Focusable * Restore Dismiss Inside Option
This commit is contained in:
Родитель
3ae27b570a
Коммит
72cb83280b
|
@ -7,15 +7,17 @@ package com.microsoft.fluentuidemo.demos
|
|||
|
||||
import android.graphics.PorterDuff
|
||||
import android.os.Bundle
|
||||
import android.view.LayoutInflater
|
||||
import android.view.Menu
|
||||
import android.view.MenuItem
|
||||
import android.view.ViewTreeObserver
|
||||
import android.widget.Button
|
||||
import androidx.core.content.ContextCompat
|
||||
import com.google.android.material.tooltip.TooltipDrawable
|
||||
import com.microsoft.fluentui.calendar.CalendarView
|
||||
import com.microsoft.fluentui.snackbar.Snackbar
|
||||
import com.microsoft.fluentui.tooltip.Tooltip
|
||||
import com.microsoft.fluentui.util.ThemeUtil
|
||||
import com.microsoft.fluentui.widget.Button
|
||||
import com.microsoft.fluentuidemo.DemoActivity
|
||||
import com.microsoft.fluentuidemo.R
|
||||
import kotlinx.android.synthetic.main.activity_demo_detail.*
|
||||
|
@ -26,19 +28,31 @@ class TooltipActivity : DemoActivity(), Tooltip.OnDismissListener {
|
|||
const val BUTTON_ID = "buttonId"
|
||||
}
|
||||
|
||||
enum class TooltipType(val buttonId: Int, val messageId: Int, val offsetXId: Int, val offsetYId: Int) {
|
||||
enum class TooltipType(
|
||||
val buttonId: Int,
|
||||
val messageId: Int,
|
||||
val offsetXId: Int,
|
||||
val offsetYId: Int
|
||||
) {
|
||||
TOP_START(R.id.tooltip_anchor_top_start, R.string.tooltip_top_start_message, 0, 0),
|
||||
TOP_END(R.id.tooltip_anchor_top_end, R.string.tooltip_top_end_message, R.dimen.tooltip_example_offset_x, 0),
|
||||
TOP_END(
|
||||
R.id.tooltip_anchor_top_end,
|
||||
R.string.tooltip_top_end_message,
|
||||
R.dimen.tooltip_example_offset_x,
|
||||
0
|
||||
),
|
||||
BOTTOM_START(R.id.tooltip_anchor_bottom_start, R.string.tooltip_bottom_start_message, 0, 0),
|
||||
BOTTOM_END(R.id.tooltip_anchor_bottom_end, R.string.tooltip_bottom_end_message, 0, R.dimen.tooltip_example_offset_y)
|
||||
BOTTOM_END(
|
||||
R.id.tooltip_anchor_bottom_end,
|
||||
R.string.tooltip_bottom_end_message,
|
||||
0,
|
||||
R.dimen.tooltip_example_offset_y
|
||||
)
|
||||
}
|
||||
|
||||
private var tooltip: Tooltip? = null
|
||||
|
||||
private var optionsMenu: Menu? = null
|
||||
set(value) {
|
||||
field = value
|
||||
}
|
||||
|
||||
private var buttonId: Int = 0
|
||||
|
||||
|
@ -78,6 +92,15 @@ class TooltipActivity : DemoActivity(), Tooltip.OnDismissListener {
|
|||
buttonId = it.id
|
||||
}
|
||||
|
||||
tooltip_anchor_custom_view.setOnClickListener {
|
||||
tooltip = Tooltip(this).show(
|
||||
it,
|
||||
LayoutInflater.from(this).inflate(R.layout.tooltip_custom_view, null)
|
||||
)
|
||||
tooltip?.onDismissListener = this
|
||||
buttonId = it.id
|
||||
}
|
||||
|
||||
tooltip_anchor_calendar_demo.setOnClickListener {
|
||||
tooltip = Tooltip(this).show(it, CalendarView(this), Tooltip.Config())
|
||||
tooltip?.onDismissListener = this
|
||||
|
@ -108,7 +131,8 @@ class TooltipActivity : DemoActivity(), Tooltip.OnDismissListener {
|
|||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||
when (item.itemId) {
|
||||
R.id.action_flag -> {
|
||||
Tooltip(baseContext).show(findViewById(item.itemId),
|
||||
Tooltip(baseContext).show(
|
||||
findViewById(item.itemId),
|
||||
"Flag Tooltip Clicked",
|
||||
Tooltip.Config(touchDismissLocation = Tooltip.TouchDismissLocation.INSIDE)
|
||||
).onDismissListener = this
|
||||
|
@ -123,7 +147,8 @@ class TooltipActivity : DemoActivity(), Tooltip.OnDismissListener {
|
|||
|
||||
if (buttonId > 0) {
|
||||
val button = findViewById<Button>(buttonId)
|
||||
button.viewTreeObserver.addOnGlobalLayoutListener(object: ViewTreeObserver.OnGlobalLayoutListener {
|
||||
button.viewTreeObserver.addOnGlobalLayoutListener(object :
|
||||
ViewTreeObserver.OnGlobalLayoutListener {
|
||||
override fun onGlobalLayout() {
|
||||
// Show tooltip on configuration change
|
||||
button.performClick()
|
||||
|
@ -150,7 +175,11 @@ class TooltipActivity : DemoActivity(), Tooltip.OnDismissListener {
|
|||
}
|
||||
|
||||
override fun onDismiss() {
|
||||
Snackbar.make(root_view, resources.getString(R.string.tooltip_dismiss_message), Snackbar.LENGTH_SHORT).show()
|
||||
Snackbar.make(
|
||||
root_view,
|
||||
resources.getString(R.string.tooltip_dismiss_message),
|
||||
Snackbar.LENGTH_SHORT
|
||||
).show()
|
||||
}
|
||||
|
||||
private fun getDimen(id: Int): Int =
|
||||
|
|
|
@ -58,6 +58,18 @@
|
|||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent" />
|
||||
|
||||
<com.microsoft.fluentui.widget.Button
|
||||
android:id="@+id/tooltip_anchor_custom_view"
|
||||
style="@style/Demo.Tooltip.Button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/tooltip_custom_view"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.755" />
|
||||
|
||||
<com.microsoft.fluentui.widget.Button
|
||||
android:id="@+id/tooltip_anchor_calendar_demo"
|
||||
style="@style/Demo.Tooltip.Button"
|
||||
|
|
|
@ -0,0 +1,40 @@
|
|||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
~ Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
~ Licensed under the MIT License.
|
||||
-->
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tooltip_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingTop="@dimen/fluentui_tooltip_padding_vertical"
|
||||
android:paddingBottom="@dimen/fluentui_tooltip_padding_vertical"
|
||||
android:paddingEnd="@dimen/fluentui_tooltip_padding_horizontal"
|
||||
android:paddingStart="@dimen/fluentui_tooltip_padding_horizontal"
|
||||
android:textAppearance="@style/TextAppearance.FluentUI.Tooltip"
|
||||
android:text="Press Yes Or No" />
|
||||
|
||||
<Button
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="@dimen/fluentui_tooltip_padding_vertical"
|
||||
android:paddingBottom="@dimen/fluentui_tooltip_padding_vertical"
|
||||
android:paddingEnd="@dimen/fluentui_tooltip_padding_horizontal"
|
||||
android:paddingStart="@dimen/fluentui_tooltip_padding_horizontal"
|
||||
android:text="Yes" />
|
||||
|
||||
<Button
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="@dimen/fluentui_tooltip_padding_vertical"
|
||||
android:paddingBottom="@dimen/fluentui_tooltip_padding_vertical"
|
||||
android:paddingEnd="@dimen/fluentui_tooltip_padding_horizontal"
|
||||
android:paddingStart="@dimen/fluentui_tooltip_padding_horizontal"
|
||||
android:text="No" />
|
||||
</LinearLayout>
|
|
@ -471,6 +471,7 @@
|
|||
<string name="tooltip_calendar_demo_button">Tap for Custom Calendar Tooltip</string>
|
||||
<string name="tooltip_custom_button">Tap Custom Color Tooltip</string>
|
||||
<string name="tooltip_center_button">Tap for Dismiss Inside Tooltip</string>
|
||||
<string name="tooltip_custom_view">Tap for Custom View Tooltip</string>
|
||||
<string name="tooltip_top_start_message">Top Custom Color Tooltip</string>
|
||||
<string name="tooltip_top_end_message">Top End Tooltip with 10dp offsetX</string>
|
||||
<string name="tooltip_bottom_start_message">Bottom Start Tooltip</string>
|
||||
|
|
|
@ -10,24 +10,19 @@ import android.content.res.ColorStateList
|
|||
import android.graphics.Color
|
||||
import android.graphics.Rect
|
||||
import android.graphics.drawable.ColorDrawable
|
||||
import android.graphics.drawable.Drawable
|
||||
import androidx.core.view.AccessibilityDelegateCompat
|
||||
import androidx.core.view.ViewCompat
|
||||
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
|
||||
import android.view.Gravity
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.widget.FrameLayout
|
||||
import android.widget.ImageView
|
||||
import android.widget.LinearLayout
|
||||
import android.widget.PopupWindow
|
||||
import android.widget.TextView
|
||||
import android.widget.*
|
||||
import androidx.annotation.ColorInt
|
||||
import androidx.annotation.DrawableRes
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.core.view.AccessibilityDelegateCompat
|
||||
import androidx.core.view.ViewCompat
|
||||
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
|
||||
import androidx.core.widget.ImageViewCompat
|
||||
import com.microsoft.fluentui.transients.R
|
||||
import com.microsoft.fluentui.theming.FluentUIContextThemeWrapper
|
||||
import com.microsoft.fluentui.transients.R
|
||||
import com.microsoft.fluentui.transients.databinding.ViewTooltipBinding
|
||||
import com.microsoft.fluentui.util.*
|
||||
|
||||
|
@ -78,7 +73,12 @@ class Tooltip {
|
|||
|
||||
// Need the theme wrapper to avoid crashing in Dark theme.
|
||||
// TODO Change to inflate(R.layout.view_tooltip, parent, false) and refactor dismiss inside listener accordingly.
|
||||
tooltipView = LayoutInflater.from(FluentUIContextThemeWrapper(context,R.style.Theme_FluentUI_Transients)).inflate(R.layout.view_tooltip, null)
|
||||
tooltipView = LayoutInflater.from(
|
||||
FluentUIContextThemeWrapper(
|
||||
context,
|
||||
R.style.Theme_FluentUI_Transients
|
||||
)
|
||||
).inflate(R.layout.view_tooltip, null)
|
||||
val binding = ViewTooltipBinding.bind(tooltipView)
|
||||
contentFrame = binding.tooltipContentFrame
|
||||
arrowUpView = binding.tooltipArrowUp
|
||||
|
@ -91,7 +91,7 @@ class Tooltip {
|
|||
|
||||
popupWindow = PopupWindow(context).apply {
|
||||
isClippingEnabled = true
|
||||
isFocusable = context.isAccessibilityEnabled
|
||||
isFocusable = true
|
||||
isOutsideTouchable = true
|
||||
width = context.displaySize.x
|
||||
height = context.displaySize.y
|
||||
|
@ -103,20 +103,26 @@ class Tooltip {
|
|||
displayHeight = context.displaySize.y
|
||||
}
|
||||
|
||||
private fun hideAllArrows(){
|
||||
private fun hideAllArrows() {
|
||||
arrowUpView.visibility = View.GONE
|
||||
arrowDownView.visibility = View.GONE
|
||||
arrowLeftView.visibility = View.GONE
|
||||
arrowRightView.visibility = View.GONE
|
||||
}
|
||||
|
||||
/**
|
||||
* Shows the text in a tooltip
|
||||
* @param config the configuration of the tooltip
|
||||
*/
|
||||
fun show(anchor: View, text: String, config: Config = Config()): Tooltip {
|
||||
val tooltipTextView: View = LayoutInflater.from(FluentUIContextThemeWrapper(this.context, com.microsoft.fluentui.transients.R.style.Theme_FluentUI_Transients)).inflate(R.layout.view_tooltip_text, null)
|
||||
val tooltipTextView: View = LayoutInflater.from(
|
||||
FluentUIContextThemeWrapper(
|
||||
this.context,
|
||||
R.style.Theme_FluentUI_Transients
|
||||
)
|
||||
).inflate(R.layout.view_tooltip_text, null)
|
||||
val tooltipText: TextView = tooltipTextView.findViewById(R.id.tooltip_text)
|
||||
tooltipText.setText(text)
|
||||
tooltipText.text = text
|
||||
return show(anchor, tooltipTextView, config)
|
||||
}
|
||||
|
||||
|
@ -134,25 +140,37 @@ class Tooltip {
|
|||
val screenPos = IntArray(2)
|
||||
anchor.getLocationInWindow(screenPos)
|
||||
// Get rect for anchor view
|
||||
val anchorRect = Rect(screenPos[0], screenPos[1], screenPos[0] + anchor.width, screenPos[1] + anchor.height)
|
||||
val anchorRect = Rect(
|
||||
screenPos[0],
|
||||
screenPos[1],
|
||||
screenPos[0] + anchor.width,
|
||||
screenPos[1] + anchor.height
|
||||
)
|
||||
|
||||
measureContentSize()
|
||||
|
||||
setPositionX(anchorRect.centerX(), if (anchor.layoutIsRtl) -config.offsetX else config.offsetX)
|
||||
setPositionX(
|
||||
anchorRect.centerX(),
|
||||
if (anchor.layoutIsRtl) -config.offsetX else config.offsetX
|
||||
)
|
||||
setPositionY(anchorRect, config.offsetY, config.touchDismissLocation)
|
||||
|
||||
initTooltipArrow(anchorRect, anchor.layoutIsRtl, config.offsetX)
|
||||
checkEdgeCase(anchorRect)
|
||||
hingeSupport(anchorRect, config.touchDismissLocation)
|
||||
if (requireReinit ) initTooltipArrow(anchorRect, anchor.layoutIsRtl, config.offsetX)
|
||||
if (requireReinit) initTooltipArrow(anchorRect, anchor.layoutIsRtl, config.offsetX)
|
||||
if (requireReadjustment) readjustTooltip(anchorRect, anchor.layoutIsRtl, config)
|
||||
|
||||
popupWindow.width = contentWidth
|
||||
popupWindow.height = contentHeight
|
||||
anchor.post { popupWindow.showAtLocation(anchor, Gravity.NO_GRAVITY, positionX, positionY)}
|
||||
anchor.post { popupWindow.showAtLocation(anchor, Gravity.NO_GRAVITY, positionX, positionY) }
|
||||
|
||||
if (config.touchDismissLocation == TouchDismissLocation.INSIDE)
|
||||
popupWindow.setOutsideTouchable(false);
|
||||
if (config.touchDismissLocation == TouchDismissLocation.INSIDE) {
|
||||
// If focusable is true, outside touchable cannot become denied.
|
||||
// https://developer.android.com/reference/android/widget/PopupWindow#setOutsideTouchable%28boolean%29
|
||||
popupWindow.isFocusable = false
|
||||
popupWindow.isOutsideTouchable = false
|
||||
}
|
||||
|
||||
// popupWindow may get dismissed by outside touch for TouchDismissLocation.ANYWHERE
|
||||
popupWindow.setOnDismissListener {
|
||||
|
@ -171,7 +189,7 @@ class Tooltip {
|
|||
ImageViewCompat.setImageTintList(arrowRightView, ColorStateList.valueOf(color))
|
||||
}
|
||||
|
||||
fun setCustomBackground(@DrawableRes drawable : Int) {
|
||||
fun setCustomBackground(@DrawableRes drawable: Int) {
|
||||
tooltipBackGround.background = ContextCompat.getDrawable(context, drawable)
|
||||
}
|
||||
|
||||
|
@ -199,7 +217,9 @@ class Tooltip {
|
|||
positionX = anchorCenter - contentWidth / 2 + offsetX
|
||||
|
||||
// Duo Second Screen Support
|
||||
val secondScreen = anchorCenter > displayWidth && context.activity?.let { DuoSupportUtils.isDeviceSurfaceDuo(it) } ?: false
|
||||
val secondScreen = anchorCenter > displayWidth && context.activity?.let {
|
||||
DuoSupportUtils.isDeviceSurfaceDuo(it)
|
||||
} ?: false
|
||||
if (secondScreen) positionX -= displayWidth + DuoSupportUtils.DUO_HINGE_WIDTH
|
||||
|
||||
// Navigation Bar in Nougat+ can appear on the left on phones at 270 rotation and adds
|
||||
|
@ -213,14 +233,17 @@ class Tooltip {
|
|||
}
|
||||
|
||||
// We manually convert position x for Rtl as the space inside the popup window places the 0 on the right
|
||||
private fun resetPositionXForRtl(): Float = contentWidth + positionX.toFloat()- context.displaySize.x.toFloat()
|
||||
private fun resetPositionXForRtl(): Float =
|
||||
contentWidth + positionX.toFloat() - context.displaySize.x.toFloat()
|
||||
|
||||
private fun setPositionY(anchor: Rect, offsetY: Int, dismissLocation: TouchDismissLocation) {
|
||||
positionY = anchor.bottom
|
||||
|
||||
// Duo Second Screen Support
|
||||
val secondScreen = anchor.bottom > displayHeight && context.activity?.let { DuoSupportUtils.isDeviceSurfaceDuo(it) } ?: false
|
||||
if(secondScreen) positionY -= displayHeight + DuoSupportUtils.DUO_HINGE_WIDTH
|
||||
val secondScreen = anchor.bottom > displayHeight && context.activity?.let {
|
||||
DuoSupportUtils.isDeviceSurfaceDuo(it)
|
||||
} ?: false
|
||||
if (secondScreen) positionY -= displayHeight + DuoSupportUtils.DUO_HINGE_WIDTH
|
||||
|
||||
isAboveAnchor = context.activity?.let {
|
||||
if (DuoSupportUtils.isDeviceSurfaceDuo(it)) positionY + contentHeight + margin > displayHeight
|
||||
|
@ -228,7 +251,7 @@ class Tooltip {
|
|||
} ?: false
|
||||
if (isAboveAnchor) {
|
||||
positionY = anchor.top - contentHeight - offsetY
|
||||
if(secondScreen) positionY -= displayHeight + DuoSupportUtils.DUO_HINGE_WIDTH
|
||||
if (secondScreen) positionY -= displayHeight + DuoSupportUtils.DUO_HINGE_WIDTH
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -237,7 +260,10 @@ class Tooltip {
|
|||
contentFrame.setOnClickListener { dismiss() }
|
||||
|
||||
ViewCompat.setAccessibilityDelegate(contentFrame, object : AccessibilityDelegateCompat() {
|
||||
override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfoCompat) {
|
||||
override fun onInitializeAccessibilityNodeInfo(
|
||||
host: View,
|
||||
info: AccessibilityNodeInfoCompat
|
||||
) {
|
||||
super.onInitializeAccessibilityNodeInfo(host, info)
|
||||
val clickAction = AccessibilityNodeInfoCompat.AccessibilityActionCompat(
|
||||
AccessibilityNodeInfoCompat.ACTION_CLICK,
|
||||
|
@ -259,14 +285,17 @@ class Tooltip {
|
|||
|
||||
toolTipArrow.visibility = View.VISIBLE
|
||||
|
||||
val tooltipArrowWidth = context.resources.getDimensionPixelSize(R.dimen.fluentui_tooltip_arrow_height)
|
||||
val tooltipArrowWidth =
|
||||
context.resources.getDimensionPixelSize(R.dimen.fluentui_tooltip_arrow_height)
|
||||
|
||||
// In RTL scenario "x" axis is still left to right with 0 being at the left most edge of the display.
|
||||
// The offset calculation places the tooltip arrow in the correct position in reference to its anchor.
|
||||
val layoutParams = toolTipArrow.layoutParams as LinearLayout.LayoutParams
|
||||
val cornerRadius = context.resources.getDimensionPixelSize(R.dimen.fluentui_tooltip_radius)
|
||||
if(!isSideAnchor){ // Normal Top/Bottom arrow
|
||||
val anchorCenterX = if (anchorRect.centerX() > displayWidth && context.activity?.let { DuoSupportUtils.isDeviceSurfaceDuo(it) } ?: false ) anchorRect.centerX() - displayWidth - DuoSupportUtils.DUO_HINGE_WIDTH
|
||||
if (!isSideAnchor) { // Normal Top/Bottom arrow
|
||||
val anchorCenterX = if (anchorRect.centerX() > displayWidth && context.activity?.let {
|
||||
DuoSupportUtils.isDeviceSurfaceDuo(it)
|
||||
} == true) anchorRect.centerX() - displayWidth - DuoSupportUtils.DUO_HINGE_WIDTH
|
||||
else anchorRect.centerX()
|
||||
|
||||
val offset = if (isRTL)
|
||||
|
@ -275,13 +304,14 @@ class Tooltip {
|
|||
(anchorCenterX - positionX - tooltipArrowWidth)
|
||||
layoutParams.gravity = Gravity.START
|
||||
layoutParams.marginStart = offset + offsetX
|
||||
}
|
||||
else{// Edge Case Left/Right arrow
|
||||
} else {// Edge Case Left/Right arrow
|
||||
layoutParams.gravity = Gravity.TOP
|
||||
var topMargin = anchorRect.centerY() - positionY - tooltipArrowWidth
|
||||
val secondScreen = anchorRect.top > displayHeight && context.activity?.let { DuoSupportUtils.isDeviceSurfaceDuo(it) } ?: false
|
||||
val secondScreen = anchorRect.top > displayHeight && context.activity?.let {
|
||||
DuoSupportUtils.isDeviceSurfaceDuo(it)
|
||||
} ?: false
|
||||
topMargin -= if (secondScreen) displayHeight else 0
|
||||
if(positionY + contentHeight >= displayHeight) topMargin -= cornerRadius
|
||||
if (positionY + contentHeight >= displayHeight) topMargin -= cornerRadius
|
||||
layoutParams.topMargin = topMargin
|
||||
}
|
||||
}
|
||||
|
@ -292,18 +322,24 @@ class Tooltip {
|
|||
isAboveAnchor = false // Enables left arrow
|
||||
|
||||
val layoutParams = toolTipArrow.layoutParams as LinearLayout.LayoutParams
|
||||
val upArrowWidth = context.resources.getDimensionPixelSize(R.dimen.fluentui_tooltip_arrow_width)
|
||||
val upArrowWidth =
|
||||
context.resources.getDimensionPixelSize(R.dimen.fluentui_tooltip_arrow_width)
|
||||
val cornerRadius = context.resources.getDimensionPixelSize(R.dimen.fluentui_tooltip_radius)
|
||||
val startPosition = positionX + layoutParams.marginStart
|
||||
val topBarHeight = context.statusBarHeight
|
||||
val doesNotFitAboveOrBelow = (positionY < topBarHeight) || (positionY + contentHeight > displayHeight)
|
||||
val doesNotFitAboveOrBelow =
|
||||
(positionY < topBarHeight) || (positionY + contentHeight > displayHeight)
|
||||
val rightSpace = displayWidth - anchorRect.right + context.softNavBarOffsetX
|
||||
val rightEdge = ( startPosition + upArrowWidth + cornerRadius + margin - context.softNavBarOffsetX > displayWidth ) || (doesNotFitAboveOrBelow && anchorRect.left > rightSpace)
|
||||
val leftEdge = ( startPosition - cornerRadius - margin - context.softNavBarOffsetX < 0 ) || (doesNotFitAboveOrBelow && anchorRect.left < rightSpace)
|
||||
val rightEdge =
|
||||
(startPosition + upArrowWidth + cornerRadius + margin - context.softNavBarOffsetX > displayWidth) || (doesNotFitAboveOrBelow && anchorRect.left > rightSpace)
|
||||
val leftEdge =
|
||||
(startPosition - cornerRadius - margin - context.softNavBarOffsetX < 0) || (doesNotFitAboveOrBelow && anchorRect.left < rightSpace)
|
||||
|
||||
// Duo Support
|
||||
val secondScreen = anchorRect.left > displayWidth && context.activity?.let { DuoSupportUtils.isDeviceSurfaceDuo(it) } ?: false
|
||||
if (leftEdge ) { // checks if the arrow is cut by the left edge of the screen and sets positionX to the left of the anchor with proper width.
|
||||
val secondScreen = anchorRect.left > displayWidth && context.activity?.let {
|
||||
DuoSupportUtils.isDeviceSurfaceDuo(it)
|
||||
} ?: false
|
||||
if (leftEdge) { // checks if the arrow is cut by the left edge of the screen and sets positionX to the left of the anchor with proper width.
|
||||
positionX = anchorRect.right
|
||||
if (secondScreen) positionX -= displayWidth + DuoSupportUtils.DUO_HINGE_WIDTH
|
||||
}
|
||||
|
@ -314,14 +350,20 @@ class Tooltip {
|
|||
if (secondScreen) positionX -= displayWidth + DuoSupportUtils.DUO_HINGE_WIDTH
|
||||
}
|
||||
|
||||
if(leftEdge || rightEdge)
|
||||
if (leftEdge || rightEdge)
|
||||
requireReadjustment = true
|
||||
}
|
||||
|
||||
private fun hingeSupport(anchorRect: Rect, dismissLocation: TouchDismissLocation) {
|
||||
context.activity?.let {
|
||||
val upArrowWidth = context.resources.getDimensionPixelSize(R.dimen.fluentui_tooltip_arrow_width)
|
||||
val tooltipRect = Rect(positionX, positionY, positionX + contentWidth, positionY + contentHeight - upArrowWidth / 2)
|
||||
val upArrowWidth =
|
||||
context.resources.getDimensionPixelSize(R.dimen.fluentui_tooltip_arrow_width)
|
||||
val tooltipRect = Rect(
|
||||
positionX,
|
||||
positionY,
|
||||
positionX + contentWidth,
|
||||
positionY + contentHeight - upArrowWidth / 2
|
||||
)
|
||||
val anchorIntersects = DuoSupportUtils.intersectHinge(it, anchorRect)
|
||||
val tooltipIntersects = DuoSupportUtils.intersectHinge(it, tooltipRect)
|
||||
|
||||
|
@ -350,8 +392,9 @@ class Tooltip {
|
|||
}
|
||||
}
|
||||
|
||||
private fun readjustTooltip(anchorRect: Rect, isRTL: Boolean, config: Config){
|
||||
val upArrowWidth = context.resources.getDimensionPixelSize(R.dimen.fluentui_tooltip_arrow_width)
|
||||
private fun readjustTooltip(anchorRect: Rect, isRTL: Boolean, config: Config) {
|
||||
val upArrowWidth =
|
||||
context.resources.getDimensionPixelSize(R.dimen.fluentui_tooltip_arrow_width)
|
||||
val cornerRadius = context.resources.getDimensionPixelSize(R.dimen.fluentui_tooltip_radius)
|
||||
val topBarHeight = context.activity!!.supportActionBar?.height ?: 0
|
||||
|
||||
|
@ -365,7 +408,7 @@ class Tooltip {
|
|||
|
||||
positionY =
|
||||
// Sets positionY such that the tooltip is symmetric about the anchor if there is enough space above and below the anchor
|
||||
if (anchorRect.centerY() + contentHeight/2 + margin < displayHeight && anchorRect.centerY() - contentHeight / 2 - margin > topBarHeight + context.statusBarHeight)
|
||||
if (anchorRect.centerY() + contentHeight / 2 + margin < displayHeight && anchorRect.centerY() - contentHeight / 2 - margin > topBarHeight + context.statusBarHeight)
|
||||
anchorRect.centerY() - contentHeight / 2
|
||||
|
||||
// Otherwise sets positionY as the top of the anchor if enough space is available below for the content
|
||||
|
@ -375,7 +418,9 @@ class Tooltip {
|
|||
// Otherwise sets positionY such that the content ends at the bottom of anchor
|
||||
else anchorRect.bottom - contentHeight
|
||||
|
||||
val secondScreen = anchorRect.top > displayHeight && context.activity?.let { DuoSupportUtils.isDeviceSurfaceDuo(it) } ?: false
|
||||
val secondScreen = anchorRect.top > displayHeight && context.activity?.let {
|
||||
DuoSupportUtils.isDeviceSurfaceDuo(it)
|
||||
} ?: false
|
||||
positionY -= if (secondScreen) displayHeight else 0
|
||||
|
||||
// Readjusts positionY if it crosses AppBar on the top
|
||||
|
@ -385,7 +430,8 @@ class Tooltip {
|
|||
positionY -= context.statusBarHeight
|
||||
|
||||
// Readjustment for Duo hinge
|
||||
val tooltipRect = Rect(positionX, positionY, positionX + contentWidth, positionY + contentHeight)
|
||||
val tooltipRect =
|
||||
Rect(positionX, positionY, positionX + contentWidth, positionY + contentHeight)
|
||||
context.activity?.let {
|
||||
if (DuoSupportUtils.intersectHinge(it, tooltipRect)) {
|
||||
positionY = if (DuoSupportUtils.moreOnTop(it, anchorRect)) {
|
||||
|
@ -404,7 +450,11 @@ class Tooltip {
|
|||
requireReadjustment = false
|
||||
}
|
||||
|
||||
data class Config(var offsetX: Int = 0, var offsetY: Int = 0, var touchDismissLocation: TouchDismissLocation = TouchDismissLocation.ANYWHERE)
|
||||
data class Config(
|
||||
var offsetX: Int = 0,
|
||||
var offsetY: Int = 0,
|
||||
var touchDismissLocation: TouchDismissLocation = TouchDismissLocation.ANYWHERE
|
||||
)
|
||||
|
||||
interface OnDismissListener {
|
||||
fun onDismiss()
|
||||
|
|
Загрузка…
Ссылка в новой задаче