commit 66cbab36dc9c4bfd783cd34f591e34580d8c77f3
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Thu Mar 31 22:03:43 2022 +0200

    Bandaged 3x3 UI: minor.

diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorObjectView.java b/src/main/java/org/distorted/bandaged/BandagedCreatorObjectView.java
index 67a3ba38..109bac2e 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCreatorObjectView.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCreatorObjectView.java
@@ -32,6 +32,9 @@ import org.distorted.main.RubikActivity;
 
 public class BandagedCreatorObjectView
 {
+  static final float RATIO_PANE = 0.36f;
+  static final float RATIO_ICON = 0.15f;
+
   private final LinearLayout mPane;
   private final String mName;
 
@@ -44,14 +47,14 @@ public class BandagedCreatorObjectView
     mPane = (LinearLayout) inflater.inflate(R.layout.bandaged_pane, null);
 
     int width    = act.getScreenWidthInPixels();
-    int lMargin  = (int)(width*RubikActivity.LARGE_MARGIN);
+    int margin   = (int)(width*RubikActivity.LARGE_MARGIN);
     int textSize = (int)(width*RubikActivity.BUTTON_TEXT_SIZE);
 
-    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;
-    params.rightMargin  = lMargin;
+    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( (int)(width*RATIO_PANE), LinearLayout.LayoutParams.MATCH_PARENT);
+    params.bottomMargin = margin;
+    params.topMargin    = margin;
+    params.leftMargin   = leftmost ? margin : 0;
+    params.rightMargin  = margin;
 
     mPane.setLayoutParams(params);
 
@@ -65,7 +68,7 @@ public class BandagedCreatorObjectView
     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);
+    int iconHeight = (int)(RATIO_ICON*(BandagedCreatorActivity.RATIO_SCROLL-2*RubikActivity.PADDING)*height);
     delButton.setIconSize(iconHeight);
 
     bottom.addView(plaButton);
@@ -99,8 +102,8 @@ public class BandagedCreatorObjectView
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  public boolean objectNameIs(String name)
+  public String getName()
     {
-    return mName.equals(name);
+    return mName;
     }
 }
diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java b/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
index b2a313ed..a1b8447f 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
@@ -155,8 +155,9 @@ public class BandagedCreatorScreen
     for(int v=0; v<mNumObjects; v++)
       {
       BandagedCreatorObjectView view = mViews.get(v);
+      String viewName = view.getName();
 
-      if( view.objectNameIs(name) )
+      if( viewName.equals(name) )
         {
         LinearLayout pane = view.getPane();
         mObjectView.removeView(pane);
@@ -168,13 +169,13 @@ public class BandagedCreatorScreen
           int width = act.getScreenWidthInPixels();
           BandagedCreatorObjectView v2 = mViews.get(v);
           LinearLayout p2 = v2.getPane();
-          int lMargin = (int)(width*RubikActivity.LARGE_MARGIN);;
-
-          LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( (int)(width*0.36f), LinearLayout.LayoutParams.MATCH_PARENT);
-          params.bottomMargin = lMargin;
-          params.topMargin    = lMargin;
-          params.leftMargin   = lMargin;
-          params.rightMargin  = lMargin;
+          int margin = (int)(width*RubikActivity.LARGE_MARGIN);;
+          int w = (int)(width*BandagedCreatorObjectView.RATIO_PANE);
+          LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( w, LinearLayout.LayoutParams.MATCH_PARENT);
+          params.bottomMargin = margin;
+          params.topMargin    = margin;
+          params.leftMargin   = margin;
+          params.rightMargin  = margin;
 
           p2.setLayoutParams(params);
           }