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

Preserve alignment by making rating icons INVISIBLE rather than GONE.

Browse Source
This commit is contained in:
akwizgran
2013-03-12 18:10:55 +00:00
parent 0280ea2aa9
commit c02ce6cb12
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
View File

@@ -2,11 +2,12 @@ package net.sf.briar.android.groups;
import static android.graphics.Typeface.BOLD; import static android.graphics.Typeface.BOLD;
import static android.view.Gravity.CENTER_VERTICAL; import static android.view.Gravity.CENTER_VERTICAL;
import static android.view.View.INVISIBLE;
import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL; import static android.widget.LinearLayout.VERTICAL;
import static java.text.DateFormat.SHORT; 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.GOOD;
import static net.sf.briar.api.Rating.UNRATED;
import java.util.ArrayList; import java.util.ArrayList;
@@ -50,23 +51,18 @@ class GroupAdapter extends ArrayAdapter<GroupItem> {
innerInnerLayout.setOrientation(HORIZONTAL); innerInnerLayout.setOrientation(HORIZONTAL);
innerInnerLayout.setGravity(CENTER_VERTICAL); innerInnerLayout.setGravity(CENTER_VERTICAL);
ImageView thumb = new ImageView(ctx);
thumb.setPadding(10, 10, 10, 10);
Rating rating = item.getRating(); Rating rating = item.getRating();
if(rating == GOOD) { if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
ImageView good = new ImageView(ctx); else thumb.setImageResource(R.drawable.rating_bad);
good.setPadding(0, 10, 10, 10); if(rating == UNRATED) thumb.setVisibility(INVISIBLE);
good.setImageResource(R.drawable.rating_good); innerInnerLayout.addView(thumb);
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);
}
TextView name = new TextView(ctx); TextView name = new TextView(ctx);
name.setTextSize(18); name.setTextSize(18);
name.setMaxLines(1); name.setMaxLines(1);
name.setPadding(10, 10, 10, 10); name.setPadding(0, 10, 10, 10);
Author author = item.getAuthor(); Author author = item.getAuthor();
Resources res = ctx.getResources(); Resources res = ctx.getResources();
if(author == null) { if(author == null) {

8
briar-android/src/net/sf/briar/android/groups/ReadGroupMessageActivity.java
View File

@@ -2,7 +2,7 @@ package net.sf.briar.android.groups;
import static android.view.Gravity.CENTER; import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_VERTICAL; 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.view.View.VISIBLE;
import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL; import static android.widget.LinearLayout.VERTICAL;
@@ -133,8 +133,8 @@ implements OnClickListener {
thumb = new ImageView(this); thumb = new ImageView(this);
thumb.setPadding(0, 10, 10, 10); thumb.setPadding(0, 10, 10, 10);
if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good); if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad); else thumb.setImageResource(R.drawable.rating_bad);
else thumb.setVisibility(GONE); if(rating == UNRATED) thumb.setVisibility(INVISIBLE);
header.addView(thumb); header.addView(thumb);
TextView author = new TextView(this); TextView author = new TextView(this);
@@ -368,7 +368,7 @@ implements OnClickListener {
thumb.setImageResource(R.drawable.rating_bad); thumb.setImageResource(R.drawable.rating_bad);
thumb.setVisibility(VISIBLE); thumb.setVisibility(VISIBLE);
} else { } else {
thumb.setVisibility(GONE); thumb.setVisibility(INVISIBLE);
} }
} }
}); });