From 065446def442bb27f8989be4134ad6bbfe8424db Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@trand>
Date: Wed, 27 Jun 2012 06:44:24 -0700
Subject: [PATCH] paint status area background manually in red or green and use
 a single transparent background icon for success and failure.

---
 .../android/XWords4/res/drawable/in_arrow.png | Bin 0 -> 183 bytes
 .../XWords4/res/drawable/in_failure.png       | Bin 168 -> 0 bytes
 .../XWords4/res/drawable/in_success.png       | Bin 168 -> 0 bytes
 .../XWords4/res/drawable/out_arrow.png        | Bin 0 -> 183 bytes
 .../XWords4/res/drawable/out_failure.png      | Bin 166 -> 0 bytes
 .../XWords4/res/drawable/out_success.png      | Bin 166 -> 0 bytes
 .../android/xw4/ConnStatusHandler.java        |  47 ++++++++++++------
 7 files changed, 32 insertions(+), 15 deletions(-)
 create mode 100644 xwords4/android/XWords4/res/drawable/in_arrow.png
 delete mode 100644 xwords4/android/XWords4/res/drawable/in_failure.png
 delete mode 100644 xwords4/android/XWords4/res/drawable/in_success.png
 create mode 100644 xwords4/android/XWords4/res/drawable/out_arrow.png
 delete mode 100644 xwords4/android/XWords4/res/drawable/out_failure.png
 delete mode 100644 xwords4/android/XWords4/res/drawable/out_success.png

diff --git a/xwords4/android/XWords4/res/drawable/in_arrow.png b/xwords4/android/XWords4/res/drawable/in_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..115a4a904bb30a72218acb093dcbfe1a845b5196
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~p!3HE570x<=sNx`ZCx&(BWL^R}Y)RhkE)4%c
zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^kiEpy*OmPan=~)C`KO0_Vu3>Do-U3d5|@)x
zew=p@Oh`-s0hP-${`2(s7_jZsbJ!|<O!=ULT8a9^SE_HkCc1L&Xq$K`f`MW2EMCqp
T(Gk~yMlg7~`njxgN@xNA_BS;F

literal 0
HcmV?d00001

diff --git a/xwords4/android/XWords4/res/drawable/in_failure.png b/xwords4/android/XWords4/res/drawable/in_failure.png
deleted file mode 100644
index 7e06aebc11b2a0d3c78a4fbdae48b71bcd5c8fc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~p!3HE570x<=sNx`ZCx&(BWL^R}Y)RhkE)4%c
zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^(Av|*F+}3>(tblO1_KUe{Y(GrZ~8Tfu&<rD
z>B)(c2P2;_yeNLt;2LSm(Gm3i*gfxH)zy2L7IiwYzI?(I`-@W`_ThYHpfL=du6{1-
HoD!M<;Gi>8

diff --git a/xwords4/android/XWords4/res/drawable/in_success.png b/xwords4/android/XWords4/res/drawable/in_success.png
deleted file mode 100644
index 4d75b5a1596e26e30aea0056098a8997bd57b453..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~p!3HE570x<=sNx`ZCx&(BWL^R}Y)RhkE)4%c
zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^(Av|*F+}3>(tble1_ci0^+*2KORD!6@+i#R
z_2rUqpYaJMhxys;-A2^{0<n7~s`X2!>U_2mC>1gCP?Qe+%PHU-Jozoq7zR&QKbLh*
G2~7a(-7Qi8

diff --git a/xwords4/android/XWords4/res/drawable/out_arrow.png b/xwords4/android/XWords4/res/drawable/out_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e7024586a38dd6d811fedd189b00a30bb216494
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~p!3HE570x<=sNx`ZCx&(BWL^R}Y)RhkE)4%c
zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^kiEpy*OmPan>4Qg&#OE09s`BUJzX3_BrYeX
z{5bC*n4q|#N$_OXf1aKnOFE4?&I+h4y32LBBTcpCw1=CA18<6w^_K<HjDn=N8FW|j
Va&GH42nHI#;OXk;vd$@?2>=wLGyVVo

literal 0
HcmV?d00001

diff --git a/xwords4/android/XWords4/res/drawable/out_failure.png b/xwords4/android/XWords4/res/drawable/out_failure.png
deleted file mode 100644
index 5eed80118cc3946411a4c07788a60c69adabaa6f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~p!3HE570x<=sNx`ZCx&(BWL^R}Y)RhkE)4%c
zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^(9+YzF+}2W@}KhuKFn`qI^g8Ns4OHs+t;Us
z=STmNi4$d*FXW~ldB*A{^!IE>ih}UY#^W7tn7kG-GF*GaAvERJffAr044$rjF6*2U
FngE6^GJF64

diff --git a/xwords4/android/XWords4/res/drawable/out_success.png b/xwords4/android/XWords4/res/drawable/out_success.png
deleted file mode 100644
index 19a08ef11e7a0dfb85d50e4e3f283241a21d8cde..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~p!3HE570x<=sNx`ZCx&(BWL^R}Y)RhkE)4%c
zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^(9+YzF+}2Wa>|eMALchQ9dHU@RTh%&4)tN-
z{n5W<;zSwd3%Th>p0T<K*`Dh#n9%v=Lb6L4BkM;7hVzd(g!W&0eH~~BgQu&X%Q~lo
FCICgMF^d2I

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ConnStatusHandler.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ConnStatusHandler.java
index 5e0da7364..e74e945a7 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ConnStatusHandler.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ConnStatusHandler.java
@@ -22,6 +22,7 @@ package org.eehouse.android.xw4;
 
 import android.content.res.Resources;
 import android.graphics.Canvas;
+import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
@@ -33,10 +34,16 @@ import junit.framework.Assert;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 
 public class ConnStatusHandler {
+    // private static final int GREEN = 0x7F00FF00;
+    // private static final int RED = 0x7FFF0000;
+    private static final int GREEN = 0xFF00FF00;
+    private static final int RED = 0xFFFF0000;
+
     private static CommsConnType s_connType = CommsConnType.COMMS_CONN_NONE;
     private static Rect s_rect;
     private static boolean s_downOnMe = false;
     private static Handler s_handler;
+    private static Paint s_fillPaint = new Paint( Paint.ANTI_ALIAS_FLAG );
 
     private static class SuccessRecord {
         // man strftime for these
@@ -213,26 +220,36 @@ public class ConnStatusHandler {
                 int quarterHeight = rect.height() / 4;
                 rect.offset( offsetX, offsetY );
 
-                rect.top += quarterHeight;
-                rect.bottom = rect.top + (2 * quarterHeight);
-                drawIn( canvas, res, iconID, rect );
-
                 if ( CommsConnType.COMMS_CONN_NONE != s_connType ) {
-                    SuccessRecord record = recordFor( s_connType, true );
-                    int inID = record.successNewer ? R.drawable.in_success
-                        : R.drawable.in_failure;
-                    record = recordFor( s_connType, false );
-                    int outID = record.successNewer ? R.drawable.out_success
-                        : R.drawable.out_failure;
+                    int saveTop = rect.top;
+                    SuccessRecord record;
 
-                    rect.bottom = rect.top;
-                    rect.top -= quarterHeight;
-                    drawIn( canvas, res, outID, rect );
+                    // Do the background coloring
+                    rect.bottom = rect.top + quarterHeight * 2;
+                    record = recordFor( s_connType, false );
+                    s_fillPaint.setColor( record.successNewer ? GREEN : RED );
+                    canvas.drawRect( rect, s_fillPaint );
+                    rect.top = rect.bottom;
+                    rect.bottom = rect.top + quarterHeight * 2;
+                    record = recordFor( s_connType, true );
+                    s_fillPaint.setColor( record.successNewer ? GREEN : RED );
+                    canvas.drawRect( rect, s_fillPaint );
+
+                    // now the icons
+                    rect.top = saveTop;
+                    rect.bottom = rect.top + quarterHeight;
+                    drawIn( canvas, res, R.drawable.out_arrow, rect );
 
                     rect.top += 3 * quarterHeight;
                     rect.bottom = rect.top + quarterHeight;
-                    drawIn( canvas, res, inID, rect );
-                } 
+                    drawIn( canvas, res, R.drawable.in_arrow, rect );
+
+                    rect.top = saveTop;
+                }
+
+                rect.top += quarterHeight;
+                rect.bottom = rect.top + (2 * quarterHeight);
+                drawIn( canvas, res, iconID, rect );
             }
         }
     }