commit fdec60a36414cfa39a2adf507f147bed189d5d01 Author: Leszek Koltunski Date: Thu Feb 6 23:45:09 2020 +0000 Skeleton of a new dialog: High Scores diff --git a/build.gradle b/build.gradle index c821d62c..a845e22d 100644 --- a/build.gradle +++ b/build.gradle @@ -25,4 +25,5 @@ dependencies { api project(':distorted-library') implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support:design:27.1.1' } diff --git a/src/main/java/org/distorted/component/HorizontalNumberPicker.java b/src/main/java/org/distorted/component/HorizontalNumberPicker.java index 40f59130..a6d81430 100644 --- a/src/main/java/org/distorted/component/HorizontalNumberPicker.java +++ b/src/main/java/org/distorted/component/HorizontalNumberPicker.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.component; diff --git a/src/main/java/org/distorted/effect/BaseEffect.java b/src/main/java/org/distorted/effect/BaseEffect.java index c4991a39..df9ac3f8 100644 --- a/src/main/java/org/distorted/effect/BaseEffect.java +++ b/src/main/java/org/distorted/effect/BaseEffect.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2020 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect; diff --git a/src/main/java/org/distorted/effect/scramble/ScrambleEffect.java b/src/main/java/org/distorted/effect/scramble/ScrambleEffect.java index ff22e8c1..e90254dd 100644 --- a/src/main/java/org/distorted/effect/scramble/ScrambleEffect.java +++ b/src/main/java/org/distorted/effect/scramble/ScrambleEffect.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.scramble; diff --git a/src/main/java/org/distorted/effect/scramble/ScrambleEffectNone.java b/src/main/java/org/distorted/effect/scramble/ScrambleEffectNone.java index 5ae64ad7..36612d6a 100644 --- a/src/main/java/org/distorted/effect/scramble/ScrambleEffectNone.java +++ b/src/main/java/org/distorted/effect/scramble/ScrambleEffectNone.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.scramble; diff --git a/src/main/java/org/distorted/effect/scramble/ScrambleEffectRotations.java b/src/main/java/org/distorted/effect/scramble/ScrambleEffectRotations.java index fb1f8c45..69376074 100644 --- a/src/main/java/org/distorted/effect/scramble/ScrambleEffectRotations.java +++ b/src/main/java/org/distorted/effect/scramble/ScrambleEffectRotations.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.scramble; diff --git a/src/main/java/org/distorted/effect/sizechange/SizeChangeEffect.java b/src/main/java/org/distorted/effect/sizechange/SizeChangeEffect.java index d4c095a2..2b6c8904 100644 --- a/src/main/java/org/distorted/effect/sizechange/SizeChangeEffect.java +++ b/src/main/java/org/distorted/effect/sizechange/SizeChangeEffect.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.sizechange; diff --git a/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectMove.java b/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectMove.java index 0216b2c7..96e22f65 100644 --- a/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectMove.java +++ b/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectMove.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.sizechange; diff --git a/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectNone.java b/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectNone.java index 775f9b64..6c360106 100644 --- a/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectNone.java +++ b/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectNone.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.sizechange; diff --git a/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectRound.java b/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectRound.java index 51127211..20206edf 100644 --- a/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectRound.java +++ b/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectRound.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.sizechange; diff --git a/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectScale.java b/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectScale.java index 45c1754a..8be0a285 100644 --- a/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectScale.java +++ b/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectScale.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.sizechange; diff --git a/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectTransparency.java b/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectTransparency.java index 86af60bc..7d12226e 100644 --- a/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectTransparency.java +++ b/src/main/java/org/distorted/effect/sizechange/SizeChangeEffectTransparency.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.sizechange; diff --git a/src/main/java/org/distorted/effect/solve/SolveEffect.java b/src/main/java/org/distorted/effect/solve/SolveEffect.java index b517194d..9a31ba0e 100644 --- a/src/main/java/org/distorted/effect/solve/SolveEffect.java +++ b/src/main/java/org/distorted/effect/solve/SolveEffect.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.solve; diff --git a/src/main/java/org/distorted/effect/solve/SolveEffectNone.java b/src/main/java/org/distorted/effect/solve/SolveEffectNone.java index abc74043..cadbd94a 100644 --- a/src/main/java/org/distorted/effect/solve/SolveEffectNone.java +++ b/src/main/java/org/distorted/effect/solve/SolveEffectNone.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.solve; diff --git a/src/main/java/org/distorted/effect/solve/SolveEffectSpin.java b/src/main/java/org/distorted/effect/solve/SolveEffectSpin.java index ce438519..4e101f2b 100644 --- a/src/main/java/org/distorted/effect/solve/SolveEffectSpin.java +++ b/src/main/java/org/distorted/effect/solve/SolveEffectSpin.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.solve; diff --git a/src/main/java/org/distorted/effect/win/WinEffect.java b/src/main/java/org/distorted/effect/win/WinEffect.java index b27a9d09..76e228cb 100644 --- a/src/main/java/org/distorted/effect/win/WinEffect.java +++ b/src/main/java/org/distorted/effect/win/WinEffect.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.win; diff --git a/src/main/java/org/distorted/effect/win/WinEffectGlow.java b/src/main/java/org/distorted/effect/win/WinEffectGlow.java index eeb748ef..7aa6f4b6 100644 --- a/src/main/java/org/distorted/effect/win/WinEffectGlow.java +++ b/src/main/java/org/distorted/effect/win/WinEffectGlow.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.win; diff --git a/src/main/java/org/distorted/effect/win/WinEffectNone.java b/src/main/java/org/distorted/effect/win/WinEffectNone.java index c2381345..4d0b4001 100644 --- a/src/main/java/org/distorted/effect/win/WinEffectNone.java +++ b/src/main/java/org/distorted/effect/win/WinEffectNone.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.effect.win; diff --git a/src/main/java/org/distorted/magic/RubikAbout.java b/src/main/java/org/distorted/magic/RubikAbout.java index 3d6032a5..0cb2f073 100644 --- a/src/main/java/org/distorted/magic/RubikAbout.java +++ b/src/main/java/org/distorted/magic/RubikAbout.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.magic; diff --git a/src/main/java/org/distorted/magic/RubikActivity.java b/src/main/java/org/distorted/magic/RubikActivity.java index eba90705..34a58fe7 100644 --- a/src/main/java/org/distorted/magic/RubikActivity.java +++ b/src/main/java/org/distorted/magic/RubikActivity.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.magic; @@ -37,8 +37,8 @@ import org.distorted.effect.BaseEffect; public class RubikActivity extends AppCompatActivity { - static final int DEFAULT_SIZE = 3; - private static final int SMALLEST_SIZE = 2; + static final int DEFAULT_SIZE = 3; + static final int SMALLEST_SIZE = 2; private static final int[] button_ids = {R.id.rubikSize2, R.id.rubikSize3, R.id.rubikSize4, R.id.rubikSize5}; public static final int MIN_SCRAMBLE = 1; @@ -109,6 +109,13 @@ public class RubikActivity extends AppCompatActivity return mSize; } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + static int getNumCubes() + { + return button_ids.length; + } + /////////////////////////////////////////////////////////////////////////////////////////////////// @Override diff --git a/src/main/java/org/distorted/magic/RubikCube.java b/src/main/java/org/distorted/magic/RubikCube.java index 2d445167..58f41501 100644 --- a/src/main/java/org/distorted/magic/RubikCube.java +++ b/src/main/java/org/distorted/magic/RubikCube.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.magic; diff --git a/src/main/java/org/distorted/magic/RubikRenderer.java b/src/main/java/org/distorted/magic/RubikRenderer.java index 217e9f60..07eb09e2 100644 --- a/src/main/java/org/distorted/magic/RubikRenderer.java +++ b/src/main/java/org/distorted/magic/RubikRenderer.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.magic; diff --git a/src/main/java/org/distorted/magic/RubikScores.java b/src/main/java/org/distorted/magic/RubikScores.java index afa88cb3..1a921563 100644 --- a/src/main/java/org/distorted/magic/RubikScores.java +++ b/src/main/java/org/distorted/magic/RubikScores.java @@ -1,29 +1,85 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.magic; +import android.app.Dialog; +import android.content.DialogInterface; +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.v4.app.FragmentActivity; +import android.support.v4.view.ViewPager; +import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatDialogFragment; +import android.support.design.widget.TabLayout; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; /////////////////////////////////////////////////////////////////////////////////////////////////// public class RubikScores extends AppCompatDialogFragment { + RubikScoresViewPager mViewPager; +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) + { + FragmentActivity act = getActivity(); + AlertDialog.Builder builder = new AlertDialog.Builder(act); + + LayoutInflater layoutInflater = act.getLayoutInflater(); + TextView tv = (TextView) layoutInflater.inflate(R.layout.scores_title, null); + tv.setText(R.string.scores_title); + builder.setCustomTitle(tv); + + builder.setCancelable(true); + builder.setPositiveButton( R.string.ok, new DialogInterface.OnClickListener() + { + @Override + public void onClick(DialogInterface dialog, int which) + { + + } + }); + + LayoutInflater inflater = act.getLayoutInflater(); + final View view = inflater.inflate(R.layout.scores, null); + builder.setView(view); + + ViewPager viewPager = view.findViewById(R.id.viewpager); + TabLayout tabLayout = view.findViewById(R.id.sliding_tabs); + mViewPager = new RubikScoresViewPager(act,viewPager); + tabLayout.setupWithViewPager(viewPager); + + for (int i=0; i. // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.magic; + +import android.support.v7.app.AppCompatDialogFragment; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class RubikScoresDownloader extends AppCompatDialogFragment + { + + } diff --git a/src/main/java/org/distorted/magic/RubikScoresTab.java b/src/main/java/org/distorted/magic/RubikScoresTab.java new file mode 100644 index 00000000..f131fa0c --- /dev/null +++ b/src/main/java/org/distorted/magic/RubikScoresTab.java @@ -0,0 +1,78 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2020 Leszek Koltunski // +// // +// This file is part of Magic Cube. // +// // +// Magic Cube is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Magic Cube is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Magic Cube. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.magic; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public enum RubikScoresTab + { + TAB1 ( R.drawable.button2, R.layout.scores_tab2 ), + TAB2 ( R.drawable.button3, R.layout.scores_tab3 ), + TAB3 ( R.drawable.button4, R.layout.scores_tab4 ), + TAB4 ( R.drawable.button5, R.layout.scores_tab5 ), + ; + + static final int LENGTH = values().length; + + private final int mIconID, mLayoutID; + + private static final RubikScoresTab[] tabs; + + static + { + int i = 0; + tabs = new RubikScoresTab[LENGTH]; + + for(RubikScoresTab tab: RubikScoresTab.values()) + { + tabs[i] = tab; + i++; + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + static RubikScoresTab getTab(int ordinal) + { + return tabs[ordinal]; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + RubikScoresTab(int iconID, int layoutID) + { + mIconID = iconID; + mLayoutID = layoutID; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + int getIcon() + { + return mIconID; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + int getLayout() + { + return mLayoutID; + } + } diff --git a/src/main/java/org/distorted/magic/RubikScoresViewPager.java b/src/main/java/org/distorted/magic/RubikScoresViewPager.java new file mode 100644 index 00000000..a9220218 --- /dev/null +++ b/src/main/java/org/distorted/magic/RubikScoresViewPager.java @@ -0,0 +1,82 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2020 Leszek Koltunski // +// // +// This file is part of Magic Cube. // +// // +// Magic Cube is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Magic Cube is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Magic Cube. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.magic; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class RubikScoresViewPager extends PagerAdapter + { + private Context mContext; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + RubikScoresViewPager(Context context, ViewPager viewPager) + { + mContext = context; + viewPager.setAdapter(this); + viewPager.setOffscreenPageLimit( RubikScoresTab.LENGTH-1 ); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + @NonNull + public Object instantiateItem(@NonNull ViewGroup collection, int position) + { + int scoresTab= RubikScoresTab.getTab(position).getLayout(); + LayoutInflater inflater = LayoutInflater.from(mContext); + ViewGroup layout = (ViewGroup) inflater.inflate(scoresTab, collection, false); + collection.addView(layout); + + return layout; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public void destroyItem(ViewGroup collection, int position, @NonNull Object view) + { + collection.removeView((View) view); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public int getCount() + { + return RubikScoresTab.LENGTH; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public boolean isViewFromObject(@NonNull View view, @NonNull Object object) + { + return view == object; + } + } diff --git a/src/main/java/org/distorted/magic/RubikSettings.java b/src/main/java/org/distorted/magic/RubikSettings.java index cdd6cce4..db9fce59 100644 --- a/src/main/java/org/distorted/magic/RubikSettings.java +++ b/src/main/java/org/distorted/magic/RubikSettings.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.magic; diff --git a/src/main/java/org/distorted/magic/RubikSurfaceView.java b/src/main/java/org/distorted/magic/RubikSurfaceView.java index f0ac93d3..50347fec 100644 --- a/src/main/java/org/distorted/magic/RubikSurfaceView.java +++ b/src/main/java/org/distorted/magic/RubikSurfaceView.java @@ -1,20 +1,20 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Copyright 2019 Leszek Koltunski // // // -// This file is part of Distorted. // +// This file is part of Magic Cube. // // // -// Distorted is free software: you can redistribute it and/or modify // +// Magic Cube is free software: you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation, either version 2 of the License, or // // (at your option) any later version. // // // -// Distorted is distributed in the hope that it will be useful, // +// Magic Cube is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // +// along with Magic Cube. If not, see . // /////////////////////////////////////////////////////////////////////////////////////////////////// package org.distorted.magic; diff --git a/src/main/res/layout/scores.xml b/src/main/res/layout/scores.xml new file mode 100644 index 00000000..d70ded5e --- /dev/null +++ b/src/main/res/layout/scores.xml @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/src/main/res/layout/scores_tab2.xml b/src/main/res/layout/scores_tab2.xml new file mode 100644 index 00000000..18b3ec79 --- /dev/null +++ b/src/main/res/layout/scores_tab2.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + diff --git a/src/main/res/layout/scores_tab3.xml b/src/main/res/layout/scores_tab3.xml new file mode 100644 index 00000000..e825cfda --- /dev/null +++ b/src/main/res/layout/scores_tab3.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + diff --git a/src/main/res/layout/scores_tab4.xml b/src/main/res/layout/scores_tab4.xml new file mode 100644 index 00000000..d656c7ef --- /dev/null +++ b/src/main/res/layout/scores_tab4.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + diff --git a/src/main/res/layout/scores_tab5.xml b/src/main/res/layout/scores_tab5.xml new file mode 100644 index 00000000..569734e4 --- /dev/null +++ b/src/main/res/layout/scores_tab5.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + diff --git a/src/main/res/layout/scores_title.xml b/src/main/res/layout/scores_title.xml new file mode 100644 index 00000000..fa2f7832 --- /dev/null +++ b/src/main/res/layout/scores_title.xml @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ac184a95..ff88b3a2 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -6,6 +6,7 @@ Solve Settings Scores + High Scores About SAVE OK