From 380ca1017fc09fafca77acf1cd76edc400991868 Mon Sep 17 00:00:00 2001 From: Vadim Furman Date: Sat, 13 Feb 2021 18:53:59 -0800 Subject: [PATCH] Use snackbar --- .../main/java/com/geeksville/mesh/ui/SettingsFragment.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt index 5d9ed961..fe0ad40f 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt @@ -49,6 +49,7 @@ import com.google.android.gms.location.LocationRequest import com.google.android.gms.location.LocationServices import com.google.android.gms.location.LocationSettingsRequest import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.google.android.material.snackbar.Snackbar import com.hoho.android.usbserial.driver.UsbSerialDriver import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -626,14 +627,14 @@ class SettingsFragment : ScreenFragment("Settings"), Logging { ChannelOption.fromConfig(model.radioConfig.value?.channelSettings?.modemConfig)?.minBroadcastPeriodSecs ?: 9000 info("edit broadcast $n min $minBroadcastPeriodSecs") - if (n != null && n >= 0 && n >= minBroadcastPeriodSecs) { - model.positionBroadcastSecs = n + if (n != null && n < MAX_INT_DEVICE && (n == 0 || n >= minBroadcastPeriodSecs)) { + model.positionBroadcastSecs = n } else { // restore the value in the edit field textEdit.setText(model.positionBroadcastSecs.toString()) - val errorText = if (n == null || n <= 0) "Bad value: ${textEdit.text.toString()}" else + val errorText = if (n == null || n < 0 || n >= MAX_INT_DEVICE) "Bad value: ${textEdit.text.toString()}" else getString(R.string.broadcast_period_too_small).format(minBroadcastPeriodSecs) - Toast.makeText(context, errorText, Toast.LENGTH_LONG).show() + Snackbar.make(requireView(), errorText, Snackbar.LENGTH_LONG).show() } requireActivity().hideKeyboard()