From c06968d217893c63374c23e3a5a011bd6b212f40 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Tue, 9 Jun 2020 23:52:34 +0200
Subject: [PATCH 01/20] Introduction of new attributes to change the background
 color (DarkMode/DayMode) of the tutorial slides (1-3)

---
 app/src/main/res/layout/tutorial_slide1.xml | 2 +-
 app/src/main/res/layout/tutorial_slide2.xml | 2 +-
 app/src/main/res/layout/tutorial_slide3.xml | 4 ++--
 app/src/main/res/values-night/styles.xml    | 2 ++
 app/src/main/res/values/attrs.xml           | 2 ++
 app/src/main/res/values/styles.xml          | 2 ++
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/tutorial_slide1.xml b/app/src/main/res/layout/tutorial_slide1.xml
index c24dd62..880eea7 100644
--- a/app/src/main/res/layout/tutorial_slide1.xml
+++ b/app/src/main/res/layout/tutorial_slide1.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorAccent">
+    android:background="?attr/backgroundTutorialSlide">
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/tutorial_slide2.xml b/app/src/main/res/layout/tutorial_slide2.xml
index 337a7d4..b8343b4 100644
--- a/app/src/main/res/layout/tutorial_slide2.xml
+++ b/app/src/main/res/layout/tutorial_slide2.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorAccent">
+    android:background="?attr/backgroundTutorialSlide">
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/tutorial_slide3.xml b/app/src/main/res/layout/tutorial_slide3.xml
index 1042d98..0af0729 100644
--- a/app/src/main/res/layout/tutorial_slide3.xml
+++ b/app/src/main/res/layout/tutorial_slide3.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorAccent">
+    android:background="?attr/backgroundTutorialSlide">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -30,7 +30,7 @@
             android:numStars="4"
             android:layout_marginTop="25dp"
             android:rating="1"
-            android:background="?attr/lightestFontColor"
+            android:background="?attr/backgroundTutorialStars"
             android:stepSize="1"
             style="@style/RatingBar"/>
 
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 5ca9ee4..81dbff3 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -20,6 +20,8 @@
         <item name="inactiveButtonColor">@color/middlegrey</item>
         <item name="highlightedButtonBorder">@color/yellow</item>
         <item name="android:itemBackground">@color/cardview_dark_background</item>
+        <item name="backgroundTutorialSlide">@color/colorPrimaryDark</item>
+        <item name="backgroundTutorialStars">@color/colorPrimaryDark</item>
     </style>
 
     <style name="ToolbarStyle" parent="Widget.AppCompat.ActionBar">
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 488146d..50a3ac5 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -12,5 +12,7 @@
         <attr name="inactiveButtonColor" format="color"/>
         <attr name="activeButtonColor" format="color"/>
         <attr name="highlightedButtonBorder" format="color"/>
+        <attr name="backgroundTutorialSlide" format="color"/>
+        <attr name="backgroundTutorialStars" format="color"/>
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 89f20f9..8bf15ad 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,6 +18,8 @@
         <item name="inactiveButtonColor">@color/middlegrey</item>
         <item name="highlightedButtonBorder">@color/yellow</item>
         <item name="actionBarTheme">@style/ToolbarStyle</item>
+        <item name="backgroundTutorialSlide">@color/colorAccent</item>
+        <item name="backgroundTutorialStars">@color/white</item>
     </style>
 
     <style name="ToolbarStyle" parent="Widget.AppCompat.ActionBar">

From c8a6385e64e0eb67bf2595fc89e5e54f6892c376 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Sat, 13 Jun 2020 20:16:51 +0200
Subject: [PATCH 02/20] Adaptation of the GameActivity and Manifest.xml to
 include deeplinking

Links of the following format
"http://sudoku" also accepted and loaded as game field
---
 app/src/main/AndroidManifest.xml                       |  9 +++++++++
 .../secuso/privacyfriendlysudoku/ui/GameActivity.java  | 10 ++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a1cc005..28b847d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,12 +44,21 @@
             android:label="@string/title_activity_game_view"
             android:theme="@style/AppTheme.NoActionBar">
 
+            <intent-filter >
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http"
+                      android:host="sudoku" />
+            </intent-filter>
+
             <intent-filter >
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="sudoku" />
             </intent-filter>
+
         </activity>
         <activity android:name="org.secuso.privacyfriendlysudoku.ui.AboutActivity" />
         <activity android:name="org.secuso.privacyfriendlysudoku.ui.LoadGameActivity" />
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 bf6e48b..8bf32de 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
@@ -115,8 +115,13 @@ public class GameActivity extends BaseActivity implements NavigationView.OnNavig
                     (extras.containsKey("gameType") || extras.containsKey("loadLevel"));
 
             if (data != null && !intentReceivedFromMainActivity) {
-                String input = data.toString();
-                input = input.replace("sudoku://", "");
+                String input = "";
+                if (data.getScheme().equals("sudoku")){
+                    input = data.getHost();
+                } else if (data.getScheme().equals("http") && data.getHost().equals("sudoku")){
+                    input = data.getPath();
+                    input =input.replace("/", "");
+                }
 
                 int sectionSize = (int)Math.sqrt(input.length());
                 int boardSize = sectionSize * sectionSize;
@@ -364,6 +369,7 @@ public class GameActivity extends BaseActivity implements NavigationView.OnNavig
 
             case R.id.menu_share:
                 String codeForClipboard = "sudoku://" + gameController.getCodeOfField();
+                String codeForClipboard1 = "http://sudoku" + gameController.getCodeOfField();
                 ShareBoardDialog shareDialog = new ShareBoardDialog();
                 shareDialog.setDisplayCode(codeForClipboard);
                 shareDialog.setCopyClickListener(new View.OnClickListener() {

From 652095f975ae799422f45a6d4d4f12e9c201f077 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Mon, 15 Jun 2020 13:55:49 +0200
Subject: [PATCH 03/20] Move the DailySudokuActivity to
 org.secuso.privacyfriendlysudoku.ui package

---
 app/src/main/AndroidManifest.xml                         | 2 +-
 .../ui/{view => }/DailySudokuActivity.java               | 9 +++------
 .../secuso/privacyfriendlysudoku/ui/MainActivity.java    | 2 --
 3 files changed, 4 insertions(+), 9 deletions(-)
 rename app/src/main/java/org/secuso/privacyfriendlysudoku/ui/{view => }/DailySudokuActivity.java (96%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 28b847d..b69f4f1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,7 +31,7 @@
             android:theme="@style/AppTheme.NoActionBar">
         </activity>
         <activity
-            android:name="org.secuso.privacyfriendlysudoku.ui.view.DailySudokuActivity"
+            android:name="org.secuso.privacyfriendlysudoku.ui.DailySudokuActivity"
             android:label="@string/Sudoku"
             android:theme="@style/AppTheme.NoActionBar">
         </activity>
diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/DailySudokuActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/DailySudokuActivity.java
similarity index 96%
rename from app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/DailySudokuActivity.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/DailySudokuActivity.java
index d8800a1..43aa30a 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/DailySudokuActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/DailySudokuActivity.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlysudoku.ui.view;
+package org.secuso.privacyfriendlysudoku.ui;
 
 import android.content.Context;
 import android.content.Intent;
@@ -18,20 +18,17 @@ import android.view.View;
 import android.widget.RatingBar;
 import android.widget.Toast;
 import org.secuso.privacyfriendlysudoku.controller.GameController;
-import org.secuso.privacyfriendlysudoku.controller.GameStateManager;
 import org.secuso.privacyfriendlysudoku.controller.NewLevelManager;
 import org.secuso.privacyfriendlysudoku.controller.database.DatabaseHelper;
 import org.secuso.privacyfriendlysudoku.controller.database.model.DailySudoku;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import org.secuso.privacyfriendlysudoku.controller.SaveLoadStatistics;
-import org.secuso.privacyfriendlysudoku.controller.helper.GameInfoContainer;
 import org.secuso.privacyfriendlysudoku.controller.qqwing.QQWing;
 import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
 import org.secuso.privacyfriendlysudoku.game.GameType;
-import org.secuso.privacyfriendlysudoku.ui.GameActivity;
-import org.secuso.privacyfriendlysudoku.ui.SettingsActivity;
-import org.secuso.privacyfriendlysudoku.ui.StatsActivity;
+import org.secuso.privacyfriendlysudoku.ui.view.R;
+
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.List;
diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
index 4a378c4..a872a5b 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
@@ -13,7 +13,6 @@ import androidx.core.view.GravityCompat;
 import androidx.viewpager.widget.ViewPager;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -30,7 +29,6 @@ import org.secuso.privacyfriendlysudoku.controller.NewLevelManager;
 import org.secuso.privacyfriendlysudoku.controller.helper.GameInfoContainer;
 import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
 import org.secuso.privacyfriendlysudoku.game.GameType;
-import org.secuso.privacyfriendlysudoku.ui.view.DailySudokuActivity;
 import org.secuso.privacyfriendlysudoku.ui.view.R;
 
 import java.util.LinkedList;

From 650bd797ba5dcfccc57e497c2331a4bc5e9d5dc6 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Wed, 24 Jun 2020 16:33:44 +0200
Subject: [PATCH 04/20] Extension of pref_settings_general.xml with a switch.
 This is used to activate/deactivate the dark theme. Adaptation to German and
 English language

---
 app/src/main/res/values-de/strings.xml         | 3 +++
 app/src/main/res/values/strings.xml            | 5 +++++
 app/src/main/res/xml/pref_settings_general.xml | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1285f24..05fbbd2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -10,6 +10,9 @@
 
     <!-- Strings related to Settings -->
     <string name="title_activity_settings">Einstellungen</string>
+    <string name="pref_dark_mode">Nachtmodus</string>
+    <string name="pref_dark_mode_setting">Nachtmodus</string>
+    <string name="pref_dark_mode_summary">Wechsel zwischen Tages und Nacht Modus</string>
 
     <!-- About Page -->
     <string name="about_affiliation">In Zusammenarbeit mit:</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a89e2c..1334060 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,6 +30,7 @@
     <string name="pref_group_highlight_value">Value highlight</string>
     <string name="pref_highlight_vals">Same values</string>
     <string name="pref_highlight_notes">Notes</string>
+
     <!-- #Game -->
     <string name="pref_header_game">Game</string>
     <string name="pref_group_game">Game settings</string>
@@ -54,6 +55,10 @@
     <string name="pref_automatic_note_deletion_summary">Automatically remove notes when setting values on connected cells</string>
     <string name="pref_timer_reset">Timer Reset</string>
     <string name="pref_timer_reset_summary">Also reset the timer, when resetting the game board.</string>
+    <string name="pref_dark_mode">Dark Mode</string>
+
+    <string name="pref_dark_mode_setting">Dark Theme</string>
+    <string name="pref_dark_mode_summary">switch between light and dark theme</string>
 
     <!-- ###ABOUT### -->
     <string name="app_name_long" translatable="false">Privacy Friendly Sudoku</string>
diff --git a/app/src/main/res/xml/pref_settings_general.xml b/app/src/main/res/xml/pref_settings_general.xml
index 3102b95..6d59eec 100644
--- a/app/src/main/res/xml/pref_settings_general.xml
+++ b/app/src/main/res/xml/pref_settings_general.xml
@@ -19,6 +19,12 @@
         android:summary="@string/pref_keep_screen_on_summary"
         android:defaultValue="true"/>
 
+        <SwitchPreference android:id="@+id/pref_dark_theme"
+            android:key="pref_dark_mode_setting"
+            android:title="@string/pref_dark_mode"
+            android:summary="@string/pref_dark_mode_summary"
+            android:defaultValue="true"/>
+
         <ListPreference
         android:key="pref_symbols"
         android:title="@string/pref_symbols"

From 1106ee84bb4cf81f2b7bd0279565e0dace2b0c40 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Wed, 24 Jun 2020 16:37:59 +0200
Subject: [PATCH 05/20] Adjusting the SettingsActivity Case discrimination with
 AppCompatDelegate to cover both cases.

---
 .../ui/SettingsActivity.java                  | 47 +++++++++++++++++--
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java
index 448b560..dc7da54 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java
@@ -3,6 +3,8 @@ package org.secuso.privacyfriendlysudoku.ui;
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
@@ -10,14 +12,19 @@ import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatDelegate;
+
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.CompoundButton;
+import android.widget.Switch;
 
 import org.secuso.privacyfriendlysudoku.ui.view.R;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * A {@link PreferenceActivity} that presents a set of application settings. On
@@ -43,12 +50,43 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             mainContent.setAlpha(0);
             mainContent.animate().alpha(1).setDuration(BaseActivity.MAIN_CONTENT_FADEIN_DURATION);
         }
+        /**
+         * Set up the {@link android.app.ActionBar}, if the API is available.
+         */
+
+        SharedPreferences preferenceManager = PreferenceManager
+                .getDefaultSharedPreferences(this);
+
+       SharedPreferences.OnSharedPreferenceChangeListener x = new SharedPreferences.OnSharedPreferenceChangeListener() {
+
+            @Override
+            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+
+                System.out.println(key);
+                if (key.equals("pref_dark_mode_setting")) {
+                    if (sharedPreferences.getBoolean(key, false )) {
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                        restartActivity();
+                    } else {
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                        restartActivity();
+                    }
+
+                }
+            }
+        };
+        // Listener registrieren
+        preferenceManager.registerOnSharedPreferenceChangeListener(x);
+
     }
 
-    /**
-     * Set up the {@link android.app.ActionBar}, if the API is available.
-     */
-    private void setupActionBar() {
+    public void restartActivity() {
+        Intent i = new Intent(getApplicationContext(), MainActivity.class);
+        startActivity(i);
+        finish();
+    }
+
+    private void setupActionBar () {
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             // Show the Up button in the action bar.
@@ -69,7 +107,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
         return super.onMenuItemSelected(featureId, item);
     }
 
-
     /**
      * {@inheritDoc}
      */

From 73e7fa395898a70af5e4a962f4d6b911d6e85882 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Wed, 24 Jun 2020 18:36:33 +0200
Subject: [PATCH 06/20] Adaptation of the MainActivity is loaded in Main
 Activity, that the dark theme remains activated when the app is opened again

---
 .../secuso/privacyfriendlysudoku/ui/MainActivity.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
index a872a5b..e25b7b5 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
@@ -6,6 +6,8 @@ import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
 import com.google.android.material.navigation.NavigationView;
+
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
@@ -54,8 +56,16 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+
+
         settings = PreferenceManager.getDefaultSharedPreferences(this);
 
+        if (settings.getBoolean("pref_dark_mode_setting", false )) {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+        } else {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+        }
+
         NewLevelManager newLevelManager = NewLevelManager.getInstance(getApplicationContext(), settings);
 
         // check if we need to pre generate levels.

From 50f72607170a1f31bbabb004942258f5563a7a84 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Wed, 24 Jun 2020 18:47:01 +0200
Subject: [PATCH 07/20] Adaptation of the GameActivity Dark Theme remains
 activated In case the GameActivity is loaded first by clicking a sudoku://
 link

---
 .../org/secuso/privacyfriendlysudoku/ui/GameActivity.java | 8 ++++++++
 1 file changed, 8 insertions(+)

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 80b9bf4..6a504e8 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
@@ -17,6 +17,8 @@ import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
 import com.google.android.material.navigation.NavigationView;
+
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.appcompat.app.ActionBarDrawerToggle;
@@ -96,6 +98,12 @@ public class GameActivity extends BaseActivity implements NavigationView.OnNavig
 
         SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
 
+        if (sharedPref.getBoolean("pref_dark_mode_setting", false )) {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+        } else {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+        }
+
         if(sharedPref.getBoolean("pref_keep_screen_on", true)) {
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         }

From 01865b17418bcdf15c0e9931c94c58eeff7d1341 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Wed, 24 Jun 2020 19:21:50 +0200
Subject: [PATCH 08/20] Adaptation of the pref_settings_general.xml Creating a
 preferenceSettings category for different settings of the DarkTheme

---
 app/src/main/res/values/strings.xml            |  3 ++-
 app/src/main/res/xml/pref_settings_general.xml | 14 ++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1334060..2291bfd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,7 +55,8 @@
     <string name="pref_automatic_note_deletion_summary">Automatically remove notes when setting values on connected cells</string>
     <string name="pref_timer_reset">Timer Reset</string>
     <string name="pref_timer_reset_summary">Also reset the timer, when resetting the game board.</string>
-    <string name="pref_dark_mode">Dark Mode</string>
+    <string name="pref_dark_mode">Dark Theme</string>
+    <string name="pref_group_dark_theme">Dark Theme settings</string>
 
     <string name="pref_dark_mode_setting">Dark Theme</string>
     <string name="pref_dark_mode_summary">switch between light and dark theme</string>
diff --git a/app/src/main/res/xml/pref_settings_general.xml b/app/src/main/res/xml/pref_settings_general.xml
index 6d59eec..b014bbe 100644
--- a/app/src/main/res/xml/pref_settings_general.xml
+++ b/app/src/main/res/xml/pref_settings_general.xml
@@ -19,12 +19,6 @@
         android:summary="@string/pref_keep_screen_on_summary"
         android:defaultValue="true"/>
 
-        <SwitchPreference android:id="@+id/pref_dark_theme"
-            android:key="pref_dark_mode_setting"
-            android:title="@string/pref_dark_mode"
-            android:summary="@string/pref_dark_mode_summary"
-            android:defaultValue="true"/>
-
         <ListPreference
         android:key="pref_symbols"
         android:title="@string/pref_symbols"
@@ -35,6 +29,14 @@
         android:positiveButtonText="@null" />
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="@string/pref_group_dark_theme">
+    <SwitchPreference android:id="@+id/pref_dark_theme"
+        android:key="pref_dark_mode_setting"
+        android:title="@string/pref_dark_mode"
+        android:summary="@string/pref_dark_mode_summary"
+        android:defaultValue="true"/>
+    </PreferenceCategory>
+
     <PreferenceCategory android:title="@string/pref_group_highlight_selection">
         <SwitchPreference android:id="@+id/pref_highlight_connected"
             android:key="pref_highlight_connected"

From eb78716249711e6ef832301b50ca0ac178c3ec0f Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Wed, 24 Jun 2020 20:44:47 +0200
Subject: [PATCH 09/20] Adjustment in pref_settings_general Creating the two
 switches for "automatic by system" and "automatic by battery"

---
 app/src/main/res/values/strings.xml            |  2 ++
 app/src/main/res/xml/pref_settings_general.xml | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2291bfd..bc1304b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -57,6 +57,8 @@
     <string name="pref_timer_reset_summary">Also reset the timer, when resetting the game board.</string>
     <string name="pref_dark_mode">Dark Theme</string>
     <string name="pref_group_dark_theme">Dark Theme settings</string>
+    <string name="pref_dark_mode_automatically_by_system">Automatically by system </string>
+    <string name="pref_dark_mode_automatically_by_battery">Automatically by battery </string>
 
     <string name="pref_dark_mode_setting">Dark Theme</string>
     <string name="pref_dark_mode_summary">switch between light and dark theme</string>
diff --git a/app/src/main/res/xml/pref_settings_general.xml b/app/src/main/res/xml/pref_settings_general.xml
index b014bbe..f53c0cc 100644
--- a/app/src/main/res/xml/pref_settings_general.xml
+++ b/app/src/main/res/xml/pref_settings_general.xml
@@ -35,6 +35,19 @@
         android:title="@string/pref_dark_mode"
         android:summary="@string/pref_dark_mode_summary"
         android:defaultValue="true"/>
+
+        <SwitchPreference android:id="@+id/pref_dark_theme_automatically_by_system"
+            android:key="pref_dark_mode_automatically_by_system"
+            android:title="@string/pref_dark_mode_automatically_by_system"
+            android:summary="Dark theme is adapted to settings of the OS"
+            android:defaultValue="true"/>
+
+        <SwitchPreference android:id="@+id/pref_dark_theme_automatically_by_battery"
+            android:key="pref_dark_mode_automatically_by_battery"
+            android:title="@string/pref_dark_mode_automatically_by_battery"
+            android:summary="adjusts Dark theme automatically according to battery status "
+            android:defaultValue="true"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/pref_group_highlight_selection">

From 38a708821a136d0e1df6d82ac9fb3bc9bcc4d571 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Mon, 29 Jun 2020 15:25:19 +0200
Subject: [PATCH 10/20] 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.

---
 .../ui/SettingsActivity.java                  | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java
index dc7da54..f6c20fd 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java
@@ -59,31 +59,39 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 
        SharedPreferences.OnSharedPreferenceChangeListener x = new SharedPreferences.OnSharedPreferenceChangeListener() {
 
+
+           public void recheckNightModeProperties(SharedPreferences sharedPreferences){
+               if (sharedPreferences.getBoolean("pref_dark_mode_setting", false )) {
+                   AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                   restartActivity();
+
+               } else if (sharedPreferences.getBoolean("pref_dark_mode_automatically_by_system", false)) {
+                   AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+                   restartActivity();
+               } else if(sharedPreferences.getBoolean("pref_dark_mode_automatically_by_battery", false)){
+                   AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY);
+                   restartActivity();
+               } else {
+                   AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                   restartActivity();
+               }
+
+           }
             @Override
             public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-
-                System.out.println(key);
-                if (key.equals("pref_dark_mode_setting")) {
-                    if (sharedPreferences.getBoolean(key, false )) {
-                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-                        restartActivity();
-                    } else {
-                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-                        restartActivity();
-                    }
-
+                if (key.equals("pref_dark_mode_setting")|| key.equals("pref_dark_mode_automatically_by_system")||key.equals("pref_dark_mode_automatically_by_battery")) {
+                    recheckNightModeProperties(sharedPreferences);
                 }
             }
         };
-        // Listener registrieren
         preferenceManager.registerOnSharedPreferenceChangeListener(x);
 
     }
 
     public void restartActivity() {
         Intent i = new Intent(getApplicationContext(), MainActivity.class);
-        startActivity(i);
         finish();
+        startActivity(i);
     }
 
     private void setupActionBar () {

From e832e6c4ac9664b27e209e1585e5ea7eb0722334 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Mon, 29 Jun 2020 15:33:10 +0200
Subject: [PATCH 11/20] 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.

---
 .../privacyfriendlysudoku/ui/MainActivity.java  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
index e25b7b5..7973ad6 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
@@ -2,6 +2,7 @@ package org.secuso.privacyfriendlysudoku.ui;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.media.audiofx.Equalizer;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
@@ -60,11 +61,17 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
         settings = PreferenceManager.getDefaultSharedPreferences(this);
 
-        if (settings.getBoolean("pref_dark_mode_setting", false )) {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-        } else {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-        }
+            if (settings.getBoolean("pref_dark_mode_setting", false )) {
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+
+            } else if (settings.getBoolean("pref_dark_mode_automatically_by_system", false)) {
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+
+            } else if(settings.getBoolean("pref_dark_mode_automatically_by_battery", false)){
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY);
+            } else {
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+            }
 
         NewLevelManager newLevelManager = NewLevelManager.getInstance(getApplicationContext(), settings);
 

From edc16b8cec49fdd98f754cadd65f3f15ce84542f Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Mon, 29 Jun 2020 17:57:47 +0200
Subject: [PATCH 12/20] Creating the layout xml file for the "Create Sudoku"
 activity.

---
 .../res/layout/activity_create_sudoku.xml     | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 app/src/main/res/layout/activity_create_sudoku.xml

diff --git a/app/src/main/res/layout/activity_create_sudoku.xml b/app/src/main/res/layout/activity_create_sudoku.xml
new file mode 100644
index 0000000..57020cf
--- /dev/null
+++ b/app/src/main/res/layout/activity_create_sudoku.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
+        tools:context="tu_darmstadt.sudoku.activity.GameActivity">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:clipChildren="false"
+            android:theme="@style/AppTheme.AppBarOverlay">
+
+            <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/colorPrimary"
+                android:clipChildren="false"
+                app:popupTheme="@style/AppTheme.PopupOverlay" >
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:weightSum="14"
+                    android:clipChildren="false"
+                    android:orientation="horizontal"
+                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                    android:layout_marginRight="@dimen/activity_horizontal_margin"
+                    android:gravity="center_vertical">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/gametype_unspecified"
+                        android:id="@+id/gameModeText"
+                        android:layout_weight="7"/>
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="5"
+                        android:clipChildren="false"
+                        android:layout_height="wrap_content">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/difficulty_easy"
+                            android:layout_centerHorizontal="true"
+                            android:id="@+id/difficultyText"
+                            />
+                        <RatingBar
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:numStars="4"
+                            android:clickable="false"
+                            android:id="@+id/gameModeStar"
+                            android:layout_centerHorizontal="true"
+                            android:layout_centerVertical="true"
+                            android:layout_below="@+id/difficultyText"
+                            style="?android:attr/ratingBarStyleSmall"/>
+                    </RelativeLayout>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="00:00"
+                        android:layout_weight="2"
+                        android:id="@+id/timerView"
+                        android:gravity="end"/>
+                </LinearLayout>
+            </androidx.appcompat.widget.Toolbar>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <include layout="@layout/content_game_view" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="wrap_content"
+        android:fitsSystemWindows="true"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:background="?attr/lightestBackGround"
+        app:menu="@menu/menu_drawer"
+        app:headerLayout="@layout/nav_header" />
+
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file

From 4d976abe168662ca108ffc16fd1e06ed016780d5 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Mon, 29 Jun 2020 18:00:27 +0200
Subject: [PATCH 13/20] Added a vector graphic for the "Finish" button for the
 Create Sudoku activity.

---
 app/src/main/res/drawable/ic_finalize.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_finalize.xml

diff --git a/app/src/main/res/drawable/ic_finalize.xml b/app/src/main/res/drawable/ic_finalize.xml
new file mode 100644
index 0000000..e57a943
--- /dev/null
+++ b/app/src/main/res/drawable/ic_finalize.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="192dp"
+    android:height="192dp"
+    android:viewportWidth="192"
+    android:viewportHeight="192">
+  <path
+      android:pathData="M109,89.5l-30.5,30.5 -12,-12 -12.1,-12 -3.9,4 -3.9,4 16.2,16.3 16.2,16.2 34,-34c18.7,-18.7 34,-34.5 34,-35 0,-0.6 -1.7,-2.8 -3.8,-4.8l-3.7,-3.7 -30.5,30.5z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>

From f2bbc38f143c97e400653749fa13432c696530c6 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Mon, 29 Jun 2020 23:16:05 +0200
Subject: [PATCH 14/20] 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

---
 .../res/layout/activity_create_sudoku.xml     | 32 +------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/app/src/main/res/layout/activity_create_sudoku.xml b/app/src/main/res/layout/activity_create_sudoku.xml
index 57020cf..4763ba5 100644
--- a/app/src/main/res/layout/activity_create_sudoku.xml
+++ b/app/src/main/res/layout/activity_create_sudoku.xml
@@ -40,43 +40,13 @@
                         android:text="@string/gametype_unspecified"
                         android:id="@+id/gameModeText"
                         android:layout_weight="7"/>
-                    <RelativeLayout
-                        android:layout_width="0dp"
-                        android:layout_weight="5"
-                        android:clipChildren="false"
-                        android:layout_height="wrap_content">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/difficulty_easy"
-                            android:layout_centerHorizontal="true"
-                            android:id="@+id/difficultyText"
-                            />
-                        <RatingBar
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:numStars="4"
-                            android:clickable="false"
-                            android:id="@+id/gameModeStar"
-                            android:layout_centerHorizontal="true"
-                            android:layout_centerVertical="true"
-                            android:layout_below="@+id/difficultyText"
-                            style="?android:attr/ratingBarStyleSmall"/>
-                    </RelativeLayout>
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="00:00"
-                        android:layout_weight="2"
-                        android:id="@+id/timerView"
-                        android:gravity="end"/>
                 </LinearLayout>
             </androidx.appcompat.widget.Toolbar>
 
         </com.google.android.material.appbar.AppBarLayout>
 
-        <include layout="@layout/content_game_view" />
+        <include layout="@layout/content_game_view_create_sudoku" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 

From df34a57f90d0bd5b9fdeb82049de849f23410b55 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Mon, 29 Jun 2020 23:34:45 +0200
Subject: [PATCH 15/20] Placeholder in Manifest.xml Create a new activity
 (CreateGameActivity) to test the layout.

---
 app/src/main/AndroidManifest.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 476543e..6c5fbcf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,11 @@
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
         </activity>
+        <activity
+            android:name="org.secuso.privacyfriendlysudoku.ui.CreateGameActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
         <activity
             android:name="org.secuso.privacyfriendlysudoku.ui.DailySudokuActivity"
             android:label="@string/Sudoku"

From efee6374d8638627693530036f97eadf376bbd30 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Mon, 29 Jun 2020 23:40:48 +0200
Subject: [PATCH 16/20] Creating the content_game_view_create_sudoku.xml The
 layout shows the playing field and contains the buttons.

---
 .../content_game_view_create_sudoku.xml       | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 app/src/main/res/layout/content_game_view_create_sudoku.xml

diff --git a/app/src/main/res/layout/content_game_view_create_sudoku.xml b/app/src/main/res/layout/content_game_view_create_sudoku.xml
new file mode 100644
index 0000000..ff2d71c
--- /dev/null
+++ b/app/src/main/res/layout/content_game_view_create_sudoku.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/main_content"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context="org.secuso.privacyfriendlysudoku.ui.GameActivity">
+
+    <org.secuso.privacyfriendlysudoku.ui.view.SudokuFieldLayout
+        android:id="@+id/sudokuLayout"
+        android:layout_width="match_parent"
+        android:layoutDirection="ltr"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:gravity="center" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@+id/sudokuLayout"
+        android:orientation="vertical"
+        android:weightSum="3">
+
+        <org.secuso.privacyfriendlysudoku.ui.view.SudokuKeyboardLayout
+            android:layout_width="fill_parent"
+            android:layout_height="0px"
+            android:id="@+id/sudokuKeyboardLayout"
+            android:orientation="vertical"
+            android:layout_weight="2"
+            android:weightSum="2">
+
+        </org.secuso.privacyfriendlysudoku.ui.view.SudokuKeyboardLayout>
+
+        <org.secuso.privacyfriendlysudoku.ui.view.CreateSudokuSpecialButtonLayout
+            android:id="@+id/createSudokuLayout"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+        </org.secuso.privacyfriendlysudoku.ui.view.CreateSudokuSpecialButtonLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>

From 0bf7e70e28f52887b262bf7911aebc3d4d7ed317 Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Mon, 29 Jun 2020 23:45:55 +0200
Subject: [PATCH 17/20] 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.

---
 .../ui/view/CreateSudokuButtonType.java       | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuButtonType.java

diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuButtonType.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuButtonType.java
new file mode 100644
index 0000000..ab4c276
--- /dev/null
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuButtonType.java
@@ -0,0 +1,56 @@
+package org.secuso.privacyfriendlysudoku.ui.view;
+
+import androidx.annotation.DrawableRes;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Chris on 15.11.2015.
+ */
+public enum CreateSudokuButtonType {
+    Unspecified(R.drawable.ic_accessibility_black_48dp),// placeholder
+    Value(R.drawable.ic_accessibility_black_48dp), // should be non picture
+    Do(R.drawable.ic_redo_black_48dp),
+    Undo(R.drawable.ic_undo_black_48dp),
+    NoteToggle(R.drawable.ic_create_black_48dp),
+    Spacer(R.drawable.ic_accessibility_black_48dp),//placeholder
+    Delete(R.drawable.ic_delete_black_48dp),
+    Finalize(R.drawable.ic_finalize),
+    Reset(R.drawable.ic_settings_backup_restore_black_48dp);
+
+
+    private int resID;
+
+    CreateSudokuButtonType(@DrawableRes int res){
+        this.resID = res;
+    }
+
+    public int getResID() {
+        return resID;
+    }
+
+    public static List<CreateSudokuButtonType> getSpecialButtons() {
+        ArrayList<CreateSudokuButtonType> result = new ArrayList<CreateSudokuButtonType>();
+        result.add(Undo);
+        result.add(Do);
+        result.add(Finalize);
+        //result.add(Spacer);
+        result.add(Delete);
+        result.add(NoteToggle);
+        return result;
+    }
+    public static String getName(CreateSudokuButtonType type) {
+        switch (type) {
+            case Do: return "Do";
+            case Undo: return "Un";
+            case Finalize: return "Fi";
+            case NoteToggle: return "On";
+            case Spacer: return "";
+            case Delete: return "Del";
+            default:return "NotSet";
+        }
+    }
+}
+
+

From ff8b9b9559363de2833fc36a989dcb0b24d22e8f Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Mon, 29 Jun 2020 23:49:54 +0200
Subject: [PATCH 18/20] Creating the CreateSudokuSpecialButton class
 Modification for CreateSudokuButtonType.

---
 .../ui/view/CreateSudokuSpecialButton.java    | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButton.java

diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButton.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButton.java
new file mode 100644
index 0000000..6d93e6e
--- /dev/null
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButton.java
@@ -0,0 +1,23 @@
+package org.secuso.privacyfriendlysudoku.ui.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ImageButton;
+
+/**
+ * Created by TMZ_LToP on 07.12.2015.
+ */
+public class CreateSudokuSpecialButton extends ImageButton {
+    private int value = -1;
+    private CreateSudokuButtonType type = CreateSudokuButtonType.Unspecified;
+
+    public CreateSudokuSpecialButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public void setValue(int value)             { this.value = value; }
+    public void setType(CreateSudokuButtonType type)  { this.type = type; }
+    public int getValue ()                      { return value; }
+    public CreateSudokuButtonType getType()           { return type; }
+
+}

From 0e4a03c94a1a7869eeaeca995cfa5f84c89fe80b Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Tue, 30 Jun 2020 00:00:52 +0200
Subject: [PATCH 19/20] Create the CreateSudokuButtonLayout class. Is identical
 to the SudokuSpecialButtonLayout slight modification to cover different
 cases. Provides the display of the different button types.

---
 .../view/CreateSudokuSpecialButtonLayout.java | 224 ++++++++++++++++++
 1 file changed, 224 insertions(+)
 create mode 100644 app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButtonLayout.java

diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButtonLayout.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButtonLayout.java
new file mode 100644
index 0000000..3fe8168
--- /dev/null
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButtonLayout.java
@@ -0,0 +1,224 @@
+package org.secuso.privacyfriendlysudoku.ui.view;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+import androidx.core.content.ContextCompat;
+
+import org.secuso.privacyfriendlysudoku.controller.GameController;
+import org.secuso.privacyfriendlysudoku.game.listener.IHighlightChangedListener;
+import org.secuso.privacyfriendlysudoku.ui.GameActivity;
+import org.secuso.privacyfriendlysudoku.ui.listener.IHintDialogFragmentListener;
+
+import java.util.LinkedList;
+
+import static org.secuso.privacyfriendlysudoku.ui.view.CreateSudokuButtonType.Spacer;
+import static org.secuso.privacyfriendlysudoku.ui.view.CreateSudokuButtonType.getSpecialButtons;
+
+/**
+ * Created by TMZ_LToP on 17.11.2015.
+ */
+public class CreateSudokuSpecialButtonLayout extends LinearLayout implements IHighlightChangedListener {
+
+
+    CreateSudokuSpecialButton[] fixedButtons;
+    public int fixedButtonsCount = getSpecialButtons().size();
+    GameController gameController;
+    SudokuKeyboardLayout keyboard;
+    Bitmap bitMap,bitResult;
+    Canvas canvas;
+    FragmentManager fragmentManager;
+    Context context;
+
+    OnClickListener listener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            if(v instanceof CreateSudokuSpecialButton) {
+                CreateSudokuSpecialButton btn = (CreateSudokuSpecialButton)v;
+
+                //int row = gameController.getSelectedRow();
+                //int col = gameController.getSelectedCol();
+
+                switch(btn.getType()) {
+                    case Delete:
+                        gameController.deleteSelectedCellsValue();
+                        break;
+                    case NoteToggle:
+                        // rotates the Drawable
+                        gameController.setNoteStatus(!gameController.getNoteStatus());
+                        keyboard.updateNotesEnabled();
+                        onHighlightChanged();
+                        break;
+                    case Do:
+                        gameController.ReDo();
+                        break;
+                    case Undo:
+                        gameController.UnDo();
+                        break;
+                    case Finalize:
+                    default:
+                        break;
+                }
+            }
+        }
+    };
+
+
+    public CreateSudokuSpecialButtonLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setWeightSum(fixedButtonsCount);
+        this.context = context;
+    }
+
+    public void setButtonsEnabled(boolean enabled) {
+        for(CreateSudokuSpecialButton b : fixedButtons) {
+            b.setEnabled(enabled);
+        }
+    }
+
+    public void setButtons(int width, GameController gc, SudokuKeyboardLayout key, FragmentManager fm, int orientation, Context cxt) {
+        fragmentManager = fm;
+        keyboard=key;
+        gameController = gc;
+        context = cxt;
+        if(gameController != null) {
+            gameController.registerHighlightChangedListener(this);
+        }
+         fixedButtons = new CreateSudokuSpecialButton[fixedButtonsCount];
+        LayoutParams p;
+        int i = 0;
+        //ArrayList<SudokuButtonType> type = (ArrayList<SudokuButtonType>) SudokuButtonType.getSpecialButtons();
+        for (CreateSudokuButtonType t : getSpecialButtons()){
+            fixedButtons[i] = new CreateSudokuSpecialButton(getContext(),null);
+            if(orientation == LinearLayout.HORIZONTAL) {
+                p = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, 1);
+            } else {
+                p = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, 1);
+                fixedButtons[i].setPadding(25, 0, 25, 0);
+            }
+            p.setMargins(5, 5, 5, 5);
+
+            //int width2 =width/(fixedButtonsCount);
+            //p.width= width2-15;
+            if(t == Spacer) {
+                fixedButtons[i].setVisibility(View.INVISIBLE);
+            }
+            /*if(t == SudokuButtonType.Do && !gameController.isRedoAvailable()) {
+                fixedButtons[i].setEnabled(false);
+            }
+            if(t == SudokuButtonType.Undo && !gameController.isUndoAvailable()) {
+                fixedButtons[i].setEnabled(false);
+            }*/
+            fixedButtons[i].setLayoutParams(p);
+            fixedButtons[i].setType(t);
+            fixedButtons[i].setImageDrawable(getResources().getDrawable(t.getResID()));
+            // fixedButtons[i].setText(SudokuButtonType.getName(t));
+            fixedButtons[i].setScaleType(ImageView.ScaleType.CENTER);
+            fixedButtons[i].setAdjustViewBounds(true);
+            fixedButtons[i].setOnClickListener(listener);
+            fixedButtons[i].setBackgroundResource(R.drawable.numpad_highlighted_four);
+            addView(fixedButtons[i]);
+
+            if(fixedButtons[i].getVisibility() == View.VISIBLE) {
+                Drawable drawable = ContextCompat.getDrawable(context, fixedButtons[i].getType().getResID());
+                setUpVectorDrawable(drawable);
+                drawable.draw(canvas);
+                fixedButtons[i].setImageBitmap(bitResult);
+            }
+            i++;
+        }
+
+    }
+
+    @Override
+    public void onHighlightChanged() {
+        for(int i = 0; i < fixedButtons.length; i++) {
+            switch(fixedButtons[i].getType()) {
+                case Undo:
+                    fixedButtons[i].setBackgroundResource(gameController.isUndoAvailable() ?
+                            R.drawable.numpad_highlighted_four : R.drawable.inactive_button);
+                    break;
+                case Do:
+                    fixedButtons[i].setBackgroundResource(gameController.isRedoAvailable() ?
+                            R.drawable.numpad_highlighted_four : R.drawable.inactive_button);
+                    break;
+                case NoteToggle:
+                    Drawable drawable = ContextCompat.getDrawable(context, fixedButtons[i].getType().getResID());
+                    setUpVectorDrawable(drawable);
+
+                    canvas.rotate(gameController.getNoteStatus() ? 45.0f : 0.0f, bitMap.getWidth()/2, bitMap.getHeight()/2);
+                    canvas.drawBitmap(bitMap, 0, 0, null);
+                    drawable.draw(canvas);
+
+                    fixedButtons[i].setImageBitmap(bitResult);
+                    fixedButtons[i].setBackgroundResource(gameController.getNoteStatus() ? R.drawable.numpad_highlighted_three : R.drawable.numpad_highlighted_four);
+
+                    keyboard.updateNotesEnabled();
+
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
+    private void setUpVectorDrawable(Drawable drawable) {
+        drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+        bitMap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
+                drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+        bitResult = Bitmap.createBitmap(bitMap.getWidth(), bitMap.getHeight(), Bitmap.Config.ARGB_8888);
+
+        canvas = new Canvas(bitResult);
+    }
+    /*
+    public static class HintConfirmationDialog extends DialogFragment {
+
+        LinkedList<IHintDialogFragmentListener> listeners = new LinkedList<>();
+
+        @Override
+        public void onAttach(Activity activity) {
+            super.onAttach(activity);
+            // Verify that the host activity implements the callback interface
+            if(activity instanceof IHintDialogFragmentListener) {
+                listeners.add((IHintDialogFragmentListener) activity);
+            }
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            // Use the Builder class for convenient dialog construction
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_Dialog);
+            builder.setMessage(R.string.hint_confirmation)
+                    .setPositiveButton(R.string.hint_confirmation_confirm, new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            for(IHintDialogFragmentListener l : listeners) {
+                                l.onHintDialogPositiveClick();
+                            }
+                        }
+                    })
+                    .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            // User cancelled the dialog
+                        }
+                    });
+            return builder.create();
+        }
+    }
+ */
+}

From 66a620f5f86d3008d21184c69aca9b35b90e87df Mon Sep 17 00:00:00 2001
From: ErikWaegerle <erikwaegerle@Eriks-MBP.fritz.box>
Date: Tue, 30 Jun 2020 00:07:07 +0200
Subject: [PATCH 20/20] Creating the dummy class CreateGameActivity Utility
 class to display the layout and not to have to customize GameActivity. Can be
 deleted!

---
 .../ui/CreateGameActivity.java                | 691 ++++++++++++++++++
 1 file changed, 691 insertions(+)
 create mode 100644 app/src/main/java/org/secuso/privacyfriendlysudoku/ui/CreateGameActivity.java

diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/CreateGameActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/CreateGameActivity.java
new file mode 100644
index 0000000..d19b52f
--- /dev/null
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/CreateGameActivity.java
@@ -0,0 +1,691 @@
+package org.secuso.privacyfriendlysudoku.ui;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.graphics.Point;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
+import com.google.android.material.navigation.NavigationView;
+
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.RatingBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.secuso.privacyfriendlysudoku.controller.GameController;
+import org.secuso.privacyfriendlysudoku.controller.GameStateManager;
+import org.secuso.privacyfriendlysudoku.controller.SaveLoadStatistics;
+import org.secuso.privacyfriendlysudoku.controller.Symbol;
+import org.secuso.privacyfriendlysudoku.controller.helper.GameInfoContainer;
+import org.secuso.privacyfriendlysudoku.controller.qqwing.QQWing;
+import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
+import org.secuso.privacyfriendlysudoku.game.GameType;
+import org.secuso.privacyfriendlysudoku.game.listener.IGameSolvedListener;
+import org.secuso.privacyfriendlysudoku.game.listener.ITimerListener;
+import org.secuso.privacyfriendlysudoku.ui.AboutActivity;
+import org.secuso.privacyfriendlysudoku.ui.BaseActivity;
+import org.secuso.privacyfriendlysudoku.ui.HelpActivity;
+import org.secuso.privacyfriendlysudoku.ui.MainActivity;
+import org.secuso.privacyfriendlysudoku.ui.SettingsActivity;
+import org.secuso.privacyfriendlysudoku.ui.StatsActivity;
+import org.secuso.privacyfriendlysudoku.ui.listener.IHintDialogFragmentListener;
+import org.secuso.privacyfriendlysudoku.ui.listener.IResetDialogFragmentListener;
+import org.secuso.privacyfriendlysudoku.ui.listener.IShareDialogFragmentListener;
+import org.secuso.privacyfriendlysudoku.ui.view.CreateSudokuSpecialButtonLayout;
+import org.secuso.privacyfriendlysudoku.ui.view.R;
+import org.secuso.privacyfriendlysudoku.ui.view.SudokuFieldLayout;
+import org.secuso.privacyfriendlysudoku.ui.view.SudokuKeyboardLayout;
+import org.secuso.privacyfriendlysudoku.ui.view.SudokuSpecialButtonLayout;
+import org.secuso.privacyfriendlysudoku.ui.view.WinDialog;
+import org.secuso.privacyfriendlysudoku.ui.view.databinding.DialogFragmentShareBoardBinding;
+
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class CreateGameActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener, IGameSolvedListener ,ITimerListener, IHintDialogFragmentListener, IResetDialogFragmentListener, IShareDialogFragmentListener {
+
+    GameController gameController;
+    SudokuFieldLayout layout;
+    SudokuKeyboardLayout keyboard;
+    SudokuSpecialButtonLayout specialButtonLayout;
+    TextView viewName ;
+    RatingBar ratingBar;
+    private boolean gameSolved = false;
+    private boolean startGame = true;
+    SaveLoadStatistics statistics = new SaveLoadStatistics(this);
+    WinDialog dialog = null;
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+
+        if(gameSolved) {
+            gameController.pauseTimer();
+        } else {
+            // start the game
+            mHandler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    gameController.startTimer();
+                }
+            }, MAIN_CONTENT_FADEIN_DURATION);
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
+
+        if (sharedPref.getBoolean("pref_dark_mode_setting", false )) {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+        } else {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+        }
+
+        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;
+        boolean loadLevel = false;
+
+        if(savedInstanceState == null) {
+
+            Bundle extras = getIntent().getExtras();
+            Uri data = getIntent().getData();
+            gameController = new GameController(sharedPref, getApplicationContext());
+
+            boolean intentReceivedFromMainActivity = extras != null &&
+                    (extras.containsKey("gameType") || extras.containsKey("loadLevel"));
+
+            if (data != null && !intentReceivedFromMainActivity) {
+                String input = "";
+                if (data.getScheme().equals("sudoku")){
+                    input = data.getHost();
+                } else if (data.getScheme().equals("http") && data.getHost().equals("sudoku")){
+                    input = data.getPath();
+                    input =input.replace("/", "");
+                }
+
+                int sectionSize = (int)Math.sqrt(input.length());
+                int boardSize = sectionSize * sectionSize;
+                QQWing difficultyCheck;
+                GameInfoContainer container = new GameInfoContainer(0, GameDifficulty.Unspecified,
+                        GameType.Unspecified, new int [boardSize], new int [boardSize], new boolean [boardSize][sectionSize]);
+
+                try {
+                    container.parseGameType("Default_" + sectionSize + "x" + sectionSize);
+                    container.parseFixedValues(input);
+
+                    difficultyCheck = new QQWing(container.getGameType(), GameDifficulty.Unspecified);
+                    difficultyCheck.setRecordHistory(true);
+                    difficultyCheck.setPuzzle(container.getFixedValues());
+                    startGame = difficultyCheck.solve();
+                    container.parseDifficulty(difficultyCheck.getDifficulty().toString());
+
+                } catch (IllegalArgumentException e) {
+                    startGame = false;
+                    sectionSize = GameType.Default_9x9.getSize();
+                    boardSize = sectionSize * sectionSize;
+                    container = new GameInfoContainer(0, GameDifficulty.Unspecified,
+                            GameType.Default_9x9, new int [boardSize], new int [boardSize], new boolean [boardSize][sectionSize]);
+                }
+
+                if (!startGame) {
+                    AlertDialog.Builder builder = new AlertDialog.Builder(org.secuso.privacyfriendlysudoku.ui.CreateGameActivity.this, R.style.AppTheme_Dialog);
+                    builder.setMessage(R.string.impossible_import_notice)
+                            .setCancelable(false)
+                            .setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int id) {
+                                    finish();
+                                }
+                            });
+                    AlertDialog alert = builder.create();
+                    alert.show();
+                }
+
+                gameController.loadLevel(container);
+
+            } else {
+                boolean isDailySudoku = false;
+                if (extras != null) {
+                    gameType = GameType.valueOf(extras.getString("gameType", GameType.Default_9x9.name()));
+                    gameDifficulty = GameDifficulty.valueOf(extras.getString("gameDifficulty", GameDifficulty.Moderate.name()));
+                    isDailySudoku = extras.getBoolean("isDailySudoku", false);
+                    loadLevel = extras.getBoolean("loadLevel", false);
+                    if (loadLevel) {
+                        loadLevelID = extras.getInt("loadLevelID");
+                    }
+                }
+                if (isDailySudoku) {
+                    gameController.loadNewDailySudokuLevel();
+                } else  {
+
+                    List<GameInfoContainer> loadableGames = GameStateManager.getLoadableGameList();
+
+                    if (loadLevel) {
+                        if (loadableGames.size() > loadLevelID) {
+                            // load level from GameStateManager
+                            gameController.loadLevel(loadableGames.get(loadLevelID));
+                        } else if (loadLevelID == GameController.DAILY_SUDOKU_ID) {
+                            for (GameInfoContainer container : loadableGames) {
+                                if (container.getID() == loadLevelID) {
+                                    gameController.loadLevel(container);
+                                    break;
+                                }
+                            }
+                        }
+                    } else {
+                        // load a new level
+                        gameController.loadNewLevel(gameType, gameDifficulty);
+                    }
+                }
+            }
+        } else {
+            gameController = savedInstanceState.getParcelable("gameController");
+            // in case we get the same object back
+            // because parceling the Object does not always parcel it. Only if needed.
+            if(gameController != null) {
+                gameController.removeAllListeners();
+                gameController.setContextAndSettings(getApplicationContext(), sharedPref);
+            } else {
+                // Error: no game could be restored. Go back to main menu.
+                Intent intent = new Intent(this, MainActivity.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                startActivity(intent);
+                finish();
+                overridePendingTransition(0, 0);
+            }
+            gameSolved = savedInstanceState.getInt("gameSolved") == 1;
+        }
+
+
+        setContentView(R.layout.activity_create_sudoku);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        //toolbar.addView();
+
+        if(gameSolved) {
+            disableReset();
+        }
+
+        //Create new GameField
+        layout = (SudokuFieldLayout)findViewById(R.id.sudokuLayout);
+        gameController.registerGameSolvedListener(this);
+        gameController.registerTimerListener(this);
+        statistics.setGameController(gameController);
+
+        layout.setSettingsAndGame(sharedPref, gameController);
+
+        //set KeyBoard
+        keyboard = (SudokuKeyboardLayout) findViewById(R.id.sudokuKeyboardLayout);
+        keyboard.removeAllViews();
+        keyboard.setGameController(gameController);
+        //keyboard.setColumnCount((gameController.getSize() / 2) + 1);
+        //keyboard.setRowCount(2);
+        Point p = new Point();
+        getWindowManager().getDefaultDisplay().getSize(p);
+
+        // set keyboard orientation
+        int orientation = getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT ?
+                LinearLayout.HORIZONTAL : LinearLayout.VERTICAL;
+
+        keyboard.setKeyBoard(gameController.getSize(), p.x,layout.getHeight()-p.y, orientation);
+
+
+        //set Special keys
+        CreateSudokuSpecialButtonLayout createSudokuSpecialButtonLayout = (CreateSudokuSpecialButtonLayout) findViewById(R.id.createSudokuLayout);
+        createSudokuSpecialButtonLayout.setButtons(p.x, gameController, keyboard, getFragmentManager(), orientation, org.secuso.privacyfriendlysudoku.ui.CreateGameActivity.this);
+
+
+        //set GameName
+        viewName = (TextView) findViewById(R.id.gameModeText);
+        viewName.setText(getString(gameController.getGameType().getStringResID()));
+
+        //set Rating bar
+        List<GameDifficulty> difficutyList = GameDifficulty.getValidDifficultyList();
+        int numberOfStarts = difficutyList.size();
+        ratingBar = (RatingBar) findViewById(R.id.gameModeStar);
+
+
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
+                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+        drawer.setDrawerListener(toggle);
+        toggle.syncState();
+
+        NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
+        navigationView.setNavigationItemSelectedListener(this);
+
+        if(gameSolved) {
+            layout.setEnabled(false);
+            keyboard.setButtonsEnabled(false);
+            specialButtonLayout.setButtonsEnabled(false);
+        }
+
+        gameController.notifyHighlightChangedListeners();
+        gameController.notifyTimerListener(gameController.getTime());
+
+        // run this so the error list gets build again.
+        gameController.onModelChange(null);
+
+        overridePendingTransition(0, 0);
+    }
+
+    @Override
+    public void onPause(){
+        super.onPause();
+        if(!gameSolved && startGame) {
+            gameController.saveGame(this);
+        }
+        gameController.deleteTimer();
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        startActivity(intent);
+        finish();
+    }
+
+    @Override
+    public void onResume(){
+        super.onResume();
+
+        View mainContent = findViewById(R.id.main_content);
+        if (mainContent != null) {
+            mainContent.animate().alpha(1).setDuration(MAIN_CONTENT_FADEOUT_DURATION);
+        }
+
+        gameController.initTimer();
+
+        if(!gameSolved) {
+            mHandler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    gameController.startTimer();
+                }
+            }, MAIN_CONTENT_FADEIN_DURATION);
+        }
+
+        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
+        Symbol s;
+        try {
+            s = Symbol.valueOf(sharedPref.getString("pref_symbols", Symbol.Default.name()));
+        } catch(IllegalArgumentException e) {
+            s = Symbol.Default;
+        }
+        layout.setSymbols(s);
+        keyboard.setSymbols(s);
+    }
+
+
+    @Override
+    public void onBackPressed() {
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        if (drawer.isDrawerOpen(GravityCompat.START)) {
+            drawer.closeDrawer(GravityCompat.START);
+        } else {
+            finish();
+            super.onBackPressed();
+        }
+    }
+
+    /*@Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.game_view, menu);
+        return true;
+    }*/
+
+    @SuppressWarnings("StatementWithEmptyBody")
+    @Override
+    public boolean onNavigationItemSelected(MenuItem item) {
+        // Handle navigation view item clicks here.
+        int id = item.getItemId();
+
+        Intent intent = null;
+
+        switch(id) {
+            case R.id.menu_reset:
+                org.secuso.privacyfriendlysudoku.ui.GameActivity.ResetConfirmationDialog resetDialog = new org.secuso.privacyfriendlysudoku.ui.GameActivity.ResetConfirmationDialog();
+                resetDialog.show(getFragmentManager(), "ResetDialogFragment");
+                break;
+
+            case R.id.menu_share:
+                String codeForClipboard = "sudoku://" + gameController.getCodeOfField();
+                String codeForClipboard1 = "http://sudoku" + gameController.getCodeOfField();
+                org.secuso.privacyfriendlysudoku.ui.GameActivity.ShareBoardDialog shareDialog = new org.secuso.privacyfriendlysudoku.ui.GameActivity.ShareBoardDialog();
+                shareDialog.setDisplayCode(codeForClipboard);
+                shareDialog.setCopyClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        // remember to include alternate code for older android versions
+                        ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+
+                        if (clipboard != null) {
+                            ClipData clip = ClipData.newPlainText("BoardCode", codeForClipboard);
+                            clipboard.setPrimaryClip(clip);
+                            Toast.makeText(org.secuso.privacyfriendlysudoku.ui.CreateGameActivity.this, R.string.copy_code_confirmation_toast,
+                                    Toast.LENGTH_LONG).show();
+                        } else {
+                            Toast.makeText(org.secuso.privacyfriendlysudoku.ui.CreateGameActivity.this, R.string.copy_code_error_toast,
+                                    Toast.LENGTH_LONG).show();
+                        }
+                    }
+                });
+                shareDialog.show(getFragmentManager(), "ShareDialogFragment");
+
+                break;
+
+            case R.id.nav_newgame:
+                //create new game
+                intent = new Intent(this, MainActivity.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                finish();
+                break;
+
+            case R.id.menu_settings:
+                //open settings
+                intent = new Intent(this, SettingsActivity.class);
+                intent.putExtra( PreferenceActivity.EXTRA_SHOW_FRAGMENT, SettingsActivity.GamePreferenceFragment.class.getName() );
+                intent.putExtra( PreferenceActivity.EXTRA_NO_HEADERS, true );
+                break;
+
+            case R.id.nav_highscore:
+                // see highscore list
+                intent = new Intent(this, StatsActivity.class);
+                break;
+
+            case R.id.menu_about:
+                //open about page
+                intent = new Intent(this, AboutActivity.class);
+                break;
+
+            case R.id.menu_help:
+                //open about page
+                intent = new Intent(this, HelpActivity.class);
+                break;
+            default:
+        }
+
+        if(intent != null) {
+
+            final Intent i = intent;
+            // fade out the active activity
+            View mainContent = findViewById(R.id.main_content);
+            if (mainContent != null) {
+                mainContent.animate().alpha(0).setDuration(MAIN_CONTENT_FADEOUT_DURATION);
+            }
+
+            mHandler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    startActivity(i);
+                    overridePendingTransition(0, 0);
+                }
+            }, NAVDRAWER_LAUNCH_DELAY);
+
+        }
+
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        drawer.closeDrawer(GravityCompat.START);
+        return true;
+    }
+
+
+    @Override
+    public void onSolved() {
+        gameSolved = true;
+
+        gameController.pauseTimer();
+        gameController.deleteGame(this);
+        disableReset();
+
+        //Save solved sudoku, if it happens to be a daily sudoku, to daily sudoku database
+        if(gameController.getGameID() == GameController.DAILY_SUDOKU_ID) {
+            gameController.saveDailySudoku(org.secuso.privacyfriendlysudoku.ui.CreateGameActivity.this);
+            SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
+            SharedPreferences.Editor editor = sharedPref.edit();
+            editor.putBoolean("finishedForToday", true);
+            editor.apply();
+        }
+
+        //Show time hints new plus old best time
+
+        statistics.saveGameStats();
+
+        boolean isNewBestTime = gameController.getUsedHints() == 0
+                && statistics.loadStats(gameController.getGameType(),gameController.getDifficulty()).getMinTime() >= gameController.getTime();
+
+        dialog = new WinDialog(this, R.style.WinDialog , timeToString(gameController.getTime()), String.valueOf(gameController.getUsedHints()), isNewBestTime);
+
+        dialog.getWindow().setContentView(R.layout.win_screen_layout);
+        //dialog.setContentView(getLayoutInflater().inflate(R.layout.win_screen_layout,null));
+        //dialog.setContentView(R.layout.win_screen_layout);
+        dialog.getWindow().setGravity(Gravity.CENTER_HORIZONTAL);
+        dialog.getWindow().setBackgroundDrawableResource(R.color.transparent);
+
+        //((TextView)dialog.findViewById(R.id.win_hints)).setText(gameController.getUsedHints());
+        //((TextView)dialog.findViewById(R.id.win_time)).setText(timeToString(gameController.getTime()));
+
+        dialog.show();
+
+        final Activity activity = this;
+        ((Button)dialog.findViewById(R.id.win_continue_button)).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+                Intent intent = new Intent(activity, MainActivity.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                startActivity(intent);
+                overridePendingTransition(0, 0);
+                activity.finish();
+            }
+        });
+        ((Button)dialog.findViewById(R.id.win_showGame_button)).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+
+
+        layout.setEnabled(false);
+        keyboard.setButtonsEnabled(false);
+        specialButtonLayout.setButtonsEnabled(false);
+    }
+
+    public static String timeToString(int time) {
+        int seconds = time % 60;
+        int minutes = ((time - seconds) / 60) % 60;
+        int hours = (time - minutes - seconds) / (3600);
+        String h, m, s;
+        s = (seconds < 10) ? "0" + String.valueOf(seconds) : String.valueOf(seconds);
+        m = (minutes < 10) ? "0" + String.valueOf(minutes) : String.valueOf(minutes);
+        h = (hours < 10) ? "0" + String.valueOf(hours) : String.valueOf(hours);
+        return h + ":" + m + ":" + s;
+    }
+
+
+    private void disableReset(){
+        NavigationView navView = (NavigationView)findViewById(R.id.nav_view);
+        Menu navMenu = navView.getMenu();
+        navMenu.findItem(R.id.menu_reset).setEnabled(false);
+    }
+    @Override
+    public void onTick(int time) {
+
+        // display the time
+
+        if(gameSolved || !startGame) return;
+        // save time
+        gameController.saveGame(this);
+    }
+
+    @Override
+    public void onHintDialogPositiveClick() {
+        gameController.hint();
+    }
+
+    @Override
+    public void onResetDialogPositiveClick() {
+        gameController.resetLevel();
+    }
+
+    @Override
+    public void onShareDialogPositiveClick(String input) {
+        Intent sendBoardIntent = new Intent();
+        sendBoardIntent.setAction(Intent.ACTION_SEND);
+        sendBoardIntent.putExtra(Intent.EXTRA_TEXT, input);
+        sendBoardIntent.setType("text/plain");
+
+        Intent shareBoardIntent = Intent.createChooser(sendBoardIntent, null);
+        startActivity(shareBoardIntent);
+    }
+
+    @Override
+    public void onDialogNegativeClick() {
+        // do nothing
+    }
+
+    public static class ShareBoardDialog extends DialogFragment {
+        private LinkedList<IShareDialogFragmentListener> listeners = new LinkedList<>();
+
+        /*declare empty display code and click listener in case anyone
+         * tries to call the ShareBoardDialog without setting those attributes first
+         */
+
+        private String displayCode = "";
+        private View.OnClickListener copyClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        };
+
+        public void setDisplayCode(String displayCode) {
+            this.displayCode = displayCode;
+        }
+
+        public void setCopyClickListener(View.OnClickListener listener) {
+            copyClickListener = listener;
+        }
+
+        @Override
+        public void onAttach(Activity activity) {
+            super.onAttach(activity);
+            // Verify that the host activity implements the callback interface
+            if(activity instanceof IShareDialogFragmentListener) {
+                listeners.add((IShareDialogFragmentListener) activity);
+            }
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_Dialog);
+
+            LayoutInflater inflater = getActivity().getLayoutInflater();
+            DialogFragmentShareBoardBinding binding = DialogFragmentShareBoardBinding.inflate(inflater);
+
+            binding.ver3DisplaySudokuTextView.setText(displayCode);
+            binding.ver3CopySudokuToClipboardButton.setOnClickListener(copyClickListener);
+            builder.setView(binding.getRoot());
+
+            builder.setPositiveButton(R.string.share_confirmation_confirm, new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int id) {
+                    for(IShareDialogFragmentListener l : listeners) {
+                        l.onShareDialogPositiveClick(binding.ver3DisplaySudokuTextView.getText().toString());
+                    }
+                }
+            })
+                    .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            // User cancelled the dialog
+                        }
+                    });
+            return builder.create();
+        }
+    }
+
+    public static class ResetConfirmationDialog extends DialogFragment {
+
+        LinkedList<IResetDialogFragmentListener> listeners = new LinkedList<>();
+
+        @Override
+        public void onAttach(Activity activity) {
+            super.onAttach(activity);
+            // Verify that the host activity implements the callback interface
+            if(activity instanceof IResetDialogFragmentListener) {
+                listeners.add((IResetDialogFragmentListener) activity);
+            }
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            // Use the Builder class for convenient dialog construction
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_Dialog);
+            builder.setMessage(R.string.reset_confirmation)
+                    .setPositiveButton(R.string.reset_confirmation_confirm, new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            for(IResetDialogFragmentListener l : listeners) {
+                                l.onResetDialogPositiveClick();
+                            }
+                        }
+                    })
+                    .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            // User cancelled the dialog
+                        }
+                    });
+            return builder.create();
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle savedInstanceState) {
+        // Save the user's current game state
+
+        savedInstanceState.putParcelable("gameController", gameController);
+        savedInstanceState.putInt("gameSolved", gameSolved ? 1 : 0);
+
+        // Always call the superclass so it can save the view hierarchy state
+        super.onSaveInstanceState(savedInstanceState);
+    }
+
+    @Override
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+        //super.onRestoreInstanceState(savedInstanceState);
+    }
+
+}