-
Notifications
You must be signed in to change notification settings - Fork 311
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
In short, this adds a card UI to the map screen that prompts the user to donate money. Tapping "Learn More" will show a new activity that provides more information about why OBA needs money. Tapping "Donate" will open a browser directed at the donations page. Tapping the "X" button will show an alert asking the user if they're willing to donate later potentially. This UI will only be shown in the main OBA build flavor. White label apps won't show it.
- Loading branch information
1 parent
930cead
commit 4441278
Showing
20 changed files
with
491 additions
and
6 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
151 changes: 151 additions & 0 deletions
151
onebusaway-android/src/main/java/org/onebusaway/android/donations/DonationsManager.java
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| package org.onebusaway.android.donations; | ||
|
|
||
| import com.google.firebase.analytics.FirebaseAnalytics; | ||
|
|
||
| import org.onebusaway.android.R; | ||
| import org.onebusaway.android.app.Application; | ||
| import org.onebusaway.android.io.ObaAnalytics; | ||
| import org.onebusaway.android.util.BuildFlavorUtils; | ||
| import org.onebusaway.android.util.PreferenceUtils; | ||
|
|
||
| import android.content.Intent; | ||
| import android.content.SharedPreferences; | ||
| import android.content.res.Resources; | ||
| import android.net.Uri; | ||
|
|
||
| import java.util.Date; | ||
|
|
||
| public class DonationsManager { | ||
| private SharedPreferences mPreferences; | ||
|
|
||
| private Resources mResources; | ||
|
|
||
| public DonationsManager(SharedPreferences preferences, FirebaseAnalytics firebaseAnalytics, Resources resources) { | ||
| this.mPreferences = preferences; | ||
| this.mAnalytics = firebaseAnalytics; | ||
| this.mResources = resources; | ||
| } | ||
|
|
||
| // region Analytics | ||
|
|
||
| private FirebaseAnalytics mAnalytics; | ||
|
|
||
| /** | ||
| * Reports UI events using Firebase | ||
| * @param resourceID ID of the UI element to report | ||
| * @param state the state or variant of the UI item, or null if the item doesn't have a state or variant | ||
| */ | ||
| private void reportUIEvent(Integer resourceID, String state) { | ||
| ObaAnalytics.reportUiEvent(mAnalytics, mResources.getString(resourceID), state); | ||
| } | ||
|
|
||
| // endregion | ||
|
|
||
| // Preference Keys | ||
|
|
||
| private static String donationRequestDismissedDateKey = "donationRequestDismissedDateKey"; | ||
| private static String donationRequestReminderDateKey = "donationRequestReminderDateKey"; | ||
|
|
||
| // region Donation Request Dismissal | ||
|
|
||
| /** | ||
| * @return The date that donation requests were hidden by the user, either because they donated | ||
| * or because they tapped the 'dismiss' button, or null if the date has not been set. | ||
| */ | ||
| public Date getDonationRequestDismissedDate() { | ||
| Long timestamp = mPreferences.getLong(donationRequestDismissedDateKey, -1); | ||
| if (timestamp < 1) { | ||
| return null; | ||
| } | ||
|
|
||
| return new Date(timestamp); | ||
| } | ||
|
|
||
| /** | ||
| * Sets the date that the donation request UI was dismissed on. Pass in null to 'reset' the UI. | ||
| * @param date The dismissal date. | ||
| */ | ||
| public void setDonationRequestDismissedDate(Date date) { | ||
| PreferenceUtils.saveLong( | ||
| mPreferences, | ||
| donationRequestDismissedDateKey, | ||
| date == null ? -1 : date.getTime() | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Hides subsequent attempts to request donations. | ||
| */ | ||
| public void dismissDonationRequests() { | ||
| setDonationRequestDismissedDate(new Date()); | ||
| } | ||
|
|
||
| // endregion | ||
|
|
||
| // region Donation Request Reminder | ||
|
|
||
| /** | ||
| * @return Optional date at which the app should remind the user to donate. | ||
| */ | ||
| public Date getDonationRequestReminderDate() { | ||
| Long timestamp = mPreferences.getLong(donationRequestReminderDateKey, -1); | ||
| if (timestamp < 1) { | ||
| return null; | ||
| } | ||
|
|
||
| return new Date(timestamp); | ||
| } | ||
|
|
||
| public void setDonationRequestReminderDate(Date date) { | ||
| PreferenceUtils.saveLong( | ||
| mPreferences, | ||
| donationRequestReminderDateKey, | ||
| date == null ? -1 : date.getTime() | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Sets a date two weeks in the future on which the app will remind the user to donate. | ||
| */ | ||
| public void remindUserLater() { | ||
| long twoWeeksInMilliseconds = 86400 * 14 * 1000; // Seconds in a day * 14 days * 1000 milliseconds | ||
| Date futureDate = new Date((new Date()).getTime() + twoWeeksInMilliseconds); | ||
| setDonationRequestReminderDate(futureDate); | ||
| } | ||
|
|
||
| // endregion | ||
|
|
||
| // region State | ||
|
|
||
| /** | ||
| * Determines whether the app should show the donation UI based on a number of factors. | ||
| * @return True if the donation UI should be shown; false otherwise. | ||
| */ | ||
| public boolean shouldShowDonationUI() { | ||
| // white-label apps should not show the donation UI. | ||
| if (!BuildFlavorUtils.isOBABuildFlavor()) { | ||
| return false; | ||
| } | ||
|
|
||
| // Don't show the UI if there's a reminder date that is still in the future. | ||
| Date reminderDate = getDonationRequestReminderDate(); | ||
| if (reminderDate != null && reminderDate.after(new Date())) { | ||
| return false; | ||
| } | ||
|
|
||
| // Show the donation UI if the user has not explicitly dismissed it. | ||
| return getDonationRequestDismissedDate() == null; | ||
| } | ||
|
|
||
| // endregion | ||
|
|
||
| // region UI/Activities | ||
|
|
||
| public Intent buildOpenDonationsPageIntent() { | ||
| reportUIEvent(R.string.analytics_label_button_press_donate, null); | ||
| Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mResources.getString(R.string.donate_url))); | ||
| return intent; | ||
| } | ||
|
|
||
| // endregion | ||
| } |
26 changes: 26 additions & 0 deletions
26
onebusaway-android/src/main/java/org/onebusaway/android/ui/DonationLearnMoreActivity.java
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package org.onebusaway.android.ui; | ||
|
|
||
| import androidx.appcompat.app.AppCompatActivity; | ||
|
|
||
| import android.content.Intent; | ||
| import android.os.Bundle; | ||
| import android.widget.Button; | ||
| import org.onebusaway.android.R; | ||
| import org.onebusaway.android.app.Application; | ||
|
|
||
| public class DonationLearnMoreActivity extends AppCompatActivity { | ||
|
|
||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState) { | ||
| super.onCreate(savedInstanceState); | ||
| setContentView(R.layout.activity_donation_learn_more); | ||
|
|
||
| Button btn = findViewById(R.id.btnDonationViewDonate); | ||
| btn.setOnClickListener(b -> { | ||
| Application.getDonationsManager().dismissDonationRequests(); | ||
| Intent i = Application.getDonationsManager().buildOpenDonationsPageIntent(); | ||
| startActivity(i); | ||
| finish(); | ||
| }); | ||
| } | ||
| } |
This file contains 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
Oops, something went wrong.