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

Minor layout changes.

Browse Source
This commit is contained in:
akwizgran
2012-11-06 19:18:05 +00:00
parent f959ef99ea
commit aa5fc4b866
6 changed files with 66 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
AndroidManifest.xml
View File

@@ -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>

2
src/net/sf/briar/android/invitation/CodesDoNotMatchActivity.java
View File

@@ -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);

1
src/net/sf/briar/android/invitation/ConnectionFailedActivity.java
View File

@@ -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);

1
src/net/sf/briar/android/invitation/ContactAddedActivity.java
View File

@@ -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);

1
src/net/sf/briar/android/invitation/NetworkSetupActivity.java
View File

@@ -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);

2
src/net/sf/briar/android/invitation/WaitForContactActivity.java
View File

@@ -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());