commit 79bf5d8b208f0f1b377b8ea3c4639333d119e61c
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Mon Nov 23 15:18:55 2020 +0100

    Progress creating the Tutorial Dialog.

diff --git a/src/main/java/org/distorted/dialogs/RubikDialogTutorialView.java b/src/main/java/org/distorted/dialogs/RubikDialogTutorialView.java
index bbacfabe..88ddf0fd 100644
--- a/src/main/java/org/distorted/dialogs/RubikDialogTutorialView.java
+++ b/src/main/java/org/distorted/dialogs/RubikDialogTutorialView.java
@@ -35,6 +35,7 @@ import androidx.fragment.app.FragmentActivity;
 
 import org.distorted.main.R;
 import org.distorted.main.RubikActivity;
+import org.distorted.objects.ObjectList;
 import org.distorted.tutorial.TutorialList;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -71,6 +72,8 @@ public class RubikDialogTutorialView extends FrameLayout
     String packageName = act.getPackageName();
 
     mList = TutorialList.getObject(position);
+    ObjectList objList = mList.getObjectList();
+    int size           = mList.getSize();
 
     View tab = inflate( act, R.layout.dialog_tutorial_tab, null);
     LinearLayout layout = tab.findViewById(R.id.tabLayout);
@@ -85,7 +88,7 @@ public class RubikDialogTutorialView extends FrameLayout
 
       int countryID = res.getIdentifier( coun, "drawable", packageName);
 
-      View row = createRow(ract,countryID,desc,url,height);
+      View row = createRow(ract,countryID,desc,url,height,objList,size);
       layout.addView(row);
       }
 
@@ -94,7 +97,7 @@ public class RubikDialogTutorialView extends FrameLayout
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private View createRow(final RubikActivity act, int countryID, final String desc, final String url, int height)
+  private View createRow(final RubikActivity act, int countryID, final String desc, final String url, int height, final ObjectList obj, final int size)
     {
     int id = countryID!=0 ? countryID : R.drawable.un;
 
@@ -112,7 +115,7 @@ public class RubikDialogTutorialView extends FrameLayout
       @Override
       public void onClick(View v)
         {
-        act.switchTutorial(url);
+        act.switchTutorial(url,obj,size);
         }
       });
 
diff --git a/src/main/java/org/distorted/main/RubikActivity.java b/src/main/java/org/distorted/main/RubikActivity.java
index 58c8c54e..17d732ac 100644
--- a/src/main/java/org/distorted/main/RubikActivity.java
+++ b/src/main/java/org/distorted/main/RubikActivity.java
@@ -555,10 +555,12 @@ public class RubikActivity extends AppCompatActivity
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public void switchTutorial(String url)
+    public void switchTutorial(String url, ObjectList object, int size)
       {
       Intent myIntent = new Intent(this, TutorialActivity.class);
       myIntent.putExtra("url", url);
+      myIntent.putExtra("obj", object.ordinal());
+      myIntent.putExtra("siz", size);
       startActivity(myIntent);
       }
 }
diff --git a/src/main/java/org/distorted/tutorial/TutorialActivity.java b/src/main/java/org/distorted/tutorial/TutorialActivity.java
index 96298569..05690ba6 100644
--- a/src/main/java/org/distorted/tutorial/TutorialActivity.java
+++ b/src/main/java/org/distorted/tutorial/TutorialActivity.java
@@ -66,6 +66,7 @@ public class TutorialActivity extends AppCompatActivity
     private int mCurrentApiVersion;
     private TutorialState mState;
     private String mURL;
+    private int mObjectOrdinal, mObjectSize;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -79,7 +80,12 @@ public class TutorialActivity extends AppCompatActivity
 
       Bundle b = getIntent().getExtras();
 
-      if(b != null) mURL = b.getString("url");
+      if(b != null)
+        {
+        mURL           = b.getString("url");
+        mObjectOrdinal = b.getInt("obj");
+        mObjectSize    = b.getInt("siz");
+        }
 
       mIsLocked = false;
       mFirebaseAnalytics = FirebaseAnalytics.getInstance(this);
@@ -197,33 +203,17 @@ public class TutorialActivity extends AppCompatActivity
       view.onResume();
       view.initialize();
 
-      boolean success = false;
-      RubikStatePlay play = (RubikStatePlay) StateList.PLAY.getStateClass();
-      int object = play.getObject();
-      int size   = play.getSize();
-
-      if( object>=0 && object< ObjectList.NUM_OBJECTS )
+      if( mObjectOrdinal>=0 && mObjectOrdinal< ObjectList.NUM_OBJECTS )
         {
-        ObjectList obj = ObjectList.getObject(object);
+        ObjectList obj = ObjectList.getObject(mObjectOrdinal);
         int[] sizes = obj.getSizes();
-        int sizeIndex = ObjectList.getSizeIndex(object,size);
+        int sizeIndex = ObjectList.getSizeIndex(mObjectOrdinal,mObjectSize);
 
         if( sizeIndex>=0 && sizeIndex<sizes.length )
           {
-          success = true;
-          view.getPreRender().changeObject(obj,size);
+          view.getPreRender().changeObject(obj,mObjectSize);
           }
         }
-/*
-      if( !success )
-        {
-        ObjectList obj = ObjectList.getObject(RubikStatePlay.DEF_OBJECT);
-        int s = RubikStatePlay.DEF_SIZE;
-
-        play.setObjectAndSize(this,obj,s);
-        view.getPreRender().changeObject(obj,s);
-        }
- */
       }
     
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/tutorial/TutorialList.java b/src/main/java/org/distorted/tutorial/TutorialList.java
index 48153cc5..7f55c8b4 100644
--- a/src/main/java/org/distorted/tutorial/TutorialList.java
+++ b/src/main/java/org/distorted/tutorial/TutorialList.java
@@ -165,6 +165,20 @@ public enum TutorialList
     return -1;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public ObjectList getObjectList()
+    {
+    return mObject;
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public int getSize()
+    {
+    return mSize;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int getNumTutorials()
diff --git a/src/main/res/layout/dialog_tutorial_row.xml b/src/main/res/layout/dialog_tutorial_row.xml
index 68a2b770..78b162ac 100644
--- a/src/main/res/layout/dialog_tutorial_row.xml
+++ b/src/main/res/layout/dialog_tutorial_row.xml
@@ -2,10 +2,9 @@
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tutorialRowButton"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="100dp"
     android:paddingStart="5dp"
     android:paddingEnd="5dp"
-    android:textSize="20sp"
     android:maxLines="1"
     android:gravity="center"/>