commit 52547ba7887e8c445e0314d6a7926cabf9ba613e
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Wed Oct 6 13:15:21 2021 +0200

    Simplification

diff --git a/src/main/java/org/distorted/dialogs/RubikDialogPattern.java b/src/main/java/org/distorted/dialogs/RubikDialogPattern.java
index 585a4cb3..00a0a860 100644
--- a/src/main/java/org/distorted/dialogs/RubikDialogPattern.java
+++ b/src/main/java/org/distorted/dialogs/RubikDialogPattern.java
@@ -44,6 +44,8 @@ import org.distorted.objectlib.main.ObjectType;
 import org.distorted.main.R;
 import org.distorted.main.RubikActivity;
 import org.distorted.patterns.RubikPatternList;
+import org.distorted.screens.RubikScreenPlay;
+import org.distorted.screens.ScreenList;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -80,18 +82,6 @@ public class RubikDialogPattern extends AppCompatDialogFragment
         }
       });
 
-    Bundle args = getArguments();
-    int curTab;
-
-    try
-      {
-      curTab = args.getInt("tab");
-      }
-    catch(Exception e)
-      {
-      curTab = 0;
-      }
-
     LayoutInflater inflater = act.getLayoutInflater();
     final View view = inflater.inflate(R.layout.dialog_tabbed, null);
     builder.setView(view);
@@ -100,7 +90,7 @@ public class RubikDialogPattern extends AppCompatDialogFragment
     TabLayout tabLayout = view.findViewById(R.id.sliding_tabs);
     mPagerAdapter = new RubikDialogPatternPagerAdapter(act, viewPager, this);
     tabLayout.setupWithViewPager(viewPager);
-    viewPager.setCurrentItem(curTab);
+    viewPager.setCurrentItem(getPatternOrdinal());
 
     for(int i=0; i< RubikPatternList.NUM_OBJECTS; i++)
       {
@@ -136,6 +126,22 @@ public class RubikDialogPattern extends AppCompatDialogFragment
     return dialog;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private int getPatternOrdinal()
+    {
+    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
+    ObjectType obj  = play.getObject();
+    int ret = RubikPatternList.getOrdinal(obj);
+
+    if( ret<0 )
+      {
+      ret = RubikPatternList.getOrdinal(RubikScreenPlay.DEF_OBJECT);
+      }
+
+    return ret;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   @Override
diff --git a/src/main/java/org/distorted/dialogs/RubikDialogTutorial.java b/src/main/java/org/distorted/dialogs/RubikDialogTutorial.java
index 87f00d06..8f657a1f 100644
--- a/src/main/java/org/distorted/dialogs/RubikDialogTutorial.java
+++ b/src/main/java/org/distorted/dialogs/RubikDialogTutorial.java
@@ -43,6 +43,9 @@ import com.google.android.material.tabs.TabLayout;
 
 import org.distorted.main.R;
 import org.distorted.main.RubikActivity;
+import org.distorted.objectlib.main.ObjectType;
+import org.distorted.screens.RubikScreenPlay;
+import org.distorted.screens.ScreenList;
 import org.distorted.tutorials.TutorialList;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -80,18 +83,6 @@ public class RubikDialogTutorial extends AppCompatDialogFragment
         }
       });
 
-    Bundle args = getArguments();
-    int curTab;
-
-    try
-      {
-      curTab = args.getInt("tab");
-      }
-    catch(Exception e)
-      {
-      curTab = 0;
-      }
-
     LayoutInflater inflater = act.getLayoutInflater();
     final View view = inflater.inflate(R.layout.dialog_tabbed, null);
     builder.setView(view);
@@ -100,7 +91,7 @@ public class RubikDialogTutorial extends AppCompatDialogFragment
     TabLayout tabLayout = view.findViewById(R.id.sliding_tabs);
     mPagerAdapter = new RubikDialogTutorialPagerAdapter(act,viewPager);
     tabLayout.setupWithViewPager(viewPager);
-    viewPager.setCurrentItem(curTab);
+    viewPager.setCurrentItem(getTutorialOrdinal());
 
     for(int i=0; i<TutorialList.NUM_OBJECTS; i++)
       {
@@ -134,6 +125,23 @@ public class RubikDialogTutorial extends AppCompatDialogFragment
     return dialog;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private int getTutorialOrdinal()
+    {
+    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
+    ObjectType obj  = play.getObject();
+
+    int ret = TutorialList.getOrdinal(obj);
+
+    if( ret<0 )
+      {
+      ret = TutorialList.getOrdinal(RubikScreenPlay.DEF_OBJECT);
+      }
+
+    return ret;
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   @Override
diff --git a/src/main/java/org/distorted/screens/RubikScreenAbstract.java b/src/main/java/org/distorted/screens/RubikScreenAbstract.java
index 7ccfa647..573e2271 100644
--- a/src/main/java/org/distorted/screens/RubikScreenAbstract.java
+++ b/src/main/java/org/distorted/screens/RubikScreenAbstract.java
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// Copyright 2020 Leszek Koltunski                                                               //
+// Copyright 2021 Leszek Koltunski                                                               //
 //                                                                                               //
 // This file is part of Magic Cube.                                                              //
 //                                                                                               //
@@ -22,47 +22,11 @@ package org.distorted.screens;
 import android.content.SharedPreferences;
 
 import org.distorted.main.RubikActivity;
-import org.distorted.objectlib.main.ObjectType;
-import org.distorted.patterns.RubikPatternList;
-import org.distorted.tutorials.TutorialList;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 public abstract class RubikScreenAbstract
   {
-  int getPatternOrdinal()
-    {
-    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
-    ObjectType obj  = play.getObject();
-    int ret = RubikPatternList.getOrdinal(obj);
-
-    if( ret<0 )
-      {
-      ret = RubikPatternList.getOrdinal(RubikScreenPlay.DEF_OBJECT);
-      }
-
-    return ret;
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  int getTutorialOrdinal()
-    {
-    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
-    ObjectType obj  = play.getObject();
-
-    int ret = TutorialList.getOrdinal(obj);
-
-    if( ret<0 )
-      {
-      ret = TutorialList.getOrdinal(RubikScreenPlay.DEF_OBJECT);
-      }
-
-    return ret;
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
   abstract void enterScreen(RubikActivity act);
   abstract void leaveScreen(RubikActivity act);
   public abstract void savePreferences(SharedPreferences.Editor editor);
diff --git a/src/main/java/org/distorted/screens/RubikScreenPattern.java b/src/main/java/org/distorted/screens/RubikScreenPattern.java
index 31447e4a..0b81f93a 100644
--- a/src/main/java/org/distorted/screens/RubikScreenPattern.java
+++ b/src/main/java/org/distorted/screens/RubikScreenPattern.java
@@ -20,7 +20,6 @@
 package org.distorted.screens;
 
 import android.content.SharedPreferences;
-import android.os.Bundle;
 import androidx.fragment.app.FragmentManager;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -78,7 +77,6 @@ public class RubikScreenPattern extends RubikScreenAbstract
     float width = act.getScreenWidthInPixels();
     mButtonSize = width*RubikActivity.BUTTON_TEXT_SIZE;
     float titleSize  = width*RubikActivity.TITLE_TEXT_SIZE;
-    mPatternOrdinal = getPatternOrdinal();
     LayoutInflater inflater = act.getLayoutInflater();
 
     // TOP ////////////////////////////
@@ -128,9 +126,6 @@ public class RubikScreenPattern extends RubikScreenAbstract
   private void showDialog(FragmentManager manager)
     {
     RubikDialogPattern diag = new RubikDialogPattern();
-    Bundle bundle = new Bundle();
-    bundle.putInt("tab", mPatternOrdinal );
-    diag.setArguments(bundle);
     diag.show( manager, RubikDialogPattern.getDialogTag() );
     }
 
diff --git a/src/main/java/org/distorted/screens/RubikScreenPlay.java b/src/main/java/org/distorted/screens/RubikScreenPlay.java
index e5920c63..7679a82f 100644
--- a/src/main/java/org/distorted/screens/RubikScreenPlay.java
+++ b/src/main/java/org/distorted/screens/RubikScreenPlay.java
@@ -366,19 +366,11 @@ public class RubikScreenPlay extends RubikScreenBase
               scores.show(act.getSupportFragmentManager(), null);
               break;
       case 1: RubikDialogPattern pDiag = new RubikDialogPattern();
-              Bundle pBundle = new Bundle();
-              int pOrd = getPatternOrdinal();
-              pBundle.putInt("tab", pOrd );
-              pDiag.setArguments(pBundle);
               pDiag.show( act.getSupportFragmentManager(), RubikDialogPattern.getDialogTag() );
               break;
       case 2: ScreenList.switchScreen(act, ScreenList.SVER);
               break;
       case 3: RubikDialogTutorial tDiag = new RubikDialogTutorial();
-              Bundle tBundle = new Bundle();
-              int tOrd = getTutorialOrdinal();
-              tBundle.putInt("tab", tOrd );
-              tDiag.setArguments(tBundle);
               tDiag.show( act.getSupportFragmentManager(), RubikDialogTutorial.getDialogTag() );
               break;
       case 4: RubikDialogAbout aDiag = new RubikDialogAbout();