commit 8f200211498c5f1ba87e3d31a2a3ad2506922418
Author: leszek <leszek@koltunski.pl>
Date:   Fri Oct 6 12:57:16 2023 +0200

    Seriously lower memory usage.

diff --git a/src/main/java/org/distorted/objects/RubikObject.java b/src/main/java/org/distorted/objects/RubikObject.java
index ffeead6a..95c42f68 100644
--- a/src/main/java/org/distorted/objects/RubikObject.java
+++ b/src/main/java/org/distorted/objects/RubikObject.java
@@ -50,7 +50,6 @@ public class RubikObject
   private int mNumScramble;
   private int mMeshState;
   private int mExtrasOrdinal;
-  private Drawable mStaticIconD, mRescaledIconD;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -76,9 +75,6 @@ public class RubikObject
 
     mObjectVersion = ObjectType.getObjectVersion(ordinal);
     mExtrasVersion = ObjectType.getExtrasVersion(ordinal);
-
-    mStaticIconD  = null;
-    mRescaledIconD= null;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -136,35 +132,18 @@ public class RubikObject
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private void createStaticIconDrawable(Activity act)
-    {
-    if( mIconID>0 )
-      {
-      mStaticIconD = AppCompatResources.getDrawable(act,mIconID);
-      }
-    else
-      {
-      RubikFiles files = RubikFiles.getInstance();
-      Bitmap bmp = files.getIcon(act,mLowerName+".png");
-      if( bmp==null ) mStaticIconD = AppCompatResources.getDrawable(act,R.drawable.unknown_icon);
-      else            mStaticIconD = new BitmapDrawable(act.getResources(), bmp);
-      }
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  private void createRescaledIconDrawable(Activity act)
+  private Drawable createIconDrawable(Activity act)
     {
     if( mIconID>0 )
       {
-      mRescaledIconD = AppCompatResources.getDrawable(act,mIconID);
+      return AppCompatResources.getDrawable(act,mIconID);
       }
     else
       {
       RubikFiles files = RubikFiles.getInstance();
       Bitmap bmp = files.getIcon(act,mLowerName+".png");
-      if( bmp==null ) mRescaledIconD = AppCompatResources.getDrawable(act,R.drawable.unknown_icon);
-      else            mRescaledIconD = new BitmapDrawable(act.getResources(), bmp);
+      if( bmp==null ) return AppCompatResources.getDrawable(act,R.drawable.unknown_icon);
+      else            return new BitmapDrawable(act.getResources(), bmp);
       }
     }
 
@@ -257,16 +236,16 @@ public class RubikObject
 
   public void setIconTo(Activity act,ImageButton button)
     {
-    if( mStaticIconD==null ) createStaticIconDrawable(act);
-    button.setBackground(mStaticIconD);
+    Drawable icon = createIconDrawable(act);
+    button.setBackground(icon);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public void setIconTo(Activity act,ImageView view)
     {
-    if( mRescaledIconD==null ) createRescaledIconDrawable(act);
-    view.setImageDrawable(mRescaledIconD);
+    Drawable icon = createIconDrawable(act);
+    view.setImageDrawable(icon);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/solvers/SolverDino6.java b/src/main/java/org/distorted/solvers/SolverDino6.java
index b90ba38a..6fe83b74 100644
--- a/src/main/java/org/distorted/solvers/SolverDino6.java
+++ b/src/main/java/org/distorted/solvers/SolverDino6.java
@@ -445,8 +445,6 @@ public class SolverDino6 extends SolverTablebase
       mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.DINO_3.name() );
       }
 
-    //mSolver.test(os);
-
     return mSolver!=null ? mSolver.solution(index,null,os) : null;
     }
 }