From 0768b9a9202b4414c5571442d8f1bbc41c9b0e55 Mon Sep 17 00:00:00 2001 From: Alexander Lussier-Cullen <alexander.lussier-cullen@savoirfairelinux.com> Date: Thu, 9 May 2024 15:51:42 -0400 Subject: [PATCH] frag_plugins_list_item: change to switch change the appearance of the plugin on/off checkbox in calls and in the settings to be a switch. GitLab: #1493 Change-Id: I7c95ada46cd342be39c211b0789c7975609eafcf --- .../java/cx/ring/viewholders/PluginSettingViewHolder.kt | 4 ++-- .../src/main/java/cx/ring/viewholders/PluginViewHolder.kt | 4 ++-- .../app/src/main/res/layout/frag_plugins_list_item.xml | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/jami-android/app/src/main/java/cx/ring/viewholders/PluginSettingViewHolder.kt b/jami-android/app/src/main/java/cx/ring/viewholders/PluginSettingViewHolder.kt index 6f55f5428..d42a8a426 100644 --- a/jami-android/app/src/main/java/cx/ring/viewholders/PluginSettingViewHolder.kt +++ b/jami-android/app/src/main/java/cx/ring/viewholders/PluginSettingViewHolder.kt @@ -17,10 +17,10 @@ package cx.ring.viewholders import android.view.View -import android.widget.CheckBox import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.materialswitch.MaterialSwitch import cx.ring.R import cx.ring.settings.pluginssettings.PluginDetails import cx.ring.settings.pluginssettings.PluginsListAdapter.PluginListItemListener @@ -28,7 +28,7 @@ import cx.ring.settings.pluginssettings.PluginsListAdapter.PluginListItemListene class PluginSettingViewHolder(itemView: View, listener: PluginListItemListener) : RecyclerView.ViewHolder(itemView) { private val pluginIcon: ImageView = itemView.findViewById(R.id.plugin_item_icon) private val pluginNameTextView: TextView = itemView.findViewById(R.id.plugin_item_name) - private val pluginItemEnableCheckbox: CheckBox = itemView.findViewById(R.id.plugin_item_enable_checkbox) + private val pluginItemEnableCheckbox: MaterialSwitch = itemView.findViewById(R.id.plugin_item_enable_checkbox) private var details: PluginDetails? = null fun setDetails(details: PluginDetails) { diff --git a/jami-android/app/src/main/java/cx/ring/viewholders/PluginViewHolder.kt b/jami-android/app/src/main/java/cx/ring/viewholders/PluginViewHolder.kt index b6b182945..ec007df23 100644 --- a/jami-android/app/src/main/java/cx/ring/viewholders/PluginViewHolder.kt +++ b/jami-android/app/src/main/java/cx/ring/viewholders/PluginViewHolder.kt @@ -17,10 +17,10 @@ package cx.ring.viewholders import android.view.View -import android.widget.CheckBox import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.materialswitch.MaterialSwitch import cx.ring.R import cx.ring.settings.pluginssettings.PluginDetails import cx.ring.adapters.PluginsAdapter.PluginListItemListener @@ -28,7 +28,7 @@ import cx.ring.adapters.PluginsAdapter.PluginListItemListener class PluginViewHolder(itemView: View, listener: PluginListItemListener) : RecyclerView.ViewHolder(itemView) { private val pluginIcon: ImageView = itemView.findViewById(R.id.plugin_item_icon) private val pluginNameTextView: TextView = itemView.findViewById(R.id.plugin_item_name) - private val pluginItemEnableCheckbox: CheckBox = itemView.findViewById(R.id.plugin_item_enable_checkbox) + private val pluginItemEnableCheckbox: MaterialSwitch = itemView.findViewById(R.id.plugin_item_enable_checkbox) private var details: PluginDetails? = null fun setDetails(details: PluginDetails) { diff --git a/jami-android/app/src/main/res/layout/frag_plugins_list_item.xml b/jami-android/app/src/main/res/layout/frag_plugins_list_item.xml index a25eb2a0a..8faeee581 100644 --- a/jami-android/app/src/main/res/layout/frag_plugins_list_item.xml +++ b/jami-android/app/src/main/res/layout/frag_plugins_list_item.xml @@ -55,13 +55,14 @@ along with this program; if not, write to the Free Software android:textSize="16sp" tools:text="@tools:sample/full_names" /> - <com.google.android.material.checkbox.MaterialCheckBox + <com.google.android.material.materialswitch.MaterialSwitch android:id="@+id/plugin_item_enable_checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:backgroundTint="@color/colorPrimary" + android:checked="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" - android:checked="true" /> + app:layout_constraintTop_toTopOf="parent" /> </LinearLayout> \ No newline at end of file -- GitLab