aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--res/layout/activity_edit_account.xml80
-rw-r--r--res/layout/server_info.xml157
2 files changed, 71 insertions, 166 deletions
diff --git a/res/layout/activity_edit_account.xml b/res/layout/activity_edit_account.xml
index 620a1f70..e4d9665a 100644
--- a/res/layout/activity_edit_account.xml
+++ b/res/layout/activity_edit_account.xml
@@ -5,6 +5,7 @@
android:background="@color/primarybackground" >
<LinearLayout
+ android:id="@+id/editor"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -14,23 +15,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_settings_jabber_id"
- android:textSize="14sp"
- android:textColor="@color/primarytext"/>
+ android:textColor="@color/primarytext"
+ android:textSize="14sp" />
<AutoCompleteTextView
android:id="@+id/account_jid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/account_settings_example_jabber_id"
- android:inputType="textEmailAddress"/>
+ android:inputType="textEmailAddress" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/account_settings_password"
- android:textSize="14sp"
- android:textColor="@color/primarytext"/>
+ android:textColor="@color/primarytext"
+ android:textSize="14sp" />
<EditText
android:id="@+id/account_password"
@@ -45,16 +46,16 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/register_account"
- android:textSize="14sp"
- android:textColor="@color/primarytext"/>
+ android:textColor="@color/primarytext"
+ android:textSize="14sp" />
<TextView
android:id="@+id/account_confirm_password_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_settings_confirm_password"
- android:textSize="14sp"
android:textColor="@color/primarytext"
+ android:textSize="14sp"
android:visibility="gone" />
<EditText
@@ -68,12 +69,73 @@
</LinearLayout>
<LinearLayout
+ 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">
+
+ <TextView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:textSize="18sp"
+ android:textStyle="bold"
+ android:textColor="@color/secondarytext"
+ android:text="@string/additional_information"
+ android:gravity="center_horizontal"/>
+
+ <TableLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:stretchColumns="1"
+ android:layout_marginTop="8dp">
+
+ <TableRow
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/server_info_session_established" />
+
+ <TextView
+ android:id="@+id/session_est"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right" />
+ </TableRow>
+
+ <TableRow
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/server_info_compatibilty" />
+
+ <TextView
+ android:id="@+id/server_compat"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right" />
+ </TableRow>
+ </TableLayout>
+ </LinearLayout>
+
+ <LinearLayout
android:id="@+id/button_bar"
android:layout_width="wrap_content"
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/server_info.xml b/res/layout/server_info.xml
deleted file mode 100644
index 499a20de..00000000
--- a/res/layout/server_info.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="match_parent"
- android:padding="8dp" >
-
- <TextView
- android:id="@+id/stats_header"
- style="@style/sectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingBottom="8dp"
- android:text="@string/server_info_statistics" />
-
- <TextView
- android:layout_below="@+id/stats_header"
- android:id="@+id/textView1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/server_info_connection_age"
- android:textSize="18sp"/>
- <TextView
- android:id="@+id/connection"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/textView1"
- android:layout_alignBottom="@+id/textView1"
- android:layout_alignParentRight="true"
- android:textSize="18sp"/>
-
- <TextView
- android:id="@+id/textView2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/textView1"
- android:text="@string/server_info_session_age"
- android:textSize="18sp"/>
- <TextView
- android:id="@+id/session"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/textView2"
- android:layout_alignBottom="@+id/textView2"
- android:layout_alignParentRight="true"
- android:textSize="18sp"/>
-
- <TextView
- android:id="@+id/textView3"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/textView2"
- android:text="@string/server_info_packets_sent"
- android:textSize="18sp"/>
- <TextView
- android:id="@+id/pcks_sent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/textView3"
- android:layout_alignBottom="@+id/textView3"
- android:layout_alignParentRight="true"
- android:textSize="18sp"/>
-
- <TextView
- android:id="@+id/textView4"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/textView3"
- android:text="@string/server_info_packets_received"
- android:textSize="18sp"/>
- <TextView
- android:id="@+id/pcks_received"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/textView4"
- android:layout_alignBottom="@+id/textView4"
- android:layout_alignParentRight="true"
- android:textSize="18sp"/>
-
- <TextView
- android:id="@+id/textView10"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/textView4"
- android:text="@string/server_info_connected_accounts"
- android:textSize="18sp"/>
- <TextView
- android:id="@+id/number_presences"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/textView10"
- android:layout_alignBottom="@+id/textView10"
- android:layout_alignParentRight="true"
- android:textSize="18sp"/>
-
- <TextView
- android:id="@+id/features_header"
- android:layout_below="@+id/textView10"
- style="@style/sectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:text="@string/server_info_server_features" />
-
- <TextView
- android:layout_below="@+id/features_header"
- android:id="@+id/textView5"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/server_info_roster_versioning"
- android:textSize="18sp"/>
- <TextView
- android:id="@+id/roster"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/textView5"
- android:layout_alignBottom="@+id/textView5"
- android:layout_alignParentRight="true"
- android:textSize="18sp"/>
-
- <TextView
- android:id="@+id/textView6"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/textView5"
- android:text="@string/server_info_carbon_messages"
- android:textSize="18sp"/>
- <TextView
- android:id="@+id/carbon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/textView6"
- android:layout_alignBottom="@+id/textView6"
- android:layout_alignParentRight="true"
- android:textSize="18sp"/>
-
- <TextView
- android:id="@+id/textView7"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/textView6"
- android:text="@string/server_info_stream_management"
- android:textSize="18sp"/>
- <TextView
- android:id="@+id/stream"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/textView7"
- android:layout_alignBottom="@+id/textView7"
- android:layout_alignParentRight="true"
- android:textSize="18sp"/>
-</RelativeLayout> \ No newline at end of file