2 files changed, 107 insertions, 24 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e919117..2f3a1ac 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -65,27 +65,113 @@
             android:scaleType="centerInside"
             android:src="@android:color/transparent" />
 
-        <com.wuhei.reccoon.WaveformView
+        <androidx.appcompat.widget.AppCompatCheckBox
+            android:id="@+id/compressCheckbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="4dp"
+            android:contentDescription="@string/compress_recording"
+            android:text="@string/compress_short"
+            android:textColor="@color/text_secondary"
+            android:textSize="13sp" />
+
+        <LinearLayout
+            android:id="@+id/inputRow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="4dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/input_label"
+                android:textColor="@color/text_secondary"
+                android:textSize="13sp" />
+
+            <Spinner
+                android:id="@+id/inputSpinner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:minWidth="180dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/outputRow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="4dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/output_label"
+                android:textColor="@color/text_secondary"
+                android:textSize="13sp" />
+
+            <Spinner
+                android:id="@+id/outputSpinner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:minWidth="180dp" />
+        </LinearLayout>
+
+        <androidx.appcompat.widget.AppCompatCheckBox
+            android:id="@+id/monitorCheckbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="2dp"
+            android:contentDescription="@string/monitor_recording"
+            android:text="@string/monitor_short"
+            android:textColor="@color/text_secondary"
+            android:textSize="13sp" />
+
+        <com.tomcooks.reccoon.WaveformView
             android:id="@+id/waveformView"
             android:layout_width="match_parent"
             android:layout_height="64dp"
             android:layout_marginTop="16dp" />
 
-        <com.wuhei.reccoon.LevelMeterView
+        <com.tomcooks.reccoon.LevelMeterView
             android:id="@+id/levelMeter"
             android:layout_width="match_parent"
             android:layout_height="38dp"
             android:layout_marginTop="10dp" />
 
-        <Button
-            android:id="@+id/markButton"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="6dp"
-            android:enabled="false"
-            android:minWidth="140dp"
-            android:text="@string/mark_action" />
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/markButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:enabled="false"
+                android:minWidth="130dp"
+                android:text="@string/mark_action" />
+
+            <Button
+                android:id="@+id/discardButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:enabled="false"
+                android:minWidth="130dp"
+                android:text="@string/discard_action" />
+        </LinearLayout>
 
         <LinearLayout
             android:id="@+id/optionsRow"
@@ -116,6 +202,17 @@
                 android:textSize="13sp" />
         </LinearLayout>
 
+        <androidx.appcompat.widget.AppCompatCheckBox
+            android:id="@+id/swapCheckbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="2dp"
+            android:contentDescription="@string/swap_channels"
+            android:text="@string/swap_short"
+            android:textColor="@color/text_secondary"
+            android:textSize="13sp" />
+
         <TextView
             android:id="@+id/statusText"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_player.xml b/app/src/main/res/layout/activity_player.xml
index 6ba1190..2bb2f54 100644
--- a/app/src/main/res/layout/activity_player.xml
+++ b/app/src/main/res/layout/activity_player.xml
@@ -159,25 +159,11 @@
             android:textSize="18sp"
             android:textStyle="bold" />
 
-        <LinearLayout
+        <Spinner
+            android:id="@+id/modelSpinner"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:orientation="horizontal">
-
-            <Spinner
-                android:id="@+id/languageSpinner"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-
-            <Spinner
-                android:id="@+id/modelSpinner"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_weight="1" />
-        </LinearLayout>
+            android:layout_marginTop="8dp" />
 
         <Button
             android:id="@+id/transcribeButton"