aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-12 17:53:42 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-12 17:53:42 +0200
commit83c3b33f18429dc8788c2b58a31d150bee553d10 (patch)
treef4451e53a65dd25fd434dcb08bdaad53137e987a /res/layout
parentcee898084ee27592d774c8f62f5be7fd1edf821b (diff)
parent73cba91c9b08ff512104897b32837f9824f1cd3e (diff)
Merge branch 'development'0.7.1
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/account_row.xml6
-rw-r--r--res/layout/actionview_search.xml2
-rw-r--r--res/layout/activity_contact_details.xml215
-rw-r--r--res/layout/activity_muc_details.xml7
-rw-r--r--res/layout/activity_publish_profile_picture.xml16
-rw-r--r--res/layout/activity_start_conversation.xml2
-rw-r--r--res/layout/contact.xml4
-rw-r--r--res/layout/contact_key.xml4
-rw-r--r--res/layout/conversation_list_row.xml120
-rw-r--r--res/layout/create_contact_dialog.xml27
-rw-r--r--res/layout/dialog_clear_history.xml13
-rw-r--r--res/layout/dialog_verify_otr.xml37
-rw-r--r--res/layout/fragment_conversation.xml95
-rw-r--r--res/layout/fragment_conversations_overview.xml52
-rw-r--r--res/layout/join_conference_dialog.xml32
-rw-r--r--res/layout/manage_accounts.xml4
-rw-r--r--res/layout/message_null.xml3
-rw-r--r--res/layout/message_status.xml8
-rw-r--r--res/layout/quickedit.xml9
19 files changed, 331 insertions, 325 deletions
diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml
index 230a5a98..2d1190a3 100644
--- a/res/layout/account_row.xml
+++ b/res/layout/account_row.xml
@@ -16,8 +16,8 @@
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_toRightOf="@+id/account_image"
android:layout_centerVertical="true"
+ android:layout_toRightOf="@+id/account_image"
android:orientation="vertical"
android:paddingLeft="8dp" >
@@ -35,9 +35,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_status_unknown"
- android:textSize="?attr/TextSizeBody"
android:textColor="@color/secondarytext"
- android:textStyle="bold"/>
+ android:textSize="?attr/TextSizeBody"
+ android:textStyle="bold" />
</LinearLayout>
</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/actionview_search.xml b/res/layout/actionview_search.xml
index 70300913..64b75f0e 100644
--- a/res/layout/actionview_search.xml
+++ b/res/layout/actionview_search.xml
@@ -14,6 +14,6 @@
android:layout_height="wrap_content"
android:focusable="true"
android:inputType="textEmailAddress|textNoSuggestions"
- android:textColor="@color/ondarktext"/>
+ android:textColor="@color/ondarktext" />
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml
index b3672e59..f4fd9c1e 100644
--- a/res/layout/activity_contact_details.xml
+++ b/res/layout/activity_contact_details.xml
@@ -2,124 +2,127 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/primarybackground">
+ android:background="@color/primarybackground" >
-<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <TextView
- style="@style/sectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:text="@string/action_contact_details"
- android:textColor="@color/primarytext"/>
- <RelativeLayout
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="88dp"
- android:padding="8dp">
+ android:orientation="vertical" >
- <QuickContactBadge
- android:id="@+id/details_contact_badge"
- android:layout_width="72dp"
- android:layout_height="72dp"
- android:layout_centerVertical="true"
- android:scaleType="centerCrop"/>
+ <TextView
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:text="@string/action_contact_details"
+ android:textColor="@color/primarytext" />
- <LinearLayout
- android:id="@+id/details_jidbox"
+ <RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_toRightOf="@+id/details_contact_badge"
- android:orientation="vertical"
- android:paddingLeft="8dp" >
+ android:minHeight="88dp"
+ android:padding="8dp" >
- <TextView
- android:id="@+id/details_contactjid"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:singleLine="true"
- android:textSize="?attr/TextSizeBody"
- android:textColor="@color/primarytext"/>
+ <QuickContactBadge
+ android:id="@+id/details_contact_badge"
+ android:layout_width="72dp"
+ android:layout_height="72dp"
+ android:layout_centerVertical="true"
+ android:scaleType="centerCrop" />
- <TextView
- android:id="@+id/details_contactstatus"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="16dp"
- android:textSize="?attr/TextSizeHeadline"
- android:textColor="@color/primarytext"
- android:textStyle="bold" />
- <TextView
- android:id="@+id/details_lastseen"
+ <LinearLayout
+ android:id="@+id/details_jidbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:singleLine="true"
- android:textSize="?attr/TextSizeBody"
- android:textColor="@color/primarytext"/>
- </LinearLayout>
-
- </RelativeLayout>
+ android:layout_centerVertical="true"
+ android:layout_toRightOf="@+id/details_contact_badge"
+ android:orientation="vertical"
+ android:paddingLeft="8dp" >
-
- <TextView
- style="@style/sectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:text="@string/your_account"
- android:textColor="@color/primarytext"/>
- <TextView
- android:id="@+id/details_account"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:textSize="?attr/TextSizeBody"
- android:textColor="@color/primarytext" />
- <TextView
- style="@style/sectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:text="@string/subscriptions"
- android:textColor="@color/primarytext"/>
+ <TextView
+ android:id="@+id/details_contactjid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dp"
+ android:singleLine="true"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeBody" />
- <CheckBox
- android:id="@+id/details_send_presence"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/send_presence_updates"
- android:textSize="?attr/TextSizeBody"
- android:textColor="@color/primarytext" />
+ <TextView
+ android:id="@+id/details_contactstatus"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="16dp"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeHeadline"
+ 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="@color/primarytext"
+ android:textSize="?attr/TextSizeBody" />
+ </LinearLayout>
+ </RelativeLayout>
+
+ <TextView
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:text="@string/your_account"
+ android:textColor="@color/primarytext" />
+
+ <TextView
+ android:id="@+id/details_account"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dp"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeBody" />
+
+ <TextView
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:text="@string/subscriptions"
+ android:textColor="@color/primarytext" />
<CheckBox
- android:id="@+id/details_receive_presence"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/receive_presence_updates"
- android:textSize="?attr/TextSizeBody"
- android:textColor="@color/primarytext" />
- <TextView
- style="@style/sectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:text="@string/keys" />
-
- <LinearLayout
- android:id="@+id/details_contact_keys"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:divider="?android:dividerHorizontal"
- android:showDividers="middle">
- </LinearLayout>
-
-</LinearLayout>
+ android:id="@+id/details_send_presence"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/send_presence_updates"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeBody" />
+
+ <CheckBox
+ android:id="@+id/details_receive_presence"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/receive_presence_updates"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeBody" />
+
+ <TextView
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:text="@string/keys" />
+
+ <LinearLayout
+ android:id="@+id/details_contact_keys"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:divider="?android:dividerHorizontal"
+ android:orientation="vertical"
+ android:showDividers="middle" >
+ </LinearLayout>
+ </LinearLayout>
+
</ScrollView> \ No newline at end of file
diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
index c3eb263d..1a676548 100644
--- a/res/layout/activity_muc_details.xml
+++ b/res/layout/activity_muc_details.xml
@@ -24,7 +24,7 @@
android:singleLine="true"
android:text="@string/account_settings_example_jabber_id"
android:textColor="@color/primarytext"
- android:textSize="?attr/TextSizeBody"/>
+ android:textSize="?attr/TextSizeBody" />
<TextView
style="@style/sectionHeader"
@@ -82,9 +82,8 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="?android:selectableItemBackground"
- android:src="@drawable/ic_action_edit_dark"
- android:padding="8dp"/>
-
+ android:padding="8dp"
+ android:src="@drawable/ic_action_edit_dark" />
</RelativeLayout>
<LinearLayout
diff --git a/res/layout/activity_publish_profile_picture.xml b/res/layout/activity_publish_profile_picture.xml
index f23ae6c4..fac499bc 100644
--- a/res/layout/activity_publish_profile_picture.xml
+++ b/res/layout/activity_publish_profile_picture.xml
@@ -28,7 +28,7 @@
android:layout_centerHorizontal="true"
android:text="@string/touch_to_choose_picture"
android:textColor="@color/secondarytext" />
-
+
<TextView
android:id="@+id/secondary_hint"
android:layout_width="wrap_content"
@@ -77,30 +77,30 @@
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_above="@+id/button_bar"
- android:layout_below="@+id/secondary_hint"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
+ android:layout_below="@+id/secondary_hint"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp" >
- <TextView
+ <TextView
android:id="@+id/account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/primarytext"
- android:textSize="?attr/TextSizeHeadline"/>
-
+ android:textSize="?attr/TextSizeHeadline" />
+
<TextView
android:id="@+id/hint_or_warning"
- android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:minLines="3"
android:text="@string/publish_avatar_explanation"
android:textColor="@color/primarytext"
- android:textSize="?attr/TextSizeBody"
- android:minLines="3" />
+ android:textSize="?attr/TextSizeBody" />
</LinearLayout>
</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/activity_start_conversation.xml b/res/layout/activity_start_conversation.xml
index 9c757540..f9c98529 100644
--- a/res/layout/activity_start_conversation.xml
+++ b/res/layout/activity_start_conversation.xml
@@ -3,6 +3,6 @@
android:id="@+id/start_conversation_view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/primarybackground">
+ android:background="@color/primarybackground" >
</android.support.v4.view.ViewPager> \ No newline at end of file
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index ff55ccac..12ab3da1 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -27,8 +27,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textSize="?attr/TextSizeHeadline"
- android:textColor="@color/primarytext" />
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeHeadline" />
<TextView
android:id="@+id/contact_jid"
diff --git a/res/layout/contact_key.xml b/res/layout/contact_key.xml
index 904523a1..e10f8420 100644
--- a/res/layout/contact_key.xml
+++ b/res/layout/contact_key.xml
@@ -32,9 +32,9 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
- android:padding="8dp"
android:background="?android:selectableItemBackground"
+ android:padding="8dp"
android:src="@drawable/ic_action_remove"
- android:visibility="invisible"/>
+ android:visibility="invisible" />
</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml
index 8fdd64b7..21147b4a 100644
--- a/res/layout/conversation_list_row.xml
+++ b/res/layout/conversation_list_row.xml
@@ -2,71 +2,67 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:padding="8dp">
-
+ android:padding="8dp" >
- <ImageView
- android:id="@+id/conversation_image"
- android:layout_width="56dp"
- android:layout_height="56dp"
- android:layout_alignParentLeft="true"
- android:scaleType="centerCrop"/>
+ <ImageView
+ android:id="@+id/conversation_image"
+ android:layout_width="56dp"
+ android:layout_height="56dp"
+ android:layout_alignParentLeft="true"
+ android:scaleType="centerCrop" />
- <RelativeLayout
- android:layout_toRightOf="@+id/conversation_image"
- android:layout_centerVertical="true"
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"
- android:paddingLeft="8dp">
+ <RelativeLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toRightOf="@+id/conversation_image"
+ android:paddingLeft="8dp" >
- <TextView
- android:id="@+id/conversation_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignLeft="@+id/conversation_lastwrapper"
- android:layout_toLeftOf="@+id/conversation_lastupdate"
- android:singleLine="true"
- android:textSize="?attr/TextSizeHeadline"
- android:textColor="@color/primarytext"
- android:typeface="sans" />
-
- <LinearLayout
- android:orientation="vertical"
- android:id="@+id/conversation_lastwrapper"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/conversation_name"
- android:paddingTop="3dp"
- >
- <TextView
- android:id="@+id/conversation_lastmsg"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:textSize="?attr/TextSizeBody"
- android:textColor="@color/primarytext"
- android:singleLine="true"
- android:scrollHorizontally="false"
- />
-
- <ImageView
- android:id="@+id/conversation_lastimage"
- android:layout_width="fill_parent"
- android:layout_height="36dp"
- android:background="@color/primarytext"
- android:scaleType="centerCrop" />
+ <TextView
+ android:id="@+id/conversation_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignLeft="@+id/conversation_lastwrapper"
+ android:layout_toLeftOf="@+id/conversation_lastupdate"
+ android:singleLine="true"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeHeadline"
+ android:typeface="sans" />
- </LinearLayout>
- <TextView
- android:id="@+id/conversation_lastupdate"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/conversation_name"
- android:layout_alignParentRight="true"
- android:gravity="right"
- android:textSize="?attr/TextSizeInfo"
- android:textColor="@color/secondarytext"/>
+ <LinearLayout
+ android:id="@+id/conversation_lastwrapper"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/conversation_name"
+ android:orientation="vertical"
+ android:paddingTop="3dp" >
+
+ <TextView
+ android:id="@+id/conversation_lastmsg"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:scrollHorizontally="false"
+ android:singleLine="true"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeBody" />
+
+ <ImageView
+ android:id="@+id/conversation_lastimage"
+ android:layout_width="fill_parent"
+ android:layout_height="36dp"
+ android:background="@color/primarytext"
+ android:scaleType="centerCrop" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/conversation_lastupdate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBaseline="@+id/conversation_name"
+ android:layout_alignParentRight="true"
+ android:gravity="right"
+ android:textColor="@color/secondarytext"
+ android:textSize="?attr/TextSizeInfo" />
+ </RelativeLayout>
- </RelativeLayout>
-
-
</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/create_contact_dialog.xml b/res/layout/create_contact_dialog.xml
index a1e6f6ad..1ab4b686 100644
--- a/res/layout/create_contact_dialog.xml
+++ b/res/layout/create_contact_dialog.xml
@@ -3,36 +3,37 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="8dp">
+ android:padding="8dp" >
- <TextView
+ <TextView
android:id="@+id/your_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="?attr/TextSizeBody"
+ android:text="@string/your_account"
android:textColor="@color/primarytext"
- android:text="@string/your_account" />
+ android:textSize="?attr/TextSizeBody" />
+
<Spinner
android:id="@+id/account"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
- <TextView
+ <TextView
android:id="@+id/jabber_id"
- android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="?attr/TextSizeBody"
+ android:layout_marginTop="8dp"
+ android:text="@string/account_settings_jabber_id"
android:textColor="@color/primarytext"
- android:text="@string/account_settings_jabber_id" />
-
+ android:textSize="?attr/TextSizeBody" />
+
<AutoCompleteTextView
android:id="@+id/jid"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:inputType="textEmailAddress"
android:hint="@string/account_settings_example_jabber_id"
- android:textColorHint="@color/secondarytext"
+ android:inputType="textEmailAddress"
android:textColor="@color/primarytext"
- />
-</LinearLayout>
+ android:textColorHint="@color/secondarytext" />
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/dialog_clear_history.xml b/res/layout/dialog_clear_history.xml
index 7edb4b87..252808c8 100644
--- a/res/layout/dialog_clear_history.xml
+++ b/res/layout/dialog_clear_history.xml
@@ -3,16 +3,19 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="8dp">
+ android:padding="8dp" >
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:paddingBottom="8dp"
android:text="@string/clear_histor_msg"
- android:textSize="?attr/TextSizeBody"
- android:paddingBottom="8dp"/>
+ android:textSize="?attr/TextSizeBody" />
+
<CheckBox
android:id="@+id/end_conversation_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/also_end_conversation"/>
-</LinearLayout>
+ android:text="@string/also_end_conversation" />
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml
index 301f465a..831f06ed 100644
--- a/res/layout/dialog_verify_otr.xml
+++ b/res/layout/dialog_verify_otr.xml
@@ -3,55 +3,58 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:paddingLeft="8dp"
android:paddingBottom="16dp"
- android:paddingRight="8dp">
-
- <TextView
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp" >
+
+ <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="Jabber ID"
android:textColor="@color/primarytext"
- android:textSize="?attr/TextSizeHeadline"/>
+ android:textSize="?attr/TextSizeHeadline" />
<TextView
android:id="@+id/verify_otr_jid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
- android:textSize="?attr/TextSizeBody"
- android:textColor="@color/secondarytext"/>
- <TextView
+ android:textColor="@color/secondarytext"
+ android:textSize="?attr/TextSizeBody" />
+
+ <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="@string/otr_fingerprint"
android:textColor="@color/primarytext"
- android:textSize="?attr/TextSizeHeadline"/>
+ android:textSize="?attr/TextSizeHeadline" />
<TextView
android:id="@+id/verify_otr_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
+ android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeBody"
- android:typeface="monospace"
- android:textColor="@color/secondarytext"/>
- <TextView
+ android:typeface="monospace" />
+
+ <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="@string/your_fingerprint"
- android:textSize="?attr/TextSizeHeadline"
- android:textColor="@color/primarytext"/>
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeHeadline" />
<TextView
android:id="@+id/verify_otr_yourprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
+ android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeBody"
- android:typeface="monospace"
- android:textColor="@color/secondarytext"/>
-</LinearLayout>
+ android:typeface="monospace" />
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index b16e4113..0f5f692e 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -5,8 +5,6 @@
android:layout_height="match_parent"
android:background="@color/secondarybackground" >
-
-
<ListView
android:id="@+id/messages_view"
android:layout_width="fill_parent"
@@ -23,13 +21,13 @@
tools:listitem="@layout/message_sent" >
</ListView>
- <RelativeLayout
- android:id="@+id/textsend"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:background="@color/primarybackground" >
+ <RelativeLayout
+ android:id="@+id/textsend"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:background="@color/primarybackground" >
<eu.siacs.conversations.ui.EditMessage
android:id="@+id/textinput"
@@ -39,6 +37,7 @@
android:layout_toLeftOf="@+id/textSendButton"
android:background="@color/primarybackground"
android:ems="10"
+ android:imeOptions="flagNoExtractUi"
android:inputType="textShortMessage|textMultiLine|textCapSentences"
android:minHeight="48dp"
android:minLines="1"
@@ -46,8 +45,8 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="12dp"
- android:textColor="@color/primarytext"
- android:imeOptions="flagNoExtractUi">
+ android:textColor="@color/primarytext" >
+
<requestFocus />
</eu.siacs.conversations.ui.EditMessage>
@@ -58,46 +57,46 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="?android:selectableItemBackground"
- android:src="@drawable/ic_action_send_now" />
+ android:src="@drawable/ic_action_send_now_offline" />
</RelativeLayout>
- <RelativeLayout
- android:id="@+id/snackbar"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_above="@+id/textsend"
- android:background="@drawable/snackbar"
- android:minHeight="48dp"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
- android:layout_marginBottom="4dp"
- android:visibility="gone" >
+ <RelativeLayout
+ android:id="@+id/snackbar"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/textsend"
+ android:layout_marginBottom="4dp"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:background="@drawable/snackbar"
+ android:minHeight="48dp"
+ android:visibility="gone" >
- <TextView
- android:id="@+id/snackbar_message"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:paddingLeft="24dp"
- android:textColor="@color/ondarktext"
- android:textSize="?attr/TextSizeBody"
- android:layout_toLeftOf="@+id/snackbar_action"/>
+ <TextView
+ android:id="@+id/snackbar_message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:layout_toLeftOf="@+id/snackbar_action"
+ android:paddingLeft="24dp"
+ android:textColor="@color/ondarktext"
+ android:textSize="?attr/TextSizeBody" />
- <TextView
- android:id="@+id/snackbar_action"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:paddingBottom="16dp"
- android:paddingLeft="24dp"
- android:paddingRight="24dp"
- android:paddingTop="16dp"
- android:textAllCaps="true"
- android:textColor="@color/ondarktext"
- android:textSize="?attr/TextSizeBody"
- android:textStyle="bold" />
- </RelativeLayout>
+ <TextView
+ android:id="@+id/snackbar_action"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:paddingBottom="16dp"
+ android:paddingLeft="24dp"
+ android:paddingRight="24dp"
+ android:paddingTop="16dp"
+ android:textAllCaps="true"
+ android:textColor="@color/ondarktext"
+ android:textSize="?attr/TextSizeBody"
+ android:textStyle="bold" />
+ </RelativeLayout>
</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/fragment_conversations_overview.xml b/res/layout/fragment_conversations_overview.xml
index b85f1116..bc52ec46 100644
--- a/res/layout/fragment_conversations_overview.xml
+++ b/res/layout/fragment_conversations_overview.xml
@@ -1,30 +1,30 @@
-<android.support.v4.widget.SlidingPaneLayout
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/slidingpanelayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+ android:layout_width="288dp"
android:layout_height="match_parent"
- android:id="@+id/slidingpanelayout">
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="288dp"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:background="@color/primarybackground"
- >
-
- <ListView
- android:id="@+id/list"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:divider="@color/divider"
- android:dividerHeight="1dp"
android:background="@color/primarybackground"
- />
-
-</LinearLayout>
-<LinearLayout
- android:id="@+id/selected_conversation"
- android:layout_width="fill_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:orientation="vertical">
-</LinearLayout>
+ android:orientation="vertical" >
+
+ <ListView
+ android:id="@+id/list"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/primarybackground"
+ android:divider="@color/divider"
+ android:dividerHeight="1dp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/selected_conversation"
+ android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+ </LinearLayout>
+
</android.support.v4.widget.SlidingPaneLayout> \ No newline at end of file
diff --git a/res/layout/join_conference_dialog.xml b/res/layout/join_conference_dialog.xml
index a36a5ef7..95c9d24c 100644
--- a/res/layout/join_conference_dialog.xml
+++ b/res/layout/join_conference_dialog.xml
@@ -3,45 +3,45 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="8dp">
+ android:padding="8dp" >
- <TextView
+ <TextView
android:id="@+id/your_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="?attr/TextSizeBody"
+ android:text="@string/your_account"
android:textColor="@color/primarytext"
- android:text="@string/your_account" />
+ android:textSize="?attr/TextSizeBody" />
+
<Spinner
android:id="@+id/account"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
- <TextView
+ <TextView
android:id="@+id/jabber_id"
- android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="?attr/TextSizeBody"
+ android:layout_marginTop="8dp"
+ android:text="@string/conference_address"
android:textColor="@color/primarytext"
- android:text="@string/conference_address" />
-
+ android:textSize="?attr/TextSizeBody" />
+
<AutoCompleteTextView
android:id="@+id/jid"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:inputType="textEmailAddress"
android:hint="@string/conference_address_example"
- android:textColorHint="@color/secondarytext"
+ android:inputType="textEmailAddress"
android:textColor="@color/primarytext"
- />
+ android:textColorHint="@color/secondarytext" />
<CheckBox
android:id="@+id/bookmark"
- android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/save_as_bookmark"
- android:checked="true" />
+ android:layout_marginTop="8dp"
+ android:checked="true"
+ android:text="@string/save_as_bookmark" />
-</LinearLayout>
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/manage_accounts.xml b/res/layout/manage_accounts.xml
index 71eb7572..11ce35b2 100644
--- a/res/layout/manage_accounts.xml
+++ b/res/layout/manage_accounts.xml
@@ -3,14 +3,14 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="@color/primarybackground">
+ android:background="@color/primarybackground" >
<ListView
android:id="@+id/account_list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:divider="@color/divider"
- android:dividerHeight="1dp">
+ android:dividerHeight="1dp" >
</ListView>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/message_null.xml b/res/layout/message_null.xml
index 4c7dd938..1e148585 100644
--- a/res/layout/message_null.xml
+++ b/res/layout/message_null.xml
@@ -1,5 +1,6 @@
<?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:layout_height="wrap_content" >
+
</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/message_status.xml b/res/layout/message_status.xml
index 33487984..d5f8bb33 100644
--- a/res/layout/message_status.xml
+++ b/res/layout/message_status.xml
@@ -3,11 +3,11 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingTop="6dp"
android:paddingBottom="6dp"
+ android:paddingLeft="8dp"
android:paddingRight="6dp"
- android:paddingLeft="8dp">
-
+ android:paddingTop="6dp" >
+
<ImageView
android:id="@+id/message_photo"
android:layout_width="32dp"
@@ -17,6 +17,6 @@
android:layout_marginRight="-1.5dp"
android:padding="0dp"
android:scaleType="fitXY"
- android:src="@drawable/ic_profile"/>
+ android:src="@drawable/ic_profile" />
</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/quickedit.xml b/res/layout/quickedit.xml
index 07a7ac3b..20a2868a 100644
--- a/res/layout/quickedit.xml
+++ b/res/layout/quickedit.xml
@@ -3,16 +3,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="16dp">
+ android:padding="16dp" >
+
<EditText
android:id="@+id/editor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textPersonName"
- android:textColor="@color/primarytext">
+ android:textColor="@color/primarytext" >
<requestFocus />
</EditText>
-
-</LinearLayout>
+
+</LinearLayout> \ No newline at end of file