commit 48314d6aef37f6f7d0d8b97044f671794703e7bb
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Fri Mar 18 12:02:01 2022 +0100

    Progress with 'bandaged UI'

diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java b/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java
index c75e3607..0d3f7ff4 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java
@@ -26,7 +26,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.LinearLayout;
-import android.widget.ScrollView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -35,6 +34,7 @@ import com.google.firebase.analytics.FirebaseAnalytics;
 import org.distorted.dialogs.RubikDialogError;
 import org.distorted.library.main.DistortedLibrary;
 import org.distorted.main.R;
+import org.distorted.main.RubikActivity;
 import org.distorted.objectlib.main.ObjectControl;
 import org.distorted.objects.RubikObject;
 import org.distorted.objects.RubikObjectList;
@@ -95,8 +95,8 @@ public class BandagedCreatorActivity extends AppCompatActivity
     private void computeHeights()
       {
       int barHeight    = (int)(mScreenHeight*RATIO_BAR);
-      int scrollHeight = (int)(mScreenHeight*RATIO_SCROLL);
-      int viewHeight   = (int)(mScreenHeight*(1-RATIO_SCROLL));
+      int viewHeight   = (int)(mScreenHeight*RATIO_SCROLL);
+      int objectHeight = (int)(mScreenHeight*(1-RATIO_SCROLL));
       mHeightBar = barHeight;
 
       LinearLayout layout = findViewById(R.id.lowerBar);
@@ -104,15 +104,18 @@ public class BandagedCreatorActivity extends AppCompatActivity
       paramsL.height = barHeight;
       layout.setLayoutParams(paramsL);
 
-      ScrollView scroll = findViewById(R.id.bandagedCreatorScrollView);
-      ViewGroup.LayoutParams paramsS = scroll.getLayoutParams();
-      paramsS.height = scrollHeight;
-      scroll.setLayoutParams(paramsS);
+      LinearLayout view = findViewById(R.id.bandagedCreatorView);
+      ViewGroup.LayoutParams paramsS = view.getLayoutParams();
+      paramsS.height = viewHeight;
 
-      BandagedCreatorView view = findViewById(R.id.bandagedCreatorView);
-      ViewGroup.LayoutParams paramsV = view.getLayoutParams();
-      paramsV.height = viewHeight;
-      view.setLayoutParams(paramsV);
+      int p = (int)(mScreenHeight* RubikActivity.PADDING);
+      view.setPadding(p,p,p,p);
+      view.setLayoutParams(paramsS);
+
+      BandagedCreatorView creator = findViewById(R.id.bandagedCreatorObjectView);
+      ViewGroup.LayoutParams paramsC = creator.getLayoutParams();
+      paramsC.height = objectHeight;
+      creator.setLayoutParams(paramsC);
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -171,7 +174,7 @@ public class BandagedCreatorActivity extends AppCompatActivity
     protected void onPause() 
       {
       super.onPause();
-      BandagedCreatorView view = findViewById(R.id.bandagedCreatorView);
+      BandagedCreatorView view = findViewById(R.id.bandagedCreatorObjectView);
       view.onPause();
       DistortedLibrary.onPause(ACTIVITY_NUMBER);
       }
@@ -183,7 +186,7 @@ public class BandagedCreatorActivity extends AppCompatActivity
       {
       super.onResume();
       DistortedLibrary.onResume(ACTIVITY_NUMBER);
-      BandagedCreatorView view = findViewById(R.id.bandagedCreatorView);
+      BandagedCreatorView view = findViewById(R.id.bandagedCreatorObjectView);
       view.onResume();
 
       if( mScreen==null ) mScreen = new BandagedCreatorScreen();
diff --git a/src/main/res/layout/bandaged.xml b/src/main/res/layout/bandaged.xml
index 9e35aa57..445c2e3b 100644
--- a/src/main/res/layout/bandaged.xml
+++ b/src/main/res/layout/bandaged.xml
@@ -4,17 +4,23 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
+    <LinearLayout
+        android:id="@+id/bandagedCreatorView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:background="@color/light_grey"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true">
     <ScrollView
         android:id="@+id/bandagedCreatorScrollView"
         android:background="@color/black"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"/>
+        android:layout_height="match_parent"/>
+    </LinearLayout>
 
     <org.distorted.bandaged.BandagedCreatorView
-        android:id="@+id/bandagedCreatorView"
-        android:layout_below="@+id/bandagedCreatorScrollView"
+        android:id="@+id/bandagedCreatorObjectView"
+        android:layout_below="@+id/bandagedCreatorView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_alignParentStart="true"/>