From bdd67ce3157aa2c14133158597a33e5966bd6d21 Mon Sep 17 00:00:00 2001
From: Peter Osterlund <peterosterlund2@gmail.com>
Date: Sat, 7 Apr 2012 09:15:44 +0000
Subject: [PATCH] DroidFish: Display PGN comments in a color different from PGN
 moves.

---
 DroidFish/res/values/strings.xml              |  1 +
 DroidFish/res/xml/preferences.xml             |  7 ++++++-
 .../src/org/petero/droidfish/ColorTheme.java  | 19 ++++++++++---------
 .../src/org/petero/droidfish/DroidFish.java   |  9 +++++++--
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/DroidFish/res/values/strings.xml b/DroidFish/res/values/strings.xml
index 33dcafd..a766753 100644
--- a/DroidFish/res/values/strings.xml
+++ b/DroidFish/res/values/strings.xml
@@ -423,6 +423,7 @@ you are not actively using the program.\
     <string name="prefs_color_decoration_title">Tablebase hints</string>
     <string name="prefs_move_list">Move List</string>
     <string name="prefs_color_currentMove_title">Current Move</string>
+    <string name="prefs_color_pgnComment_title">Comments</string>
     <string name="prefs_other">Other</string>
     <string name="prefs_bookSettings_title">Opening Book Settings</string>
     <string name="prefs_bookSettings_summary">Settings for opening book usage</string>
diff --git a/DroidFish/res/xml/preferences.xml b/DroidFish/res/xml/preferences.xml
index c56389a..5568290 100644
--- a/DroidFish/res/xml/preferences.xml
+++ b/DroidFish/res/xml/preferences.xml
@@ -244,7 +244,12 @@
                     android:title="@string/prefs_color_currentMove_title"
                     android:defaultValue="#FF3333FF">
                 </EditTextPreference>
-            </PreferenceCategory>
+                <EditTextPreference
+                    android:key="color_pgnComment"
+                    android:title="@string/prefs_color_pgnComment_title"
+                    android:defaultValue="#FFC0C000">
+                </EditTextPreference>
+                </PreferenceCategory>
         </PreferenceScreen>
     </PreferenceCategory>
     <PreferenceCategory
diff --git a/DroidFish/src/org/petero/droidfish/ColorTheme.java b/DroidFish/src/org/petero/droidfish/ColorTheme.java
index cdb4ade..c14b4a5 100644
--- a/DroidFish/src/org/petero/droidfish/ColorTheme.java
+++ b/DroidFish/src/org/petero/droidfish/ColorTheme.java
@@ -47,13 +47,14 @@ public class ColorTheme {
     final static int ARROW_5 = 12;
     final static int SQUARE_LABEL = 13;
     final static int DECORATION = 14;
-    private final static int numColors = 15;
+    final static int PGN_COMMENT = 15;
+    private final static int numColors = 16;
 
     private int colorTable[] = new int[numColors];
 
     private static final String[] prefNames = {
         "darkSquare", "brightSquare", "selectedSquare", "cursorSquare", "darkPiece", "brightPiece", "currentMove",
-        "arrow0", "arrow1", "arrow2", "arrow3", "arrow4", "arrow5", "squareLabel", "decoration"
+        "arrow0", "arrow1", "arrow2", "arrow3", "arrow4", "arrow5", "squareLabel", "decoration", "pgnComment"
     };
     private static final String prefPrefix = "color_";
 
@@ -64,37 +65,37 @@ public class ColorTheme {
     { // Original
         "#FF808080", "#FFBEBE5A", "#FFFF0000", "#FF00FF00", "#FF000000", "#FFFFFFFF", "#FF888888",
         "#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F", "#FFFF0000",
-        "#FF9F9F66"
+        "#FF9F9F66", "#FFC0C000"
     },
     { // XBoard
         "#FF77A26D", "#FFC8C365", "#FFFFFF00", "#FF00FF00", "#FF202020", "#FFFFFFCC", "#FF6B9262",
         "#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F", "#FFFF0000",
-        "#FF808080"
+        "#FF808080", "#FFC0C000"
     },
     { // Blue
         "#FF83A5D2", "#FFFFFFFA", "#FF3232D1", "#FF5F5FFD", "#FF282828", "#FFF0F0F0", "#FF3333FF",
         "#A01F1FFF", "#A01FFF1F", "#501F1FFF", "#501FFF1F", "#1E1F1FFF", "#281FFF1F", "#FFFF0000",
-        "#FF808080"
+        "#FF808080", "#FFC0C000"
     },
     { // Grey
         "#FF666666", "#FFDDDDDD", "#FFFF0000", "#FF0000FF", "#FF000000", "#FFFFFFFF", "#FF888888",
         "#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F", "#FFFF0000",
-        "#FF909090"
+        "#FF909090", "#FFC0C000"
     },
     { // Scid Default
         "#FF80A0A0", "#FFD0E0D0", "#FFFF0000", "#FF00FF00", "#FF000000", "#FFFFFFFF", "#FF666666",
         "#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F", "#FFFF0000",
-        "#FF808080"
+        "#FF808080", "#FFC0C000"
     },
     { // Scid Brown
         "#B58863",   "#F0D9B5",   "#FFFF0000", "#FF00FF00", "#FF000000", "#FFFFFFFF", "#FF666666",
         "#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F", "#FFFF0000",
-        "#FF808080"
+        "#FF808080", "#FFC0C000"
     },
     { // Scid Green
         "#FF769656", "#FFEEEED2", "#FFFF0000", "#FF0000FF", "#FF000000", "#FFFFFFFF", "#FF666666",
         "#A01F1FFF", "#A0FF1F1F", "#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F", "#FFFF0000",
-        "#FF808080"
+        "#FF808080", "#FFC0C000"
     }
     };
 
diff --git a/DroidFish/src/org/petero/droidfish/DroidFish.java b/DroidFish/src/org/petero/droidfish/DroidFish.java
index c17eb6b..6884515 100644
--- a/DroidFish/src/org/petero/droidfish/DroidFish.java
+++ b/DroidFish/src/org/petero/droidfish/DroidFish.java
@@ -87,6 +87,7 @@ import android.text.TextPaint;
 import android.text.method.LinkMovementMethod;
 import android.text.style.BackgroundColorSpan;
 import android.text.style.ClickableSpan;
+import android.text.style.ForegroundColorSpan;
 import android.text.style.LeadingMarginSpan;
 import android.text.style.StyleSpan;
 import android.util.TypedValue;
@@ -1507,8 +1508,8 @@ public class DroidFish extends Activity implements GUIInterface {
                 public void onClick(DialogInterface dialog, int item) {
                     ColorTheme.instance().setTheme(settings, item);
                     cb.setColors();
-                    gameTextListener.setCurrent(gameTextListener.currNode);
-                    moveListUpdated();
+                    gameTextListener.clear();
+                    ctrl.prefsChanged();
                     dialog.dismiss();
                 }
             });
@@ -2193,7 +2194,11 @@ public class DroidFish extends Activity implements GUIInterface {
                         sb.append(' ');
                     }
                 }
+                int l0 = sb.length();
                 sb.append(token.replaceAll("[ \t\r\n]+", " ").trim());
+                int l1 = sb.length();
+                int color = ColorTheme.instance().getColor(ColorTheme.PGN_COMMENT);
+                sb.setSpan(new ForegroundColorSpan(color), l0, l1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                 col0 = false;
                 if (nestLevel == 0)
                     newLine();