From b2f9cd215b0fc0163512258a26a7c7bdc8c81ff0 Mon Sep 17 00:00:00 2001
From: Gongxter <Timm7@hotmail.de>
Date: Wed, 11 Nov 2015 14:28:24 +0100
Subject: [PATCH] Multilanguage for german English First GUI samples

---
 .idea/gradle.xml                              |   2 +-
 .idea/vcs.xml                                 |   2 +-
 app/build.gradle                              |   1 +
 app/src/main/AndroidManifest.xml              |  25 +-
 .../view/AppCompatPreferenceActivity.java     | 111 +++++++
 .../view/{GameView.java => GameActivity.java} |  68 ++--
 .../sudoku/view/MainActivity.java             |  23 ++
 .../tu_darmstadt/sudoku/view/MainMenu.java    |  52 ---
 .../sudoku/view/SettingsActivity.java         | 297 ++++++++++++++++++
 .../sudoku/view/SudokuCellView.java           |  52 +++
 .../sudoku/view/SudokuFieldLayout.java        |  43 +++
 .../res/drawable-hdpi/ic_info_black_24dp.png  | Bin 0 -> 321 bytes
 .../ic_notifications_black_24dp.png           | Bin 0 -> 233 bytes
 .../res/drawable-hdpi/ic_sync_black_24dp.png  | Bin 0 -> 368 bytes
 .../res/drawable-mdpi/ic_info_black_24dp.png  | Bin 0 -> 222 bytes
 .../ic_notifications_black_24dp.png           | Bin 0 -> 182 bytes
 .../res/drawable-mdpi/ic_sync_black_24dp.png  | Bin 0 -> 250 bytes
 .../res/drawable-v21/ic_info_black_24dp.xml   |   9 +
 .../ic_notifications_black_24dp.xml           |   9 +
 .../res/drawable-v21/ic_sync_black_24dp.xml   |   9 +
 .../res/drawable-xhdpi/ic_info_black_24dp.png | Bin 0 -> 412 bytes
 .../ic_notifications_black_24dp.png           | Bin 0 -> 278 bytes
 .../res/drawable-xhdpi/ic_sync_black_24dp.png | Bin 0 -> 467 bytes
 .../drawable-xxhdpi/ic_info_black_24dp.png    | Bin 0 -> 579 bytes
 .../ic_notifications_black_24dp.png           | Bin 0 -> 383 bytes
 .../drawable-xxhdpi/ic_sync_black_24dp.png    | Bin 0 -> 669 bytes
 .../drawable-xxxhdpi/ic_info_black_24dp.png   | Bin 0 -> 766 bytes
 .../ic_notifications_black_24dp.png           | Bin 0 -> 497 bytes
 .../drawable-xxxhdpi/ic_sync_black_24dp.png   | Bin 0 -> 875 bytes
 app/src/main/res/layout/activity_main.xml     |  18 ++
 .../main/res/layout/activity_main_menu.xml    |  20 --
 app/src/main/res/layout/app_bar_game_view.xml |   6 +-
 app/src/main/res/layout/content_game_view.xml |   6 +-
 app/src/main/res/layout/content_main_menu.xml |  14 -
 .../res/menu/activity_game_view_drawer.xml    |  22 +-
 app/src/main/res/menu/game_view.xml           |   3 +-
 app/src/main/res/menu/menu_main_menu.xml      |   6 -
 app/src/main/res/values-de/strings.xml        |   7 +
 app/src/main/res/values/strings.xml           |  75 ++++-
 app/src/main/res/xml/pref_data_sync.xml       |  21 ++
 app/src/main/res/xml/pref_general.xml         |  33 ++
 app/src/main/res/xml/pref_headers.xml         |  16 +
 app/src/main/res/xml/pref_highlighting.xml    |  11 +
 app/src/main/res/xml/pref_notification.xml    |  27 ++
 44 files changed, 826 insertions(+), 162 deletions(-)
 create mode 100644 app/src/main/java/tu_darmstadt/sudoku/view/AppCompatPreferenceActivity.java
 rename app/src/main/java/tu_darmstadt/sudoku/view/{GameView.java => GameActivity.java} (59%)
 create mode 100644 app/src/main/java/tu_darmstadt/sudoku/view/MainActivity.java
 delete mode 100644 app/src/main/java/tu_darmstadt/sudoku/view/MainMenu.java
 create mode 100644 app/src/main/java/tu_darmstadt/sudoku/view/SettingsActivity.java
 create mode 100644 app/src/main/java/tu_darmstadt/sudoku/view/SudokuCellView.java
 create mode 100644 app/src/main/java/tu_darmstadt/sudoku/view/SudokuFieldLayout.java
 create mode 100644 app/src/main/res/drawable-hdpi/ic_info_black_24dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_sync_black_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_info_black_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_sync_black_24dp.png
 create mode 100644 app/src/main/res/drawable-v21/ic_info_black_24dp.xml
 create mode 100644 app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml
 create mode 100644 app/src/main/res/drawable-v21/ic_sync_black_24dp.xml
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_sync_black_24dp.png
 create mode 100644 app/src/main/res/layout/activity_main.xml
 delete mode 100644 app/src/main/res/layout/activity_main_menu.xml
 delete mode 100644 app/src/main/res/layout/content_main_menu.xml
 delete mode 100644 app/src/main/res/menu/menu_main_menu.xml
 create mode 100644 app/src/main/res/values-de/strings.xml
 create mode 100644 app/src/main/res/xml/pref_data_sync.xml
 create mode 100644 app/src/main/res/xml/pref_general.xml
 create mode 100644 app/src/main/res/xml/pref_headers.xml
 create mode 100644 app/src/main/res/xml/pref_highlighting.xml
 create mode 100644 app/src/main/res/xml/pref_notification.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5f8ec24..166a03b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.4" />
+        <option name="gradleHome" value="D:\Program Files\Android\Android Studio\gradle\gradle-2.4" />
         <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 6564d52..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index ff4a23d..f77d0ee 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,4 +24,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:23.1.0'
     compile 'com.android.support:design:23.1.0'
+    compile 'com.android.support:support-v4:23.1.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2948c5e..5aedd69 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,23 +8,26 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme" >
-        <!--<activity
-            android:name=".MainMenu"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar" >
+        <activity android:name=".MainActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity>-->
+        </activity>
         <activity
-            android:name=".GameView"
-            android:label="@string/app_name"
+            android:name=".SettingsActivity"
+            android:label="@string/title_activity_settings"
+            android:parentActivityName=".MainActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="tu_darmstadt.sudoku.view.MainActivity" />
+        </activity>
+        <activity
+            android:name=".GameActivity"
+            android:label="@string/title_activity_game_view"
             android:theme="@style/AppTheme.NoActionBar" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+
         </activity>
     </application>
 
diff --git a/app/src/main/java/tu_darmstadt/sudoku/view/AppCompatPreferenceActivity.java b/app/src/main/java/tu_darmstadt/sudoku/view/AppCompatPreferenceActivity.java
new file mode 100644
index 0000000..958a856
--- /dev/null
+++ b/app/src/main/java/tu_darmstadt/sudoku/view/AppCompatPreferenceActivity.java
@@ -0,0 +1,111 @@
+package tu_darmstadt.sudoku.view;
+
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.support.annotation.LayoutRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatDelegate;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls
+ * to be used with AppCompat.
+ */
+public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
+
+    private AppCompatDelegate mDelegate;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        getDelegate().installViewFactory();
+        getDelegate().onCreate(savedInstanceState);
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        getDelegate().onPostCreate(savedInstanceState);
+    }
+
+    public ActionBar getSupportActionBar() {
+        return getDelegate().getSupportActionBar();
+    }
+
+    public void setSupportActionBar(@Nullable Toolbar toolbar) {
+        getDelegate().setSupportActionBar(toolbar);
+    }
+
+    @NonNull
+    @Override
+    public MenuInflater getMenuInflater() {
+        return getDelegate().getMenuInflater();
+    }
+
+    @Override
+    public void setContentView(@LayoutRes int layoutResID) {
+        getDelegate().setContentView(layoutResID);
+    }
+
+    @Override
+    public void setContentView(View view) {
+        getDelegate().setContentView(view);
+    }
+
+    @Override
+    public void setContentView(View view, ViewGroup.LayoutParams params) {
+        getDelegate().setContentView(view, params);
+    }
+
+    @Override
+    public void addContentView(View view, ViewGroup.LayoutParams params) {
+        getDelegate().addContentView(view, params);
+    }
+
+    @Override
+    protected void onPostResume() {
+        super.onPostResume();
+        getDelegate().onPostResume();
+    }
+
+    @Override
+    protected void onTitleChanged(CharSequence title, int color) {
+        super.onTitleChanged(title, color);
+        getDelegate().setTitle(title);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        getDelegate().onConfigurationChanged(newConfig);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        getDelegate().onStop();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        getDelegate().onDestroy();
+    }
+
+    public void invalidateOptionsMenu() {
+        getDelegate().invalidateOptionsMenu();
+    }
+
+    private AppCompatDelegate getDelegate() {
+        if (mDelegate == null) {
+            mDelegate = AppCompatDelegate.create(this, null);
+        }
+        return mDelegate;
+    }
+}
diff --git a/app/src/main/java/tu_darmstadt/sudoku/view/GameView.java b/app/src/main/java/tu_darmstadt/sudoku/view/GameActivity.java
similarity index 59%
rename from app/src/main/java/tu_darmstadt/sudoku/view/GameView.java
rename to app/src/main/java/tu_darmstadt/sudoku/view/GameActivity.java
index 271511b..1b87c0b 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/view/GameView.java
+++ b/app/src/main/java/tu_darmstadt/sudoku/view/GameActivity.java
@@ -1,10 +1,7 @@
 package tu_darmstadt.sudoku.view;
 
+import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.util.Log;
-import android.view.View;
 import android.support.design.widget.NavigationView;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
@@ -13,12 +10,16 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.ViewGroup;
+
 import tu_darmstadt.sudoku.controller.GameController;
 import tu_darmstadt.sudoku.game.*;
 
-public class GameView extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
+public class GameActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
 
     GameController gameController = new GameController(GameType.Default_9x9);
+    SudokuFieldLayout layout;
+    
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -26,18 +27,14 @@ public class GameView extends AppCompatActivity implements NavigationView.OnNavi
         setContentView(R.layout.activity_game_view);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
+        //TODO: set view for game
 
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                /* DEBUG */
-                String debug = gameController.getFieldAsString();
-                Log.d("Sudoku", debug);
 
-                Snackbar.make(view, "Printed example Sudoku board in console.", Snackbar.LENGTH_LONG).setAction("Action", null).show();
-            }
-        });
+        /*
+        // DEBUG
+        String debug = gameController.getFieldAsString();
+        Log.d("Sudoku", debug);
+         */
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
@@ -49,6 +46,7 @@ public class GameView extends AppCompatActivity implements NavigationView.OnNavi
         navigationView.setNavigationItemSelectedListener(this);
     }
 
+
     @Override
     public void onBackPressed() {
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -66,38 +64,34 @@ public class GameView extends AppCompatActivity implements NavigationView.OnNavi
         return true;
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        //noinspection SimplifiableIfStatement
-        if (id == R.id.action_settings) {
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
     @SuppressWarnings("StatementWithEmptyBody")
     @Override
     public boolean onNavigationItemSelected(MenuItem item) {
         // Handle navigation view item clicks here.
         int id = item.getItemId();
 
-        if (id == R.id.nav_camara) {
-            // Handle the camera action
-        } else if (id == R.id.nav_gallery) {
+        Intent intent;
 
-        } else if (id == R.id.nav_slideshow) {
+        if (id == R.id.nav_newgame) {
+            //create new game
+        } else if (id == R.id.nav_mainmenu) {
+            //new Game
+            intent = new Intent(this, MainActivity.class);
+            startActivity(intent);
 
-        } else if (id == R.id.nav_manage) {
+        } else if (id == R.id.nav_settings) {
+            //open settings
+            intent = new Intent(this,SettingsActivity.class);
+            startActivity(intent);
 
-        } else if (id == R.id.nav_share) {
 
-        } else if (id == R.id.nav_send) {
+
+        } else if (id == R.id.nav_highscore) {
+            //open highscore
+
+    //    } else if (id == R.id.nav_share) {
+
+    //    } else if (id == R.id.nav_send) {
 
         }
 
diff --git a/app/src/main/java/tu_darmstadt/sudoku/view/MainActivity.java b/app/src/main/java/tu_darmstadt/sudoku/view/MainActivity.java
new file mode 100644
index 0000000..8c4129c
--- /dev/null
+++ b/app/src/main/java/tu_darmstadt/sudoku/view/MainActivity.java
@@ -0,0 +1,23 @@
+package tu_darmstadt.sudoku.view;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+
+    }
+    public void onClicktext(View view) {
+        Intent i = new Intent(this, GameActivity.class);
+        startActivity(i);
+    }
+
+}
diff --git a/app/src/main/java/tu_darmstadt/sudoku/view/MainMenu.java b/app/src/main/java/tu_darmstadt/sudoku/view/MainMenu.java
deleted file mode 100644
index d016c10..0000000
--- a/app/src/main/java/tu_darmstadt/sudoku/view/MainMenu.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package tu_darmstadt.sudoku.view;
-
-import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.View;
-import android.view.Menu;
-import android.view.MenuItem;
-
-public class MainMenu extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main_menu);
-        //Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        //setSupportActionBar(toolbar);
-
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                        .setAction("Action", null).show();
-            }
-        });
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_main_menu, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        //noinspection SimplifiableIfStatement
-        if (id == R.id.action_settings) {
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-}
diff --git a/app/src/main/java/tu_darmstadt/sudoku/view/SettingsActivity.java b/app/src/main/java/tu_darmstadt/sudoku/view/SettingsActivity.java
new file mode 100644
index 0000000..029335f
--- /dev/null
+++ b/app/src/main/java/tu_darmstadt/sudoku/view/SettingsActivity.java
@@ -0,0 +1,297 @@
+package tu_darmstadt.sudoku.view;
+
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.support.v7.app.ActionBar;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.preference.RingtonePreference;
+import android.text.TextUtils;
+import android.view.MenuItem;
+import android.support.v4.app.NavUtils;
+
+import tu_darmstadt.sudoku.view.R;
+
+import java.util.List;
+
+/**
+ * A {@link PreferenceActivity} that presents a set of application settings. On
+ * handset devices, settings are presented as a single list. On tablets,
+ * settings are split by category, with category headers shown to the left of
+ * the list of settings.
+ * <p>
+ * See <a href="http://developer.android.com/design/patterns/settings.html">
+ * Android Design: Settings</a> for design guidelines and the <a
+ * href="http://developer.android.com/guide/topics/ui/settings.html">Settings
+ * API Guide</a> for more information on developing a Settings UI.
+ */
+public class SettingsActivity extends AppCompatPreferenceActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setupActionBar();
+    }
+
+    /**
+     * Set up the {@link android.app.ActionBar}, if the API is available.
+     */
+    private void setupActionBar() {
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            // Show the Up button in the action bar.
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+    }
+
+    @Override
+    public boolean onMenuItemSelected(int featureId, MenuItem item) {
+        int id = item.getItemId();
+        if (id == android.R.id.home) {
+            if (!super.onMenuItemSelected(featureId, item)) {
+                NavUtils.navigateUpFromSameTask(this);
+            }
+            return true;
+        }
+        return super.onMenuItemSelected(featureId, item);
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean onIsMultiPane() {
+        return isXLargeTablet(this);
+    }
+
+    /**
+     * Helper method to determine if the device has an extra-large screen. For
+     * example, 10" tablets are extra-large.
+     */
+    private static boolean isXLargeTablet(Context context) {
+        return (context.getResources().getConfiguration().screenLayout
+                & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    public void onBuildHeaders(List<Header> target) {
+        loadHeadersFromResource(R.xml.pref_headers, target);
+    }
+
+    /**
+     * A preference value change listener that updates the preference's summary
+     * to reflect its new value.
+     */
+    private static Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = new Preference.OnPreferenceChangeListener() {
+        @Override
+        public boolean onPreferenceChange(Preference preference, Object value) {
+            String stringValue = value.toString();
+
+            if (preference instanceof ListPreference) {
+                // For list preferences, look up the correct display value in
+                // the preference's 'entries' list.
+                ListPreference listPreference = (ListPreference) preference;
+                int index = listPreference.findIndexOfValue(stringValue);
+
+                // Set the summary to reflect the new value.
+                preference.setSummary(
+                        index >= 0
+                                ? listPreference.getEntries()[index]
+                                : null);
+
+            } else if (preference instanceof RingtonePreference) {
+                // For ringtone preferences, look up the correct display value
+                // using RingtoneManager.
+                if (TextUtils.isEmpty(stringValue)) {
+                    // Empty values correspond to 'silent' (no ringtone).
+                    preference.setSummary(R.string.pref_ringtone_silent);
+
+                } else {
+                    Ringtone ringtone = RingtoneManager.getRingtone(
+                            preference.getContext(), Uri.parse(stringValue));
+
+                    if (ringtone == null) {
+                        // Clear the summary if there was a lookup error.
+                        preference.setSummary(null);
+                    } else {
+                        // Set the summary to reflect the new ringtone display
+                        // name.
+                        String name = ringtone.getTitle(preference.getContext());
+                        preference.setSummary(name);
+                    }
+                }
+
+            } else {
+                // For all other preferences, set the summary to the value's
+                // simple string representation.
+                preference.setSummary(stringValue);
+            }
+            return true;
+        }
+    };
+
+    /**
+     * Binds a preference's summary to its value. More specifically, when the
+     * preference's value is changed, its summary (line of text below the
+     * preference title) is updated to reflect the value. The summary is also
+     * immediately updated upon calling this method. The exact display format is
+     * dependent on the type of preference.
+     *
+     * @see #sBindPreferenceSummaryToValueListener
+     */
+    private static void bindPreferenceSummaryToValue(Preference preference) {
+        // Set the listener to watch for value changes.
+        preference.setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
+
+        // Trigger the listener immediately with the preference's
+        // current value.
+        sBindPreferenceSummaryToValueListener.onPreferenceChange(preference,
+                PreferenceManager
+                        .getDefaultSharedPreferences(preference.getContext())
+                        .getString(preference.getKey(), ""));
+    }
+
+    /**
+     * This method stops fragment injection in malicious applications.
+     * Make sure to deny any unknown fragments here.
+     */
+    protected boolean isValidFragment(String fragmentName) {
+        return PreferenceFragment.class.getName().equals(fragmentName)
+                || GeneralPreferenceFragment.class.getName().equals(fragmentName)
+                || DataSyncPreferenceFragment.class.getName().equals(fragmentName)
+                || NotificationPreferenceFragment.class.getName().equals(fragmentName);
+    }
+
+    /**
+     * This fragment shows general preferences only. It is used when the
+     * activity is showing a two-pane settings UI.
+     */
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    public static class GeneralPreferenceFragment extends PreferenceFragment {
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            addPreferencesFromResource(R.xml.pref_general);
+            setHasOptionsMenu(true);
+
+            // Bind the summaries of EditText/List/Dialog/Ringtone preferences
+            // to their values. When their values change, their summaries are
+            // updated to reflect the new value, per the Android Design
+            // guidelines.
+            bindPreferenceSummaryToValue(findPreference("example_text"));
+            bindPreferenceSummaryToValue(findPreference("example_list"));
+
+        }
+
+        @Override
+        public boolean onOptionsItemSelected(MenuItem item) {
+            int id = item.getItemId();
+            if (id == android.R.id.home) {
+                startActivity(new Intent(getActivity(), SettingsActivity.class));
+                return true;
+            }
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
+    /**
+     * This fragment shows notification preferences only. It is used when the
+     * activity is showing a two-pane settings UI.
+     */
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    public static class NotificationPreferenceFragment extends PreferenceFragment {
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            addPreferencesFromResource(R.xml.pref_notification);
+            setHasOptionsMenu(true);
+
+            // Bind the summaries of EditText/List/Dialog/Ringtone preferences
+            // to their values. When their values change, their summaries are
+            // updated to reflect the new value, per the Android Design
+            // guidelines.
+            bindPreferenceSummaryToValue(findPreference("notifications_new_message_ringtone"));
+        }
+
+        @Override
+        public boolean onOptionsItemSelected(MenuItem item) {
+            int id = item.getItemId();
+            if (id == android.R.id.home) {
+                startActivity(new Intent(getActivity(), SettingsActivity.class));
+                return true;
+            }
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
+    /**
+     * This fragment shows data and sync preferences only. It is used when the
+     * activity is showing a two-pane settings UI.
+     */
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    public static class DataSyncPreferenceFragment extends PreferenceFragment {
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            addPreferencesFromResource(R.xml.pref_data_sync);
+            setHasOptionsMenu(true);
+
+            // Bind the summaries of EditText/List/Dialog/Ringtone preferences
+            // to their values. When their values change, their summaries are
+            // updated to reflect the new value, per the Android Design
+            // guidelines.
+            bindPreferenceSummaryToValue(findPreference("sync_frequency"));
+        }
+
+        @Override
+        public boolean onOptionsItemSelected(MenuItem item) {
+            int id = item.getItemId();
+            if (id == android.R.id.home) {
+                startActivity(new Intent(getActivity(), SettingsActivity.class));
+                return true;
+            }
+            return super.onOptionsItemSelected(item);
+        }
+    }
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    public static class TestFragment extends PreferenceFragment {
+        @Override
+        public void onCreate(Bundle savedInstanceState){
+            super.onCreate(savedInstanceState);
+            addPreferencesFromResource(R.xml.pref_highlighting);
+            setHasOptionsMenu(true);
+
+            // Bind the summaries of EditText/List/Dialog/Ringtone preferences
+            // to their values. When their values change, their summaries are
+            // updated to reflect the new value, per the Android Design
+            // guidelines.
+            //bindPreferenceSummaryToValue(findPreference(""));
+        }
+
+        @Override
+        public boolean onOptionsItemSelected(MenuItem item) {
+            int id = item.getItemId();
+            if (id == android.R.id.home) {
+                startActivity(new Intent(getActivity(), SettingsActivity.class));
+                return true;
+            }
+            return super.onOptionsItemSelected(item);
+        }
+
+    }
+}
diff --git a/app/src/main/java/tu_darmstadt/sudoku/view/SudokuCellView.java b/app/src/main/java/tu_darmstadt/sudoku/view/SudokuCellView.java
new file mode 100644
index 0000000..2649892
--- /dev/null
+++ b/app/src/main/java/tu_darmstadt/sudoku/view/SudokuCellView.java
@@ -0,0 +1,52 @@
+package tu_darmstadt.sudoku.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.provider.ContactsContract;
+import android.util.AttributeSet;
+import android.view.View;
+
+import java.util.jar.Attributes;
+
+/**
+ * Created by TMZ_LToP on 10.11.2015.
+ */
+public class SudokuCellView extends View {
+
+    public SudokuCellView(Context context) {
+        super(context);
+    }
+
+    public SudokuCellView(Context context, AttributeSet attrs){
+        super(context,attrs);
+
+    }
+
+    int pubx =0 ;
+    int puby =0 ;
+
+    public void setPos(int x,int y) {
+        //dpi = (width * 160)/density getRecourses().getDisplayMetrics().density
+
+        pubx = x;
+        puby = y;
+
+    }
+
+
+    @Override
+    public void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        int width = getWidth() - getPaddingRight();
+        int height = getHeight() - getPaddingBottom();
+
+        int paddingLeft = getPaddingLeft();
+        int paddingTop = getPaddingTop();
+
+        canvas.drawRect(pubx,puby,pubx+100,puby+100,new Paint());
+
+
+    }
+}
diff --git a/app/src/main/java/tu_darmstadt/sudoku/view/SudokuFieldLayout.java b/app/src/main/java/tu_darmstadt/sudoku/view/SudokuFieldLayout.java
new file mode 100644
index 0000000..bfd18fe
--- /dev/null
+++ b/app/src/main/java/tu_darmstadt/sudoku/view/SudokuFieldLayout.java
@@ -0,0 +1,43 @@
+package tu_darmstadt.sudoku.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.RelativeLayout;
+
+import tu_darmstadt.sudoku.controller.GameController;
+
+/**
+ * Created by Timm Lippert on 11.11.2015.
+ */
+public class SudokuFieldLayout extends RelativeLayout {
+
+
+    private GameController gamecont;
+
+    public SudokuCellView [][] gamecells;
+
+
+
+    public SudokuFieldLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public void setGame(GameController gc) {
+        if (gc == null) throw new IllegalArgumentException("GameController may not be null.");
+        gamecont = gc;
+        gamecells = new SudokuCellView[gc.getSize()][gc.getSize()];
+        int width = (Math.min(getWidth(),getHeight()))/gc.getSize();
+
+        for (int i = 0; i < gc.getSize(); i++) {
+            for (int j = 0; j < gc.getSize(); j++){
+
+                gamecells[i][j] = new SudokuCellView(getContext(), null);
+                //gamecells[i][j].setValues(i,j,width,field);
+            }
+        }
+
+
+    }
+
+}
diff --git a/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..da56077636546c97764fd2686daad67d7b529f59
GIT binary patch
literal 321
zcmV-H0lxl;P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD00039Nkl<Zcmd_p
zF^a-K6o>H-qjnO!mZF74z`KYHo<K2zM_7ctgH6ayB$;>tZQj~G9OBG_t^ED_kIXRP
z8;w~~Qsa5P=BYWdU__EBJMKte9gdtxYdq4khJueW&Pc>cvi{6361huX>Wn1p1Yv6=
zaRmWW!dHC7;kXjM_MA66Bsd3vLxS6)G3IUxb&OD!2oiZTy*WyW7<WLa&7lg#n~&C_
zJQ34n3y*&ad2^^msm-AZ<!BD=Q5NRV3}sAb3VDWTI8$iDo17;3LEe}UP#}q05k_hM
zUA2r$bmoTv^rcRbUo+sNf~GfeV@0H#ZTMZ`*)So=h&cx;S{|>pRP32C<oo;q(L9?;
Tfhv~Q00000NkvXXu0mjfLIsC(

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e200012181c392372b6c950a9464239709367fcc
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8Lp22U5qkP61PXEvTZ6d>a8@UZ?1
zA+c-66fgaBRuc>lIKkqWwEBhLN~4B^=^YF1?lx0w{jkHlvNhq4U%kY(4%UYj${gxU
zt{#`?C=^<Ez05t;=WV@fQ@R_!w%mzm|7#^%Ty1g>ypw+}YdKA#S3~g6)IW)n6udaq
z+)GOiED3ODRoiN{EBVotiHBXj>?{2uy>wZi)V_=1zmDyj)K|Gw_IHc)r4T`te0NDl
hwI^3XQhFp;iAM+Z&9%(1ZU(xY!PC{xWt~$(698`;Th;&o

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_sync_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_sync_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5ebdbd072989517b8c6230f65f7064d7c2ac017
GIT binary patch
literal 368
zcmV-$0gwKPP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003uNkl<ZcmchW
zF=_%q6hL1J6C14pffVjyJcM`@6)%y1@iHkRULfwq6dq$s!I%qZqq0okGek*d_J?8c
z{r2$~{{H2Xq_HxqSQ!&5V`61Ytc>Bnh6NK+0$5`HOv#KS=tYj%F$hmx(`HEa6MGCz
zVd+xXR3C*q>XmoYu)EvRqLNoKN9vrWebtl-5=snn<zMUBFPPxvS(G<4a`DD^c^6@T
z#z?#zFJB_0XmrF|<K-wq4UHS|_INqi^V6t_cf`v^gf<!v;(g*}A;R#V%bw$9B0`47
zhxW&%l%jMiPx6YnZ0Mc}W)doBaL(#is!qlWl_cyWwWP@j<4E12Fu=$Z^iCm13Y{m6
zotzOJIlsVEpDo5Q0jU;KN=Ir*010Dq*6agb<RMaqSQ%nvh?Rkq%kd50jLVTGj~NF5
O0000<MNUMnLSTYsh@6N3

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_info_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ef3dc0809e2030ac573605e4d50a1b15be283f3
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+irJgR1Ar*{!&pBo_7znsMbQe4M
zmu2aqie+Lg_Z%-OYdThQ-1WK3yF`&wq~^cgljetCWtg?+{hpb=@c6_R&GITYJe^Gr
zn+wS+w{7@Qu3Fze@l2LUOog?>hoS^g9uF~&xlN*)H`W{wZ;U+{TXN|u|AX!W%Mvu1
zCO7Tl*uo`~E>@u<#XBj|^}>ul|6C>19PJEUR$ER;nAhbpt#9Vs*Ef&3bU%Gs$9S4s
WW8+=f3r;`>GkCiCxvX<aXaWHBIaSO6

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b36475d7fa83a40c21ebab1109c6d2a73d2484a7
GIT binary patch
literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iT2B|pkP60R355ekCY+gY<bcPP
zss*3^JIrucQ<T@%n!wB5sH5bdcDQ;$5=YJP30@wRrXiY4(;f$}JN<z@mN~$MdwbhV
z2i6${QhB`FH)ieVj6STtMyl@7wGZ;vGUueE3bHZ|tehjF`=8U{Ra1C^alF8K#fFEf
f0Xy{%H!v{BDQ@(b<#wSR=nw`^S3j3^P6<r_hf_hU

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_sync_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_sync_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9685e8e16561136ae1abf674d2d1019fea78ca1b
GIT binary patch
literal 250
zcmV<W00sYvP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002NNkl<Zcmb`@
zF=_%q7{}4qgjEPRgLObRL=PxfrBVp8o7;E`kr2{&h+P8vrLalZuh;?KwErK>jC<LZ
z&ZBf5rSs6cXw=h#+ZnWG(~`>CUMHOLgs0@uOIM+hc=c_OeCtYY$lmfH>|_qY(a5Lp
zBC`?BMt+0`nYqvz>4i$B5_%&SVO?^iM%c@|3GYT~gU&Mf*o80860LBx0>q!>QEKKS
zbPhJ=;$MP1X$|6brX|#l&bsLVpmeTu&enbW0-8ozYX{n?_5c6?07*qoM6N<$f=D}Y
AIRF3v

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-v21/ic_info_black_24dp.xml b/app/src/main/res/drawable-v21/ic_info_black_24dp.xml
new file mode 100644
index 0000000..8024b5b
--- /dev/null
+++ b/app/src/main/res/drawable-v21/ic_info_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+            android:fillColor="#FF000000"
+            android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,15h-2v-6h2v6zm0,-8h-2V7h2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml b/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml
new file mode 100644
index 0000000..14f20f9
--- /dev/null
+++ b/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+            android:fillColor="#FF000000"
+            android:pathData="M11.5,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zm6.5,-6v-5.5c0,-3.07 -2.13,-5.64 -5,-6.32V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5v0.68c-2.87,0.68 -5,3.25 -5,6.32V16l-2,2v1h17v-1l-2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml b/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml
new file mode 100644
index 0000000..ab79101
--- /dev/null
+++ b/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+            android:fillColor="#FF000000"
+            android:pathData="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01,-.25 1.97,-.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0,-4.42,-3.58,-8,-8,-8zm0 14c-3.31 0,-6,-2.69,-6,-6 0,-1.01.25,-1.97.7,-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4,-4,-4,-4v3z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..46ed12a89bd7303d12a00edee53504903c9fdaf1
GIT binary patch
literal 412
zcmV;N0b~A&P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004FNkl<ZcmeIy
zPj1>k7>D5($61se0<oZlTY%soNM+G;KyrYj%{EnJDeVa?d4rI84$BuPf=$8gHumQ0
zDyzZ&W<DVy@%;AlN;8(Zx(FUK?ukf9$;nAch`3{lhqDn+?2&@)_{tD#eO}3tie&`!
zu<(VyNX?}zXylfkNW%sA)YRq|VzCWvYPfB3ypiy!^aF8NQ2n&xxX+a6^UpbOq)VY!
zq;&73bT1Sbk*fqUK626%q7o1u!Q`=53v6j&m?4UrV7ONetT05Xfe=HY8i+BZh}t6y
z2MoDtAUk{D3|Ew>24W16Y9PdLry5vdn5qWG7(8}rf#0;i^i3`Bz)3@LmB1SV3Ir;F
zXA1R55y$<ZLy3iRU`~YqaoBe%`D_r&t+}Cwwq;_?2Ws*OEH3AUMiv|!d^vM0ba^2|
zD)z=R9jtxgk!{I8=YavvJSMCNi8+vwaUdpS$(R;b7vMjpGor`QfDTIl0000<MNUMn
GLSTYbg0Y4G

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7de8581da3acd7dad37cfdd44045514ee24d67e0
GIT binary patch
literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002pNkl<ZcmeIx
z&nf^>7>4m@$40i?z@(7tAuhqf9h{9DK(kS9VPYq@pj?P({$*j*$70e<k@L<ur^xxe
z`|nwOOl8?BB`pmXtdK;BjXNia_A^kEgiRLR4sI53Y!l5Mci0!ZWtRv}7_e{l$}xdX
zu^;9LaD;j6fQ2?`yaF{F0gvUiGjy!;;vMK&Lw1M>+edaK1ul_2NP&A~Pg39!*_#v?
zkeRk$7|4Mf$N?t@T-x(e!eI;N(w!F)7P$0*|EtF)>xk}V7O04Biy9mEOaUnp*K{AN
cD9HYhcl4RW{G`P`$^ZZW07*qoM6N<$f+&V{8UO$Q

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..860a5db38b393009a7407ced8d9fec8da0b460e1
GIT binary patch
literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004+Nkl<Zcmd^<
zL8}r`6vux}k%l8JADGZ$q^+9>Y8m235b4thfjq5s2xGL-&my=8Y}rO#iqNL_sAt7#
zbGQi8aPN&dD}Q(UKmQ-YoO`)AM%MLWT`$)4VqGuR^<rHwoH(*3XGqhc{`}lBr(-D4
z@0n7!RR|lhDisfD(PPXOapyp{`ZY}$usc&^78k9-!YMY?3FcMAQ}Ny@CIs?~UyLFi
zyQSNxj37QCNU5So%3c*Y0X*i1#-9_)P$zCk@$yE)U%5vpiQA_EUOsB{Eiqi{)C@15
zHTs$u`Z~43%QuZ)5kuQuI4^%RdY>3-I(3JalY4Vwc%W0i@p9B?ix{5h)DbUhjrRWQ
zC$I66YjjKu6St<pw{lBDC<*)Ui`L{eJgmIbiSINBV6O4qKjY=^tnh&#I&M`L6p>QJ
zPo5IU6w&jpC@59DAecvdaf&5rK~PjglW}m0Jwp-{q$)-COd;&Jrcaw1Qk^1WgA`Ad
ziaHZcwhG9|xiJ$cDFbG#IB*wVAB%B4*7aD|V_lDRJ&d?8{sN$?X^Ds6w;2Ec002ov
JPDHLkV1g1j%<2FD

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a81eeb9ee7ef8ab1662b5b6bc88cf74912e4cb5c
GIT binary patch
literal 579
zcmV-J0=)f+P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0006CNkl<ZcmeI!
zy-HhQ9LMqRVth&Cl+%cpQbQD5brhPxt5DEI$wjnK3+<$aR%kaxhl0XUgCUgAO9<IR
z2yV@Z`0v`~Ij_%4hV%K|z!#pJ@F$ncO|2qZG-%SH&yawCA$>YDX|Txx7F9T)MSz5C
z%me$p#<(@Ec}8Mx!WA`)S?3W+u@<Xnx6Dr@!_HYkqaB`*j2lr$i&?%Rns!Wqj27_`
zjl1C$8F>6bG_Q+CN{iWZ6iFpgn8im7?Un+GeL)QF6AA4ghWDNXmU%KBG@?RmKM)K1
zMojBSqWw=2twt=5)`ISdVGXesBvgrXZ8hkU2o;{K22Jn?b%0n667~qyLM-o&5Jdv(
zL4TP?X$x_%4U`&Af{svXIte;OspBN5jZz=6{@DvXl!i`%1}Ftig2q!9G`&wY{XgoC
zlb|+AO(#JoC^eh}9ip`9B<LMV3k24KLeCF)upZ<SYTtU$E}<$+tOf;?iEw2#=z>T!
zt3hvwp=B+|Cze%9K`*Qj(>Y>cXT-L|$au~Wj|A$*gSJWNv(cQ7Bv#<YSk5nINTEd6
zNX~DHq~y^xkW(gu61SQkt4Kx#j<w}{U<NJf8vd7tY@<<y?-^oVIKxA`8uzJke5x2z
z<ubtu7jVG}#(C^<$2j72_t~Y4Me}TM#3^lh3>Y(JK#w*j9P*Yqa=F};`Uf%+Z6V(b
RSUCUy002ovPDHLkV1jt6`k4R#

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab8a9c464c6c30f54a49d18e1d48b3b8637a9295
GIT binary patch
literal 383
zcmV-_0f7FAP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0003-Nkl<ZcmeIs
zzb->z9Eb5|s``^)CE_}yje)z64pu{@M5;_j>;{9|U?dVTN(BQGf?Y^x(n#9o)!|G%
zjU4BEPu~u|&vOG0CJAFqk!rUBLt&b8T-X^?co*)3o#I&$*V6)CRU<=Ncojs30vigA
zQsRV0WT?S0E94odF?RXD{n0zygPU6B6&Ist78!sYI=Gm%sgSV)+&|kVLp5B2*2%~c
zokT+|3ZOU68!lmw<dNIMrKpD3B;ToqKAAwOf=k&NQn#sxt`M5X37SP_RWejU=14Mh
zh|HyA=mMD+$<Pxr4av|KGHuCF3mGRW78|l58?qrAvLPF?p+Ghi=y&u>`W^j}en-C~
z-w`ZncLYl=<KnO(V}5XbYU0gJ-=R9*Z1x>0<4vB2$j%)(JeuRaXJ-b_M%dt*X16+J
datt|R%rC40J4*F-*<%0z002ovPDHLkV1n31phf@y

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7990080d1d7d7e30b1844c18be8928128af147c
GIT binary patch
literal 669
zcmV;O0%HA%P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0007HNkl<ZcmeH~
zu}fQF6h}{MQ>Ri)#A+rN#ZV}M#KrnQ=uoUdx&}e)B(84V)X*Zhb`j|=Sg}(VanQLY
z)jde5NeBw@b}N@>BJX?O<K=>$-+X_Zyy1Q~JX9W8v!)}~bi|sDSkn<}I$}*ntm%j~
z9kHe(+;B;meM-zT*nOQ~j#(ySLPw>+CRr0gDs@&#*-{ct8MUTVV>WrE=cE~@z!sG@
zN-c^>D`}?Kp%s)$S}DjF2Y0^GOt&A`B27f)iji)gA9<>X$_XjF_`tB|ftCv>t>D2c
zYFva=>dYif^r{>pGMfkzQt3Vx5tVf!(nkXct#m(!=r=AyBtEK=GClZ^L+_;}B5|xL
zzT(TSYC9qVSwtm|FVm{+mI0huPzAs6=LzSkaSmrbtML+Xu&o+5aOQ^^e@7hXZ@z~!
zzt#9_;$T8Gp5aVQjlU!g`c-2UXKvN_Q{tdkHD2S)4f-04gC6v4<jkcSPZI}ys_`$*
zl-2k+aqz}(v+b+#0&!4Kjo)#mq{g?1gD-w3$h;b_fIq%Z#~`9Ig)eV|kE`GLv4bz)
zRNGG?v5ejuWBBllivM563=LIs;CaLjbMb!%z3@2lL;o%bt@Me=WT`8mCV4s|A(j4+
z#)DNvrAm%YNJypkc#+~XpfpK)B&3ozqtp<UCX2K~l2e+cg`jgtjv$hxQV|KH#V*rm
zBx$7<awq3(v%m!X^dd<s&2WV{Bmt!nPOK@VSfOr935HmwVM0ieVTmJdP3R~Fm}7%I
z&Zu(js}n!Qbg-s_H65(!U`+>WI#|=enhvb-FnQ!32goiP%3qR|00000NkvXXu0mjf
DBY7@j

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8f86b925366485cef1f43c089f785ab8415068d
GIT binary patch
literal 766
zcmV<a0s;MrP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0008TNkl<ZcmeI$
z%Sv-s7>DuaOF?qdkw!ZaV?`>xjy6gVLBv5If;S){v5mCXA=Y@H1rfw?2k|s36`TsO
zNHkbQ$!A*+5eLd!$4>T2_S$>D#r=D(;16rBEP_R$P$(1%^^m2=ItNs!^UUj8&(x`~
z&l*LtbfZ#|309~g2Axu3oCHcl$g<57(qs*`7$HKSIw(*>Ty)MH?F1shPyB;e=#~ZI
z_$<#QVzCQy_@<vd#DmK8;e%-&5RbYekEde%ig?@#Q9RPa5#mFCkir9l)DWMl@)eeS
z!!_b#R}5j%AlHb`T`_<qUs6K?s7eY8VjLj>bx0J~enA3k6_=)wfSbaFejbp3yC+S{
z_7DY?X;B_gQjQiRTt1lJbNASe)3hHEH3Nk2X;KG&s~Yf`BuyzGss;$NVD1ZQ>IR$<
z!B`eiH$cc>Y+L1kO$;S@QaRv}I7TKArHx@^1yR}(MyiO?PB74eD6Y%=3f0*#j*5ul
z=5e%+D6WK~14MDVII194dQYr$jH9~h0XH~$Rz0ABqgT}fUjFw3KEM%D{t<tGYjj`r
zfE^sIsUEP5qoV2o1sr8n56IxCTlIi044kSRaDtJN+5w9g8CN@C6e9^5DhE6e!_bz>
z0UH<_Q90l{j72zCH=xQV%rU2Kzzj`k=T_B#ItiMzplU#Yrp38XGoVI{7UU2mP12$=
zqM+YsSs!;u!2L@vF65Db%i+>05@0{$T9iX1pnj(f3sO{(06L`;O9r??eD0Do77h74
z;V-_%vH{L~JUnSU(9NMwpKd1}iL!=x+!AegYKnUge|2;CAWhk$H%~9V$#H>L?3_t_
z7Uu^(BNnPtAVwgP%(}c>tIUufP!Te0^4P-PR2zKDCzOaY#u9%b231&Olo%?d7-pUl
wyBu>vgO|4&+;Gee%M{4ag*Bm2C=?3)2UQ-CT`xs~ZvX%Q07*qoM6N<$g2UHD;{X5v

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..86f89d75000ada881e4c14891ceec47c27c7fb0d
GIT binary patch
literal 497
zcmV<N0S^9&P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0005FNkl<ZcmeIt
zv2RUb9LDi)7x#8&BP4BYO&4LXi@$)RgGFMnks8Eu2Z<V*NLtZZ%n}i+bg<zLB3Gm$
z1`KQ^as=mRyvw;aT<3Yu`^xiq{(<L<nVFgWm*!bxNJYhSF4LzlhZzx!_mV>tWS;T;
zaYBz`tPu^nL@|bq0naE#)fn)NVnp*CkjTQsfCVzQ#5%jgl<jhZMY439N5mhk<{`((
z$^q^Xf4RHtCljanOw6!PoFW5Psfii)iz{?&gZRhYq(cLug<Yc~t3*pXLkEuXrL}-P
z7D;T5Cq#?eVUDEE6D{u?3H5p3dcZsOk<3LxunQzJk_5aUk&}dICrIL!EMS8q-pT^r
zfZh>8xP!>8N(0U!w=NC1j@$!jz<uO~(txMPeUt`#K<=wFU=O*U(tsbxg?5<+IKTl8
zaDW3G-~b0WzyS_$fCC&bkOvI(_w@<-`}zd^eSL!dzCJ;JU!S1AuTRMTzBC~^9uCmW
z0cIxfotUzU?7f~EFd}<*rUq=1y%lO=!fKW&!1ly|EsD@*hiKSidQeKjHZ?IGHCyy3
n$_lr6MMcGkO_nh;GZXj?c~leGfPlDe00000NkvXXu0mjfZC>5g

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_sync_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_sync_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9f56f327d6346a39fa6f69d8827ff0be7a4337d
GIT binary patch
literal 875
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z-;8{;uuoF_;%J_Z=H0J_W3g(
z>AlH{ab;?9J<uP<sU$c%n&pU|LRr!(hn@vVJ+4}vi<CO#BO;ays4QCgzmYS>g@dus
zS3Fj^r{zaz$Fn8&d}%W(?;Egx`}y_xAGvkbzxP>-ufMV)F!@|n?Z&wHHP^*oe?5wo
z*(xr#vgi<FH_zp)wf|nv+3aWEc<`53^0ZA`e_565T+Hxwc-~g%berqY`I4yc9qCtg
zHEnR5;on+ra`700@SB3K%MLNN{*hO$x}oCq=y0N(Xk2j0BySb7-z{c+msO`#c7;Z4
zE?)TZkxp3Rk#kcw_5Hokp4C3ryY__HqQioU=YGzz^tWGqM6>7N3?sowUJv(kS~`R%
zow7(}bPUo|SvZet(WVAxsUOmwD<|~i{SA0Jjcv|H-KHfW9;dh#88sV!vHwuMW4TLc
z?n;3NEp{$XwQCG|SA2Qc5^DNw7L%QZ&`RIc7LN4~*FWgi-TG35eT$OT-5-m@12Ywk
z4`)4*|DpUKDpy*`xI61f|BsaL+}Y~JzxMp#wVN4q``d{#ol-yL=JTw|J)YuLzqh8z
z|JK!Q+(w^QxJ~=ux%t*NhqQlz%FH!E0k`L!Jj4B~TyB2LueVLV?H8)me44mVe)oTY
z?GGoLeV0%AD<OM8eg5iP`4c_+*8BZgAD?2s)86aNgUPa6-?D#i->Lma@Wb+3-&*@0
zm+<fV!4vpXf_={Fg|mMo1?T?aRbR7uqo8X|z!UwgnUd;Xl(i=RNMH*5DWcBuXB}I7
z&>`E+S*O?kbK^c8_wV_OIqO#k&$L$k;39r<!W1q+RhdmKE9L~c3#lwU^xb0V#Mx8y
zpQucAnkv*M>3-p+pV|bchu(99KY6clnh~I|v&r15vZHo?-24CqcCN)9K3XN}A}1OT
zxve=QtUaZ}y=d`*_!BEbW-dFCt&-2h$|v|pc%!R+qu7c0hwMJNt-G1p<#;P|S;Lb+
z#T4F?6J#_FaD2ZeYGtu$oq&;BN;IQX<b!Lo8kRLmYF&Gk&Gakc>6N%zUvB3!n~xic
v+kD7bYbW*k>&7^F?8L|D{cgQd|C!2ftO$D&n7s#>i5NUx{an^LB{Ts5h>e~y

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..c7502cc
--- /dev/null
+++ b/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="tu_darmstadt.sudoku.view.MainActivity">
+
+    <TextView android:id="@+id/testString"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:editable="true"
+        android:clickable="true"
+        android:onClick="onClicktext"
+        android:text="@string/app_name"/>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_main_menu.xml b/app/src/main/res/layout/activity_main_menu.xml
deleted file mode 100644
index 7697f78..0000000
--- a/app/src/main/res/layout/activity_main_menu.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-    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:layout_width="match_parent"
-    android:layout_height="match_parent" android:fitsSystemWindows="true" tools:context=".MainMenu">
-
-    <android.support.design.widget.AppBarLayout android:layout_height="wrap_content"
-        android:layout_width="match_parent" android:theme="@style/AppTheme.AppBarOverlay">
-
-    </android.support.design.widget.AppBarLayout>
-
-    <include layout="@layout/content_main_menu" />
-
-    <android.support.design.widget.FloatingActionButton android:id="@+id/fab"
-        android:layout_width="wrap_content" android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin"
-        android:src="@android:drawable/ic_dialog_email" />
-
-</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/app_bar_game_view.xml b/app/src/main/res/layout/app_bar_game_view.xml
index fecb452..f49a0e8 100644
--- a/app/src/main/res/layout/app_bar_game_view.xml
+++ b/app/src/main/res/layout/app_bar_game_view.xml
@@ -4,7 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
     android:layout_height="match_parent" android:fitsSystemWindows="true"
-    tools:context="tu_darmstadt.sudoku.view.GameView">
+    tools:context="tu_darmstadt.sudoku.view.GameActivity">
 
     <android.support.design.widget.AppBarLayout android:layout_height="wrap_content"
         android:layout_width="match_parent" android:theme="@style/AppTheme.AppBarOverlay">
@@ -17,9 +17,5 @@
 
     <include layout="@layout/content_game_view" />
 
-    <android.support.design.widget.FloatingActionButton android:id="@+id/fab"
-        android:layout_width="wrap_content" android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin"
-        android:src="@android:drawable/ic_dialog_email" />
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/content_game_view.xml b/app/src/main/res/layout/content_game_view.xml
index 8141eb9..908eb6d 100644
--- a/app/src/main/res/layout/content_game_view.xml
+++ b/app/src/main/res/layout/content_game_view.xml
@@ -7,6 +7,10 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:showIn="@layout/app_bar_game_view" tools:context="tu_darmstadt.sudoku.view.GameView">
+    tools:showIn="@layout/app_bar_game_view" tools:context="tu_darmstadt.sudoku.view.GameActivity">
+    <tu_darmstadt.sudoku.view.SudokuFieldLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
 
+    </tu_darmstadt.sudoku.view.SudokuFieldLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/content_main_menu.xml b/app/src/main/res/layout/content_main_menu.xml
deleted file mode 100644
index 7f0cbd7..0000000
--- a/app/src/main/res/layout/content_main_menu.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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: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:showIn="@layout/activity_main_menu" tools:context=".MainMenu">
-
-    <TextView android:text="Hello World! :)" android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-</RelativeLayout>
diff --git a/app/src/main/res/menu/activity_game_view_drawer.xml b/app/src/main/res/menu/activity_game_view_drawer.xml
index fed8d76..7e17bf4 100644
--- a/app/src/main/res/menu/activity_game_view_drawer.xml
+++ b/app/src/main/res/menu/activity_game_view_drawer.xml
@@ -2,22 +2,22 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <group android:checkableBehavior="single">
-        <item android:id="@+id/nav_camara" android:icon="@android:drawable/ic_menu_camera"
-            android:title="Import" />
-        <item android:id="@+id/nav_gallery" android:icon="@android:drawable/ic_menu_gallery"
-            android:title="Gallery" />
-        <item android:id="@+id/nav_slideshow" android:icon="@android:drawable/ic_menu_slideshow"
-            android:title="Slideshow" />
-        <item android:id="@+id/nav_manage" android:icon="@android:drawable/ic_menu_manage"
-            android:title="Tools" />
+        <item android:id="@+id/nav_newgame" android:icon="@android:drawable/ic_menu_camera"
+            android:title="@string/new_game" />
+        <item android:id="@+id/nav_mainmenu" android:icon="@android:drawable/ic_menu_gallery"
+            android:title="@string/mainmenu" />
+        <item android:id="@+id/nav_settings" android:icon="@android:drawable/ic_menu_slideshow"
+            android:title="@string/settings" />
+        <item android:id="@+id/nav_highscore" android:icon="@android:drawable/ic_menu_manage"
+            android:title="@string/highscore" />
     </group>
 
-    <item android:title="Communicate">
+    <item android:title="@string/group">
         <menu>
             <item android:id="@+id/nav_share" android:icon="@android:drawable/ic_menu_share"
-                android:title="Share" />
+                android:title="@string/help" />
             <item android:id="@+id/nav_send" android:icon="@android:drawable/ic_menu_send"
-                android:title="Send" />
+                android:title="@string/about" />
         </menu>
     </item>
 
diff --git a/app/src/main/res/menu/game_view.xml b/app/src/main/res/menu/game_view.xml
index 47a66d9..fe20e5c 100644
--- a/app/src/main/res/menu/game_view.xml
+++ b/app/src/main/res/menu/game_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/action_settings" android:title="@string/action_settings"
-        android:orderInCategory="100" app:showAsAction="never" />
+
 </menu>
diff --git a/app/src/main/res/menu/menu_main_menu.xml b/app/src/main/res/menu/menu_main_menu.xml
deleted file mode 100644
index 2b4455a..0000000
--- a/app/src/main/res/menu/menu_main_menu.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<menu 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" tools:context=".MainMenu">
-    <item android:id="@+id/action_settings" android:title="@string/action_settings"
-        android:orderInCategory="100" app:showAsAction="never" />
-</menu>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000..a275172
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="new_game">Neues Spiel</string>
+    <string name="settings">Einstellungen</string>
+    <string name="highscore">Bestenliste</string>
+    <string name="mainmenu">Hauptmenü</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a5e1065..a4fee65 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,81 @@
 <resources>
     <string name="app_name">Sudoku</string>
     <string name="action_settings">Settings</string>
-    <string name="title_activity_game_view">GameView</string>
+    <string name="title_activity_game_view">Sudoku</string>
+
+    <!-- Strings related to Menu -->
+    <string name="new_game">New Game</string>
+    <string name="settings">Settings</string>
+    <string name="highscore">Highscore</string>
+    <string name="mainmenu">Main Menu</string>
+    <string name="group">Group</string>
+    <string name="help">Help</string>
+    <string name="about">About</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="title_activity_settings">Settings</string>
+
+    <!-- Strings related to Settings -->
+
+    <!-- Strings related to Highlight -->
+    <string name="pref_highlighting_selection">Selection</string>
+    <string name="pref_highlighting_selection_values">Values</string>
+
+
+    <!-- Example General settings -->
+    <string name="pref_header_general">General</string>
+
+    <string name="pref_title_social_recommendations">Enable social recommendations</string>
+    <string name="pref_description_social_recommendations">Recommendations for people to contact
+        based on your message history
+    </string>
+
+    <string name="pref_title_display_name">Display DeineMudda</string>
+    <string name="pref_default_display_name">Anonymous</string>
+
+    <string name="pref_title_add_friends_to_messages">Add friends to messages</string>
+    <string-array name="pref_example_list_titles">
+        <item>Always</item>
+        <item>When possible</item>
+        <item>Never</item>
+    </string-array>
+    <string-array name="pref_example_list_values">
+        <item>1</item>
+        <item>0</item>
+        <item>-1</item>
+    </string-array>
+
+    <!-- Example settings for Data & Sync -->
+    <string name="pref_header_data_sync">Data &amp; sync</string>
+
+    <string name="pref_title_sync_frequency">Sync frequency</string>
+    <string-array name="pref_sync_frequency_titles">
+        <item>15 minutes</item>
+        <item>30 minutes</item>
+        <item>1 hour</item>
+        <item>3 hours</item>
+        <item>6 hours</item>
+        <item>Never</item>
+    </string-array>
+    <string-array name="pref_sync_frequency_values">
+        <item>15</item>
+        <item>30</item>
+        <item>60</item>
+        <item>180</item>
+        <item>360</item>
+        <item>-1</item>
+    </string-array>
+
+    <string name="pref_title_system_sync_settings">System sync settings</string>
+
+    <!-- Example settings for Notifications -->
+    <string name="pref_header_notifications">Notifications</string>
+
+    <string name="pref_title_new_message_notifications">New message notifications</string>
+
+    <string name="pref_title_ringtone">Ringtone</string>
+    <string name="pref_ringtone_silent">Silent</string>
+
+    <string name="pref_title_vibrate">Vibrate</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_data_sync.xml b/app/src/main/res/xml/pref_data_sync.xml
new file mode 100644
index 0000000..ffda831
--- /dev/null
+++ b/app/src/main/res/xml/pref_data_sync.xml
@@ -0,0 +1,21 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
+         dismiss it. -->
+    <!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
+    <ListPreference
+        android:key="sync_frequency"
+        android:title="@string/pref_title_sync_frequency"
+        android:entries="@array/pref_sync_frequency_titles"
+        android:entryValues="@array/pref_sync_frequency_values"
+        android:defaultValue="180"
+        android:negativeButtonText="@null"
+        android:positiveButtonText="@null" />
+
+    <!-- This preference simply launches an intent when selected. Use this UI sparingly, per
+         design guidelines. -->
+    <Preference android:title="@string/pref_title_system_sync_settings">
+        <intent android:action="android.settings.SYNC_SETTINGS" />
+    </Preference>
+
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
new file mode 100644
index 0000000..d7cfdc5
--- /dev/null
+++ b/app/src/main/res/xml/pref_general.xml
@@ -0,0 +1,33 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <SwitchPreference
+        android:key="example_switch"
+        android:title="@string/pref_title_social_recommendations"
+        android:summary="@string/pref_description_social_recommendations"
+        android:defaultValue="true" />
+
+    <!-- NOTE: EditTextPreference accepts EditText attributes. -->
+    <!-- NOTE: EditTextPreference's summary should be set to its value by the activity code. -->
+    <EditTextPreference
+        android:key="example_text"
+        android:title="@string/pref_title_display_name"
+        android:defaultValue="@string/pref_default_display_name"
+        android:selectAllOnFocus="true"
+        android:inputType="textCapWords"
+        android:capitalize="words"
+        android:singleLine="true"
+        android:maxLines="1" />
+
+    <!-- NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
+         dismiss it. -->
+    <!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
+    <ListPreference
+        android:key="example_list"
+        android:title="@string/pref_title_add_friends_to_messages"
+        android:defaultValue="-1"
+        android:entries="@array/pref_example_list_titles"
+        android:entryValues="@array/pref_example_list_values"
+        android:negativeButtonText="@null"
+        android:positiveButtonText="@null" />
+
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml
new file mode 100644
index 0000000..e94b4ce
--- /dev/null
+++ b/app/src/main/res/xml/pref_headers.xml
@@ -0,0 +1,16 @@
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- These settings headers are only used on tablets. -->
+
+    <header android:fragment="tu_darmstadt.sudoku.view.SettingsActivity$GeneralPreferenceFragment"
+        android:title="@string/pref_header_general" android:icon="@drawable/ic_info_black_24dp" />
+
+    <header
+        android:fragment="tu_darmstadt.sudoku.view.SettingsActivity$NotificationPreferenceFragment"
+        android:title="@string/pref_header_notifications"
+        android:icon="@drawable/ic_notifications_black_24dp" />
+
+    <header android:fragment="tu_darmstadt.sudoku.view.SettingsActivity$DataSyncPreferenceFragment"
+        android:title="@string/pref_header_data_sync" android:icon="@drawable/ic_sync_black_24dp" />
+
+</preference-headers>
diff --git a/app/src/main/res/xml/pref_highlighting.xml b/app/src/main/res/xml/pref_highlighting.xml
new file mode 100644
index 0000000..ff4be12
--- /dev/null
+++ b/app/src/main/res/xml/pref_highlighting.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory android:title="@string/pref_highlighting_selection">
+        <SwitchPreference android:id="@+id/pref_highlighting_selection_values"
+            android:key="example_switch"
+            android:title="@string/pref_title_social_recommendations"
+            android:summary="@string/pref_description_social_recommendations"
+            android:defaultValue="true"/>
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_notification.xml b/app/src/main/res/xml/pref_notification.xml
new file mode 100644
index 0000000..298ecfb
--- /dev/null
+++ b/app/src/main/res/xml/pref_notification.xml
@@ -0,0 +1,27 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- A 'parent' preference, which enables/disables child preferences (below)
+         when checked/unchecked. -->
+    <SwitchPreference
+        android:key="notifications_new_message"
+        android:title="@string/pref_title_new_message_notifications"
+        android:defaultValue="true" />
+
+    <!-- Allows the user to choose a ringtone in the 'notification' category. -->
+    <!-- NOTE: This preference will be enabled only when the checkbox above is checked. -->
+    <!-- NOTE: RingtonePreference's summary should be set to its value by the activity code. -->
+    <RingtonePreference
+        android:dependency="notifications_new_message"
+        android:key="notifications_new_message_ringtone"
+        android:title="@string/pref_title_ringtone"
+        android:ringtoneType="notification"
+        android:defaultValue="content://settings/system/notification_sound" />
+
+    <!-- NOTE: This preference will be enabled only when the checkbox above is checked. -->
+    <SwitchPreference
+        android:dependency="notifications_new_message"
+        android:key="notifications_new_message_vibrate"
+        android:title="@string/pref_title_vibrate"
+        android:defaultValue="true" />
+
+</PreferenceScreen>