Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-07 05:24:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

draw status icon background red when SMS turned off.

Browse source
This commit is contained in:
Eric House 2012-07-25 23:26:24 -07:00
parent bc91956e20
commit 9c670804f2
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
View file

@ -321,8 +321,8 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
synchronized( this ) { synchronized( this ) {
if ( layoutBoardOnce() ) { if ( layoutBoardOnce() ) {
canvas.drawBitmap( s_bitmap, 0, 0, m_drawPaint ); canvas.drawBitmap( s_bitmap, 0, 0, m_drawPaint );
ConnStatusHandler.draw( canvas, getResources(), 0, 0, ConnStatusHandler.draw( m_context, canvas, getResources(),
m_connType ); 0, 0, m_connType );
} }
} }
} }

22
xwords4/android/XWords4/src/org/eehouse/android/xw4/ConnStatusHandler.java
View file

@ -253,7 +253,7 @@ public class ConnStatusHandler {
showSuccess( handler, false ); showSuccess( handler, false );
} }
public static void draw( Canvas canvas, Resources res, public static void draw( Context context, Canvas canvas, Resources res,
int offsetX, int offsetY, CommsConnType connType ) int offsetX, int offsetY, CommsConnType connType )
{ {
synchronized( s_lockObj ) { synchronized( s_lockObj ) {
@ -282,16 +282,19 @@ public class ConnStatusHandler {
if ( CommsConnType.COMMS_CONN_NONE != connType ) { if ( CommsConnType.COMMS_CONN_NONE != connType ) {
int saveTop = rect.top; int saveTop = rect.top;
SuccessRecord record; SuccessRecord record;
boolean enabled = connTypeEnabled( context, connType );
// Do the background coloring // Do the background coloring
rect.bottom = rect.top + quarterHeight * 2; rect.bottom = rect.top + quarterHeight * 2;
record = recordFor( connType, false ); record = recordFor( connType, false );
s_fillPaint.setColor( record.successNewer ? GREEN : RED ); s_fillPaint.setColor( enabled && record.successNewer
? GREEN : RED );
canvas.drawRect( rect, s_fillPaint ); canvas.drawRect( rect, s_fillPaint );
rect.top = rect.bottom; rect.top = rect.bottom;
rect.bottom = rect.top + quarterHeight * 2; rect.bottom = rect.top + quarterHeight * 2;
record = recordFor( connType, true ); record = recordFor( connType, true );
s_fillPaint.setColor( record.successNewer ? GREEN : RED ); s_fillPaint.setColor( enabled && record.successNewer
? GREEN : RED );
canvas.drawRect( rect, s_fillPaint ); canvas.drawRect( rect, s_fillPaint );
// now the icons // now the icons
@ -458,5 +461,16 @@ public class ConnStatusHandler {
s_needsSave = false; s_needsSave = false;
} }
} }
private static boolean connTypeEnabled( Context context,
CommsConnType connType )
{
boolean result = true;
switch( connType ) {
case COMMS_CONN_SMS:
result = XWApp.SMSSUPPORTED && XWPrefs.getSMSEnabled( context );
break;
}
return result;
}
} }