From f090724c85fd05569b22298ee611c1cdaa1217d8 Mon Sep 17 00:00:00 2001
From: Nils <highball-it@dittberner.it>
Date: Sun, 3 Sep 2017 13:17:08 +0200
Subject: [PATCH] Moved button to own class

---
 app/src/main/java/de/mlte/soundboard/MainActivity.kt | 14 ++------------
 app/src/main/java/de/mlte/soundboard/SoundButton.kt  | 19 +++++++++++++++++++
 app/src/main/res/layout/layout_button.xml            |  4 ++--
 3 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/java/de/mlte/soundboard/SoundButton.kt

diff --git a/app/src/main/java/de/mlte/soundboard/MainActivity.kt b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
index 8854f09..02c78c3 100644
--- a/app/src/main/java/de/mlte/soundboard/MainActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
@@ -88,18 +88,8 @@ class MainActivity : AppCompatActivity() {
 
         for (row in 0..1) {
             for (col in 0..1) {
-                val newFrame = inflater.inflate(R.layout.layout_button, null)
-                // newFrame.findViewById<ProgressBar>(R.id.progress_bar)
-                // newFrame.findViewById<TextView>(R.id.text_view_button)
-
-                val params = GridLayout.LayoutParams()
-                params.columnSpec = GridLayout.spec(col, 1, 1.0f)
-                params.rowSpec = GridLayout.spec(row, 1, 1.0f)
-                params.width = 0
-                params.height = 0
-                newFrame.layoutParams = params
-
-                parent.addView(newFrame)
+                val soundButton = SoundButton(this, col, row)
+                parent.addView(soundButton)
             }
         }
     }
diff --git a/app/src/main/java/de/mlte/soundboard/SoundButton.kt b/app/src/main/java/de/mlte/soundboard/SoundButton.kt
new file mode 100644
index 0000000..bac36c1
--- /dev/null
+++ b/app/src/main/java/de/mlte/soundboard/SoundButton.kt
@@ -0,0 +1,19 @@
+package de.mlte.soundboard
+
+import android.content.Context
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.GridLayout
+
+class SoundButton : FrameLayout {
+    constructor(context: Context, col: Int, row: Int) : super(context) {
+        View.inflate(context, R.layout.layout_button, this)
+
+        val params = GridLayout.LayoutParams()
+        params.columnSpec = GridLayout.spec(col, 1, 1.0f)
+        params.rowSpec = GridLayout.spec(row, 1, 1.0f)
+        params.width = 0
+        params.height = 0
+        layoutParams = params
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_button.xml b/app/src/main/res/layout/layout_button.xml
index 66f80b1..b5fece5 100644
--- a/app/src/main/res/layout/layout_button.xml
+++ b/app/src/main/res/layout/layout_button.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:padding="2dp">
     <ProgressBar
         android:id="@+id/progress_bar"