commit a7327225665a3b2b67ff47c340c12507cab4cf6d
Author: leszek <leszek@koltunski.pl>
Date:   Mon Oct 16 17:10:53 2023 +0200

    Slightely improve the scores dialog.

diff --git a/src/main/java/org/distorted/main/RubikActivity.java b/src/main/java/org/distorted/main/RubikActivity.java
index 384cad39..9e1d7a67 100644
--- a/src/main/java/org/distorted/main/RubikActivity.java
+++ b/src/main/java/org/distorted/main/RubikActivity.java
@@ -18,7 +18,6 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.LocaleList;
 import android.preference.PreferenceManager;
 
 import android.util.DisplayMetrics;
@@ -46,7 +45,6 @@ import org.distorted.objectlib.main.ObjectControl;
 import org.distorted.objectlib.main.TwistyObject;
 
 import org.distorted.dialogs.RubikDialogError;
-import org.distorted.dialogs.RubikDialogPrivacy;
 import org.distorted.external.RubikScores;
 import org.distorted.external.RubikNetwork;
 import org.distorted.objects.RubikObject;
@@ -65,7 +63,7 @@ import static org.distorted.objectlib.main.TwistyObject.MESH_NICE;
 public class RubikActivity extends AppCompatActivity
 {
     public static final boolean SHOW_DOWNLOADED_DEBUG = false;
-    public static final boolean SHOW_IAP_DEBUG        = true;
+    public static final boolean SHOW_IAP_DEBUG        = false;
     public static final boolean USE_IAP               = false;
 
     public static final float PADDING             = 0.010f;
@@ -81,7 +79,6 @@ public class RubikActivity extends AppCompatActivity
     public static final float POPUP_PADDING       = 0.028f;
     public static final float POPUP_MARGIN        = 0.016f;
     public static final float POPUP_BOTTOM        = 0.090f;
-    public static final float BUTT_PAD            = 0.020f;
     public static final float RATIO_BAR           = 0.100f;
 
     public static final int FLAGS =  View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
@@ -99,9 +96,9 @@ public class RubikActivity extends AppCompatActivity
     private boolean mJustStarted;
     private FirebaseAnalytics mFirebaseAnalytics;
     private static int mScreenWidth, mScreenHeight;
-    private boolean mPolicyAccepted, mIsChinese;
+    private boolean mPolicyAccepted;
     private int mCurrentApiVersion;
-    private int mHeightUpperBar, mHeightLowerBar;
+    private int mHeightUpperBar;
     private int mOldVersion1, mOldVersion2, mOldVersion3;
     private String mOldVersion, mCurrVersion;
     private int mSolverIndex;
@@ -113,20 +110,19 @@ public class RubikActivity extends AppCompatActivity
       {
       super.onCreate(savedState);
       DistortedLibrary.onCreate(ACTIVITY_NUMBER);
-
       setTheme(R.style.MaterialThemeNoActionBar);
       setContentView(R.layout.main);
+      hideNavigationBar();
 
       mJustStarted = true;
       mFirebaseAnalytics = FirebaseAnalytics.getInstance(this);
-      mIsChinese = localeIsChinese();
 
       DisplayMetrics displaymetrics = new DisplayMetrics();
       getWindowManager().getDefaultDisplay().getRealMetrics(displaymetrics);
       mScreenWidth =displaymetrics.widthPixels;
       mScreenHeight=displaymetrics.heightPixels;
 
-      hideNavigationBar();
+
       cutoutHack();
       computeBarHeights();
 
@@ -151,7 +147,6 @@ public class RubikActivity extends AppCompatActivity
     private void computeBarHeights()
       {
       int barHeight = (int)(mScreenHeight*RATIO_BAR);
-      mHeightLowerBar = barHeight;
       mHeightUpperBar = barHeight;
 
       LinearLayout layoutTop = findViewById(R.id.upperBar);
@@ -161,7 +156,7 @@ public class RubikActivity extends AppCompatActivity
       paramsTop.height = mHeightUpperBar;
       layoutTop.setLayoutParams(paramsTop);
       ViewGroup.LayoutParams paramsBot = layoutBot.getLayoutParams();
-      paramsBot.height = mHeightLowerBar;
+      paramsBot.height = barHeight;
       layoutBot.setLayoutParams(paramsBot);
       }
 
@@ -290,14 +285,6 @@ public class RubikActivity extends AppCompatActivity
         }
       }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    private void privacyPolicy()
-      {
-      RubikDialogPrivacy priDiag = new RubikDialogPrivacy();
-      priDiag.show(getSupportFragmentManager(), null);
-      }
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     private void displayNovelties()
@@ -516,13 +503,6 @@ public class RubikActivity extends AppCompatActivity
       return mHeightUpperBar;
       }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    public int getHeightLowerBar()
-      {
-      return mHeightLowerBar;
-      }
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     public TwistyObject getObject()
@@ -632,24 +612,6 @@ public class RubikActivity extends AppCompatActivity
       finish();
       }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    public static boolean localeIsChinese()
-      {
-      String language;
-
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-        {
-        language= LocaleList.getDefault().get(0).getLanguage();
-        }
-      else
-        {
-        language= Locale.getDefault().getLanguage();
-        }
-
-      return language.equals("zh");
-      }
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     public boolean isVertical()
diff --git a/src/main/res/layout/dialog_scores_scramble_row.xml b/src/main/res/layout/dialog_scores_scramble_row.xml
index 79499f5b..456ad2c8 100644
--- a/src/main/res/layout/dialog_scores_scramble_row.xml
+++ b/src/main/res/layout/dialog_scores_scramble_row.xml
@@ -4,38 +4,40 @@
     android:layout_height="wrap_content"
     android:paddingBottom="2dp"
     android:paddingTop="2dp"
-    android:orientation="horizontal" >
+    android:orientation="horizontal"
+    android:weightSum="1.0">
 
     <ImageView
         android:id="@+id/scoresScrambleRowCountry"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
         android:paddingBottom="3dp"
         android:paddingTop="3dp"
-        android:layout_weight="1.5"
+        android:layout_weight="0.17"
         android:gravity="start"
         android:background="@color/black"/>
 
     <TextView
         android:id="@+id/scoresScrambleRowName"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:layout_weight="1"
+        android:layout_weight="0.53"
         android:textSize="20sp"
         android:maxLines="1"
-        android:gravity="left"
+        android:gravity="start|center_vertical"
         android:background="@color/black"
+        android:paddingStart="5dp"
         />
 
     <TextView
         android:id="@+id/scoresScrambleRowTime"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:layout_weight="1.2"
+        android:layout_weight="0.3"
         android:textSize="20sp"
         android:maxLines="1"
-        android:gravity="end"
+        android:gravity="end|center_vertical"
         android:background="@color/black"
-        android:paddingEnd="3dp"
+        android:paddingEnd="5dp"
         />
 </LinearLayout>