Commit graph

494 commits

Author SHA1 Message Date
ErikWaegerle
67e73a6175 Adjusting the SettingsActivity
Here it is checked whether the battery and system have the value true at the same time.
In this case the Battery value is set to false to solve the problem that both options can have
the same value.
2020-07-29 19:54:59 +02:00
ErikWaegerle
954dffca34 Customizing the styles-night.xml
Creating the items "rankingCircleSelected" and "rankingCircleNotSelected.
So that the circle is also visible in Dark Mode.
2020-07-29 19:35:50 +02:00
uykek
b79685f194 Fix bug that caused a NullPointerException in the GameActivity when importing a sudoku 2020-07-26 17:13:02 +02:00
ErikWaegerle
13bd2deee1 Merge branch 'Sudoku-v3.0' of https://github.com/SecUSo/privacy-friendly-sudoku into Sudoku-v3.0 2020-07-22 02:22:19 +02:00
ErikWaegerle
89baff374f 1) Change of the displayed stars (no stars selected) if CheckBox is set to true.
2.)Selecting the playButton starts a new CreateSudoku Intent.
3.)Additionally the button label was changed (CREATE) and "Custom Sudoku" is displayed as difficulty level.
2020-07-22 02:10:15 +02:00
ErikWaegerle
77520b0d72 Adapting the activity_main_menu.xml
A CheckBox was inserted here, as this is better than a button in our case.
Finally, the Checkbox was set up as a circle (vector file).
2020-07-22 01:51:35 +02:00
ErikWaegerle
5668b2a33f Inserting the attributes "rankingCircleSelected" and "rankingCircleNotSelected".
Is identical to "rankingStarSelected" but the new element is not a star.
In addition, the color is adjusted in the colors.xml
2020-07-22 01:39:16 +02:00
ErikWaegerle
b91ea693d9 Insert create_game_src.xml
This is required for the ImageButton. This makes it possible to check the status.
2020-07-22 01:34:01 +02:00
ErikWaegerle
84964dd5e5 Insert the circle as a vector file.
ic_circle_blue and ic_circle_grey have different colors for the case that the circle is selected once and once in the non-selected state.
2020-07-22 01:30:45 +02:00
uykek
3db3110618 Adjust generation of the daily sudoku so that challenges have a lesser probability of being generated than other sudokus, but generating them on the days they do appear won't take as long as before 2020-07-21 10:43:54 +02:00
uykek
a4b80b9ecc Fix a few constraints in the portrait layout of the DailySudokuActivity 2020-07-21 09:50:37 +02:00
uykek
efa6394f57 Override transition when navigating from MainActivity to DailySudokuActivity 2020-07-18 15:46:12 +02:00
uykek
110013f8ca Flatten hierarchy of the DailySudokuActivity's portrait mode layout 2020-07-18 15:43:17 +02:00
ErikWaegerle
a538517900 Customize the Manifest and GameActivity with scheme "http://sudoku.secuso.org".
Make sure that WhatsApp accepts this as a valid link.
2020-07-16 00:50:49 +02:00
uykek
8027b8b409 Only add time and hints used in a Sudoku to HighscoreInfoContainer if sudoku isn't custom 2020-07-14 10:08:42 +02:00
uykek
f9d053a069 If the GameActivity receives an Intent carrying an imported sudoku containing the key 'isCustom', set 'isCustom' attribute of the created GameInfoContainer to 'true' 2020-07-14 09:56:21 +02:00
uykek
54a4024dac Add extra 'isCustom' to Intent from CreateSudokuActivity so that the GameActivity will know that it is handling a custom sudoku 2020-07-14 09:53:03 +02:00
uykek
2df51ac5ba Change the way a custom sudoku is saved (add 'true' at the end of the byte stream) so that the GameStateManager can recognise custom levels when loading the sudokus the user has saved on his device 2020-07-14 09:50:48 +02:00
uykek
1c6be6e5c4 Add boolean 'isCustom' variable to GameInfoContainer and GameController 2020-07-14 09:29:13 +02:00
uykek
b12d085f27 Fix bug in MainActivity that caused the MainActivity to be re-opened, rather than the GameActivity being opened, upon successfully veriying an imported sudoku 2020-07-11 14:42:34 +02:00
uykek
b98014ad88 Fix bug that caused the GameActivity to assign the difficulty "unspecified" to all imported sudokus 2020-07-11 14:33:23 +02:00
uykek
0ccb20ad19 Add string values for the ImportDialogFragment 2020-07-09 08:41:07 +02:00
uykek
61fc0a243a Update layout of the ImportDialogFragment 2020-07-09 08:38:06 +02:00
uykek
ab90d7585b Merge branch 'Sudoku-v3.0' of https://github.com/SecUSo/privacy-friendly-sudoku into Sudoku-v3.0 2020-07-09 08:26:39 +02:00
uykek
863352d621 Fix problem that occured when starting a DialogFragment from the MainActivity's navigation bar 2020-07-09 08:25:31 +02:00
uykek
f53b4ba3fa Change IImportDialogFragmentListener interface 2020-07-09 08:24:49 +02:00
ErikWaegerle
92f2730265 Modify the activity_daily_sudoku.xml/strings.xml
Adjust the text gravity to center and add the German translation
2020-07-07 22:45:32 +02:00
ErikWaegerle
aa4571a124 Adjusting the pref_help_general.xml
add the finalize button and description (German and English) on the help activity
2020-07-07 22:03:08 +02:00
ErikWaegerle
e25da314ff bug fix
Query the current SDK version to avoid complications when setting the switches in older versions.
2020-07-07 18:15:49 +02:00
ErikWaegerle
9982c9f592 Adaptation of the GamePreferenceFragment class
Modify the switches in the SettingsActivity
If Dark Theme has been set manually, Dark Theme is displayed greyed out according to battery and system.
Additionally it is only allowed to set one of both to the Dark theme, not both at the same time.
2020-07-07 16:56:32 +02:00
ErikWaegerle
d1615b4f5f Merge branch 'Sudoku-v3.0' of https://github.com/SecUSo/privacy-friendly-sudoku into Sudoku-v3.0 2020-07-07 13:29:03 +02:00
uykek
553e98367e Add the ImportDialogFragment to the MainActivity. Turn the verification process of the CreateSudokuActivity into a static method that can be used by the ImportDialogFragment. 2020-07-06 09:36:37 +02:00
uykek
ca71badd39 Add new layout and listener for the sudoku import DialogFragment 2020-07-06 09:35:13 +02:00
uykek
26b649e904 Add new 'import sudoku' drawer to main menu and necessary strings to the English and German strings.xml files 2020-07-05 13:43:36 +02:00
uykek
515e922260 Use 'QQWing.hasUniqueSolution()' method instead of 'QQWing.solve()' method for the custom sudoku and import verification 2020-07-05 12:52:29 +02:00
ErikWaegerle
68b402fff7 Inserting the pref_settings_general.xml-v29 file
Allows to load the different layout files for different SDK versions.
For SDK >= 29 pref_settings_general.xml-v29
2020-07-01 21:39:59 +02:00
uykek
2af00fd31c Replace hardcoded URL schemes in GameActivity and CreateSudokuActivity with constants 2020-07-01 18:45:53 +02:00
uykek
47b83dc316 Add Intent to GameActivity to onFinalizeDialogPositiveClick() method of CreateSudokuActivity 2020-07-01 18:35:06 +02:00
uykek
060b2c5740 Fix bug that caused the IFinalizeDialogFragmentListener to be called twice once the FinalizeDialogFragment is attached 2020-06-30 21:13:14 +02:00
uykek
360847f99d Set GameType text view in CreateSudokuActivity 2020-06-30 15:33:27 +02:00
uykek
bf4f839cae Replace hardcoded Strings in the CreateSudokuActivity and the CreateSudokuSpecialButtonLayout with string attributes. 2020-06-30 11:24:04 +02:00
uykek
e420b1b558 Add a FinalizeDialogFragment using the CreateSudokuActivity as an IFinalizeDialogFragmentListener to the CreateSudokuSpecialButtonLayout class. The DialogFragment is called when the user clicks on the 'finalize' button. 2020-06-30 11:07:37 +02:00
uykek
3bbb6576f9 Rename verify() method of CreateSudokuActivity so that it implements the onFinalizaDialogPositiveClick() method of the previously added interface and add the onDialogNegativeClick() method. 2020-06-30 10:48:24 +02:00
uykek
8d19a2239d Add a listener interface for the finalization dialog of the CreateSudokuActivity 2020-06-30 10:42:09 +02:00
uykek
83a148887f Delete CreateGameActivity dummy class. 2020-06-30 10:34:57 +02:00
uykek
4bd4ec78f1 Replace stroke and fill color of finalize drawable with theme attributes 2020-06-30 10:33:32 +02:00
uykek
c41ca657fd Replace placeholder layout in CreateSudokuActivity with the CreateSudokuActivity layout 2020-06-30 10:22:51 +02:00
uykek
bc047addea Add private verification method to CreateSudokuActivity 2020-06-30 10:14:30 +02:00
uykek
bc88df46f1 Delete dummy activity from manifest 2020-06-30 10:08:38 +02:00
uykek
caf3bf3f9f Merge branch 'Sudoku-v3.0' of https://github.com/SecUSo/privacy-friendly-sudoku into Sudoku-v3.0 2020-06-30 10:07:17 +02:00