From bc57946aec59469946f4af580c711bd8321e2f94 Mon Sep 17 00:00:00 2001 From: andrekir Date: Sat, 8 Jan 2022 16:18:36 -0300 Subject: [PATCH] convert changeRadioButton to fab --- .../java/com/geeksville/mesh/ui/SettingsFragment.kt | 2 -- app/src/main/res/drawable/ic_twotone_add_24.xml | 10 ++++++++++ app/src/main/res/layout/settings_fragment.xml | 12 ++++++------ 3 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 app/src/main/res/drawable/ic_twotone_add_24.xml 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 bb8f0a9ff..9888caf57 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt @@ -831,10 +831,8 @@ class SettingsFragment : ScreenFragment("Settings"), Logging { if (curRadio != null) { binding.scanStatusText.text = getString(R.string.current_pair).format(curRadio) - binding.changeRadioButton.text = getString(R.string.change_radio) } else { binding.scanStatusText.text = getString(R.string.not_paired_yet) - binding.changeRadioButton.setText(R.string.select_radio) } binding.changeRadioButton.setOnClickListener { myActivity.startCompanionScan() diff --git a/app/src/main/res/drawable/ic_twotone_add_24.xml b/app/src/main/res/drawable/ic_twotone_add_24.xml new file mode 100644 index 000000000..eb232541d --- /dev/null +++ b/app/src/main/res/drawable/ic_twotone_add_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml index fefd3e54e..c9d1372b3 100644 --- a/app/src/main/res/layout/settings_fragment.xml +++ b/app/src/main/res/layout/settings_fragment.xml @@ -96,7 +96,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="16dp" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/changeRadioButton"> + app:layout_constraintTop_toBottomOf="@+id/scanStatusText"> - + app:layout_constraintBottom_toTopOf="@+id/reportBugButton" />