Commit graph

395 commits

Author SHA1 Message Date
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
ErikWaegerle
8d72312575 Merge branch 'Sudoku-v3.0' of https://github.com/SecUSo/privacy-friendly-sudoku into Sudoku-v3.0 2020-06-30 00:14:10 +02:00
ErikWaegerle
66a620f5f8 Creating the dummy class CreateGameActivity
Utility class to display the layout and not to have to customize GameActivity.
Can be deleted!
2020-06-30 00:07:07 +02:00
ErikWaegerle
0e4a03c94a Create the CreateSudokuButtonLayout class.
Is identical to the SudokuSpecialButtonLayout slight modification to cover different cases.
Provides the display of the different button types.
2020-06-30 00:00:52 +02:00
ErikWaegerle
ff8b9b9559 Creating the CreateSudokuSpecialButton class
Modification for CreateSudokuButtonType.
2020-06-29 23:49:54 +02:00
ErikWaegerle
0bf7e70e28 Creating the CreateSudokuButtonType
The class contains the button types that are needed for the CreateSudoku.
The hint button was removed from the list and the finalize button was added.
2020-06-29 23:45:55 +02:00
ErikWaegerle
efee6374d8 Creating the content_game_view_create_sudoku.xml
The layout shows the playing field and contains the buttons.
2020-06-29 23:40:48 +02:00
ErikWaegerle
df34a57f90 Placeholder in Manifest.xml
Create a new activity (CreateGameActivity) to test the layout.
2020-06-29 23:34:45 +02:00
ErikWaegerle
f2bbc38f14 Customization of the CreateSudoku layout
Remove the time and the difficulty level in the ActionBar of the "CreateSudoku" display.
&
Include the content_game_view_create_sudoku
2020-06-29 23:16:05 +02:00
ErikWaegerle
4d976abe16 Added a vector graphic for the "Finish" button for the Create Sudoku activity. 2020-06-29 18:00:27 +02:00
ErikWaegerle
edc16b8cec Creating the layout xml file for the "Create Sudoku" activity. 2020-06-29 17:57:47 +02:00
ErikWaegerle
e832e6c4ac Adjustment of the MainActivity, so that DarkTheme is still active with the activated battery or system status option. Dark Theme will remain if the app is closed. 2020-06-29 15:33:10 +02:00
ErikWaegerle
38a708821a Adjusting the Settings Activity
Implementation of the case distinction for manual modification of the Dark Theme. It is possible to adjust the Dark Theme according to battery status or system settings.
2020-06-29 15:25:19 +02:00
uykek
abc34b899c Implement onCreate method of CreateSudokuActivity (for now using the button layouts of the GameActivity) 2020-06-25 16:17:28 +02:00
ErikWaegerle
eb78716249 Adjustment in pref_settings_general
Creating the two switches for "automatic by system" and "automatic by battery"
2020-06-24 20:44:47 +02:00
ErikWaegerle
01865b1741 Adaptation of the pref_settings_general.xml
Creating a preferenceSettings category for different settings of the DarkTheme
2020-06-24 19:21:50 +02:00
uykek
b30ae90237 Override the onResume() and onBackPressed() methods of the CreateSudokuActivity 2020-06-24 19:18:45 +02:00
uykek
9b9670c965 Add new activity for creating custom sudokus 2020-06-24 19:02:35 +02:00
ErikWaegerle
50f7260717 Adaptation of the GameActivity
Dark Theme remains activated
In case the GameActivity is loaded first by clicking a sudoku:// link
2020-06-24 18:47:01 +02:00
ErikWaegerle
73e7fa3958 Adaptation of the MainActivity
is loaded in Main Activity, that the dark theme remains activated when the app is opened again
2020-06-24 18:36:33 +02:00
ErikWaegerle
1106ee84bb Adjusting the SettingsActivity
Case discrimination with AppCompatDelegate to cover both cases.
2020-06-24 16:37:59 +02:00
ErikWaegerle
650bd797ba Extension of pref_settings_general.xml with a switch. This is used to activate/deactivate the dark theme.
Adaptation to German and English language
2020-06-24 16:33:44 +02:00
uykek
0f5ef95c01 Fix problem with previously added method that caused the generation of a challenge sudoku as the daily sudoku to be more, rather than less, likely 2020-06-22 10:22:04 +02:00
uykek
f2aa3460ff Modify NewLevelManager's loadDailySudoku() method so that the probability of the daily sudoku's difficulty being 'challenge' is only 10% 2020-06-17 18:33:59 +02:00
ErikWaegerle
c115b6c990 Merge branch 'Sudoku-v3.0' of https://github.com/SecUSo/privacy-friendly-sudoku into Sudoku-v3.0 2020-06-15 18:44:15 +02:00
ErikWaegerle
652095f975 Move the DailySudokuActivity to org.secuso.privacyfriendlysudoku.ui package 2020-06-15 13:55:49 +02:00
uykek
87a80de4b5 Change launchmode of GameActivityto 'singleTask' and add onNewIntent method to GameActivity 2020-06-15 09:05:56 +02:00
ErikWaegerle
c8a6385e64 Adaptation of the GameActivity and Manifest.xml to include deeplinking
Links of the following format
"http://sudoku" also accepted and loaded as game field
2020-06-13 20:16:51 +02:00
ErikWaegerle
bf9aee31ed Merge branch 'Sudoku-v3.0' of https://github.com/SecUSo/privacy-friendly-sudoku into Sudoku-v3.0 2020-06-13 18:31:17 +02:00
uykek
a8629fc75c Adjust GameInfoContainer and GameActivity so that importing a sudoku containing an invalid fixed value (e.g. a 9x9 sudoku containing an 'A' as a fixed value) no longer causes an exception. 2020-06-13 15:56:37 +02:00
uykek
80fa401666 Adjust size of view element of DailySudokuActivity's landscape layout to match the regular layout more closely 2020-06-13 15:44:43 +02:00
uykek
6c8848b803 Flatten layout hierarchy of the DailySudokuActivity landscape layout 2020-06-12 15:23:14 +02:00
ErikWaegerle
c06968d217 Introduction of new attributes to change the background color (DarkMode/DayMode) of the tutorial slides (1-3) 2020-06-09 23:52:34 +02:00
ErikWaegerle
ee548697eb Adjusting the background color for Tutorial Slide 1-3 2020-06-08 01:38:19 +02:00
ErikWaegerle
2b7bf3cef0 Merge branch 'Sudoku-v3.0' of https://github.com/SecUSo/privacy-friendly-sudoku into Sudoku-v3.0 2020-06-08 01:32:22 +02:00
ErikWaegerle
c65a126a65 delete the statement android:textColor 2020-06-07 21:49:37 +02:00
uykek
3d8cae11b6 Add landscape layout for the DailySudokuActivity 2020-06-07 16:17:38 +02:00
ErikWaegerle
f3225d9832 Update version:
Deletion of the resource color files for the coloring of the selected element
->will be changed from blue to grey
Delete the corresponding attributes and reverse the styles/night.xml
2020-06-07 14:58:23 +02:00
uykek
8dfa0f5317 Change onCreate() method of DailySudokuActivity so that the difficulty of the daily sudoku is only calculated once a day 2020-06-07 11:40:45 +02:00
uykek
05cc8aec51 Add new dialog style to all AlertDialog instances within the app 2020-06-07 10:34:23 +02:00
uykek
3232c7eb3f Replace font theme attribute of the win_screen_layout with new theme attribute 2020-06-07 10:32:43 +02:00
uykek
5b3db3342a Add new theme attribute and style to configure specific layouts for the night mode 2020-06-07 10:31:56 +02:00
ErikWaegerle
994d85947f Merge branch 'Sudoku-v3.0' of https://github.com/SecUSo/privacy-friendly-sudoku into Sudoku-v3.0 2020-06-07 10:25:30 +02:00
ErikWaegerle
b98c930517 Color adjustment in the Navigation Drawer (blue background)
Introduction of the resources color files to define the color matching of the selected item
Creating the appropriate attributes and customizing the styles/night.xml
2020-06-07 10:21:19 +02:00
ErikWaegerle
7441559a11 Color adjustment of the background of the tutorial slides (1-3) for the dark mode 2020-06-06 16:33:06 +02:00
ErikWaegerle
29362a4188 Secuso_logo_blau.png delete and replace with vector file
Color adjustment of the vector file for dark mode
2020-06-06 16:08:13 +02:00
uykek
4e2b89db69 Remove white border around numfirst.png and numfull.png 2020-06-06 14:49:52 +02:00
uykek
9fdeba1767 Slightly tweak path of the blue star vector drawable so that it matches the path of the grey star vector drawable exactly 2020-06-06 14:48:22 +02:00
uykek
d76c4b7b50 Fix bug which causes vector graphics which receive their color from theme attributes to appear invisible when placed on an image button. 2020-06-06 12:51:39 +02:00
uykek
e31add2adf Add standard background color for dark theme as #121212 2020-06-06 10:22:33 +02:00
uykek
0356687ee0 Fix bug that was caused by a theme attribute in splash_screen.xml 2020-06-03 17:05:39 +02:00
uykek
a47443ce99 Replace color references with attributes in the following vector drawables: 2020-06-03 16:22:02 +02:00
ErikWaegerle
a698099e81 The color references of the following vector graphics have been replaced 2020-06-03 13:42:47 +02:00
uykek
34d3d40f0a Rename night mode style.xml file and move it to values-night directory 2020-06-03 12:41:40 +02:00
uykek
81ca1b4374 Add <resources>-night counterpieces of the style.xml files. 2020-06-03 10:31:24 +02:00
ErikWaegerle
b7189338f7 The color references of the following layouts files have been replaced by attribute references 2020-06-03 00:36:59 +02:00
ErikWaegerle
e366bccee9 Merge branch 'Sudoku-v3.0' of https://github.com/SecUSo/privacy-friendly-sudoku into Sudoku-v3.0 2020-06-02 21:22:22 +02:00
uykek
ebcca01f52 Replace color references in the win screen layout and stats fragment layout with attribute references 2020-06-02 21:16:00 +02:00
uykek
d587b4b2dc Add all the theme attributes which are necessary for the win screen layout. 2020-06-02 21:13:02 +02:00
ErikWaegerle
ef344db759 The color references of the following vector files have been replaced by attribute references 2020-06-02 20:39:32 +02:00