Merge pull request #114 from hannesa2/KotlinConversion

Kotlin conversion

Author: hannesa2

demo/src/main/java/com/sothree/slidinguppanel/demo/DemoActivity.kt

@@ -9,28 +9,32 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.*
 import android.widget.AdapterView.OnItemClickListener
+import android.widget.ArrayAdapter
+import android.widget.Button
+import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import com.sothree.slidinguppanel.PanelSlideListener
 import com.sothree.slidinguppanel.PanelState
 import com.sothree.slidinguppanel.demo.databinding.ActivityDemoBinding
-import java.util.*
 
 class DemoActivity : AppCompatActivity() {
 
+    private val tag = "DemoActivity"
     private lateinit var binding: ActivityDemoBinding
-    
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityDemoBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        
+
         setSupportActionBar(findViewById<View>(R.id.main_toolbar) as Toolbar)
-        binding.listView.onItemClickListener =
-            OnItemClickListener { parent, view, position, id -> Toast.makeText(this@DemoActivity, "onItemClick", Toast.LENGTH_SHORT).show() }
-        val yourArrayList = Arrays.asList(
+        binding.listView.onItemClickListener = OnItemClickListener { _, _, _, _ ->
+            Toast.makeText(this@DemoActivity, "onItemClick", Toast.LENGTH_SHORT).show()
+        }
+        val yourArrayList = listOf(
             "This",
             "Is",
             "An",
@@ -61,18 +65,16 @@ class DemoActivity : AppCompatActivity() {
         // first parameter, the type of list view as a second parameter and your
         // array as a third parameter.
         val arrayAdapter = ArrayAdapter(
-            this,
-            android.R.layout.simple_list_item_1,
-            yourArrayList
+            this, android.R.layout.simple_list_item_1, yourArrayList
         )
         binding.listView.adapter = arrayAdapter
         binding.slidingLayout.addPanelSlideListener(object : PanelSlideListener {
             override fun onPanelSlide(panel: View, slideOffset: Float) {
-                Log.i(TAG, "onPanelSlide, offset $slideOffset")
+                Log.i(tag, "onPanelSlide, offset $slideOffset")
             }
 
             override fun onPanelStateChanged(panel: View, previousState: PanelState, newState: PanelState) {
-                Log.i(TAG, "onPanelStateChanged $newState")
+                Log.i(tag, "onPanelStateChanged $newState")
             }
         })
         binding.slidingLayout.setFadeOnClickListener { binding.slidingLayout.setPanelState(PanelState.COLLAPSED) }
@@ -92,38 +94,35 @@ class DemoActivity : AppCompatActivity() {
         // Inflate the menu; this adds items to the action bar if it is present.
         menuInflater.inflate(R.menu.demo, menu)
         val item = menu.findItem(R.id.action_toggle)
-        if (binding.slidingLayout.panelState == PanelState.HIDDEN) {
+        if (binding.slidingLayout.getPanelState() == PanelState.HIDDEN) {
             item.setTitle(R.string.action_show)
         } else {
             item.setTitle(R.string.action_hide)
         }
         return true
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu): Boolean {
-        return super.onPrepareOptionsMenu(menu)
-    }
-
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_toggle -> {
-                if (binding.slidingLayout.panelState != PanelState.HIDDEN) {
-                    binding.slidingLayout.panelState = PanelState.HIDDEN
+                if (binding.slidingLayout.getPanelState() != PanelState.HIDDEN) {
+                    binding.slidingLayout.setPanelState(PanelState.HIDDEN)
                     item.setTitle(R.string.action_show)
                 } else {
-                    binding.slidingLayout.panelState = PanelState.COLLAPSED
+                    binding.slidingLayout.setPanelState(PanelState.COLLAPSED)
                     item.setTitle(R.string.action_hide)
                 }
                 return true
             }
+
             R.id.action_anchor -> {
                 if (binding.slidingLayout.anchorPoint == 1.0f) {
                     binding.slidingLayout.anchorPoint = 0.7f
-                    binding.slidingLayout.panelState = PanelState.ANCHORED
+                    binding.slidingLayout.setPanelState(PanelState.ANCHORED)
                     item.setTitle(R.string.action_anchor_disable)
                 } else {
                     binding.slidingLayout.anchorPoint = 1.0f
-                    binding.slidingLayout.panelState = PanelState.COLLAPSED
+                    binding.slidingLayout.setPanelState(PanelState.COLLAPSED)
                     item.setTitle(R.string.action_anchor_enable)
                 }
                 return true
@@ -133,14 +132,10 @@ class DemoActivity : AppCompatActivity() {
     }
 
     override fun onBackPressed() {
-        if ((binding.slidingLayout.panelState == PanelState.EXPANDED || binding.slidingLayout.panelState == PanelState.ANCHORED)) {
-            binding.slidingLayout.panelState = PanelState.COLLAPSED
+        if ((binding.slidingLayout.getPanelState() == PanelState.EXPANDED || binding.slidingLayout.getPanelState() == PanelState.ANCHORED)) {
+            binding.slidingLayout.setPanelState(PanelState.COLLAPSED)
         } else {
             super.onBackPressed()
         }
     }
-
-    companion object {
-        private const val TAG = "DemoActivity"
-    }
-}
+}

library/src/main/java/com/sothree/slidinguppanel/LayoutWeightParams.kt

@@ -6,7 +6,6 @@ import android.view.ViewGroup
 import android.util.AttributeSet
 
 class LayoutWeightParams : MarginLayoutParams {
-    @JvmField
     var weight = 0f
 
     constructor() : super(MATCH_PARENT, MATCH_PARENT)

library/src/main/java/com/sothree/slidinguppanel/PanelSlideListener.kt

@@ -17,4 +17,4 @@ interface PanelSlideListener {
      * @param panel The child view that was slid to an collapsed position
      */
     fun onPanelStateChanged(panel: View, previousState: PanelState, newState: PanelState)
-}
+}