Skip to content

Commit 497f627

Browse files
jcesarmobilejcesarmobile
authored
feat(dialog): Make title optional (#940)
1 parent 302d813 commit 497f627

File tree

4 files changed

+27
-26
lines changed

4 files changed

+27
-26
lines changed

‎dialog/android/src/main/java/com/capacitorjs/plugins/dialog/Dialog.java

+9-8
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,18 @@ public static void alert(
4040
final String okButtonTitle,
4141
final Dialog.OnResultListener listener
4242
) {
43-
final String alertTitle = title == null ? "Alert" : title;
4443
final String alertOkButtonTitle = okButtonTitle == null ? "OK" : okButtonTitle;
4544

4645
new Handler(Looper.getMainLooper())
4746
.post(
4847
() -> {
4948
AlertDialog.Builder builder = new AlertDialog.Builder(context);
5049

50+
if (title != null) {
51+
builder.setTitle(title);
52+
}
5153
builder
5254
.setMessage(message)
53-
.setTitle(alertTitle)
5455
.setPositiveButton(
5556
alertOkButtonTitle,
5657
(dialog, buttonIndex) -> {
@@ -84,18 +85,18 @@ public static void confirm(
8485
final String cancelButtonTitle,
8586
final Dialog.OnResultListener listener
8687
) {
87-
final String confirmTitle = title == null ? "Confirm" : title;
8888
final String confirmOkButtonTitle = okButtonTitle == null ? "OK" : okButtonTitle;
8989
final String confirmCancelButtonTitle = cancelButtonTitle == null ? "Cancel" : cancelButtonTitle;
9090

9191
new Handler(Looper.getMainLooper())
9292
.post(
9393
() -> {
9494
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
95-
95+
if (title != null) {
96+
builder.setTitle(title);
97+
}
9698
builder
9799
.setMessage(message)
98-
.setTitle(confirmTitle)
99100
.setPositiveButton(
100101
confirmOkButtonTitle,
101102
(dialog, buttonIndex) -> {
@@ -138,7 +139,6 @@ public static void prompt(
138139
final String inputText,
139140
final Dialog.OnResultListener listener
140141
) {
141-
final String promptTitle = title == null ? "Prompt" : title;
142142
final String promptOkButtonTitle = okButtonTitle == null ? "OK" : okButtonTitle;
143143
final String promptCancelButtonTitle = cancelButtonTitle == null ? "Cancel" : cancelButtonTitle;
144144
final String promptInputPlaceholder = inputPlaceholder == null ? "" : inputPlaceholder;
@@ -152,10 +152,11 @@ public static void prompt(
152152

153153
input.setHint(promptInputPlaceholder);
154154
input.setText(promptInputText);
155-
155+
if (title != null) {
156+
builder.setTitle(title);
157+
}
156158
builder
157159
.setMessage(message)
158-
.setTitle(promptTitle)
159160
.setView(input)
160161
.setPositiveButton(
161162
promptOkButtonTitle,

‎dialog/android/src/main/java/com/capacitorjs/plugins/dialog/DialogPlugin.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ public void alert(final PluginCall call) {
1717
final String message = call.getString("message");
1818
final String buttonTitle = call.getString("buttonTitle", "OK");
1919

20-
if (title == null || message == null) {
21-
call.reject("Please provide a title or message for the alert");
20+
if (message == null) {
21+
call.reject("Please provide a message for the dialog");
2222
return;
2323
}
2424

@@ -38,8 +38,8 @@ public void confirm(final PluginCall call) {
3838
final String okButtonTitle = call.getString("okButtonTitle", "OK");
3939
final String cancelButtonTitle = call.getString("cancelButtonTitle", "Cancel");
4040

41-
if (title == null || message == null) {
42-
call.reject("Please provide a title or message for the alert");
41+
if (message == null) {
42+
call.reject("Please provide a message for the dialog");
4343
return;
4444
}
4545

@@ -72,8 +72,8 @@ public void prompt(final PluginCall call) {
7272
final String inputPlaceholder = call.getString("inputPlaceholder", "");
7373
final String inputText = call.getString("inputText", "");
7474

75-
if (title == null || message == null) {
76-
call.reject("Please provide a title or message for the alert");
75+
if (message == null) {
76+
call.reject("Please provide a message for the dialog");
7777
return;
7878
}
7979

‎dialog/ios/Plugin/DialogPlugin.swift

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import Capacitor
88
public class DialogPlugin: CAPPlugin {
99

1010
@objc public func alert(_ call: CAPPluginCall) {
11-
guard let title = call.options["title"] as? String else {
12-
call.reject("title must be provided")
11+
let title = call.options["title"] as? String
12+
guard let message = call.options["message"] as? String else {
13+
call.reject("Please provide a message for the dialog")
1314
return
1415
}
15-
let message = call.options["message"] as? String
1616
let buttonTitle = call.options["buttonTitle"] as? String ?? "OK"
1717

1818
DispatchQueue.main.async { [weak self] in
@@ -25,11 +25,11 @@ public class DialogPlugin: CAPPlugin {
2525
}
2626

2727
@objc public func confirm(_ call: CAPPluginCall) {
28-
guard let title = call.options["title"] as? String else {
29-
call.reject("title must be provided")
28+
let title = call.options["title"] as? String
29+
guard let message = call.options["message"] as? String else {
30+
call.reject("Please provide a message for the dialog")
3031
return
3132
}
32-
let message = call.options["message"] as? String ?? ""
3333
let okButtonTitle = call.options["okButtonTitle"] as? String ?? "OK"
3434
let cancelButtonTitle = call.options["cancelButtonTitle"] as? String ?? "Cancel"
3535

@@ -50,11 +50,11 @@ public class DialogPlugin: CAPPlugin {
5050
}
5151

5252
@objc public func prompt (_ call: CAPPluginCall) {
53-
guard let title = call.options["title"] as? String else {
54-
call.reject("title must be provided")
53+
let title = call.options["title"] as? String
54+
guard let message = call.options["message"] as? String else {
55+
call.reject("Please provide a message for the dialog")
5556
return
5657
}
57-
let message = call.options["message"] as? String ?? ""
5858
let okButtonTitle = call.options["okButtonTitle"] as? String ?? "OK"
5959
let cancelButtonTitle = call.options["cancelButtonTitle"] as? String ?? "Cancel"
6060
let inputPlaceholder = call.options["inputPlaceholder"] as? String ?? ""

‎dialog/src/definitions.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export interface AlertOptions {
44
*
55
* @since 1.0.0
66
*/
7-
title: string;
7+
title?: string;
88

99
/**
1010
* Message to show on the dialog.
@@ -28,7 +28,7 @@ export interface PromptOptions {
2828
*
2929
* @since 1.0.0
3030
*/
31-
title: string;
31+
title?: string;
3232

3333
/**
3434
* Message to show on the dialog.
@@ -74,7 +74,7 @@ export interface ConfirmOptions {
7474
*
7575
* @since 1.0.0
7676
*/
77-
title: string;
77+
title?: string;
7878

7979
/**
8080
* Message to show on the dialog.

0 commit comments

Comments
 (0)