Skip to content

Commit 89cd97e

Browse files
committed
Update dialogs to use material builders
1 parent fdbd21c commit 89cd97e

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ publish {
3636
userOrg = 'buffer'
3737
groupId = 'org.buffer.android'
3838
artifactId = 'android-components'
39-
publishVersion = '0.5'
39+
publishVersion = '0.6'
4040
desc = 'An Android library for frequently used UI components'
4141
website = 'https://github.com/bufferapp/android-components'
4242
}

app/src/main/java/org/buffer/android/components/DialogFactory.kt

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import androidx.annotation.DrawableRes
2121
import androidx.annotation.StringRes
2222
import androidx.appcompat.app.AlertDialog
2323
import androidx.core.content.ContextCompat
24+
import com.google.android.material.dialog.MaterialAlertDialogBuilder
2425

2526
object DialogFactory {
2627

@@ -33,7 +34,7 @@ object DialogFactory {
3334
positiveListener: DialogInterface.OnClickListener? = null,
3435
negativeListener: DialogInterface.OnClickListener? = null
3536
): AlertDialog {
36-
val alertDialog = AlertDialog.Builder(context)
37+
val alertDialog = MaterialAlertDialogBuilder(context)
3738
.setTitle(title)
3839
.setMessage(message)
3940
.setPositiveButton(positive, positiveListener)
@@ -46,10 +47,10 @@ object DialogFactory {
4647
title: String,
4748
message: String
4849
): AlertDialog {
49-
val alertDialog = AlertDialog.Builder(context)
50+
val alertDialog = MaterialAlertDialogBuilder(context)
5051
.setTitle(title)
5152
.setMessage(message)
52-
.setNeutralButton(R.string.dialog_action_ok, null);
53+
.setNeutralButton(R.string.dialog_action_ok, null)
5354
return alertDialog.create()
5455
}
5556

@@ -59,7 +60,7 @@ object DialogFactory {
5960
message: String,
6061
positive: String
6162
): AlertDialog {
62-
val alertDialog = AlertDialog.Builder(context)
63+
val alertDialog = MaterialAlertDialogBuilder(context)
6364
.setTitle(title)
6465
.setMessage(message)
6566
.setPositiveButton(positive, null)
@@ -75,7 +76,7 @@ object DialogFactory {
7576
positiveListener: DialogInterface.OnClickListener? = null,
7677
negativeListener: DialogInterface.OnClickListener? = null
7778
): AlertDialog {
78-
val alertDialog = AlertDialog.Builder(context)
79+
val alertDialog = MaterialAlertDialogBuilder(context)
7980
.setTitle(title)
8081
.setMessage(message)
8182
.setPositiveButton(positive, positiveListener)
@@ -105,7 +106,7 @@ object DialogFactory {
105106
(view.findViewById<View>(R.id.text_message) as TextView).text = context.getString(message)
106107
(view.findViewById<View>(R.id.button_positive) as TextView).text = context.getString(positive)
107108
(view.findViewById<View>(R.id.button_neutral) as TextView).text = context.getString(neutral)
108-
return AlertDialog.Builder(context).setView(view).create()
109+
return MaterialAlertDialogBuilder(context).setView(view).create()
109110
}
110111

111112
fun createInfoDialog(
@@ -119,7 +120,7 @@ object DialogFactory {
119120
negativeListener: DialogInterface.OnClickListener? = null,
120121
neutralListener: DialogInterface.OnClickListener
121122
): AlertDialog {
122-
return AlertDialog.Builder(context)
123+
return MaterialAlertDialogBuilder(context)
123124
.setTitle(titleResource)
124125
.setMessage(messageResource)
125126
.setPositiveButton(positiveResource, positiveListener)
@@ -157,7 +158,7 @@ object DialogFactory {
157158
buttonText: String,
158159
onClickListener: DialogInterface.OnClickListener? = null
159160
): AlertDialog {
160-
val alertDialog = AlertDialog.Builder(context)
161+
val alertDialog = MaterialAlertDialogBuilder(context)
161162
.setTitle(title)
162163
.setMessage(message)
163164
.setPositiveButton(buttonText, onClickListener)
@@ -173,7 +174,7 @@ object DialogFactory {
173174
positiveClickListener: DialogInterface.OnClickListener? = null,
174175
neutralClickListener: DialogInterface.OnClickListener? = null
175176
): AlertDialog {
176-
val alertDialog = AlertDialog.Builder(context)
177+
val alertDialog = MaterialAlertDialogBuilder(context)
177178
.setTitle(title)
178179
.setMessage(message)
179180
.setPositiveButton(positiveButtonText, positiveClickListener)
@@ -194,7 +195,7 @@ object DialogFactory {
194195
items: Array<String>,
195196
onClickListener: DialogInterface.OnClickListener? = null
196197
): AlertDialog {
197-
return AlertDialog.Builder(context).setItems(items, onClickListener).create()
198+
return MaterialAlertDialogBuilder(context).setItems(items, onClickListener).create()
198199
}
199200

200201
fun createProgressDialog(
@@ -239,13 +240,13 @@ object DialogFactory {
239240
defaultText: String?,
240241
inputType: Int
241242
): AlertDialog.Builder {
242-
val builder = AlertDialog.Builder(context)
243+
val builder = MaterialAlertDialogBuilder(context)
243244
builder.setTitle(titleResource)
244245

245246
val input = EditText(context)
246247
input.inputType = inputType
247248
if (inputType == InputType.TYPE_TEXT_FLAG_MULTI_LINE) {
248-
input.setSingleLine(false)
249+
input.isSingleLine = false
249250
input.maxLines = 8
250251
}
251252
if (defaultText != null) input.setText(defaultText)
@@ -266,7 +267,7 @@ object DialogFactory {
266267
inputListener: InputListener? = null,
267268
defaultText: String? = null
268269
): AlertDialog {
269-
val builder = AlertDialog.Builder(context)
270+
val builder = MaterialAlertDialogBuilder(context)
270271
.setTitle(titleResource)
271272
.setMessage(messageResource)
272273

@@ -306,12 +307,12 @@ object DialogFactory {
306307
@StringRes neutral: Int,
307308
@StringRes checkbox: Int,
308309
clickListener: ActionListener? = null
309-
): AlertDialog.Builder {
310+
): MaterialAlertDialogBuilder {
310311
val checkboxView = LayoutInflater.from(context).inflate(R.layout.checkbox, null)
311312
val dontShowAgain = checkboxView.findViewById<CheckBox>(R.id.skip)
312313
dontShowAgain.setText(checkbox)
313314

314-
return AlertDialog.Builder(context)
315+
return MaterialAlertDialogBuilder(context)
315316
.setView(checkboxView)
316317
.setTitle(title)
317318
.setMessage(message)

0 commit comments

Comments
 (0)