commit af133d41e612ef8dadc1b35bb87de94fa7589a24 Author: Leszek Koltunski Date: Sun Sep 20 22:00:49 2020 +0100 Progress with UI diff --git a/src/main/java/org/distorted/states/RubikStatePattern.java b/src/main/java/org/distorted/states/RubikStatePattern.java index 54db249a..64cc5493 100644 --- a/src/main/java/org/distorted/states/RubikStatePattern.java +++ b/src/main/java/org/distorted/states/RubikStatePattern.java @@ -118,12 +118,16 @@ public class RubikStatePattern extends RubikStateAbstract setTrioState(false); - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1); + LinearLayout.LayoutParams paramsL = new LinearLayout.LayoutParams((int)(width/2),LinearLayout.LayoutParams.MATCH_PARENT); + LinearLayout.LayoutParams paramsM = new LinearLayout.LayoutParams((int)(width/6),LinearLayout.LayoutParams.MATCH_PARENT); + LinearLayout.LayoutParams paramsR = new LinearLayout.LayoutParams((int)(width/3),LinearLayout.LayoutParams.MATCH_PARENT); LinearLayout layoutLeft = new LinearLayout(act); - layoutLeft.setLayoutParams(params); + layoutLeft.setLayoutParams(paramsL); + LinearLayout layoutMid = new LinearLayout(act); + layoutMid.setLayoutParams(paramsM); LinearLayout layoutRight = new LinearLayout(act); - layoutRight.setLayoutParams(params); + layoutRight.setLayoutParams(paramsR); layoutLeft.addView(mPrevButton); layoutLeft.addView(mMovesText); @@ -134,6 +138,7 @@ public class RubikStatePattern extends RubikStateAbstract layoutRight.addView(mBackButton); layoutBot.addView(layoutLeft); + layoutBot.addView(layoutMid); layoutBot.addView(layoutRight); } diff --git a/src/main/java/org/distorted/states/RubikStateSolution.java b/src/main/java/org/distorted/states/RubikStateSolution.java index 2c1e6605..322fbd21 100644 --- a/src/main/java/org/distorted/states/RubikStateSolution.java +++ b/src/main/java/org/distorted/states/RubikStateSolution.java @@ -79,27 +79,31 @@ public class RubikStateSolution extends RubikStateAbstract implements RubikPreRe LinearLayout layoutBot = act.findViewById(R.id.lowerBar); layoutBot.removeAllViews(); - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1); + LinearLayout.LayoutParams paramsL = new LinearLayout.LayoutParams((int)(width/2),LinearLayout.LayoutParams.MATCH_PARENT); + LinearLayout.LayoutParams paramsM = new LinearLayout.LayoutParams((int)(width/6),LinearLayout.LayoutParams.MATCH_PARENT); + LinearLayout.LayoutParams paramsR = new LinearLayout.LayoutParams((int)(width/3),LinearLayout.LayoutParams.MATCH_PARENT); + + LinearLayout layoutLeft = new LinearLayout(act); + layoutLeft.setLayoutParams(paramsL); + LinearLayout layoutMid = new LinearLayout(act); + layoutMid.setLayoutParams(paramsM); + LinearLayout layoutRight = new LinearLayout(act); + layoutRight.setLayoutParams(paramsR); setupPrevButton(act,width); setupNextButton(act,width); setupTextView(act,width); - LinearLayout layoutLeft = new LinearLayout(act); - layoutLeft.setLayoutParams(params); - layoutLeft.addView(mPrevButton); layoutLeft.addView(mMovesText); layoutLeft.addView(mNextButton); setupBackButton(act,width); - LinearLayout layoutRight = new LinearLayout(act); - layoutRight.setLayoutParams(params); - layoutRight.addView(mBackButton); layoutBot.addView(layoutLeft); + layoutBot.addView(layoutMid); layoutBot.addView(layoutRight); } diff --git a/src/main/java/org/distorted/states/RubikStateSolver.java b/src/main/java/org/distorted/states/RubikStateSolver.java index 4c781241..a341ff1e 100644 --- a/src/main/java/org/distorted/states/RubikStateSolver.java +++ b/src/main/java/org/distorted/states/RubikStateSolver.java @@ -98,6 +98,15 @@ public class RubikStateSolver extends RubikStateAbstract LinearLayout layoutTop = act.findViewById(R.id.upperBar); layoutTop.removeAllViews(); + LinearLayout.LayoutParams paramsL = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1); + + LinearLayout layoutLeft = new LinearLayout(act); + layoutLeft.setLayoutParams(paramsL); + LinearLayout layoutMid = new LinearLayout(act); + layoutMid.setLayoutParams(paramsL); + LinearLayout layoutRight = new LinearLayout(act); + layoutRight.setLayoutParams(paramsL); + if( mNumFaces>0 ) { setupBitmaps(); @@ -114,8 +123,12 @@ public class RubikStateSolver extends RubikStateAbstract setupSolveButton(act,width); setupBackButton(act,width); - layoutBot.addView(mSolveButton); - layoutBot.addView(mBackButton); + layoutLeft.addView(mSolveButton); + layoutRight.addView(mBackButton); + + layoutBot.addView(layoutLeft); + layoutBot.addView(layoutMid); + layoutBot.addView(layoutRight); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/res/drawable-nodpi/ui_big_left.png b/src/main/res/drawable-nodpi/ui_big_left.png index 74903af7..5ebae214 100644 Binary files a/src/main/res/drawable-nodpi/ui_big_left.png and b/src/main/res/drawable-nodpi/ui_big_left.png differ diff --git a/src/main/res/drawable-nodpi/ui_big_right.png b/src/main/res/drawable-nodpi/ui_big_right.png index eaeadbe1..0b397b80 100644 Binary files a/src/main/res/drawable-nodpi/ui_big_right.png and b/src/main/res/drawable-nodpi/ui_big_right.png differ diff --git a/src/main/res/drawable-nodpi/ui_huge_left.png b/src/main/res/drawable-nodpi/ui_huge_left.png index 988e21a9..a5f57b43 100644 Binary files a/src/main/res/drawable-nodpi/ui_huge_left.png and b/src/main/res/drawable-nodpi/ui_huge_left.png differ diff --git a/src/main/res/drawable-nodpi/ui_huge_right.png b/src/main/res/drawable-nodpi/ui_huge_right.png index 8e854c92..64d25b7f 100644 Binary files a/src/main/res/drawable-nodpi/ui_huge_right.png and b/src/main/res/drawable-nodpi/ui_huge_right.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_left.png b/src/main/res/drawable-nodpi/ui_medium_left.png index 2d866354..d13fb61d 100644 Binary files a/src/main/res/drawable-nodpi/ui_medium_left.png and b/src/main/res/drawable-nodpi/ui_medium_left.png differ diff --git a/src/main/res/drawable-nodpi/ui_medium_right.png b/src/main/res/drawable-nodpi/ui_medium_right.png index 8a1d1764..dc59456e 100644 Binary files a/src/main/res/drawable-nodpi/ui_medium_right.png and b/src/main/res/drawable-nodpi/ui_medium_right.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_left.png b/src/main/res/drawable-nodpi/ui_small_left.png index e84a8885..05f7f7c4 100644 Binary files a/src/main/res/drawable-nodpi/ui_small_left.png and b/src/main/res/drawable-nodpi/ui_small_left.png differ diff --git a/src/main/res/drawable-nodpi/ui_small_right.png b/src/main/res/drawable-nodpi/ui_small_right.png index 857d9fb3..eb9404ca 100644 Binary files a/src/main/res/drawable-nodpi/ui_small_right.png and b/src/main/res/drawable-nodpi/ui_small_right.png differ