Merge branch 'master' into release/7.1.0

hborisoff · hborisoff · commit c9e2f6054d2b · 2023-01-20T11:39:08.000+02:00
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/messagetemplates/options/BaseMessageOptions.java b/AndroidSDKCore/src/main/java/com/leanplum/messagetemplates/options/BaseMessageOptions.java
@@ -220,7 +220,7 @@ static ActionArgs createPushPrePermissionArgs(Context context) {
         // new arguments
         .withAction(Args.CANCEL_ACTION, null)
         .with(Args.CANCEL_BUTTON_TEXT, Values.MAYBE_LATER)
-        .with(Args.CANCEL_BUTTON_BACKGROUND_COLOR, Color.WHITE)
-        .with(Args.CANCEL_BUTTON_TEXT_COLOR, Color.argb(255, 127, 127, 127)); // light grey
+        .withColor(Args.CANCEL_BUTTON_BACKGROUND_COLOR, Color.WHITE)
+        .withColor(Args.CANCEL_BUTTON_TEXT_COLOR, Color.argb(255, 127, 127, 127)); // light grey
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ static ActionArgs createPushPrePermissionArgs(Context context) {`
`220`	`220`	`// new arguments`
`221`	`221`	`.withAction(Args.CANCEL_ACTION, null)`
`222`	`222`	`.with(Args.CANCEL_BUTTON_TEXT, Values.MAYBE_LATER)`
`223`		`- .with(Args.CANCEL_BUTTON_BACKGROUND_COLOR, Color.WHITE)`
`224`		`- .with(Args.CANCEL_BUTTON_TEXT_COLOR, Color.argb(255, 127, 127, 127)); // light grey`
	`223`	`+ .withColor(Args.CANCEL_BUTTON_BACKGROUND_COLOR, Color.WHITE)`
	`224`	`+ .withColor(Args.CANCEL_BUTTON_TEXT_COLOR, Color.argb(255, 127, 127, 127)); // light grey`
`225`	`225`	`}`
`226`	`226`	`}`