Skip to content

Commit d47f374

Browse files
committed
merged main
1 parent a33ae00 commit d47f374

File tree

2 files changed

+60
-1
lines changed

2 files changed

+60
-1
lines changed

sentry-android-core/src/main/java/io/sentry/android/core/SentryUserFeedbackDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ protected void onCreate(Bundle savedInstanceState) {
113113
lblTitle.setText(feedbackOptions.getFormTitle());
114114

115115
btnSend.setBackgroundTintList(
116-
ColorStateList.valueOf(Color.parseColor(feedbackOptions.getSubmitBackgroundHex())));
116+
ColorStateList.valueOf(Color.parseColor(feedbackOptions.getSubmitBackgroundHex())));
117117
btnSend.setTextColor(Color.parseColor(feedbackOptions.getSubmitForegroundHex()));
118118
btnSend.setText(feedbackOptions.getSubmitButtonLabel());
119119
btnSend.setOnClickListener(

sentry/api/sentry.api

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2934,6 +2934,63 @@ public final class io/sentry/SentryExecutorService : io/sentry/ISentryExecutorSe
29342934
public fun submit (Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Future;
29352935
}
29362936

2937+
public final class io/sentry/SentryFeedbackOptions {
2938+
public fun <init> ()V
2939+
public fun getCancelButtonLabel ()Ljava/lang/String;
2940+
public fun getConfirmButtonLabel ()Ljava/lang/String;
2941+
public fun getEmailLabel ()Ljava/lang/String;
2942+
public fun getEmailPlaceholder ()Ljava/lang/String;
2943+
public fun getFormTitle ()Ljava/lang/String;
2944+
public fun getIsRequiredLabel ()Ljava/lang/String;
2945+
public fun getMessageLabel ()Ljava/lang/String;
2946+
public fun getMessagePlaceholder ()Ljava/lang/String;
2947+
public fun getNameLabel ()Ljava/lang/String;
2948+
public fun getNamePlaceholder ()Ljava/lang/String;
2949+
public fun getOnFormClose ()Ljava/lang/Runnable;
2950+
public fun getOnFormOpen ()Ljava/lang/Runnable;
2951+
public fun getOnSubmitError ()Lio/sentry/SentryFeedbackOptions$SentryFeedbackCallback;
2952+
public fun getOnSubmitSuccess ()Lio/sentry/SentryFeedbackOptions$SentryFeedbackCallback;
2953+
public fun getSubmitBackgroundHex ()Ljava/lang/String;
2954+
public fun getSubmitButtonLabel ()Ljava/lang/String;
2955+
public fun getSubmitForegroundHex ()Ljava/lang/String;
2956+
public fun getSuccessMessageText ()Ljava/lang/String;
2957+
public fun isEmailRequired ()Z
2958+
public fun isNameRequired ()Z
2959+
public fun isShowBranding ()Z
2960+
public fun isShowEmail ()Z
2961+
public fun isShowName ()Z
2962+
public fun isUseSentryUser ()Z
2963+
public fun setCancelButtonLabel (Ljava/lang/String;)V
2964+
public fun setConfirmButtonLabel (Ljava/lang/String;)V
2965+
public fun setEmailLabel (Ljava/lang/String;)V
2966+
public fun setEmailPlaceholder (Ljava/lang/String;)V
2967+
public fun setEmailRequired (Z)V
2968+
public fun setFormTitle (Ljava/lang/String;)V
2969+
public fun setIsRequiredLabel (Ljava/lang/String;)V
2970+
public fun setMessageLabel (Ljava/lang/String;)V
2971+
public fun setMessagePlaceholder (Ljava/lang/String;)V
2972+
public fun setNameLabel (Ljava/lang/String;)V
2973+
public fun setNamePlaceholder (Ljava/lang/String;)V
2974+
public fun setNameRequired (Z)V
2975+
public fun setOnFormClose (Ljava/lang/Runnable;)V
2976+
public fun setOnFormOpen (Ljava/lang/Runnable;)V
2977+
public fun setOnSubmitError (Lio/sentry/SentryFeedbackOptions$SentryFeedbackCallback;)V
2978+
public fun setOnSubmitSuccess (Lio/sentry/SentryFeedbackOptions$SentryFeedbackCallback;)V
2979+
public fun setShowBranding (Z)V
2980+
public fun setShowEmail (Z)V
2981+
public fun setShowName (Z)V
2982+
public fun setSubmitBackgroundHex (Ljava/lang/String;)V
2983+
public fun setSubmitButtonLabel (Ljava/lang/String;)V
2984+
public fun setSubmitForegroundHex (Ljava/lang/String;)V
2985+
public fun setSuccessMessageText (Ljava/lang/String;)V
2986+
public fun setUseSentryUser (Z)V
2987+
public fun toString ()Ljava/lang/String;
2988+
}
2989+
2990+
public abstract interface class io/sentry/SentryFeedbackOptions$SentryFeedbackCallback {
2991+
public abstract fun call (Lio/sentry/protocol/Feedback;)V
2992+
}
2993+
29372994
public final class io/sentry/SentryInstantDate : io/sentry/SentryDate {
29382995
public fun <init> ()V
29392996
public fun <init> (Ljava/time/Instant;)V
@@ -3215,6 +3272,7 @@ public class io/sentry/SentryOptions {
32153272
public fun getExecutorService ()Lio/sentry/ISentryExecutorService;
32163273
public fun getExperimental ()Lio/sentry/ExperimentalOptions;
32173274
public fun getFatalLogger ()Lio/sentry/ILogger;
3275+
public fun getFeedbackOptions ()Lio/sentry/SentryFeedbackOptions;
32183276
public fun getFlushTimeoutMillis ()J
32193277
public fun getFullyDisplayedReporter ()Lio/sentry/FullyDisplayedReporter;
32203278
public fun getGestureTargetLocators ()Ljava/util/List;
@@ -3358,6 +3416,7 @@ public class io/sentry/SentryOptions {
33583416
public fun setEnvironment (Ljava/lang/String;)V
33593417
public fun setExecutorService (Lio/sentry/ISentryExecutorService;)V
33603418
public fun setFatalLogger (Lio/sentry/ILogger;)V
3419+
public fun setFeedbackOptions (Lio/sentry/SentryFeedbackOptions;)V
33613420
public fun setFlushTimeoutMillis (J)V
33623421
public fun setForceInit (Z)V
33633422
public fun setFullyDisplayedReporter (Lio/sentry/FullyDisplayedReporter;)V

0 commit comments

Comments
 (0)