aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/account_row.xml6
-rw-r--r--res/layout/activity_contact_details.xml15
-rw-r--r--res/layout/activity_muc_details.xml10
-rw-r--r--res/layout/activity_new_conversation.xml2
-rw-r--r--res/layout/contact.xml9
-rw-r--r--res/layout/dialog_verify_otr.xml3
-rw-r--r--res/layout/edit_account_dialog.xml14
-rw-r--r--res/layout/fragment_conversation.xml188
-rw-r--r--res/layout/fragment_conversations_overview.xml31
-rw-r--r--res/layout/message_recieved.xml2
-rw-r--r--res/layout/message_sent.xml1
-rw-r--r--res/layout/message_status.xml22
-rw-r--r--res/layout/server_info.xml20
-rw-r--r--res/layout/share_with.xml4
14 files changed, 166 insertions, 161 deletions
diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml
index 402cb965..6cfbe9e3 100644
--- a/res/layout/account_row.xml
+++ b/res/layout/account_row.xml
@@ -19,7 +19,6 @@
android:id="@+id/account_jid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="inputmice@jabber.ccc.de"
android:textSize="20sp"
android:singleLine="true"
android:scrollHorizontally="false"/>
@@ -34,7 +33,7 @@
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Status: "
+ android:text="@string/account_status"
android:textStyle="bold"
android:textSize="16sp" />
@@ -42,8 +41,9 @@
android:id="@+id/account_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:paddingLeft="4dp"
android:textColor="#669900"
- android:text="unknown"
+ android:text="@string/account_status_unknown"
android:textStyle="bold"
android:textSize="16sp"/>
diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml
index cb001b79..5eecfa87 100644
--- a/res/layout/activity_contact_details.xml
+++ b/res/layout/activity_contact_details.xml
@@ -17,7 +17,8 @@
android:text="@string/action_contact_details" />
<RelativeLayout
android:layout_width="wrap_content"
- android:layout_height="88dp"
+ android:layout_height="wrap_content"
+ android:minHeight="88dp"
android:padding="8dp">
<QuickContactBadge
@@ -47,11 +48,19 @@
<TextView
android:id="@+id/details_contactstatus"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:textSize="24sp"
android:textStyle="bold" />
+ <TextView
+ android:id="@+id/details_lastseen"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dp"
+ android:singleLine="true"
+ android:textColor="#5b5b5b"
+ android:textSize="14sp" />
</LinearLayout>
</RelativeLayout>
diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
index 73f21ad0..f866a485 100644
--- a/res/layout/activity_muc_details.xml
+++ b/res/layout/activity_muc_details.xml
@@ -13,7 +13,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
- android:text="Conference" />
+ android:text="@string/muc_details_conference" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
android:layout_toLeftOf="@+id/muc_edit_subject"
android:background="#eee"
android:ems="10"
- android:hint="Conferenece Subject"
+ android:hint="@string/muc_details_conference_subject"
android:inputType="textAutoComplete"
android:paddingBottom="12dp"
android:paddingLeft="8dp"
@@ -62,7 +62,7 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="8dp"
- android:text="Your Nickname" />
+ android:text="@string/muc_details_your_nickname" />
<RelativeLayout
android:layout_width="match_parent"
@@ -78,7 +78,7 @@
android:layout_toLeftOf="@+id/muc_edit_nick"
android:background="#eee"
android:ems="10"
- android:hint="Your nickname"
+ android:hint="@string/muc_details_your_nickname"
android:inputType="textEmailAddress"
android:paddingBottom="12dp"
android:paddingLeft="8dp"
@@ -119,7 +119,7 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="8dp"
- android:text="Other Members" />
+ android:text="@string/muc_details_other_members" />
<LinearLayout
android:id="@+id/muc_members"
diff --git a/res/layout/activity_new_conversation.xml b/res/layout/activity_new_conversation.xml
index a2b00af1..78500ead 100644
--- a/res/layout/activity_new_conversation.xml
+++ b/res/layout/activity_new_conversation.xml
@@ -23,7 +23,7 @@
android:layout_alignParentTop="true"
android:background="#eee"
android:ems="10"
- android:hint="Search or enter Jabber ID"
+ android:hint="@string/search_jabber_id"
android:inputType="textEmailAddress"
android:paddingBottom="12dp"
android:paddingLeft="8dp"
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index fcf8e8b9..7303d2ba 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -35,6 +35,15 @@
android:textColor="#5b5b5b"
android:singleLine="true"
/>
+ <TextView
+ android:id="@+id/key"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="18sp"
+ android:textColor="#5b5b5b"
+ android:typeface="monospace"
+ android:visibility="gone"
+ />
</LinearLayout>
</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml
index 41ce3b07..6dfe149d 100644
--- a/res/layout/dialog_verify_otr.xml
+++ b/res/layout/dialog_verify_otr.xml
@@ -20,7 +20,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
- android:text="julia@jabber.example.com"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
@@ -35,7 +34,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
- android:text="2674D6A0 0B1421B1 BFC42AEC C56F3719 672437D8"
android:textSize="14sp"
android:typeface="monospace"/>
<TextView
@@ -51,7 +49,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
- android:text="2674D6A0 0B1421B1 BFC42AEC C56F3719 672437D8"
android:textSize="14sp"
android:typeface="monospace"/>
</LinearLayout>
diff --git a/res/layout/edit_account_dialog.xml b/res/layout/edit_account_dialog.xml
index 0a86039d..12fbe468 100644
--- a/res/layout/edit_account_dialog.xml
+++ b/res/layout/edit_account_dialog.xml
@@ -9,7 +9,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
- android:text="Jabber ID:" />
+ android:text="@string/account_settings_jabber_id" />
@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textEmailAddress"
- android:hint="username@jabber.example.com">
+ android:hint="@string/account_settings_example_jabber_id">
</EditText>
@@ -30,7 +30,7 @@
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Password:"
+ android:text="@string/account_settings_password"
android:textSize="14sp"/>
<EditText
@@ -39,14 +39,14 @@
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textPassword"
- android:hint="Password"
+ android:hint="@string/password"
android:fontFamily="sans-serif" />
<CheckBox
android:id="@+id/edit_account_register_new"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Register a new account on server"/>
+ android:text="@string/register_account"/>
<TextView
@@ -54,7 +54,7 @@
android:id="@+id/account_confirm_password_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Confirm password:"
+ android:text="@string/account_settings_confirm_password"
android:textSize="14sp"
android:visibility="gone"/>
@@ -64,7 +64,7 @@
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textPassword"
- android:hint="Confirm password"
+ android:hint="@string/confirm_password"
android:visibility="gone"
android:fontFamily="sans-serif" />
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index ca09d770..703a525e 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -3,32 +3,33 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#e5e5e5">
+ android:background="#e5e5e5" >
<RelativeLayout
- android:background="#eee"
android:id="@+id/textsend"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true">
+ android:layout_alignParentLeft="true"
+ android:background="#eee" >
<EditText
android:id="@+id/textinput"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:minHeight="48dp"
android:layout_alignParentLeft="true"
- android:paddingBottom="12dp"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="12dp"
android:layout_toLeftOf="@+id/textSendButton"
android:background="#eee"
android:ems="10"
android:inputType="textShortMessage|textMultiLine|textCapSentences"
- android:minLines="1" >
- <requestFocus />
+ android:minHeight="48dp"
+ android:minLines="1"
+ android:paddingBottom="12dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="12dp" >
+
+ <requestFocus />
</EditText>
<ImageButton
@@ -52,101 +53,98 @@
android:divider="@null"
android:dividerHeight="0dp"
android:listSelector="@android:color/transparent"
- android:transcriptMode="alwaysScroll"
- tools:listitem="@layout/message_sent"
- android:stackFromBottom="true">
-
+ android:stackFromBottom="true"
+ android:transcriptMode="normal"
+ tools:listitem="@layout/message_sent" >
</ListView>
+
<LinearLayout
android:id="@+id/info_box"
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"
- android:orientation="vertical"
- >
-
- <LinearLayout
- android:id="@+id/muc_error"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@drawable/redbackground"
- android:orientation="vertical"
- android:visibility="gone"
- >
+ android:orientation="vertical" >
- <TextView
- android:id="@+id/muc_error_msg"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="#eee"
- android:textStyle="bold"
- android:padding="8dp"
- android:textSize="20sp"/>
- <TextView
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:id="@+id/muc_error"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="Click to edit conference details"
- android:textColor="#eee"
- android:paddingLeft="8dp"
- android:paddingBottom="8dp"
- android:textSize="14sp"/>
-
- </LinearLayout>
-
-
- <LinearLayout
- android:id="@+id/new_fingerprint"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/redbackground"
- android:orientation="vertical"
- android:visibility="gone"
- >
+ android:background="@drawable/redbackground"
+ android:orientation="vertical"
+ android:visibility="gone" >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Unknown OTR Fingerprint"
- android:textColor="#eee"
- android:textStyle="bold"
- android:padding="8dp"
- android:textSize="20sp"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/otr_fingerprint"
- android:textColor="#eee"
- android:paddingLeft="8dp"
- android:paddingBottom="8dp"
- android:textSize="14sp"
- android:typeface="monospace"/>
-
- </LinearLayout>
- <LinearLayout
- android:id="@+id/pgp_keyentry"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/bluebackground"
- android:orientation="vertical"
- android:visibility="gone"
- >
+ <TextView
+ android:id="@+id/muc_error_msg"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:textColor="#eee"
+ android:textSize="20sp"
+ android:textStyle="bold" />
- <TextView
- android:layout_width="wrap_content"
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingBottom="8dp"
+ android:paddingLeft="8dp"
+ android:text="Click to edit conference details"
+ android:textColor="#eee"
+ android:textSize="14sp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/new_fingerprint"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="OpenPGP encrypted messages found"
- android:textColor="#eee"
- android:textStyle="bold"
- android:padding="8dp"
- android:textSize="20sp"/>
- <TextView
- android:layout_width="wrap_content"
+ android:background="@drawable/redbackground"
+ android:orientation="vertical"
+ android:visibility="gone" >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:text="Unknown OTR Fingerprint"
+ android:textColor="#eee"
+ android:textSize="20sp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/otr_fingerprint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingBottom="8dp"
+ android:paddingLeft="8dp"
+ android:textColor="#eee"
+ android:textSize="14sp"
+ android:typeface="monospace" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/pgp_keyentry"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:textColor="#eee"
- android:text="Click here to enter passphrase and decrypt messages"
- android:paddingLeft="8dp"
- android:paddingBottom="8dp"
- android:textSize="14sp"/>
-
- </LinearLayout>
+ android:background="@drawable/bluebackground"
+ android:orientation="vertical"
+ android:visibility="gone" >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:text="OpenPGP encrypted messages found"
+ android:textColor="#eee"
+ android:textSize="20sp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingBottom="8dp"
+ android:paddingLeft="8dp"
+ android:text="Click here to enter passphrase and decrypt messages"
+ android:textColor="#eee"
+ android:textSize="14sp" />
+ </LinearLayout>
</LinearLayout>
+
</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/fragment_conversations_overview.xml b/res/layout/fragment_conversations_overview.xml
deleted file mode 100644
index 5548cce6..00000000
--- a/res/layout/fragment_conversations_overview.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<android.support.v4.widget.SlidingPaneLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:id="@+id/slidingpanelayout">
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="336dp"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:background="#eeeeee"
- >
-
- <ListView
- android:id="@+id/list"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:divider="#b5b5b5"
- android:dividerHeight="1dp"
- android:background="#eeeeee"
- />
-
-</LinearLayout>
-<LinearLayout
- android:id="@+id/selected_conversation"
- android:layout_width="400dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:background="#e5e5e5"
- android:orientation="vertical">
-</LinearLayout>
-</android.support.v4.widget.SlidingPaneLayout> \ No newline at end of file
diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml
index 9f0c41e5..6e4577fb 100644
--- a/res/layout/message_recieved.xml
+++ b/res/layout/message_recieved.xml
@@ -6,7 +6,7 @@
android:padding="8dp" >
<LinearLayout
- android:id="@+id/linearLayout1"
+ android:id="@+id/message_box"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index 990df59b..ebba6ac5 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -6,6 +6,7 @@
android:padding="8dp" >
<LinearLayout
+ android:id="@+id/message_box"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
diff --git a/res/layout/message_status.xml b/res/layout/message_status.xml
new file mode 100644
index 00000000..33487984
--- /dev/null
+++ b/res/layout/message_status.xml
@@ -0,0 +1,22 @@
+<?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="wrap_content"
+ android:orientation="vertical"
+ android:paddingTop="6dp"
+ android:paddingBottom="6dp"
+ android:paddingRight="6dp"
+ android:paddingLeft="8dp">
+
+ <ImageView
+ android:id="@+id/message_photo"
+ android:layout_width="32dp"
+ android:layout_height="32dp"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginRight="-1.5dp"
+ android:padding="0dp"
+ android:scaleType="fitXY"
+ android:src="@drawable/ic_profile"/>
+
+</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/server_info.xml b/res/layout/server_info.xml
index 25e5a471..499a20de 100644
--- a/res/layout/server_info.xml
+++ b/res/layout/server_info.xml
@@ -12,14 +12,14 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingBottom="8dp"
- android:text="Statistics" />
+ 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="Connection age"
+ android:text="@string/server_info_connection_age"
android:textSize="18sp"/>
<TextView
android:id="@+id/connection"
@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/textView1"
- android:text="Session age"
+ android:text="@string/server_info_session_age"
android:textSize="18sp"/>
<TextView
android:id="@+id/session"
@@ -53,7 +53,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/textView2"
- android:text="Packets sent"
+ android:text="@string/server_info_packets_sent"
android:textSize="18sp"/>
<TextView
android:id="@+id/pcks_sent"
@@ -69,7 +69,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/textView3"
- android:text="Packets received"
+ android:text="@string/server_info_packets_received"
android:textSize="18sp"/>
<TextView
android:id="@+id/pcks_received"
@@ -85,7 +85,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/textView4"
- android:text="Connected accounts"
+ android:text="@string/server_info_connected_accounts"
android:textSize="18sp"/>
<TextView
android:id="@+id/number_presences"
@@ -103,14 +103,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
- android:text="Server Features" />
+ 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="Roster Versioning"
+ android:text="@string/server_info_roster_versioning"
android:textSize="18sp"/>
<TextView
android:id="@+id/roster"
@@ -127,7 +127,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/textView5"
- android:text="Carbon Messages"
+ android:text="@string/server_info_carbon_messages"
android:textSize="18sp"/>
<TextView
android:id="@+id/carbon"
@@ -144,7 +144,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/textView6"
- android:text="Stream Managment"
+ android:text="@string/server_info_stream_management"
android:textSize="18sp"/>
<TextView
android:id="@+id/stream"
diff --git a/res/layout/share_with.xml b/res/layout/share_with.xml
index ae73a688..a578b2cb 100644
--- a/res/layout/share_with.xml
+++ b/res/layout/share_with.xml
@@ -12,7 +12,7 @@
android:id="@+id/conversations_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Active Conversations"
+ android:text="@string/share_with_active_conversations"
style="@style/sectionHeader"
android:paddingLeft="8dp"
android:paddingTop="8dp"
@@ -32,7 +32,7 @@
android:id="@+id/contacts_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Contacts"
+ android:text="@string/contacts"
style="@style/sectionHeader"
android:paddingLeft="8dp"
android:paddingTop="8dp"
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-06 03:07:29 +0000