From c02ce6cb120a5810b859cd1c502d5c26299ce0af Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 12 Mar 2013 18:10:55 +0000
Subject: [PATCH] Preserve alignment by making rating icons INVISIBLE rather
than GONE.
---
.../sf/briar/android/groups/GroupAdapter.java | 22 ++++++++-----------
.../groups/ReadGroupMessageActivity.java | 8 +++----
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
index 10f8b11722..c554a7bfae 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
@@ -2,11 +2,12 @@ package net.sf.briar.android.groups;
import static android.graphics.Typeface.BOLD;
import static android.view.Gravity.CENTER_VERTICAL;
+import static android.view.View.INVISIBLE;
import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL;
import static java.text.DateFormat.SHORT;
-import static net.sf.briar.api.Rating.BAD;
import static net.sf.briar.api.Rating.GOOD;
+import static net.sf.briar.api.Rating.UNRATED;
import java.util.ArrayList;
@@ -50,23 +51,18 @@ class GroupAdapter extends ArrayAdapter<GroupItem> {
innerInnerLayout.setOrientation(HORIZONTAL);
innerInnerLayout.setGravity(CENTER_VERTICAL);
+ ImageView thumb = new ImageView(ctx);
+ thumb.setPadding(10, 10, 10, 10);
Rating rating = item.getRating();
- if(rating == GOOD) {
- ImageView good = new ImageView(ctx);
- good.setPadding(0, 10, 10, 10);
- good.setImageResource(R.drawable.rating_good);
- innerInnerLayout.addView(good);
- } else if(rating == BAD) {
- ImageView bad = new ImageView(ctx);
- bad.setPadding(0, 10, 10, 10);
- bad.setImageResource(R.drawable.rating_bad);
- innerInnerLayout.addView(bad);
- }
+ if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
+ else thumb.setImageResource(R.drawable.rating_bad);
+ if(rating == UNRATED) thumb.setVisibility(INVISIBLE);
+ innerInnerLayout.addView(thumb);
TextView name = new TextView(ctx);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(10, 10, 10, 10);
+ name.setPadding(0, 10, 10, 10);
Author author = item.getAuthor();
Resources res = ctx.getResources();
if(author == null) {
diff --git a/briar-android/src/net/sf/briar/android/groups/ReadGroupMessageActivity.java b/briar-android/src/net/sf/briar/android/groups/ReadGroupMessageActivity.java
index 61b4183e58..6c58d3290d 100644
--- a/briar-android/src/net/sf/briar/android/groups/ReadGroupMessageActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/ReadGroupMessageActivity.java
@@ -2,7 +2,7 @@ package net.sf.briar.android.groups;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_VERTICAL;
-import static android.view.View.GONE;
+import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;
import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL;
@@ -133,8 +133,8 @@ implements OnClickListener {
thumb = new ImageView(this);
thumb.setPadding(0, 10, 10, 10);
if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
- else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
- else thumb.setVisibility(GONE);
+ else thumb.setImageResource(R.drawable.rating_bad);
+ if(rating == UNRATED) thumb.setVisibility(INVISIBLE);
header.addView(thumb);
TextView author = new TextView(this);
@@ -368,7 +368,7 @@ implements OnClickListener {
thumb.setImageResource(R.drawable.rating_bad);
thumb.setVisibility(VISIBLE);
} else {
- thumb.setVisibility(GONE);
+ thumb.setVisibility(INVISIBLE);
}
}
});
--
GitLab