NavOptions should override equals and hashCode [161586466]

Fixed

Bug

Status Update

No update yet.

Description

ga...@gmail.com

created issue #1

Jul 19, 2020 12:51PM

Component used: Navigation Version used: 2.3.0

In some of our jvm tests we want to check that the right navigation is triggered. Since we are not on an actual device we are checking if the correct NavDirections object and NavOptions object are passed to the navigator. However NavOptions currently does not override equals and hashCode which makes this more complicated than needed. Since all NavOptions fields are either int or boolean this should be straightforward to do.

Comments

il...@google.com <il...@google.com> Jul 20, 2020 09:36PM

Assigned to jb...@google.com.

ap...@google.com <ap...@google.com> #2Jul 31, 2020 05:51PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit c60f33e229e31ab328ef6b59dab63b264954831c
Author: Alexandre Elias <aelias@google.com>
Date: Fri Jul 10 16:23:09 2020

Semantics no-op cleanups

Partly in response to lmr's broad code review, I did a pass of
superficial API/implementation cleanup. The main changes are:

- I changed each Boolean SemanticsProperty where false is equivalent to
not being present to take "Unit" instead. This is conceptually
clearer: it avoids questions like "can I cancel out a semantics from a
merged child by setting it to false?" Because "property = Unit" looks
weird, I also changed the style of these to "property()".

- I moved the Semantics id generator closer to where it's used, in
SemanticsModifierCore. I made it internal and an AtomicInt.
(Note that integer ids are heavily used in the Android
AccessibilityNodeInfo APIs so I can't simply remove them entirely.)

- I deleted dead code. Some examples include SemanticsHintOverrides,
a public API not connected to anything, and SemanticsPropertyKey
merge() open method which is never called. (In both cases I have
a different plan in mind for accessibility.)

Fixes: 145951226
Fixes: 145955412
Test: existing tests
Relnote: "Single-value semantics properties now use a calling style.
For example, 'semantics { hidden = true }' is now written as:
'semantics { hidden() }'."

Change-Id: Ic1afd12ea22c926babc9662f1804d80b33aa0cfc

M ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/LayoutNodeModifierBenchmark.kt
M ui/ui-core/api/0.1.0-dev15.txt
M ui/ui-core/api/current.txt
M ui/ui-core/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-core/api/public_plus_experimental_current.txt
M ui/ui-core/api/restricted_0.1.0-dev15.txt
M ui/ui-core/api/restricted_current.txt
M ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/graphics/vector/VectorTest.kt
M ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/semantics/SemanticsTests.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidActuals.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidPopup.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Expect.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsConfiguration.kt
D ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsHintOverrides.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsModifier.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsNode.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsOwner.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsWrapper.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.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/src/main/java/androidx/ui/foundation/Clickable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Dialog.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Scroller.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Selectable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Toggleable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/semantics/FoundationSemanticsProperties.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ButtonTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/CardTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/CheckboxScreenshotTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/RadioButtonScreenshotTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ScaffoldTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SnackbarTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SurfaceTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ripple/RippleIndicationTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/TextFieldScreenshotTest.kt
M ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
M ui/ui-material/src/main/java/androidx/ui/material/TextFieldImpl.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/AssertsTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/CallSemanticsActionTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/FindersTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/PrintToStringTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/ScrollToTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/TextActionsTest.kt
M ui/ui-test/src/main/java/androidx/ui/test/Actions.kt
M ui/ui-test/src/main/java/androidx/ui/test/Filters.kt
M ui/ui-text/api/0.1.0-dev15.txt
M ui/ui-text/api/current.txt
M ui/ui-text/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-text/api/public_plus_experimental_current.txt
M ui/ui-text/api/restricted_0.1.0-dev15.txt
M ui/ui-text/api/restricted_current.txt
M ui/ui-text/src/commonMain/kotlin/androidx/ui/text/CoreTextField.kt
M ui/ui-text/src/commonMain/kotlin/androidx/ui/text/TextSemanticsProperties.kt

https://android-review.googlesource.com/1360099

jb...@google.com <jb...@google.com> #3Jul 31, 2020 06:38PM

Marked as fixed.

This has been fixed internally and will be available in the Navigation 2.4.0-alpha01 release.

ga...@gmail.com <ga...@gmail.com> #4Jul 31, 2020 07:48PM

Thank you, that's great to hear. Looking forward to it.

ap...@google.com <ap...@google.com> #5Sep 24, 2020 08:45AM

Project: platform/frameworks/support
Branch: snap-temp-L69500000699825513

commit 91e0659733e097aabfb5801caccbf6f40d2f4a72
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Jul 30 18:45:38 2020

override equals and hashCode for NavOptions

Lets implement these methods to simplify comparing NavOptions.

Equals method generated using studio.

Test: ./gradlew bOS
Bug: 161586466
Change-Id: I1beb8d06aa72ed6ad7bfe77d1f134a9793bc7e38
(cherry picked from commit 26288a9e8c3cb7ef4888ed252e2765bda7ab7d54)

M navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.java

https://android-review.googlesource.com/1436153

ap...@google.com <ap...@google.com> #6Sep 24, 2020 08:52AM

Project: platform/frameworks/support
Branch: snap-temp-L62000000699827533

commit 94827a2939f3a4d2c8d08e8dc93d53330de56806
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Jul 30 18:45:38 2020

override equals and hashCode for NavOptions

Lets implement these methods to simplify comparing NavOptions.

Equals method generated using studio.

Test: ./gradlew bOS
Bug: 161586466
Change-Id: I1beb8d06aa72ed6ad7bfe77d1f134a9793bc7e38
(cherry picked from commit 26288a9e8c3cb7ef4888ed252e2765bda7ab7d54)

M navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.java

https://android-review.googlesource.com/1436736

ap...@google.com <ap...@google.com> #7Sep 24, 2020 08:57AM

Project: platform/frameworks/support
Branch: snap-temp-L46100000699831674

commit b1fbee9fc7b04ae2cb8868774a714c134c86f865
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Jul 30 18:45:38 2020

override equals and hashCode for NavOptions

Lets implement these methods to simplify comparing NavOptions.

Equals method generated using studio.

Test: ./gradlew bOS
Bug: 161586466
Change-Id: I1beb8d06aa72ed6ad7bfe77d1f134a9793bc7e38
(cherry picked from commit 26288a9e8c3cb7ef4888ed252e2765bda7ab7d54)

M navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.java

https://android-review.googlesource.com/1436740

ap...@google.com <ap...@google.com> #8Sep 24, 2020 09:18AM

Project: platform/frameworks/support
Branch: snap-temp-L91000000699844097

commit 81272b7a61a520f9be7803eefd58bf8143b3fd50
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Jul 30 18:45:38 2020

override equals and hashCode for NavOptions

Lets implement these methods to simplify comparing NavOptions.

Equals method generated using studio.

Test: ./gradlew bOS
Bug: 161586466
Change-Id: I1beb8d06aa72ed6ad7bfe77d1f134a9793bc7e38
(cherry picked from commit 26288a9e8c3cb7ef4888ed252e2765bda7ab7d54)

M navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.java

https://android-review.googlesource.com/1436541

ap...@google.com <ap...@google.com> #9Sep 24, 2020 09:34AM

Project: platform/frameworks/support
Branch: snap-temp-L34200000699848945

commit 0849c43e4adbea7f96104d328f69a7c504b15ea1
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Jul 30 18:45:38 2020

override equals and hashCode for NavOptions

Lets implement these methods to simplify comparing NavOptions.

Equals method generated using studio.

Test: ./gradlew bOS
Bug: 161586466
Change-Id: I1beb8d06aa72ed6ad7bfe77d1f134a9793bc7e38
(cherry picked from commit 26288a9e8c3cb7ef4888ed252e2765bda7ab7d54)

M navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.java

https://android-review.googlesource.com/1436871

ap...@google.com <ap...@google.com> #10Sep 24, 2020 09:36AM

Project: platform/frameworks/support
Branch: snap-temp-L04700000699849955

commit 2a048de5fbc9f21dfb785a8d015eec9c10930874
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Jul 30 18:45:38 2020

override equals and hashCode for NavOptions

Lets implement these methods to simplify comparing NavOptions.

Equals method generated using studio.

Test: ./gradlew bOS
Bug: 161586466
Change-Id: I1beb8d06aa72ed6ad7bfe77d1f134a9793bc7e38
(cherry picked from commit 26288a9e8c3cb7ef4888ed252e2765bda7ab7d54)

M navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.java

https://android-review.googlesource.com/1436748

ap...@google.com <ap...@google.com> #11Sep 24, 2020 10:08AM

Project: platform/frameworks/support
Branch: snap-temp-L69500000699869549

commit f5f97b37c2bf85e50d6e819a0e2529f733e5c5c2
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Jul 30 18:45:38 2020

override equals and hashCode for NavOptions

Lets implement these methods to simplify comparing NavOptions.

Equals method generated using studio.

Test: ./gradlew bOS
Bug: 161586466
Change-Id: I1beb8d06aa72ed6ad7bfe77d1f134a9793bc7e38
(cherry picked from commit 26288a9e8c3cb7ef4888ed252e2765bda7ab7d54)

M navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.java

https://android-review.googlesource.com/1436413

ap...@google.com <ap...@google.com> #12Sep 24, 2020 10:10AM

Project: platform/frameworks/support
Branch: snap-temp-L31300000699869852

commit ebb79ab4f29f90cc26deb78c2ec9a7c06fd5240e
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Jul 30 18:45:38 2020

override equals and hashCode for NavOptions

Lets implement these methods to simplify comparing NavOptions.

Equals method generated using studio.

Test: ./gradlew bOS
Bug: 161586466
Change-Id: I1beb8d06aa72ed6ad7bfe77d1f134a9793bc7e38
(cherry picked from commit 26288a9e8c3cb7ef4888ed252e2765bda7ab7d54)

M navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.java

https://android-review.googlesource.com/1436915

ap...@google.com <ap...@google.com> #13Sep 24, 2020 11:29AM

Project: platform/frameworks/support
Branch: snap-temp-L53700000699921463

commit a3d1426113e183c5c294e4c124f61b28ff8fa91d
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Jul 30 18:45:38 2020

override equals and hashCode for NavOptions

Lets implement these methods to simplify comparing NavOptions.

Equals method generated using studio.

Test: ./gradlew bOS
Bug: 161586466
Change-Id: I1beb8d06aa72ed6ad7bfe77d1f134a9793bc7e38
(cherry picked from commit 26288a9e8c3cb7ef4888ed252e2765bda7ab7d54)

M navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.java

https://android-review.googlesource.com/1436394

ap...@google.com <ap...@google.com> #14Sep 24, 2020 11:32AM

Project: platform/frameworks/support
Branch: snap-temp-L25200000699921867

commit b7b6a6655ccad65b509d1b1e2b6e7c4d69a8f852
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Jul 30 18:45:38 2020

override equals and hashCode for NavOptions

Lets implement these methods to simplify comparing NavOptions.

Equals method generated using studio.

Test: ./gradlew bOS
Bug: 161586466
Change-Id: I1beb8d06aa72ed6ad7bfe77d1f134a9793bc7e38
(cherry picked from commit 26288a9e8c3cb7ef4888ed252e2765bda7ab7d54)

M navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.java

https://android-review.googlesource.com/1436922

ap...@google.com <ap...@google.com> #15Sep 24, 2020 11:52AM

Project: platform/frameworks/support
Branch: snap-temp-L07700000699933785

commit 6e637298fa0127e409ab105309e19cb1869e2c76
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Jul 30 18:45:38 2020

override equals and hashCode for NavOptions

Lets implement these methods to simplify comparing NavOptions.

Equals method generated using studio.

Test: ./gradlew bOS
Bug: 161586466
Change-Id: I1beb8d06aa72ed6ad7bfe77d1f134a9793bc7e38
(cherry picked from commit 26288a9e8c3cb7ef4888ed252e2765bda7ab7d54)

M navigation/navigation-common/src/main/java/androidx/navigation/NavOptions.java

https://android-review.googlesource.com/1436927