commit 4918f19ca4045b16de17102cee89668411f7b77d
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Tue Feb 11 23:19:28 2020 +0000

    Various improvements.

diff --git a/src/main/java/org/distorted/magic/RubikActivity.java b/src/main/java/org/distorted/magic/RubikActivity.java
index 3f1d047b..2dd4375e 100644
--- a/src/main/java/org/distorted/magic/RubikActivity.java
+++ b/src/main/java/org/distorted/magic/RubikActivity.java
@@ -218,9 +218,10 @@ 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);
+      bundle.putInt("tab", mButton);
+
+      RubikScores scores = new RubikScores();
       scores.setArguments(bundle);
       scores.show(getSupportFragmentManager(), null);
       }
diff --git a/src/main/java/org/distorted/magic/RubikScores.java b/src/main/java/org/distorted/magic/RubikScores.java
index 61b3d107..1338c9c5 100644
--- a/src/main/java/org/distorted/magic/RubikScores.java
+++ b/src/main/java/org/distorted/magic/RubikScores.java
@@ -63,6 +63,18 @@ public class RubikScores 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.scores, null);
     builder.setView(view);
@@ -72,9 +84,7 @@ public class RubikScores extends AppCompatDialogFragment
     mPagerAdapter = new RubikScoresPagerAdapter(act,viewPager);
     tabLayout.setupWithViewPager(viewPager);
 
-    Bundle args = getArguments();
-    int button = args.getInt("button");
-    viewPager.setCurrentItem(button);
+    viewPager.setCurrentItem(curTab);
 
     for (int i = 0; i< RubikSize.LENGTH; i++)
       {
diff --git a/src/main/java/org/distorted/magic/RubikScoresPagerAdapter.java b/src/main/java/org/distorted/magic/RubikScoresPagerAdapter.java
index 74ed1b31..c1b24c10 100644
--- a/src/main/java/org/distorted/magic/RubikScoresPagerAdapter.java
+++ b/src/main/java/org/distorted/magic/RubikScoresPagerAdapter.java
@@ -99,7 +99,7 @@ class RubikScoresPagerAdapter extends PagerAdapter implements RubikScoresDownloa
 
       try
         {
-        Thread.sleep(50);
+        Thread.sleep(60);
         }
       catch( InterruptedException ie)
         {
diff --git a/src/main/java/org/distorted/magic/RubikScoresView.java b/src/main/java/org/distorted/magic/RubikScoresView.java
index e7453473..1fb02ff1 100644
--- a/src/main/java/org/distorted/magic/RubikScoresView.java
+++ b/src/main/java/org/distorted/magic/RubikScoresView.java
@@ -26,6 +26,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -81,19 +82,19 @@ public class RubikScoresView extends FrameLayout
 
   void addSection(FragmentActivity act, int scramble, final int[] country, final String[] name, final String[] time)
     {
-    LinearLayout level = (LinearLayout)inflate(act, R.layout.level_records, null);
-    TextView text = level.findViewById(R.id.levelTitle);
+    LinearLayout level = (LinearLayout)inflate(act, R.layout.scores_scramble_title, null);
+    TextView text = level.findViewById(R.id.scoresScrambleTitle);
     text.setText(act.getString(R.string.sc_placeholder,(scramble+1)));
 
     for(int j=0; j<RubikScoresDownloader.MAX_PLACES; j++)
       {
       if( name[j] != null )
         {
-        View row = inflate(act, R.layout.level_row, null);
+        View row = inflate(act, R.layout.scores_scramble_row, null);
 
-        ImageView imgCoun = row.findViewById(R.id.level_row_country);
-        TextView textName = row.findViewById(R.id.level_row_name);
-        TextView textTime = row.findViewById(R.id.level_row_time);
+        ImageView imgCoun = row.findViewById(R.id.scoresScrambleRowCountry);
+        TextView textName = row.findViewById(R.id.scoresScrambleRowName);
+        TextView textTime = row.findViewById(R.id.scoresScrambleRowTime);
 
         imgCoun.setImageResource(country[j]);
         textName.setText(name[j]);
diff --git a/src/main/java/org/distorted/magic/RubikSettings.java b/src/main/java/org/distorted/magic/RubikSettings.java
index de61cc45..19187594 100644
--- a/src/main/java/org/distorted/magic/RubikSettings.java
+++ b/src/main/java/org/distorted/magic/RubikSettings.java
@@ -20,6 +20,7 @@
 package org.distorted.magic;
 
 import android.app.Dialog;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.FragmentActivity;
@@ -74,7 +75,7 @@ public class RubikSettings extends AppCompatDialogFragment implements SeekBar.On
     LinearLayout outerLayout = new LinearLayout(act);
     LinearLayout.LayoutParams outerLayoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT, 0.5f);
     outerLayoutParams.topMargin    = margin;
-    outerLayoutParams.bottomMargin = margin;
+    outerLayoutParams.bottomMargin = 0;
     outerLayoutParams.leftMargin   = margin;
     outerLayoutParams.rightMargin  = margin;
 
@@ -205,7 +206,16 @@ public class RubikSettings extends AppCompatDialogFragment implements SeekBar.On
     {
     FragmentActivity act = getActivity();
     AlertDialog.Builder builder = new AlertDialog.Builder(act);
-    builder.setCancelable(false);
+
+    builder.setCancelable(true);
+    builder.setPositiveButton( R.string.ok, new DialogInterface.OnClickListener()
+      {
+      @Override
+      public void onClick(DialogInterface dialog, int which)
+        {
+
+        }
+      });
 
     LayoutInflater inflater = act.getLayoutInflater();
     final View view = inflater.inflate(R.layout.settings, null);
diff --git a/src/main/res/layout/level_records.xml b/src/main/res/layout/level_records.xml
deleted file mode 100644
index a95180a0..00000000
--- a/src/main/res/layout/level_records.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:id="@+id/levelLayout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/grey"
-
-    android:paddingBottom="0dp"
-    android:paddingTop="0dp"
-    android:paddingLeft="5dp"
-    android:paddingRight="5dp"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/levelTitle"
-        android:layout_width="match_parent"
-        android:layout_height="32dp"
-        android:textSize="24sp"
-        android:gravity="center"
-        android:background="@color/grey"
-        android:paddingBottom="0dp"
-        android:paddingTop="0dp"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/level_row.xml b/src/main/res/layout/level_row.xml
deleted file mode 100644
index 08870523..00000000
--- a/src/main/res/layout/level_row.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="50dp"
-    android:paddingBottom="2dp"
-    android:paddingTop="2dp"
-    android:orientation="horizontal" >
-
-    <ImageView
-        android:id="@+id/level_row_country"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1.5"
-        android:textSize="20sp"
-        android:gravity="left"
-        android:background="@color/black"
-        android:paddingLeft="5dp"/>
-
-    <TextView
-        android:id="@+id/level_row_name"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:textSize="20sp"
-        android:gravity="left"
-        android:background="@color/black"
-        />
-
-    <TextView
-        android:id="@+id/level_row_time"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1.5"
-        android:textSize="20sp"
-        android:gravity="right"
-        android:background="@color/black"
-        android:paddingRight="5dp"
-        />
-</LinearLayout>
diff --git a/src/main/res/layout/scores_scramble_row.xml b/src/main/res/layout/scores_scramble_row.xml
new file mode 100644
index 00000000..88031674
--- /dev/null
+++ b/src/main/res/layout/scores_scramble_row.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="0dp"
+    android:paddingBottom="2dp"
+    android:paddingTop="2dp"
+    android:orientation="horizontal" >
+
+    <ImageView
+        android:id="@+id/scoresScrambleRowCountry"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1.5"
+        android:textSize="20sp"
+        android:gravity="left"
+        android:background="@color/black"
+        android:paddingLeft="0dp"/>
+
+    <TextView
+        android:id="@+id/scoresScrambleRowName"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:textSize="20sp"
+        android:gravity="left"
+        android:background="@color/black"
+        />
+
+    <TextView
+        android:id="@+id/scoresScrambleRowTime"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1.5"
+        android:textSize="20sp"
+        android:gravity="right"
+        android:background="@color/black"
+        android:paddingRight="5dp"
+        />
+</LinearLayout>
diff --git a/src/main/res/layout/scores_scramble_title.xml b/src/main/res/layout/scores_scramble_title.xml
new file mode 100644
index 00000000..81a0fca4
--- /dev/null
+++ b/src/main/res/layout/scores_scramble_title.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/scoresScrambleLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/grey"
+
+    android:paddingBottom="0dp"
+    android:paddingTop="0dp"
+    android:paddingLeft="5dp"
+    android:paddingRight="5dp"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/scoresScrambleTitle"
+        android:layout_width="match_parent"
+        android:layout_height="32dp"
+        android:textSize="24sp"
+        android:gravity="center"
+        android:background="@color/grey"
+        android:paddingBottom="0dp"
+        android:paddingTop="0dp"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"/>
+
+</LinearLayout>
\ No newline at end of file