joel/privacy-friendly-sudoku-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
283 commits 1 branch 0 tags 3 MiB
Commit graph

251 commits

Author SHA1 Message Date
Gongxter
06dd3fa9fa Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
 2016-01-31 14:24:53 +01:00
Christopher Beckmann
229f167c2e Fixed the Delete Button. It would not delete notes. 2016-01-31 14:10:33 +01:00
Christopher Beckmann
a4e7a693f9 Corrected Parceable Implementation. Wasn't aware that my code was not called. Had to force it to clear the app out of the memory. 2016-01-31 12:46:22 +01:00
Christopher Beckmann
54bf935685 Modified the Landscape GameView a bit. Looks a lot cleaner now. Not tested on smaller and bigger devices yet. Also added the landscape version of the stats page. 2016-01-31 01:06:34 +01:00
Gongxter
c4d2999680 winscreen and helppage created 2016-01-30 23:20:05 +01:00
Christopher Beckmann
91530e3efa Made the GameActivity Rotatable. (Sounds easy.... wasn't though) 2016-01-30 23:05:32 +01:00
Christopher Beckmann
1b31b5cfe2 Added some Layouts for landscape ordientation as well as some for high density screens. 
Also made the arrows in the main menu clickable.
 2016-01-30 12:38:26 +01:00
Christopher Beckmann
65e5dbe5fc Solved Issue #3, #2 and fixed an Android 6.0 specific bug, that would prevent the UI from updating when changes to the gameboard were made. 
Also corrected the keyboard layout.
 2016-01-28 19:37:22 +01:00
Gongxter
b25b55afb7 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	app/src/main/java/org/secuso/privacyfriendlysudoku/controller/SaveLoadStatistics.java
#	app/src/main/res/values/strings.xml
 2016-01-21 16:55:24 +01:00
Gongxter
4724612c1e stats reworked fixed a bug 2016-01-21 16:52:08 +01:00
Christopher Beckmann
e975d9277a Runnable again. Fixed imports. 2016-01-21 16:50:20 +01:00
Christopher Beckmann
f24a0866e4 Russian added as well. Translation following soon. 2016-01-21 16:44:23 +01:00
Christopher Beckmann
cd1b9ece7b Merge remote-tracking branch 'origin/master' 2016-01-21 16:36:23 +01:00
Christopher Beckmann
7b84ce0232 Updated language files and added new ones for Spanish and Chinese. 2016-01-21 16:36:08 +01:00
Gongxter
3d110b57c5 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	app/src/main/java/org/secuso/privacyfriendlysudoku/controller/SaveLoadStatistics.java
#	app/src/main/res/drawable/standalone_button.xml
 2016-01-21 16:12:57 +01:00
Christopher Beckmann
8db2f6ec91 Added some strings and HintListener 2016-01-21 16:08:48 +01:00
Gongxter
8b98f2531d timer now always counts in stats 2016-01-21 15:39:00 +01:00
Christopher Beckmann
06deb5b439 Fixed Issue#6 and fixed an activity stack bug, that caused the app to have multiple main menus in the stack. 2016-01-21 14:26:59 +01:00
Gongxter
01b3e37ce1 keyboard now with linear layout 2016-01-21 13:55:46 +01:00
Gongxter
b6787846e6 Merge remote-tracking branch 'origin/master' 2016-01-20 09:43:53 +01:00
Gongxter
48535eedd6 small changes 2016-01-20 09:43:23 +01:00
Christopher Beckmann
92c035f860 Fixed a lot of stuff.. and added ... stuff....... yay. 2016-01-19 15:15:47 +01:00
Christopher Beckmann
29028c39f5 Symbol Map selectable in settings. 2015-12-20 16:26:41 +01:00
Christopher Beckmann
0d4a222cfc Value and Note Highlighting with settings done. Also you can now select values and put them in that way. 2015-12-19 19:00:41 +01:00
Gongxter
f205532ed4 added DialogeFragment for WinScreen 2015-12-11 14:48:27 +01:00
Gongxter
97becd93e5 edit the notes location in a cell to an dynamic one added rotation for the drawable pen in note button Blue TU Theme should now be finished 2015-12-10 13:37:04 +01:00
Gongxter
3714a321d9 Blue TU Theme added and drawables with first attempt to add animation to drawable 2015-12-07 14:29:37 +01:00
Gongxter
1a58a9b7cc designs updated to Blue TU Theme 2015-12-02 14:23:17 +01:00
Gongxter
7242345a21 Edit Buttons and slideshow with arrows 2015-11-30 18:02:00 +01:00
Gongxter
f28217bf46 Stats: Changed Average time and min time per difficulty to only games without Hints used 2015-11-26 14:21:25 +01:00
Gongxter
5e8c1bd2b1 Stats added 2015-11-26 13:21:44 +01:00
Christopher Beckmann
ab152917d1 Renamed some files. 2015-11-25 00:32:29 +01:00
Christopher Beckmann
31144449c7 Undo/Redo Feature added. States are not saved through sessions. They build up for every play session you start. 2015-11-24 23:59:52 +01:00
Christopher Beckmann
d2bed7b2a5 You can now delete entries in the continue game screen by long clicking them. 2015-11-24 12:32:36 +01:00
Christopher Beckmann
e2ecfe9292 Redesigned the Continue Game Screen. Also the list is now sorted and only the top 10 recent played games are saved. All the others are deleted. 2015-11-24 11:06:39 +01:00
Christopher Beckmann
7d2ec4abae Now pre generating levels in the background when starting the app, so when the user chooses a level it will be loaded instantly. 
We are storing up to 5 levels per gametype and difficulty and whenever the user picks a level we start generating the next ones already.
Since generating a 12x12 level can take a very long time. This is the workaround we have so far. If we still run into the problem of having to wait for 12x12 levels to generate. I will consider removing the 12x12 Gamemode alltogether.
 2015-11-23 18:48:04 +01:00
Christopher Beckmann
b875a66ab5 Generator now works for every Difficulty and GameType. I had to change the generator for the 12x12 Generation to leave more clues because it had a very hard time generating levels for the "easy" difficulty level. 
It's not very pretty but it works in a reasonable time. Before it would just turn black and stay that way for half an hour.
 2015-11-22 17:45:17 +01:00
Christopher Beckmann
606625d08b Generator now works for 6x6.. Working on 12x12 now... thought I might have fixed both at the same time, but 12x12 is not working. 2015-11-22 15:57:41 +01:00
Christopher Beckmann
afc39b78e0 QQWing Solver now works for 6x6. Still a lot of work left. 2015-11-22 14:34:07 +01:00
Christopher Beckmann
2a652c7e12 Tried to integrate the QQGenerator. It's somehow working for 9x9 Games, but all the others are not working yet. Have to look at that at again. 2015-11-21 21:29:23 +01:00
Christopher Beckmann
fc992778a0 Timer is now being saved when loading a game. 2015-11-20 21:57:34 +01:00
Gongxter
b4fb350fa0 Timer now in GameController and saves 2015-11-20 14:42:14 +01:00
Gongxter
87ec3902a0 Timer and GameDescription added 2015-11-19 15:38:50 +01:00
Christopher Beckmann
327f9a6c66 Bugfix. Runnable again. 2015-11-19 15:33:29 +01:00
Christopher Beckmann
86581ffd8e Added an IGameSolvedListener. The GameActivity now listens for it. 2015-11-19 14:38:41 +01:00
Christopher Beckmann
643c45070f Removed ISolver since we are not implementing different solvers. 
Corrected GameController listening to GameCells.
 2015-11-19 14:31:18 +01:00
Gongxter
8089adf862 Changed GameType Enum to hold al the relevant information for that GameType. Added Timer to the GameView. 2015-11-19 14:15:54 +01:00
Christopher Beckmann
c7e7f1d88c Merge remote-tracking branch 'origin/master' 
Conflicts:
	app/src/main/java/tu_darmstadt/sudoku/controller/Symbol.java
 2015-11-19 13:41:33 +01:00
Christopher Beckmann
02419e1028 Added Game Difficulty Enum. The Difficulty Selection now checks the enum for valid difficulty types and sets itself automaticly. Added IModelChangeListeners to the GameCells. 2015-11-19 13:41:01 +01:00
Gongxter
ad5a873bf9 Button sizing fixed added timer 2015-11-19 11:19:32 +01:00
Christopher Beckmann
f1ef933963 Solved a Bug in the Solver. When solving Levels that have multiple solutions it would set wrong values. (Off by 1 error) 2015-11-18 13:15:29 +01:00
Christopher Beckmann
07ea26114e HighscoreInfoContainer hinzugefügt. 2015-11-18 12:06:01 +01:00
Christopher Beckmann
4c00ffec1c Bugfix 2015-11-18 11:46:26 +01:00
Christopher Beckmann
40aab36624 Hint Button is now working and will reveal the selected cell for you. 
Not sure if I should check the board for errors as well.
 2015-11-18 04:22:35 +01:00
Christopher Beckmann
cc92454cc6 Implemented the backtracking strategy for the Sudoku Solver. 
JUnit tests are running. Still need to add more logic strategies.
 2015-11-18 03:54:33 +01:00
Christopher Beckmann
6ad5832538 Game is now saved every time the model is changed. 2015-11-17 15:47:24 +01:00
Christopher Beckmann
0370fdad4e Merge remote-tracking branch 'origin/master' 
Conflicts:
	app/src/main/res/layout/activity_main_menu.xml
 2015-11-17 15:43:32 +01:00
Christopher Beckmann
328cc583cc Added the LoadGame Activity. 
Added a Symbol Map to solve issues with saving 2 digit values to file.
LoadGame Activity is now also working.
 2015-11-17 15:42:32 +01:00
Gongxter
f8ab4d7cce Boderless Style removed again 2015-11-17 15:12:56 +01:00
Gongxter
4bfdf01a9a Bordeless Style added and Still not figured out how to set Text Size correct 2015-11-17 14:53:20 +01:00
Gongxter
d3abad12a2 Buttons rearanged and and Note High low size added 2015-11-17 13:53:29 +01:00
Christopher Beckmann
ca73b34f3a Added new icons for the main menu. 2015-11-17 06:16:56 +01:00
Christopher Beckmann
5ba2ee98a1 LevelLoad from File implemented. 
LevelSave to File implemented.
We can now continue a saved level.
Choice of GameType and difficulty is now saved through App restarts.
 2015-11-17 05:43:59 +01:00
Christopher Beckmann
93cf408ea5 Bugfix in MainActivity. 2015-11-16 23:32:35 +01:00
Christopher Beckmann
e640ae9b31 Added File Manager. Not working yet. 2015-11-16 23:26:28 +01:00
Christopher Beckmann
1e482e68f5 Reworked Main menu. 2015-11-16 18:02:31 +01:00
Gongxter
7feef3cf65 merged 2015-11-15 13:16:45 +01:00
Gongxter
08a16160e0 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	app/src/main/java/tu_darmstadt/sudoku/ui/GameActivity.java
 2015-11-15 13:15:37 +01:00
Christopher Beckmann
6629c3d9a6 Corrected Keyboard to always take the remaining space available. 
Fixed Delete button.
 2015-11-15 13:14:14 +01:00
Gongxter
fddd7d742b Hotfix für Fixed Button Row now only available buttons are shown height fixed by Chris 2015-11-15 13:10:29 +01:00
Gongxter
8a170f88bf Hotfix für Fixed Button Row 2015-11-15 12:50:12 +01:00
Gongxter
45ed0fc2da Merge remote-tracking branch 'origin/master' 2015-11-15 12:38:28 +01:00
Christopher Beckmann
e18dd1062c Bugfix 2015-11-15 12:38:15 +01:00
Gongxter
b3ddbb8d31 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	app/src/main/java/tu_darmstadt/sudoku/ui/GameActivity.java
 2015-11-15 12:36:03 +01:00
Gongxter
d045a1a401 KeyBoard with fixed buttons added and fixed the allocation 2015-11-15 12:34:07 +01:00
Christopher Beckmann
94f183f95b Added the NewGame screen. No real settings available yet. 2015-11-15 12:18:22 +01:00
Christopher Beckmann
54b9de3e22 Merged. Also Added an Enum for Button Types. 
Extended the GameController with additional functions for the view.
 2015-11-15 10:33:17 +01:00
Gongxter
163e64810e Added KeyBoard and is now Playable 2015-11-14 20:18:20 +01:00
Christopher Beckmann
403522c5b3 Bug fix. I hate crashes :) 2015-11-13 14:56:32 +01:00
Gongxter
0a0febe781 Readded GameActivity. No idea why it was deleted from git. 2015-11-13 14:50:00 +01:00
Gongxter
f7ed0dd922 Bugfix so it is runnable. 2015-11-13 14:48:23 +01:00
Gongxter
74b1b0bbdd Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	app/src/main/AndroidManifest.xml
 2015-11-13 14:44:06 +01:00
Gongxter
e8428751f1 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/tu_darmstadt/sudoku/ui/GameActivity.java
#	app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuCellView.java
 2015-11-13 14:43:04 +01:00
Christopher Beckmann
8d2358b5aa Bug fix. 2015-11-13 14:40:58 +01:00
Gongxter
81ddad4745 UI KeyBoard 2015-11-13 13:45:09 +01:00
Christopher Beckmann
f43803ad46 Added a new solve strategy to the Solver. 
Added new settings that will work across the app.
Cleaned up code.
Added about page.
 2015-11-13 13:43:58 +01:00
Gongxter
96a0b1d7ba UI KeyBoard 2015-11-13 13:40:36 +01:00
Christopher Beckmann
fcf095c3dd Merge remote-tracking branch 'origin/master' 
Conflicts:
	app/src/main/java/tu_darmstadt/sudoku/view/SudokuCellView.java
 2015-11-12 14:29:10 +01:00
Christopher Beckmann
8566f4341c Added Cell Selection and Highlighting of Connected Cells. 2015-11-12 14:18:42 +01:00
Gongxter
1b6738f375 UI Notes added 2015-11-12 14:13:31 +01:00
Christopher Beckmann
a8486fe5a2 Cleaned up code and made GameView prettier. :) 2015-11-12 11:24:16 +01:00
Christopher Beckmann
f4ea6bf66b GameView can now show the GameBoard correctly. Interactions are not yet possible. 2015-11-12 01:50:38 +01:00
Gongxter
add419fa01 UI changes. 2015-11-11 18:20:02 +01:00
Christopher Beckmann
c7402d1196 Updated Model, Solver and GameController. 2015-11-11 16:02:13 +01:00
Christopher Beckmann
b9dcf4e2d2 Merge remote-tracking branch 'origin/master' 
Conflicts:
	app/src/main/AndroidManifest.xml
 2015-11-11 14:31:43 +01:00
Christopher Beckmann
b0dd182ffe Added basic Solver (not working yet) 
updated GameController, GameCell and GameField - added functionality
 2015-11-11 14:30:55 +01:00
Gongxter
b2f9cd215b Multilanguage for german English 
First GUI samples
 2015-11-11 14:28:24 +01:00
Christopher Beckmann
bd474e3280 Rewrote CellConflict Detection. 
Added additional JUnit Tests
 2015-11-10 10:53:16 +01:00
Christopher Beckmann
b5dc145bb7 Redesigned a bit of the model. 
Added JUnit Tests for GameController.
Added a GameView, that doesn't show the game yet though.
 2015-11-10 03:21:02 +01:00
Christopher Beckmann
351bb3bc2d Removed Errors, so it could be compiled. 2015-11-09 13:20:27 +01:00
Christopher Beckmann
b4a651a332 First Commit. Adding some Source code. 2015-11-09 12:41:46 +01:00