From 0e681b94160c0609e49b758430e2e8ba261bc67e Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 18 Apr 2013 22:22:15 +0100
Subject: [PATCH] Removed padding between text entry fields and their labels.
---
.../src/net/sf/briar/android/HomeScreenActivity.java | 3 +--
briar-android/src/net/sf/briar/android/SetupActivity.java | 6 +++---
.../src/net/sf/briar/android/blogs/CreateBlogActivity.java | 3 +--
.../net/sf/briar/android/blogs/WriteBlogPostActivity.java | 5 +++--
.../net/sf/briar/android/groups/CreateGroupActivity.java | 3 +--
.../net/sf/briar/android/groups/WriteGroupPostActivity.java | 5 +++--
.../sf/briar/android/identity/CreateIdentityActivity.java | 3 +--
.../net/sf/briar/android/invitation/CodeEntryWidget.java | 3 +--
.../briar/android/messages/WritePrivateMessageActivity.java | 5 +++--
9 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
index 443e3b57c6..9c4ad4c3b4 100644
--- a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
+++ b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
@@ -197,13 +197,12 @@ public class HomeScreenActivity extends BriarActivity {
enterPassword = new TextView(this);
enterPassword.setGravity(CENTER);
enterPassword.setTextSize(18);
- enterPassword.setPadding(10, 10, 10, 10);
+ enterPassword.setPadding(10, 10, 10, 0);
enterPassword.setText(R.string.enter_password);
layout.addView(enterPassword);
final EditText passwordEntry = new EditText(this);
passwordEntry.setMaxLines(1);
- passwordEntry.setPadding(10, 0, 10, 10);
int inputType = TYPE_CLASS_TEXT | TYPE_TEXT_VARIATION_PASSWORD;
passwordEntry.setInputType(inputType);
passwordEntry.setOnEditorActionListener(new OnEditorActionListener() {
diff --git a/briar-android/src/net/sf/briar/android/SetupActivity.java b/briar-android/src/net/sf/briar/android/SetupActivity.java
index a761e7b7f5..fbae8b829d 100644
--- a/briar-android/src/net/sf/briar/android/SetupActivity.java
+++ b/briar-android/src/net/sf/briar/android/SetupActivity.java
@@ -67,7 +67,7 @@ public class SetupActivity extends BriarActivity implements OnClickListener {
TextView chooseNickname = new TextView(this);
chooseNickname.setGravity(CENTER);
chooseNickname.setTextSize(18);
- chooseNickname.setPadding(10, 10, 10, 10);
+ chooseNickname.setPadding(10, 10, 10, 0);
chooseNickname.setText(R.string.choose_nickname);
layout.addView(chooseNickname);
@@ -86,7 +86,7 @@ public class SetupActivity extends BriarActivity implements OnClickListener {
TextView choosePassword = new TextView(this);
choosePassword.setGravity(CENTER);
choosePassword.setTextSize(18);
- choosePassword.setPadding(10, 10, 10, 10);
+ choosePassword.setPadding(10, 10, 10, 0);
choosePassword.setText(R.string.choose_password);
layout.addView(choosePassword);
@@ -105,7 +105,7 @@ public class SetupActivity extends BriarActivity implements OnClickListener {
TextView confirmPassword = new TextView(this);
confirmPassword.setGravity(CENTER);
confirmPassword.setTextSize(18);
- confirmPassword.setPadding(10, 10, 10, 10);
+ confirmPassword.setPadding(10, 10, 10, 0);
confirmPassword.setText(R.string.confirm_password);
layout.addView(confirmPassword);
diff --git a/briar-android/src/net/sf/briar/android/blogs/CreateBlogActivity.java b/briar-android/src/net/sf/briar/android/blogs/CreateBlogActivity.java
index 35cbe2f6a4..26444d0f28 100644
--- a/briar-android/src/net/sf/briar/android/blogs/CreateBlogActivity.java
+++ b/briar-android/src/net/sf/briar/android/blogs/CreateBlogActivity.java
@@ -88,7 +88,7 @@ SelectContactsDialog.Listener {
TextView chooseName = new TextView(this);
chooseName.setGravity(CENTER);
chooseName.setTextSize(18);
- chooseName.setPadding(10, 10, 10, 10);
+ chooseName.setPadding(10, 10, 10, 0);
chooseName.setText(R.string.choose_blog_name);
layout.addView(chooseName);
@@ -100,7 +100,6 @@ SelectContactsDialog.Listener {
}
};
nameEntry.setMaxLines(1);
- nameEntry.setPadding(10, 0, 10, 10);
nameEntry.setInputType(TYPE_CLASS_TEXT | TYPE_TEXT_FLAG_CAP_SENTENCES);
nameEntry.setOnEditorActionListener(this);
layout.addView(nameEntry);
diff --git a/briar-android/src/net/sf/briar/android/blogs/WriteBlogPostActivity.java b/briar-android/src/net/sf/briar/android/blogs/WriteBlogPostActivity.java
index cae099277c..a6e3ab9703 100644
--- a/briar-android/src/net/sf/briar/android/blogs/WriteBlogPostActivity.java
+++ b/briar-android/src/net/sf/briar/android/blogs/WriteBlogPostActivity.java
@@ -40,6 +40,7 @@ import net.sf.briar.api.messaging.MessageId;
import android.content.Intent;
import android.os.Bundle;
import android.os.Parcelable;
+import android.text.InputType;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.AdapterView;
@@ -138,8 +139,8 @@ implements OnItemSelectedListener, OnClickListener {
layout.addView(header);
content = new EditText(this);
- content.setPadding(10, 10, 10, 10);
- int inputType = TYPE_CLASS_TEXT | TYPE_TEXT_FLAG_CAP_SENTENCES;
+ int inputType = TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE
+ | TYPE_TEXT_FLAG_CAP_SENTENCES;
content.setInputType(inputType);
if(state != null && bundleEncrypter.decrypt(state)) {
Parcelable p = state.getParcelable("net.sf.briar.CONTENT");
diff --git a/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java b/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java
index 388fe72169..ee0dbafd20 100644
--- a/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java
@@ -83,7 +83,7 @@ SelectContactsDialog.Listener {
TextView chooseName = new TextView(this);
chooseName.setGravity(CENTER);
chooseName.setTextSize(18);
- chooseName.setPadding(10, 10, 10, 10);
+ chooseName.setPadding(10, 10, 10, 0);
chooseName.setText(R.string.choose_group_name);
layout.addView(chooseName);
@@ -95,7 +95,6 @@ SelectContactsDialog.Listener {
}
};
nameEntry.setMaxLines(1);
- nameEntry.setPadding(10, 0, 10, 10);
nameEntry.setInputType(TYPE_CLASS_TEXT | TYPE_TEXT_FLAG_CAP_SENTENCES);
nameEntry.setOnEditorActionListener(this);
layout.addView(nameEntry);
diff --git a/briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java b/briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java
index 3254c70c2e..afacecf6fc 100644
--- a/briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java
@@ -43,6 +43,7 @@ import net.sf.briar.api.messaging.MessageId;
import android.content.Intent;
import android.os.Bundle;
import android.os.Parcelable;
+import android.text.InputType;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.AdapterView;
@@ -141,8 +142,8 @@ implements OnItemSelectedListener, OnClickListener {
layout.addView(header);
content = new EditText(this);
- content.setPadding(10, 10, 10, 10);
- int inputType = TYPE_CLASS_TEXT | TYPE_TEXT_FLAG_CAP_SENTENCES;
+ int inputType = TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE
+ | TYPE_TEXT_FLAG_CAP_SENTENCES;
content.setInputType(inputType);
if(state != null && bundleEncrypter.decrypt(state)) {
Parcelable p = state.getParcelable("net.sf.briar.CONTENT");
diff --git a/briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java b/briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java
index 995d7927e9..f5928c8efc 100644
--- a/briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java
+++ b/briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java
@@ -76,7 +76,7 @@ implements OnEditorActionListener, OnClickListener {
TextView chooseNickname = new TextView(this);
chooseNickname.setGravity(CENTER);
chooseNickname.setTextSize(18);
- chooseNickname.setPadding(10, 10, 10, 10);
+ chooseNickname.setPadding(10, 10, 10, 0);
chooseNickname.setText(R.string.choose_nickname);
layout.addView(chooseNickname);
@@ -89,7 +89,6 @@ implements OnEditorActionListener, OnClickListener {
}
};
nicknameEntry.setMaxLines(1);
- nicknameEntry.setPadding(10, 0, 10, 10);
int inputType = TYPE_CLASS_TEXT | TYPE_TEXT_FLAG_CAP_WORDS;
nicknameEntry.setInputType(inputType);
nicknameEntry.setOnEditorActionListener(this);
diff --git a/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java b/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
index 9428cb768f..68f73f2982 100644
--- a/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
+++ b/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
@@ -38,7 +38,7 @@ implements OnEditorActionListener, OnClickListener {
TextView enterCode = new TextView(ctx);
enterCode.setGravity(CENTER_HORIZONTAL);
enterCode.setTextSize(14);
- enterCode.setPadding(10, 10, 10, 10);
+ enterCode.setPadding(10, 10, 10, 0);
enterCode.setText(prompt);
addView(enterCode);
@@ -55,7 +55,6 @@ implements OnEditorActionListener, OnClickListener {
}
};
codeEntry.setTextSize(26);
- codeEntry.setPadding(10, 0, 10, 10);
codeEntry.setOnEditorActionListener(this);
codeEntry.setMinEms(5);
codeEntry.setMaxEms(5);
diff --git a/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java b/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java
index 866c4bdaa5..ef421fcc59 100644
--- a/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java
@@ -39,6 +39,7 @@ import net.sf.briar.api.messaging.MessageId;
import android.content.Intent;
import android.os.Bundle;
import android.os.Parcelable;
+import android.text.InputType;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.AdapterView;
@@ -129,8 +130,8 @@ implements OnItemSelectedListener, OnClickListener {
layout.addView(header);
content = new EditText(this);
- content.setPadding(10, 10, 10, 10);
- int inputType = TYPE_CLASS_TEXT | TYPE_TEXT_FLAG_CAP_SENTENCES;
+ int inputType = TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE
+ | TYPE_TEXT_FLAG_CAP_SENTENCES;
content.setInputType(inputType);
if(state != null && bundleEncrypter.decrypt(state)) {
Parcelable p = state.getParcelable("net.sf.briar.CONTENT");
--
GitLab