commit 42803ba0fcf0b224e4ea770686ca9ac9c59d23c8 Author: Leszek Koltunski Date: Sun Jun 28 22:11:20 2020 +0100 Introduce three sizes of UI images: small, medium, large. diff --git a/src/main/java/org/distorted/dialogs/RubikDialogEffects.java b/src/main/java/org/distorted/dialogs/RubikDialogEffects.java index 4fd7933a..faa31951 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogEffects.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogEffects.java @@ -177,7 +177,7 @@ public class RubikDialogEffects extends AppCompatDialogFragment implements SeekB Spinner spinner = new Spinner(act); spinner.setLayoutParams(spinnerLayoutParams); spinner.setPadding(spinnerPadding,0,spinnerPadding,0); - spinner.setBackgroundResource(R.drawable.spinner); + spinner.setBackgroundResource(R.drawable.ui_small_spinner); spinner.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_START); spinner.setId(index+BaseEffect.Type.LENGTH); innerLayout2.addView(spinner); diff --git a/src/main/java/org/distorted/objects/RubikCube.java b/src/main/java/org/distorted/objects/RubikCube.java index a7d14c1b..4682faa7 100644 --- a/src/main/java/org/distorted/objects/RubikCube.java +++ b/src/main/java/org/distorted/objects/RubikCube.java @@ -105,7 +105,7 @@ class RubikCube extends RubikObject } /////////////////////////////////////////////////////////////////////////////////////////////////// -// paint the square with upper-right cornder at (left,top) and side length 'side' with texture +// paint the square with upper-right corner at (left,top) and side length 'side' with texture // for face 'face'. void createFaceTexture(Canvas canvas, Paint paint, int face, int left, int top, int side) diff --git a/src/main/java/org/distorted/objects/RubikObjectList.java b/src/main/java/org/distorted/objects/RubikObjectList.java index 26aa5b78..f6344474 100644 --- a/src/main/java/org/distorted/objects/RubikObjectList.java +++ b/src/main/java/org/distorted/objects/RubikObjectList.java @@ -35,10 +35,10 @@ public enum RubikObjectList { CUBE ( new int[][] { - {2 , 12, R.drawable.cube2, R.raw.cube2} , - {3 , 16, R.drawable.cube3, R.raw.cube3} , - {4 , 20, R.drawable.cube4, R.raw.cube4} , - {5 , 24, R.drawable.cube5, R.raw.cube5} + {2 , 12, R.drawable.ui_small_cube2, R.raw.cube2} , + {3 , 16, R.drawable.ui_small_cube3, R.raw.cube3} , + {4 , 20, R.drawable.ui_small_cube4, R.raw.cube4} , + {5 , 24, R.drawable.ui_small_cube5, R.raw.cube5} }, RubikCube.class, new RubikCubeMovement() @@ -46,9 +46,9 @@ public enum RubikObjectList PYRA ( new int[][] { - {3 , 10, R.drawable.pyra3, R.raw.pyra3} , - {4 , 15, R.drawable.pyra4, R.raw.pyra4} , - {5 , 20, R.drawable.pyra5, R.raw.pyra5} + {3 , 10, R.drawable.ui_small_pyra3, R.raw.pyra3} , + {4 , 15, R.drawable.ui_small_pyra4, R.raw.pyra4} , + {5 , 20, R.drawable.ui_small_pyra5, R.raw.pyra5} }, RubikPyraminx.class, new RubikPyraminxMovement() diff --git a/src/main/java/org/distorted/states/RubikStatePattern.java b/src/main/java/org/distorted/states/RubikStatePattern.java index d9fd2960..c344f78f 100644 --- a/src/main/java/org/distorted/states/RubikStatePattern.java +++ b/src/main/java/org/distorted/states/RubikStatePattern.java @@ -213,7 +213,7 @@ public class RubikStatePattern extends RubikStateAbstract mPrevButton = new ImageButton(act); mPrevButton.setLayoutParams(params); mPrevButton.setPadding(padding,0,padding,0); - mPrevButton.setImageResource(R.drawable.left); + mPrevButton.setImageResource(R.drawable.ui_small_left); mPrevButton.setOnClickListener( new View.OnClickListener() { @@ -245,7 +245,7 @@ public class RubikStatePattern extends RubikStateAbstract mNextButton = new ImageButton(act); mNextButton.setLayoutParams(params); mNextButton.setPadding(padding,0,padding,0); - mNextButton.setImageResource(R.drawable.right); + mNextButton.setImageResource(R.drawable.ui_small_right); mNextButton.setOnClickListener( new View.OnClickListener() { diff --git a/src/main/java/org/distorted/states/RubikStatePlay.java b/src/main/java/org/distorted/states/RubikStatePlay.java index c97d6d26..bc7ceca4 100644 --- a/src/main/java/org/distorted/states/RubikStatePlay.java +++ b/src/main/java/org/distorted/states/RubikStatePlay.java @@ -163,7 +163,7 @@ public class RubikStatePlay extends RubikStateAbstract implements AdapterView.On mObjButton = new ImageButton(act); mObjButton.setLayoutParams(params); mObjButton.setPadding(padding,0,padding,0); - mObjButton.setImageResource(R.drawable.cube_menu); + mObjButton.setImageResource(R.drawable.ui_small_cube_menu); mObjButton.setOnClickListener( new View.OnClickListener() { @@ -206,7 +206,7 @@ public class RubikStatePlay extends RubikStateAbstract implements AdapterView.On mLevelSpinner = new AppCompatSpinner(act); mLevelSpinner.setLayoutParams(params); mLevelSpinner.setPadding(padding,0,padding,0); - mLevelSpinner.setBackgroundResource(R.drawable.spinner); + mLevelSpinner.setBackgroundResource(R.drawable.ui_small_spinner); mLevelSpinner.setTextAlignment(View.TEXT_ALIGNMENT_CENTER); mLevelSpinner.setOnItemSelectedListener(this); @@ -281,7 +281,7 @@ public class RubikStatePlay extends RubikStateAbstract implements AdapterView.On mMenuButton = new ImageButton(act); mMenuButton.setLayoutParams(params); mMenuButton.setPadding(padding,0,padding,0); - mMenuButton.setImageResource(R.drawable.menu); + mMenuButton.setImageResource(R.drawable.ui_small_menu); final int barHeight = act.getScreenHeightInPixels()/10; @@ -315,7 +315,7 @@ public class RubikStatePlay extends RubikStateAbstract implements AdapterView.On mSolveButton = new ImageButton(act); mSolveButton.setLayoutParams(params); mSolveButton.setPadding(padding,0,padding,0); - mSolveButton.setImageResource(R.drawable.cube_solve); + mSolveButton.setImageResource(R.drawable.ui_small_cube_solve); mSolveButton.setOnClickListener( new View.OnClickListener() { @@ -344,7 +344,7 @@ public class RubikStatePlay extends RubikStateAbstract implements AdapterView.On mPrevButton = new ImageButton(act); mPrevButton.setLayoutParams(params); mPrevButton.setPadding(padding,0,padding,0); - mPrevButton.setImageResource(R.drawable.cube_back); + mPrevButton.setImageResource(R.drawable.ui_small_cube_back); mPrevButton.setOnClickListener( new View.OnClickListener() { @@ -370,7 +370,7 @@ public class RubikStatePlay extends RubikStateAbstract implements AdapterView.On mObjectPopup.setFocusable(true); int margin = (int)(width*RubikActivity.PADDING); - BitmapDrawable bd = (BitmapDrawable) act.getResources().getDrawable(R.drawable.cube2); + BitmapDrawable bd = (BitmapDrawable) act.getResources().getDrawable(R.drawable.ui_small_cube2); int cubeWidth = bd.getIntrinsicWidth(); mObjectLayoutWidth = (int)(cubeWidth + 2*margin + 0.5f); diff --git a/src/main/java/org/distorted/states/RubikStateReady.java b/src/main/java/org/distorted/states/RubikStateReady.java index 9de22b81..734c36b2 100644 --- a/src/main/java/org/distorted/states/RubikStateReady.java +++ b/src/main/java/org/distorted/states/RubikStateReady.java @@ -109,7 +109,7 @@ public class RubikStateReady extends RubikStateAbstract mPrevButton = new ImageButton(act); mPrevButton.setLayoutParams(params); mPrevButton.setPadding(padding,0,padding,0); - mPrevButton.setImageResource(R.drawable.cube_back); + mPrevButton.setImageResource(R.drawable.ui_small_cube_back); mPrevButton.setOnClickListener( new View.OnClickListener() { diff --git a/src/main/java/org/distorted/states/RubikStateSolution.java b/src/main/java/org/distorted/states/RubikStateSolution.java index e10ecf27..89e2cfaa 100644 --- a/src/main/java/org/distorted/states/RubikStateSolution.java +++ b/src/main/java/org/distorted/states/RubikStateSolution.java @@ -109,7 +109,7 @@ public class RubikStateSolution extends RubikStateAbstract implements RubikPreRe mPrevButton = new ImageButton(act); mPrevButton.setLayoutParams(params); mPrevButton.setPadding(padding,0,padding,0); - mPrevButton.setImageResource(R.drawable.left); + mPrevButton.setImageResource(R.drawable.ui_small_left); mPrevButton.setOnClickListener( new View.OnClickListener() { @@ -138,7 +138,7 @@ public class RubikStateSolution extends RubikStateAbstract implements RubikPreRe mNextButton = new ImageButton(act); mNextButton.setLayoutParams(params); mNextButton.setPadding(padding,0,padding,0); - mNextButton.setImageResource(R.drawable.right); + mNextButton.setImageResource(R.drawable.ui_small_right); mNextButton.setOnClickListener( new View.OnClickListener() { diff --git a/src/main/java/org/distorted/states/RubikStateSolving.java b/src/main/java/org/distorted/states/RubikStateSolving.java index 37e6c440..b07558c2 100644 --- a/src/main/java/org/distorted/states/RubikStateSolving.java +++ b/src/main/java/org/distorted/states/RubikStateSolving.java @@ -160,7 +160,7 @@ public class RubikStateSolving extends RubikStateAbstract implements RubikPreRen mPrevButton = new ImageButton(act); mPrevButton.setLayoutParams(params); mPrevButton.setPadding(padding,0,padding,0); - mPrevButton.setImageResource(R.drawable.cube_back); + mPrevButton.setImageResource(R.drawable.ui_small_cube_back); mPrevButton.setOnClickListener( new View.OnClickListener() { diff --git a/src/main/res/drawable-nodpi/ui_big_cube2.png b/src/main/res/drawable-nodpi/ui_big_cube2.png new file mode 100644 index 00000000..53e89cf2 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_cube2.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_cube3.png b/src/main/res/drawable-nodpi/ui_big_cube3.png new file mode 100644 index 00000000..a22d8a4d Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_cube3.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_cube4.png b/src/main/res/drawable-nodpi/ui_big_cube4.png new file mode 100644 index 00000000..472b70df Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_cube4.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_cube5.png b/src/main/res/drawable-nodpi/ui_big_cube5.png new file mode 100644 index 00000000..46fee585 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_cube5.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_cube_back.png b/src/main/res/drawable-nodpi/ui_big_cube_back.png new file mode 100644 index 00000000..bbe4bf9d Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_cube_back.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_cube_menu.png b/src/main/res/drawable-nodpi/ui_big_cube_menu.png new file mode 100644 index 00000000..05ca8333 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_cube_menu.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_cube_solve.png b/src/main/res/drawable-nodpi/ui_big_cube_solve.png new file mode 100644 index 00000000..82993011 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_cube_solve.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_down.png b/src/main/res/drawable-nodpi/ui_big_down.png new file mode 100644 index 00000000..6f3ad610 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_down.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_left.png b/src/main/res/drawable-nodpi/ui_big_left.png new file mode 100644 index 00000000..74903af7 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_left.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_menu.png b/src/main/res/drawable-nodpi/ui_big_menu.png new file mode 100644 index 00000000..502b2089 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_menu.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_pyra2.png b/src/main/res/drawable-nodpi/ui_big_pyra2.png new file mode 100644 index 00000000..11358f12 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_pyra2.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_pyra3.png b/src/main/res/drawable-nodpi/ui_big_pyra3.png new file mode 100644 index 00000000..7d76defb Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_pyra3.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_pyra4.png b/src/main/res/drawable-nodpi/ui_big_pyra4.png new file mode 100644 index 00000000..a1a7a377 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_pyra4.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_pyra5.png b/src/main/res/drawable-nodpi/ui_big_pyra5.png new file mode 100644 index 00000000..fcc4b751 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_pyra5.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_right.png b/src/main/res/drawable-nodpi/ui_big_right.png new file mode 100644 index 00000000..eaeadbe1 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_big_right.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_cube2.png b/src/main/res/drawable-nodpi/ui_medium_cube2.png new file mode 100644 index 00000000..e081b29d Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_cube2.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_cube3.png b/src/main/res/drawable-nodpi/ui_medium_cube3.png new file mode 100644 index 00000000..3c0185d3 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_cube3.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_cube4.png b/src/main/res/drawable-nodpi/ui_medium_cube4.png new file mode 100644 index 00000000..bf1db71c Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_cube4.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_cube5.png b/src/main/res/drawable-nodpi/ui_medium_cube5.png new file mode 100644 index 00000000..8efa6dd8 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_cube5.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_cube_back.png b/src/main/res/drawable-nodpi/ui_medium_cube_back.png new file mode 100644 index 00000000..0680557e Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_cube_back.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_cube_menu.png b/src/main/res/drawable-nodpi/ui_medium_cube_menu.png new file mode 100644 index 00000000..8da78951 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_cube_menu.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_cube_solve.png b/src/main/res/drawable-nodpi/ui_medium_cube_solve.png new file mode 100644 index 00000000..8687db28 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_cube_solve.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_down.png b/src/main/res/drawable-nodpi/ui_medium_down.png new file mode 100644 index 00000000..166afd58 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_down.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_left.png b/src/main/res/drawable-nodpi/ui_medium_left.png new file mode 100644 index 00000000..2d866354 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_left.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_menu.png b/src/main/res/drawable-nodpi/ui_medium_menu.png new file mode 100644 index 00000000..882be73c Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_menu.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_pyra2.png b/src/main/res/drawable-nodpi/ui_medium_pyra2.png new file mode 100644 index 00000000..d11cf90e Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_pyra2.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_pyra3.png b/src/main/res/drawable-nodpi/ui_medium_pyra3.png new file mode 100644 index 00000000..61ebdbc4 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_pyra3.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_pyra4.png b/src/main/res/drawable-nodpi/ui_medium_pyra4.png new file mode 100644 index 00000000..6bb90d54 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_pyra4.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_pyra5.png b/src/main/res/drawable-nodpi/ui_medium_pyra5.png new file mode 100644 index 00000000..569ab4fe Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_pyra5.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_right.png b/src/main/res/drawable-nodpi/ui_medium_right.png new file mode 100644 index 00000000..8a1d1764 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_medium_right.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_cube2.png b/src/main/res/drawable-nodpi/ui_small_cube2.png new file mode 100644 index 00000000..eb781e64 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_cube2.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_cube3.png b/src/main/res/drawable-nodpi/ui_small_cube3.png new file mode 100644 index 00000000..dae0f164 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_cube3.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_cube4.png b/src/main/res/drawable-nodpi/ui_small_cube4.png new file mode 100644 index 00000000..c37a2e75 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_cube4.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_cube5.png b/src/main/res/drawable-nodpi/ui_small_cube5.png new file mode 100644 index 00000000..c6c5ff3a Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_cube5.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_cube_back.png b/src/main/res/drawable-nodpi/ui_small_cube_back.png new file mode 100644 index 00000000..f7c7d3bd Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_cube_back.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_cube_menu.png b/src/main/res/drawable-nodpi/ui_small_cube_menu.png new file mode 100644 index 00000000..f8a97b0c Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_cube_menu.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_cube_solve.png b/src/main/res/drawable-nodpi/ui_small_cube_solve.png new file mode 100644 index 00000000..176eb4f2 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_cube_solve.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_down.png b/src/main/res/drawable-nodpi/ui_small_down.png new file mode 100644 index 00000000..9c204481 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_down.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_left.png b/src/main/res/drawable-nodpi/ui_small_left.png new file mode 100644 index 00000000..e84a8885 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_left.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_menu.png b/src/main/res/drawable-nodpi/ui_small_menu.png new file mode 100644 index 00000000..d2b808b3 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_menu.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_pyra2.png b/src/main/res/drawable-nodpi/ui_small_pyra2.png new file mode 100644 index 00000000..239d380a Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_pyra2.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_pyra3.png b/src/main/res/drawable-nodpi/ui_small_pyra3.png new file mode 100644 index 00000000..e7fa6640 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_pyra3.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_pyra4.png b/src/main/res/drawable-nodpi/ui_small_pyra4.png new file mode 100644 index 00000000..11b2e7fa Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_pyra4.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_pyra5.png b/src/main/res/drawable-nodpi/ui_small_pyra5.png new file mode 100644 index 00000000..55aa5dba Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_pyra5.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_right.png b/src/main/res/drawable-nodpi/ui_small_right.png new file mode 100644 index 00000000..857d9fb3 Binary files /dev/null and b/src/main/res/drawable-nodpi/ui_small_right.png differ diff --git a/src/main/res/drawable/cube2.png b/src/main/res/drawable/cube2.png deleted file mode 100644 index eb781e64..00000000 Binary files a/src/main/res/drawable/cube2.png and /dev/null differ diff --git a/src/main/res/drawable/cube3.png b/src/main/res/drawable/cube3.png deleted file mode 100644 index dae0f164..00000000 Binary files a/src/main/res/drawable/cube3.png and /dev/null differ diff --git a/src/main/res/drawable/cube4.png b/src/main/res/drawable/cube4.png deleted file mode 100644 index c37a2e75..00000000 Binary files a/src/main/res/drawable/cube4.png and /dev/null differ diff --git a/src/main/res/drawable/cube5.png b/src/main/res/drawable/cube5.png deleted file mode 100644 index c6c5ff3a..00000000 Binary files a/src/main/res/drawable/cube5.png and /dev/null differ diff --git a/src/main/res/drawable/cube_back.png b/src/main/res/drawable/cube_back.png deleted file mode 100644 index f7c7d3bd..00000000 Binary files a/src/main/res/drawable/cube_back.png and /dev/null differ diff --git a/src/main/res/drawable/cube_menu.png b/src/main/res/drawable/cube_menu.png deleted file mode 100644 index f8a97b0c..00000000 Binary files a/src/main/res/drawable/cube_menu.png and /dev/null differ diff --git a/src/main/res/drawable/cube_solve.png b/src/main/res/drawable/cube_solve.png deleted file mode 100644 index 176eb4f2..00000000 Binary files a/src/main/res/drawable/cube_solve.png and /dev/null differ diff --git a/src/main/res/drawable/left.png b/src/main/res/drawable/left.png deleted file mode 100644 index 4d875e02..00000000 Binary files a/src/main/res/drawable/left.png and /dev/null differ diff --git a/src/main/res/drawable/logo.png b/src/main/res/drawable/logo.png deleted file mode 100644 index 8a0c2637..00000000 Binary files a/src/main/res/drawable/logo.png and /dev/null differ diff --git a/src/main/res/drawable/menu.png b/src/main/res/drawable/menu.png deleted file mode 100644 index d2b808b3..00000000 Binary files a/src/main/res/drawable/menu.png and /dev/null differ diff --git a/src/main/res/drawable/pyra2.png b/src/main/res/drawable/pyra2.png deleted file mode 100644 index 239d380a..00000000 Binary files a/src/main/res/drawable/pyra2.png and /dev/null differ diff --git a/src/main/res/drawable/pyra3.png b/src/main/res/drawable/pyra3.png deleted file mode 100644 index e7fa6640..00000000 Binary files a/src/main/res/drawable/pyra3.png and /dev/null differ diff --git a/src/main/res/drawable/pyra4.png b/src/main/res/drawable/pyra4.png deleted file mode 100644 index 11b2e7fa..00000000 Binary files a/src/main/res/drawable/pyra4.png and /dev/null differ diff --git a/src/main/res/drawable/pyra5.png b/src/main/res/drawable/pyra5.png deleted file mode 100644 index 55aa5dba..00000000 Binary files a/src/main/res/drawable/pyra5.png and /dev/null differ diff --git a/src/main/res/drawable/right.png b/src/main/res/drawable/right.png deleted file mode 100644 index 89a6a39c..00000000 Binary files a/src/main/res/drawable/right.png and /dev/null differ diff --git a/src/main/res/drawable/settings.png b/src/main/res/drawable/settings.png deleted file mode 100644 index 0fa288f5..00000000 Binary files a/src/main/res/drawable/settings.png and /dev/null differ diff --git a/src/main/res/drawable/spinner.xml b/src/main/res/drawable/spinner.xml deleted file mode 100644 index 30adfc62..00000000 --- a/src/main/res/drawable/spinner.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/drawable/spinner_arrow.png b/src/main/res/drawable/spinner_arrow.png deleted file mode 100644 index 46a9177f..00000000 Binary files a/src/main/res/drawable/spinner_arrow.png and /dev/null differ diff --git a/src/main/res/drawable/ui_big_spinner.xml b/src/main/res/drawable/ui_big_spinner.xml new file mode 100644 index 00000000..d81ead88 --- /dev/null +++ b/src/main/res/drawable/ui_big_spinner.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/drawable/ui_medium_spinner.xml b/src/main/res/drawable/ui_medium_spinner.xml new file mode 100644 index 00000000..59cbdde9 --- /dev/null +++ b/src/main/res/drawable/ui_medium_spinner.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/drawable/ui_small_spinner.xml b/src/main/res/drawable/ui_small_spinner.xml new file mode 100644 index 00000000..38273540 --- /dev/null +++ b/src/main/res/drawable/ui_small_spinner.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/dialog_pattern_tab.xml b/src/main/res/layout/dialog_pattern_tab.xml index e41c8a8d..0c7dd1bc 100644 --- a/src/main/res/layout/dialog_pattern_tab.xml +++ b/src/main/res/layout/dialog_pattern_tab.xml @@ -7,7 +7,7 @@