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.

Sign up for GitHub

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

adding a custom dialog #74

Merged
merged 4 commits into from
May 8, 2024
Merged

adding a custom dialog #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b95e8b8
adding a custom dialog
Apr 17, 2024
e9630ad
changing DialogFragment to dialog
Apr 23, 2024
ce3f481
Updating shaky flow for custom dialog
Apr 24, 2024
9c8fd24
moving custom dialog to ShakeDelegate
May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions shaky/src/main/java/com/linkedin/android/shaky/ShakeDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package com.linkedin.android.shaky;

import android.app.Activity;
import android.app.DialogFragment;

import androidx.annotation.IntDef;
import androidx.annotation.MenuRes;
Expand Down Expand Up @@ -131,6 +132,14 @@ public Integer getPopupTheme() {
public void collectData(@NonNull Activity activity, @NonNull Result data) {
}

/**
* @return a custom dialog to be shown before the feedback flow
*/
@Nullable
public DialogFragment getCustomDialog() {
return null;
}

/**
* Called when the user submits the Feedback form. Creates and starts an email Intent.
* This method can be overridden to send data to a custom URL endpoint, etc.
Expand Down
8 changes: 6 additions & 2 deletions shaky/src/main/java/com/linkedin/android/shaky/Shaky.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ public class Shaky implements ShakeDetector.Listener {

private static final String SEND_FEEDBACK_TAG = "SendFeedback";
private static final String COLLECT_DATA_TAG = "CollectFeedbackData";
private static final String CUSTOM_DIALOG_TAG = "CustomDialog";

private static final long SHAKE_COOLDOWN_MS = TimeUnit.SECONDS.toMillis(5);

private final ShakeDelegate delegate;
private final ShakeDetector shakeDetector;
@Nullable
Expand Down Expand Up @@ -186,7 +186,11 @@ public void hearShake() {
arguments.putInt(ShakySettingDialog.SHAKY_CURRENT_SENSITIVITY, delegate.getSensitivityLevel());
SendFeedbackDialog sendFeedbackDialog = new SendFeedbackDialog();
sendFeedbackDialog.setArguments(arguments);
sendFeedbackDialog.show(activity.getFragmentManager(), SEND_FEEDBACK_TAG);
if (delegate.getCustomDialog() != null) {
delegate.getCustomDialog().show(activity.getFragmentManager(), CUSTOM_DIALOG_TAG);
} else {
sendFeedbackDialog.show(activity.getFragmentManager(), SEND_FEEDBACK_TAG);
}
if (shakyFlowCallback != null) {
shakyFlowCallback.onUserPromptShown();
}
Expand Down
Loading