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

nav: Add an About Zulip button to the main menu #1157

Merged
merged 2 commits into from
Dec 20, 2024

Conversation

tomlin7
Copy link
Contributor

@tomlin7 tomlin7 commented Dec 13, 2024

fix #1128

Changes

  • Added About Zulip button to main menu
  • Added localizations and tests for the button

Screenshots


outdated screenshot (icon changed):

zulip.mp4

The tests are passing:

image

Copy link
Collaborator

@chrisbobbe chrisbobbe left a comment

Choose a reason for hiding this comment

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

Thanks! Small comments below.

The other thing this PR needs is screenshots. Please include screenshots of the new button in the PR description.

lib/widgets/home.dart Outdated Show resolved Hide resolved
assets/l10n/app_en.arb Outdated Show resolved Hide resolved
@chrisbobbe chrisbobbe added the maintainer review PR ready for review by Zulip maintainers label Dec 13, 2024
@chrisbobbe chrisbobbe self-assigned this Dec 13, 2024
@tomlin7
Copy link
Contributor Author

tomlin7 commented Dec 13, 2024

@chrisbobbe I have made the code changes and added screenshots! please check

@chrisbobbe
Copy link
Collaborator

I see a video; please include a still image because videos are harder to review.

@chrisbobbe
Copy link
Collaborator

For which icon to use, let's use the same icon that web uses for a similar button:

image

Looks like that's this SVG file: https://github.com/zulip/zulip/blob/74d7f1192/web/shared/icons/info.svg

Please add that file to the project in a separate prep commit, using the instructions in lib/widgets/icons.dart. The commit message should say that we didn't find a suitable icon in the Icons page of the Figma design (with a link to that page), which is why we're using the one from web. The commit should include this link, which points to the SVG file in web: https://github.com/zulip/zulip/blob/74d7f1192/web/shared/icons/info.svg

@tomlin7
Copy link
Contributor Author

tomlin7 commented Dec 13, 2024

@chrisbobbe I have added a still image of the About Zulip button as well. Please check now.

@tomlin7 tomlin7 changed the title nav: Add about-zulip button to menu bar nav: Add an About Zulip button to the main menu Dec 13, 2024
@chrisbobbe
Copy link
Collaborator

chrisbobbe commented Dec 14, 2024

Great, thanks! I see it's not the icon from the web app that I mentioned in my comment above: #1157 (comment)

Please update the PR with that change. 🙂

@tomlin7
Copy link
Contributor Author

tomlin7 commented Dec 14, 2024

@chrisbobbe Pardon, I saw the second message after sending previous one!
I have the changes ready, how would I go about making a separate preparatory commit? Do I just push to the same branch with a new commit?

@tomlin7
Copy link
Contributor Author

tomlin7 commented Dec 14, 2024

@chrisbobbe After reading more docs, and having an understanding of what to do, I have done a separate commit because it's an entirely different kind of change compared to previous ones. Also updated screenshots, please review!

@apoorvapendse
Copy link

Hey @tomlin7, the test you added seems to be failing

@tomlin7
Copy link
Contributor Author

tomlin7 commented Dec 17, 2024

@apoorvapendse thanks for pointing this out! I have fixed the test now, please review it.

@chrisbobbe
Copy link
Collaborator

Thanks, this is quite close! Please switch the order of the two commits: the commit adding the icon should come first, so the new button uses it from the beginning.

You can use an interactive rebase to reorder the commits. If you need help, please ask on #git help in the Zulip development community.

@tomlin7
Copy link
Contributor Author

tomlin7 commented Dec 18, 2024

@chrisbobbe I have reordered the commits, thanks for the docs. Please check!

@chrisbobbe
Copy link
Collaborator

Thanks! LGTM; marking for Greg's review.

@chrisbobbe chrisbobbe assigned gnprice and unassigned chrisbobbe Dec 18, 2024
@chrisbobbe chrisbobbe added integration review Added by maintainers when PR may be ready for integration and removed maintainer review PR ready for review by Zulip maintainers labels Dec 18, 2024
@chrisbobbe chrisbobbe requested a review from gnprice December 18, 2024 20:33
Copy link
Member

@gnprice gnprice left a comment

Choose a reason for hiding this comment

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

Thanks @tomlin7 for the contribution! And thanks @chrisbobbe for the previous reviews.

Generally this looks good. Small comments below.

test/widgets/home_test.dart Outdated Show resolved Hide resolved
lib/widgets/icons.dart Show resolved Hide resolved
lib/widgets/home.dart Show resolved Hide resolved
@tomlin7 tomlin7 force-pushed the about-zulip-button branch 2 times, most recently from 24cd71a to b24b1c6 Compare December 19, 2024 06:13
@tomlin7
Copy link
Contributor Author

tomlin7 commented Dec 19, 2024

@gnprice I have fixed the commit messages and fixed the redundancy as well! please check.
I'm really not sure if the tests are failing due to the change made.

@gnprice
Copy link
Member

gnprice commented Dec 20, 2024

Thanks for the revision! All LGTM.

The CI failure looks like #1177. I've rebased, and tools/check passes for me locally — merging.

(CI will take a few minutes longer because it runs tools/check --all, including things like building an APK which are very unlikely to be affected by this change.)

@gnprice gnprice merged commit eb3e2aa into zulip:main Dec 20, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integration review Added by maintainers when PR may be ready for integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"About Zulip" in main menu
4 participants