aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/activity_edit_account.xml50
-rw-r--r--res/layout/otr_fingerprint.xml24
-rw-r--r--res/menu/manageaccounts_context.xml35
-rw-r--r--res/values/strings.xml6
4 files changed, 50 insertions, 65 deletions
diff --git a/res/layout/activity_edit_account.xml b/res/layout/activity_edit_account.xml
index e4d9665a..3cab4b80 100644
--- a/res/layout/activity_edit_account.xml
+++ b/res/layout/activity_edit_account.xml
@@ -4,6 +4,16 @@
android:layout_height="match_parent"
android:background="@color/primarybackground" >
+ <ScrollView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/button_bar"
+ android:layout_alignParentTop="true">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
<LinearLayout
android:id="@+id/editor"
android:layout_width="fill_parent"
@@ -72,28 +82,25 @@
android:id="@+id/stats"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:layout_above="@+id/button_bar"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/editor"
android:layout_marginTop="8dp"
android:orientation="vertical"
android:padding="16dp"
- android:visibility="gone">
+ android:visibility="gone" >
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:textSize="18sp"
- android:textStyle="bold"
- android:textColor="@color/secondarytext"
+ android:gravity="center_horizontal"
android:text="@string/additional_information"
- android:gravity="center_horizontal"/>
+ android:textColor="@color/secondarytext"
+ android:textSize="18sp"
+ android:textStyle="bold" />
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:stretchColumns="1"
- android:layout_marginTop="8dp">
+ android:layout_marginTop="8dp"
+ android:stretchColumns="1" >
<TableRow
android:layout_width="fill_parent"
@@ -127,7 +134,28 @@
android:layout_gravity="right" />
</TableRow>
</TableLayout>
+
+ <TextView
+ android:id="@+id/otr_fingerprint_headline"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ android:gravity="center_horizontal"
+ android:text="@string/otr_fingerprint"
+ android:textColor="@color/secondarytext"
+ android:textSize="18sp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/otr_fingerprint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:textSize="14sp"
+ android:typeface="monospace" />
+ </LinearLayout>
</LinearLayout>
+ </ScrollView>
<LinearLayout
android:id="@+id/button_bar"
@@ -135,7 +163,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true">
+ android:layout_alignParentRight="true" >
<Button
android:id="@+id/cancel_button"
diff --git a/res/layout/otr_fingerprint.xml b/res/layout/otr_fingerprint.xml
deleted file mode 100644
index d8f24151..00000000
--- a/res/layout/otr_fingerprint.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="8dp">
-
- <TextView
- android:id="@+id/otr_no_fingerprint"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="18sp"
- android:text="@string/no_otr_fingerprint"
- android:visibility="visible"/>
-
- <TextView
- android:id="@+id/otr_fingerprint"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="18sp"
- android:typeface="monospace"
- android:visibility="gone"/>
-
-</LinearLayout>
diff --git a/res/menu/manageaccounts_context.xml b/res/menu/manageaccounts_context.xml
index 103f95cc..7a7cc0a2 100644
--- a/res/menu/manageaccounts_context.xml
+++ b/res/menu/manageaccounts_context.xml
@@ -2,39 +2,20 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
- android:id="@+id/mgmt_account_edit"
- android:icon="@drawable/ic_action_edit"
- android:showAsAction="always"
- android:title="@string/mgmt_account_edit"/>
- <item
- android:id="@+id/mgmt_account_delete"
- android:icon="@drawable/ic_action_discard"
- android:showAsAction="always"
- android:title="@string/mgmt_account_delete"/>
- <item
- android:id="@+id/mgmt_account_disable"
- android:showAsAction="never"
- android:title="@string/mgmt_account_disable"/>
- <item
android:id="@+id/mgmt_account_enable"
- android:showAsAction="never"
- android:title="@string/mgmt_account_enable"
- android:visible="false"/>
- <item
- android:id="@+id/mgmt_account_announce_pgp"
- android:showAsAction="never"
- android:title="@string/announce_pgp"/>
+ android:title="@string/mgmt_account_enable"/>
<item
android:id="@+id/mgmt_account_publish_avatar"
- android:showAsAction="never"
android:title="@string/mgmt_account_publish_avatar"/>
<item
- android:id="@+id/mgmt_otr_key"
- android:showAsAction="never"
- android:title="@string/show_otr_key"/>
+ android:id="@+id/mgmt_account_announce_pgp"
+ android:title="@string/mgmt_account_publish_pgp"/>
<item
- android:id="@+id/mgmt_account_info"
+ android:id="@+id/mgmt_account_disable"
android:showAsAction="never"
- android:title="@string/account_info"/>
+ android:title="@string/mgmt_account_disable"/>
+ <item
+ android:id="@+id/mgmt_account_delete"
+ android:title="@string/mgmt_account_delete"/>
</menu> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a4c26eb3..79a8730a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -184,11 +184,11 @@
<string name="encryption_choice_none">Plain text</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
- <string name="mgmt_account_edit">Edit account</string>
- <string name="mgmt_account_delete">Delete</string>
+ <string name="mgmt_account_delete">Delete account</string>
<string name="mgmt_account_disable">Temporarily disable</string>
<string name="mgmt_account_publish_avatar">Publish avatar</string>
- <string name="mgmt_account_enable">Enable</string>
+ <string name="mgmt_account_publish_pgp">Publish OpenPGP public key</string>
+ <string name="mgmt_account_enable">Enable account</string>
<string name="mgmt_account_are_you_sure">Are you sure?</string>
<string name="mgmt_account_delete_confirm_text">If you delete your account your entire conversation history will be lost</string>
<string name="mgmt_account_account_offline">Account is offline</string>