implemented ActionBar

updated icons in Tutorial-ActionTree. Some symbols were drawn just in time.
updated some layouts
ActionTree: 2 times same action gives only on child
in case of input assistance, notes can be undone

sudoq-app/.classpath

@@ -5,5 +5,6 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/sudoq-model"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

sudoq-app/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

sudoq-app/AndroidManifest.xml

@@ -5,32 +5,38 @@
 <!-- This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.sudoq"
-    android:versionCode="4"
-    android:versionName="1.0.4"
+    android:versionCode="7"
+    android:versionName="1.0.5"
     android:installLocation="auto" >
 
     <uses-sdk android:minSdkVersion="8" />
 
     <application
         android:icon="@drawable/launcher"
         android:label="@string/app_name" android:allowClearUserData="true"
-        android:debuggable="true">
-        <activity android:name=".controller.menus.SplashActivity" android:noHistory="true" android:configChanges="orientation">
+        android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
+        <activity android:name=".controller.menus.SplashActivity" android:noHistory="true" 
+                                                                  android:configChanges="orientation"
+                                                                  android:windowActionBar="false" 
+                                                                  android:theme="@style/Theme.Sherlock.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"></action>
                 <category android:name="android.intent.category.LAUNCHER"></category>
             </intent-filter>
         </activity>
+        <activity android:name=".controller.SudoqActivitySherlock" ></activity>
         <activity android:name=".controller.menus.MainActivity"></activity>
         <activity android:name=".controller.menus.GameTypeSelectionActivity"></activity>
-        <activity android:name=".controller.menus.GestureBuilder"></activity>
+        <activity android:name=".controller.menus.GestureBuilder" android:label="@string/gesture_builder_title"></activity>
         <activity android:name=".controller.sudoku.SudokuActivity"></activity>
-        <activity android:name=".controller.menus.SudokuLoadingActivity" android:noHistory="true" android:configChanges="orientation"></activity>
-        <activity android:name=".controller.menus.SudokuPreferencesActivity" ></activity>
-        <activity android:name=".controller.menus.AssistancesPreferencesActivity"></activity>
-        <activity android:name=".controller.menus.PlayerPreferencesActivity"></activity>
-        <activity android:name=".controller.menus.StatisticsActivity" android:configChanges="orientation"></activity>
-        <activity android:name=".controller.menus.ProfileListActivity" android:theme="@android:style/Theme.Dialog"></activity>
+        <activity android:name=".controller.menus.SudokuLoadingActivity"     android:noHistory="true" 
+                                                                             android:configChanges="orientation"></activity>
+        <activity android:name=".controller.menus.SudokuPreferencesActivity" android:label="@string/title_sudokupreferences"></activity>
+        <activity android:name=".controller.menus.AssistancesPreferencesActivity" android:label="@string/title_sudokupreferences"></activity>
+        <activity android:name=".controller.menus.PlayerPreferencesActivity" android:label="@string/profile_preference_title"
+                                                                             android:windowSoftInputMode="stateHidden"></activity>
+        <activity android:name=".controller.menus.StatisticsActivity"  android:label="@string/statistics_title"></activity>
+        <activity android:name=".controller.menus.ProfileListActivity" android:theme="@android:style/Theme.Dialog" ></activity>
         <activity android:name=".controller.tutorial.TutorialActivity"></activity>
         <activity android:name=".controller.tutorial.TutorialSudokuActivity"></activity>
         <activity android:name=".controller.tutorial.TutorialAssistancesActivity"></activity>

sudoq-app/project.properties

@@ -11,4 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-8
+target=android-19
+android.library.reference.1=../../JakeWharton-ActionBarSherlock-5a15d92/actionbarsherlock

sudoq-app/res/layout-land/mainmenu.xml

@@ -23,41 +23,42 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:orientation="horizontal">
-	<LinearLayout
-	    android:layout_width="wrap_content"
-	    android:layout_height="fill_parent"
-	    android:layout_weight="1.0"
-	    android:orientation="vertical">
-    <Button
-        android:id="@+id/button_mainmenu_new_sudoku"
-        style="@style/style_mainmenu_buttons"
-        android:text="@string/sf_mainmenu_new_sudoku"
-        android:onClick="switchActivity" />
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:layout_weight="1.0"
+			android:orientation="vertical">
+		    <Button
+    		    android:id="@+id/button_mainmenu_new_sudoku"
+    	    	style="@style/style_mainmenu_buttons"
+    	    	android:text="@string/sf_mainmenu_new_sudoku"
+		        android:onClick="switchActivity" />
 
-    <Button
-        android:id="@+id/button_mainmenu_continue"
-        style="@style/style_mainmenu_buttons"
-        android:text="@string/sf_mainmenu_continue"
-        android:onClick="switchActivity" />
-
-    <Button
-        android:id="@+id/button_mainmenu_load_sudoku"
-        style="@style/style_mainmenu_buttons"
-        android:text="@string/sf_mainmenu_load_sudoku"
-        android:onClick="switchActivity" />
-	</LinearLayout>
+		    <Button
+		        android:id="@+id/button_mainmenu_continue"
+		        style="@style/style_mainmenu_buttons"
+		        android:text="@string/sf_mainmenu_continue"
+		        android:onClick="switchActivity" />
+
+		</LinearLayout>
 
-    <LinearLayout
-	    android:layout_width="wrap_content"
-	    android:layout_height="fill_parent"
-	    android:layout_weight="1.0"
-	    android:orientation="vertical">
-    <Button
-        android:id="@+id/button_mainmenu_profile"
-        style="@style/style_mainmenu_buttons"
-        android:text="@string/sf_mainmenu_profile"
-        android:onClick="switchActivity" />
-
-    </LinearLayout>
+	    <LinearLayout
+		    android:layout_width="wrap_content"
+		    android:layout_height="fill_parent"
+		    android:layout_weight="1.0"
+		    android:orientation="vertical">
+		    <Button
+		        android:id="@+id/button_mainmenu_profile"
+		        style="@style/style_mainmenu_buttons"
+		        android:text="@string/sf_mainmenu_profile"
+		        android:onClick="switchActivity" />
+
+		    <Button
+		        android:id="@+id/button_mainmenu_load_sudoku"
+		        style="@style/style_mainmenu_buttons"
+		        android:text="@string/sf_mainmenu_load_sudoku"
+		        android:onClick="switchActivity" />
+
+	    </LinearLayout>
 	</LinearLayout>
 </LinearLayout>

sudoq-app/res/layout-land/playerpreferences.xml

@@ -14,54 +14,28 @@
 	    android:layout_height="wrap_content"
 	    android:orientation="vertical" >
 
-	    <TextView 
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:focusableInTouchMode="true" 
-	        android:focusable="true"
-	        android:gravity="center"
-	        android:layout_margin="10dp"
-	        android:textAppearance="@android:style/TextAppearance.Large" 
-	        android:text="@string/profile_preference_title"
-		    android:textColor="@android:color/black" />
-
-	    <Button
-	        android:id="@+id/button_showStatistics"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_margin="5dp"
-	        android:onClick="viewStatistics"
-	        android:text="@string/profile_preference_button_statistics" />
-
-	    <Button
-	        android:id="@+id/button_openGestureBuilder"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_margin="5dp"
-	        android:onClick="openGestureBuilder"
-	        android:text="@string/profile_preference_button_gesture_builder" />
+	    <LinearLayout android:layout_width="fill_parent"
+	                android:layout_height="wrap_content"
+	                android:orientation="horizontal" 
+	                android:weightSum="1.0">
 
-	    <LinearLayout
-        	android:layout_width="fill_parent"
-        	android:layout_height="wrap_content"
-        	android:orientation="horizontal">
-	    <!-- Button
-	        android:id="@+id/button_switchProfile"
-	        android:layout_width="wrap_content"
-	        android:layout_height="fill_parent"
-	        android:layout_weight="1.0"
-	        android:layout_margin="5dp"
-	        android:onClick="switchToProfileList"
-	        android:text="@string/profile_preference_title_switchprofile" />
+	    	<Button
+		        android:id="@+id/button_showStatistics"
+		        android:layout_width="0dip"
+		        android:layout_height="wrap_content"
+		        android:layout_weight="0.5"
+		        android:layout_margin="5dp"
+		        android:onClick="viewStatistics"
+		        android:text="@string/profile_preference_button_statistics" />
 
-	    <Button
-	        android:id="@+id/button_createProfile"
-	        android:layout_width="wrap_content"
-	        android:layout_height="fill_parent"
-	        android:layout_weight="1.0"
-	        android:layout_margin="5dp"
-	        android:onClick="createProfile"
-	        android:text="@string/profile_preference_title_createprofile" /-->
+		    <Button
+		        android:id="@+id/button_openGestureBuilder"
+		        android:layout_width="0dip"
+		        android:layout_height="wrap_content"
+		        android:layout_weight="0.5"
+		        android:layout_margin="5dp"
+		        android:onClick="openGestureBuilder"
+		        android:text="@string/profile_preference_button_gesture_builder" />
 	    </LinearLayout>
 
 	    <LinearLayout
@@ -128,14 +102,6 @@
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content" 
 	        android:textColor="@android:color/black"/>
-
-	    <!-- Button
-	        android:id="@+id/button_deleteProfile"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_margin="5dp"
-	        android:onClick="deleteProfile"
-	        android:text="@string/profile_preference_title_deleteprofile" /-->
 
 	    <Button
 	        android:id="@+id/button_saveChanges"

sudoq-app/res/layout-land/statistics.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SudoQ is a Sudoku-App for Adroid Devices with Version 2.2 at least. -->
+<!-- Copyright (C) 2012  Haiko Klare, Julian Geppert, Jan-Bernhard Kordaß, Jonathan Kieling, Tim Zeitz, Timo Abele -->
+<!-- This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.  -->
+<!-- This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.  -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent"
+	    android:orientation="vertical"
+		android:background="@drawable/background_gradient">
+
+	<RelativeLayout android:layout_width="fill_parent"
+	                android:layout_height="wrap_content"
+	                android:orientation="horizontal" >
+
+	    <LinearLayout
+	        android:id="@+id/statistics_left_column"
+	        android:layout_width="wrap_content"
+	        android:layout_height="fill_parent"
+	        android:orientation="vertical" >
+
+	    <TextView
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_margin="10dp"
+	        android:textSize="20dp"
+	        android:text="@string/statistics_counters"
+	        android:textAppearance="?android:attr/textAppearanceMedium"
+	        android:textColor="@android:color/black" />
+
+	    <TextView
+	        android:id="@+id/text_played_sudokus"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_marginLeft="20dp"
+	        android:textAppearance="?android:attr/textAppearanceSmall"
+	        android:textColor="@android:color/black" />
+
+	    <TextView
+	        android:id="@+id/text_played_easy_sudokus"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_marginTop="10dp"
+	        android:layout_marginLeft="20dp"
+	        android:textAppearance="?android:attr/textAppearanceSmall"
+	        android:textColor="@android:color/black" />
+
+	    <TextView
+	        android:id="@+id/text_played_medium_sudokus"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_marginTop="10dp"
+	        android:layout_marginLeft="20dp"
+	        android:textAppearance="?android:attr/textAppearanceSmall"
+	        android:textColor="@android:color/black" />
+
+	    <TextView
+	        android:id="@+id/text_played_difficult_sudokus"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_marginTop="10dp"
+	        android:layout_marginLeft="20dp"
+	        android:textAppearance="?android:attr/textAppearanceSmall"
+	        android:textColor="@android:color/black" />
+
+	    <TextView
+	        android:id="@+id/text_played_infernal_sudokus"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_marginTop="10dp"
+	        android:layout_marginLeft="20dp"
+	        android:layout_marginBottom="10dp"
+	        android:textAppearance="?android:attr/textAppearanceSmall"
+	        android:textColor="@android:color/black" />
+	</LinearLayout>	
+
+		<LinearLayout
+		    android:layout_width="wrap_content"  
+		    android:layout_height="fill_parent"
+		    android:gravity="left"
+		    android:layout_gravity="right"
+		    android:layout_alignParentRight="true"
+		    android:layout_marginRight="20dp"
+		    android:orientation="vertical" >
+
+		    <TextView android:layout_width="wrap_content"
+		        	  android:layout_height="wrap_content"
+		        	  android:layout_margin="10dp"
+		        	  android:textSize="20dp"
+		        	  android:text="@string/statistics_records"
+		        	  android:textAppearance="?android:attr/textAppearanceMedium"
+		        	  android:textColor="@android:color/black" />
+
+			<TextView android:id="@+id/text_score"
+	        		  android:layout_width="wrap_content"
+	        		  android:layout_height="wrap_content"
+	        		  android:layout_marginLeft="20dp"
+	        		  android:textAppearance="?android:attr/textAppearanceSmall"
+	        		  android:textColor="@android:color/black" />
+
+			<TextView android:id="@+id/text_fastest_solving_time"
+					  android:layout_width="wrap_content"
+					  android:layout_height="wrap_content"
+					  android:layout_marginTop="10dp"
+					  android:layout_marginLeft="20dp"
+					  android:textAppearance="?android:attr/textAppearanceSmall"
+					  android:textColor="@android:color/black" />
+
+		</LinearLayout>
+	</RelativeLayout>
+</ScrollView>

sudoq-app/res/layout-land/sudoku.xml

@@ -15,7 +15,7 @@
         android:layout_height="fill_parent"
         android:orientation="vertical" >
 
-        <LinearLayout
+        <!--LinearLayout
             android:id="@+id/sudoku_time_border"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -38,7 +38,7 @@
                 android:gravity="right"
                 android:textColor="@android:color/white"
                 android:textSize="10dp" />
-        </LinearLayout>
+        </LinearLayout-->
 
         <LinearLayout
         android:layout_width="fill_parent"

sudoq-app/res/layout-land/sudokupreferences.xml

@@ -8,15 +8,6 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" 
     android:background="@drawable/background_gradient" >
-
-    <TextView 
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_margin="10dp"
-        android:textAppearance="@android:style/TextAppearance.Large" 
-        android:text="@string/title_sudokupreferences"
-       	android:textColor="@android:color/black" />
 
     <LinearLayout
         android:layout_width="fill_parent"

sudoq-app/res/layout/list.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/list"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+</ListView>