AudioFX: dynamically add available knobs

Knobs were defined statically for non-waves devices, but we cannot
assume knobs/effects are availble, so query them and add them as needed.

Change-Id: I759f99555a0956c43946bc7007d711273e608e0f
Signed-off-by: Roman Birg <roman@cyngn.com>

3 files changed, 28 insertions, 101 deletions

diff --git a/res/layout/activity_main_generic.xml b/res/layout/activity_main_generic.xml
index 06bcbdc..c33f544 100644
--- a/res/layout/activity_main_generic.xml
+++ b/res/layout/activity_main_generic.xml
@@ -68,101 +68,6 @@
                 android:animateLayoutChanges="true"
                 android:layout_weight="1">
 
-            <Space
-                    android:layout_weight="0.1"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"/>
-
-            <FrameLayout
-                    android:id="@+id/treble_knob_container"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_weight="0"
-                    android:paddingBottom="@dimen/knob_container_padding_bottom">
-
-                <com.cyngn.audiofx.knobs.RadialKnob
-                        android:id="@+id/treble_knob"
-                        android:layout_width="@dimen/knob_width"
-                        android:layout_gravity="top|center_horizontal"
-                        android:layout_height="wrap_content"
-                        custom:foreground="@drawable/knob"
-                        />
-
-                <TextView
-                        android:id="@+id/treble_label"
-                        android:layout_gravity="bottom|center_horizontal"
-                        android:layout_height="22dp"
-                        android:text="@string/treble"
-                        android:layout_width="wrap_content"/>
-
-            </FrameLayout>
-
-            <Space
-                    android:layout_weight="0.1"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"/>
-
-            <FrameLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_weight="0"
-                    android:id="@+id/bass_knob_container"
-                    android:paddingBottom="@dimen/knob_container_padding_bottom">
-
-                <com.cyngn.audiofx.knobs.RadialKnob
-                        android:id="@+id/bass_knob"
-                        android:layout_gravity="top|center_horizontal"
-                        android:layout_width="@dimen/knob_width"
-                        android:layout_height="wrap_content"
-                        custom:foreground="@drawable/knob"/>
-
-                <TextView
-                        android:id="@+id/bass_label"
-                        android:layout_height="22dp"
-                        android:text="@string/bass"
-                        android:layout_gravity="bottom|center_horizontal"
-                        android:layout_width="wrap_content"/>
-
-            </FrameLayout>
-
-            <Space
-                    android:layout_weight="0.1"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"/>
-
-            <FrameLayout
-                    android:id="@+id/virtualizer_knob_container"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_weight="0"
-                    android:visibility="gone"
-                    android:paddingBottom="@dimen/knob_container_padding_bottom">
-
-                <com.cyngn.audiofx.knobs.RadialKnob
-                        android:id="@+id/virtualizer_knob"
-                        android:layout_gravity="top|center_horizontal"
-                        android:layout_width="@dimen/knob_width"
-                        android:layout_height="wrap_content"
-                        custom:foreground="@drawable/knob"/>
-
-                <TextView
-                        android:id="@+id/virtualizer_label"
-                        android:layout_height="22dp"
-                        android:text="@string/virtualizer"
-                        android:layout_gravity="bottom|center_horizontal"
-                        android:layout_width="wrap_content"/>
-
-            </FrameLayout>
-
-            <Space
-                    android:visibility="gone"
-                    android:layout_weight="0.1"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"/>
-
         </com.cyngn.audiofx.knobs.KnobContainer>
 
     </LinearLayout>
diff --git a/res/layout/activity_main_maxx_audio.xml b/res/layout/activity_main_maxx_audio.xml
index 1f03ea1..082f82b 100644
--- a/res/layout/activity_main_maxx_audio.xml
+++ b/res/layout/activity_main_maxx_audio.xml
@@ -114,7 +114,7 @@
                     android:paddingBottom="@dimen/knob_container_padding_bottom">
 
                 <com.cyngn.audiofx.knobs.RadialKnob
-                        android:id="@+id/treble_knob"
+                        android:id="@+id/knob"
                         android:layout_width="@dimen/knob_width"
                         android:layout_gravity="top|center_horizontal"
                         android:layout_height="wrap_content"
@@ -123,7 +123,7 @@
                         />
 
                 <ImageView
-                        android:id="@+id/treble_label"
+                        android:id="@+id/label"
                         android:layout_gravity="bottom|center_horizontal"
                         android:layout_width="76dp"
                         android:layout_height="22dp"
@@ -146,7 +146,7 @@
                     android:paddingBottom="@dimen/knob_container_padding_bottom">
 
                 <com.cyngn.audiofx.knobs.RadialKnob
-                        android:id="@+id/bass_knob"
+                        android:id="@+id/knob"
                         android:layout_gravity="top|center_horizontal"
                         android:layout_width="@dimen/knob_width"
                         android:layout_height="wrap_content"
@@ -154,7 +154,7 @@
                         custom:foreground="@drawable/knob"/>
 
                 <ImageView
-                        android:id="@+id/bass_label"
+                        android:id="@+id/label"
                         android:layout_gravity="bottom|center_horizontal"
                         android:layout_width="68dp"
                         android:layout_height="22dp"
@@ -178,7 +178,7 @@
                     android:paddingBottom="@dimen/knob_container_padding_bottom">
 
                 <com.cyngn.audiofx.knobs.RadialKnob
-                        android:id="@+id/virtualizer_knob"
+                        android:id="@+id/knob"
                         android:layout_gravity="top|center_horizontal"
                         android:layout_width="@dimen/knob_width"
                         android:layout_height="wrap_content"
@@ -186,7 +186,7 @@
 
 
                 <ImageView
-                        android:id="@+id/virtualizer_label"
+                        android:id="@+id/label"
                         android:layout_gravity="bottom|center_horizontal"
                         android:layout_width="69dp"
                         android:layout_height="22dp"
diff --git a/res/layout/generic_knob_control.xml b/res/layout/generic_knob_control.xml
new file mode 100644
index 0000000..454e1fb
--- /dev/null
+++ b/res/layout/generic_knob_control.xml
@@ -0,0 +1,22 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:custom="http://schemas.android.com/apk/res/com.cyngn.audiofx"
+             android:layout_width="wrap_content"
+             android:layout_height="match_parent"
+             android:layout_gravity="center_horizontal"
+             android:layout_weight="0"
+             android:paddingBottom="@dimen/knob_container_padding_bottom">
+
+    <com.cyngn.audiofx.knobs.RadialKnob
+            android:id="@+id/knob"
+            android:layout_gravity="top|center_horizontal"
+            android:layout_width="@dimen/knob_width"
+            android:layout_height="wrap_content"
+            custom:foreground="@drawable/knob"/>
+
+    <TextView
+            android:id="@+id/label"
+            android:layout_height="22dp"
+            android:layout_gravity="bottom|center_horizontal"
+            android:layout_width="wrap_content"/>
+
+</FrameLayout>