Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

Layout tweaks, dark action bar, don't send empty messages.

Browse Source
This commit is contained in:
akwizgran
2014-02-26 18:36:51 +00:00
parent 95605891f3
commit 52cf47619f
12 changed files with 41 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
View File

@@ -2,31 +2,24 @@ package org.briarproject.android.contact;
import static android.view.Gravity.LEFT;
import static android.view.Gravity.RIGHT;
import static android.widget.RelativeLayout.ALIGN_PARENT_LEFT;
import static android.widget.RelativeLayout.ALIGN_PARENT_RIGHT;
import static android.widget.RelativeLayout.ALIGN_PARENT_TOP;
import static android.widget.RelativeLayout.BELOW;
import static android.widget.RelativeLayout.LEFT_OF;
import static android.widget.RelativeLayout.RIGHT_OF;
import static android.widget.LinearLayout.VERTICAL;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
import java.util.ArrayList;
import org.briarproject.R;
import org.briarproject.android.util.CommonLayoutParams;
import org.briarproject.android.util.LayoutUtils;
import org.briarproject.api.db.MessageHeader;
import org.briarproject.util.StringUtils;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.text.format.DateUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
class ConversationAdapter extends ArrayAdapter<ConversationItem> {
@@ -46,17 +39,26 @@ class ConversationAdapter extends ArrayAdapter<ConversationItem> {
Context ctx = getContext();
Resources res = ctx.getResources();
LinearLayout layout = new LinearLayout(ctx);
layout.setOrientation(VERTICAL);
if(header.isLocal()) layout.setPadding(3 * pad, 0, 0, 0);
else layout.setPadding(0, 0, 3 * pad, 0);
int background;
if(header.isRead()) background = res.getColor(R.color.read_background);
else background = res.getColor(R.color.unread_background);
TextView date = new TextView(ctx);
date.setId(1);
date.setLayoutParams(MATCH_WRAP);
if(header.isLocal()) date.setGravity(RIGHT);
else date.setGravity(LEFT);
date.setTextSize(14);
date.setBackgroundColor(background);
date.setPadding(pad, pad, pad, 0);
long timestamp = header.getTimestamp();
date.setText(DateUtils.getRelativeTimeSpanString(ctx, timestamp));
layout.addView(date);
View content;
if(item.getBody() == null) {
@@ -73,61 +75,11 @@ class ConversationAdapter extends ArrayAdapter<ConversationItem> {
content = attachment;
}
content.setId(2);
content.setLayoutParams(MATCH_WRAP);
content.setBackgroundColor(background);
content.setPadding(pad, 0, pad, pad);
layout.addView(content);
ImageView bubble = new ImageView(ctx);
bubble.setId(3);
RelativeLayout layout = new RelativeLayout(ctx);
if(header.isLocal()) {
Drawable d;
if(header.isRead())
d = res.getDrawable(R.drawable.bubble_read_right);
else d = res.getDrawable(R.drawable.bubble_unread_right);
bubble.setImageDrawable(d);
layout.setPadding(d.getIntrinsicWidth(), 0, 0, 0);
// Bubble tip and date at the top right, content below
date.setGravity(RIGHT);
RelativeLayout.LayoutParams topRight =
CommonLayoutParams.relative();
topRight.addRule(ALIGN_PARENT_TOP);
topRight.addRule(ALIGN_PARENT_RIGHT);
layout.addView(bubble, topRight);
RelativeLayout.LayoutParams leftOf = CommonLayoutParams.relative();
leftOf.addRule(ALIGN_PARENT_TOP);
leftOf.addRule(ALIGN_PARENT_LEFT);
leftOf.addRule(LEFT_OF, 3);
layout.addView(date, leftOf);
RelativeLayout.LayoutParams below = CommonLayoutParams.relative();
below.addRule(ALIGN_PARENT_LEFT);
below.addRule(LEFT_OF, 3);
below.addRule(BELOW, 1);
layout.addView(content, below);
} else {
Drawable d;
if(header.isRead())
d = res.getDrawable(R.drawable.bubble_read_left);
else d = res.getDrawable(R.drawable.bubble_unread_left);
bubble.setImageDrawable(d);
layout.setPadding(0, 0, d.getIntrinsicWidth(), 0);
// Bubble tip and date at the top left, content below
date.setGravity(LEFT);
RelativeLayout.LayoutParams topLeft = CommonLayoutParams.relative();
topLeft.addRule(ALIGN_PARENT_TOP);
topLeft.addRule(ALIGN_PARENT_LEFT);
layout.addView(bubble, topLeft);
RelativeLayout.LayoutParams rightOf = CommonLayoutParams.relative();
rightOf.addRule(ALIGN_PARENT_TOP);
rightOf.addRule(ALIGN_PARENT_RIGHT);
rightOf.addRule(RIGHT_OF, 3);
layout.addView(date, rightOf);
RelativeLayout.LayoutParams below = CommonLayoutParams.relative();
below.addRule(ALIGN_PARENT_RIGHT);
below.addRule(RIGHT_OF, 3);
below.addRule(BELOW, 1);
layout.addView(content, below);
}
return layout;
}
}