commit 32f60decef19566427da7feae1ce1adb54a2998d
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Tue Feb 11 22:18:21 2020 +0000

    Downloading High Scores: make the Scores Dialog always start from appropriate tab

diff --git a/src/main/java/org/distorted/magic/RubikActivity.java b/src/main/java/org/distorted/magic/RubikActivity.java
index 23fde701..3f1d047b 100644
--- a/src/main/java/org/distorted/magic/RubikActivity.java
+++ b/src/main/java/org/distorted/magic/RubikActivity.java
@@ -45,20 +45,20 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList
     public static final int DEF_SCRAMBLE =  1;
     public static final int MAX_SCRAMBLE = 18;
 
-    private static int mSize = RubikSize.DEFAULT_SIZE;
+    private static int mButton = RubikSize.SIZE3.ordinal();
     private HorizontalNumberPicker mPicker;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    private void markButton(int size)
+    private void markButton(int button)
       {
-      mSize = size;
+      mButton = button;
 
       for(int b=0; b<RubikSize.LENGTH; b++)
         {
         Drawable d = findViewById(b).getBackground();
 
-        if( size == RubikSize.getSize(b).getCubeSize() )
+        if( b==button )
           {
           d.setColorFilter(ContextCompat.getColor(this,R.color.red), PorterDuff.Mode.MULTIPLY);
           }
@@ -128,9 +128,9 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    static int getSize()
+    static int getRedButton()
       {
-      return mSize;
+      return mButton;
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -142,7 +142,7 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList
       setTheme(R.style.CustomActivityThemeNoActionBar);
       setContentView(R.layout.main);
       addSizeButtons();
-      markButton(mSize);
+      markButton(mButton);
 
       mPicker = findViewById(R.id.rubikNumberPicker);
       mPicker.setMin(MIN_SCRAMBLE);
@@ -199,7 +199,7 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList
 
         if( success )
           {
-          markButton(size);
+          markButton(id);
           }
         }
       }
@@ -219,6 +219,9 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList
     public void Scores(View v)
       {
       RubikScores scores = new RubikScores();
+      Bundle bundle = new Bundle();
+      bundle.putInt("button", mButton);
+      scores.setArguments(bundle);
       scores.show(getSupportFragmentManager(), null);
       }
 
diff --git a/src/main/java/org/distorted/magic/RubikRenderer.java b/src/main/java/org/distorted/magic/RubikRenderer.java
index 07eb09e2..4e293f5e 100644
--- a/src/main/java/org/distorted/magic/RubikRenderer.java
+++ b/src/main/java/org/distorted/magic/RubikRenderer.java
@@ -84,7 +84,7 @@ public class RubikRenderer implements GLSurfaceView.Renderer, EffectListener
       mEffectID = new long[BaseEffect.Type.LENGTH];
 
       mMesh= new MeshFlat(20,20);
-      mNextCubeSize = RubikActivity.getSize();
+      mNextCubeSize = RubikSize.getSize(RubikActivity.getRedButton()).getCubeSize();
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/magic/RubikScores.java b/src/main/java/org/distorted/magic/RubikScores.java
index ad4f29ed..61b3d107 100644
--- a/src/main/java/org/distorted/magic/RubikScores.java
+++ b/src/main/java/org/distorted/magic/RubikScores.java
@@ -72,7 +72,9 @@ public class RubikScores extends AppCompatDialogFragment
     mPagerAdapter = new RubikScoresPagerAdapter(act,viewPager);
     tabLayout.setupWithViewPager(viewPager);
 
-    viewPager.setCurrentItem(0);
+    Bundle args = getArguments();
+    int button = args.getInt("button");
+    viewPager.setCurrentItem(button);
 
     for (int i = 0; i< RubikSize.LENGTH; i++)
       {
diff --git a/src/main/java/org/distorted/magic/RubikSize.java b/src/main/java/org/distorted/magic/RubikSize.java
index 11aa9e9a..7001c377 100644
--- a/src/main/java/org/distorted/magic/RubikSize.java
+++ b/src/main/java/org/distorted/magic/RubikSize.java
@@ -29,7 +29,6 @@ public enum RubikSize
   SIZE5 ( 5, R.drawable.button5 ),
   ;
 
-  static final int DEFAULT_SIZE  = 3;
   static final int LENGTH = values().length;
   private final int mCubeSize, mIconID;
   private static final RubikSize[] sizes;