Skip to content
This repository was archived by the owner on Jul 13, 2020. It is now read-only.

Commit b3d2245

Browse files
thatfiredev4u7
authored andcommitted
fix: Replace Snackbar's message type from String to CharSequence (#655)
Fix #654
1 parent 78cfe0a commit b3d2245

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

anko/library/static/design/src/main/java/Snackbar.kt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ inline fun indefiniteSnackbar(view: View, message: Int) = Snackbar
5757
*
5858
* @param message the message text.
5959
*/
60-
@Deprecated("Use 'View.snackbar(String)' instead.", ReplaceWith("view.snackbar(message)"))
61-
inline fun snackbar(view: View, message: String) = Snackbar
60+
@Deprecated("Use 'View.snackbar(CharSequence)' instead.", ReplaceWith("view.snackbar(message)"))
61+
inline fun snackbar(view: View, message: CharSequence) = Snackbar
6262
.make(view, message, Snackbar.LENGTH_SHORT)
6363
.apply { show() }
6464

@@ -67,8 +67,8 @@ inline fun snackbar(view: View, message: String) = Snackbar
6767
*
6868
* @param message the message text.
6969
*/
70-
@Deprecated("Use 'View.longSnackbar(String)' instead.", ReplaceWith("view.longSnackbar(message)"))
71-
inline fun longSnackbar(view: View, message: String) = Snackbar
70+
@Deprecated("Use 'View.longSnackbar(CharSequence)' instead.", ReplaceWith("view.longSnackbar(message)"))
71+
inline fun longSnackbar(view: View, message: CharSequence) = Snackbar
7272
.make(view, message, Snackbar.LENGTH_LONG)
7373
.apply { show() }
7474

@@ -77,8 +77,8 @@ inline fun longSnackbar(view: View, message: String) = Snackbar
7777
*
7878
* @param message the message text.
7979
*/
80-
@Deprecated("Use 'View.indefiniteSnackbar(String)' instead.", ReplaceWith("view.indefiniteSnackbar(message)"))
81-
inline fun indefiniteSnackbar(view: View, message: String) = Snackbar
80+
@Deprecated("Use 'View.indefiniteSnackbar(CharSequence)' instead.", ReplaceWith("view.indefiniteSnackbar(message)"))
81+
inline fun indefiniteSnackbar(view: View, message: CharSequence) = Snackbar
8282
.make(view, message, Snackbar.LENGTH_INDEFINITE)
8383
.apply { show() }
8484

@@ -120,8 +120,8 @@ inline fun indefiniteSnackbar(view: View, message: Int, actionText: Int, noinlin
120120
*
121121
* @param message the message text.
122122
*/
123-
@Deprecated("Use 'View.snackbar(String, String, (View) -> Unit)' instead.", ReplaceWith("view.snackbar(message, actionText, action)"))
124-
inline fun snackbar(view: View, message: String, actionText: String, noinline action: (View) -> Unit) = Snackbar
123+
@Deprecated("Use 'View.snackbar(CharSequence, CharSequence, (View) -> Unit)' instead.", ReplaceWith("view.snackbar(message, actionText, action)"))
124+
inline fun snackbar(view: View, message: CharSequence, actionText: CharSequence, noinline action: (View) -> Unit) = Snackbar
125125
.make(view, message, Snackbar.LENGTH_SHORT)
126126
.setAction(actionText, action)
127127
.apply { show() }
@@ -131,8 +131,8 @@ inline fun snackbar(view: View, message: String, actionText: String, noinline ac
131131
*
132132
* @param message the message text.
133133
*/
134-
@Deprecated("Use 'View.longSnackbar(String, String, (View) -> Unit)' instead.", ReplaceWith("view.longSnackbar(message, actionText, action)"))
135-
inline fun longSnackbar(view: View, message: String, actionText: String, noinline action: (View) -> Unit) = Snackbar
134+
@Deprecated("Use 'View.longSnackbar(CharSequence, CharSequence, (View) -> Unit)' instead.", ReplaceWith("view.longSnackbar(message, actionText, action)"))
135+
inline fun longSnackbar(view: View, message: CharSequence, actionText: CharSequence, noinline action: (View) -> Unit) = Snackbar
136136
.make(view, message, Snackbar.LENGTH_LONG)
137137
.setAction(actionText, action)
138138
.apply { show() }
@@ -142,8 +142,8 @@ inline fun longSnackbar(view: View, message: String, actionText: String, noinlin
142142
*
143143
* @param message the message text.
144144
*/
145-
@Deprecated("Use 'View.indefiniteSnackbar(String, String, (View) -> Unit)' instead.", ReplaceWith("view.indefiniteSnackbar(message, actionText, action)"))
146-
inline fun indefiniteSnackbar(view: View, message: String, actionText: String, noinline action: (View) -> Unit) = Snackbar
145+
@Deprecated("Use 'View.indefiniteSnackbar(CharSequence, CharSequence, (View) -> Unit)' instead.", ReplaceWith("view.indefiniteSnackbar(message, actionText, action)"))
146+
inline fun indefiniteSnackbar(view: View, message: CharSequence, actionText: CharSequence, noinline action: (View) -> Unit) = Snackbar
147147
.make(view, message, Snackbar.LENGTH_INDEFINITE)
148148
.setAction(actionText, action)
149149
.apply { show() }
@@ -184,7 +184,7 @@ inline fun View.indefiniteSnackbar(@StringRes message: Int) = Snackbar
184184
* @param message the message text.
185185
*/
186186
@JvmName("snackbar2")
187-
inline fun View.snackbar(message: String) = Snackbar
187+
inline fun View.snackbar(message: CharSequence) = Snackbar
188188
.make(this, message, Snackbar.LENGTH_SHORT)
189189
.apply { show() }
190190

@@ -194,7 +194,7 @@ inline fun View.snackbar(message: String) = Snackbar
194194
* @param message the message text.
195195
*/
196196
@JvmName("longSnackbar2")
197-
inline fun View.longSnackbar(message: String) = Snackbar
197+
inline fun View.longSnackbar(message: CharSequence) = Snackbar
198198
.make(this, message, Snackbar.LENGTH_LONG)
199199
.apply { show() }
200200

@@ -204,7 +204,7 @@ inline fun View.longSnackbar(message: String) = Snackbar
204204
* @param message the message text.
205205
*/
206206
@JvmName("indefiniteSnackbar2")
207-
inline fun View.indefiniteSnackbar(message: String) = Snackbar
207+
inline fun View.indefiniteSnackbar(message: CharSequence) = Snackbar
208208
.make(this, message, Snackbar.LENGTH_INDEFINITE)
209209
.apply { show() }
210210

@@ -247,7 +247,7 @@ inline fun View.indefiniteSnackbar(@StringRes message: Int, @StringRes actionTex
247247
* @param message the message text.
248248
*/
249249
@JvmName("snackbar2")
250-
inline fun View.snackbar(message: String, actionText: String, noinline action: (View) -> Unit) = Snackbar
250+
inline fun View.snackbar(message: CharSequence, actionText: CharSequence, noinline action: (View) -> Unit) = Snackbar
251251
.make(this, message, Snackbar.LENGTH_SHORT)
252252
.setAction(actionText, action)
253253
.apply { show() }
@@ -258,7 +258,7 @@ inline fun View.snackbar(message: String, actionText: String, noinline action: (
258258
* @param message the message text.
259259
*/
260260
@JvmName("longSnackbar2")
261-
inline fun View.longSnackbar(message: String, actionText: String, noinline action: (View) -> Unit) = Snackbar
261+
inline fun View.longSnackbar(message: CharSequence, actionText: CharSequence, noinline action: (View) -> Unit) = Snackbar
262262
.make(this, message, Snackbar.LENGTH_LONG)
263263
.setAction(actionText, action)
264264
.apply { show() }
@@ -269,7 +269,7 @@ inline fun View.longSnackbar(message: String, actionText: String, noinline actio
269269
* @param message the message text.
270270
*/
271271
@JvmName("indefiniteSnackbar2")
272-
inline fun View.indefiniteSnackbar(message: String, actionText: String, noinline action: (View) -> Unit) = Snackbar
272+
inline fun View.indefiniteSnackbar(message: CharSequence, actionText: CharSequence, noinline action: (View) -> Unit) = Snackbar
273273
.make(this, message, Snackbar.LENGTH_INDEFINITE)
274274
.setAction(actionText, action)
275275
.apply { show() }

0 commit comments

Comments
 (0)