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

Replace third party top bar library #5231

Merged
merged 5 commits into from
Oct 6, 2023

Conversation

Rawa
Copy link
Contributor

@Rawa Rawa commented Oct 4, 2023

Material 3 has a collapsable toolbar, this PR aim to replace our third party dependency and use the native one.

Before any merge we should also update verification-metadata.xml to remove the old dependency.


This change is Reviewable

@linear
Copy link

linear bot commented Oct 4, 2023

DROID-272 Evaluate replacing collapsing toolbar

We should evaluate whether to replace the current collapsing toolbar since the project seem dead (https://github.com/onebone/compose-collapsing-toolbar).

The following seems like a good potential:

https://github.com/germainkevinbusiness/CollapsingTopBarCompose

Update:

There is now https://developer.android.com/jetpack/compose/components/app-bars#medium which we strongly should consider instead.

@Rawa Rawa changed the title Replace third party top bar library WIP: Replace third party top bar library Oct 4, 2023
@Rawa Rawa self-assigned this Oct 4, 2023
@Rawa Rawa added the Android Issues related to Android label Oct 4, 2023
@Rawa Rawa force-pushed the evaluate-replacing-collapsing-toolbar-droid-272 branch from 2a53fa3 to 4427971 Compare October 4, 2023 13:18
@Rawa Rawa changed the title WIP: Replace third party top bar library Replace third party top bar library Oct 4, 2023
@Rawa Rawa requested review from Pururun and sabercodic October 4, 2023 13:24
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.

:lgtm:

Reviewed 5 of 11 files at r1, 10 of 10 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@Rawa
Copy link
Contributor Author

Rawa commented Oct 5, 2023

This PR also fixes our issue with overlapping header text. I've confirmed with marketing that it is ok for us to show the logo in this way, however they are doing a double check with stakeholder.

Screenshot 2023-10-05 at 10 36 49
Screenshot 2023-10-05 at 10 47 58

@Rawa
Copy link
Contributor Author

Rawa commented Oct 5, 2023

All approved

@albin-mullvad albin-mullvad force-pushed the evaluate-replacing-collapsing-toolbar-droid-272 branch from 0852662 to 9338a9e Compare October 5, 2023 12:42
@Rawa Rawa force-pushed the evaluate-replacing-collapsing-toolbar-droid-272 branch from e9f62da to a8b4bbf Compare October 5, 2023 13:07
Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 11 files at r1, 3 of 10 files at r2, 1 of 2 files at r6, 1 of 2 files at r7, all commit messages.
Reviewable status: 15 of 17 files reviewed, 2 unresolved discussions (waiting on @Pururun and @Rawa)


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt line 88 at r7 (raw file):

}

@OptIn(ExperimentalMaterial3Api::class)

Can this be removed when using @file:OptIn(ExperimentalMaterial3Api::class)?

Code quote:

@OptIn(ExperimentalMaterial3Api::class)

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt line 192 at r7 (raw file):

}

@OptIn(ExperimentalMaterial3Api::class)

Can this be removed when using @file:OptIn(ExperimentalMaterial3Api::class)?

Code quote:

@OptIn(ExperimentalMaterial3Api::class)

@Rawa Rawa force-pushed the evaluate-replacing-collapsing-toolbar-droid-272 branch from a8b4bbf to 95b2016 Compare October 6, 2023 07:09
Copy link
Contributor Author

@Rawa Rawa left a comment

Choose a reason for hiding this comment

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

Reviewable status: 14 of 17 files reviewed, 2 unresolved discussions (waiting on @albin-mullvad and @Pururun)


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt line 88 at r7 (raw file):

Previously, albin-mullvad wrote…

Can this be removed when using @file:OptIn(ExperimentalMaterial3Api::class)?

Yeah, good catch!


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt line 192 at r7 (raw file):

Previously, albin-mullvad wrote…

Can this be removed when using @file:OptIn(ExperimentalMaterial3Api::class)?

Done.

@Rawa Rawa force-pushed the evaluate-replacing-collapsing-toolbar-droid-272 branch from 95b2016 to eb11321 Compare October 6, 2023 08:34
Copy link
Contributor Author

@Rawa Rawa left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r10.
Reviewable status: 12 of 17 files reviewed, 2 unresolved discussions (waiting on @albin-mullvad and @Pururun)

Copy link
Contributor Author

@Rawa Rawa left a comment

Choose a reason for hiding this comment

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

Reviewed 4 of 4 files at r11, all commit messages.
Reviewable status: 12 of 17 files reviewed, 2 unresolved discussions (waiting on @albin-mullvad)

Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 11 files at r1, 1 of 2 files at r7, 1 of 1 files at r8, 1 of 1 files at r10, 4 of 4 files at r11, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@albin-mullvad albin-mullvad force-pushed the evaluate-replacing-collapsing-toolbar-droid-272 branch from eb11321 to 7e28f78 Compare October 6, 2023 15:35
@albin-mullvad albin-mullvad merged commit c1f9e78 into main Oct 6, 2023
17 checks passed
@albin-mullvad albin-mullvad deleted the evaluate-replacing-collapsing-toolbar-droid-272 branch October 6, 2023 20:54
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.

3 participants