Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use constraints in UI state for FilterScreen #7389

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

Rawa
Copy link
Contributor

@Rawa Rawa commented Dec 20, 2024


This change is Reviewable

@Rawa Rawa changed the base branch from main to crash-when-filtering-on-provider-in-android-app-droid-1703 December 20, 2024 09:28
@Rawa Rawa changed the base branch from crash-when-filtering-on-provider-in-android-app-droid-1703 to multiple-ownership-for-providers-droid-1704 December 20, 2024 09:30
@Pururun Pururun added the Android Issues related to Android label Dec 20, 2024
@Rawa Rawa force-pushed the use-constraints-in-ui-state branch from 26beec9 to b9b7ed2 Compare December 20, 2024 09:30
@Rawa Rawa added the On hold Means the PR is paused for some reason. No need to review it for now label Dec 20, 2024
Copy link
Contributor

@Pururun Pururun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 14 of 14 files at r1, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @Rawa)


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/RelayFilterUiState.kt line 35 at r1 (raw file):

                providerToOwnerships
                    .filterValues { selectedOwnership.value in it }
                    .keys

Should probaby be an extensionfunction


android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Providers.kt line 3 at r1 (raw file):

package net.mullvad.mullvadvpn.lib.model

typealias Providers = List<ProviderId>

Great that this removed. ⭐


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt line 125 at r1 (raw file):

            if (ownershipExpanded) {
                item(key = Keys.OWNERSHIP_ALL, contentType = ContentType.ITEM) {
                    AnyOwnership(state, { onSelectedOwnership(Constraint.Any) })

I think this should probably be moved back into the AnyOwnershipfunction.

@Rawa Rawa force-pushed the use-constraints-in-ui-state branch from 405dd61 to 6f784d0 Compare December 20, 2024 09:54
@Rawa Rawa force-pushed the multiple-ownership-for-providers-droid-1704 branch from 0529627 to 04d9fb7 Compare December 20, 2024 09:54
@Pururun Pururun force-pushed the multiple-ownership-for-providers-droid-1704 branch from cbbb316 to 99bd279 Compare December 20, 2024 13:28
Base automatically changed from multiple-ownership-for-providers-droid-1704 to main December 20, 2024 13:38
@Rawa Rawa force-pushed the use-constraints-in-ui-state branch from 3ae34f3 to db9b326 Compare December 22, 2024 19:43
@Rawa Rawa removed the On hold Means the PR is paused for some reason. No need to review it for now label Dec 22, 2024
@Rawa Rawa force-pushed the use-constraints-in-ui-state branch from 8a31408 to a220f59 Compare December 23, 2024 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Android Issues related to Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants