moparisthebest
/
Yaaic
mirror of https://github.com/moparisthebest/Yaaic
1
0
Fork 0
Code Issues Releases Wiki Activity

ConversationSwitcher: Removed logging and adjusted drawing

This commit is contained in:
Sebastian Kaspari 2010-05-12 11:18:34 +02:00
parent 11325ef8bd
commit 8f0ae05493
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/yaaic/view/ConversationSwitcher.java
View File

@ -30,7 +30,6 @@ import android.graphics.Canvas;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.Rect; import android.graphics.Rect;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.view.View; import android.view.View;
/** /**
@ -76,8 +75,7 @@ public class ConversationSwitcher extends View
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
{ {
int width = MeasureSpec.getSize(widthMeasureSpec); int width = MeasureSpec.getSize(widthMeasureSpec);
Log.d("Yaaic", width + " x " + 20); setMeasuredDimension(width, 16);
setMeasuredDimension(width, 20);
} }
/** /**
@ -94,8 +92,6 @@ public class ConversationSwitcher extends View
canvas.drawRect(new Rect(0, 0, getWidth() - 1, getHeight() - 1), paint); canvas.drawRect(new Rect(0, 0, getWidth() - 1, getHeight() - 1), paint);
} }
//Log.d("Yaaic", "Drawing...");
if (server == null) { if (server == null) {
return; return;
} }
@ -106,7 +102,7 @@ public class ConversationSwitcher extends View
Collection<Conversation> conversations = server.getConversations(); Collection<Conversation> conversations = server.getConversations();
int circles = conversations.size(); int circles = conversations.size();
int startX = width / 2 - circles * 14; int startX = (width / 2) - (((circles + 1) / 2) * 14);
paint.setColor(0xFFDDDDDD); paint.setColor(0xFFDDDDDD);
paint.setStyle(Paint.Style.FILL); paint.setStyle(Paint.Style.FILL);
@ -119,10 +115,10 @@ public class ConversationSwitcher extends View
paint.setColor(0xFF888888); paint.setColor(0xFF888888);
break; break;
case Conversation.STATUS_HIGHLIGHT: case Conversation.STATUS_HIGHLIGHT:
paint.setColor(0xFFDD0000); paint.setColor(0xFF880000);
break; break;
case Conversation.STATUS_MESSAGE: case Conversation.STATUS_MESSAGE:
paint.setColor(0xFF00DD00); paint.setColor(0xFF008800);
break; break;
case Conversation.STATUS_SELECTED: case Conversation.STATUS_SELECTED:
paint.setColor(0xFFFFFFFF); paint.setColor(0xFFFFFFFF);