From c69766fbd27b32f0dcfa15b4c8476d3812af1259 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Sat, 1 Mar 2014 11:55:54 +0000
Subject: [PATCH] Removed redundant calls to setTextSize(14), which is the
default.
---
briar-android/src/org/briarproject/android/SetupActivity.java | 1 -
.../org/briarproject/android/contact/ContactListAdapter.java | 1 -
.../org/briarproject/android/contact/ConversationAdapter.java | 1 -
.../android/contact/ReadPrivateMessageActivity.java | 1 -
.../src/org/briarproject/android/groups/GroupAdapter.java | 1 -
.../src/org/briarproject/android/groups/GroupListAdapter.java | 2 --
.../org/briarproject/android/groups/ManageGroupsAdapter.java | 1 -
.../org/briarproject/android/groups/ReadGroupPostActivity.java | 1 -
.../org/briarproject/android/invitation/ChooseIdentityView.java | 1 -
.../src/org/briarproject/android/invitation/CodeEntryView.java | 1 -
.../briarproject/android/invitation/CodesDoNotMatchView.java | 1 -
.../briarproject/android/invitation/ConfirmationCodeView.java | 1 -
.../briarproject/android/invitation/ConnectionFailedView.java | 1 -
.../src/org/briarproject/android/invitation/ConnectionView.java | 1 -
.../org/briarproject/android/invitation/ContactDetailsView.java | 1 -
.../org/briarproject/android/invitation/InvitationCodeView.java | 1 -
.../org/briarproject/android/invitation/WaitForContactView.java | 1 -
17 files changed, 18 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/SetupActivity.java b/briar-android/src/org/briarproject/android/SetupActivity.java
index e8472c5ee2..261c6a4e41 100644
--- a/briar-android/src/org/briarproject/android/SetupActivity.java
+++ b/briar-android/src/org/briarproject/android/SetupActivity.java
@@ -146,7 +146,6 @@ public class SetupActivity extends RoboActivity implements OnClickListener {
feedback = new TextView(this);
feedback.setGravity(CENTER);
- feedback.setTextSize(14);
feedback.setPadding(0, pad, 0, pad);
feedback.setText("");
layout.addView(feedback);
diff --git a/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java b/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java
index c43e0b0e5c..1e2fb5a943 100644
--- a/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java
+++ b/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java
@@ -63,7 +63,6 @@ class ContactListAdapter extends ArrayAdapter<ContactListItem> {
layout.addView(name);
TextView connected = new TextView(ctx);
- connected.setTextSize(14);
connected.setPadding(0, pad, pad, pad);
if(item.isConnected()) {
connected.setText(R.string.contact_connected);
diff --git a/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java b/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
index f50ffd7240..a315cf16ac 100644
--- a/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
+++ b/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
@@ -71,7 +71,6 @@ class ConversationAdapter extends ArrayAdapter<ConversationItem> {
date.setLayoutParams(MATCH_WRAP);
if(header.isLocal()) date.setGravity(RIGHT);
else date.setGravity(LEFT);
- date.setTextSize(14);
date.setTextColor(res.getColor(R.color.private_message_date));
date.setBackgroundColor(background);
date.setPadding(pad, 0, pad, pad);
diff --git a/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java b/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java
index c321319a85..cf0d43bc14 100644
--- a/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java
+++ b/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java
@@ -119,7 +119,6 @@ implements OnClickListener {
int pad = LayoutUtils.getPadding(this);
TextView date = new TextView(this);
- date.setTextSize(14);
date.setPadding(0, pad, pad, pad);
date.setText(DateUtils.getRelativeTimeSpanString(this, timestamp));
header.addView(date);
diff --git a/briar-android/src/org/briarproject/android/groups/GroupAdapter.java b/briar-android/src/org/briarproject/android/groups/GroupAdapter.java
index ad0e90abed..220da0fa2a 100644
--- a/briar-android/src/org/briarproject/android/groups/GroupAdapter.java
+++ b/briar-android/src/org/briarproject/android/groups/GroupAdapter.java
@@ -60,7 +60,6 @@ class GroupAdapter extends ArrayAdapter<GroupItem> {
headerLayout.addView(authorView);
TextView date = new TextView(ctx);
- date.setTextSize(14);
date.setPadding(0, pad, pad, pad);
long timestamp = header.getTimestamp();
date.setText(DateUtils.getRelativeTimeSpanString(ctx, timestamp));
diff --git a/briar-android/src/org/briarproject/android/groups/GroupListAdapter.java b/briar-android/src/org/briarproject/android/groups/GroupListAdapter.java
index b63d3d2647..a3df0e9f01 100644
--- a/briar-android/src/org/briarproject/android/groups/GroupListAdapter.java
+++ b/briar-android/src/org/briarproject/android/groups/GroupListAdapter.java
@@ -53,14 +53,12 @@ class GroupListAdapter extends ArrayAdapter<GroupListItem> {
if(item.isEmpty()) {
TextView noPosts = new TextView(ctx);
- noPosts.setTextSize(14);
noPosts.setPadding(pad, 0, pad, pad);
noPosts.setTextColor(res.getColor(R.color.no_posts));
noPosts.setText(R.string.no_posts);
layout.addView(noPosts);
} else {
TextView date = new TextView(ctx);
- date.setTextSize(14);
date.setPadding(pad, 0, pad, pad);
long timestamp = item.getTimestamp();
date.setText(DateUtils.getRelativeTimeSpanString(ctx, timestamp));
diff --git a/briar-android/src/org/briarproject/android/groups/ManageGroupsAdapter.java b/briar-android/src/org/briarproject/android/groups/ManageGroupsAdapter.java
index e6fcd2c31e..38f419a419 100644
--- a/briar-android/src/org/briarproject/android/groups/ManageGroupsAdapter.java
+++ b/briar-android/src/org/briarproject/android/groups/ManageGroupsAdapter.java
@@ -56,7 +56,6 @@ class ManageGroupsAdapter extends ArrayAdapter<ManageGroupsItem> {
innerLayout.addView(name);
TextView status = new TextView(ctx);
- status.setTextSize(14);
status.setPadding(0, 0, pad, pad);
if(groupStatus.isSubscribed()) {
if(groupStatus.isVisibleToAll())
diff --git a/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java b/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java
index 1b6332bb89..a2d11da553 100644
--- a/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java
+++ b/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java
@@ -116,7 +116,6 @@ implements OnClickListener {
int pad = LayoutUtils.getPadding(this);
TextView date = new TextView(this);
- date.setTextSize(14);
date.setPadding(0, pad, pad, pad);
date.setText(DateUtils.getRelativeTimeSpanString(this, timestamp));
header.addView(date);
diff --git a/briar-android/src/org/briarproject/android/invitation/ChooseIdentityView.java b/briar-android/src/org/briarproject/android/invitation/ChooseIdentityView.java
index 81070413db..b81858db46 100644
--- a/briar-android/src/org/briarproject/android/invitation/ChooseIdentityView.java
+++ b/briar-android/src/org/briarproject/android/invitation/ChooseIdentityView.java
@@ -64,7 +64,6 @@ implements OnItemSelectedListener, OnClickListener {
addView(innerLayout);
TextView faceToFace = new TextView(ctx);
- faceToFace.setTextSize(14);
faceToFace.setPadding(pad, pad, pad, pad);
faceToFace.setText(R.string.face_to_face);
addView(faceToFace);
diff --git a/briar-android/src/org/briarproject/android/invitation/CodeEntryView.java b/briar-android/src/org/briarproject/android/invitation/CodeEntryView.java
index 6b330a0f41..b09ef75049 100644
--- a/briar-android/src/org/briarproject/android/invitation/CodeEntryView.java
+++ b/briar-android/src/org/briarproject/android/invitation/CodeEntryView.java
@@ -43,7 +43,6 @@ implements OnEditorActionListener, OnClickListener {
Context ctx = getContext();
TextView enterCode = new TextView(ctx);
enterCode.setGravity(CENTER_HORIZONTAL);
- enterCode.setTextSize(14);
enterCode.setPadding(pad, pad, pad, 0);
enterCode.setText(prompt);
addView(enterCode);
diff --git a/briar-android/src/org/briarproject/android/invitation/CodesDoNotMatchView.java b/briar-android/src/org/briarproject/android/invitation/CodesDoNotMatchView.java
index f7b8f20469..ea800ccfc8 100644
--- a/briar-android/src/org/briarproject/android/invitation/CodesDoNotMatchView.java
+++ b/briar-android/src/org/briarproject/android/invitation/CodesDoNotMatchView.java
@@ -43,7 +43,6 @@ class CodesDoNotMatchView extends AddContactView implements OnClickListener {
TextView interfering = new TextView(ctx);
interfering.setGravity(CENTER);
- interfering.setTextSize(14);
interfering.setPadding(pad, 0, pad, pad);
interfering.setText(R.string.interfering);
addView(interfering);
diff --git a/briar-android/src/org/briarproject/android/invitation/ConfirmationCodeView.java b/briar-android/src/org/briarproject/android/invitation/ConfirmationCodeView.java
index b19ba409c6..1002a8c0c2 100644
--- a/briar-android/src/org/briarproject/android/invitation/ConfirmationCodeView.java
+++ b/briar-android/src/org/briarproject/android/invitation/ConfirmationCodeView.java
@@ -37,7 +37,6 @@ class ConfirmationCodeView extends AddContactView implements CodeEntryListener {
TextView yourCode = new TextView(ctx);
yourCode.setGravity(CENTER_HORIZONTAL);
- yourCode.setTextSize(14);
yourCode.setPadding(pad, pad, pad, pad);
yourCode.setText(R.string.your_confirmation_code);
addView(yourCode);
diff --git a/briar-android/src/org/briarproject/android/invitation/ConnectionFailedView.java b/briar-android/src/org/briarproject/android/invitation/ConnectionFailedView.java
index 05f6dd954b..346d9788c4 100644
--- a/briar-android/src/org/briarproject/android/invitation/ConnectionFailedView.java
+++ b/briar-android/src/org/briarproject/android/invitation/ConnectionFailedView.java
@@ -45,7 +45,6 @@ class ConnectionFailedView extends AddContactView implements OnClickListener {
TextView couldNotFind = new TextView(ctx);
couldNotFind.setGravity(CENTER);
- couldNotFind.setTextSize(14);
couldNotFind.setPadding(pad, 0, pad, pad);
couldNotFind.setText(R.string.could_not_find_contact);
addView(couldNotFind);
diff --git a/briar-android/src/org/briarproject/android/invitation/ConnectionView.java b/briar-android/src/org/briarproject/android/invitation/ConnectionView.java
index 5bc7584a08..edc63b0ca7 100644
--- a/briar-android/src/org/briarproject/android/invitation/ConnectionView.java
+++ b/briar-android/src/org/briarproject/android/invitation/ConnectionView.java
@@ -21,7 +21,6 @@ class ConnectionView extends AddContactView {
Context ctx = getContext();
TextView yourCode = new TextView(ctx);
yourCode.setGravity(CENTER_HORIZONTAL);
- yourCode.setTextSize(14);
yourCode.setPadding(pad, pad, pad, pad);
yourCode.setText(R.string.your_invitation_code);
addView(yourCode);
diff --git a/briar-android/src/org/briarproject/android/invitation/ContactDetailsView.java b/briar-android/src/org/briarproject/android/invitation/ContactDetailsView.java
index 1c31bba2ce..9e8a83f78c 100644
--- a/briar-android/src/org/briarproject/android/invitation/ContactDetailsView.java
+++ b/briar-android/src/org/briarproject/android/invitation/ContactDetailsView.java
@@ -37,7 +37,6 @@ class ContactDetailsView extends AddContactView {
TextView yourCode = new TextView(ctx);
yourCode.setGravity(CENTER_HORIZONTAL);
- yourCode.setTextSize(14);
yourCode.setPadding(pad, 0, pad, pad);
yourCode.setText(R.string.your_confirmation_code);
addView(yourCode);
diff --git a/briar-android/src/org/briarproject/android/invitation/InvitationCodeView.java b/briar-android/src/org/briarproject/android/invitation/InvitationCodeView.java
index afd4669c3c..c099a67422 100644
--- a/briar-android/src/org/briarproject/android/invitation/InvitationCodeView.java
+++ b/briar-android/src/org/briarproject/android/invitation/InvitationCodeView.java
@@ -19,7 +19,6 @@ class InvitationCodeView extends AddContactView implements CodeEntryListener {
Context ctx = getContext();
TextView yourCode = new TextView(ctx);
yourCode.setGravity(CENTER_HORIZONTAL);
- yourCode.setTextSize(14);
yourCode.setPadding(pad, pad, pad, pad);
yourCode.setText(R.string.your_invitation_code);
addView(yourCode);
diff --git a/briar-android/src/org/briarproject/android/invitation/WaitForContactView.java b/briar-android/src/org/briarproject/android/invitation/WaitForContactView.java
index 2ee3f392a2..f417dd1139 100644
--- a/briar-android/src/org/briarproject/android/invitation/WaitForContactView.java
+++ b/briar-android/src/org/briarproject/android/invitation/WaitForContactView.java
@@ -37,7 +37,6 @@ class WaitForContactView extends AddContactView {
TextView yourCode = new TextView(ctx);
yourCode.setGravity(CENTER_HORIZONTAL);
- yourCode.setTextSize(14);
yourCode.setPadding(pad, 0, pad, pad);
yourCode.setText(R.string.your_confirmation_code);
addView(yourCode);
--
GitLab