commit e01c0d027ed995792ac21d1589dd1d12ab5680a2
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Wed Sep 29 10:10:10 2021 +0200

    Rename some assets for consistency

diff --git a/src/main/java/org/distorted/objectlb/ObjectList.java b/src/main/java/org/distorted/objectlb/ObjectList.java
index b14f5503..98bfb993 100644
--- a/src/main/java/org/distorted/objectlb/ObjectList.java
+++ b/src/main/java/org/distorted/objectlb/ObjectList.java
@@ -51,6 +51,43 @@ import org.distorted.main.RubikActivity;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
+/*
+  CUBE_2 ( 0, new int[] {2 , 12, 12, R.raw.cube2, R.drawable.ui_small_cube2, R.drawable.ui_medium_cube2, R.drawable.ui_big_cube2, R.drawable.ui_huge_cube2} ),
+  CUBE_3 ( 0, new int[] {3 , 16, 17, R.raw.cube3, R.drawable.ui_small_cube3, R.drawable.ui_medium_cube3, R.drawable.ui_big_cube3, R.drawable.ui_huge_cube3} ),
+  CUBE_4 ( 0, new int[] {4 , 20, 24, R.raw.cube4, R.drawable.ui_small_cube4, R.drawable.ui_medium_cube4, R.drawable.ui_big_cube4, R.drawable.ui_huge_cube4} ),
+  CUBE_5 ( 0, new int[] {5 , 24, 28, R.raw.cube5, R.drawable.ui_small_cube5, R.drawable.ui_medium_cube5, R.drawable.ui_big_cube5, R.drawable.ui_huge_cube5} ),
+  JING_2 ( 1, new int[] {2 , 11, 11, R.raw.jing , R.drawable.ui_small_jing2, R.drawable.ui_medium_jing2, R.drawable.ui_big_jing2, R.drawable.ui_huge_jing2} ),
+  PYRA_3 ( 1, new int[] {3 , 10, 10, R.raw.pyra3, R.drawable.ui_small_pyra3, R.drawable.ui_medium_pyra3, R.drawable.ui_big_pyra3, R.drawable.ui_huge_pyra3} ),
+  PYRA_4 ( 1, new int[] {4 , 14, 17, R.raw.pyra4, R.drawable.ui_small_pyra4, R.drawable.ui_medium_pyra4, R.drawable.ui_big_pyra4, R.drawable.ui_huge_pyra4} ),
+  PYRA_5 ( 1, new int[] {5 , 20, 23, R.raw.pyra5, R.drawable.ui_small_pyra5, R.drawable.ui_medium_pyra5, R.drawable.ui_big_pyra5, R.drawable.ui_huge_pyra5} ),
+  KILO_3 ( 2, new int[] {3 , 18, 18, R.raw.kilo3, R.drawable.ui_small_kilo3, R.drawable.ui_medium_kilo3, R.drawable.ui_big_kilo3, R.drawable.ui_huge_kilo3} ),
+  KILO_5 ( 2, new int[] {5 , 33, 33, R.raw.kilo5, R.drawable.ui_small_kilo5, R.drawable.ui_medium_kilo5, R.drawable.ui_big_kilo5, R.drawable.ui_huge_kilo5} ),
+  MEGA_3 ( 2, new int[] {3 , 21, 21, R.raw.mega3, R.drawable.ui_small_mega3, R.drawable.ui_medium_mega3, R.drawable.ui_big_mega3, R.drawable.ui_huge_mega3} ),
+  MEGA_5 ( 2, new int[] {5 , 35, 37, R.raw.mega5, R.drawable.ui_small_mega5, R.drawable.ui_medium_mega5, R.drawable.ui_big_mega5, R.drawable.ui_huge_mega5} ),
+  ULTI_2 ( 3, new int[] {2 , 18, 18, R.raw.ulti , R.drawable.ui_small_ulti , R.drawable.ui_medium_ulti , R.drawable.ui_big_ulti , R.drawable.ui_huge_ulti } ),
+  DIAM_2 ( 3, new int[] {2 , 10, 12, R.raw.diam2, R.drawable.ui_small_diam2, R.drawable.ui_medium_diam2, R.drawable.ui_big_diam2, R.drawable.ui_huge_diam2} ),
+  DIAM_3 ( 3, new int[] {3 , 18, 24, R.raw.diam3, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} ),
+  DIAM_4 ( 3, new int[] {4 , 32, 32, R.raw.diam4, R.drawable.ui_small_diam4, R.drawable.ui_medium_diam4, R.drawable.ui_big_diam4, R.drawable.ui_huge_diam4} ),
+  DINO_3 ( 4, new int[] {3 , 10, 10, R.raw.dino , R.drawable.ui_small_dino , R.drawable.ui_medium_dino , R.drawable.ui_big_dino , R.drawable.ui_huge_dino } ),
+  DIN4_3 ( 4, new int[] {3 ,  7,  7, R.raw.dino , R.drawable.ui_small_din4 , R.drawable.ui_medium_din4 , R.drawable.ui_big_din4 , R.drawable.ui_huge_din4 } ),
+  REDI_3 ( 4, new int[] {3 , 14, 16, R.raw.redi , R.drawable.ui_small_redi , R.drawable.ui_medium_redi , R.drawable.ui_big_redi , R.drawable.ui_huge_redi } ),
+  HELI_3 ( 4, new int[] {3 , 18, 20, R.raw.heli , R.drawable.ui_small_heli , R.drawable.ui_medium_heli , R.drawable.ui_big_heli , R.drawable.ui_huge_heli } ),
+  SKEW_2 ( 5, new int[] {2 , 11, 11, R.raw.skew2, R.drawable.ui_small_skew2, R.drawable.ui_medium_skew2, R.drawable.ui_big_skew2, R.drawable.ui_huge_skew2} ),
+  SKEW_3 ( 5, new int[] {3 , 17, 21, R.raw.skew3, R.drawable.ui_small_skew3, R.drawable.ui_medium_skew3, R.drawable.ui_big_skew3, R.drawable.ui_huge_skew3} ),
+  IVY_2  ( 5, new int[] {2 ,  8,  8, R.raw.ivy  , R.drawable.ui_small_ivy  , R.drawable.ui_medium_ivy  , R.drawable.ui_big_ivy  , R.drawable.ui_huge_ivy  } ),
+  REX_3  ( 5, new int[] {3 , 16, 19, R.raw.rex  , R.drawable.ui_small_rex  , R.drawable.ui_medium_rex  , R.drawable.ui_big_rex  , R.drawable.ui_huge_rex  } ),
+  BAN1_3 ( 6, new int[] {3 , 16, 16, R.raw.ban1 , R.drawable.ui_small_ban1 , R.drawable.ui_medium_ban1 , R.drawable.ui_big_ban1 , R.drawable.ui_huge_ban1 } ),
+  BAN2_3 ( 6, new int[] {3 , 16, 16, R.raw.ban2 , R.drawable.ui_small_ban2 , R.drawable.ui_medium_ban2 , R.drawable.ui_big_ban2 , R.drawable.ui_huge_ban2 } ),
+  BAN3_3 ( 6, new int[] {3 , 16, 16, R.raw.ban3 , R.drawable.ui_small_ban3 , R.drawable.ui_medium_ban3 , R.drawable.ui_big_ban3 , R.drawable.ui_huge_ban3 } ),
+  BAN4_3 ( 6, new int[] {3 , 16, 16, R.raw.ban4 , R.drawable.ui_small_ban4 , R.drawable.ui_medium_ban4 , R.drawable.ui_big_ban4 , R.drawable.ui_huge_ban4 } ),
+  SQU1_3 ( 7, new int[] {3 , 24, 24, R.raw.squa1, R.drawable.ui_small_squa1, R.drawable.ui_medium_squa1, R.drawable.ui_big_squa1, R.drawable.ui_huge_squa1} ),
+  SQU2_3 ( 7, new int[] {3 , 24, 24, R.raw.squa2, R.drawable.ui_small_squa2, R.drawable.ui_medium_squa2, R.drawable.ui_big_squa2, R.drawable.ui_huge_squa2} ),
+  MIRR_2 ( 7, new int[] {2 , 12, 12, R.raw.mirr2, R.drawable.ui_small_mirr2, R.drawable.ui_medium_mirr2, R.drawable.ui_big_mirr2, R.drawable.ui_huge_mirr2} ),
+  MIRR_3 ( 7, new int[] {3 , 16, 17, R.raw.mirr3, R.drawable.ui_small_mirr3, R.drawable.ui_medium_mirr3, R.drawable.ui_big_mirr3, R.drawable.ui_huge_mirr3} ),
+  ;
+*/
+
+
 public enum ObjectList
   {
   ///////////////////// Size // DB Level // NumScrambles // Mesh // small icon // medium icon // big icon // huge icon
@@ -143,8 +180,8 @@ public enum ObjectList
 
   SKEW (
          new int[][] {
-                       {2 , 11, 11, R.raw.skew2, R.drawable.ui_small_skewb, R.drawable.ui_medium_skewb, R.drawable.ui_big_skewb, R.drawable.ui_huge_skewb} ,
-                       {3 , 17, 21, R.raw.skew3, R.drawable.ui_small_skewm, R.drawable.ui_medium_skewm, R.drawable.ui_big_skewm, R.drawable.ui_huge_skewm} ,
+                       {2 , 11, 11, R.raw.skew2, R.drawable.ui_small_skew2, R.drawable.ui_medium_skew2, R.drawable.ui_big_skew2, R.drawable.ui_huge_skew2} ,
+                       {3 , 17, 21, R.raw.skew3, R.drawable.ui_small_skew3, R.drawable.ui_medium_skew3, R.drawable.ui_big_skew3, R.drawable.ui_huge_skew3} ,
                      },
          5
        ),
@@ -193,14 +230,14 @@ public enum ObjectList
 
   SQU1 (
          new int[][] {
-                       {3 , 24, 24, R.raw.square1, R.drawable.ui_small_square1, R.drawable.ui_medium_square1, R.drawable.ui_big_square1, R.drawable.ui_huge_square1} ,
+                       {3 , 24, 24, R.raw.squa1, R.drawable.ui_small_squa1, R.drawable.ui_medium_squa1, R.drawable.ui_big_squa1, R.drawable.ui_huge_squa1} ,
                      },
          7
        ),
 
   SQU2 (
          new int[][] {
-                       {3 , 24, 24, R.raw.square2, R.drawable.ui_small_square2, R.drawable.ui_medium_square2, R.drawable.ui_big_square2, R.drawable.ui_huge_square2} ,
+                       {3 , 24, 24, R.raw.squa2, R.drawable.ui_small_squa2, R.drawable.ui_medium_squa2, R.drawable.ui_big_squa2, R.drawable.ui_huge_squa2} ,
                      },
          7
        ),
diff --git a/src/main/res/drawable-nodpi/ui_big_skew2.png b/src/main/res/drawable-nodpi/ui_big_skew2.png
new file mode 100644
index 00000000..654d457c
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_skew2.png differ
diff --git a/src/main/res/drawable-nodpi/ui_big_skew3.png b/src/main/res/drawable-nodpi/ui_big_skew3.png
new file mode 100644
index 00000000..c4072f44
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_skew3.png differ
diff --git a/src/main/res/drawable-nodpi/ui_big_skewb.png b/src/main/res/drawable-nodpi/ui_big_skewb.png
deleted file mode 100644
index 654d457c..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_skewb.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_skewm.png b/src/main/res/drawable-nodpi/ui_big_skewm.png
deleted file mode 100644
index c4072f44..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_skewm.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_squa1.png b/src/main/res/drawable-nodpi/ui_big_squa1.png
new file mode 100644
index 00000000..92892943
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_squa1.png differ
diff --git a/src/main/res/drawable-nodpi/ui_big_squa2.png b/src/main/res/drawable-nodpi/ui_big_squa2.png
new file mode 100644
index 00000000..f9cfa71d
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_squa2.png differ
diff --git a/src/main/res/drawable-nodpi/ui_big_square1.png b/src/main/res/drawable-nodpi/ui_big_square1.png
deleted file mode 100644
index 92892943..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_square1.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_big_square2.png b/src/main/res/drawable-nodpi/ui_big_square2.png
deleted file mode 100644
index f9cfa71d..00000000
Binary files a/src/main/res/drawable-nodpi/ui_big_square2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_skew2.png b/src/main/res/drawable-nodpi/ui_huge_skew2.png
new file mode 100644
index 00000000..f431b1e6
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_huge_skew2.png differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_skew3.png b/src/main/res/drawable-nodpi/ui_huge_skew3.png
new file mode 100644
index 00000000..8c096b81
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_huge_skew3.png differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_skewb.png b/src/main/res/drawable-nodpi/ui_huge_skewb.png
deleted file mode 100644
index f431b1e6..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_skewb.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_skewm.png b/src/main/res/drawable-nodpi/ui_huge_skewm.png
deleted file mode 100644
index 8c096b81..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_skewm.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_squa1.png b/src/main/res/drawable-nodpi/ui_huge_squa1.png
new file mode 100644
index 00000000..f57d8ec6
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_huge_squa1.png differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_squa2.png b/src/main/res/drawable-nodpi/ui_huge_squa2.png
new file mode 100644
index 00000000..16772218
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_huge_squa2.png differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_square1.png b/src/main/res/drawable-nodpi/ui_huge_square1.png
deleted file mode 100644
index f57d8ec6..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_square1.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_huge_square2.png b/src/main/res/drawable-nodpi/ui_huge_square2.png
deleted file mode 100644
index 16772218..00000000
Binary files a/src/main/res/drawable-nodpi/ui_huge_square2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_skew2.png b/src/main/res/drawable-nodpi/ui_medium_skew2.png
new file mode 100644
index 00000000..1dd3b3ef
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_skew2.png differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_skew3.png b/src/main/res/drawable-nodpi/ui_medium_skew3.png
new file mode 100644
index 00000000..bf6c510b
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_skew3.png differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_skewb.png b/src/main/res/drawable-nodpi/ui_medium_skewb.png
deleted file mode 100644
index 1dd3b3ef..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_skewb.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_skewm.png b/src/main/res/drawable-nodpi/ui_medium_skewm.png
deleted file mode 100644
index bf6c510b..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_skewm.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_squa1.png b/src/main/res/drawable-nodpi/ui_medium_squa1.png
new file mode 100644
index 00000000..ed4e7c56
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_squa1.png differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_squa2.png b/src/main/res/drawable-nodpi/ui_medium_squa2.png
new file mode 100644
index 00000000..37312fdf
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_squa2.png differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_square1.png b/src/main/res/drawable-nodpi/ui_medium_square1.png
deleted file mode 100644
index ed4e7c56..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_square1.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_medium_square2.png b/src/main/res/drawable-nodpi/ui_medium_square2.png
deleted file mode 100644
index 37312fdf..00000000
Binary files a/src/main/res/drawable-nodpi/ui_medium_square2.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_skew2.png b/src/main/res/drawable-nodpi/ui_small_skew2.png
new file mode 100644
index 00000000..e7d5f56a
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_skew2.png differ
diff --git a/src/main/res/drawable-nodpi/ui_small_skew3.png b/src/main/res/drawable-nodpi/ui_small_skew3.png
new file mode 100644
index 00000000..8d675a93
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_skew3.png differ
diff --git a/src/main/res/drawable-nodpi/ui_small_skewb.png b/src/main/res/drawable-nodpi/ui_small_skewb.png
deleted file mode 100644
index e7d5f56a..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_skewb.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_skewm.png b/src/main/res/drawable-nodpi/ui_small_skewm.png
deleted file mode 100644
index 8d675a93..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_skewm.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_squa1.png b/src/main/res/drawable-nodpi/ui_small_squa1.png
new file mode 100644
index 00000000..f53f0b56
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_squa1.png differ
diff --git a/src/main/res/drawable-nodpi/ui_small_squa2.png b/src/main/res/drawable-nodpi/ui_small_squa2.png
new file mode 100644
index 00000000..9d2757b3
Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_squa2.png differ
diff --git a/src/main/res/drawable-nodpi/ui_small_square1.png b/src/main/res/drawable-nodpi/ui_small_square1.png
deleted file mode 100644
index f53f0b56..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_square1.png and /dev/null differ
diff --git a/src/main/res/drawable-nodpi/ui_small_square2.png b/src/main/res/drawable-nodpi/ui_small_square2.png
deleted file mode 100644
index 9d2757b3..00000000
Binary files a/src/main/res/drawable-nodpi/ui_small_square2.png and /dev/null differ
diff --git a/src/main/res/raw/squa1.dmesh b/src/main/res/raw/squa1.dmesh
new file mode 100644
index 00000000..239497d6
Binary files /dev/null and b/src/main/res/raw/squa1.dmesh differ
diff --git a/src/main/res/raw/squa2.dmesh b/src/main/res/raw/squa2.dmesh
new file mode 100644
index 00000000..56ff0c85
Binary files /dev/null and b/src/main/res/raw/squa2.dmesh differ
diff --git a/src/main/res/raw/square1.dmesh b/src/main/res/raw/square1.dmesh
deleted file mode 100644
index 239497d6..00000000
Binary files a/src/main/res/raw/square1.dmesh and /dev/null differ
diff --git a/src/main/res/raw/square2.dmesh b/src/main/res/raw/square2.dmesh
deleted file mode 100644
index 56ff0c85..00000000
Binary files a/src/main/res/raw/square2.dmesh and /dev/null differ