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

Fix: app icon "Donor Benefit" label border #5121

Merged
merged 2 commits into from
Nov 14, 2024

Conversation

Williamrai
Copy link
Collaborator

What does this do?

Adds a border on "Donor Benefit" label

Phabricator:
https://phabricator.wikimedia.org/T376423

@Williamrai Williamrai added the Ready to merge PR passed design signoff and ready to be merged. label Nov 14, 2024
@Williamrai Williamrai changed the base branch from main to contributions-dashboard-design November 14, 2024 14:37

<stroke
android:width="1dp"
android:color="@color/widget_border" />
Copy link
Member

@dbrant dbrant Nov 14, 2024

Choose a reason for hiding this comment

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

The more correct color here would be ?attr/border_color (it's the same color value).
The widget_ color attributes are reserved for widgets only (i.e. actual Widgets for the launcher home screen), which exist outside of our color themes.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

done, thank you for letting me know.

app/src/main/res/drawable/shape_rounded_border_1dp.xml Outdated Show resolved Hide resolved
@dbrant dbrant merged commit ef4c53a into contributions-dashboard-design Nov 14, 2024
1 check passed
@dbrant dbrant deleted the fix-app-icon branch November 14, 2024 17:11
dbrant added a commit that referenced this pull request Nov 14, 2024
* [Feature branch] The Contributions Dashboard

* Update target languages and due date

* [Contributions dashboard] bottom nav tab rename (#5019)

* - adds conditional logic to support "Contribute" tab

* - adds a safeguard against potential crash
- adds an open function on NavTab to preserve the order after conditional addition of Tab
- replaces "Contributions" to "Edits" in the SuggestedEditsTasksFragment

* - fixes CI issue

* - adds conditional naming in the EDITS enum itself, removes the CONTRIBUTE enum which removes the potential crash and hidden side effects

* - fixes CI issue

* - removal of unused strings and some logic

---------

Co-authored-by: cooltey <[email protected]>

* [Contribution dashboard] Create a donor badge view

* View update

* Use TextView

* Add a proper padding to the chip icon for smaller text

* Update padding

* [Contributions dashboard] donor status on article overflow menu (#5028)

* - adds UI for displaying user donor status
- adds callback function for donor buttons
- adds preference for user visited donor history
-

* - renames Preference key and variable for clarity

* - rename functions for better clarity
- creates a single function for navigating to MainActivity with different tabs and extra

* - rename preference key

* - updates donor information text with string resource

* - adds developer preference for updating donor status

* - fix CI issues

* - replaces the XML with the custom DonorBadgeView and updates the code

* - fix ci issues

* - removes developer setting option for updating donor status

* - fix ci issue

* - adds developer setting for changing donor history

---------

Co-authored-by: cooltey <[email protected]>

* Add dialog message for donationResult preference

* [Contributions dashboard] survey dialog (#5044)

* - adds a survey dialog

* - adds a general simple alert dialog

* - converts the SimpleAlertDialog function to a class with easy to use extension for AppCompatActivity

* - adds contribution survey dialog to SurveyDialog object

* - adds survey link cta on alert dialog positive button

* - removes dialog from SurveyDialog object and adds it to the SuggestedEditsTasksFragment

* - adds contributionDashboardSurveyDialogShown preference

* - small code fix

* - code fixes

* - code fixes

---------

Co-authored-by: cooltey <[email protected]>

* Follow up: survey dialog for Contributions Dashboard

* [Contributions Dashboard] Donor History (#5021)

* Donor History screen

* Update strings

* Update strings

* Fix error

* Some viewModel stuff

* Remove old strings

* Some logic of initializing the view

* Build actions

* Finish the layout

* Datepicker

* Correctly apply theme for datepicker

* Show a proper time selection for the date picker

* More refine to datePicker

* Better selection status

* Add proper ripple animation

* Handle UTC issues in the date picker

* Disable if no date is selected

* Use tooltip view for a proper menu item color

* Add preference and comment for discussion

* Handle orientation properly

* Update design

* Update preference

* Move the preference to the bottom for easier access

* qq string

* Add link, paddings and ripple animation

* Code review comments

* Remove preference

* Checkbox

* Code review comments

* Fix datepicker text color

* Fix single item text color

* Add proper outline background

* Wire up the survey dialog

* Open link in an external browser

* [Contributions Dashboard] Update contribute tab for donor history (#5048)

* Initial commit for Contribute tab

* Update design

* Restore design

* TextView for toolbar title

* Use flexbox for edge case

* Add comment for log out logic and update flexbox layout

* Send a LoggedOutEvent to the FlowEventBus for refreshing screen purpose

* Get event and refresh

* Add minimal height

* Slighly change the top margin

* Rename layout and update the stats view to the new design

* Change to linearLayout

* Add donor history related view

* Margins

* Update/streamline layout of "last donated" row.

* Revert "Update/streamline layout of "last donated" row."

This reverts commit 5a453af.

* Update/streamline layout of "last donated" row. (#5062)

* Paddings

* Simplify the layout a bit

* Optimize

* Set date and clickable area

* Hide sequential tooltips

* Refine layout

* Update todo

* Streamline layout of title and donor button.

* Revert "Streamline layout of title and donor button."

This reverts commit 5917238.

* Streamline layout of title and donor button.

* Streamline layout of title and donor button. (#5066)

* Update layout

* Add donor status function to a proper location

* Remove unused layout parameters

* Fix style and wire up donor history

* Add donorHistory for overflow menu

---------

Co-authored-by: Dmitry Brant <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>

* Update Donor Status logic for recurring donor option

* Add warning dialog for modified page

* Save only if it is modified

* Add preference to dev preference

* [Contributions Dashboard] Entry dialogs for the feature (#5067)

* [Contributions Dashboard] Entry dialogs for the feature

* Update helper

* Wire entry dialogs logic

* Move dialog

* Add paramter

* Add temp variable

* Survey dialogs and update logic

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fix: make sure only refresh the content in the current fragment

* Fix: design signoff updates for Contribute Tab and Donor history (#5089)

* Fix: design signoff updates for Contribute Tab

* Adding fixes for donor history

* Fix entry dialog logic

* Fix: prevent possible crash

* Fix: set Donor badge icon to white

* Fix: Overflow menu design changes (#5095)

* - design fixes: reduces vertical padding for overflow menu and adds vertical padding to "update donor status" button for better accessibility

* - reverts back the padding

---------

Co-authored-by: cooltey <[email protected]>

* Add isRecurringDonor key to the dev preferences

* Fix: Update Contribute tab for design signoff comments (#5107)

* Update contribute tab for design signoff comments

* Add isRecurring donor preference to dev preferences

* Apply a check to avoid unnecessary loading

* Remove unused launcher

* Fix: donor status if taps on the already donated; replace double % with
the encoded symbol

* [Contributions dashboard] app icon  (#5055)

* - initial work and test work

* - adds list preference for setting app icon
- update manifest file to include activity alias for default icon
- shows snackbar when app icon changes

* - fixes both app icon showing on the home screen

* - adds a condition for showing donor icon
- adds TODO's

* - fixes CI issue

* - adds Bottom sheet dialog for App icon
- adds recyclerView for showing different app icon
- removes unused code
- adds styles for circular image view
- adds logic to select/de-select app icon

* - modifies AppIconDialog class to support API 21 for setting foreground and optimized code
- adds prefs for saving current selected app icon

* - adds logic to show/hide change app icon

* - fixes CI issue

* - adds donor benefit icon

* - replaces png with svg donor benefit launcher icon

* - code and ui fixes

* - ci fix

* - removes displayName from launcherIcon

* - adds missing logic for showing "App Icon" setting

* - replaces icon and removes unused resource

* - code fixes

---------

Co-authored-by: cooltey <[email protected]>

* Fix translation issue

* Revert "Fix translation issue"

This reverts commit e91fe45.

* Revert "Fix: donor status if taps on the already donated; replace double % with"

This reverts commit fb19f21.

* Update donor status logic

* [Contributions Dashboard] add isDonor preference for the optional donor (#5116)

info

* Use String.format() for the double percent symbol

* - disabled donor badge click when shown on SuggestedEditsTasksFragment (#5119)

* Fix: save the page even it is not modified

* Fix: Survey dialog design and logic changes (#5115)

* - design changes: centered title, icon tint to use secondary color
- logic changes:
1. when user updates donor history as a non donor the action on survey dialog opens snackbar
2. user updates donor history as donor then dialog actions opens thank you dialog

* - code and style fixes

* - centers the alert dialog title globally

---------

Co-authored-by: Cooltey Feng <[email protected]>

* Make container visibility

* Fix: make sure the username item only visible for the feature

* Show the snackbar for donor history saved

* Use correct string resource for app icon

* Design review: open AppIconDialog after clicking on "Take me there"

* Fix lint

* Fix: update click listener for donorHistoryUpdate button

* Refine the isDonor preference

* Fix: app icon "Donor Benefit" label border (#5121)

* - adds border to the "DONOR BENEFIT" design

* - renames file and replaces widget_color with border_color

* [Contributions Dashboard] Wire up the instrumentation (#5104)

* [Contributions Dashboard] Wire up the instrumentation

* Fix error

* Finalized instrumentation

* Add todo

* Pending: campaignId

* Use contrib for campaignId, remove anon suffix

* Remove space

* Oops

---------

Co-authored-by: William Rai <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
Co-authored-by: williamrai <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Ready to merge PR passed design signoff and ready to be merged.
Development

Successfully merging this pull request may close these issues.

2 participants