Clean up the API a bit

Author: Jawnnypoo

togglebuttonlayout/src/main/java/com/savvyapps/togglebuttonlayout/Toggle.kt

@@ -27,11 +27,18 @@ class Toggle(
      */
     var isSelected: Boolean = false
 
-    internal var parentRef: ToggleButtonLayout? = null
 
-    fun getToggleButtonLayout(): ToggleButtonLayout? {
-        return parentRef
-    }
+    /**
+     * Get the parent view of the toggle. Null if not yet inflated
+     */
+    var toggleButtonLayout: ToggleButtonLayout? = null
+        internal set
+
+    /**
+     * The current toggle view. Null if not yet inflated
+     */
+    var toggleView: ToggleView? = null
+        internal set
 
     init {
         if (id == 0) {

togglebuttonlayout/src/main/java/com/savvyapps/togglebuttonlayout/ToggleButtonLayout.kt

@@ -19,11 +19,11 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 
-@Suppress("MemberVisibilityCanBePrivate", "unused")
 /**
  * ToggleButtonLayout is a layout used to group related options. Layout and spacing is arranged to
  * convey that certain toggle buttons are part of a group.
  */
+@Suppress("MemberVisibilityCanBePrivate", "unused")
 class ToggleButtonLayout : CardView {
 
     companion object {
@@ -116,7 +116,7 @@ class ToggleButtonLayout : CardView {
     /**
      * Listen for when toggles get selected and deselected
      */
-    var onToggledListener: ((v: View?, toggle: Toggle, selected: Boolean) -> Unit)? = null
+    var onToggledListener: ((toggleButtonLayout: ToggleButtonLayout?, toggle: Toggle, selected: Boolean) -> Unit)? = null
 
     constructor(context: Context) : super(context) {
         init(context, null)
@@ -173,9 +173,7 @@ class ToggleButtonLayout : CardView {
         MenuInflater(context).inflate(menuId, menu)
         for (i in 0 until menu.size()) {
             val item = menu.getItem(i)
-            val toggle = Toggle(item.itemId, item.icon, item.title).apply {
-                this.parentRef = this@ToggleButtonLayout
-            }
+            val toggle = Toggle(item.itemId, item.icon, item.title)
             addToggle(toggle)
         }
     }
@@ -212,6 +210,8 @@ class ToggleButtonLayout : CardView {
             toggleView.layoutParams = params
         }
         linearLayout.addView(toggleView)
+        toggle.toggleView = toggleView
+        toggle.toggleButtonLayout = this
     }
 
     /**
@@ -278,35 +278,4 @@ class ToggleButtonLayout : CardView {
             view.background = null
         }
     }
-
-    /**
-     * Default view for Toggle
-     */
-    @SuppressLint("ViewConstructor")
-    internal class ToggleView(context: Context, toggle: Toggle, @LayoutRes layoutRes: Int?) : FrameLayout(context) {
-        private val textView: TextView?
-        private val imageView: ImageView?
-
-        init {
-            id = toggle.id
-            if (layoutRes != null) {
-                View.inflate(context, layoutRes, this)
-                textView = findViewById(android.R.id.text1)
-                imageView = findViewById(android.R.id.icon)
-            } else {
-                textView = TextView(context)
-                imageView = ImageView(context)
-                addView(imageView)
-                addView(textView)
-                val eightDp = Utils.dpToPx(getContext(), 8)
-                setPadding(eightDp, eightDp, eightDp, eightDp)
-            }
-            setTag(R.id.tb_toggle_id, toggle)
-            textView?.text = toggle.title
-            if (toggle.icon != null) {
-                imageView?.setImageDrawable(toggle.icon)
-            }
-            foreground = Utils.getThemeAttrDrawable(getContext(), R.attr.selectableItemBackground)
-        }
-    }
 }

togglebuttonlayout/src/main/java/com/savvyapps/togglebuttonlayout/ToggleView.kt

@@ -0,0 +1,42 @@
+package com.savvyapps.togglebuttonlayout
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.support.annotation.LayoutRes
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.TextView
+
+/**
+ * Default view for Toggle. Be sure to use references [android.R.id.text1] and
+ * [android.R.id.icon] if using your own layout
+ */
+@Suppress("MemberVisibilityCanBePrivate")
+@SuppressLint("ViewConstructor")
+class ToggleView(context: Context, toggle: Toggle, @LayoutRes layoutRes: Int?) : FrameLayout(context) {
+    val textView: TextView?
+    val imageView: ImageView?
+
+    init {
+        id = toggle.id
+        if (layoutRes != null) {
+            View.inflate(context, layoutRes, this)
+            textView = findViewById(android.R.id.text1)
+            imageView = findViewById(android.R.id.icon)
+        } else {
+            textView = TextView(context)
+            imageView = ImageView(context)
+            addView(imageView)
+            addView(textView)
+            val eightDp = Utils.dpToPx(getContext(), 8)
+            setPadding(eightDp, eightDp, eightDp, eightDp)
+        }
+        setTag(R.id.tb_toggle_id, toggle)
+        textView?.text = toggle.title
+        if (toggle.icon != null) {
+            imageView?.setImageDrawable(toggle.icon)
+        }
+        foreground = Utils.getThemeAttrDrawable(getContext(), R.attr.selectableItemBackground)
+    }
+}