From aa5fc4b8663c8319a10c8c9d631cb59a9ac79f3a Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 6 Nov 2012 19:18:05 +0000
Subject: [PATCH] Minor layout changes.
---
AndroidManifest.xml | 117 +++++++++---------
.../invitation/CodesDoNotMatchActivity.java | 2 +
.../invitation/ConnectionFailedActivity.java | 1 +
.../invitation/ContactAddedActivity.java | 1 +
.../invitation/NetworkSetupActivity.java | 1 +
.../invitation/WaitForContactActivity.java | 2 +
6 files changed, 66 insertions(+), 58 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7992928960..762be9fb14 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,64 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="net.sf.briar"
- android:versionCode="1"
- android:versionName="1.0" >
+ package="net.sf.briar"
+ android:versionCode="1"
+ android:versionName="1.0" >
- <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16" />
+ <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16" />
- <uses-permission android:name="android.permission.BLUETOOTH" />
- <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+ <uses-permission android:name="android.permission.BLUETOOTH" />
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+ <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
- <application
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name" >
- <service android:name=".HelloWorldService" android:exported="false" >
- <intent-filter>
- <action android:name=".HelloWorldService" />
- </intent-filter>
- </service>
- <activity
- android:name=".HelloWorldActivity"
- android:label="@string/app_name" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- <activity
- android:name=".android.invitation.NetworkSetupActivity"
- android:label="@string/title" >
- </activity>
- <activity
- android:name=".android.invitation.InvitationCodeActivity"
- android:label="@string/title" >
- </activity>
- <activity
- android:name=".android.invitation.ConnectionActivity"
- android:label="@string/title" >
- </activity>
- <activity
- android:name=".android.invitation.ConnectionFailedActivity"
- android:label="@string/title" >
- </activity>
- <activity
- android:name=".android.invitation.ConfirmationCodeActivity"
- android:label="@string/title" >
- </activity>
- <activity
- android:name=".android.invitation.WaitForContactActivity"
- android:label="@string/title" >
- </activity>
- <activity
- android:name=".android.invitation.CodesDoNotMatchActivity"
- android:label="@string/title" >
- </activity>
- <activity
- android:name=".android.invitation.ContactAddedActivity"
- android:label="@string/title" >
- </activity>
- </application>
+ <application
+ android:theme="@android:style/Theme.Holo"
+ android:icon="@drawable/ic_launcher"
+ android:label="@string/app_name" >
+ <service android:name=".HelloWorldService" android:exported="false" >
+ <intent-filter>
+ <action android:name=".HelloWorldService" />
+ </intent-filter>
+ </service>
+ <activity
+ android:name=".HelloWorldActivity"
+ android:label="@string/app_name" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ <activity
+ android:name=".android.invitation.NetworkSetupActivity"
+ android:label="@string/title" >
+ </activity>
+ <activity
+ android:name=".android.invitation.InvitationCodeActivity"
+ android:label="@string/title" >
+ </activity>
+ <activity
+ android:name=".android.invitation.ConnectionActivity"
+ android:label="@string/title" >
+ </activity>
+ <activity
+ android:name=".android.invitation.ConnectionFailedActivity"
+ android:label="@string/title" >
+ </activity>
+ <activity
+ android:name=".android.invitation.ConfirmationCodeActivity"
+ android:label="@string/title" >
+ </activity>
+ <activity
+ android:name=".android.invitation.WaitForContactActivity"
+ android:label="@string/title" >
+ </activity>
+ <activity
+ android:name=".android.invitation.CodesDoNotMatchActivity"
+ android:label="@string/title" >
+ </activity>
+ <activity
+ android:name=".android.invitation.ContactAddedActivity"
+ android:label="@string/title" >
+ </activity>
+ </application>
</manifest>
diff --git a/src/net/sf/briar/android/invitation/CodesDoNotMatchActivity.java b/src/net/sf/briar/android/invitation/CodesDoNotMatchActivity.java
index 6af1ad41a2..861a80c700 100644
--- a/src/net/sf/briar/android/invitation/CodesDoNotMatchActivity.java
+++ b/src/net/sf/briar/android/invitation/CodesDoNotMatchActivity.java
@@ -45,6 +45,8 @@ implements OnClickListener {
layout.addView(innerLayout);
TextView interfering = new TextView(this);
+ interfering.setGravity(CENTER_HORIZONTAL);
+ interfering.setPadding(0, 0, 0, 10);
interfering.setText(R.string.interfering);
layout.addView(interfering);
diff --git a/src/net/sf/briar/android/invitation/ConnectionFailedActivity.java b/src/net/sf/briar/android/invitation/ConnectionFailedActivity.java
index 433d75d402..a18e90a199 100644
--- a/src/net/sf/briar/android/invitation/ConnectionFailedActivity.java
+++ b/src/net/sf/briar/android/invitation/ConnectionFailedActivity.java
@@ -51,6 +51,7 @@ implements WifiStateListener, BluetoothStateListener, OnClickListener {
layout.addView(innerLayout);
TextView checkNetwork = new TextView(this);
+ checkNetwork.setGravity(CENTER_HORIZONTAL);
checkNetwork.setText(R.string.check_same_network);
layout.addView(checkNetwork);
diff --git a/src/net/sf/briar/android/invitation/ContactAddedActivity.java b/src/net/sf/briar/android/invitation/ContactAddedActivity.java
index fb22cec8c0..8f75032806 100644
--- a/src/net/sf/briar/android/invitation/ContactAddedActivity.java
+++ b/src/net/sf/briar/android/invitation/ContactAddedActivity.java
@@ -49,6 +49,7 @@ OnEditorActionListener {
layout.addView(innerLayout);
TextView enterNickname = new TextView(this);
+ enterNickname.setGravity(CENTER_HORIZONTAL);
enterNickname.setText(R.string.enter_nickname);
layout.addView(enterNickname);
diff --git a/src/net/sf/briar/android/invitation/NetworkSetupActivity.java b/src/net/sf/briar/android/invitation/NetworkSetupActivity.java
index 935145ea90..abe9065dbb 100644
--- a/src/net/sf/briar/android/invitation/NetworkSetupActivity.java
+++ b/src/net/sf/briar/android/invitation/NetworkSetupActivity.java
@@ -33,6 +33,7 @@ implements WifiStateListener, BluetoothStateListener, OnClickListener {
layout.setGravity(CENTER_HORIZONTAL);
TextView sameNetwork = new TextView(this);
+ sameNetwork.setGravity(CENTER_HORIZONTAL);
sameNetwork.setText(R.string.same_network);
layout.addView(sameNetwork);
diff --git a/src/net/sf/briar/android/invitation/WaitForContactActivity.java b/src/net/sf/briar/android/invitation/WaitForContactActivity.java
index d5f57ab2b9..e6884c67ad 100644
--- a/src/net/sf/briar/android/invitation/WaitForContactActivity.java
+++ b/src/net/sf/briar/android/invitation/WaitForContactActivity.java
@@ -42,10 +42,12 @@ implements ConfirmationListener {
layout.addView(innerLayout);
TextView yourCode = new TextView(this);
+ yourCode.setGravity(CENTER_HORIZONTAL);
yourCode.setText(R.string.your_confirmation_code);
layout.addView(yourCode);
TextView code = new TextView(this);
+ code.setGravity(CENTER_HORIZONTAL);
code.setTextSize(50);
InvitationManager im = InvitationManagerFactory.getInvitationManager();
code.setText(im.getLocalConfirmationCode());
--
GitLab