diff --git a/app/src/main/art/floor.svg b/app/src/main/art/floor.svg index 2b09d00..7330305 100644 --- a/app/src/main/art/floor.svg +++ b/app/src/main/art/floor.svg @@ -2,23 +2,23 @@ + inkscape:export-ydpi="90" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + color-interpolation-filters="sRGB" + x="-0.025040128" + y="-0.025040128" + width="1.0500803" + height="1.0500803"> + showborder="true" + inkscape:pagecheckerboard="true"> image/svg+xml - + @@ -240,11 +263,11 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="Layer" - style="opacity:0.4424779;display:none" + style="display:none;opacity:0.442478" transform="translate(0,-552.36217)" sodipodi:insensitive="true"> + style="display:inline;opacity:1" + sodipodi:insensitive="true"> + inkscape:export-ydpi="90" + cx="241.15384" + cy="251.92308" + rx="41.153847" + ry="43.46154" /> + inkscape:export-ydpi="17.258801" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -27,7 +27,6 @@ image/svg+xml - @@ -168,22 +167,25 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1018" + inkscape:window-width="1792" + inkscape:window-height="1067" id="namedview2987" showgrid="false" inkscape:zoom="0.69044441" - inkscape:cx="-748.14943" - inkscape:cy="232.66929" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:cx="210.00967" + inkscape:cy="490.26394" + inkscape:window-x="0" + inkscape:window-y="25" inkscape:window-maximized="1" - inkscape:current-layer="g3013" /> + inkscape:current-layer="g3013" + inkscape:pagecheckerboard="true" + borderlayer="true" + inkscape:showpageshadow="false" /> + style="display:inline;fill:#ffd42a;fill-opacity:1;stroke:none" /> @@ -202,11 +204,11 @@ sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path4186-8" - d="m 414.41905,0.63774623 83.52302,0 -0.0777,497.14000377 -82.62207,0 z" - style="fill:#ffb82a;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;display:inline" /> + d="m 414.41905,0.63774623 h 83.52302 L 497.86437,497.77775 H 415.2423 Z" + style="display:inline;fill:#ffb82a;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" /> @@ -214,44 +216,44 @@ sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path4193-1" - d="m -0.41289001,416.51885 498.27713001,0 0,81.2589 -498.27713001,0 z" - style="fill:#ffc52a;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198;stroke-linejoin:round;stroke-opacity:1;display:inline" /> + d="M -0.41289001,416.51885 H 497.86424 v 81.2589 H -0.41289001 Z" + style="display:inline;fill:#ffc52a;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642;stroke-linejoin:round;stroke-opacity:1" /> @@ -272,11 +274,11 @@ inkscape:groupmode="layer" id="layer2" inkscape:label="lock" - style="display:none" + style="display:inline" sodipodi:insensitive="true"> @@ -289,7 +291,7 @@ + d="M 279.25,15.34375 C 244.19516,16.280737 205.62169,14.019558 176.28125,36.875 145.74944,58.031778 124.42793,93.306298 125.625,131.09375 c -1.25949,30.25303 -1.54242,60.51254 -2.28125,90.78125 -29.107271,8.83439 -58.911773,28.03569 -66.40625,59.25 -5.949132,47.85073 -5.193718,96.65794 0.84375,144.46875 5.81316,29.47508 34.048591,50.86541 62.09375,57.65625 70.6574,5.2588 141.68427,4.72145 212.5,3.46875 36.0167,-1.89923 79.02601,-1.32552 103.75,-32.375 21.95709,-21.13269 15.57942,-53.75893 17.09375,-81.125 -1.06809,-35.15555 3.16616,-71.38914 -6.75,-105.59375 C 436.50164,241.82253 407.98841,233.30151 386.0625,220.1875 385.31924,179.13486 387.46822,137.91703 383.6875,97 377.68381,59.868714 342.45783,37.770594 311.5625,21.9375 301.55636,16.932984 290.33578,15.305295 279.25,15.34375 Z M 254.78125,57.1875 c 35.09884,-0.818972 74.31899,21.760519 82.34375,57.6875 3.94756,36.27398 1.5228,72.90765 2.1875,109.34375 H 175.75 c 0.66778,-35.63012 -2.1258,-71.5459 3.5625,-106.875 4.44807,-36.240113 40.78168,-60.13132 75.46875,-60.15625 z m 6.28125,228.84375 c 4.57444,0.0559 9.10362,1.18725 13.25,3.09375 20.14711,7.7839 34.49677,34.87768 16.59375,52.34375 -20.24236,15.0574 -2.79826,38.70146 -0.0625,57.78125 13.10925,26.0231 -14.10754,37.72869 -35.875,34.0625 -26.15517,4.54421 -33.10596,-19.45003 -23.96875,-39.28125 8.88977,-21.957 12.21901,-45.05648 -7.625,-62 -10.54098,-23.17468 16.0488,-45.52697 37.6875,-46 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3809);fill-opacity:1;stroke:#0000ff;stroke-width:13;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" /> diff --git a/app/src/main/art/wall.svg b/app/src/main/art/wall.svg index b4ae999..230daed 100644 --- a/app/src/main/art/wall.svg +++ b/app/src/main/art/wall.svg @@ -2,24 +2,25 @@ + inkscape:export-ydpi="90" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + Banvor Wall + inkscape:swatch="solid"> + inkscape:window-width="1792" + inkscape:window-height="1067" + inkscape:window-x="0" + inkscape:window-y="25" + inkscape:window-maximized="0" + inkscape:pagecheckerboard="true" + inkscape:showpageshadow="false" + showborder="true" + borderlayer="true"> image/svg+xml - + Banvor Wall + inkscape:label="Grey Background" + sodipodi:insensitive="true" + style="display:none"> @@ -271,7 +277,7 @@ transform="translate(0,-552.36217)" sodipodi:insensitive="true"> - diff --git a/app/src/main/art/worker.svg b/app/src/main/art/worker.svg index 666c8aa..5ae88cb 100644 --- a/app/src/main/art/worker.svg +++ b/app/src/main/art/worker.svg @@ -2,22 +2,22 @@ + inkscape:export-ydpi="90" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + inkscape:window-width="1307" + inkscape:window-height="969" + inkscape:window-x="0" + inkscape:window-y="25" + inkscape:window-maximized="0" + inkscape:pagecheckerboard="true" + inkscape:showpageshadow="false" + borderlayer="true"> image/svg+xml - diff --git a/app/src/main/java/org/vostan/banvor/PuzzleBoardFragment.java b/app/src/main/java/org/vostan/banvor/PuzzleBoardFragment.java index b480fd9..6ca0ec0 100644 --- a/app/src/main/java/org/vostan/banvor/PuzzleBoardFragment.java +++ b/app/src/main/java/org/vostan/banvor/PuzzleBoardFragment.java @@ -15,7 +15,6 @@ import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; -import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; import org.vostan.banvor.board.PuzzleControl; @@ -29,11 +28,10 @@ public class PuzzleBoardFragment extends Fragment { private FragmentPuzzleBoardBinding binding; private State gameState; - private PuzzleControl mPuzzleView; @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { gameState = theApp().state(); binding = FragmentPuzzleBoardBinding.inflate(inflater, container, false); @@ -62,36 +60,22 @@ public class PuzzleBoardFragment extends Fragment public void onTouch() { } }); - binding.btnPrev.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - gameState.setCurrentLevel(gameState.getCurrentLevel()-1); - PuzzleBoardFragment.this.initAndShowCurrentPuzzle(); - } + binding.btnPrev.setOnClickListener((View.OnClickListener) view1 -> { + gameState.setCurrentLevel(gameState.getCurrentLevel()-1); + PuzzleBoardFragment.this.initAndShowCurrentPuzzle(); }); - binding.btnNext.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - gameState.setCurrentLevel(gameState.getCurrentLevel()+1); - PuzzleBoardFragment.this.initAndShowCurrentPuzzle(); - } + binding.btnNext.setOnClickListener((View.OnClickListener) view2 -> { + gameState.setCurrentLevel(gameState.getCurrentLevel()+1); + PuzzleBoardFragment.this.initAndShowCurrentPuzzle(); }); - binding.btnReset.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - PuzzleBoardFragment.this.initAndShowCurrentPuzzle(); - } + binding.btnReset.setOnClickListener((View.OnClickListener) view3 -> { + PuzzleBoardFragment.this.initAndShowCurrentPuzzle(); }); - binding.btnUndo.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - createNextLevelDialog(new DialogInterface.OnClickListener(){ - public void onClick(DialogInterface d, int w){ - gameState.advanceCurrentLevel(); - initAndShowCurrentPuzzle(); - } - }).show(); - } + binding.btnUndo.setOnClickListener((View.OnClickListener) view4 -> { + createNextLevelDialog((d, w) -> { + gameState.advanceCurrentLevel(); + initAndShowCurrentPuzzle(); + }).show(); }); } @@ -120,11 +104,9 @@ public class PuzzleBoardFragment extends Fragment // } // }; // df.show(getChildFragmentManager(), null); - createNextLevelDialog(new DialogInterface.OnClickListener(){ - public void onClick(DialogInterface d, int w){ - gameState.advanceCurrentLevel(); - initAndShowCurrentPuzzle(); - } + createNextLevelDialog((d, w) -> { + gameState.advanceCurrentLevel(); + initAndShowCurrentPuzzle(); }).show(); } diff --git a/app/src/main/res/drawable/floor.png b/app/src/main/res/drawable/floor.png index 00393b4..ad2a3bc 100644 Binary files a/app/src/main/res/drawable/floor.png and b/app/src/main/res/drawable/floor.png differ diff --git a/app/src/main/res/drawable/goal.png b/app/src/main/res/drawable/goal.png index e8b36c5..ef30a03 100644 Binary files a/app/src/main/res/drawable/goal.png and b/app/src/main/res/drawable/goal.png differ diff --git a/app/src/main/res/drawable/wall.png b/app/src/main/res/drawable/wall.png index b61b22a..112a5d2 100644 Binary files a/app/src/main/res/drawable/wall.png and b/app/src/main/res/drawable/wall.png differ diff --git a/app/src/main/res/layout/fragment_puzzle_board.xml b/app/src/main/res/layout/fragment_puzzle_board.xml index 44e51c2..a9095df 100644 --- a/app/src/main/res/layout/fragment_puzzle_board.xml +++ b/app/src/main/res/layout/fragment_puzzle_board.xml @@ -54,16 +54,15 @@ android:layout_weight="1" /> + android:scaleType="fitCenter" + android:src="@drawable/prev" /> + android:src="@drawable/undo" + android:visibility="gone" + tools:visibility="visible" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae3..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/keys/private_key.pepk b/keys/private_key.pepk new file mode 100644 index 0000000..fa44c45 Binary files /dev/null and b/keys/private_key.pepk differ diff --git a/keys/signing_key b/keys/signing_key new file mode 100644 index 0000000..ce96b50 Binary files /dev/null and b/keys/signing_key differ