Fixed
Status Update
Comments
ap...@google.com <ap...@google.com> #2
Project: platform/frameworks/support
Branch: androidx-master-dev
commit 235b4fa6ab69b620dd1a336b683ba4161ecf5d22
Author: Matvei Malkov <malkov@google.com>
Date: Tue Jul 07 21:14:49 2020
Deprecate Scroller. Introduce ScrollableColumn / ScrollableRow
This CL reworks Scrolling-related API. Scrollers and ScrollerPosition have been deprecated. Instead, ScrollableColumn, ScrollableRow and ScrollState have been introduced. Additionaly, for more flexibility and performance, Modifier.verticalScroll and Modifier.horizontalScroll have been introduced, so users can add scrolling to everything while saving layout node.
While moving from ScrollerPosition to ScrollState, few API were renamed and simplified and @Composable ScrollerPosition was replaced with rememberScrollState.
Relnote: 'VerticalScroller and HoriziontalScroller have been deprecated. Use ScrollableColumn and ScrollableRow for build-in experience with Column/Row behaviour and parameters, or Modifier.verticalScroll and Modifier.horizontalScroll on your own element. Similarly, ScrollerPosition has been deprecated in favor of ScrollState'
Fixes: 158571223
Fixes: 157225838
Bug: 148542949
Bug: 150706555
Fixes: 150458415
Fixes: 149460415
Fixes: 154105299
Test: Tests were fixed for new APIs
Change-Id: I400ce0e6c0e33aa865e0e49defef1eb92ac40a93
M ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoApp.kt
M ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoFilter.kt
M ui/integration-tests/src/main/java/androidx/ui/integration/test/foundation/NestedScrollerTestCase.kt
M ui/integration-tests/src/main/java/androidx/ui/integration/test/foundation/ScrollerTestCase.kt
M ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/PointerInputInteropAndroidInCompose.kt
M ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/PointerInputInteropComposeInAndroid.kt
M ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/PopupDemo.kt
M ui/ui-foundation/api/0.1.0-dev15.txt
M ui/ui-foundation/api/current.txt
M ui/ui-foundation/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-foundation/api/public_plus_experimental_current.txt
M ui/ui-foundation/api/restricted_0.1.0-dev15.txt
M ui/ui-foundation/api/restricted_current.txt
M ui/ui-foundation/integration-tests/foundation-demos/src/main/java/androidx/ui/foundation/demos/FoundationDemos.kt
M ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ScrollerSamples.kt
M ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/ui/foundation/ScrollTest.kt
M ui/ui-foundation/src/androidMain/kotlin/androidx/ui/foundation/animation/AndroidFlingConfig.kt
A ui/ui-foundation/src/commonMain/kotlin/androidx/ui/foundation/Scroll.kt
D ui/ui-foundation/src/commonMain/kotlin/androidx/ui/foundation/Scroller.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ButtonDemo.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/DynamicThemeActivity.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ElevationDemo.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ListItemDemo.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/MaterialTextField.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ProgressIndicatorDemo.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/SelectionControlsDemo.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/SnackbarDemo.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/TabDemo.kt
M ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/AccountsScreen.kt
M ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/BillsScreen.kt
M ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/OverviewScreen.kt
M ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ScaffoldSamples.kt
M ui/ui-material/src/main/java/androidx/ui/material/Menu.kt
M ui/ui-material/src/main/java/androidx/ui/material/Tab.kt
M ui/ui-material/src/main/java/androidx/ui/material/TextFieldImpl.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/IsDisplayedTest.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeInputField.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeInputFieldFocusTransition.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeInputFieldTrickyUseCase.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeMultiParagraph.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeText.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeTextSelection.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeTextSelectionSample.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeVariousInputField.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/InteractiveText.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/TextFieldWIthScroller.kt
https://android-review.googlesource.com/1355660
Branch: androidx-master-dev
commit 235b4fa6ab69b620dd1a336b683ba4161ecf5d22
Author: Matvei Malkov <malkov@google.com>
Date: Tue Jul 07 21:14:49 2020
Deprecate Scroller. Introduce ScrollableColumn / ScrollableRow
This CL reworks Scrolling-related API. Scrollers and ScrollerPosition have been deprecated. Instead, ScrollableColumn, ScrollableRow and ScrollState have been introduced. Additionaly, for more flexibility and performance, Modifier.verticalScroll and Modifier.horizontalScroll have been introduced, so users can add scrolling to everything while saving layout node.
While moving from ScrollerPosition to ScrollState, few API were renamed and simplified and @Composable ScrollerPosition was replaced with rememberScrollState.
Relnote: 'VerticalScroller and HoriziontalScroller have been deprecated. Use ScrollableColumn and ScrollableRow for build-in experience with Column/Row behaviour and parameters, or Modifier.verticalScroll and Modifier.horizontalScroll on your own element. Similarly, ScrollerPosition has been deprecated in favor of ScrollState'
Fixes: 158571223
Fixes: 157225838
Bug: 148542949
Bug: 150706555
Fixes: 150458415
Fixes: 149460415
Fixes: 154105299
Test: Tests were fixed for new APIs
Change-Id: I400ce0e6c0e33aa865e0e49defef1eb92ac40a93
M ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoApp.kt
M ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoFilter.kt
M ui/integration-tests/src/main/java/androidx/ui/integration/test/foundation/NestedScrollerTestCase.kt
M ui/integration-tests/src/main/java/androidx/ui/integration/test/foundation/ScrollerTestCase.kt
M ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/PointerInputInteropAndroidInCompose.kt
M ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/PointerInputInteropComposeInAndroid.kt
M ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/PopupDemo.kt
M ui/ui-foundation/api/0.1.0-dev15.txt
M ui/ui-foundation/api/current.txt
M ui/ui-foundation/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-foundation/api/public_plus_experimental_current.txt
M ui/ui-foundation/api/restricted_0.1.0-dev15.txt
M ui/ui-foundation/api/restricted_current.txt
M ui/ui-foundation/integration-tests/foundation-demos/src/main/java/androidx/ui/foundation/demos/FoundationDemos.kt
M ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ScrollerSamples.kt
M ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/ui/foundation/ScrollTest.kt
M ui/ui-foundation/src/androidMain/kotlin/androidx/ui/foundation/animation/AndroidFlingConfig.kt
A ui/ui-foundation/src/commonMain/kotlin/androidx/ui/foundation/Scroll.kt
D ui/ui-foundation/src/commonMain/kotlin/androidx/ui/foundation/Scroller.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ButtonDemo.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/DynamicThemeActivity.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ElevationDemo.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ListItemDemo.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/MaterialTextField.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ProgressIndicatorDemo.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/SelectionControlsDemo.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/SnackbarDemo.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/TabDemo.kt
M ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/AccountsScreen.kt
M ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/BillsScreen.kt
M ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/OverviewScreen.kt
M ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ScaffoldSamples.kt
M ui/ui-material/src/main/java/androidx/ui/material/Menu.kt
M ui/ui-material/src/main/java/androidx/ui/material/Tab.kt
M ui/ui-material/src/main/java/androidx/ui/material/TextFieldImpl.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/IsDisplayedTest.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeInputField.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeInputFieldFocusTransition.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeInputFieldTrickyUseCase.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeMultiParagraph.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeText.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeTextSelection.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeTextSelectionSample.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeVariousInputField.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/InteractiveText.kt
M ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/TextFieldWIthScroller.kt
Description
I replaced
Column(Modifier.padding(8.dp))
with
VerticalScroller
and it doesn't work as modifier is not the first optional parameter, so I had to use named parameters. SwapscrollerPosition
andmodifier
for consistency