commit e0e846744913cc67ba75df72041b2bd87e15cb34
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Sat Mar 28 23:01:59 2020 +0000

    Improve the upper_text.

diff --git a/build.gradle b/build.gradle
index a845e22d..6e34a6e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ android {
 
     defaultConfig {
         applicationId "org.distorted.magic"
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"
diff --git a/src/main/java/org/distorted/dialog/RubikDialogPatternView.java b/src/main/java/org/distorted/dialog/RubikDialogPatternView.java
index b05e6432..b69f4628 100644
--- a/src/main/java/org/distorted/dialog/RubikDialogPatternView.java
+++ b/src/main/java/org/distorted/dialog/RubikDialogPatternView.java
@@ -120,7 +120,7 @@ public class RubikDialogPatternView extends FrameLayout implements AdapterView.O
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private void fillPatterns(int category)
+  private void fillPatterns(final int category)
     {
     final RubikActivity act = (RubikActivity)getContext();
 
@@ -148,7 +148,7 @@ public class RubikDialogPatternView extends FrameLayout implements AdapterView.O
         public void onClick(View view)
           {
           RubikStatePattern state = (RubikStatePattern) RubikState.PATT.getStateClass();
-          state.setPatternName(patterns[ii]);
+          state.setPattern(mPosition, category, ii);
           mDialog.dismiss();
           }
         });
diff --git a/src/main/java/org/distorted/uistate/RubikStatePattern.java b/src/main/java/org/distorted/uistate/RubikStatePattern.java
index 7942186c..a51241d5 100644
--- a/src/main/java/org/distorted/uistate/RubikStatePattern.java
+++ b/src/main/java/org/distorted/uistate/RubikStatePattern.java
@@ -39,6 +39,9 @@ import org.distorted.patterns.RubikPattern;
 
 public class RubikStatePattern extends RubikStateAbstract
   {
+  // TODO: read this from upper_text.xml;  this is the height of the TextView there.
+  private static final int DEFAULT_TEXT_SIZE = 30;
+
   private TextView mText;
   private Button mBackButton;
   private int mSize;
@@ -144,6 +147,8 @@ public class RubikStatePattern extends RubikStateAbstract
 
         if( diag==null )
           {
+          mText.setTextSize(DEFAULT_TEXT_SIZE);
+          mText.setText(R.string.patterns);
           showDialog(mana);
           }
         else
@@ -157,9 +162,11 @@ public class RubikStatePattern extends RubikStateAbstract
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  public void setPatternName(String name)
+  public void setPattern(int sizeIndex, int category, int pattern)
     {
-    mText.setText(name);
+    RubikPattern patt = RubikPattern.getInstance();
+    String patternName = patt.getPatternName(sizeIndex,category,pattern);
+    mText.setText(patternName);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/res/layout/upper_text.xml b/src/main/res/layout/upper_text.xml
index 944e8a13..83a893d1 100644
--- a/src/main/res/layout/upper_text.xml
+++ b/src/main/res/layout/upper_text.xml
@@ -3,4 +3,7 @@
         android:layout_width="fill_parent"
         android:layout_height="50dp"
         android:textAlignment="center"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:autoSizeTextType="uniform"
         android:textSize="30sp"/>
