From bc65183e809c73c50d18f48bdb21e9eb50bd119d Mon Sep 17 00:00:00 2001 From: Christopher Beckmann Date: Mon, 5 Oct 2020 12:49:40 +0200 Subject: [PATCH] Corrected Licence Information Added Migration from v1 to v2 Fixed Dark Theme on Actionbar Popup Fixed CreateSudokuActivity Parcelable implementation Fixes #45 --- app/build.gradle | 10 +-- app/src/main/AndroidManifest.xml | 1 - .../privacyfriendlysudoku/SudokuApp.java | 31 ++++---- .../controller/GameController.java | 31 ++++---- .../controller/GameStateManager.java | 31 ++++---- .../controller/GeneratorService.java | 31 ++++---- .../controller/Highscore.java | 31 ++++---- .../controller/NewLevelManager.java | 31 ++++---- .../controller/QQWingController.java | 31 ++++---- .../controller/SaveLoadStatistics.java | 31 ++++---- .../controller/Symbol.java | 31 ++++---- .../controller/UndoRedoManager.java | 31 ++++---- .../controller/database/DatabaseHelper.java | 40 +++++----- .../database/columns/DailySudokuColumns.java | 30 ++++--- .../database/columns/LevelColumns.java | 30 ++++--- .../database/migration/Migration.java | 35 +++++++++ .../database/migration/MigrationUtil.java | 52 +++++++++++++ .../database/model/DailySudoku.java | 30 ++++--- .../controller/database/model/Level.java | 31 ++++---- .../controller/helper/GameInfoContainer.java | 45 +++++------ .../helper/HighscoreInfoContainer.java | 31 ++++---- .../game/CellConflict.java | 31 ++++---- .../game/CellConflictList.java | 31 ++++---- .../privacyfriendlysudoku/game/GameBoard.java | 31 ++++---- .../privacyfriendlysudoku/game/GameCell.java | 31 ++++---- .../game/GameDifficulty.java | 31 ++++---- .../game/GameSettings.java | 31 ++++---- .../game/GameStatus.java | 31 ++++---- .../privacyfriendlysudoku/game/GameType.java | 31 ++++---- .../game/ICellAction.java | 31 ++++---- .../game/listener/IGameErrorListener.java | 31 ++++---- .../game/listener/IGameSolvedListener.java | 31 ++++---- .../listener/IHighlightChangedListener.java | 31 ++++---- .../game/listener/IHintListener.java | 31 ++++---- .../game/listener/IModelChangedListener.java | 31 ++++---- .../game/listener/ITimerListener.java | 31 ++++---- .../ui/AboutActivity.java | 31 ++++---- .../ui/AppCompatPreferenceActivity.java | 31 ++++---- .../ui/BaseActivity.java | 31 ++++---- .../ui/CreateSudokuActivity.java | 78 ++++++++++++------- .../ui/DailySudokuActivity.java | 35 ++++----- .../ui/GameActivity.java | 45 ++++++----- .../ui/HelpActivity.java | 31 ++++---- .../ui/LoadGameActivity.java | 31 ++++---- .../ui/MainActivity.java | 31 ++++---- .../privacyfriendlysudoku/ui/PrefManager.java | 31 ++++---- .../ui/SettingsActivity.java | 31 ++++---- .../ui/SplashActivity.java | 31 ++++---- .../ui/StatsActivity.java | 31 ++++---- .../ui/TutorialActivity.java | 31 ++++---- .../IDeleteDialogFragmentListener.java | 31 ++++---- .../IFinalizeDialogFragmentListener.java | 31 ++++---- .../listener/IHintDialogFragmentListener.java | 31 ++++---- .../IImportDialogFragmentListener.java | 31 ++++---- .../IResetDialogFragmentListener.java | 31 ++++---- .../IShareDialogFragmentListener.java | 31 ++++---- .../ui/view/CellHighlightTypes.java | 30 ++++--- .../ui/view/CreateSudokuButtonType.java | 31 ++++---- .../ui/view/CreateSudokuSpecialButton.java | 33 ++++---- .../view/CreateSudokuSpecialButtonLayout.java | 31 ++++---- .../ui/view/SudokuButton.java | 33 ++++---- .../ui/view/SudokuButtonType.java | 31 ++++---- .../ui/view/SudokuCellView.java | 31 ++++---- .../ui/view/SudokuFieldLayout.java | 31 ++++---- .../ui/view/SudokuKeyboardLayout.java | 31 ++++---- .../ui/view/SudokuSpecialButton.java | 33 ++++---- .../ui/view/SudokuSpecialButtonLayout.java | 31 ++++---- .../ui/view/WinDialog.java | 31 ++++---- app/src/main/res/values-night/styles.xml | 2 +- .../controller/GameControllerTest.java | 16 ++++ .../game/solver/SolverTest.java | 16 ++++ 71 files changed, 1080 insertions(+), 1126 deletions(-) create mode 100644 app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/migration/Migration.java create mode 100644 app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/migration/MigrationUtil.java diff --git a/app/build.gradle b/app/build.gradle index 753a737..bf5c5ab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,15 +33,15 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.preference:preference:1.1.0-rc01' + implementation 'androidx.preference:preference:1.1.1' testImplementation 'junit:junit:4.12' - implementation 'androidx.core:core:1.2.0' + implementation 'androidx.core:core:1.3.2' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.legacy:legacy-support-v13:1.0.0' - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'com.google.android.material:material:1.1.0' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.2.1' implementation 'androidx.legacy:legacy-support-core-ui:1.0.0' implementation 'androidx.legacy:legacy-support-core-utils:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:2.0.1' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9f25327..43a0057 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,7 +16,6 @@ android:theme="@style/SplashTheme"> - diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/SudokuApp.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/SudokuApp.java index efb1a67..5975a32 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/SudokuApp.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/SudokuApp.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku; import android.app.Application; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameController.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameController.java index cbd25ab..ed0d54d 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameController.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameController.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.controller; import android.content.Context; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameStateManager.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameStateManager.java index dad7f8c..bfff728 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameStateManager.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameStateManager.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.controller; import android.content.Context; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GeneratorService.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GeneratorService.java index 16a799d..79435b1 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GeneratorService.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GeneratorService.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.controller; import android.app.IntentService; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/Highscore.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/Highscore.java index 3f7a640..e30d8d4 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/Highscore.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/Highscore.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.controller; /** diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/NewLevelManager.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/NewLevelManager.java index 36ebdf0..6e9464d 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/NewLevelManager.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/NewLevelManager.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.controller; import android.content.Context; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/QQWingController.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/QQWingController.java index 413abe7..3b8c35e 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/QQWingController.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/QQWingController.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.controller; import android.os.Parcelable; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/SaveLoadStatistics.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/SaveLoadStatistics.java index cf77556..ee233f4 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/SaveLoadStatistics.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/SaveLoadStatistics.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.controller; import android.content.Context; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/Symbol.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/Symbol.java index 575de0e..adac2c4 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/Symbol.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/Symbol.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.controller; /** diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/UndoRedoManager.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/UndoRedoManager.java index 06656f8..e41dade 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/UndoRedoManager.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/UndoRedoManager.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.controller; import android.os.Parcel; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/DatabaseHelper.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/DatabaseHelper.java index 742a579..5601101 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/DatabaseHelper.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/DatabaseHelper.java @@ -1,20 +1,18 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + This file is part of Privacy Friendly Sudoku. + + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . */ package org.secuso.privacyfriendlysudoku.controller.database; @@ -26,6 +24,7 @@ import android.database.sqlite.SQLiteOpenHelper; import org.secuso.privacyfriendlysudoku.controller.database.columns.DailySudokuColumns; import org.secuso.privacyfriendlysudoku.controller.database.columns.LevelColumns; +import org.secuso.privacyfriendlysudoku.controller.database.migration.MigrationUtil; import org.secuso.privacyfriendlysudoku.controller.database.model.DailySudoku; import org.secuso.privacyfriendlysudoku.controller.database.model.Level; import org.secuso.privacyfriendlysudoku.game.GameDifficulty; @@ -52,9 +51,12 @@ public class DatabaseHelper extends SQLiteOpenHelper { } public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - db.execSQL(LevelColumns.SQL_DELETE_ENTRIES); - db.execSQL(DailySudokuColumns.SQL_DELETE_ENTRIES); - onCreate(db); + // fallback to destructive migration if no migration could be executed + if(!MigrationUtil.executeMigration(db, oldVersion, newVersion)) { + db.execSQL(LevelColumns.SQL_DELETE_ENTRIES); + db.execSQL(DailySudokuColumns.SQL_DELETE_ENTRIES); + onCreate(db); + } } public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) { diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/columns/DailySudokuColumns.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/columns/DailySudokuColumns.java index dfb5db4..cfd2fcd 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/columns/DailySudokuColumns.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/columns/DailySudokuColumns.java @@ -1,20 +1,18 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + This file is part of Privacy Friendly Sudoku. + + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . */ package org.secuso.privacyfriendlysudoku.controller.database.columns; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/columns/LevelColumns.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/columns/LevelColumns.java index 9464749..f824533 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/columns/LevelColumns.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/columns/LevelColumns.java @@ -1,20 +1,18 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + This file is part of Privacy Friendly Sudoku. + + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . */ package org.secuso.privacyfriendlysudoku.controller.database.columns; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/migration/Migration.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/migration/Migration.java new file mode 100644 index 0000000..794bedf --- /dev/null +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/migration/Migration.java @@ -0,0 +1,35 @@ +/* + This file is part of Privacy Friendly Sudoku. + + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ +package org.secuso.privacyfriendlysudoku.controller.database.migration; + +import android.database.sqlite.SQLiteDatabase; + +/** + * Similar idea to room migration class. + * @author Christopher Beckmann + */ +public abstract class Migration { + int from = 0; + int to = 0; + + public Migration(int from, int to) { + this.from = from; + this.to = to; + } + + public abstract void migrate(SQLiteDatabase db); +} diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/migration/MigrationUtil.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/migration/MigrationUtil.java new file mode 100644 index 0000000..386e5cb --- /dev/null +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/migration/MigrationUtil.java @@ -0,0 +1,52 @@ +/* + This file is part of Privacy Friendly Sudoku. + + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ +package org.secuso.privacyfriendlysudoku.controller.database.migration; + +import android.database.sqlite.SQLiteDatabase; + +import java.util.Arrays; +import java.util.List; + +import static org.secuso.privacyfriendlysudoku.controller.database.columns.DailySudokuColumns.SQL_CREATE_ENTRIES; + +/** + * @author Christopher Beckmann + */ +public class MigrationUtil { + + public static List migrations = Arrays.asList( + new Migration(1,2) { + @Override + public void migrate(SQLiteDatabase db) { + db.execSQL(SQL_CREATE_ENTRIES); + } + } + ); + + //TODO: for now just try to find the desired migration from the list. + // -> When more migrations are added, a chain could be found, e.g. 1->2->3 + public static boolean executeMigration(SQLiteDatabase db, int from, int to) { + for(Migration m : migrations) { + if(m.from == from && m.to == to) { + m.migrate(db); + return true; + } + } + return false; + } + +} diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/model/DailySudoku.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/model/DailySudoku.java index 4228ec4..3c40446 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/model/DailySudoku.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/model/DailySudoku.java @@ -1,20 +1,18 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + This file is part of Privacy Friendly Sudoku. + + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . */ package org.secuso.privacyfriendlysudoku.controller.database.model; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/model/Level.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/model/Level.java index 2686fc2..be46794 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/model/Level.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/database/model/Level.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.controller.database.model; import org.secuso.privacyfriendlysudoku.controller.Symbol; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/GameInfoContainer.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/GameInfoContainer.java index ff938f4..345805c 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/GameInfoContainer.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/GameInfoContainer.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.controller.helper; import android.util.Log; @@ -73,9 +70,6 @@ public class GameInfoContainer { public void parseGameType(String s) { gameType = Enum.valueOf(GameType.class, s); - if(gameType == null) { - throw new IllegalArgumentException("GameInfoContainer: gameType could not be set."); - } } public int getTimePlayed() { @@ -88,7 +82,7 @@ public class GameInfoContainer { public void parseTime(String s) { try { - this.timePlayed = Integer.valueOf(s); + this.timePlayed = Integer.parseInt(s); } catch(NumberFormatException e) { throw new IllegalArgumentException("GameInfoContainer: Can not parse time.", e); } @@ -96,7 +90,7 @@ public class GameInfoContainer { public void parseHintsUsed(String s) { try { - this.hintsUsed = Integer.valueOf(s); + this.hintsUsed = Integer.parseInt(s); } catch(NumberFormatException e) { throw new IllegalArgumentException("GameInfoContainer: Can not parse hints used.", e); } @@ -104,7 +98,7 @@ public class GameInfoContainer { public void parseDate(String s) { try { - this.lastTimePlayed = new Date(Long.valueOf(s)); + this.lastTimePlayed = new Date(Long.parseLong(s)); } catch(NumberFormatException e) { throw new IllegalArgumentException("GameInfoContainer: LastTimePlayed Date can not be extracted.", e); } @@ -112,9 +106,6 @@ public class GameInfoContainer { public void parseDifficulty(String s) { difficulty = Enum.valueOf(GameDifficulty.class, s); - if(difficulty == null) { - throw new IllegalArgumentException("GameInfoContainer: difficulty could not be set."); - } } public void parseFixedValues(String s){ @@ -158,7 +149,7 @@ public class GameInfoContainer { int size = gameType.getSize(); int sq = size*size; - if(gameType != GameType.Unspecified && gameType != null) { + if(gameType != GameType.Unspecified) { if(strings.length != sq) { throw new IllegalArgumentException("The string array must have "+sq+" entries."); } diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/HighscoreInfoContainer.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/HighscoreInfoContainer.java index 06da00c..2c20914 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/HighscoreInfoContainer.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/HighscoreInfoContainer.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.controller.helper; import org.secuso.privacyfriendlysudoku.controller.GameController; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/CellConflict.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/CellConflict.java index 8f1e3f8..63537dc 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/CellConflict.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/CellConflict.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game; import android.os.Parcel; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/CellConflictList.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/CellConflictList.java index 0320e0a..309360d 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/CellConflictList.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/CellConflictList.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game; import java.util.ArrayList; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameBoard.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameBoard.java index 6fe9088..a2aaa68 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameBoard.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameBoard.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game; import android.os.Parcel; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameCell.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameCell.java index a809ef2..82ce514 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameCell.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameCell.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game; import android.os.Parcel; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameDifficulty.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameDifficulty.java index 2ff1479..ad3a33f 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameDifficulty.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameDifficulty.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game; import android.os.Parcel; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameSettings.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameSettings.java index bb2dc1a..c0e69d7 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameSettings.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameSettings.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game; /** diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameStatus.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameStatus.java index 065c5c7..e681e6b 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameStatus.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameStatus.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game; /** diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameType.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameType.java index 7ab9b2d..5f67a3c 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameType.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameType.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game; import android.os.Parcel; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/ICellAction.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/ICellAction.java index 8e877ed..d028e9f 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/ICellAction.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/ICellAction.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game; /** diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IGameErrorListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IGameErrorListener.java index 2a5b842..568e50d 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IGameErrorListener.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IGameErrorListener.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game.listener; import org.secuso.privacyfriendlysudoku.game.CellConflict; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IGameSolvedListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IGameSolvedListener.java index 11c4329..e0ec751 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IGameSolvedListener.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IGameSolvedListener.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game.listener; /** diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IHighlightChangedListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IHighlightChangedListener.java index 18659ba..b782310 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IHighlightChangedListener.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IHighlightChangedListener.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game.listener; /** diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IHintListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IHintListener.java index 1af9052..f9548a3 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IHintListener.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IHintListener.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game.listener; /** diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IModelChangedListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IModelChangedListener.java index b44cebe..178c61c 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IModelChangedListener.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IModelChangedListener.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game.listener; import org.secuso.privacyfriendlysudoku.game.GameCell; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/ITimerListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/ITimerListener.java index 42fd1f4..3f47603 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/ITimerListener.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/ITimerListener.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.game.listener; /** diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AboutActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AboutActivity.java index 38b1132..9ab0693 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AboutActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AboutActivity.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui; import android.graphics.Color; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AppCompatPreferenceActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AppCompatPreferenceActivity.java index e5400ec..5a7f7de 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AppCompatPreferenceActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AppCompatPreferenceActivity.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui; import android.content.res.Configuration; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/BaseActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/BaseActivity.java index b12dfb3..b101855 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/BaseActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/BaseActivity.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui; import android.os.Bundle; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/CreateSudokuActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/CreateSudokuActivity.java index f61d2b1..05a89f1 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/CreateSudokuActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/CreateSudokuActivity.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui; import android.content.Context; @@ -60,31 +57,39 @@ public class CreateSudokuActivity extends BaseActivity implements IFinalizeDialo SharedPreferences sharedPref; SudokuFieldLayout layout; SudokuKeyboardLayout keyboard; - TextView viewName ; CreateSudokuSpecialButtonLayout specialButtonLayout; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + sharedPref = PreferenceManager.getDefaultSharedPreferences(this); - if(sharedPref.getBoolean("pref_keep_screen_on", true)) { + if (sharedPref.getBoolean("pref_keep_screen_on", true)) { getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); } - gameController = new GameController(sharedPref, getApplicationContext()); + if(savedInstanceState == null) { - Bundle extras = getIntent().getExtras(); - GameType gameType = GameType.valueOf(extras.getString("gameType", GameType.Default_9x9.name())); - int sectionSize = gameType.getSize(); - int boardSize = sectionSize * sectionSize; + gameController = new GameController(sharedPref, getApplicationContext()); - GameInfoContainer container = new GameInfoContainer(0, GameDifficulty.Moderate, - gameType, new int [boardSize], new int [boardSize], new boolean [boardSize][sectionSize]); - gameController.loadLevel(container); + Bundle extras = getIntent().getExtras(); + GameType gameType = GameType.valueOf(extras.getString("gameType", GameType.Default_9x9.name())); + int sectionSize = gameType.getSize(); + int boardSize = sectionSize * sectionSize; + + GameInfoContainer container = new GameInfoContainer(0, GameDifficulty.Moderate, + gameType, new int[boardSize], new int[boardSize], new boolean[boardSize][sectionSize]); + gameController.loadLevel(container); + } else { + gameController = savedInstanceState.getParcelable("gameController"); + if(gameController != null) { + gameController.removeAllListeners(); + gameController.setContextAndSettings(getApplicationContext(), sharedPref); + } + } setUpLayout(); - } private void setUpLayout() { @@ -269,4 +274,21 @@ public class CreateSudokuActivity extends BaseActivity implements IFinalizeDialo public void onDialogNegativeClick() { } + + @Override + public void onSaveInstanceState(Bundle savedInstanceState) { + // Always call the superclass so it can save the view hierarchy state + super.onSaveInstanceState(savedInstanceState); + + // Save the user's current game state + savedInstanceState.putParcelable("gameController", gameController); + + } + + @Override + public void onRestoreInstanceState(Bundle savedInstanceState) { + super.onRestoreInstanceState(savedInstanceState); + + gameController = savedInstanceState.getParcelable("gameController"); + } } diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/DailySudokuActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/DailySudokuActivity.java index fab1eaf..e684b06 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/DailySudokuActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/DailySudokuActivity.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui; import android.content.Context; @@ -59,8 +56,6 @@ import java.util.TimeZone; *The activity is responsible for the logic of the DailySudoku. *DailySudoku is a game mode where every day a different Sudoku is created for the user */ - - public class DailySudokuActivity extends AppCompatActivity { List sudokuList; @@ -189,7 +184,7 @@ public class DailySudokuActivity extends AppCompatActivity { } public boolean onCreateOptionsMenu(Menu menu) { - return false; + return true; } @Override diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java index 8a7c520..66309ab 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui; import android.app.Activity; @@ -673,18 +670,20 @@ public class GameActivity extends BaseActivity implements NavigationView.OnNavig @Override public void onSaveInstanceState(Bundle savedInstanceState) { - // Save the user's current game state - - savedInstanceState.putParcelable("gameController", gameController); - savedInstanceState.putInt("gameSolved", gameSolved ? 1 : 0); - // Always call the superclass so it can save the view hierarchy state super.onSaveInstanceState(savedInstanceState); + + // Save the user's current game state + savedInstanceState.putParcelable("gameController", gameController); + savedInstanceState.putBoolean("gameSolved", gameSolved); } @Override public void onRestoreInstanceState(Bundle savedInstanceState) { - //super.onRestoreInstanceState(savedInstanceState); + super.onRestoreInstanceState(savedInstanceState); + + gameController = savedInstanceState.getParcelable("gameController"); + gameSolved = savedInstanceState.getBoolean("gameSolved"); } public static class ShareBoardDialog extends DialogFragment { diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/HelpActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/HelpActivity.java index 151bb70..8499e4c 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/HelpActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/HelpActivity.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/LoadGameActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/LoadGameActivity.java index ac152dd..5f47dc3 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/LoadGameActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/LoadGameActivity.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui; import android.app.Activity; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java index bb24188..be2b943 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui; import android.app.Activity; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/PrefManager.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/PrefManager.java index 23e62f6..8280b54 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/PrefManager.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/PrefManager.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui; import android.content.Context; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java index da9baf6..7f1d963 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui; import android.content.SharedPreferences; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SplashActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SplashActivity.java index 657a909..2c4a3d6 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SplashActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SplashActivity.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui; import android.content.Intent; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/StatsActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/StatsActivity.java index 90ccdf1..17c504b 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/StatsActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/StatsActivity.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui; import android.content.Context; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/TutorialActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/TutorialActivity.java index 53b197d..609d750 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/TutorialActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/TutorialActivity.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui; import android.content.Context; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IDeleteDialogFragmentListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IDeleteDialogFragmentListener.java index f5504d0..5b545d9 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IDeleteDialogFragmentListener.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IDeleteDialogFragmentListener.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.listener; /** diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IFinalizeDialogFragmentListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IFinalizeDialogFragmentListener.java index af86aa3..d61ffd3 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IFinalizeDialogFragmentListener.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IFinalizeDialogFragmentListener.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.listener; public interface IFinalizeDialogFragmentListener { diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IHintDialogFragmentListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IHintDialogFragmentListener.java index 3b8cb34..0d73b15 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IHintDialogFragmentListener.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IHintDialogFragmentListener.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.listener; /** diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IImportDialogFragmentListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IImportDialogFragmentListener.java index 3b14fbf..8100f87 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IImportDialogFragmentListener.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IImportDialogFragmentListener.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.listener; public interface IImportDialogFragmentListener { diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IResetDialogFragmentListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IResetDialogFragmentListener.java index c4d92c2..149c9bd 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IResetDialogFragmentListener.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IResetDialogFragmentListener.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.listener; /** diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IShareDialogFragmentListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IShareDialogFragmentListener.java index 25c8ea4..1520da9 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IShareDialogFragmentListener.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IShareDialogFragmentListener.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.listener; public interface IShareDialogFragmentListener { diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CellHighlightTypes.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CellHighlightTypes.java index 09406ca..f51ec3e 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CellHighlightTypes.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CellHighlightTypes.java @@ -1,20 +1,18 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + This file is part of Privacy Friendly Sudoku. + + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . */ package org.secuso.privacyfriendlysudoku.ui.view; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuButtonType.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuButtonType.java index 708c6e9..aa7912e 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuButtonType.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuButtonType.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.view; import androidx.annotation.DrawableRes; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButton.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButton.java index cdb9e2f..cde1c5a 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButton.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButton.java @@ -1,29 +1,26 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.view; import android.content.Context; import android.util.AttributeSet; import android.widget.ImageButton; -public class CreateSudokuSpecialButton extends ImageButton { +public class CreateSudokuSpecialButton extends androidx.appcompat.widget.AppCompatImageButton { private int value = -1; private CreateSudokuButtonType type = CreateSudokuButtonType.Unspecified; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButtonLayout.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButtonLayout.java index e496389..0a92c1e 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButtonLayout.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButtonLayout.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.view; import android.app.Activity; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuButton.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuButton.java index 3e8b24a..1b91726 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuButton.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuButton.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.view; import android.content.Context; @@ -31,7 +28,7 @@ import android.widget.Button; -public class SudokuButton extends Button { +public class SudokuButton extends androidx.appcompat.widget.AppCompatButton { private int value = -1; private SudokuButtonType type = SudokuButtonType.Unspecified; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuButtonType.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuButtonType.java index 4bafb6b..79d43b9 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuButtonType.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuButtonType.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.view; import androidx.annotation.DrawableRes; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuCellView.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuCellView.java index fc2a337..a9ec0c1 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuCellView.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuCellView.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.view; import android.content.Context; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuFieldLayout.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuFieldLayout.java index f0aebef..9d78d98 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuFieldLayout.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuFieldLayout.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.view; import android.content.Context; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuKeyboardLayout.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuKeyboardLayout.java index 3b06549..f54aca5 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuKeyboardLayout.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuKeyboardLayout.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.view; import android.content.Context; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButton.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButton.java index 91a06c7..920be2d 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButton.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButton.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.view; import android.content.Context; @@ -26,7 +23,7 @@ import android.widget.ImageButton; /** * Created by TMZ_LToP on 07.12.2015. */ -public class SudokuSpecialButton extends ImageButton { +public class SudokuSpecialButton extends androidx.appcompat.widget.AppCompatImageButton { private int value = -1; private SudokuButtonType type = SudokuButtonType.Unspecified; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButtonLayout.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButtonLayout.java index 99d40b2..b676b89 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButtonLayout.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButtonLayout.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.view; import android.app.Activity; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/WinDialog.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/WinDialog.java index 964c995..a94e085 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/WinDialog.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/WinDialog.java @@ -1,22 +1,19 @@ /* - * qqwing - Sudoku solver and generator - * Copyright (C) 2014 Stephen Ostermiller - * - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ + This file is part of Privacy Friendly Sudoku. + Privacy Friendly Sudoku 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 3 of the License, or any later version. + + Privacy Friendly Sudoku 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 Privacy Friendly Sudoku. If not, see . + */ package org.secuso.privacyfriendlysudoku.ui.view; import android.app.AlertDialog; diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 8fc418d..193db3b 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -59,7 +59,7 @@