app: switch back to buttons for SSH config screen

2 files changed, 15 insertions, 8 deletions

diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt
index d1e84374..4b82ee81 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt
@@ -65,7 +65,11 @@ class GitServerConfigActivity : BaseGitActivity() {
         AuthMode.OpenKeychain -> check(binding.authModeOpenKeychain.id)
         AuthMode.None -> check(View.NO_ID)
       }
-      setOnCheckedChangeListener { _, checkedId ->
+      addOnButtonCheckedListener { _, checkedId, isChecked ->
+        if (!isChecked) {
+          newAuthMode = AuthMode.None
+          return@addOnButtonCheckedListener
+        }
         when (checkedId) {
           binding.authModeSshKey.id -> newAuthMode = AuthMode.SshKey
           binding.authModeOpenKeychain.id -> newAuthMode = AuthMode.OpenKeychain
@@ -213,12 +217,12 @@ class GitServerConfigActivity : BaseGitActivity() {
         authModeSshKey.isVisible = false
         authModeOpenKeychain.isVisible = false
         authModePassword.isVisible = true
-        if (authModeGroup.checkedChipId != authModePassword.id) authModeGroup.check(View.NO_ID)
+        if (authModeGroup.checkedButtonId != authModePassword.id) authModeGroup.check(View.NO_ID)
       } else {
         authModeSshKey.isVisible = true
         authModeOpenKeychain.isVisible = true
         authModePassword.isVisible = true
-        if (authModeGroup.checkedChipId == View.NO_ID) authModeGroup.check(authModeSshKey.id)
+        if (authModeGroup.checkedButtonId == View.NO_ID) authModeGroup.check(authModeSshKey.id)
       }
     }
 
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index 51ca17e1..6c991faa 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -67,7 +67,7 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/label_server_branch" />
 
-    <com.google.android.material.chip.ChipGroup
+    <com.google.android.material.button.MaterialButtonToggleGroup
       android:id="@+id/auth_mode_group"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -75,24 +75,27 @@
       app:layout_constraintTop_toBottomOf="@id/label_auth_mode"
       app:singleSelection="true">
 
-      <com.google.android.material.chip.Chip
+      <com.google.android.material.button.MaterialButton
         android:id="@+id/auth_mode_ssh_key"
+        style="?attr/materialButtonOutlinedStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/connection_mode_ssh_key" />
 
-      <com.google.android.material.chip.Chip
+      <com.google.android.material.button.MaterialButton
         android:id="@+id/auth_mode_password"
+        style="?attr/materialButtonOutlinedStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/connection_mode_basic_authentication" />
 
-      <com.google.android.material.chip.Chip
+      <com.google.android.material.button.MaterialButton
         android:id="@+id/auth_mode_open_keychain"
+        style="?attr/materialButtonOutlinedStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/connection_mode_openkeychain" />
-    </com.google.android.material.chip.ChipGroup>
+    </com.google.android.material.button.MaterialButtonToggleGroup>
 
     <com.google.android.material.button.MaterialButton
       android:id="@+id/save_button"