From a47af477b6615f68cdb656039ea68c5cc5aa978a Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Mon, 4 Nov 2019 23:16:25 +0530
Subject: Remove useless parent layout

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
---
 .../widget/MultiselectableConstraintLayout.kt      | 41 ++++++++++++++++++
 .../pwdstore/widget/MultiselectableLinearLayout.kt | 49 ----------------------
 2 files changed, 41 insertions(+), 49 deletions(-)
 create mode 100644 app/src/main/java/com/zeapo/pwdstore/widget/MultiselectableConstraintLayout.kt
 delete mode 100644 app/src/main/java/com/zeapo/pwdstore/widget/MultiselectableLinearLayout.kt

(limited to 'app/src/main/java/com/zeapo/pwdstore/widget')

diff --git a/app/src/main/java/com/zeapo/pwdstore/widget/MultiselectableConstraintLayout.kt b/app/src/main/java/com/zeapo/pwdstore/widget/MultiselectableConstraintLayout.kt
new file mode 100644
index 00000000..3cd88eb4
--- /dev/null
+++ b/app/src/main/java/com/zeapo/pwdstore/widget/MultiselectableConstraintLayout.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2014-2019 The Android Password Store Authors. All Rights Reserved.
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+package com.zeapo.pwdstore.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.zeapo.pwdstore.R
+
+class MultiselectableConstraintLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0,
+    defStyleRes: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr, defStyleRes) {
+    private var multiselected: Boolean = false
+
+    override fun onCreateDrawableState(extraSpace: Int): IntArray {
+        if (multiselected) {
+            val drawableState = super.onCreateDrawableState(extraSpace + 1)
+            View.mergeDrawableStates(drawableState, STATE_MULTISELECTED)
+            return drawableState
+        }
+        return super.onCreateDrawableState(extraSpace)
+    }
+
+    fun setMultiSelected(on: Boolean) {
+        if (!multiselected) {
+            multiselected = true
+            refreshDrawableState()
+        }
+        isActivated = on
+    }
+
+    companion object {
+        private val STATE_MULTISELECTED = intArrayOf(R.attr.state_multiselected)
+    }
+}
diff --git a/app/src/main/java/com/zeapo/pwdstore/widget/MultiselectableLinearLayout.kt b/app/src/main/java/com/zeapo/pwdstore/widget/MultiselectableLinearLayout.kt
deleted file mode 100644
index c857c4d4..00000000
--- a/app/src/main/java/com/zeapo/pwdstore/widget/MultiselectableLinearLayout.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2014-2019 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
- */
-package com.zeapo.pwdstore.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import android.widget.LinearLayout
-import com.zeapo.pwdstore.R
-
-class MultiselectableLinearLayout @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-    defStyleRes: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr, defStyleRes) {
-    private var multiselected: Boolean = false
-
-    override fun onCreateDrawableState(extraSpace: Int): IntArray {
-        if (multiselected) {
-            val drawableState = super.onCreateDrawableState(extraSpace + 1)
-            View.mergeDrawableStates(drawableState, STATE_MULTISELECTED)
-            return drawableState
-        }
-        return super.onCreateDrawableState(extraSpace)
-    }
-
-    fun setMultiSelected(on: Boolean) {
-        if (!multiselected) {
-            multiselected = true
-            refreshDrawableState()
-        }
-        isActivated = on
-    }
-
-    fun setSingleSelected(on: Boolean) {
-        if (multiselected) {
-            multiselected = false
-            refreshDrawableState()
-        }
-        isActivated = on
-    }
-
-    companion object {
-        private val STATE_MULTISELECTED = intArrayOf(R.attr.state_multiselected)
-    }
-}
-- 
cgit v1.2.3