Change CheckBox to MaterialCheckBox (34ef8ee7) · Commits · e / os / Mail

app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ import android.os.Bundle
		import android.view.Menu
		import android.view.MenuItem
		import android.view.View
		import android.widget.CheckBox
		import android.widget.TextView
		import androidx.core.content.IntentCompat
		import androidx.core.os.BundleCompat
		@@ -16,6 +15,7 @@ import com.fsck.k9.Identity
		import com.fsck.k9.Preferences
		import com.fsck.k9.ui.R
		import com.fsck.k9.ui.base.K9Activity
		import com.google.android.material.checkbox.MaterialCheckBox
		import org.koin.android.ext.android.inject

		class EditIdentity : K9Activity() {
		@@ -28,7 +28,7 @@ class EditIdentity : K9Activity() {
		private lateinit var name: TextView
		private lateinit var email: TextView
		private lateinit var replyTo: TextView
		private lateinit var signatureUse: CheckBox
		private lateinit var signatureUse: MaterialCheckBox
		private lateinit var signature: TextView
		private lateinit var signatureLayout: View

+2 −2

Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@ import android.os.Bundle;
		import android.view.MenuItem;
		import android.view.View;
		import android.widget.CompoundButton;
		import android.widget.CheckBox;
		import android.widget.EditText;
		import android.widget.LinearLayout;
		import android.widget.RadioButton;
		@@ -16,6 +15,7 @@ import com.fsck.k9.Account;
		import com.fsck.k9.Preferences;
		import com.fsck.k9.ui.R;
		import com.fsck.k9.ui.base.K9Activity;
		import com.google.android.material.checkbox.MaterialCheckBox;

		public class AccountSetupComposition extends K9Activity {

		@@ -27,7 +27,7 @@ public class AccountSetupComposition extends K9Activity {
		private EditText mAccountEmail;
		private EditText mAccountAlwaysBcc;
		private EditText mAccountName;
		private CheckBox mAccountSignatureUse;
		private MaterialCheckBox mAccountSignatureUse;
		private RadioButton mAccountSignatureBeforeLocation;
		private RadioButton mAccountSignatureAfterLocation;
		private LinearLayout mAccountSignatureLayout;

+2 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ import android.os.Bundle
		import android.view.LayoutInflater
		import android.view.View
		import android.view.ViewGroup
		import android.widget.CheckBox
		import android.widget.TextView
		import androidx.fragment.app.Fragment
		import androidx.recyclerview.widget.RecyclerView
		@@ -12,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder
		import app.k9mail.core.android.common.compat.BundleCompat
		import com.fsck.k9.ui.R
		import com.fsck.k9.ui.base.loader.observeLoading
		import com.google.android.material.checkbox.MaterialCheckBox
		import de.cketti.changelog.ReleaseItem
		import org.koin.androidx.viewmodel.ext.android.viewModel
		import org.koin.core.parameter.parametersOf
		@@ -47,7 +47,7 @@ class ChangelogFragment : Fragment() {
		}

		private fun setUpShowRecentChangesCheckbox(view: View) {
		val showRecentChangesCheckBox = view.findViewById<CheckBox>(R.id.show_recent_changes_checkbox)
		val showRecentChangesCheckBox = view.findViewById<MaterialCheckBox>(R.id.show_recent_changes_checkbox)
		var isInitialValue = true
		viewModel.showRecentChangesState.observe(viewLifecycleOwner) { showRecentChanges ->
		showRecentChangesCheckBox.isChecked = showRecentChanges

+3 −3

Original line number	Diff line number	Diff line
		@@ -4,10 +4,10 @@ import android.app.Dialog
		import android.os.Bundle
		import android.text.method.LinkMovementMethod
		import android.view.View
		import android.widget.CheckBox
		import android.widget.TextView
		import androidx.preference.PreferenceDialogFragmentCompat
		import com.fsck.k9.ui.R
		import com.google.android.material.checkbox.MaterialCheckBox
		import com.google.android.material.dialog.MaterialAlertDialogBuilder
		import com.fsck.k9.ui.base.R as BaseR

		@@ -15,14 +15,14 @@ class AutocryptPreferEncryptDialogFragment : PreferenceDialogFragmentCompat() {
		private val preferEncryptPreference: AutocryptPreferEncryptPreference
		get() = preference as AutocryptPreferEncryptPreference

		private lateinit var preferEncryptCheckbox: CheckBox
		private lateinit var preferEncryptCheckbox: MaterialCheckBox

		override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
		val view = layoutInflater.inflate(R.layout.dialog_autocrypt_prefer_encrypt, null)

		view.findViewById<TextView>(R.id.prefer_encrypt_learn_more).makeLinksClickable()

		preferEncryptCheckbox = view.findViewById<CheckBox>(R.id.prefer_encrypt_check).apply {
		preferEncryptCheckbox = view.findViewById<MaterialCheckBox>(R.id.prefer_encrypt_check).apply {
		isChecked = preferEncryptPreference.isPreferEncryptEnabled
		}

+2 −2

Original line number	Diff line number	Diff line
		package com.fsck.k9.ui.settings.export

		import android.view.View
		import android.widget.CheckBox
		import androidx.recyclerview.widget.RecyclerView
		import com.fsck.k9.ui.R
		import com.google.android.material.checkbox.MaterialCheckBox
		import com.mikepenz.fastadapter.FastAdapter
		import com.mikepenz.fastadapter.items.AbstractItem
		import com.mikepenz.fastadapter.listeners.ClickEventHook
		@@ -18,7 +18,7 @@ abstract class CheckBoxItem<VH : CheckBoxViewHolder>(override var identifier: Lo
		}

		open class CheckBoxViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
		val checkBox: CheckBox = itemView.findViewById(R.id.checkBox)
		val checkBox: MaterialCheckBox = itemView.findViewById(R.id.checkBox)
		}

		class CheckBoxClickEvent(val action: (position: Int, isSelected: Boolean) -> Unit) : ClickEventHook<CheckBoxItem<*>>() {