commit 4c65045840b6bd08c80996bf5e8aa3392f93f3b4
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Mon Nov 22 15:57:09 2021 +0100

    Minor.

diff --git a/src/main/java/org/distorted/screens/RubikScreenPlay.java b/src/main/java/org/distorted/screens/RubikScreenPlay.java
index 8f76bcaa..3c7544e5 100644
--- a/src/main/java/org/distorted/screens/RubikScreenPlay.java
+++ b/src/main/java/org/distorted/screens/RubikScreenPlay.java
@@ -246,9 +246,9 @@ public class RubikScreenPlay extends RubikScreenBase
     mObjectSize = (int)(cubeWidth + 2*margin + 0.5f);
     mMaxRowCount = (int)((height-1.8f*mUpperBarHeight)/mObjectSize);
     int layoutH = (int)(1.5f*mObjectSize);
+    int viewID = R.layout.popup_object;
 
-    int viewID = mMaxRowCount<mRowCount ? R.layout.popup_object_withscroll : R.layout.popup_object_scrollless;
-    View view = inflate( act, viewID, null);
+    LinearLayout view = (LinearLayout)inflate( act, viewID, null);
     GridLayout objectGrid = view.findViewById(R.id.objectGrid);
 
     GridLayout.Spec[] rowSpecs = new GridLayout.Spec[mRowCount];
@@ -407,20 +407,22 @@ public class RubikScreenPlay extends RubikScreenBase
 
   void setupBottomLayout(final RubikActivity act, final LinearLayout layout, int width)
     {
-    int icon1 = RubikActivity.getDrawable(R.drawable.ui_small_cube_solve_new,R.drawable.ui_medium_cube_solve_new, R.drawable.ui_big_cube_solve_new, R.drawable.ui_huge_cube_solve_new);
-    LinearLayout.LayoutParams params1 = new LinearLayout.LayoutParams(width,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    TransparentImageButton buttonTut = new TransparentImageButton(act, icon1, TransparentImageButton.GRAVITY_MIDDLE, params1);
+    int iconT = RubikActivity.getDrawable(R.drawable.ui_small_tutorial,R.drawable.ui_medium_tutorial, R.drawable.ui_big_tutorial, R.drawable.ui_huge_tutorial);
+    LinearLayout.LayoutParams paramsT = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
+    TransparentImageButton buttonTut = new TransparentImageButton(act, iconT, TransparentImageButton.GRAVITY_MIDDLE, paramsT);
 
-    int icon2 = RubikActivity.getDrawable(R.drawable.ui_small_cube_solve_new,R.drawable.ui_medium_cube_solve_new, R.drawable.ui_big_cube_solve_new, R.drawable.ui_huge_cube_solve_new);
-    LinearLayout.LayoutParams params2 = new LinearLayout.LayoutParams(width,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    TransparentImageButton buttonDet = new TransparentImageButton(act, icon2, TransparentImageButton.GRAVITY_MIDDLE, params2);
+    int iconD = RubikActivity.getDrawable(R.drawable.ui_small_info,R.drawable.ui_medium_info, R.drawable.ui_big_info, R.drawable.ui_huge_info);
+    LinearLayout.LayoutParams paramsD = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
+    TransparentImageButton buttonDet = new TransparentImageButton(act, iconD, TransparentImageButton.GRAVITY_MIDDLE, paramsD);
 
     buttonTut.setOnClickListener( new View.OnClickListener()
       {
       @Override
       public void onClick(View v)
         {
-        android.util.Log.e("D", "BUTTON TUT CLICKED!!");
+        if( mObjectPopup!=null ) mObjectPopup.dismiss();
+        RubikDialogTutorial tDiag = new RubikDialogTutorial();
+        tDiag.show( act.getSupportFragmentManager(), RubikDialogTutorial.getDialogTag() );
         }
       });
 
@@ -433,7 +435,7 @@ public class RubikScreenPlay extends RubikScreenBase
         }
       });
 
-    LinearLayout.LayoutParams paramsNul = new LinearLayout.LayoutParams(width,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
+    LinearLayout.LayoutParams paramsNul = new LinearLayout.LayoutParams(width,LinearLayout.LayoutParams.MATCH_PARENT,2.0f);
     Button buttonNul = new Button(act);
     buttonNul.setLayoutParams(paramsNul);
     buttonNul.setVisibility(View.INVISIBLE);
diff --git a/src/main/res/layout/popup_object.xml b/src/main/res/layout/popup_object.xml
new file mode 100644
index 00000000..063aca18
--- /dev/null
+++ b/src/main/res/layout/popup_object.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+   android:layout_width="match_parent"
+   android:layout_height="match_parent"
+   android:orientation="vertical">
+
+   <ScrollView
+       android:id="@+id/objectScroll"
+       android:layout_width="match_parent"
+       android:layout_height="match_parent"
+       android:layout_weight="1">
+
+       <GridLayout
+           android:id="@+id/objectGrid"
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content">
+       </GridLayout>
+
+   </ScrollView>
+
+   <LinearLayout
+       android:id="@+id/bottomLayout"
+       android:background="@color/grey"
+       android:layout_width="match_parent"
+       android:layout_height="100dp"
+       android:layout_weight="1"
+       android:paddingEnd="5dp"
+       android:paddingStart="5dp"
+       android:orientation="horizontal">
+
+   </LinearLayout>
+
+</LinearLayout>
diff --git a/src/main/res/layout/popup_object_scrollless.xml b/src/main/res/layout/popup_object_scrollless.xml
deleted file mode 100644
index 25aeb1c3..00000000
--- a/src/main/res/layout/popup_object_scrollless.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-   android:layout_width="match_parent"
-   android:layout_height="match_parent"
-   android:orientation="vertical">
-
-   <GridLayout
-       android:id="@+id/objectGrid"
-       android:layout_width="match_parent"
-       android:layout_height="match_parent"
-       android:layout_weight="1">
-   </GridLayout>
-
-   <LinearLayout
-       android:id="@+id/bottomLayout"
-       android:background="@color/grey"
-       android:layout_width="match_parent"
-       android:layout_height="100dp"
-       android:layout_weight="1"
-       android:paddingEnd="5dp"
-       android:paddingStart="5dp"
-       android:orientation="horizontal">
-
-   </LinearLayout>
-
-</LinearLayout>
diff --git a/src/main/res/layout/popup_object_withscroll.xml b/src/main/res/layout/popup_object_withscroll.xml
deleted file mode 100644
index 063aca18..00000000
--- a/src/main/res/layout/popup_object_withscroll.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-   android:layout_width="match_parent"
-   android:layout_height="match_parent"
-   android:orientation="vertical">
-
-   <ScrollView
-       android:id="@+id/objectScroll"
-       android:layout_width="match_parent"
-       android:layout_height="match_parent"
-       android:layout_weight="1">
-
-       <GridLayout
-           android:id="@+id/objectGrid"
-           android:layout_width="match_parent"
-           android:layout_height="wrap_content">
-       </GridLayout>
-
-   </ScrollView>
-
-   <LinearLayout
-       android:id="@+id/bottomLayout"
-       android:background="@color/grey"
-       android:layout_width="match_parent"
-       android:layout_height="100dp"
-       android:layout_weight="1"
-       android:paddingEnd="5dp"
-       android:paddingStart="5dp"
-       android:orientation="horizontal">
-
-   </LinearLayout>
-
-</LinearLayout>