@apexnative/navigation 1.0.0-alpha.6 → 1.0.0-alpha.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ApexNavigation.podspec +2 -1
- package/CHANGELOG.md +15 -0
- package/android/CLAUDE.md +19 -10
- package/android/CORE.md +3 -2
- package/android/consumer-rules.pro +6 -0
- package/android/src/main/java/dev/apexnative/navigation/options/BottomTabOptions.kt +1 -1
- package/android/src/main/java/dev/apexnative/navigation/options/ButtonOptions.kt +1 -1
- package/android/src/main/java/dev/apexnative/navigation/options/LargeTitleOptions.kt +1 -1
- package/android/src/main/java/dev/apexnative/navigation/options/LayoutAnimation.kt +1 -1
- package/android/src/main/java/dev/apexnative/navigation/options/OptionKey.kt +18 -0
- package/android/src/main/java/dev/apexnative/navigation/options/OptionPaths.kt +91 -0
- package/android/src/main/java/dev/apexnative/navigation/options/SheetOptions.kt +7 -4
- package/android/src/main/java/dev/apexnative/navigation/options/TitleOptions.kt +2 -2
- package/android/src/main/java/dev/apexnative/navigation/options/TopBarAppearanceOptions.kt +1 -1
- package/android/src/main/java/dev/apexnative/navigation/options/TopBarOptions.kt +16 -7
- package/android/src/main/java/dev/apexnative/navigation/react/ContentHeights.kt +95 -0
- package/android/src/main/java/dev/apexnative/navigation/react/ContentMounts.kt +66 -0
- package/android/src/main/java/dev/apexnative/navigation/react/NavigationTurboModule.kt +4 -0
- package/android/src/main/java/dev/apexnative/navigation/react/OptionsCommands.kt +41 -3
- package/android/src/main/java/dev/apexnative/navigation/react/ReactView.kt +16 -1
- package/android/src/main/java/dev/apexnative/navigation/slots/SlotScreenView.kt +27 -7
- package/android/src/main/java/dev/apexnative/navigation/slots/SlotView.kt +12 -1
- package/android/src/main/java/dev/apexnative/navigation/utils/MaterialTheme.kt +5 -6
- package/android/src/main/java/dev/apexnative/navigation/utils/SystemAnimations.kt +36 -0
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/modal/ModalSheet.kt +329 -55
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/modal/ModalViews.kt +26 -5
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/modal/SheetStops.kt +60 -2
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/sidemenu/SideMenuMotion.kt +8 -2
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/stack/BackPreview.kt +32 -4
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/stack/StackController.kt +46 -7
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/stack/StackQueue.kt +15 -3
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/stack/StackViews.kt +7 -4
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/stack/fab/FabMotion.kt +142 -0
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/stack/fab/FabPresenter.kt +215 -43
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/stack/search/StackSearchPresenter.kt +25 -26
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/stack/topbar/BarRowTransition.kt +3 -2
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/stack/topbar/ButtonPlaces.kt +11 -5
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/stack/topbar/TopBarPresenter.kt +86 -39
- package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/stack/topbar/TopBarVisibility.kt +9 -2
- package/android/src/main/java/dev/apexnative/navigation/views/element/ElementTransitions.kt +124 -181
- package/android/src/main/java/dev/apexnative/navigation/views/element/TargetsWait.kt +8 -1
- package/android/src/main/java/dev/apexnative/navigation/views/element/TransitionLayer.kt +37 -112
- package/android/src/main/java/dev/apexnative/navigation/views/element/animators/ElementPictures.kt +56 -3
- package/android/src/main/java/dev/apexnative/navigation/views/element/animators/FlightGeometry.kt +170 -153
- package/android/src/main/java/dev/apexnative/navigation/views/element/animators/ImageMorph.kt +199 -0
- package/android/src/main/java/dev/apexnative/navigation/views/element/animators/SharedAnimatorFactory.kt +55 -45
- package/android/src/main/java/dev/apexnative/navigation/views/element/animators/{TextChangeAnimator.kt → TextMorph.kt} +79 -129
- package/android/src/main/java/dev/apexnative/navigation/views/element/animators/ViewMorph.kt +108 -0
- package/android/src/main/java/dev/apexnative/navigation/views/stack/fab/FabCopy.kt +85 -0
- package/android/src/main/java/dev/apexnative/navigation/views/stack/fab/FabMenu.kt +13 -0
- package/android/src/main/java/dev/apexnative/navigation/views/stack/topbar/TitleBar.kt +5 -24
- package/android/src/main/java/dev/apexnative/navigation/views/stack/topbar/TopBar.kt +51 -34
- package/android/src/main/java/dev/apexnative/navigation/views/stack/topbar/titlebar/BarButtonComponentCell.kt +6 -6
- package/android/src/main/java/dev/apexnative/navigation/views/stack/topbar/titlebar/BarButtonView.kt +113 -0
- package/android/src/main/java/dev/apexnative/navigation/views/stack/topbar/titlebar/BarMenu.kt +219 -0
- package/android/src/main/java/dev/apexnative/navigation/views/stack/topbar/titlebar/ButtonBar.kt +121 -175
- package/android/src/main/java/dev/apexnative/navigation/views/stack/topbar/titlebar/ButtonMenus.kt +34 -64
- package/android/src/main/java/dev/apexnative/navigation/views/stack/topbar/titlebar/ButtonRow.kt +216 -0
- package/android/src/main/jni/ANNContentHeights.cpp +82 -0
- package/android/src/main/res/drawable/apex_navigation_ic_arrow_right.xml +14 -0
- package/android/src/main/res/layout/apex_navigation_menu_header.xml +19 -0
- package/android/src/main/res/layout/apex_navigation_menu_item.xml +68 -0
- package/android/src/main/res/values/styles.xml +1 -1
- package/android/src/main/res/values-night/styles.xml +1 -1
- package/cli/doctor/checks/app.js +16 -1
- package/cli/project.js +4 -0
- package/cli/setup/index.js +5 -0
- package/cli/setup/steps/metro.js +46 -0
- package/docs-md/architecture/native-screens.md +4 -0
- package/docs-md/architecture/theme-and-context.md +131 -12
- package/docs-md/architecture/transitions.md +43 -4
- package/docs-md/flows/bottom-sheets.md +4 -2
- package/docs-md/fundamentals/screens-and-props.md +9 -1
- package/docs-md/guides/cli.md +3 -1
- package/docs-md/help/troubleshooting.md +1 -1
- package/docs-md/index.json +29 -1
- package/docs-md/screen-ui/back-and-gestures.md +3 -1
- package/docs-md/screen-ui/bar-buttons.md +1 -1
- package/docs-md/screen-ui/toolbar-and-fab.md +2 -0
- package/docs-md/start/installation.md +16 -1
- package/ios/Animations/ANNFrameDriver.h +55 -15
- package/ios/Animations/ANNFrameDriver.mm +214 -60
- package/ios/Animations/ANNTransitionAnimator.h +26 -5
- package/ios/Animations/ANNTransitionAnimator.mm +49 -3
- package/ios/Animations/ANNTransitionPlan.h +2 -2
- package/ios/Animations/ANNTransitionPlan.mm +10 -0
- package/ios/Animations/Elements/ANNElementFinder.h +2 -2
- package/ios/Animations/Elements/ANNElementFinder.mm +2 -2
- package/ios/Animations/Elements/ANNElementTransition.h +3 -3
- package/ios/Animations/Elements/ANNElementTransition.mm +2 -2
- package/ios/Animations/Elements/ANNSharedElementFlight.h +3 -3
- package/ios/Animations/Elements/ANNSharedElementFlight.mm +181 -43
- package/ios/Animations/Interpolators/ANNViewTracks.h +6 -5
- package/ios/Animations/Interpolators/ANNViewTracks.mm +51 -21
- package/ios/CLAUDE.md +19 -8
- package/ios/CORE.md +1 -1
- package/ios/Core/ANNAppDelegate.mm +0 -2
- package/ios/Core/ANNDeepLinkQueue.h +6 -5
- package/ios/Core/ANNDeepLinkQueue.mm +22 -10
- package/ios/Core/ANNSceneDelegate.mm +2 -2
- package/ios/Core/ANNUtils.h +7 -0
- package/ios/Core/ANNUtils.mm +10 -0
- package/ios/Core/ApexNavigation.mm +6 -2
- package/ios/Layouts/Overlay/ANNOverlayCoordinator.mm +1 -7
- package/ios/Layouts/Root/ANNRootCoordinator.mm +45 -15
- package/ios/Layouts/Screen/ANNComponentViewController.mm +4 -1
- package/ios/Layouts/Stack/ANNStackAnimatingDelegate.h +11 -2
- package/ios/Layouts/Stack/ANNStackAnimatingDelegate.mm +14 -7
- package/ios/Layouts/Stack/ANNStackController.h +8 -0
- package/ios/Layouts/Stack/ANNStackController.mm +153 -11
- package/ios/Layouts/Stack/ANNSwipePopInteraction.h +26 -0
- package/ios/Layouts/Stack/ANNSwipePopInteraction.mm +185 -0
- package/ios/Layouts/Stack/InteractivePopGestureDelegate.mm +28 -4
- package/ios/Layouts/Tabs/ANNTabsPreloadWindow.mm +2 -4
- package/ios/Options/ANNAnimationOptions.h +2 -1
- package/ios/Options/ANNAnimationOptions.mm +1 -1
- package/ios/Options/ANNOptions.h +7 -0
- package/ios/Options/ANNOptions.mm +45 -0
- package/ios/Options/ANNOptionsReader.mm +2 -4
- package/ios/Options/ANNStackPopAnimationOptions.h +13 -0
- package/ios/Options/ANNStackPopAnimationOptions.mm +11 -0
- package/ios/Options/Params/ColorParser.h +4 -3
- package/ios/Options/Params/ColorParser.mm +22 -4
- package/ios/React/ANNSurfaceHostingView.h +8 -0
- package/ios/React/ANNSurfaceHostingView.mm +28 -1
- package/ios/React/Slots/ANNSlotHost.mm +1 -3
- package/ios/React/Slots/ANNSlotScreenView.mm +8 -2
- package/ios/TurboModules/ANNTurboModule.mm +46 -0
- package/ios/cpp/react/renderer/components/ApexNavigationSpec/ANNSlotState.cpp +20 -0
- package/ios/cpp/react/renderer/components/ApexNavigationSpec/ANNSlotState.h +5 -14
- package/lib/module/ARCHITECTURE.md +9 -3
- package/lib/module/adapters/NativeANNTurboModule.js.map +1 -1
- package/lib/module/api/app/AppRegistry.js +14 -2
- package/lib/module/api/app/AppRegistry.js.map +1 -1
- package/lib/module/api/app/createNavigation.js +188 -66
- package/lib/module/api/app/createNavigation.js.map +1 -1
- package/lib/module/api/events/navigationEvents.js +6 -2
- package/lib/module/api/events/navigationEvents.js.map +1 -1
- package/lib/module/api/linking/linking.js +11 -0
- package/lib/module/api/linking/linking.js.map +1 -1
- package/lib/module/api/screens/defineScreen.js +45 -3
- package/lib/module/api/screens/defineScreen.js.map +1 -1
- package/lib/module/api/screens/nativeScreens.js +31 -6
- package/lib/module/api/screens/nativeScreens.js.map +1 -1
- package/lib/module/api/screens/registerScreens.js +193 -35
- package/lib/module/api/screens/registerScreens.js.map +1 -1
- package/lib/module/api/theme/theme.js +5 -0
- package/lib/module/api/theme/theme.js.map +1 -1
- package/lib/module/engine/commands.js +21 -1
- package/lib/module/engine/commands.js.map +1 -1
- package/lib/module/engine/layout.js +7 -2
- package/lib/module/engine/layout.js.map +1 -1
- package/lib/module/engine/nativeScreens.js +9 -0
- package/lib/module/engine/nativeScreens.js.map +1 -1
- package/lib/module/engine/options.js +5 -4
- package/lib/module/engine/options.js.map +1 -1
- package/lib/module/engine/optionsChange.js +102 -0
- package/lib/module/engine/optionsChange.js.map +1 -0
- package/lib/module/engine/refresh.js +85 -0
- package/lib/module/engine/refresh.js.map +1 -0
- package/lib/module/engine/rememberedOptions.js +60 -0
- package/lib/module/engine/rememberedOptions.js.map +1 -1
- package/lib/module/engine/screens.js +26 -0
- package/lib/module/engine/screens.js.map +1 -1
- package/lib/typescript/adapters/NativeANNTurboModule.d.ts +7 -0
- package/lib/typescript/adapters/NativeANNTurboModule.d.ts.map +1 -1
- package/lib/typescript/api/app/AppRegistry.d.ts.map +1 -1
- package/lib/typescript/api/app/createNavigation.d.ts +5 -0
- package/lib/typescript/api/app/createNavigation.d.ts.map +1 -1
- package/lib/typescript/api/events/navigationEvents.d.ts +2 -2
- package/lib/typescript/api/events/navigationEvents.d.ts.map +1 -1
- package/lib/typescript/api/index.d.ts +1 -1
- package/lib/typescript/api/index.d.ts.map +1 -1
- package/lib/typescript/api/linking/linking.d.ts +8 -0
- package/lib/typescript/api/linking/linking.d.ts.map +1 -1
- package/lib/typescript/api/screens/defineScreen.d.ts +23 -4
- package/lib/typescript/api/screens/defineScreen.d.ts.map +1 -1
- package/lib/typescript/api/screens/nativeScreens.d.ts +8 -1
- package/lib/typescript/api/screens/nativeScreens.d.ts.map +1 -1
- package/lib/typescript/api/screens/registerScreens.d.ts.map +1 -1
- package/lib/typescript/api/theme/theme.d.ts +2 -0
- package/lib/typescript/api/theme/theme.d.ts.map +1 -1
- package/lib/typescript/engine/commands.d.ts +5 -0
- package/lib/typescript/engine/commands.d.ts.map +1 -1
- package/lib/typescript/engine/layout.d.ts.map +1 -1
- package/lib/typescript/engine/nativeScreens.d.ts +5 -0
- package/lib/typescript/engine/nativeScreens.d.ts.map +1 -1
- package/lib/typescript/engine/optionsChange.d.ts +28 -0
- package/lib/typescript/engine/optionsChange.d.ts.map +1 -0
- package/lib/typescript/engine/refresh.d.ts +35 -0
- package/lib/typescript/engine/refresh.d.ts.map +1 -0
- package/lib/typescript/engine/rememberedOptions.d.ts +13 -0
- package/lib/typescript/engine/rememberedOptions.d.ts.map +1 -1
- package/lib/typescript/engine/screens.d.ts +7 -0
- package/lib/typescript/engine/screens.d.ts.map +1 -1
- package/lib/typescript/interfaces/ComponentEvents.d.ts +2 -2
- package/lib/typescript/interfaces/options/animations.d.ts +40 -15
- package/lib/typescript/interfaces/options/animations.d.ts.map +1 -1
- package/lib/typescript/interfaces/options/bottomTabs.d.ts +2 -2
- package/lib/typescript/interfaces/options/buttons.d.ts +2 -2
- package/lib/typescript/interfaces/options/modals.d.ts +6 -7
- package/lib/typescript/interfaces/options/modals.d.ts.map +1 -1
- package/lib/typescript/interfaces/options/stack.d.ts +8 -3
- package/lib/typescript/interfaces/options/stack.d.ts.map +1 -1
- package/lib/typescript/interfaces/options/topBar.d.ts +14 -0
- package/lib/typescript/interfaces/options/topBar.d.ts.map +1 -1
- package/metro/acceptPlugin.js +57 -0
- package/metro/babelTransformer.js +45 -0
- package/metro/index.js +36 -0
- package/package.json +3 -1
- package/src/ARCHITECTURE.md +9 -3
- package/src/adapters/NativeANNTurboModule.ts +7 -0
- package/src/api/app/AppRegistry.ts +16 -2
- package/src/api/app/createNavigation.ts +198 -66
- package/src/api/events/navigationEvents.ts +9 -3
- package/src/api/index.ts +1 -0
- package/src/api/linking/linking.ts +22 -1
- package/src/api/screens/defineScreen.ts +49 -5
- package/src/api/screens/nativeScreens.ts +40 -4
- package/src/api/screens/registerScreens.tsx +185 -42
- package/src/api/theme/theme.ts +5 -0
- package/src/engine/commands.ts +21 -0
- package/src/engine/layout.ts +11 -2
- package/src/engine/nativeScreens.ts +10 -1
- package/src/engine/options.ts +6 -8
- package/src/engine/optionsChange.ts +107 -0
- package/src/engine/refresh.ts +97 -0
- package/src/engine/rememberedOptions.ts +70 -0
- package/src/engine/screens.tsx +24 -0
- package/src/interfaces/ComponentEvents.ts +2 -2
- package/src/interfaces/options/animations.ts +40 -15
- package/src/interfaces/options/bottomTabs.ts +2 -2
- package/src/interfaces/options/buttons.ts +2 -2
- package/src/interfaces/options/modals.ts +6 -7
- package/src/interfaces/options/stack.ts +8 -3
- package/src/interfaces/options/topBar.ts +14 -0
- package/android/src/main/java/dev/apexnative/navigation/views/element/ElementStub.kt +0 -31
- package/android/src/main/java/dev/apexnative/navigation/views/element/animators/ImageMatrixAnimator.kt +0 -134
- package/android/src/main/java/dev/apexnative/navigation/views/element/animators/PlainViewAnimator.kt +0 -78
- package/android/src/main/java/dev/apexnative/navigation/views/element/animators/PropertyAnimatorCreator.kt +0 -33
- package/android/src/main/java/dev/apexnative/navigation/views/element/animators/ReactImageAnimator.kt +0 -57
- package/android/src/main/java/dev/apexnative/navigation/views/element/animators/ViewChangeAnimator.kt +0 -146
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
package dev.apexnative.navigation.views.element.animators
|
|
2
|
+
|
|
3
|
+
import android.graphics.Canvas
|
|
4
|
+
import android.graphics.Paint
|
|
5
|
+
import android.graphics.Picture
|
|
6
|
+
import android.graphics.PorterDuff
|
|
7
|
+
import android.graphics.PorterDuffXfermode
|
|
8
|
+
import android.graphics.RectF
|
|
9
|
+
import android.view.View
|
|
10
|
+
import dev.apexnative.navigation.utils.borderRadius
|
|
11
|
+
import kotlin.math.roundToInt
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* A shared view moves as two pictures of itself, as on iOS: of the view that goes away and of the one that comes, each
|
|
15
|
+
* with its children. The copy goes from where the one is drawn — its center, its size at the scale it is drawn at, its
|
|
16
|
+
* angle and corner radius — to where the other is drawn in its screen ([FlightGeometry]), the angle along the shorter
|
|
17
|
+
* arc; both pictures fill it, and the picture of the destination shows over the other on the way. Where a parent cuts
|
|
18
|
+
* a view (`overflow: hidden`, a scroll view, the screen's edge), only the part that shows flies, the mask going from
|
|
19
|
+
* one end's part to the other's ([FlightMask]), as on iOS. The pictures are drawing commands, taken before the views
|
|
20
|
+
* hide: an avatar's letter grows sharp, and what changes in the views meanwhile shows when they are back.
|
|
21
|
+
*/
|
|
22
|
+
internal class ViewMorph private constructor(
|
|
23
|
+
private val start: ViewPicture,
|
|
24
|
+
private val end: ViewPicture,
|
|
25
|
+
) : FlightPicture() {
|
|
26
|
+
private val flight = FlightGeometry(start.end, end.end)
|
|
27
|
+
private val cut = FlightMask.of(start.visible, end.visible)?.let(::MaskCut)
|
|
28
|
+
private var at = start.end
|
|
29
|
+
private var progress = 0f
|
|
30
|
+
private val rect = RectF()
|
|
31
|
+
private val maskPaint = Paint(Paint.ANTI_ALIAS_FLAG)
|
|
32
|
+
// What is drawn over the mask keeps only the mask's pixels: the corners stay smooth (a clip path on the hardware
|
|
33
|
+
// canvas is not anti-aliased).
|
|
34
|
+
private val contentPaint = Paint().apply { xfermode = PorterDuffXfermode(PorterDuff.Mode.SRC_IN) }
|
|
35
|
+
|
|
36
|
+
override fun update(time: Float, progress: Float) {
|
|
37
|
+
this.progress = progress
|
|
38
|
+
at = flight.at(progress, time)
|
|
39
|
+
cut?.update(time, progress)
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
override fun draw(canvas: Canvas) {
|
|
43
|
+
rect.set(-at.width / 2, -at.height / 2, at.width / 2, at.height / 2)
|
|
44
|
+
if (rect.isEmpty) return
|
|
45
|
+
val radius = lerp(start.radius, end.radius)
|
|
46
|
+
// The copy turns about its center, mirrored where a view is.
|
|
47
|
+
canvas.translate(at.centerX, at.centerY)
|
|
48
|
+
canvas.rotate(at.rotation)
|
|
49
|
+
canvas.scale(at.mirrorX, at.mirrorY)
|
|
50
|
+
canvas.saveLayer(rect, null)
|
|
51
|
+
canvas.drawRoundRect(rect, radius, radius, maskPaint)
|
|
52
|
+
cut?.draw(canvas, rect)
|
|
53
|
+
canvas.saveLayer(rect, contentPaint)
|
|
54
|
+
draw(canvas, start, start.alpha)
|
|
55
|
+
draw(canvas, end, end.alpha * progress)
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
// A picture fills the copy, as on iOS.
|
|
59
|
+
private fun draw(canvas: Canvas, view: ViewPicture, shown: Float) {
|
|
60
|
+
val alpha = (shown * 255).roundToInt().coerceIn(0, 255)
|
|
61
|
+
if (alpha == 0) return
|
|
62
|
+
val width = view.picture.width.toFloat()
|
|
63
|
+
val height = view.picture.height.toFloat()
|
|
64
|
+
val count = canvas.save()
|
|
65
|
+
canvas.translate(rect.left, rect.top)
|
|
66
|
+
canvas.scale(rect.width() / width, rect.height() / height)
|
|
67
|
+
// The picture fades as a whole: its children and background don't show through each other.
|
|
68
|
+
if (alpha < 255) canvas.saveLayerAlpha(0f, 0f, width, height, alpha)
|
|
69
|
+
canvas.drawPicture(view.picture)
|
|
70
|
+
canvas.restoreToCount(count)
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
private fun lerp(from: Float, to: Float) = from + (to - from) * progress
|
|
74
|
+
|
|
75
|
+
companion object {
|
|
76
|
+
/**
|
|
77
|
+
* The morph of [from] into [to] in [layer], each cut by its parents up to the view of its screen ([fromRoot],
|
|
78
|
+
* [toRoot]); none when a picture of either can't be taken.
|
|
79
|
+
*/
|
|
80
|
+
fun of(from: View, to: View, fromRoot: View?, toRoot: View?, layer: View): ViewMorph? {
|
|
81
|
+
val start = ViewPicture.of(from, LayerPlace.of(from, layer, fromRoot)) ?: return null
|
|
82
|
+
val end = ViewPicture.of(to, LayerPlace.of(to, layer, toRoot)) ?: return null
|
|
83
|
+
return ViewMorph(start, end)
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
// A view's picture, where it is drawn in the transition layer, its corner radius there, its opacity and the part of it
|
|
89
|
+
// that shows.
|
|
90
|
+
private class ViewPicture(
|
|
91
|
+
val picture: Picture,
|
|
92
|
+
val end: FlightEnd,
|
|
93
|
+
val radius: Float,
|
|
94
|
+
val alpha: Float,
|
|
95
|
+
val visible: VisiblePart,
|
|
96
|
+
) {
|
|
97
|
+
companion object {
|
|
98
|
+
fun of(view: View, place: LayerPlace): ViewPicture? {
|
|
99
|
+
if (view.width <= 0 || view.height <= 0) return null
|
|
100
|
+
val picture = recordPicture(view) ?: return null
|
|
101
|
+
val end = place.end(view.width, view.height)
|
|
102
|
+
val radius = view.borderRadius
|
|
103
|
+
return ViewPicture(
|
|
104
|
+
picture, end, radius * end.scale, view.alpha, place.visible(view.width, view.height, radius),
|
|
105
|
+
)
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
package dev.apexnative.navigation.views.stack.fab
|
|
2
|
+
|
|
3
|
+
import android.annotation.SuppressLint
|
|
4
|
+
import android.content.Context
|
|
5
|
+
import android.graphics.Canvas
|
|
6
|
+
import android.graphics.Outline
|
|
7
|
+
import android.graphics.Picture
|
|
8
|
+
import android.os.Build
|
|
9
|
+
import android.view.Gravity
|
|
10
|
+
import android.view.View
|
|
11
|
+
import android.view.ViewGroup
|
|
12
|
+
import android.view.ViewOutlineProvider
|
|
13
|
+
import androidx.coordinatorlayout.widget.CoordinatorLayout
|
|
14
|
+
import dev.apexnative.navigation.views.element.animators.recordPicture
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* The picture of a FAB that leaves with its screen while the new top's FAB arrives: drawn as the button was, with the
|
|
18
|
+
* shadow of its shape, taking no touches and hidden from accessibility. The live button goes from its parent at once.
|
|
19
|
+
*/
|
|
20
|
+
@SuppressLint("ViewConstructor")
|
|
21
|
+
internal class FabCopy private constructor(
|
|
22
|
+
context: Context,
|
|
23
|
+
private val picture: Picture,
|
|
24
|
+
shape: Outline,
|
|
25
|
+
) : View(context) {
|
|
26
|
+
init {
|
|
27
|
+
importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
|
|
28
|
+
outlineProvider = object : ViewOutlineProvider() {
|
|
29
|
+
override fun getOutline(view: View, outline: Outline) = outline.set(shape)
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
override fun onDraw(canvas: Canvas) {
|
|
34
|
+
canvas.drawPicture(picture)
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
companion object {
|
|
38
|
+
/**
|
|
39
|
+
* A copy of [button] in [container], a child of [parent] (the button itself, or its menu), as it shows now: in
|
|
40
|
+
* its place in [parent], moved, scaled and faded as it is. None when it doesn't show or can't be recorded (a
|
|
41
|
+
* hardware bitmap in its icon before Android 9).
|
|
42
|
+
*/
|
|
43
|
+
fun of(button: View, container: View, parent: ViewGroup): FabCopy? {
|
|
44
|
+
if (container.parent !== parent || !button.isAttachedToWindow) return null
|
|
45
|
+
if (button.width <= 0 || button.height <= 0) return null
|
|
46
|
+
if (container.visibility != VISIBLE || button.visibility != VISIBLE) return null
|
|
47
|
+
val inner = button !== container
|
|
48
|
+
val alpha = container.alpha * if (inner) button.alpha else 1f
|
|
49
|
+
val scale = container.scaleX * if (inner) button.scaleX else 1f
|
|
50
|
+
if (alpha <= 0f || scale <= 0f) return null
|
|
51
|
+
val picture = recordPicture(button) ?: return null
|
|
52
|
+
val shape = Outline().apply {
|
|
53
|
+
// As the view counts its own outline: opaque unless the provider says otherwise.
|
|
54
|
+
this.alpha = 1f
|
|
55
|
+
button.outlineProvider?.getOutline(button, this)
|
|
56
|
+
}
|
|
57
|
+
val copy = FabCopy(button.context, picture, shape)
|
|
58
|
+
val left = container.left + if (inner) button.left else 0
|
|
59
|
+
val top = container.top + if (inner) button.top else 0
|
|
60
|
+
copy.translationX = container.translationX + if (inner) button.translationX else 0f
|
|
61
|
+
copy.translationY = container.translationY + if (inner) button.translationY else 0f
|
|
62
|
+
copy.scaleX = scale
|
|
63
|
+
copy.scaleY = scale
|
|
64
|
+
copy.alpha = alpha
|
|
65
|
+
copy.elevation = button.elevation
|
|
66
|
+
copy.translationZ = button.translationZ
|
|
67
|
+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
|
|
68
|
+
copy.outlineAmbientShadowColor = button.outlineAmbientShadowColor
|
|
69
|
+
copy.outlineSpotShadowColor = button.outlineSpotShadowColor
|
|
70
|
+
}
|
|
71
|
+
parent.addView(copy, CoordinatorLayout.LayoutParams(button.width, button.height).apply {
|
|
72
|
+
gravity = Gravity.TOP or Gravity.LEFT
|
|
73
|
+
leftMargin = left
|
|
74
|
+
topMargin = top
|
|
75
|
+
})
|
|
76
|
+
// In its place before the next layout, so its first frame draws.
|
|
77
|
+
copy.measure(
|
|
78
|
+
MeasureSpec.makeMeasureSpec(button.width, MeasureSpec.EXACTLY),
|
|
79
|
+
MeasureSpec.makeMeasureSpec(button.height, MeasureSpec.EXACTLY),
|
|
80
|
+
)
|
|
81
|
+
copy.layout(left, top, left + button.width, top + button.height)
|
|
82
|
+
return copy
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
@@ -120,6 +120,19 @@ class FabMenu(context: Context, val fabId: String) : LinearLayout(context), FabA
|
|
|
120
120
|
(view.parent as? ViewGroup)?.removeView(view)
|
|
121
121
|
}
|
|
122
122
|
|
|
123
|
+
/**
|
|
124
|
+
* The menu closes and leaves its parent next: a scrim that shows fades out by itself and goes from the parent at
|
|
125
|
+
* the end of its fade, which the menu no longer owns; it takes no touches meanwhile, which belong to the new screen.
|
|
126
|
+
*/
|
|
127
|
+
fun closeToLeave() {
|
|
128
|
+
close()
|
|
129
|
+
scrim?.apply {
|
|
130
|
+
setOnClickListener(null)
|
|
131
|
+
isClickable = false
|
|
132
|
+
}
|
|
133
|
+
scrim = null
|
|
134
|
+
}
|
|
135
|
+
|
|
123
136
|
override fun show() = main.show()
|
|
124
137
|
|
|
125
138
|
override fun hide() {
|
|
@@ -7,15 +7,14 @@ import android.util.TypedValue
|
|
|
7
7
|
import android.view.View
|
|
8
8
|
import android.view.ViewGroup
|
|
9
9
|
import androidx.appcompat.widget.AppCompatTextView
|
|
10
|
-
import com.google.android.material.appbar.MaterialToolbar
|
|
11
|
-
import dev.apexnative.navigation.utils.MaterialTheme
|
|
12
10
|
import dev.apexnative.navigation.utils.UiUtils
|
|
11
|
+
import dev.apexnative.navigation.views.stack.topbar.titlebar.ButtonRow
|
|
13
12
|
import kotlin.math.max
|
|
14
13
|
import kotlin.math.min
|
|
15
14
|
|
|
16
15
|
/**
|
|
17
16
|
* The row of the bar: the left buttons with the back button at the start ([leftButtonBar]), the right buttons and "⋮"
|
|
18
|
-
* at the end ([rightButtonBar]),
|
|
17
|
+
* at the end ([rightButtonBar]), each a [ButtonRow], and between them the title and the subtitle, or a React
|
|
19
18
|
* title ([titleComponent]). It lays them out in its own coordinates, so a shift of the row (`topBar.title.topMargin`)
|
|
20
19
|
* moves them all; [sideInsets] keep them off the system bars and the cutout at the sides. Right to left, everything
|
|
21
20
|
* mirrors. Main thread only.
|
|
@@ -26,10 +25,10 @@ class TitleBar(context: Context) : ViewGroup(context) {
|
|
|
26
25
|
enum class Alignment { Start, Center, Fill }
|
|
27
26
|
|
|
28
27
|
/** The back button (its navigation button) and the left buttons. */
|
|
29
|
-
val leftButtonBar =
|
|
28
|
+
val leftButtonBar = ButtonRow(context)
|
|
30
29
|
|
|
31
30
|
/** The right buttons, the search's magnifier and "⋮". */
|
|
32
|
-
val rightButtonBar =
|
|
31
|
+
val rightButtonBar = ButtonRow(context)
|
|
33
32
|
|
|
34
33
|
/** The title's text: one line, cut with "…" at its end (`topBar.title.text`). */
|
|
35
34
|
val titleView = AppCompatTextView(context).apply {
|
|
@@ -118,8 +117,6 @@ class TitleBar(context: Context) : ViewGroup(context) {
|
|
|
118
117
|
val height = MeasureSpec.getSize(heightMeasureSpec)
|
|
119
118
|
val inner = max(width - sideInsetsBox[0] - sideInsetsBox[1], 0)
|
|
120
119
|
val exactHeight = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
|
|
121
|
-
alignButtons(leftButtonBar, height)
|
|
122
|
-
alignButtons(rightButtonBar, height)
|
|
123
120
|
leftButtonBar.measure(MeasureSpec.makeMeasureSpec(inner, MeasureSpec.AT_MOST), exactHeight)
|
|
124
121
|
val rightRoom = max(inner - leftButtonBar.measuredWidth, 0)
|
|
125
122
|
rightButtonBar.measure(MeasureSpec.makeMeasureSpec(rightRoom, MeasureSpec.AT_MOST), exactHeight)
|
|
@@ -154,7 +151,7 @@ class TitleBar(context: Context) : ViewGroup(context) {
|
|
|
154
151
|
view.layout(x, top, x + w, top + view.measuredHeight)
|
|
155
152
|
}
|
|
156
153
|
// The back button and the left buttons at the start of the line, the right buttons at its end: right to left
|
|
157
|
-
// the whole row mirrors, and each
|
|
154
|
+
// the whole row mirrors, and each side mirrors what it holds.
|
|
158
155
|
val startBar = leftButtonBar.measuredWidth
|
|
159
156
|
val endBar = rightButtonBar.measuredWidth
|
|
160
157
|
place(leftButtonBar, 0, 0)
|
|
@@ -194,22 +191,6 @@ class TitleBar(context: Context) : ViewGroup(context) {
|
|
|
194
191
|
return min(max(middle, startBar), max(inner - endBar - width, startBar))
|
|
195
192
|
}
|
|
196
193
|
|
|
197
|
-
// A toolbar stands its back button and its menu at the top of its minimum height, centered in it (`buttonGravity`
|
|
198
|
-
// is top): with the row's height as that minimum, they stand in the middle of the row, as the title does.
|
|
199
|
-
private fun alignButtons(toolbar: MaterialToolbar, height: Int) {
|
|
200
|
-
if (toolbar.minimumHeight != height) toolbar.minimumHeight = height
|
|
201
|
-
}
|
|
202
|
-
|
|
203
|
-
// A toolbar that holds only buttons: no insets of its own around them (the row places them).
|
|
204
|
-
private fun plain(toolbar: MaterialToolbar) {
|
|
205
|
-
// Before the toolbar makes its menu, which takes the popup theme once: "⋮" in the current mode.
|
|
206
|
-
toolbar.popupTheme = MaterialTheme.popupTheme(toolbar.context)
|
|
207
|
-
toolbar.setContentInsetsRelative(0, 0)
|
|
208
|
-
toolbar.contentInsetStartWithNavigation = 0
|
|
209
|
-
toolbar.contentInsetEndWithActions = 0
|
|
210
|
-
toolbar.setPadding(0, 0, 0, 0)
|
|
211
|
-
}
|
|
212
|
-
|
|
213
194
|
private companion object {
|
|
214
195
|
const val GAP_DP = 16
|
|
215
196
|
const val TITLE_SIZE_SP = 22f
|
|
@@ -2,11 +2,12 @@ package dev.apexnative.navigation.views.stack.topbar
|
|
|
2
2
|
|
|
3
3
|
import android.annotation.SuppressLint
|
|
4
4
|
import android.content.Context
|
|
5
|
-
import android.graphics.Bitmap
|
|
6
5
|
import android.graphics.Canvas
|
|
7
6
|
import android.graphics.Color
|
|
7
|
+
import android.graphics.Picture
|
|
8
8
|
import android.graphics.Rect
|
|
9
9
|
import android.graphics.drawable.ColorDrawable
|
|
10
|
+
import android.graphics.drawable.PictureDrawable
|
|
10
11
|
import android.os.Build
|
|
11
12
|
import android.view.ContextThemeWrapper
|
|
12
13
|
import android.view.Gravity
|
|
@@ -16,10 +17,11 @@ import android.view.ViewGroup
|
|
|
16
17
|
import android.widget.FrameLayout
|
|
17
18
|
import android.widget.ImageView
|
|
18
19
|
import android.widget.LinearLayout
|
|
19
|
-
import
|
|
20
|
+
import androidx.appcompat.widget.AppCompatImageView
|
|
20
21
|
import dev.apexnative.navigation.R
|
|
21
22
|
import dev.apexnative.navigation.utils.MaterialTheme
|
|
22
23
|
import dev.apexnative.navigation.utils.UiUtils
|
|
24
|
+
import dev.apexnative.navigation.views.stack.topbar.titlebar.ButtonRow
|
|
23
25
|
|
|
24
26
|
/**
|
|
25
27
|
* The top bar of a stack: one per stack, showing what its screen on top sets. Top to bottom: the strip under the status
|
|
@@ -47,7 +49,7 @@ class TopBar(context: Context) : FrameLayout(themed(context)) {
|
|
|
47
49
|
private val largeTitleHolder = FrameLayout(this.context)
|
|
48
50
|
private val searchHolder = FrameLayout(this.context)
|
|
49
51
|
private val border = View(this.context)
|
|
50
|
-
private val snapshot =
|
|
52
|
+
private val snapshot = Snapshot(this.context)
|
|
51
53
|
private var searchArea: View? = null
|
|
52
54
|
private var barHeight = UiUtils.dpToPx(this.context, DEFAULT_HEIGHT_DP)
|
|
53
55
|
private var searchTakesBar = false
|
|
@@ -58,12 +60,12 @@ class TopBar(context: Context) : FrameLayout(themed(context)) {
|
|
|
58
60
|
// `topBar.elevation`, in pixels: the bar's elevation unless it is flat.
|
|
59
61
|
private var shadow = 0f
|
|
60
62
|
|
|
61
|
-
/** The
|
|
62
|
-
val rightButtonBar:
|
|
63
|
+
/** The right buttons, the search's magnifier and "⋮". */
|
|
64
|
+
val rightButtonBar: ButtonRow
|
|
63
65
|
get() = titleBar.rightButtonBar
|
|
64
66
|
|
|
65
|
-
/** The
|
|
66
|
-
val leftButtonBar:
|
|
67
|
+
/** The back button and the left buttons. */
|
|
68
|
+
val leftButtonBar: ButtonRow
|
|
67
69
|
get() = titleBar.leftButtonBar
|
|
68
70
|
|
|
69
71
|
/** The strip under the status bar at the top of the bar, in pixels: the bar is under the status bar. */
|
|
@@ -305,32 +307,27 @@ class TopBar(context: Context) : FrameLayout(themed(context)) {
|
|
|
305
307
|
layoutParams = params
|
|
306
308
|
}
|
|
307
309
|
|
|
308
|
-
// The row's picture in a transition.
|
|
310
|
+
// The row's picture in a transition: the drawing commands of the row as it is, not its pixels. Nothing as large
|
|
311
|
+
// as the bar is allocated or filled in on the main thread, and the renderer plays the commands each frame.
|
|
309
312
|
|
|
310
313
|
/**
|
|
311
|
-
* Lays a picture of the row and the large title over them, laid out at once; false when the bar can't be
|
|
312
|
-
*
|
|
314
|
+
* Lays a picture of the row and the large title over them, laid out at once; false when the bar can't be recorded:
|
|
315
|
+
* no picture then.
|
|
313
316
|
*/
|
|
314
317
|
fun takeRowSnapshot(withLargeTitle: Boolean = true): Boolean {
|
|
315
318
|
val width = rowArea.width
|
|
316
319
|
val large = withLargeTitle && isLargeTitleShown
|
|
317
320
|
val height = rowArea.height + if (large) largeTitleHolder.height else 0
|
|
318
321
|
if (width <= 0 || height <= 0) return false
|
|
319
|
-
val picture =
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
rowArea.
|
|
323
|
-
|
|
324
|
-
canvas.translate(0f, rowArea.height.toFloat())
|
|
325
|
-
largeTitleHolder.draw(canvas)
|
|
326
|
-
}
|
|
322
|
+
val picture = record(width, height) { canvas ->
|
|
323
|
+
rowArea.draw(canvas)
|
|
324
|
+
if (large) {
|
|
325
|
+
canvas.translate(0f, rowArea.height.toFloat())
|
|
326
|
+
largeTitleHolder.draw(canvas)
|
|
327
327
|
}
|
|
328
|
-
}
|
|
329
|
-
// A HARDWARE bitmap in the bar: it can't be drawn on a software canvas.
|
|
330
|
-
return false
|
|
331
|
-
}
|
|
328
|
+
} ?: return false
|
|
332
329
|
val top = content.top + rowArea.top
|
|
333
|
-
snapshot.
|
|
330
|
+
snapshot.setImageDrawable(PictureDrawable(picture))
|
|
334
331
|
snapshot.alpha = 1f
|
|
335
332
|
snapshot.translationX = 0f
|
|
336
333
|
snapshot.translationY = rowArea.translationY
|
|
@@ -348,29 +345,43 @@ class TopBar(context: Context) : FrameLayout(themed(context)) {
|
|
|
348
345
|
|
|
349
346
|
/**
|
|
350
347
|
* A picture of the bar under its row — the background, the large title, the search, the line — and where it starts
|
|
351
|
-
* in the bar, for a push to a screen without a large title; none when the bar can't be
|
|
348
|
+
* in the bar, for a push to a screen without a large title; none when the bar can't be recorded. Its intrinsic
|
|
349
|
+
* size is its size; it draws at the top left of its bounds.
|
|
352
350
|
*/
|
|
353
|
-
fun pictureUnderRow(): Pair<
|
|
351
|
+
fun pictureUnderRow(): Pair<PictureDrawable, Int>? = pictureFrom(content.top + rowArea.bottom)
|
|
354
352
|
|
|
355
353
|
/**
|
|
356
354
|
* A picture of the whole bar, for the screen it leaves with in a transition of the stack's own; none when the bar
|
|
357
|
-
* can't be
|
|
355
|
+
* can't be recorded.
|
|
358
356
|
*/
|
|
359
|
-
fun picture():
|
|
357
|
+
fun picture(): PictureDrawable? = pictureFrom(0)?.first
|
|
360
358
|
|
|
361
|
-
private fun pictureFrom(top: Int): Pair<
|
|
359
|
+
private fun pictureFrom(top: Int): Pair<PictureDrawable, Int>? {
|
|
362
360
|
val width = width
|
|
363
361
|
val height = height - top
|
|
364
362
|
if (width <= 0 || height <= 0) return null
|
|
365
|
-
|
|
366
|
-
val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
|
|
367
|
-
val canvas = Canvas(bitmap)
|
|
363
|
+
val picture = record(width, height) { canvas ->
|
|
368
364
|
canvas.translate(0f, -top.toFloat())
|
|
369
365
|
draw(canvas)
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
366
|
+
} ?: return null
|
|
367
|
+
return PictureDrawable(picture) to top
|
|
368
|
+
}
|
|
369
|
+
|
|
370
|
+
// The commands [draw] gives, cut to [width] × [height]. A hardware bitmap in the bar is kept as it is from Android
|
|
371
|
+
// 9 on (the picture then plays only on the screen's hardware canvas, where the bar's pictures are drawn); Android 8
|
|
372
|
+
// can't record one, and there is no picture then.
|
|
373
|
+
private fun record(width: Int, height: Int, draw: (Canvas) -> Unit): Picture? = try {
|
|
374
|
+
Picture().also {
|
|
375
|
+
val canvas = it.beginRecording(width, height)
|
|
376
|
+
try {
|
|
377
|
+
canvas.clipRect(0, 0, width, height)
|
|
378
|
+
draw(canvas)
|
|
379
|
+
} finally {
|
|
380
|
+
it.endRecording()
|
|
381
|
+
}
|
|
373
382
|
}
|
|
383
|
+
} catch (e: IllegalArgumentException) {
|
|
384
|
+
null
|
|
374
385
|
}
|
|
375
386
|
|
|
376
387
|
/** The row's picture goes. */
|
|
@@ -410,6 +421,12 @@ class TopBar(context: Context) : FrameLayout(themed(context)) {
|
|
|
410
421
|
heightChanged = true
|
|
411
422
|
}
|
|
412
423
|
|
|
424
|
+
// The row's picture: it fades as one image. Its commands overlap (a button's background under its icon), and drawn
|
|
425
|
+
// one by one at the view's opacity each would show through the next.
|
|
426
|
+
private class Snapshot(context: Context) : AppCompatImageView(context) {
|
|
427
|
+
override fun hasOverlappingRendering(): Boolean = true
|
|
428
|
+
}
|
|
429
|
+
|
|
413
430
|
// The area of the row: it takes the touches without passing them on while the row is transparent.
|
|
414
431
|
private class RowArea(context: Context) : FrameLayout(context) {
|
|
415
432
|
var blocksTouches = false
|
|
@@ -8,12 +8,12 @@ import dev.apexnative.navigation.utils.UiUtils
|
|
|
8
8
|
import kotlin.math.max
|
|
9
9
|
|
|
10
10
|
/**
|
|
11
|
-
* The cell of a React button in the bar (`topBar.leftButtons[].component`)
|
|
12
|
-
*
|
|
13
|
-
* React root, or later a view of the screen's own tree) measures `AT_MOST` — the width at most what the row
|
|
14
|
-
* height at most the row's — or exactly its `component.width` / `component.height` when the options give
|
|
15
|
-
* ([contentWidth], [contentHeight], pixels). The cell takes the
|
|
16
|
-
* rejects a root with an id). It never looks inside the content.
|
|
11
|
+
* The cell of a React button in the bar (`topBar.leftButtons[].component`), in the row of its side as an icon button
|
|
12
|
+
* stands there: 12 dp on each side, at least 48 dp wide, as high as the row gives, the content in its middle. The
|
|
13
|
+
* content (a React root, or later a view of the screen's own tree) measures `AT_MOST` — the width at most what the row
|
|
14
|
+
* gives, the height at most the row's — or exactly its `component.width` / `component.height` when the options give
|
|
15
|
+
* them ([contentWidth], [contentHeight], pixels). The cell takes the button's `testID`; the content never gets one
|
|
16
|
+
* (React Native rejects a root with an id). It never looks inside the content.
|
|
17
17
|
*/
|
|
18
18
|
@SuppressLint("ViewConstructor")
|
|
19
19
|
internal class BarButtonComponentCell(context: Context) : ViewGroup(context) {
|
package/android/src/main/java/dev/apexnative/navigation/views/stack/topbar/titlebar/BarButtonView.kt
ADDED
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
package dev.apexnative.navigation.views.stack.topbar.titlebar
|
|
2
|
+
|
|
3
|
+
import android.annotation.SuppressLint
|
|
4
|
+
import android.content.Context
|
|
5
|
+
import android.content.res.TypedArray
|
|
6
|
+
import android.graphics.drawable.Drawable
|
|
7
|
+
import android.view.Gravity
|
|
8
|
+
import android.widget.Button
|
|
9
|
+
import androidx.appcompat.R as AppCompatR
|
|
10
|
+
import androidx.appcompat.widget.AppCompatTextView
|
|
11
|
+
import androidx.appcompat.widget.TooltipCompat
|
|
12
|
+
import androidx.core.widget.TextViewCompat
|
|
13
|
+
import dev.apexnative.navigation.utils.UiUtils
|
|
14
|
+
import kotlin.math.roundToInt
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* A button of the bar with an icon or a text, drawn as a toolbar draws the items of its menu: the theme's
|
|
18
|
+
* `actionButtonStyle` (48 dp at least, 12 dp at the sides, the bar's ripple), its `actionMenuTextAppearance` and
|
|
19
|
+
* `actionMenuTextColor`, the icon at most 32 dp and in the middle. With an icon the text doesn't show; it labels the
|
|
20
|
+
* button for accessibility and is its tooltip instead, unless the button has a label of its own. Main thread only.
|
|
21
|
+
*/
|
|
22
|
+
@SuppressLint("ViewConstructor")
|
|
23
|
+
internal class BarButtonView(context: Context) :
|
|
24
|
+
AppCompatTextView(context, null, AppCompatR.attr.actionButtonStyle) {
|
|
25
|
+
private val minimumWidth = minWidth
|
|
26
|
+
private val maxIconSize = UiUtils.dpToPx(context, MAX_ICON_DP).roundToInt()
|
|
27
|
+
private val sidePadding = UiUtils.dpToPx(context, SIDE_DP).roundToInt()
|
|
28
|
+
private var icon: Drawable? = null
|
|
29
|
+
|
|
30
|
+
init {
|
|
31
|
+
gravity = Gravity.CENTER
|
|
32
|
+
isFocusable = true
|
|
33
|
+
val vertical = UiUtils.dpToPx(context, VERTICAL_DP).roundToInt()
|
|
34
|
+
setPaddingRelative(sidePadding, vertical, sidePadding, vertical)
|
|
35
|
+
restyle()
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** The text appearance and color of the theme as it is now: a light/dark switch changes them. */
|
|
39
|
+
fun restyle() {
|
|
40
|
+
themed(AppCompatR.attr.actionMenuTextAppearance) { getResourceId(0, 0) }
|
|
41
|
+
.takeIf { it != 0 }
|
|
42
|
+
?.let { TextViewCompat.setTextAppearance(this, it) }
|
|
43
|
+
themed(AppCompatR.attr.actionMenuTextColor) { getColorStateList(0) }?.let(::setTextColor)
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
private fun <T> themed(attr: Int, read: TypedArray.() -> T): T {
|
|
47
|
+
val values = context.obtainStyledAttributes(intArrayOf(attr))
|
|
48
|
+
return try {
|
|
49
|
+
values.read()
|
|
50
|
+
} finally {
|
|
51
|
+
values.recycle()
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/**
|
|
56
|
+
* What the button shows: [icon], or [title] without one. [label] is its accessibility label, else the title when
|
|
57
|
+
* only the icon shows; that title is its tooltip too. [tooltip] false leaves the long press to the caller.
|
|
58
|
+
*/
|
|
59
|
+
fun show(title: CharSequence, icon: Drawable?, label: CharSequence?, tooltip: Boolean) {
|
|
60
|
+
this.icon = icon?.also { fit(it) }
|
|
61
|
+
setCompoundDrawablesRelative(icon, null, null, null)
|
|
62
|
+
text = if (icon == null) title else null
|
|
63
|
+
val hidden = title.takeIf { icon != null && it.isNotEmpty() }
|
|
64
|
+
contentDescription = label?.takeIf { it.isNotEmpty() } ?: hidden
|
|
65
|
+
TooltipCompat.setTooltipText(this, if (tooltip) hidden else null)
|
|
66
|
+
requestLayout()
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
// TalkBack and UI tests see a button, as they see a toolbar's item.
|
|
70
|
+
override fun getAccessibilityClassName(): CharSequence = Button::class.java.name
|
|
71
|
+
|
|
72
|
+
// An icon larger than the bar's item takes keeps its shape at 32 dp.
|
|
73
|
+
private fun fit(icon: Drawable) {
|
|
74
|
+
var width = icon.intrinsicWidth.coerceAtLeast(0)
|
|
75
|
+
var height = icon.intrinsicHeight.coerceAtLeast(0)
|
|
76
|
+
if (width > maxIconSize) {
|
|
77
|
+
height = (height * maxIconSize.toFloat() / width).roundToInt()
|
|
78
|
+
width = maxIconSize
|
|
79
|
+
}
|
|
80
|
+
if (height > maxIconSize) {
|
|
81
|
+
width = (width * maxIconSize.toFloat() / height).roundToInt()
|
|
82
|
+
height = maxIconSize
|
|
83
|
+
}
|
|
84
|
+
icon.setBounds(0, 0, width, height)
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
|
|
88
|
+
val centered = icon?.takeIf { text.isNullOrEmpty() }
|
|
89
|
+
if (centered == null) setPaddingRelative(sidePadding, paddingTop, sidePadding, paddingBottom)
|
|
90
|
+
super.onMeasure(widthMeasureSpec, heightMeasureSpec)
|
|
91
|
+
// At least the theme's width, within what the row gives.
|
|
92
|
+
val mode = MeasureSpec.getMode(widthMeasureSpec)
|
|
93
|
+
val target = if (mode == MeasureSpec.AT_MOST) {
|
|
94
|
+
minOf(MeasureSpec.getSize(widthMeasureSpec), minimumWidth)
|
|
95
|
+
} else {
|
|
96
|
+
minimumWidth
|
|
97
|
+
}
|
|
98
|
+
if (mode != MeasureSpec.EXACTLY && minimumWidth > 0 && measuredWidth < target) {
|
|
99
|
+
super.onMeasure(MeasureSpec.makeMeasureSpec(target, MeasureSpec.EXACTLY), heightMeasureSpec)
|
|
100
|
+
}
|
|
101
|
+
// The icon alone stands in the middle of the button.
|
|
102
|
+
if (centered != null) {
|
|
103
|
+
val start = (measuredWidth - centered.bounds.width()) / 2
|
|
104
|
+
setPaddingRelative(start, paddingTop, paddingEnd, paddingBottom)
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
private companion object {
|
|
109
|
+
const val MAX_ICON_DP = 32f
|
|
110
|
+
const val SIDE_DP = 12f
|
|
111
|
+
const val VERTICAL_DP = 4f
|
|
112
|
+
}
|
|
113
|
+
}
|