Implement SeekBar

-> Implement SeekBar widget -> Fix LayerListDrawable size
GabrielBRDeveloper · Jul 25, 2024 · eeba3e0 · eeba3e0
1 parent ac8d6be
commit eeba3e0
Show file tree

Hide file tree

Showing 13 changed files with 323 additions and 7 deletions.
diff --git a/core/res/drawable-default/seekbar_progress.xml b/core/res/drawable-default/seekbar_progress.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<layer-list>
+  <item height="4dp">
+    <selector>
+      <item pressed="true">
+        <layer-list>
+          <item>
+            <shape
+                type="rounded"
+                radius="2dp"
+                color="?colorPrimaryVariant"/>
+          </item>
+        </layer-list>
+      </item>
+      <item>
+        <layer-list>
+          <item>
+            <shape
+                type="rounded"
+                radius="2dp"
+                color="?colorPrimary"/>
+          </item>
+        </layer-list>
+      </item>
+    </selector>
+  </item>
+</layer-list>
diff --git a/core/res/drawable-default/seekbar_thumb.xml b/core/res/drawable-default/seekbar_thumb.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<layer-list>
+  <item height="16dp" width="16dp">
+    <selector>
+      <item pressed="true">
+        <layer-list>
+          <item>
+            <shape
+                type="rounded"
+                radius="64dp"
+                color="?colorPrimaryVariant"/>
+          </item>
+        </layer-list>
+      </item>
+      <item>
+        <layer-list>
+          <item>
+            <shape
+                type="rounded"
+                radius="64dp"
+                color="?colorPrimary"/>
+          </item>
+        </layer-list>
+      </item>
+    </selector>
+  </item>
+</layer-list>
diff --git a/core/res/drawable-default/seekbar_track.xml b/core/res/drawable-default/seekbar_track.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<layer-list>
+  <item height="4dp">
+    <shape
+        type="rounded"
+        radius="2dp"
+        color="?colorSurfaceVariant"/>
+  </item>
+</layer-list>
diff --git a/core/res/ex-layout/main.xml b/core/res/ex-layout/main.xml
@@ -26,9 +26,12 @@
       width="match_parent"
       height="wrap_content"
       margin="5dp"/>
-    <Button
+    <SeekBar
       width="match_parent"
       height="wrap_content"
+      progress="50"
+      background="#F00"
+      max="100"
       margin="5dp"/>
 
   </LinearLayout>

diff --git a/core/res/style/defaults.xml b/core/res/style/defaults.xml
@@ -21,6 +21,12 @@
     <item name="scrollbar">@drawable/scrollbar_thumb</item>
   </style>
 
+  <style name="Widget.SeekBar">
+    <item name="trackDrawable">@drawable-default/seekbar_track</item>
+    <item name="thumbDrawable">@drawable-default/seekbar_thumb</item>
+    <item name="progressDrawable">@drawable-default/seekbar_progress</item>
+  </style>
+
   <style name="Widget.MenuLayout">
     <style name="background">@drawable/menu_background</style>
     <style name="paddingTop">10dp</style>

diff --git a/core/src/br/nullexcept/mux/graphics/drawable/LayerListDrawable.java b/core/src/br/nullexcept/mux/graphics/drawable/LayerListDrawable.java
@@ -36,7 +36,7 @@ public void draw(Canvas canvas) {
     public int getWidth() {
         int width = 1;
         for (Layer layer: layers) {
-            width = Math.max(width, layer.drawable.getWidth()+layer.padding.left+layer.padding.right);
+            width = Math.max(width, layer.getWidth()+layer.padding.left+layer.padding.right);
         }
         return width;
     }
@@ -45,7 +45,7 @@ public int getWidth() {
     public int getHeight() {
         int height = 1;
         for (Layer layer: layers) {
-            height = Math.max(height, layer.drawable.getWidth()+layer.padding.bottom+layer.padding.top);
+            height = Math.max(height, layer.getHeight()+layer.padding.bottom+layer.padding.top);
         }
         return height;
     }
@@ -105,5 +105,13 @@ public void setBounds(Rect rect) {
 
             drawable.setBounds(tmp);
         }
+
+        public int getWidth() {
+            return size.width == -1 ? drawable.getWidth() : size.width;
+        }
+
+        public int getHeight() {
+            return size.height == -1 ? drawable.getHeight() : size.height;
+        }
     }
 }
diff --git a/core/src/br/nullexcept/mux/graphics/drawable/SelectorDrawable.java b/core/src/br/nullexcept/mux/graphics/drawable/SelectorDrawable.java
@@ -51,6 +51,16 @@ public boolean setState(StateList state) {
         return !current.equals(old);
     }
 
+    @Override
+    public int getWidth() {
+        return current == null ? super.getWidth() : current.getWidth();
+    }
+
+    @Override
+    public int getHeight() {
+        return current == null ? super.getHeight() : current.getHeight();
+    }
+
     private class StateDrawable {
         public final StateList stateList;
         public final Drawable drawable;

diff --git a/core/src/br/nullexcept/mux/lang/Function3.java b/core/src/br/nullexcept/mux/lang/Function3.java
@@ -0,0 +1,5 @@
+package br.nullexcept.mux.lang;
+
+public interface Function3<A,B,C> {
+    void run(A a, B b, C c);
+}
diff --git a/core/src/br/nullexcept/mux/res/LayoutInflater.java b/core/src/br/nullexcept/mux/res/LayoutInflater.java
@@ -108,6 +108,7 @@ private ViewGroup.LayoutParams parseLayoutParams(AttributeList attr){
         registerView("TextView", TextView::new);
         registerView("Switch", Switch::new);
         registerView("View", View::new);
+        registerView("SeekBar", SeekBar::new);
     }
 
     public static void registerView(String name, ViewRegister register){

diff --git a/core/src/br/nullexcept/mux/res/Parser.java b/core/src/br/nullexcept/mux/res/Parser.java
@@ -227,6 +227,7 @@ private static Bitmap openBitmap(String path) {
     }
 
     public static Drawable parseDrawable(Resources resources, String value) {
+        value = value.trim();
         if (value.startsWith("#")){
             return new ColorDrawable(Color.parseColor(value));
         } else {
@@ -242,7 +243,7 @@ public static Drawable parseDrawable(Resources resources, String value) {
                 }
             }
         }
-        Log.error(LOG_TAG,"Invalid background value: "+value);
+        Log.error(LOG_TAG,"Invalid drawable source value: "+value);
         return null;
     }
 

diff --git a/core/src/br/nullexcept/mux/view/AttrList.java b/core/src/br/nullexcept/mux/view/AttrList.java
@@ -45,4 +45,9 @@ public class AttrList {
     public static final String summary = "summary";
     public static final String icon = "icon";
     public static final String visibility = "visibility";
+    public static final String progress = "progress";
+    public static final String max = "max";
+    public static final String thumbDrawable = "thumbDrawable";
+    public static final String trackDrawable = "trackDrawable";
+    public static final String progressDrawable = "progressDrawable";
 }
diff --git a/core/src/br/nullexcept/mux/widget/FlowLayout.java b/core/src/br/nullexcept/mux/widget/FlowLayout.java
@@ -3,18 +3,21 @@
 import br.nullexcept.mux.app.Context;
 import br.nullexcept.mux.graphics.Point;
 import br.nullexcept.mux.res.AttributeList;
+import br.nullexcept.mux.view.AttrList;
 import br.nullexcept.mux.view.Gravity;
 import br.nullexcept.mux.view.View;
 import br.nullexcept.mux.view.ViewGroup;
 
 public class FlowLayout extends ViewGroup {
     private int dividerSize = 16;
     public FlowLayout(Context context) {
-        super(context);
+        this(context, null);
     }
 
-    public FlowLayout(Context context, AttributeList attrs) {
-        super(context, attrs);
+    public FlowLayout(Context context, AttributeList init) {
+        super(context, init);
+        AttributeList attrs = initialAttributes();
+        attrs.searchDimension(AttrList.dividerSize, x -> dividerSize = x.intValue());
     }
 
     @Override