commit 83e021c58bd0e2d15c9ea28568527fc0db0742d8
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Wed Mar 30 23:08:51 2022 +0200

    Bandaged 3x3 UI: progress

diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java b/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java
index 7d85567a..f618af17 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java
@@ -44,7 +44,7 @@ public class BandagedCreatorActivity extends AppCompatActivity
 {
     private static final int ACTIVITY_NUMBER = 3;
     private static final float RATIO_BAR   = 0.10f;
-    private static final float RATIO_SCROLL= 0.30f;
+    static final float RATIO_SCROLL= 0.30f;
 
     public static final float DIALOG_BUTTON_SIZE  = 0.06f;
     public static final float MENU_BIG_TEXT_SIZE  = 0.05f;
diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorObjectView.java b/src/main/java/org/distorted/bandaged/BandagedCreatorObjectView.java
index c546fcd5..5f94dadc 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCreatorObjectView.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCreatorObjectView.java
@@ -61,7 +61,7 @@ public class BandagedCreatorObjectView
     int lMargin  = (int)(width*RubikActivity.LARGE_MARGIN);
     int textSize = (int)(width*RubikActivity.BUTTON_TEXT_SIZE);
 
-    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( (int)(width*0.35f), LinearLayout.LayoutParams.MATCH_PARENT);
+    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( (int)(width*0.36f), LinearLayout.LayoutParams.MATCH_PARENT);
     params.bottomMargin = lMargin;
     params.topMargin    = lMargin;
     params.leftMargin   = leftmost ? lMargin : 0;
@@ -72,11 +72,16 @@ public class BandagedCreatorObjectView
     LinearLayout bottom = mPane.findViewById(R.id.bandagedCreatorObjectLayout);
 
     TransparentButton plaButton = new TransparentButton(act, R.string.play, textSize);
+    plaButton.setSingleLine();
 
-    final int icon = RubikActivity.getDrawable(R.drawable.ui_small_trash,R.drawable.ui_medium_trash, R.drawable.ui_big_trash, R.drawable.ui_huge_trash);
+    final int icon = R.drawable.ui_trash;
     LinearLayout.LayoutParams paramsB = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,3.0f);
     TransparentImageButton delButton = new TransparentImageButton(act, icon, TransparentImageButton.GRAVITY_MIDDLE, paramsB);
 
+    int height = act.getScreenHeightInPixels();
+    int iconHeight = (int)(0.15f*(BandagedCreatorActivity.RATIO_SCROLL-2*RubikActivity.PADDING)*height);
+    delButton.setIconSize(iconHeight);
+
     bottom.addView(plaButton);
     bottom.addView(delButton);
 
diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java b/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
index 278cfe6a..457db8db 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
@@ -148,23 +148,27 @@ public class BandagedCreatorScreen
   void iconCreationDone(Activity act, Bitmap bmp)
     {
     int numChildren = mObjectView.getChildCount();
-    LinearLayout pane = (LinearLayout)mObjectView.getChildAt(numChildren-1);
-    ImageView view = pane.findViewById(R.id.bandagedCreatorObjectIcon);
 
-    if( view!=null )
+    if( numChildren>0 )
       {
-      act.runOnUiThread(new Runnable()
+      LinearLayout pane = (LinearLayout)mObjectView.getChildAt(numChildren-1);
+      ImageView view = pane.findViewById(R.id.bandagedCreatorObjectIcon);
+
+      if( view!=null )
         {
-        @Override
-        public void run()
+        act.runOnUiThread(new Runnable()
+          {
+          @Override
+          public void run()
           {
           view.setImageBitmap(bmp);
           }
-        });
-      }
-    else
-      {
-      android.util.Log.e("D", "ImageView not found!");
+          });
+        }
+      else
+        {
+        android.util.Log.e("D", "ImageView not found!");
+        }
       }
     }
 }
diff --git a/src/main/res/drawable-nodpi/ui_big_trash.png b/src/main/res/drawable-nodpi/ui_big_trash.png
deleted file mode 100644
index 2ed534de..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_trash.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_trash.png b/src/main/res/drawable-nodpi/ui_huge_trash.png
deleted file mode 100644
index 34028570..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_trash.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_trash.png b/src/main/res/drawable-nodpi/ui_medium_trash.png
deleted file mode 100644
index 6c1abd32..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_trash.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_trash.png b/src/main/res/drawable-nodpi/ui_small_trash.png
deleted file mode 100644
index 460043f4..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_trash.png and /dev/null differ
diff --git a/src/main/res/drawable/ui_trash.png b/src/main/res/drawable/ui_trash.png
new file mode 100644
index 00000000..34028570
Binary files /dev/null and b/src/main/res/drawable/ui_trash.png differ