From 583ed62b763d3f984bcc2135d4706b9e155503ae Mon Sep 17 00:00:00 2001 From: Karola Marky Date: Thu, 24 Nov 2016 15:18:15 +0200 Subject: [PATCH 01/16] Advertising added --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index aa47705..86b186e 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,12 @@ It also does neither include advertisement nor tracking mechanisms. As it is part of the Privacy Friendly Apps developed by the SECUSO research group of the Technische Universtität Darmstadt in Germany it is optimized due to user's privacy. - ## Download and more Information +[Get it on F-Droid](https://f-droid.org/repository/browse/?fdfilter=sudoku&fdid=org.secuso.privacyfriendlysudoku) + +### Building + Further development requires Android Studio, we recommend to use at least version 2.2.3 ### API Reference From 600996eee71e091bfd45f6feeab0e03a0f39df40 Mon Sep 17 00:00:00 2001 From: Karola Marky Date: Sun, 27 Nov 2016 15:17:14 +0200 Subject: [PATCH 02/16] Changelog added --- CHANGELOG.md | 25 +++++++++ app/app.iml | 142 --------------------------------------------------- 2 files changed, 25 insertions(+), 142 deletions(-) create mode 100644 CHANGELOG.md delete mode 100644 app/app.iml diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..6f4ef26 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,25 @@ +Changelog +========== + +Version 2.0.1 *(2016-11-07)* +---------------------------- + + * Splash Screen added + +Version 2.0 *(2016-10-15)* +---------------------------- + + * Optimization of the level generator to save battery life + * Design-Update + * New Logo + * French translation updated + +Version 1.1 *(2016-03-29)* +---------------------------- + + * French translation updated + +Version 1.0 *(2016-03-22)* +---------------------------- + + * Initial Release diff --git a/app/app.iml b/app/app.iml deleted file mode 100644 index bc02165..0000000 --- a/app/app.iml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 9df554795380b82145fdd17236ed2fc4f5c5fa7a Mon Sep 17 00:00:00 2001 From: naofum Date: Thu, 22 Dec 2016 23:10:15 +0900 Subject: [PATCH 03/16] japanese translation --- app/src/main/res/values-ja/strings.xml | 126 +++++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 app/src/main/res/values-ja/strings.xml diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml new file mode 100644 index 0000000..9598158 --- /dev/null +++ b/app/src/main/res/values-ja/strings.xml @@ -0,0 +1,126 @@ + + + キャンセル + + + 新しいゲーム + メインメニュー + 設定 + ハイスコア + グループ + ヘルプ + アプリについて + ボードをリセット + ゲームを続ける + + ゲームをロード + バックグラウンドで新しいレベルを生成中… + + + 設定 + + ハイライト + 選択のハイライト + 接続したフィールド + 数のハイライト + 同じ数 + メモ + + ゲーム + ゲーム設定 + シンボル + + デフォルト 1,2,3,.. + ローマ I,II,III,.. + ファンシー ♪,♫,☼,.. + 漢字 一,二,三,.. + ギリシャ α,β,γ,.. + インド १,२,३,.. + + + Default + Roman + Fancy + Chinese + Greek + Indian + + メモの削除 + 接続されたセルの数をセットするときにメモを自動的に削除します + タイマーリセット + ゲームボードをリセットするときに、タイマーもリセットします。 + + + 作者: + と貢献者。 + 提携 + このアプリケーションは、ダルムシュタット工科大学 (Technische Universität Darmstadt, Germany) が開発したプライバシーフレンドリーアプリのグループに属しています。 ソースコードは GPLv3 の下でライセンスされます。画像の著作権は TU Darmstadt および Google Inc. + さらに詳しい情報は以下でご覧ください: + このアプリケーションは QQWing v1.3.4 の修正版を使用しています + + + 簡単 + 標準 + 難しい + + + 未指定 + 有効なフィールドを選択して、ヒントボタンを押すと、解決策を表示します。 + このヒントを使用してもよろしいですか? ヒントを使用すると、個人のベストタイムを達成することができなくなります。 + 使用する + ゲームボードをリセットしてもよろしいですか? + リセット + + + プライバシーフレンドリー Sudoku へようこそ。 + スワイプまたは左右の矢印ボタンを押して、ゲームモードを変更します。 + ゲームモード: + 星を押すかスワイプして難易度を変えます。 + 難易度: + + + このセーブを削除してもよろしいですか? + 削除 + + + 統計 + # 使用したヒント: + # 完了したゲーム: + 合計プレイタイム: + 平均タイム: + ベストタイム: + すべてリセット + + + おめでとう! + 続ける + ヘルプ + タイム: + ヒント: + ゲームフィールドを表示 + 新記録! + + + ヘルプ + キーボード + ゲームフィールド + 数が選択されていることを示します。 このモードでは、フィールドを選択しなくても、フィールドに触れると数がすぐにセットされます。 + ここに正しい数が置かれたことを示します。 + + + 実行ボタン + 最後に取り消された操作をやり直します + 取り消しボタン + 最後の操作を取り消します + ヒントボタン + 選択したフィールドを公開します\n警告: 使用すると、現在のゲームは新しいベストタイムにカウントされません。 + 削除ボタン + 選択したフィールドを削除します + メモ切り替えボタン + フィールドの値を、数またはメモとしてセットするかどうかを切り替えます + プライバシー情報 + アクセス許可 + プライバシーフレンドリー Sudoku はいかなるアクセス許可も使用していません。 + OK + ヘルプを表示 + From f7edfbb34b23c2b0f89af1b6d0dbca2aee253bd2 Mon Sep 17 00:00:00 2001 From: Christopher Beckmann Date: Sun, 25 Jun 2017 21:10:55 +0200 Subject: [PATCH 04/16] Settings and Toolbar update --- .../org/secuso/privacyfriendlysudoku/ui/GameActivity.java | 8 +++++--- app/src/main/res/layout/activity_game_view.xml | 4 ++-- app/src/main/res/values/strings.xml | 6 ++++-- app/src/main/res/xml/pref_settings_general.xml | 8 +++++++- 4 files changed, 18 insertions(+), 8 deletions(-) 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 4c8e125..7b01c2e 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java @@ -83,10 +83,12 @@ public class GameActivity extends BaseActivity implements NavigationView.OnNavig protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); + + if(sharedPref.getBoolean("pref_keep_screen_on", true)) { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + } + GameType gameType = GameType.Unspecified; GameDifficulty gameDifficulty = GameDifficulty.Unspecified; int loadLevelID = 0; diff --git a/app/src/main/res/layout/activity_game_view.xml b/app/src/main/res/layout/activity_game_view.xml index 4278fe9..2e33c3f 100644 --- a/app/src/main/res/layout/activity_game_view.xml +++ b/app/src/main/res/layout/activity_game_view.xml @@ -40,10 +40,10 @@ android:layout_height="wrap_content" android:text="@string/gametype_unspecified" android:id="@+id/gameModeText" - android:layout_weight="8"/> + android:layout_weight="7"/> Privacy Friendly Sudoku does not use any permissions. Okay View Help - Challenge - Highlight input mistakes + Challenge + Highlight input mistakes + Keep Screen On + Don\'t turn the screen off while playing diff --git a/app/src/main/res/xml/pref_settings_general.xml b/app/src/main/res/xml/pref_settings_general.xml index 793e450..3102b95 100644 --- a/app/src/main/res/xml/pref_settings_general.xml +++ b/app/src/main/res/xml/pref_settings_general.xml @@ -13,7 +13,13 @@ android:summary="@string/pref_timer_reset_summary" android:defaultValue="true" /> - + + Date: Sun, 25 Jun 2017 21:29:56 +0200 Subject: [PATCH 05/16] New menu icons --- app/src/main/res/drawable/ic_menu_about.xml | 9 +++++++++ app/src/main/res/drawable/ic_menu_help.xml | 9 +++++++++ app/src/main/res/drawable/ic_menu_home.xml | 9 +++++++++ app/src/main/res/drawable/ic_menu_settings.xml | 5 +++++ app/src/main/res/menu/menu_drawer.xml | 6 +++--- app/src/main/res/menu/menu_drawer_main.xml | 8 ++++---- 6 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 app/src/main/res/drawable/ic_menu_about.xml create mode 100644 app/src/main/res/drawable/ic_menu_help.xml create mode 100644 app/src/main/res/drawable/ic_menu_home.xml create mode 100644 app/src/main/res/drawable/ic_menu_settings.xml diff --git a/app/src/main/res/drawable/ic_menu_about.xml b/app/src/main/res/drawable/ic_menu_about.xml new file mode 100644 index 0000000..2851ab6 --- /dev/null +++ b/app/src/main/res/drawable/ic_menu_about.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_menu_help.xml b/app/src/main/res/drawable/ic_menu_help.xml new file mode 100644 index 0000000..4148ec9 --- /dev/null +++ b/app/src/main/res/drawable/ic_menu_help.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_menu_home.xml b/app/src/main/res/drawable/ic_menu_home.xml new file mode 100644 index 0000000..5a425b4 --- /dev/null +++ b/app/src/main/res/drawable/ic_menu_home.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_menu_settings.xml b/app/src/main/res/drawable/ic_menu_settings.xml new file mode 100644 index 0000000..8e4a68a --- /dev/null +++ b/app/src/main/res/drawable/ic_menu_settings.xml @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_drawer.xml b/app/src/main/res/menu/menu_drawer.xml index 8915107..6be2dc6 100644 --- a/app/src/main/res/menu/menu_drawer.xml +++ b/app/src/main/res/menu/menu_drawer.xml @@ -11,11 +11,11 @@ - - - diff --git a/app/src/main/res/menu/menu_drawer_main.xml b/app/src/main/res/menu/menu_drawer_main.xml index f47ca5a..8c6b68e 100644 --- a/app/src/main/res/menu/menu_drawer_main.xml +++ b/app/src/main/res/menu/menu_drawer_main.xml @@ -3,7 +3,7 @@ - @@ -11,11 +11,11 @@ - - - \ No newline at end of file From 116973865a5441e5372f680c24b8684981b74dd3 Mon Sep 17 00:00:00 2001 From: Karola Marky Date: Sun, 25 Jun 2017 21:37:45 +0200 Subject: [PATCH 06/16] Missing translations added --- app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values/strings.xml | 2 +- 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e7d9b3a..a250299 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -89,5 +89,6 @@ Drücke oder wische über die Sterne um den Schwierigkeitsgrad zu ändern. Siehe Hilfe Okay + Profi \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d6f90cf..6fcfd54 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -9,6 +9,7 @@ Fácil Difícil Normal + Reto No especificado Generando nuevo nivel en segundo plano… Borrar diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9b0d9dd..94ee99f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -8,6 +8,7 @@ Facile Difficile Normal + Challenge Indéterminé Générer nouveau niveau en arrière-plan… Aide diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9598158..45dc560 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -62,6 +62,7 @@ 簡単 標準 難しい + チャレンジ 未指定 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 00b00c8..4f710bb 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -8,6 +8,7 @@ Легкий Сложный Средний + вызов Необычный Генерирую новый уровень на заднем плане… Помощь diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index eb262de..e8debba 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -140,7 +140,7 @@ Privacy Friendly Sudoku does not use any permissions. Okay View Help - Challenge + Challenge Highlight input mistakes Keep Screen On Don\'t turn the screen off while playing From ca7cc3bb03a17f083b52fa28ef951541911ec42e Mon Sep 17 00:00:00 2001 From: Karola Marky Date: Sun, 25 Jun 2017 21:50:51 +0200 Subject: [PATCH 07/16] Version number automatic --- .../ui/AboutActivity.java | 2 ++ app/src/main/res/layout/activity_about.xml | 25 ++++++++++++++++--- app/src/main/res/values-de/strings.xml | 3 ++- app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-zh/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 4 +-- 9 files changed, 34 insertions(+), 6 deletions(-) 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 83d586b..065edf9 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AboutActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AboutActivity.java @@ -8,6 +8,7 @@ import android.text.method.LinkMovementMethod; import android.view.MenuItem; import android.widget.TextView; +import org.secuso.privacyfriendlysudoku.ui.view.BuildConfig; import org.secuso.privacyfriendlysudoku.ui.view.R; public class AboutActivity extends BaseActivity { @@ -19,6 +20,7 @@ public class AboutActivity extends BaseActivity { ((TextView)findViewById(R.id.secusoWebsite)).setMovementMethod(LinkMovementMethod.getInstance()); ((TextView)findViewById(R.id.githubURL)).setMovementMethod(LinkMovementMethod.getInstance()); + ((TextView)findViewById(R.id.textFieldVersionName)).setText(BuildConfig.VERSION_NAME); android.support.v7.app.ActionBar actionBar = getSupportActionBar(); actionBar.setTitle(R.string.menu_about); diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index ea2259a..d8cdd1d 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -42,13 +42,32 @@ android:layout_marginTop="15dp" android:text="@string/app_name_long" /> - + android:gravity="center"> + + + + + + + In Zusammenarbeit mit: - Autor: + Autoren: + Version: und Mitwirkende. Diese App gehört zur Gruppe der Privacy Friendly Apps entwickelt von der Technischen Universität Darmstadt. Quelltext lizenziert unter GPLv3. Bilder copyright TU Darmstadt und Google Inc. Weitere Infos unter: diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6fcfd54..9246a5d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -80,6 +80,7 @@ Resetear Tiempo El tiempo se resetea tambien, cuando el tablero se resetea. Bienvenido a Privacy Friendly Sudoku. + Versión: " " Ok Ayuda diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 94ee99f..c0bf332 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -81,6 +81,7 @@ Aussi réinitialiser le minuteur en réinitialisant le jeux en cours. Bienvenue à Privacy Friendly Sudoku. " " + Version: Ok Aide diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 45dc560..2aafe86 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -53,6 +53,7 @@ 作者: と貢献者。 + バージョン 提携 このアプリケーションは、ダルムシュタット工科大学 (Technische Universität Darmstadt, Germany) が開発したプライバシーフレンドリーアプリのグループに属しています。 ソースコードは GPLv3 の下でライセンスされます。画像の著作権は TU Darmstadt および Google Inc. さらに詳しい情報は以下でご覧ください: diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4f710bb..5897362 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -81,6 +81,7 @@ Сброс таймера при сбросе доски. Добро пожаловать в Privacy Friendly Sudoku. " " + Версия: Ok Помощь diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 8f31fab..52e891b 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -8,6 +8,7 @@ 简单 难 普通 + 挑战 未详细说明的 删除 祝贺！ @@ -82,5 +83,6 @@ " " Ok 帮助 + Version \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e8debba..fd256d4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -57,8 +57,8 @@ Privacy Friendly Sudoku - 2.1.1 - Author: + Version: + Authors: Christopher Beckmann, Timm Lippert and contributors. In affiliation with From 4bcc5d2cf0061dec6c71b8ab4850b82bbbfe2f86 Mon Sep 17 00:00:00 2001 From: Karola Marky Date: Sun, 25 Jun 2017 21:56:40 +0200 Subject: [PATCH 08/16] Cleanup --- .idea/compiler.xml | 22 ------- .idea/copyright/profiles_settings.xml | 3 - .idea/gradle.xml | 18 ------ .idea/misc.xml | 88 --------------------------- .idea/modules.xml | 9 --- .idea/runConfigurations.xml | 12 ---- 6 files changed, 152 deletions(-) delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 7ac24c7..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 50282c1..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - Android - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 3a3eea2..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file From de778f7e8a6233134b7e87d39a312d9bb6397e47 Mon Sep 17 00:00:00 2001 From: Karola Marky Date: Sun, 25 Jun 2017 21:56:52 +0200 Subject: [PATCH 09/16] New gitignore --- .gitignore | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index cd07bc5..2bf4b77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Built application files /*/build/ +build/* # Crashlytics configuations com_crashlytics_export_strings.xml @@ -14,17 +15,7 @@ local.properties .signing/ # User-specific configurations -.idea/libraries/ -.idea/workspace.xml -.idea/tasks.xml -.idea/.name -.idea/compiler.xml -.idea/copyright/profiles_settings.xml -.idea/encodings.xml -.idea/misc.xml -.idea/modules.xml -.idea/scopes/scope_settings.xml -.idea/vcs.xml +.idea/* *.iml # OS-specific files @@ -35,3 +26,12 @@ local.properties .Trashes ehthumbs.db Thumbs.db + +# Documents +*.pdf +*.doc +*.docx +*.odt + +# APKs +*.apk From 8ab60839a58a9030abbc964e5c2c14c0f768b99d Mon Sep 17 00:00:00 2001 From: Karola Marky Date: Sun, 25 Jun 2017 21:57:43 +0200 Subject: [PATCH 10/16] .iml removed --- privacy-friendly-sudoku.iml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 privacy-friendly-sudoku.iml diff --git a/privacy-friendly-sudoku.iml b/privacy-friendly-sudoku.iml deleted file mode 100644 index 18f377d..0000000 --- a/privacy-friendly-sudoku.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file From 9df73f531b322822cee785febb66d862b9d19dff Mon Sep 17 00:00:00 2001 From: Karola Marky Date: Sun, 25 Jun 2017 21:59:27 +0200 Subject: [PATCH 11/16] Version Code update --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 87e81d7..f2c469a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { minSdkVersion 16 targetSdkVersion 25 versionCode 4 - versionName "2.1.1" + versionName "2.1.0" } buildTypes { release { From 426f5c84f475a7b1160da249f94447cfb070c0a5 Mon Sep 17 00:00:00 2001 From: Karola Marky Date: Sun, 25 Jun 2017 22:01:09 +0200 Subject: [PATCH 12/16] Readme update --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 86b186e..7a1f6f9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ## Privacy Friendly Sudoku +[Get it on F-Droid](https://f-droid.org/repository/browse/?fdfilter=sudoku&fdid=org.secuso.privacyfriendlysudoku) + Privacy Friendly Sudoku is a logic based game and belongs to the group of Privacy Friendly Apps developed by Technische Universität Darmstadt, Germany. This app is optimized regarding the user's privacy. It doesn't use any tracking mechanisms, neither it displays any advertisement. @@ -11,11 +13,7 @@ It also does neither include advertisement nor tracking mechanisms. As it is part of the Privacy Friendly Apps developed by the SECUSO research group of the Technische Universtität Darmstadt in Germany it is optimized due to user's privacy. -## Download and more Information - -[Get it on F-Droid](https://f-droid.org/repository/browse/?fdfilter=sudoku&fdid=org.secuso.privacyfriendlysudoku) - -### Building +## Building Further development requires Android Studio, we recommend to use at least version 2.2.3 @@ -40,7 +38,7 @@ The icons ic_trophy_award_black_48dp and ic_trophy_black_48dp are licensed under ## Contributors -App-Icons: +App-Icon: Markus Hau Github-Users:
From 3a0c7bc1216853b45f2f5cd4ecd4a242ae54c4e5 Mon Sep 17 00:00:00 2001 From: Karola Marky Date: Sun, 25 Jun 2017 22:07:38 +0200 Subject: [PATCH 13/16] Placeholders added --- app/src/main/res/values-de/strings.xml | 3 +++ app/src/main/res/values-es/strings.xml | 2 ++ app/src/main/res/values-fr/strings.xml | 2 ++ app/src/main/res/values-ja/strings.xml | 3 +++ app/src/main/res/values-ru/strings.xml | 3 +++ app/src/main/res/values-zh/strings.xml | 2 ++ 6 files changed, 15 insertions(+) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index dff5d26..81344e8 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -92,4 +92,7 @@ Okay Profi + Bildschirm dauerhaft an + Der Bildschirm bleibt während des Spielens an. + \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 9246a5d..39f8c72 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -84,4 +84,6 @@ " " Ok Ayuda + Keep Screen On + Don\'t turn the screen off while playing \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c0bf332..26eb391 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -84,4 +84,6 @@ Version: Ok Aide + Keep Screen On + Don\'t turn the screen off while playing diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2aafe86..9b1d74c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -125,4 +125,7 @@ プライバシーフレンドリー Sudoku はいかなるアクセス許可も使用していません。 OK ヘルプを表示 + + Keep Screen On + Don\'t turn the screen off while playing diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5897362..d405f45 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -84,4 +84,7 @@ Версия: Ok Помощь + + Keep Screen On + Don\'t turn the screen off while playing diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 52e891b..2ee816a 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -85,4 +85,6 @@ 帮助 Version + Keep Screen On + Don\'t turn the screen off while playing \ No newline at end of file From f830ba9d818285d571c6e8f8cb59b970b979fa9f Mon Sep 17 00:00:00 2001 From: Karola Marky Date: Sun, 25 Jun 2017 22:11:39 +0200 Subject: [PATCH 14/16] Changelog added --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f4ef26..155ef1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ Changelog ========== +Version 2.1.0 *(2017-07-25)* +---------------------------- + + * New difficulity level added + * New settings + * DB restructuring + + Version 2.0.1 *(2016-11-07)* ---------------------------- From 7c651ae351ca446344f9dc7e7ac8740c0e5d48fd Mon Sep 17 00:00:00 2001 From: Christopher Beckmann Date: Sun, 25 Jun 2017 22:36:45 +0200 Subject: [PATCH 15/16] Added presaved levels for 12x12 easy difficulty --- .../privacyfriendlysudoku/controller/NewLevelManager.java | 4 ++++ 1 file changed, 4 insertions(+) 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 3ad7c9a..b74319b 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/NewLevelManager.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/NewLevelManager.java @@ -208,6 +208,10 @@ public class NewLevelManager { saveToDb(GameType.Default_9x9, GameDifficulty.Challenge, "040100800059408061700000002500000009080700000007004000000000090801009200000000685"); saveToDb(GameType.Default_9x9, GameDifficulty.Challenge, "007000050300710000140000000000500406001000907000370005790030001060004000005620000"); + saveToDb(GameType.Default_12x12, GameDifficulty.Easy, "29B0087000060070A0039001000A69000023050007000600040020080590600000002108B03C000000040A50800100C00060004000A073000056C000A009300B0200C00001A00B89"); + saveToDb(GameType.Default_12x12, GameDifficulty.Easy, "0000C5B03000003C000804000B64920005C06002080C1A500A0B0000030890000000C70440B800000007209000004030065340C0800201C0007598400080B0002600000609A30000"); + saveToDb(GameType.Default_12x12, GameDifficulty.Easy, "0000000100C0C01000678000000B804570900A35000BC80047BC0020090001203000000000000003041000500100BA7C00C950006230030274081000000A960003070500C0000000"); + saveToDb(GameType.Default_12x12, GameDifficulty.Moderate, "B30050A100701600070030800002894000007008000000B550100004020300B0000090000060000A010000000032050C0407008006A000000000400001000C290000000008005000"); saveToDb(GameType.Default_12x12, GameDifficulty.Moderate, "00B4008A09C002A030C00008007850003000030C000408AB000B00052000000000000070069500030C00B00010467000008000000A100000000800000C0020700001700000095400"); saveToDb(GameType.Default_12x12, GameDifficulty.Moderate, "90B08A00300100A000007B500054000B90000320000C05B0A00C0000090200050200000000000094C2000006000200303140000008006C0800000000003000C0010050007009AC60"); From 77e25602ce6e67b1aedc198cb14974df6260a8ec Mon Sep 17 00:00:00 2001 From: naofum Date: Tue, 27 Jun 2017 23:44:51 +0900 Subject: [PATCH 16/16] updated japanese --- app/src/main/res/values-ja/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9b1d74c..dea5088 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -126,6 +126,6 @@ OK ヘルプを表示 - Keep Screen On - Don\'t turn the screen off while playing + 画面をオンのままにする + プレイ中は画面をオフにしません