Add level buttons

build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
     }
 }
 

src/main/java/org/billthefarmer/siggen/Main.java

@@ -198,6 +198,8 @@ protected void onResume()
 
         if (dark != darkTheme && Build.VERSION.SDK_INT != Build.VERSION_CODES.M)
             recreate();
+
+        checkButtons();
     }
 
     // Restore state
@@ -747,11 +749,30 @@ public void onClick(View v)
 
         // Higher
         case R.id.higher:
-        {
-            int progress = fine.getProgress();
-            fine.setProgress(++progress);
-        }
-        break;
+            if (fine != null)
+            {
+                int progress = fine.getProgress();
+                fine.setProgress(++progress);
+            }
+            break;
+
+        // Less
+        case R.id.less:
+            if (level != null)
+            {
+                int progress = level.getProgress();
+                level.setProgress(--progress);
+            }
+            break;
+
+        // More
+        case R.id.more:
+            if (level != null)
+            {
+                int progress = level.getProgress();
+                level.setProgress(++progress);
+            }
+            break;
         }
     }
 
@@ -934,6 +955,14 @@ private void setupWidgets()
         if (v != null)
             v.setOnClickListener(this);
 
+        v = findViewById(R.id.less);
+        if (v != null)
+            v.setOnClickListener(this);
+
+        v = findViewById(R.id.more);
+        if (v != null)
+            v.setOnClickListener(this);
+
         if (fine != null)
         {
             fine.setOnSeekBarChangeListener(this);
@@ -967,6 +996,24 @@ private void setupWidgets()
             v.setOnClickListener(this);
     }
 
+    private void checkButtons()
+    {
+        final View v = findViewById(R.id.mute);
+        if (v != null)
+            v.postDelayed(() ->
+        {
+            int width = v.getWidth();
+            View l = findViewById(R.id.less);
+            if (l != null && width < l.getWidth())
+            {
+                l.setVisibility(View.GONE);
+                View m = findViewById(R.id.more);
+                if (m != null)
+                    m.setVisibility(View.GONE);
+            }
+        }, DELAY);
+    }
+
     // setupPhoneStateListener
     private void setupPhoneStateListener()
     {

src/main/res/layout-large/main.xml

@@ -132,6 +132,26 @@
       android:src="?attr/previous"
       tools:ignore="ContentDescription" />
 
+  <ImageButton
+      android:id="@+id/less"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_above="@+id/fine"
+      android:layout_toRightOf="@id/lower"
+      android:layout_marginBottom="8dp"
+      android:src="?attr/expand"
+      tools:ignore="ContentDescription" />
+
+  <ImageButton
+      android:id="@+id/more"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_above="@+id/fine"
+      android:layout_toLeftOf="@id/higher"
+      android:layout_marginBottom="8dp"
+      android:src="?attr/collapse"
+      tools:ignore="ContentDescription" />
+
   <ImageButton
       android:id="@+id/higher"
       android:layout_width="wrap_content"

src/main/res/layout-small/main.xml

@@ -126,6 +126,24 @@
       android:src="?attr/previous"
       tools:ignore="ContentDescription" />
 
+  <ImageButton
+      android:id="@+id/less"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/waveform"
+      android:layout_toRightOf="@id/lower"
+      android:src="?attr/expand"
+      tools:ignore="ContentDescription" />
+
+  <ImageButton
+      android:id="@+id/more"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/waveform"
+      android:layout_toLeftOf="@id/higher"
+      android:src="?attr/collapse"
+      tools:ignore="ContentDescription" />
+
   <ImageButton
       android:id="@+id/higher"
       android:layout_width="wrap_content"
@@ -141,8 +159,8 @@
       android:layout_height="wrap_content"
       android:layout_below="@id/waveform"
       android:layout_alignBottom="@id/lower"
-      android:layout_toLeftOf="@id/higher"
-      android:layout_toRightOf="@id/lower"
+      android:layout_toLeftOf="@id/more"
+      android:layout_toRightOf="@id/less"
       android:drawableLeft="@android:drawable/checkbox_off_background"
       android:drawablePadding="8dp"
       android:text="@string/mute" />

src/main/res/layout/main.xml

@@ -126,6 +126,24 @@
       android:src="?attr/previous"
       tools:ignore="ContentDescription" />
 
+  <ImageButton
+      android:id="@+id/less"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/waveform"
+      android:layout_toRightOf="@id/lower"
+      android:src="?attr/expand"
+      tools:ignore="ContentDescription" />
+
+  <ImageButton
+      android:id="@+id/more"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/waveform"
+      android:layout_toLeftOf="@id/higher"
+      android:src="?attr/collapse"
+      tools:ignore="ContentDescription" />
+
   <ImageButton
       android:id="@+id/higher"
       android:layout_width="wrap_content"
@@ -141,8 +159,8 @@
       android:layout_height="wrap_content"
       android:layout_below="@id/waveform"
       android:layout_alignBottom="@id/lower"
-      android:layout_toLeftOf="@id/higher"
-      android:layout_toRightOf="@id/lower"
+      android:layout_toLeftOf="@id/more"
+      android:layout_toRightOf="@id/less"
       android:drawableLeft="@android:drawable/checkbox_off_background"
       android:drawablePadding="8dp"
       android:text="@string/mute" />

src/main/res/menu/main.xml

@@ -9,7 +9,7 @@
 
   <item
       android:id="@+id/bookmark"
-      android:icon="@drawable/ic_action_expand"
+      android:icon="@drawable/ic_action_expand_dark"
       android:showAsAction="ifRoom"
       android:title="@string/bookmark" />
 

src/main/res/values/attrs.xml

@@ -3,9 +3,11 @@
 
   <declare-styleable name="Siggen">
     <attr name="back" format="reference" />
+    <attr name="collapse" format="reference" />
+    <attr name="expand" format="reference" />
     <attr name="forward" format="reference" />
-    <attr name="previous" format="reference" />
     <attr name="next" format="reference" />
+    <attr name="previous" format="reference" />
 
     <attr name="pref_about" format="reference" />
     <attr name="pref_dark_theme" format="reference" />

src/main/res/values/styles.xml

@@ -21,9 +21,11 @@
     -->
 
     <item name="back">@drawable/ic_back</item>
+    <item name="collapse">@drawable/ic_action_collapse</item>
+    <item name="expand">@drawable/ic_action_expand</item>
     <item name="forward">@drawable/ic_forward</item>
-    <item name="previous">@drawable/ic_action_previous_item</item>
     <item name="next">@drawable/ic_action_next_item</item>
+    <item name="previous">@drawable/ic_action_previous_item</item>
 
     <item name="pref_about">@drawable/ic_action_about</item>
     <item name="pref_dark_theme">@drawable/ic_action_brightness_high_light</item>
@@ -47,9 +49,11 @@
     -->
 
     <item name="back">@drawable/ic_back_dark</item>
+    <item name="collapse">@drawable/ic_action_collapse_dark</item>
+    <item name="expand">@drawable/ic_action_expand_dark</item>
     <item name="forward">@drawable/ic_forward_dark</item>
-    <item name="previous">@drawable/ic_action_previous_item_dark</item>
     <item name="next">@drawable/ic_action_next_item_dark</item>
+    <item name="previous">@drawable/ic_action_previous_item_dark</item>
 
     <item name="pref_about">@drawable/ic_action_about_dark</item>
     <item name="pref_dark_theme">@drawable/ic_action_brightness_high</item>