commit acee3e3e4bb5d8c124ed5c2b70a031fcc43b6ecf
Author: leszek <leszek@koltunski.pl>
Date:   Sun Jan 21 02:47:17 2024 +0100

    progress

diff --git a/src/main/java/org/distorted/main/MainActivity.java b/src/main/java/org/distorted/main/MainActivity.java
index 6112b0e6..28846f31 100644
--- a/src/main/java/org/distorted/main/MainActivity.java
+++ b/src/main/java/org/distorted/main/MainActivity.java
@@ -465,7 +465,7 @@ public class MainActivity extends AppCompatActivity implements RubikNetwork.Upda
 
       int vw = v.getWidth();
 
-      MainSettingsPopup popup = new MainSettingsPopup(this,mScreenWidth,mScreenHeight);
+      MainSettingsPopup popup = new MainSettingsPopup(this,mSortMode,mScreenWidth,mScreenHeight);
       popup.displayPopup(this,v,sw,sh,(int)((vw-sw)/2),0);
       }
 
diff --git a/src/main/java/org/distorted/main/MainSettingsPopup.java b/src/main/java/org/distorted/main/MainSettingsPopup.java
index f75e713f..bc72a98b 100644
--- a/src/main/java/org/distorted/main/MainSettingsPopup.java
+++ b/src/main/java/org/distorted/main/MainSettingsPopup.java
@@ -82,7 +82,7 @@ public class MainSettingsPopup implements AdapterView.OnItemSelectedListener
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  MainSettingsPopup(MainActivity act, int width, int height)
+  MainSettingsPopup(MainActivity act, int sortMethod, int width, int height)
     {
     mAct = new WeakReference<>(act);
 
@@ -108,11 +108,13 @@ public class MainSettingsPopup implements AdapterView.OnItemSelectedListener
     Spinner actSpinner  = layout.findViewById(R.id.sortMethod);
     actSpinner.setOnItemSelectedListener(this);
 
-    mCurrMethod = -1;
+    mCurrMethod = sortMethod;
 
     ArrayAdapter<String> actAdapter = new ArrayAdapter<>(act, android.R.layout.simple_spinner_item, mSortNames);
     actAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
     actSpinner.setAdapter(actAdapter);
+
+    if( sortMethod>=0 && sortMethod<mSortNames.length ) actSpinner.setSelection(sortMethod);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -172,6 +174,7 @@ public class MainSettingsPopup implements AdapterView.OnItemSelectedListener
       mCurrMethod = pos;
       MainActivity act = mAct.get();
       act.sortObjectsBy(pos);
+      mPopup.dismiss();
       }
     }