From 8c790edd04ad66a2a4585c80f2a698e0ad3644a3 Mon Sep 17 00:00:00 2001
From: eehouse <eehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Thu, 27 May 2010 02:57:21 +0000
Subject: [PATCH] add numerical edittexts to left of seekers in color edit
 view.  Not yet wired up but layout's ok

---
 .../android/XWords4/res/layout/color_edit.xml | 56 ++++++++++++-------
 xwords4/android/XWords4/res/values/styles.xml | 20 +++++++
 .../android/xw4/EditColorPreference.java      | 12 ++--
 3 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/xwords4/android/XWords4/res/layout/color_edit.xml b/xwords4/android/XWords4/res/layout/color_edit.xml
index dbb0ff8c4..77a73a837 100644
--- a/xwords4/android/XWords4/res/layout/color_edit.xml
+++ b/xwords4/android/XWords4/res/layout/color_edit.xml
@@ -22,33 +22,51 @@
             android:text="@string/red"
             android:textAppearance="?android:attr/textAppearanceMedium"
             />
-  <SeekBar android:id="@+id/edit_red" 
-           android:layout_width="fill_parent"
-           android:layout_height="wrap_content"
-           android:max="255"
-           android:progress="1"
-           />
+  <LinearLayout android:orientation="horizontal"
+                android:layout_width="fill_parent" 
+                android:layout_height="wrap_content"
+                >
+    <SeekBar android:id="@+id/seek_red" 
+             style="@style/color_seek_text"
+             />
+    <EditText android:id="@+id/edit_red" 
+              style="@style/color_edit_text"
+              />
+  </LinearLayout>
+
   <TextView android:layout_height="wrap_content"
             android:layout_width="fill_parent"
             android:text="@string/green"
             android:textAppearance="?android:attr/textAppearanceMedium"
             />
-  <SeekBar android:id="@+id/edit_green" 
-           android:layout_width="fill_parent"
-           android:layout_height="wrap_content"
-           android:max="255"
-           android:progress="1"
-           />
+  <LinearLayout android:orientation="horizontal"
+                android:layout_width="fill_parent" 
+                android:layout_height="wrap_content"
+                >
+    <SeekBar android:id="@+id/seek_green" 
+             style="@style/color_seek_text"
+             />
+    <EditText android:id="@+id/edit_green" 
+              style="@style/color_edit_text"
+              />
+  </LinearLayout>
+
   <TextView android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
+            android:layout_width="wrap_content"
             android:text="@string/blue"
             android:textAppearance="?android:attr/textAppearanceMedium"
             />
-  <SeekBar android:id="@+id/edit_blue" 
-           android:layout_width="fill_parent"
-           android:layout_height="wrap_content"
-           android:max="255"
-           android:progress="1"
-           />
+  <LinearLayout android:orientation="horizontal"
+                android:layout_width="fill_parent" 
+                android:layout_height="wrap_content"
+                >
+    <SeekBar android:id="@+id/seek_blue"
+             style="@style/color_seek_text"
+             />
+
+    <EditText android:id="@+id/edit_blue" 
+              style="@style/color_edit_text"
+              />
+  </LinearLayout>
 
 </LinearLayout>
diff --git a/xwords4/android/XWords4/res/values/styles.xml b/xwords4/android/XWords4/res/values/styles.xml
index 7134bc3c9..04b147be2 100644
--- a/xwords4/android/XWords4/res/values/styles.xml
+++ b/xwords4/android/XWords4/res/values/styles.xml
@@ -17,4 +17,24 @@
       <item name="android:textColor">#FFFFFFFF</item>
     </style>
 
+    <style name="color_seek_text">
+      <item name="android:layout_width">wrap_content</item>
+      <item name="android:layout_height">wrap_content</item>
+      <item name="android:layout_gravity">left|center_vertical</item>
+      <item name="android:max">255</item>
+      <item name="android:layout_weight">1</item>
+      <item name="android:paddingRight">4dp</item>
+    </style>
+
+    <style name="color_edit_text">
+      <item name="android:layout_height">wrap_content</item>
+      <item name="android:layout_width">wrap_content</item>
+      <item name="android:layout_gravity">right|center_vertical</item>
+      <item name="android:numeric">decimal</item>
+      <item name="android:maxLength">3</item>
+      <item name="android:includeFontPadding">false</item>
+      <item name="android:ems">3</item>
+    </style>
+
 </resources>
+
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/EditColorPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/EditColorPreference.java
index 0da40a0d5..ebe9e520e 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/EditColorPreference.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/EditColorPreference.java
@@ -96,9 +96,9 @@ public class EditColorPreference extends DialogPreference {
     protected void onBindDialogView( View view )
     {
         m_curColor = getPersistedColor();
-        setOneByte( view, R.id.edit_red,  16 );
-        setOneByte( view, R.id.edit_green,  8 );
-        setOneByte( view, R.id.edit_blue, 0 );
+        setOneByte( view, R.id.seek_red,  16 );
+        setOneByte( view, R.id.seek_green,  8 );
+        setOneByte( view, R.id.seek_blue, 0 );
 
         View sample = (View)view.findViewById( R.id.color_edit_sample );
         sample.setBackgroundColor( m_curColor );
@@ -112,9 +112,9 @@ public class EditColorPreference extends DialogPreference {
                 @Override
                 public void onClick( DialogInterface dialog, int which )
                 {
-                    int color = (getOneByte( dialog, R.id.edit_red ) << 16)
-                        | (getOneByte( dialog, R.id.edit_green ) << 8)
-                        | getOneByte( dialog, R.id.edit_blue );
+                    int color = (getOneByte( dialog, R.id.seek_red ) << 16)
+                        | (getOneByte( dialog, R.id.seek_green ) << 8)
+                        | getOneByte( dialog, R.id.seek_blue );
 
                     persistInt( color );
                     notifyChanged();