[Feature branch] The Donation Reminder #5783
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cooltey
added
WIP
* Create a Donation reminder data class for the configuration * Lint * Simplify * Change to val
* - strings for donation reminders * - order fixes
* - adds DonationReminderActivity, DonationReminderScreen initial code - adds a text with inline element support * - adds other components for the donation reminder screen - code fixes * - adds Donation Field with popup components - adds viewModel logic to retrieve donation amounts and other data - create readable code structure - created ui state data class for compose * - adds an info tooltip and headline icon, text align fix * - adds custom dialog - code re-structure * - ui fixes * - adds snackbar when user confirms the reminder * - adds validators, maximum threshold and ui fixes - adds hardcoded donation frequencies and amounts * - adds proper validation with error icon - adds config call to retrieve min and max amount * - adds donations category in the settings screen - adds donation reminder to setting screen * - updates DonationReminderHelper.kt * - code fixes * - code fixes * - adds "isFromSettings" logic and adds TODO * - code/ui fixes - adds timestamp preference * - code fixes to fit the new DonationReminderConfig * - move DonationReminderHelper.kt to donationreminder package - lint fixes * - adds external experiment link * - code fixes * - optimizes currency format recomposition - code/ui fixes * - converts the dataType articleFrequency and donateAmount to float - - update strings and logic for the float data type * - code fix * - code fixes * - move currency formatting and amount formatting logic to a separate DonateUtil object * - using directly instead of importing * - code fixes * - Adds string resources * - adds generic for selectable Option to handle different number types - ui/string fixes * - code fixes * - code/ui fixes --------- Co-authored-by: Cooltey Feng <[email protected]>
…t comes from (#5816) - adds loading and error state - updates code structure
* Donation reminder: In-article prompt * Set message card height? * Fix height for now * Use post for now * Get a better measure method * Unused import * Set strings and preferences * Update logic and preference * update helper class * Refine card layout * Lint * Handle visibility properly * Update label * Correct monospace - should apply this programmtically * handle bottom space correctly * Adjust the padding and animation * Fix unreachable IDE error * Update space in different cases * Adjust height correctly * Show snackbar message * Update helper class * Add logic for different card messages * donation flow * Add strings and set up donation bottomsheet for donation reminder * Google Pay * References fix * fix lint * make sure the prefs works correctly * Set up Gpay and the flow * Update card height and logic of showing the reminder * Article visit * 15 seconds as valid time spent on an article * Update donate dialog paddings * Set the currency from helper class * Lint * - strings for donation reminders * - order fixes * Update string names * Change d to s * Change d to s #2 * string update * More proper parameter from `d` to `s` * Update strings * Filled amount * Wire filled amount to GooglePay screen * Add filled amount to the list and sort * Fix lint * Update code error * Update imports * Update the logic of showing the prompt * Reset the config after reaching the condition * Lint fix * condition update * Refine the algorithm * Code review comments * Update the get * Refine the logic * reset the active status when enabling the feature * logic update --------- Co-authored-by: williamrai <[email protected]>
…5820) * Add two reset buttons in developer preferences for testing purposes * Use proper title in Settings preference
* Donation reminder: In-article prompt * Set message card height? * Fix height for now * Use post for now * Get a better measure method * Unused import * Set strings and preferences * Update logic and preference * update helper class * Refine card layout * Lint * Handle visibility properly * Update label * Correct monospace - should apply this programmtically * - adds DonationRemindersSurveyGroupAssignment, DonationReminderSurveyState for handling donation reminders survey dialog - adds preference to track the survey dialog state and article visit - copies over code from donation reminder in-prompt PR * handle bottom space correctly * Adjust the padding and animation * Fix unreachable IDE error * Update space in different cases * Adjust height correctly * Show snackbar message * - adds survey dialog - adds strings * Update helper class * Add logic for different card messages * donation flow * Add strings and set up donation bottomsheet for donation reminder * - updates donation reminders survey logic - copies over preference from other donation reminders PR * Google Pay * - code fixes to fit the new DonationReminderConfig * - lint fixes * References fix * fix lint * - lint fixes * make sure the prefs works correctly * Set up Gpay and the flow * Update card height and logic of showing the reminder * Article visit * 15 seconds as valid time spent on an article * Update donate dialog paddings * Set the currency from helper class * Lint * - strings for donation reminders * - order fixes * Update string names * Change d to s * Change d to s #2 * string update * More proper parameter from `d` to `s` * Update strings * Filled amount * Wire filled amount to GooglePay screen * Add filled amount to the list and sort * Fix lint * Update code error * Update imports * Update the logic of showing the prompt * Reset the config after reaching the condition * Lint fix * condition update * Refine the algorithm * Code review comments * Update the get * - adds a TODO * Refine the logic * - code fix * reset the active status when enabling the feature * logic update * - code fix * - code fixes * - code fixes * - survey logic fix * - code fixes --------- Co-authored-by: Cooltey Feng <[email protected]>
* - design fixes * - using window inset for retrieving bottom navigation height - code fixes * - code fixes * - code fixes
…android-wikipedia into donation-reminder-design
dbrant
requested changes
Aug 15, 2025
app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.kt
Outdated
Show resolved
Hide resolved
dbrant
reviewed
Aug 15, 2025
app/src/main/java/org/wikipedia/donate/donationreminder/DonationReminderViewModel.kt
Outdated
Show resolved
Hide resolved
dbrant
requested changes
Aug 15, 2025
Done. Didn't notice the verbiage has been changed 😓 |
cooltey
added
Ready to merge
…android-wikipedia into donation-reminder-design
|
The fdroid build failed after this. Reference to proprietary GooglePayComponent directly in main variant is unacceptable, because it bypasses isGooglePayAvailable. @cooltey Please keep it in DonateViewModel. (How come there is no test build on pull requests for each variant...?) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Phabricator:
https://phabricator.wikimedia.org/T399601