Fixed
Status Update
Comments
ap...@google.com <ap...@google.com> #2
Project: platform/frameworks/support
Branch: androidx-master-dev
commit e386f97dd769da18d9f3103958714e43d797219f
Author: Louis Pullen-Freilich <lpf@google.com>
Date: Fri Jan 31 17:32:33 2020
Monthly button refactoring
- Removes string overload for Button
- Replaces ButtonStyle with distinct functions, the following is the
migration strategy:
ContainedButtonStyle -> Button
OutlinedButtonStyle -> OutlinedButton
TextButtonStyle -> TextButton
Custom ButtonStyle -> Any / which ever is most semantically related
Now that each function takes the same parameters, and there are no
overloads, there is no more large separation between layers - extra
customization is just a matter of supplying more parameters, instead of
needing to find overloads / copy and paste parameters from high level
styles into the base ButtonStyle.
Also adds sample for Modifiers so the samples won't break when API
changes like this are made.
Bug: b/146478620
Bug: b/146482131
Bug: b/146346551
Test: ButtonTest
Change-Id: If63ab32bd3f12050a2d2f4b8c0cb044bc7144a6b
Relnote: "Replaced ButtonStyle with distinct functions and removed text (string) overload. See updated samples for usage information."
M compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/EffectSamples.kt
M compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/ModelSamples.kt
M compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/RecomposeSamples.kt
M ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ViewInCompose.kt
M ui/ui-core/integration-tests/samples/build.gradle
A ui/ui-core/integration-tests/samples/src/main/java/androidx/ui/core/samples/ModifierSamples.kt
M ui/ui-core/src/main/java/androidx/ui/core/Modifier.kt
M ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL1.kt
M ui/ui-material/api/0.1.0-dev05.txt
M ui/ui-material/api/current.txt
M ui/ui-material/api/public_plus_experimental_0.1.0-dev05.txt
M ui/ui-material/api/public_plus_experimental_current.txt
M ui/ui-material/api/restricted_0.1.0-dev05.txt
M ui/ui-material/api/restricted_current.txt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ButtonActivity.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/CustomShapeActivity.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/TabActivity.kt
M ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyAlertDialog.kt
M ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyCards.kt
M ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/AlertDialogSample.kt
M ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/ButtonSamples.kt
M ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/DrawerSamples.kt
M ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/SnackbarSample.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ButtonTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SnackbarTest.kt
M ui/ui-material/src/main/java/androidx/ui/material/Button.kt
M ui/ui-material/src/main/java/androidx/ui/material/Snackbar.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/AssertExistsTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/CustomActivityTest.kt
https://android-review.googlesource.com/1222411
Branch: androidx-master-dev
commit e386f97dd769da18d9f3103958714e43d797219f
Author: Louis Pullen-Freilich <lpf@google.com>
Date: Fri Jan 31 17:32:33 2020
Monthly button refactoring
- Removes string overload for Button
- Replaces ButtonStyle with distinct functions, the following is the
migration strategy:
ContainedButtonStyle -> Button
OutlinedButtonStyle -> OutlinedButton
TextButtonStyle -> TextButton
Custom ButtonStyle -> Any / which ever is most semantically related
Now that each function takes the same parameters, and there are no
overloads, there is no more large separation between layers - extra
customization is just a matter of supplying more parameters, instead of
needing to find overloads / copy and paste parameters from high level
styles into the base ButtonStyle.
Also adds sample for Modifiers so the samples won't break when API
changes like this are made.
Bug:
Bug:
Bug:
Test: ButtonTest
Change-Id: If63ab32bd3f12050a2d2f4b8c0cb044bc7144a6b
Relnote: "Replaced ButtonStyle with distinct functions and removed text (string) overload. See updated samples for usage information."
M compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/EffectSamples.kt
M compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/ModelSamples.kt
M compose/compose-runtime/integration-tests/samples/src/main/java/androidx/compose/samples/RecomposeSamples.kt
M ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ViewInCompose.kt
M ui/ui-core/integration-tests/samples/build.gradle
A ui/ui-core/integration-tests/samples/src/main/java/androidx/ui/core/samples/ModifierSamples.kt
M ui/ui-core/src/main/java/androidx/ui/core/Modifier.kt
M ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL1.kt
M ui/ui-material/api/0.1.0-dev05.txt
M ui/ui-material/api/current.txt
M ui/ui-material/api/public_plus_experimental_0.1.0-dev05.txt
M ui/ui-material/api/public_plus_experimental_current.txt
M ui/ui-material/api/restricted_0.1.0-dev05.txt
M ui/ui-material/api/restricted_current.txt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ButtonActivity.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/CustomShapeActivity.kt
M ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/TabActivity.kt
M ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyAlertDialog.kt
M ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyCards.kt
M ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/AlertDialogSample.kt
M ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/ButtonSamples.kt
M ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/DrawerSamples.kt
M ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/SnackbarSample.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ButtonTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SnackbarTest.kt
M ui/ui-material/src/main/java/androidx/ui/material/Button.kt
M ui/ui-material/src/main/java/androidx/ui/material/Snackbar.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/AssertExistsTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/CustomActivityTest.kt
Description
mvivo@ faced it(his screenshot is in attachment:
"I used a plain ButtonStyle because border in the other implementations cannot be null
This is my button
style = ButtonStyle(
backgroundColor = MaterialTheme.colors().primary,
contentColor = MaterialTheme.colors().onSurface,
shape = RoundedCornerShape(16.dp),
border = if (selected) Border(color = Color.White, width = 2.dp) else null
)
Couldn't use ContainedButtonStyle because it has no border, couldn't use OutlinedButtonStyle because border cannot be null, and neither TextButtonStyle because of all the above"