commit 344f290c634b48c0483a69a6e99d1606128ef5d7
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Tue Nov 17 16:07:00 2020 +0100

    Start creating the Tutorial Activity.

diff --git a/src/main/java/org/distorted/main/RubikRenderer.java b/src/main/java/org/distorted/main/RubikRenderer.java
index 546af791..80020aba 100644
--- a/src/main/java/org/distorted/main/RubikRenderer.java
+++ b/src/main/java/org/distorted/main/RubikRenderer.java
@@ -112,6 +112,8 @@ public class RubikRenderer implements GLSurfaceView.Renderer, DistortedLibrary.E
    @Override
    public void onSurfaceChanged(GL10 glUnused, int width, int height)
       {
+      android.util.Log.e("main", "width="+width+" height="+height);
+
       mScreen.resize(width,height);
       mView.setScreenSize(width,height);
       mView.getPreRender().setScreenSize(width);
@@ -128,8 +130,6 @@ public class RubikRenderer implements GLSurfaceView.Renderer, DistortedLibrary.E
       BaseEffect.Type.enableEffects();
 
       DistortedLibrary.onSurfaceCreated(mView.getContext(),this,1);
-
-android.util.Log.e("ren", "onSurfaceCreated");
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/states/RubikStateAbstract.java b/src/main/java/org/distorted/states/RubikStateAbstract.java
index de10be6e..87390cd0 100644
--- a/src/main/java/org/distorted/states/RubikStateAbstract.java
+++ b/src/main/java/org/distorted/states/RubikStateAbstract.java
@@ -19,10 +19,7 @@
 
 package org.distorted.states;
 
-import android.annotation.SuppressLint;
 import android.content.SharedPreferences;
-import android.util.TypedValue;
-import android.widget.LinearLayout;
 
 import org.distorted.main.RubikActivity;
 import org.distorted.objects.ObjectList;
@@ -32,62 +29,6 @@ import org.distorted.patterns.RubikPatternList;
 
 public abstract class RubikStateAbstract
   {
-  @SuppressLint("ViewConstructor")
-  static class TransparentImageButton extends androidx.appcompat.widget.AppCompatImageButton
-    {
-    public TransparentImageButton(RubikActivity act, int icon, float scrWidth, int butWidth)
-      {
-      super(act);
-
-      final int padding = (int)(scrWidth*RubikActivity.PADDING);
-      final int margin  = (int)(scrWidth*RubikActivity.MARGIN);
-
-      LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(butWidth,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-
-      params.topMargin    = margin;
-      params.bottomMargin = margin;
-      params.leftMargin   = margin;
-      params.rightMargin  = margin;
-
-      setLayoutParams(params);
-      setPadding(padding,0,padding,0);
-      setImageResource(icon);
-
-      TypedValue outValue = new TypedValue();
-      act.getTheme().resolveAttribute(android.R.attr.selectableItemBackgroundBorderless, outValue, true);
-      setBackgroundResource(outValue.resourceId);
-      }
-    }
-
-  @SuppressLint("ViewConstructor")
-  static class TransparentButton extends androidx.appcompat.widget.AppCompatButton
-    {
-    public TransparentButton(RubikActivity act, int resId, float size, float scrWidth)
-      {
-      super(act);
-
-      final int padding = (int)(scrWidth*RubikActivity.PADDING);
-      final int margin  = (int)(scrWidth*RubikActivity.MARGIN);
-
-      LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT, 1.0f);
-      params.topMargin    = margin;
-      params.bottomMargin = margin;
-      params.leftMargin   = margin;
-      params.rightMargin  = margin;
-
-      setLayoutParams(params);
-      setPadding(padding,0,padding,0);
-      setTextSize(TypedValue.COMPLEX_UNIT_PX, size);
-      setText(resId);
-
-      TypedValue outValue = new TypedValue();
-      act.getTheme().resolveAttribute(android.R.attr.selectableItemBackgroundBorderless, outValue, true);
-      setBackgroundResource(outValue.resourceId);
-      }
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
   int getPatternOrdinal()
     {
     RubikStatePlay play = (RubikStatePlay) StateList.PLAY.getStateClass();
diff --git a/src/main/java/org/distorted/states/TransparentButton.java b/src/main/java/org/distorted/states/TransparentButton.java
new file mode 100644
index 00000000..6325a434
--- /dev/null
+++ b/src/main/java/org/distorted/states/TransparentButton.java
@@ -0,0 +1,56 @@
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Copyright 2020 Leszek Koltunski                                                               //
+//                                                                                               //
+// This file is part of Magic Cube.                                                              //
+//                                                                                               //
+// Magic Cube is free software: you can redistribute it and/or modify                            //
+// it under the terms of the GNU General Public License as published by                          //
+// the Free Software Foundation, either version 2 of the License, or                             //
+// (at your option) any later version.                                                           //
+//                                                                                               //
+// Magic Cube is distributed in the hope that it will be useful,                                 //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                 //
+// GNU General Public License for more details.                                                  //
+//                                                                                               //
+// You should have received a copy of the GNU General Public License                             //
+// along with Magic Cube.  If not, see <http://www.gnu.org/licenses/>.                           //
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.distorted.states;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.TypedValue;
+import android.widget.LinearLayout;
+
+import org.distorted.main.RubikActivity;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+@SuppressLint("ViewConstructor")
+public class TransparentButton extends androidx.appcompat.widget.AppCompatButton
+{
+   public TransparentButton(Context context, int resId, float size, float scrWidth)
+      {
+      super(context);
+
+      final int padding = (int)(scrWidth*RubikActivity.PADDING);
+      final int margin  = (int)(scrWidth*RubikActivity.MARGIN);
+
+      LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT, 1.0f);
+      params.topMargin    = margin;
+      params.bottomMargin = margin;
+      params.leftMargin   = margin;
+      params.rightMargin  = margin;
+
+      setLayoutParams(params);
+      setPadding(padding,0,padding,0);
+      setTextSize(TypedValue.COMPLEX_UNIT_PX, size);
+      setText(resId);
+
+      TypedValue outValue = new TypedValue();
+      context.getTheme().resolveAttribute(android.R.attr.selectableItemBackgroundBorderless, outValue, true);
+      setBackgroundResource(outValue.resourceId);
+      }
+}
diff --git a/src/main/java/org/distorted/states/TransparentImageButton.java b/src/main/java/org/distorted/states/TransparentImageButton.java
new file mode 100644
index 00000000..22384a9d
--- /dev/null
+++ b/src/main/java/org/distorted/states/TransparentImageButton.java
@@ -0,0 +1,56 @@
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Copyright 2020 Leszek Koltunski                                                               //
+//                                                                                               //
+// This file is part of Magic Cube.                                                              //
+//                                                                                               //
+// Magic Cube is free software: you can redistribute it and/or modify                            //
+// it under the terms of the GNU General Public License as published by                          //
+// the Free Software Foundation, either version 2 of the License, or                             //
+// (at your option) any later version.                                                           //
+//                                                                                               //
+// Magic Cube is distributed in the hope that it will be useful,                                 //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                 //
+// GNU General Public License for more details.                                                  //
+//                                                                                               //
+// You should have received a copy of the GNU General Public License                             //
+// along with Magic Cube.  If not, see <http://www.gnu.org/licenses/>.                           //
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.distorted.states;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.TypedValue;
+import android.widget.LinearLayout;
+
+import org.distorted.main.RubikActivity;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+@SuppressLint("ViewConstructor")
+public class TransparentImageButton extends androidx.appcompat.widget.AppCompatImageButton
+{
+  public TransparentImageButton(Context context, int icon, float scrWidth, int butWidth)
+      {
+      super(context);
+
+      final int padding = (int)(scrWidth*RubikActivity.PADDING);
+      final int margin  = (int)(scrWidth*RubikActivity.MARGIN);
+
+      LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(butWidth,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
+
+      params.topMargin    = margin;
+      params.bottomMargin = margin;
+      params.leftMargin   = margin;
+      params.rightMargin  = margin;
+
+      setLayoutParams(params);
+      setPadding(padding,0,padding,0);
+      setImageResource(icon);
+
+      TypedValue outValue = new TypedValue();
+      context.getTheme().resolveAttribute(android.R.attr.selectableItemBackgroundBorderless, outValue, true);
+      setBackgroundResource(outValue.resourceId);
+      }
+}
diff --git a/src/main/java/org/distorted/tutorial/TutorialActivity.java b/src/main/java/org/distorted/tutorial/TutorialActivity.java
index 2729b399..c078ad22 100644
--- a/src/main/java/org/distorted/tutorial/TutorialActivity.java
+++ b/src/main/java/org/distorted/tutorial/TutorialActivity.java
@@ -61,6 +61,7 @@ public class TutorialActivity extends AppCompatActivity
     private static int mScreenWidth, mScreenHeight;
     private int mCurrentApiVersion;
     private WebView mWebView;
+    private TutorialState mState;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -117,12 +118,22 @@ public class TutorialActivity extends AppCompatActivity
       {
       super.onAttachedToWindow();
 
-      final float RATIO = 0.30f;
+      final float RATIO = 0.15f;
       float width = getScreenWidthInPixels();
-      LinearLayout layout = findViewById(R.id.rightBar);
-      ViewGroup.LayoutParams params = layout.getLayoutParams();
-      params.width = (int)(width*RATIO);
-      layout.setLayoutParams(params);
+
+      TutorialSurfaceView viewL = findViewById(R.id.tutorialSurfaceView);
+      ViewGroup.LayoutParams paramsL = viewL.getLayoutParams();
+      paramsL.width = (int)(width*(1.0f-RATIO));
+      viewL.setLayoutParams(paramsL);
+
+      LinearLayout viewR = findViewById(R.id.rightBar);
+      ViewGroup.LayoutParams paramsR = viewR.getLayoutParams();
+      paramsR.width = (int)(width*RATIO);
+      viewR.setLayoutParams(paramsR);
+
+      if( mState==null ) mState = new TutorialState();
+
+      mState.createRightPane(this,width);
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -217,6 +228,13 @@ public class TutorialActivity extends AppCompatActivity
       errDiag.show(getSupportFragmentManager(), null);
       }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+    TutorialState getState()
+      {
+      return mState;
+      }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC API
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/tutorial/TutorialRenderer.java b/src/main/java/org/distorted/tutorial/TutorialRenderer.java
index 2669acbe..8abc67cd 100644
--- a/src/main/java/org/distorted/tutorial/TutorialRenderer.java
+++ b/src/main/java/org/distorted/tutorial/TutorialRenderer.java
@@ -64,6 +64,8 @@ public class TutorialRenderer implements GLSurfaceView.Renderer, DistortedLibrar
    @Override
    public void onSurfaceChanged(GL10 glUnused, int width, int height)
       {
+      android.util.Log.e("tut", "width="+width+" height="+height);
+
       mScreen.resize(width,height);
       mView.setScreenSize(width,height);
       mView.getPreRender().setScreenSize(width);
@@ -80,8 +82,6 @@ public class TutorialRenderer implements GLSurfaceView.Renderer, DistortedLibrar
       BaseEffect.Type.enableEffects();
 
       DistortedLibrary.onSurfaceCreated(mView.getContext(),this,1);
-
-android.util.Log.e("tut", "onSurfaceCreated");
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/tutorial/TutorialState.java b/src/main/java/org/distorted/tutorial/TutorialState.java
new file mode 100644
index 00000000..373eb534
--- /dev/null
+++ b/src/main/java/org/distorted/tutorial/TutorialState.java
@@ -0,0 +1,237 @@
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Copyright 2020 Leszek Koltunski                                                               //
+//                                                                                               //
+// This file is part of Magic Cube.                                                              //
+//                                                                                               //
+// Magic Cube is free software: you can redistribute it and/or modify                            //
+// it under the terms of the GNU General Public License as published by                          //
+// the Free Software Foundation, either version 2 of the License, or                             //
+// (at your option) any later version.                                                           //
+//                                                                                               //
+// Magic Cube is distributed in the hope that it will be useful,                                 //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                 //
+// GNU General Public License for more details.                                                  //
+//                                                                                               //
+// You should have received a copy of the GNU General Public License                             //
+// along with Magic Cube.  If not, see <http://www.gnu.org/licenses/>.                           //
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.distorted.tutorial;
+
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+
+import org.distorted.main.R;
+import org.distorted.main.RubikActivity;
+import org.distorted.main.RubikPreRender;
+import org.distorted.objects.TwistyObject;
+import org.distorted.states.TransparentImageButton;
+
+import java.util.ArrayList;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+public class TutorialState implements RubikPreRender.ActionFinishedListener
+{
+  private static final int DURATION_MILLIS = 750;
+
+  private ImageButton mPrevButton, mLockButton, mSolveButton, mScrambleButton, mBackButton;
+
+  private boolean mCanPrevMove;
+
+  private static class Move
+    {
+    private int mAxis, mRow, mAngle;
+
+    Move(int axis, int row, int angle)
+      {
+      mAxis = axis;
+      mRow  = row;
+      mAngle= angle;
+      }
+    }
+
+  ArrayList<Move> mMoves;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private void backMove(TutorialPreRender pre)
+    {
+    if( mCanPrevMove )
+      {
+      int numMoves = mMoves.size();
+
+      if( numMoves>0 )
+        {
+        Move move = mMoves.remove(numMoves-1);
+        TwistyObject object = pre.getObject();
+
+        int axis  = move.mAxis;
+        int row   = (1<<move.mRow);
+        int angle = move.mAngle;
+        int numRot= Math.abs(angle*object.getBasicAngle()/360);
+
+        if( angle!=0 )
+          {
+          mCanPrevMove = false;
+          pre.addRotation(this, axis, row, -angle, numRot*DURATION_MILLIS);
+          }
+        else
+          {
+          android.util.Log.e("solution", "error: trying to back move of angle 0");
+          }
+        }
+      }
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private void toggleLock(TutorialActivity act)
+    {
+    act.toggleLock();
+    mLockButton.setImageResource(getLockIcon(act));
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private int getLockIcon(TutorialActivity act)
+    {
+    if( act.retLocked() )
+      {
+      return RubikActivity.getDrawable(R.drawable.ui_small_locked,R.drawable.ui_medium_locked, R.drawable.ui_big_locked, R.drawable.ui_huge_locked);
+      }
+    else
+      {
+      return RubikActivity.getDrawable(R.drawable.ui_small_unlocked,R.drawable.ui_medium_unlocked, R.drawable.ui_big_unlocked, R.drawable.ui_huge_unlocked);
+      }
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private void setupSolveButton(final TutorialActivity act, final float width)
+    {
+    int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube_solve,R.drawable.ui_medium_cube_solve, R.drawable.ui_big_cube_solve, R.drawable.ui_huge_cube_solve);
+    mSolveButton = new TransparentImageButton(act, icon, width, LinearLayout.LayoutParams.MATCH_PARENT);
+
+    mSolveButton.setOnClickListener( new View.OnClickListener()
+      {
+      @Override
+      public void onClick(View v)
+        {
+        act.getPreRender().solveObject();
+        mMoves.clear();
+        }
+      });
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private void setupLockButton(final TutorialActivity act, final float width)
+    {
+    final int icon = getLockIcon(act);
+    mLockButton = new TransparentImageButton(act, icon, width,LinearLayout.LayoutParams.MATCH_PARENT);
+
+    mLockButton.setOnClickListener( new View.OnClickListener()
+      {
+      @Override
+      public void onClick(View v)
+        {
+        toggleLock(act);
+        }
+      });
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private void setupPrevButton(final TutorialActivity act, final float width)
+    {
+    int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube_back,R.drawable.ui_medium_cube_back, R.drawable.ui_big_cube_back, R.drawable.ui_huge_cube_back);
+    mPrevButton = new TransparentImageButton(act, icon, width,LinearLayout.LayoutParams.MATCH_PARENT);
+
+    mPrevButton.setOnClickListener( new View.OnClickListener()
+      {
+      @Override
+      public void onClick(View v)
+        {
+        TutorialPreRender pre = act.getPreRender();
+        backMove(pre);
+        }
+      });
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private void setupScrambleButton(final TutorialActivity act, final float width)
+    {
+    int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube_scramble,R.drawable.ui_medium_cube_scramble, R.drawable.ui_big_cube_scramble, R.drawable.ui_huge_cube_scramble);
+    mScrambleButton = new TransparentImageButton(act, icon, width,LinearLayout.LayoutParams.MATCH_PARENT);
+
+    mScrambleButton.setOnClickListener( new View.OnClickListener()
+      {
+      @Override
+      public void onClick(View v)
+        {
+        TutorialPreRender pre = act.getPreRender();
+        // TODO
+        }
+      });
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private void setupBackButton(final TutorialActivity act, final float width)
+    {
+    int icon = RubikActivity.getDrawable(R.drawable.ui_small_back,R.drawable.ui_medium_back, R.drawable.ui_big_back, R.drawable.ui_huge_back);
+    mBackButton = new TransparentImageButton(act, icon, width, LinearLayout.LayoutParams.MATCH_PARENT);
+
+    mBackButton.setOnClickListener( new View.OnClickListener()
+      {
+      @Override
+      public void onClick(View v)
+        {
+        act.finish();
+        }
+      });
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  void createRightPane(final TutorialActivity act, float width)
+    {
+    mCanPrevMove = true;
+
+    if( mMoves==null ) mMoves = new ArrayList<>();
+    else               mMoves.clear();
+
+    LinearLayout layout = act.findViewById(R.id.rightBar);
+    layout.removeAllViews();
+
+    setupPrevButton(act,width);
+    setupLockButton(act,width);
+    setupSolveButton(act,width);
+    setupScrambleButton(act,width);
+    setupBackButton(act,width);
+
+    layout.addView(mSolveButton);
+    layout.addView(mPrevButton);
+    layout.addView(mScrambleButton);
+    layout.addView(mLockButton);
+    layout.addView(mBackButton);
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public void addMove(int axis, int row, int angle)
+    {
+    mMoves.add(new Move(axis,row,angle));
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  public void onActionFinished(final long effectID)
+    {
+    mCanPrevMove = true;
+    }
+}
diff --git a/src/main/java/org/distorted/tutorial/TutorialSurfaceView.java b/src/main/java/org/distorted/tutorial/TutorialSurfaceView.java
index 679d66e4..b8472b10 100644
--- a/src/main/java/org/distorted/tutorial/TutorialSurfaceView.java
+++ b/src/main/java/org/distorted/tutorial/TutorialSurfaceView.java
@@ -32,6 +32,7 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.distorted.library.type.Static2D;
 import org.distorted.library.type.Static4D;
+import org.distorted.main.RubikActivity;
 import org.distorted.objects.Movement;
 import org.distorted.objects.TwistyObject;
 import org.distorted.states.RubikStateSolving;
@@ -371,17 +372,12 @@ public class TutorialSurfaceView extends GLSurfaceView
       int angle = mPreRender.getObject().computeNearestAngle(mCurrentAngle, mCurrRotSpeed);
       mPreRender.finishRotation(angle);
 
-////////////
-// TODO
       if( angle!=0 )
         {
-        if( StateList.getCurrentState()== StateList.SOLV )
-          {
-          RubikStateSolving solving = (RubikStateSolving) StateList.SOLV.getStateClass();
-          solving.addMove(mCurrentAxis, mCurrentRow, angle);
-          }
+        final TutorialActivity act = (TutorialActivity)getContext();
+        TutorialState state = act.getState();
+        state.addMove(mCurrentAxis, mCurrentRow, angle);
         }
-///////////
 
       mContinuingRotation = false;
       mBeginningRotation  = false;
diff --git a/src/main/res/drawable-nodpi/ui_big_cube_scramble.png b/src/main/res/drawable-nodpi/ui_big_cube_scramble.png
new file mode 100644
index 00000000..887d8f2f
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_cube_scramble.png differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_cube_scramble.png b/src/main/res/drawable-nodpi/ui_huge_cube_scramble.png
new file mode 100644
index 00000000..df46cd71
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_huge_cube_scramble.png differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_cube_scramble.png b/src/main/res/drawable-nodpi/ui_medium_cube_scramble.png
new file mode 100644
index 00000000..b2ab231e
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_cube_scramble.png differ
diff --git a/src/main/res/drawable-nodpi/ui_small_cube_scramble.png b/src/main/res/drawable-nodpi/ui_small_cube_scramble.png
new file mode 100644
index 00000000..9e6b2a3d
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_cube_scramble.png differ
diff --git a/src/main/res/layout/tutorial.xml b/src/main/res/layout/tutorial.xml
index a40090b0..901f14fc 100644
--- a/src/main/res/layout/tutorial.xml
+++ b/src/main/res/layout/tutorial.xml
@@ -17,22 +17,24 @@
         android:id="@+id/lowerPart"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:gravity="center"
         android:layout_weight="1"
         android:orientation="horizontal"
         android:background="@android:color/transparent">
 
         <org.distorted.tutorial.TutorialSurfaceView
            android:id="@+id/tutorialSurfaceView"
-           android:layout_width="fill_parent"
-           android:layout_height="fill_parent"/>
+           android:layout_width="0dp"
+           android:layout_height="match_parent"/>
 
         <LinearLayout
            android:id="@+id/rightBar"
-           android:layout_width="200dp"
+           android:layout_width="0dp"
            android:layout_height="match_parent"
+
            android:orientation="vertical"
            android:background="@android:color/transparent">
+
+
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file