From fa38c3b6bbc648402ef39de29f7a3b5b8067abd7 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 15 Apr 2013 15:19:10 +0100
Subject: [PATCH] Use 5 pixels of padding around icons.
---
briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java | 4 +++-
.../src/net/sf/briar/android/blogs/BlogListAdapter.java | 1 +
.../src/net/sf/briar/android/blogs/ReadBlogPostActivity.java | 3 ++-
.../src/net/sf/briar/android/contact/ContactListAdapter.java | 3 ++-
.../src/net/sf/briar/android/groups/GroupAdapter.java | 4 +++-
.../src/net/sf/briar/android/groups/GroupListAdapter.java | 1 +
.../net/sf/briar/android/groups/ReadGroupPostActivity.java | 3 ++-
.../src/net/sf/briar/android/invitation/BluetoothWidget.java | 4 ++++
.../src/net/sf/briar/android/invitation/WifiWidget.java | 4 ++++
.../net/sf/briar/android/messages/ConversationAdapter.java | 4 +++-
.../sf/briar/android/messages/ReadPrivateMessageActivity.java | 3 ++-
11 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java b/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java
index 3141bf4af6..046b10650b 100644
--- a/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java
+++ b/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java
@@ -54,6 +54,7 @@ class BlogAdapter extends ArrayAdapter<GroupMessageHeader> {
authorLayout.setGravity(CENTER_VERTICAL);
ImageView thumb = new ImageView(ctx);
+ thumb.setPadding(5, 5, 5, 5);
Rating rating = item.getRating();
if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
@@ -65,7 +66,7 @@ class BlogAdapter extends ArrayAdapter<GroupMessageHeader> {
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(10, 10, 10, 10);
+ name.setPadding(0, 10, 10, 10);
Author author = item.getAuthor();
if(author == null) {
name.setTextColor(res.getColor(R.color.anonymous_author));
@@ -89,6 +90,7 @@ class BlogAdapter extends ArrayAdapter<GroupMessageHeader> {
LinearLayout attachmentLayout = new LinearLayout(ctx);
attachmentLayout.setOrientation(HORIZONTAL);
ImageView attachment = new ImageView(ctx);
+ attachment.setPadding(5, 0, 5, 5);
attachment.setImageResource(R.drawable.content_attachment);
attachmentLayout.addView(attachment);
attachmentLayout.addView(new HorizontalSpace(ctx));
diff --git a/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java b/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java
index 7d177e9813..2ec0fec775 100644
--- a/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java
+++ b/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java
@@ -78,6 +78,7 @@ implements OnItemClickListener {
LinearLayout attachmentLayout = new LinearLayout(ctx);
attachmentLayout.setOrientation(HORIZONTAL);
ImageView attachment = new ImageView(ctx);
+ attachment.setPadding(5, 0, 5, 5);
attachment.setImageResource(R.drawable.content_attachment);
attachmentLayout.addView(attachment);
attachmentLayout.addView(new HorizontalSpace(ctx));
diff --git a/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java b/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java
index 07c24e7454..f27e0ae4a3 100644
--- a/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java
+++ b/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java
@@ -123,6 +123,7 @@ implements OnClickListener {
header.setGravity(CENTER_VERTICAL);
thumb = new ImageView(this);
+ thumb.setPadding(5, 5, 5, 5);
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_unrated);
@@ -133,7 +134,7 @@ implements OnClickListener {
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(10, 10, 10, 10);
+ name.setPadding(0, 10, 10, 10);
if(authorName == null) {
name.setTextColor(res.getColor(R.color.anonymous_author));
name.setText(R.string.anonymous);
diff --git a/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java b/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java
index 52763e97cb..577e569d20 100644
--- a/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java
+++ b/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java
@@ -37,6 +37,7 @@ implements OnItemClickListener {
layout.setGravity(CENTER_VERTICAL);
ImageView bulb = new ImageView(ctx);
+ bulb.setPadding(5, 5, 5, 5);
if(item.isConnected())
bulb.setImageResource(R.drawable.contact_connected);
else bulb.setImageResource(R.drawable.contact_disconnected);
@@ -47,7 +48,7 @@ implements OnItemClickListener {
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(10, 10, 10, 10);
+ name.setPadding(0, 10, 10, 10);
name.setText(item.getContactName());
layout.addView(name);
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 bf3ca47397..d47cc864c3 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
@@ -54,6 +54,7 @@ class GroupAdapter extends ArrayAdapter<GroupMessageHeader> {
authorLayout.setGravity(CENTER_VERTICAL);
ImageView thumb = new ImageView(ctx);
+ thumb.setPadding(5, 5, 5, 5);
Rating rating = item.getRating();
if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
@@ -65,7 +66,7 @@ class GroupAdapter extends ArrayAdapter<GroupMessageHeader> {
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(10, 10, 10, 10);
+ name.setPadding(0, 10, 10, 10);
Author author = item.getAuthor();
if(author == null) {
name.setTextColor(res.getColor(R.color.anonymous_author));
@@ -89,6 +90,7 @@ class GroupAdapter extends ArrayAdapter<GroupMessageHeader> {
LinearLayout attachmentLayout = new LinearLayout(ctx);
attachmentLayout.setOrientation(HORIZONTAL);
ImageView attachment = new ImageView(ctx);
+ attachment.setPadding(5, 0, 5, 5);
attachment.setImageResource(R.drawable.content_attachment);
attachmentLayout.addView(attachment);
attachmentLayout.addView(new HorizontalSpace(ctx));
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java b/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java
index 56b9ef3691..455941cdbf 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java
@@ -78,6 +78,7 @@ implements OnItemClickListener {
LinearLayout attachmentLayout = new LinearLayout(ctx);
attachmentLayout.setOrientation(HORIZONTAL);
ImageView attachment = new ImageView(ctx);
+ attachment.setPadding(5, 0, 5, 5);
attachment.setImageResource(R.drawable.content_attachment);
attachmentLayout.addView(attachment);
attachmentLayout.addView(new HorizontalSpace(ctx));
diff --git a/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java b/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
index 42c45bbe52..bc5a33a3d7 100644
--- a/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
@@ -130,6 +130,7 @@ implements OnClickListener {
header.setGravity(CENTER_VERTICAL);
thumb = new ImageView(this);
+ thumb.setPadding(5, 5, 5, 5);
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_unrated);
@@ -140,7 +141,7 @@ implements OnClickListener {
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(10, 10, 10, 10);
+ name.setPadding(0, 10, 10, 10);
if(authorName == null) {
name.setTextColor(res.getColor(R.color.anonymous_author));
name.setText(R.string.anonymous);
diff --git a/briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java b/briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java
index 0b72d68715..93b86f88cb 100644
--- a/briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java
+++ b/briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java
@@ -41,6 +41,7 @@ public class BluetoothWidget extends LinearLayout implements OnClickListener {
if(adapter == null) {
listener.bluetoothStateChanged(false);
ImageView warning = new ImageView(ctx);
+ warning.setPadding(5, 5, 5, 5);
warning.setImageResource(R.drawable.alerts_and_states_warning);
addView(warning);
status.setText(R.string.bluetooth_not_available);
@@ -48,6 +49,7 @@ public class BluetoothWidget extends LinearLayout implements OnClickListener {
} else if(adapter.getScanMode() == SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
listener.bluetoothStateChanged(true);
ImageView ok = new ImageView(ctx);
+ ok.setPadding(5, 5, 5, 5);
ok.setImageResource(R.drawable.navigation_accept);
addView(ok);
status.setText(R.string.bluetooth_enabled);
@@ -59,6 +61,7 @@ public class BluetoothWidget extends LinearLayout implements OnClickListener {
} else if(adapter.isEnabled()) {
listener.bluetoothStateChanged(true);
ImageView warning = new ImageView(ctx);
+ warning.setPadding(5, 5, 5, 5);
warning.setImageResource(R.drawable.alerts_and_states_warning);
addView(warning);
status.setText(R.string.bluetooth_not_discoverable);
@@ -70,6 +73,7 @@ public class BluetoothWidget extends LinearLayout implements OnClickListener {
} else {
listener.bluetoothStateChanged(false);
ImageView warning = new ImageView(ctx);
+ warning.setPadding(5, 5, 5, 5);
warning.setImageResource(R.drawable.alerts_and_states_warning);
addView(warning);
status.setText(R.string.bluetooth_disabled);
diff --git a/briar-android/src/net/sf/briar/android/invitation/WifiWidget.java b/briar-android/src/net/sf/briar/android/invitation/WifiWidget.java
index 82b652386a..90f34854a7 100644
--- a/briar-android/src/net/sf/briar/android/invitation/WifiWidget.java
+++ b/briar-android/src/net/sf/briar/android/invitation/WifiWidget.java
@@ -42,6 +42,7 @@ public class WifiWidget extends LinearLayout implements OnClickListener {
if(wifi == null) {
wifiStateChanged(null);
ImageView warning = new ImageView(ctx);
+ warning.setPadding(5, 5, 5, 5);
warning.setImageResource(R.drawable.alerts_and_states_warning);
addView(warning);
status.setText(R.string.wifi_not_available);
@@ -53,6 +54,7 @@ public class WifiWidget extends LinearLayout implements OnClickListener {
if(networkName == null || networkId == -1) {
wifiStateChanged(null);
ImageView warning = new ImageView(ctx);
+ warning.setPadding(5, 5, 5, 5);
warning.setImageResource(R.drawable.alerts_and_states_warning);
addView(warning);
status.setText(R.string.wifi_disconnected);
@@ -64,6 +66,7 @@ public class WifiWidget extends LinearLayout implements OnClickListener {
} else {
wifiStateChanged(networkName);
ImageView ok = new ImageView(ctx);
+ ok.setPadding(5, 5, 5, 5);
ok.setImageResource(R.drawable.navigation_accept);
addView(ok);
String format = getResources().getString(
@@ -78,6 +81,7 @@ public class WifiWidget extends LinearLayout implements OnClickListener {
} else {
wifiStateChanged(null);
ImageView warning = new ImageView(ctx);
+ warning.setPadding(5, 5, 5, 5);
warning.setImageResource(R.drawable.alerts_and_states_warning);
addView(warning);
status.setText(R.string.wifi_disabled);
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java b/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
index 867593d40b..fadd7f8dc1 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
@@ -54,6 +54,7 @@ class ConversationAdapter extends ArrayAdapter<PrivateMessageHeader> {
authorLayout.setGravity(CENTER_VERTICAL);
ImageView thumb = new ImageView(ctx);
+ thumb.setPadding(5, 5, 5, 5);
Rating rating = item.getRating();
if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
@@ -65,7 +66,7 @@ class ConversationAdapter extends ArrayAdapter<PrivateMessageHeader> {
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(10, 10, 10, 10);
+ name.setPadding(0, 10, 10, 10);
name.setText(item.getAuthor().getName());
authorLayout.addView(name);
innerLayout.addView(authorLayout);
@@ -83,6 +84,7 @@ class ConversationAdapter extends ArrayAdapter<PrivateMessageHeader> {
LinearLayout attachmentLayout = new LinearLayout(ctx);
attachmentLayout.setOrientation(HORIZONTAL);
ImageView attachment = new ImageView(ctx);
+ attachment.setPadding(5, 0, 5, 5);
attachment.setImageResource(R.drawable.content_attachment);
attachmentLayout.addView(attachment);
attachmentLayout.addView(new HorizontalSpace(ctx));
diff --git a/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java b/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
index b50870f38f..811bbd27ad 100644
--- a/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
@@ -122,6 +122,7 @@ implements OnClickListener {
header.setGravity(CENTER_VERTICAL);
ImageView thumb = new ImageView(this);
+ thumb.setPadding(5, 5, 5, 5);
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_unrated);
@@ -132,7 +133,7 @@ implements OnClickListener {
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(10, 10, 10, 10);
+ name.setPadding(0, 10, 10, 10);
name.setText(authorName);
header.addView(name);
--
GitLab