commit 94ff59625a69dd68b6175dc1394cce9e445f4134
Author: leszek <leszek@koltunski.pl>
Date:   Mon Mar 4 19:22:54 2024 +0100

    progress with configurable stickers

diff --git a/src/main/java/org/distorted/config/ConfigScreenPane.java b/src/main/java/org/distorted/config/ConfigScreenPane.java
index 2d011184..d8af4562 100644
--- a/src/main/java/org/distorted/config/ConfigScreenPane.java
+++ b/src/main/java/org/distorted/config/ConfigScreenPane.java
@@ -26,7 +26,7 @@ public class ConfigScreenPane
   public static final float[] BORDER_STEPS = { 0.50f, 0.75f, 1.00f, 1.50f, 2.00f };
   public static final float[] CORNER_STEPS = { 0.00f, 0.50f, 1.00f, 1.50f, 2.00f };
 
-  private static final float PADDING_RATIO = 0.016f;
+  private static final float PADDING_RATIO = 0.010f;
   private static final float TEXT_RATIO    = 0.025f;
 
   private final SeekBar mSeekBarBorders, mSeekBarCorners;
@@ -55,25 +55,24 @@ public class ConfigScreenPane
     float textSize = height*TEXT_RATIO;
     int padding = (int)(height*PADDING_RATIO);
 
-    LinearLayout configLayout = act.findViewById(R.id.configLayout);
-    configLayout.setPadding(padding,padding,padding,padding);
+    ///// UPPER LAYOUT /////////////////////////////////
+    LinearLayout configLayoutU = act.findViewById(R.id.configLayoutUpper);
+    configLayoutU.setPadding(padding,padding,padding,padding);
 
-    LinearLayout.LayoutParams paramsLayout = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 0, 1.00f);
-    paramsLayout.bottomMargin = padding;
-    paramsLayout.topMargin    = 0;
-    paramsLayout.leftMargin   = padding;
-    paramsLayout.rightMargin  = padding;
+    LinearLayout.LayoutParams paramsLayoutU = (LinearLayout.LayoutParams)configLayoutU.getLayoutParams();
+    paramsLayoutU.bottomMargin = padding;
+    paramsLayoutU.topMargin    = 0;
+    paramsLayoutU.leftMargin   = padding;
+    paramsLayoutU.rightMargin  = padding;
 
-    configLayout.setLayoutParams(paramsLayout);
+    configLayoutU.setLayoutParams(paramsLayoutU);
 
-    TextView textStickers = configLayout.findViewById(R.id.configTextStickers);
-    textStickers.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
-    TextView textBorder   = configLayout.findViewById(R.id.configTextBorder);
+    TextView textBorder   = configLayoutU.findViewById(R.id.configTextBorder);
     textBorder.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
-    TextView textCorner   = configLayout.findViewById(R.id.configTextCorner);
+    TextView textCorner   = configLayoutU.findViewById(R.id.configTextCorner);
     textCorner.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
 
-    mSeekBarBorders = configLayout.findViewById(R.id.configSeekBarBorder);
+    mSeekBarBorders = configLayoutU.findViewById(R.id.configSeekBarBorder);
     mCurrentBorders = mSeekBarBorders.getProgress();
 
     mSeekBarBorders.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener()
@@ -94,7 +93,7 @@ public class ConfigScreenPane
         }
       });
 
-    mSeekBarCorners = configLayout.findViewById(R.id.configSeekBarCorner);
+    mSeekBarCorners = configLayoutU.findViewById(R.id.configSeekBarCorner);
     mCurrentCorners = mSeekBarCorners.getProgress();
 
     mSeekBarCorners.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener()
@@ -113,5 +112,17 @@ public class ConfigScreenPane
         act.recreateStickers(mCurrentBorders,mCurrentCorners);
         }
       });
+
+    ///// LOWER LAYOUT /////////////////////////////////
+    LinearLayout configLayoutL = act.findViewById(R.id.configLayoutLower);
+    configLayoutL.setPadding(padding,padding,padding,padding);
+
+    LinearLayout.LayoutParams paramsLayoutL = (LinearLayout.LayoutParams)configLayoutL.getLayoutParams();
+    paramsLayoutL.bottomMargin = padding;
+    paramsLayoutL.topMargin    = 0;
+    paramsLayoutL.leftMargin   = padding;
+    paramsLayoutL.rightMargin  = padding;
+
+    configLayoutL.setLayoutParams(paramsLayoutL);
     }
 }
diff --git a/src/main/res/layout/config.xml b/src/main/res/layout/config.xml
index b269d104..052c3514 100644
--- a/src/main/res/layout/config.xml
+++ b/src/main/res/layout/config.xml
@@ -10,13 +10,13 @@
         android:id="@+id/configSurfaceView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1.3"/>
+        android:layout_weight="3"/>
 
     <LinearLayout
-        android:id="@+id/configLayout"
+        android:id="@+id/configLayoutUpper"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1.0"
+        android:layout_weight="0.75"
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
         android:layout_marginBottom="5dp"
@@ -25,21 +25,12 @@
         android:background="@color/grey"
         android:orientation="vertical" >
 
-        <TextView
-            android:id="@+id/configTextStickers"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textSize="26sp"
-            android:text="@string/config_stickers"/>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:background="@color/grey"
             android:orientation="horizontal" >
 
             <TextView
@@ -66,7 +57,6 @@
             android:layout_margin="5dp"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:background="@color/grey"
             android:orientation="horizontal" >
 
             <TextView
@@ -88,6 +78,20 @@
         </LinearLayout>
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/configLayoutLower"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_marginBottom="5dp"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:background="@color/grey"
+        android:orientation="vertical" >
+    </LinearLayout>
+
     <LinearLayout
         android:id="@+id/lowerBar"
         android:layout_width="match_parent"
diff --git a/src/main/res/layout/object_popup.xml b/src/main/res/layout/object_popup.xml
index 529cced2..5b203c8e 100644
--- a/src/main/res/layout/object_popup.xml
+++ b/src/main/res/layout/object_popup.xml
@@ -52,7 +52,7 @@
 
     <Button
         android:id="@+id/objectConfig"
-        android:text="@string/object_config"
+        android:text="@string/config_stickers"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingRight="10dp"
