Merge pull request #6 from jcarolus/feature/puzzle_navigation

Feature/puzzle navigation
jcarolus · Aug 30, 2014 · 4baa792 · 4baa792
2 parents 14830b1 + 41d9558
commit 4baa792
Show file tree

Hide file tree

Showing 6 changed files with 196 additions and 175 deletions.
diff --git a/gen/jwtc/android/chess/R.java b/gen/jwtc/android/chess/R.java
diff --git a/native/project/jni/chess b/native/project/jni/chess
diff --git a/native/project/jni/chess-jni.cpp b/native/project/jni/chess-jni.cpp
@@ -320,7 +320,7 @@ static JNINativeMethod sMethods[] = {
  {"isLegalPosition", "()I", (void*)Java_jwtc_chess_JNI_isLegalPosition},
  {"isAmbiguousCastle", "(II)I", (void*)Java_jwtc_chess_JNI_isAmbiguousCastle},
  {"doCastleMove", "(II)I", (void*)Java_jwtc_chess_JNI_doCastleMove},
- {"toFEN", "()Ljava/lang/String;", (void*)JNICALL Java_jwtc_chess_JNI_toFEN},
+ {"toFEN", "()Ljava/lang/String;", (void*)Java_jwtc_chess_JNI_toFEN},
  {"removePiece", "(II)V", (void*)Java_jwtc_chess_JNI_removePiece},
  {"getHashKey", "()J", (void*)Java_jwtc_chess_JNI_getHashKey},
  {"loadDB", "(Ljava/lang/String;I)V", (void*)Java_jwtc_chess_JNI_loadDB},

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -56,6 +56,8 @@
 <string name="pref_icscustomcommand_desc">Create your own custom commands</string>
 <string name="pref_icsautosought">Auto sought</string>
 <string name="pref_icsautosought_desc">Refresh the challenges screen automatically</string>
+<string name="pref_puzzle_show_seekbar">Show seek bar</string>
+<string name="pref_puzzle_show_seekbar_desc">Quickly navigate through puzzles with seek bar</string>
 
 <string name="button_play">Play</string>
 <string name="button_undo">Undo</string>

diff --git a/res/xml/globalprefs.xml b/res/xml/globalprefs.xml
@@ -89,6 +89,15 @@
 			android:entryValues="@array/UCIArray" />
 		 -->
 	</PreferenceCategory>
+
+	<PreferenceCategory android:title="Puzzle settings">
+	    <CheckBoxPreference
+			android:title="@string/pref_puzzle_show_seekbar"
+			android:defaultValue="true"
+			android:summary="@string/pref_puzzle_show_seekbar_desc"
+			android:key="PuzzleShowSeekBar" />
+	</PreferenceCategory>
+
 	<PreferenceCategory android:title="Play online settings">
 		<CheckBoxPreference
 			android:title="@string/pref_icsconfirmmove"

diff --git a/src/jwtc/android/chess/puzzle/ChessViewPuzzle.java b/src/jwtc/android/chess/puzzle/ChessViewPuzzle.java
@@ -398,6 +398,14 @@ public void OnPause(SharedPreferences.Editor editor){
 	public void OnResume(final SharedPreferences prefs){
 		super.OnResume();
 
+		if(prefs.getBoolean("PuzzleShowSeekBar", true)){
+			_seekBar.setVisibility(View.VISIBLE);
+
+		} else {
+			_seekBar.setVisibility(View.GONE);
+
+		}
+
 		_view.OnResume();
 
 		ChessImageView._colorScheme = prefs.getInt("ColorScheme", 0);