aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/account_row.xml9
-rw-r--r--res/layout/actionview_search.xml19
-rw-r--r--res/layout/activity_choose_contact.xml13
-rw-r--r--res/layout/activity_contact_details.xml46
-rw-r--r--res/layout/activity_muc_details.xml234
-rw-r--r--res/layout/activity_new_conversation.xml56
-rw-r--r--res/layout/activity_start_conversation.xml8
-rw-r--r--res/layout/cert_warning.xml8
-rw-r--r--res/layout/contact.xml7
-rw-r--r--res/layout/contact_key.xml4
-rw-r--r--res/layout/conversation_list_row.xml13
-rw-r--r--res/layout/create_contact_dialog.xml38
-rw-r--r--res/layout/dialog_clear_history.xml2
-rw-r--r--res/layout/dialog_verify_otr.xml25
-rw-r--r--res/layout/edit_account_dialog.xml6
-rw-r--r--res/layout/edit_contact_name.xml28
-rw-r--r--res/layout/fragment_conversation.xml175
-rw-r--r--res/layout/fragment_conversations_overview.xml30
-rw-r--r--res/layout/join_conference_dialog.xml47
-rw-r--r--res/layout/manage_accounts.xml3
-rw-r--r--res/layout/message_recieved.xml25
-rw-r--r--res/layout/message_sent.xml25
-rw-r--r--res/layout/otr_fingerprint.xml4
-rw-r--r--res/layout/quickedit.xml18
24 files changed, 437 insertions, 406 deletions
diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml
index 6cfbe9e3..0c18d9b2 100644
--- a/res/layout/account_row.xml
+++ b/res/layout/account_row.xml
@@ -19,7 +19,8 @@
android:id="@+id/account_jid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="20sp"
+ android:textSize="18sp"
+ android:textColor="@color/primarytext"
android:singleLine="true"
android:scrollHorizontally="false"/>
@@ -35,17 +36,17 @@
android:layout_height="wrap_content"
android:text="@string/account_status"
android:textStyle="bold"
- android:textSize="16sp" />
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"/>
<TextView
android:id="@+id/account_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="4dp"
- android:textColor="#669900"
android:text="@string/account_status_unknown"
android:textStyle="bold"
- android:textSize="16sp"/>
+ android:textSize="14sp"/>
</LinearLayout>
diff --git a/res/layout/actionview_search.xml b/res/layout/actionview_search.xml
new file mode 100644
index 00000000..70300913
--- /dev/null
+++ b/res/layout/actionview_search.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:addStatesFromChildren="true"
+ android:focusable="true"
+ android:gravity="center"
+ android:paddingLeft="5dp"
+ android:paddingRight="5dp" >
+
+ <EditText
+ android:id="@+id/search_field"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:focusable="true"
+ android:inputType="textEmailAddress|textNoSuggestions"
+ android:textColor="@color/ondarktext"/>
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/activity_choose_contact.xml b/res/layout/activity_choose_contact.xml
new file mode 100644
index 00000000..248a7822
--- /dev/null
+++ b/res/layout/activity_choose_contact.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <ListView
+ android:id="@+id/choose_contact_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:listitem="@layout/contact" />
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml
index 5eecfa87..8f0b42c1 100644
--- a/res/layout/activity_contact_details.xml
+++ b/res/layout/activity_contact_details.xml
@@ -2,7 +2,7 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#e5e5e5">
+ android:background="@color/primarybackground">
<LinearLayout
android:layout_width="match_parent"
@@ -14,7 +14,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
- android:text="@string/action_contact_details" />
+ android:text="@string/action_contact_details"
+ android:textColor="@color/primarytext"/>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -43,15 +44,16 @@
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:singleLine="true"
- android:textColor="#5b5b5b"
- android:textSize="18sp" />
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"/>
<TextView
android:id="@+id/details_contactstatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
- android:textSize="24sp"
+ android:textSize="18sp"
+ android:textColor="@color/primarytext"
android:textStyle="bold" />
<TextView
android:id="@+id/details_lastseen"
@@ -59,8 +61,8 @@
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:singleLine="true"
- android:textColor="#5b5b5b"
- android:textSize="14sp" />
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"/>
</LinearLayout>
</RelativeLayout>
@@ -71,48 +73,38 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
- android:text="@string/your_account" />
+ 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="18sp"
- android:textColor="#5b5b5b" />
+ android:textSize="14sp"
+ 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:text="@string/subscriptions"
+ android:textColor="@color/primarytext"/>
<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="18sp"
- android:textColor="#5b5b5b" />
+ android:textSize="14sp"
+ 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="18sp"
- android:textColor="#5b5b5b" />
-
- <TextView
- android:id="@+id/ask_again"
- android:paddingTop="8dp"
- android:paddingLeft="32dp"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/ask_again"
- android:textColor="#33B5E5"
- android:textSize="18sp"
- android:visibility="gone"
- />
+ android:textSize="14sp"
+ android:textColor="@color/primarytext" />
<TextView
style="@style/sectionHeader"
android:layout_width="wrap_content"
diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
index f866a485..49b4cef3 100644
--- a/res/layout/activity_muc_details.xml
+++ b/res/layout/activity_muc_details.xml
@@ -2,144 +2,126 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#e5e5e5">
-
-<LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
- <TextView
- style="@style/sectionHeader"
+ android:background="@color/primarybackground" >
+
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="8dp"
- android:text="@string/muc_details_conference" />
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="#eee" >
-
+ android:orientation="vertical" >
- <EditText
- android:id="@+id/muc_subject"
+ <TextView
+ style="@style/sectionHeader"
android:layout_width="wrap_content"
- android:layout_height="48dp"
- android:layout_alignParentLeft="true"
- android:layout_toLeftOf="@+id/muc_edit_subject"
- android:background="#eee"
- android:ems="10"
- android:hint="@string/muc_details_conference_subject"
- android:inputType="textAutoComplete"
- android:paddingBottom="12dp"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="12dp" />
-
- <ImageButton
- android:id="@+id/muc_edit_subject"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_centerVertical="true"
- android:background="?android:selectableItemBackground"
+ android:layout_height="wrap_content"
android:padding="8dp"
- android:src="@drawable/ic_action_edit" />
- </RelativeLayout>
- <TextView
- android:id="@+id/muc_jabberid"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:singleLine="true"
- android:textColor="#5b5b5b"
- android:textSize="18sp"/>
+ android:text="@string/muc_details_conference" />
- <TextView
- style="@style/sectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="8dp"
- android:text="@string/muc_details_your_nickname" />
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="#eee" >
-
+ <TextView
+ android:id="@+id/muc_jabberid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:singleLine="true"
+ android:text="@string/account_settings_example_jabber_id"
+ android:textColor="@color/primarytext"
+ android:textSize="14sp"/>
- <EditText
- android:id="@+id/muc_your_nick"
+ <TextView
+ style="@style/sectionHeader"
android:layout_width="wrap_content"
- android:layout_height="48dp"
- android:layout_alignParentLeft="true"
- android:layout_toLeftOf="@+id/muc_edit_nick"
- android:background="#eee"
- android:ems="10"
- android:hint="@string/muc_details_your_nickname"
- android:inputType="textEmailAddress"
- android:paddingBottom="12dp"
+ android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:paddingTop="12dp" />
-
- <ImageButton
- android:id="@+id/muc_edit_nick"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_centerVertical="true"
- android:background="?android:selectableItemBackground"
+ android:paddingTop="8dp"
+ android:text="@string/you" />
+
+ <RelativeLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="?android:attr/activatedBackgroundIndicator"
android:padding="8dp"
- android:src="@drawable/ic_action_edit" />
- </RelativeLayout>
- <TextView
- android:id="@+id/muc_role"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:singleLine="true"
- android:textSize="18sp"
- android:textColor="#5b5b5b"/>
-
- <LinearLayout
- android:id="@+id/muc_more_details"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/muc_participants_header"
- style="@style/sectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="8dp"
- android:text="@string/muc_details_other_members" />
+ android:paddingBottom="8dp" >
- <LinearLayout
- android:id="@+id/muc_members"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_weight="1"
- android:orientation="vertical"
- android:divider="?android:dividerHorizontal"
- android:showDividers="middle"
- >
- </LinearLayout>
+ <ImageView
+ android:id="@+id/your_photo"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:layout_alignParentLeft="true"
+ android:src="@drawable/ic_profile" >
+ </ImageView>
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toRightOf="@+id/your_photo"
+ android:orientation="vertical"
+ android:paddingLeft="8dp" >
+
+ <TextView
+ android:id="@+id/muc_your_nick"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textColor="@color/primarytext"
+ android:textSize="18sp" />
+
+ <TextView
+ android:id="@+id/muc_role"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textColor="@color/primarytext"
+ android:textSize="14sp" />
+ </LinearLayout>
+
+ <ImageButton
+ android:id="@+id/edit_nick_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:background="?android:selectableItemBackground"
+ android:src="@drawable/ic_action_edit_dark"
+ android:padding="8dp"/>
+
+ </RelativeLayout>
+
+ <LinearLayout
+ android:id="@+id/muc_more_details"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/muc_participants_header"
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="8dp"
+ android:text="@string/muc_details_other_members" />
+
+ <LinearLayout
+ android:id="@+id/muc_members"
+ android:layout_width="fill_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:divider="?android:dividerHorizontal"
+ android:orientation="vertical"
+ android:showDividers="middle" >
+ </LinearLayout>
+ </LinearLayout>
+
+ <Button
+ android:id="@+id/invite"
+ style="?android:attr/buttonStyleSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginTop="24dp"
+ android:text="@string/invite_contact" />
</LinearLayout>
- <Button
- android:layout_marginTop="24dp"
- android:id="@+id/invite"
- style="?android:attr/buttonStyleSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/invite_contacts"
- android:layout_gravity="center_horizontal"/>
-</LinearLayout>
</ScrollView> \ No newline at end of file
diff --git a/res/layout/activity_new_conversation.xml b/res/layout/activity_new_conversation.xml
deleted file mode 100644
index 78500ead..00000000
--- a/res/layout/activity_new_conversation.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="#e5e5e5" >
-
-
- <ProgressBar
- android:id="@+id/progressBar1"
- style="?android:attr/progressBarStyleLarge"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- android:visibility="gone"
- />
-
- <EditText
- android:id="@+id/new_conversation_search"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:background="#eee"
- android:ems="10"
- android:hint="@string/search_jabber_id"
- android:inputType="textEmailAddress"
- android:paddingBottom="12dp"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="12dp" />
-
- <TextView
- android:id="@+id/contacts_header"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Contacts"
- style="@style/sectionHeader"
- android:layout_below="@+id/new_conversation_search"
- android:paddingLeft="8dp"
- android:paddingTop="8dp"
- android:paddingRight="8dp"/>
-
- <ListView
- android:id="@+id/contactList"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/contacts_header"
- tools:listitem="@layout/contact"
- android:choiceMode="multipleChoice">
-
- </ListView>
-</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/activity_start_conversation.xml b/res/layout/activity_start_conversation.xml
new file mode 100644
index 00000000..9c757540
--- /dev/null
+++ b/res/layout/activity_start_conversation.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/start_conversation_view_pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/primarybackground">
+
+</android.support.v4.view.ViewPager> \ No newline at end of file
diff --git a/res/layout/cert_warning.xml b/res/layout/cert_warning.xml
index 59d71803..fffe3266 100644
--- a/res/layout/cert_warning.xml
+++ b/res/layout/cert_warning.xml
@@ -9,14 +9,14 @@
android:id="@+id/hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="18sp"/>
+ android:textSize="14sp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFe92727"
android:textStyle="bold"
- android:textSize="18sp"
+ android:textSize="14sp"
android:text="Do not connect unless you know exactly what you are doing"
android:paddingTop="8dp"
android:paddingBottom="8dp"/>
@@ -24,7 +24,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="18sp"
+ android:textSize="14sp"
android:text="The SHA1 fingerprint is:" />
<TextView
@@ -36,6 +36,6 @@
android:layout_height="wrap_content"
android:typeface="monospace"
android:textStyle="bold"
- android:textSize="20sp"/>
+ android:textSize="18sp"/>
</LinearLayout>
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index 7303d2ba..8432c7a3 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -25,22 +25,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
- android:textColor="#5b5b5b"
+ android:textColor="@color/primarytext"
android:singleLine="true"
/>
<TextView
android:id="@+id/contact_jid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="#5b5b5b"
android:singleLine="true"
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"
/>
<TextView
android:id="@+id/key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
- android:textColor="#5b5b5b"
+ android:textColor="@color/primarytext"
android:typeface="monospace"
android:visibility="gone"
/>
diff --git a/res/layout/contact_key.xml b/res/layout/contact_key.xml
index dcac42e9..0c457c25 100644
--- a/res/layout/contact_key.xml
+++ b/res/layout/contact_key.xml
@@ -10,13 +10,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
- android:textColor="#5b5b5b"
+ android:textColor="@color/primarytext"
android:typeface="monospace"
/>
<TextView
android:id="@+id/key_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="#5b5b5b"
+ android:textColor="@color/secondarytext"
/>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml
index dda09178..97985737 100644
--- a/res/layout/conversation_list_row.xml
+++ b/res/layout/conversation_list_row.xml
@@ -25,8 +25,8 @@
android:layout_alignLeft="@+id/conversation_lastwrapper"
android:layout_toLeftOf="@+id/conversation_lastupdate"
android:singleLine="true"
- android:textColor="#636363"
- android:textSize="20sp"
+ android:textSize="18sp"
+ android:textColor="@color/primarytext"
android:typeface="sans" />
<LinearLayout
@@ -41,9 +41,8 @@
android:id="@+id/conversation_lastmsg"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
-
- android:textColor="#636363"
android:textSize="14sp"
+ android:textColor="@color/primarytext"
android:singleLine="true"
android:scrollHorizontally="false"
/>
@@ -52,7 +51,7 @@
android:id="@+id/conversation_lastimage"
android:layout_width="fill_parent"
android:layout_height="36dp"
- android:background="#333333"
+ android:background="@color/primarytext"
android:scaleType="centerCrop" />
</LinearLayout>
@@ -63,8 +62,8 @@
android:layout_alignBaseline="@+id/conversation_name"
android:layout_alignParentRight="true"
android:gravity="right"
- android:textColor="#636363"
- android:textSize="12sp" />
+ android:textSize="12sp"
+ android:textColor="@color/secondarytext"/>
</RelativeLayout>
diff --git a/res/layout/create_contact_dialog.xml b/res/layout/create_contact_dialog.xml
new file mode 100644
index 00000000..4b5b9a04
--- /dev/null
+++ b/res/layout/create_contact_dialog.xml
@@ -0,0 +1,38 @@
+<?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/your_account"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"
+ android:text="@string/your_account" />
+ <Spinner
+ android:id="@+id/account"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" />
+
+ <TextView
+ android:id="@+id/jabber_id"
+ android:layout_marginTop="8dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"
+ android:text="@string/account_settings_jabber_id" />
+
+ <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:textColor="@color/primarytext"
+ />
+</LinearLayout>
diff --git a/res/layout/dialog_clear_history.xml b/res/layout/dialog_clear_history.xml
index 789bbae9..10ceaae5 100644
--- a/res/layout/dialog_clear_history.xml
+++ b/res/layout/dialog_clear_history.xml
@@ -8,7 +8,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/clear_histor_msg"
- android:textSize="18sp"
+ android:textSize="14sp"
android:paddingBottom="8dp"/>
<CheckBox
android:id="@+id/end_conversation_checkbox"
diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml
index 6dfe149d..c518c647 100644
--- a/res/layout/dialog_verify_otr.xml
+++ b/res/layout/dialog_verify_otr.xml
@@ -12,22 +12,23 @@
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="Jabber ID"
- android:textColor="#33B5E5"
- android:textSize="20sp"/>
+ android:textColor="@color/primarytext"
+ android:textSize="18sp"/>
<TextView
android:id="@+id/verify_otr_jid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
- android:textSize="14sp" />
+ android:textSize="14sp"
+ android:textColor="@color/secondarytext"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
- android:text="OTR fingerprint"
- android:textColor="#33B5E5"
- android:textSize="20sp"/>
+ android:text="@string/otr_fingerprint"
+ android:textColor="@color/primarytext"
+ android:textSize="18sp"/>
<TextView
android:id="@+id/verify_otr_fingerprint"
@@ -35,14 +36,15 @@
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:textSize="14sp"
- android:typeface="monospace"/>
+ android:typeface="monospace"
+ android:textColor="@color/secondarytext"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
- android:text="Your fingerprint"
- android:textColor="#33B5E5"
- android:textSize="20sp"/>
+ android:text="@string/your_fingerprint"
+ android:textSize="18sp"
+ android:textColor="@color/primarytext"/>
<TextView
android:id="@+id/verify_otr_yourprint"
@@ -50,5 +52,6 @@
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:textSize="14sp"
- android:typeface="monospace"/>
+ android:typeface="monospace"
+ android:textColor="@color/secondarytext"/>
</LinearLayout>
diff --git a/res/layout/edit_account_dialog.xml b/res/layout/edit_account_dialog.xml
index 12fbe468..3b2ee981 100644
--- a/res/layout/edit_account_dialog.xml
+++ b/res/layout/edit_account_dialog.xml
@@ -13,16 +13,14 @@
- <EditText
+ <AutoCompleteTextView
android:id="@+id/account_jid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textEmailAddress"
- android:hint="@string/account_settings_example_jabber_id">
+ android:hint="@string/account_settings_example_jabber_id" />
-
- </EditText>
<TextView
diff --git a/res/layout/edit_contact_name.xml b/res/layout/edit_contact_name.xml
deleted file mode 100644
index 206c7432..00000000
--- a/res/layout/edit_contact_name.xml
+++ /dev/null
@@ -1,28 +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/textView1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/enter_new_name"
- android:textColor="#5b5b5b"
- android:textSize="18sp" />
-
- <EditText
- android:paddingTop="16dp"
- android:paddingBottom="8dp"
- android:id="@+id/editText1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:inputType="textPersonName" >
-
- <requestFocus />
- </EditText>
-
-</LinearLayout>
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index c09a7d5f..b712c304 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -3,15 +3,33 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#e5e5e5" >
+ android:background="@color/secondarybackground" >
- <RelativeLayout
- android:id="@+id/textsend"
+
+
+ <ListView
+ android:id="@+id/messages_view"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
+ android:layout_above="@+id/snackbar"
android:layout_alignParentLeft="true"
- android:background="#eee" >
+ android:layout_alignParentTop="true"
+ android:background="@color/secondarybackground"
+ android:divider="@null"
+ android:dividerHeight="0dp"
+ android:listSelector="@android:color/transparent"
+ android:stackFromBottom="true"
+ android:transcriptMode="normal"
+ 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" >
<EditText
android:id="@+id/textinput"
@@ -19,7 +37,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/textSendButton"
- android:background="#eee"
+ android:background="@color/primarybackground"
android:ems="10"
android:inputType="textShortMessage|textMultiLine|textCapSentences"
android:minHeight="48dp"
@@ -27,7 +45,8 @@
android:paddingBottom="12dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:paddingTop="12dp" >
+ android:paddingTop="12dp"
+ android:textColor="@color/primarytext">
<requestFocus />
</EditText>
@@ -42,110 +61,42 @@
android:src="@drawable/ic_action_send_now" />
</RelativeLayout>
- <ListView
- android:id="@+id/messages_view"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_above="@+id/textsend"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/info_box"
- android:background="#e5e5e5"
- android:divider="@null"
- android:dividerHeight="0dp"
- android:listSelector="@android:color/transparent"
- android:stackFromBottom="true"
- android:transcriptMode="normal"
- tools:listitem="@layout/message_sent" >
- </ListView>
-
- <LinearLayout
- android:id="@+id/info_box"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- 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" >
-
- <TextView
- android:id="@+id/muc_error_msg"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="6dp"
- android:textColor="#eee"
- android:textSize="20sp"
- android:textStyle="bold" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingBottom="6dp"
- android:paddingLeft="6dp"
- android:text="@string/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:background="@drawable/redbackground"
- android:orientation="vertical"
- android:visibility="gone" >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="6dp"
- android:text="@string/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="6dp"
- android:paddingLeft="6dp"
- android:textColor="#eee"
- android:textSize="14sp"
- android:singleLine="true"
- 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:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="6dp"
- android:text="@string/openpgp_messages_found"
- android:textColor="#eee"
- android:textSize="20sp"
- android:textStyle="bold" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingBottom="6dp"
- android:paddingLeft="6dp"
- android:text="@string/openpgp_click_to_decrypt"
- android:textColor="#eee"
- android:textSize="14sp" />
- </LinearLayout>
- </LinearLayout>
+ <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" >
+
+ <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="14sp" />
+
+ <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="14sp"
+ 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
new file mode 100644
index 00000000..b85f1116
--- /dev/null
+++ b/res/layout/fragment_conversations_overview.xml
@@ -0,0 +1,30 @@
+<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="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.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
new file mode 100644
index 00000000..431bf59e
--- /dev/null
+++ b/res/layout/join_conference_dialog.xml
@@ -0,0 +1,47 @@
+<?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/your_account"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"
+ android:text="@string/your_account" />
+ <Spinner
+ android:id="@+id/account"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" />
+
+ <TextView
+ android:id="@+id/jabber_id"
+ android:layout_marginTop="8dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"
+ android:text="@string/conference_address" />
+
+ <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:textColor="@color/primarytext"
+ />
+
+ <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" />
+
+</LinearLayout>
diff --git a/res/layout/manage_accounts.xml b/res/layout/manage_accounts.xml
index 0866477a..a2a01bf1 100644
--- a/res/layout/manage_accounts.xml
+++ b/res/layout/manage_accounts.xml
@@ -8,7 +8,8 @@
android:id="@+id/account_list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- tools:listitem="@layout/account_row">
+ android:divider="@color/divider"
+ android:dividerHeight="1dp">
</ListView>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml
index 3b3df9e8..563d730d 100644
--- a/res/layout/message_recieved.xml
+++ b/res/layout/message_recieved.xml
@@ -3,7 +3,10 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="8dp" >
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingBottom="4dp"
+ android:paddingTop="4dp">
<LinearLayout
android:id="@+id/message_box"
@@ -17,10 +20,13 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:background="#ededed"
+ android:background="@color/primarybackground"
android:orientation="vertical"
android:gravity="center_vertical"
- android:padding="3dp" >
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp"
+ android:paddingRight="5dp"
+ android:paddingLeft="5dp">
<ImageView
android:id="@+id/message_image"
@@ -29,7 +35,7 @@
android:adjustViewBounds="true"
android:paddingBottom="2dp"
android:scaleType="fitXY"
- android:background="#333333"
+ android:background="@color/primarytext"
/>
<TextView
@@ -38,8 +44,8 @@
android:layout_height="wrap_content"
android:autoLink="web"
android:textIsSelectable="true"
- android:textColor="#333333"
- android:textSize="16sp"/>
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"/>
<Button
android:id="@+id/download_button"
@@ -52,7 +58,8 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal" >
+ android:orientation="horizontal"
+ android:paddingTop="1dp">
<ImageView
android:id="@+id/security_indicator"
@@ -72,8 +79,8 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/sending"
- android:textColor="#8e8e8e"
- android:textSize="12sp" />
+ android:textSize="12sp"
+ android:textColor="@color/secondarytext"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index fbc95898..d4970e6f 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -3,7 +3,10 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="8dp" >
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingBottom="4dp"
+ android:paddingTop="4dp">
<LinearLayout
android:id="@+id/message_box"
@@ -17,10 +20,13 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:background="#ededed"
+ android:background="@color/primarybackground"
android:orientation="vertical"
android:gravity="center_vertical"
- android:padding="3dp" >
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp"
+ android:paddingRight="5dp"
+ android:paddingLeft="5dp">
<ImageView
android:id="@+id/message_image"
@@ -29,7 +35,7 @@
android:adjustViewBounds="true"
android:paddingBottom="2dp"
android:scaleType="fitXY"
- android:background="#333333"
+ android:background="@color/primarytext"
/>
<TextView
@@ -38,14 +44,15 @@
android:layout_height="wrap_content"
android:autoLink="web"
android:textIsSelectable="true"
- android:textColor="#333333"
- android:textSize="16sp" />
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_gravity="right">
+ android:layout_gravity="right"
+ android:paddingTop="1dp">
<TextView
android:id="@+id/message_time"
@@ -54,8 +61,8 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/sending"
- android:textColor="#8e8e8e"
- android:textSize="12sp" />
+ android:textSize="12sp"
+ android:textColor="@color/secondarytext"/>
<ImageView
android:id="@+id/security_indicator"
diff --git a/res/layout/otr_fingerprint.xml b/res/layout/otr_fingerprint.xml
index b9eafca4..d8f24151 100644
--- a/res/layout/otr_fingerprint.xml
+++ b/res/layout/otr_fingerprint.xml
@@ -9,7 +9,7 @@
android:id="@+id/otr_no_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="20sp"
+ android:textSize="18sp"
android:text="@string/no_otr_fingerprint"
android:visibility="visible"/>
@@ -17,7 +17,7 @@
android:id="@+id/otr_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="20sp"
+ android:textSize="18sp"
android:typeface="monospace"
android:visibility="gone"/>
diff --git a/res/layout/quickedit.xml b/res/layout/quickedit.xml
new file mode 100644
index 00000000..07a7ac3b
--- /dev/null
+++ b/res/layout/quickedit.xml
@@ -0,0 +1,18 @@
+<?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="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">
+
+ <requestFocus />
+ </EditText>
+
+</LinearLayout>