Commit graph

45 commits

Author SHA1 Message Date
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