From e64049c4fc0f4514dee011a1f616ea4bdff1f16a Mon Sep 17 00:00:00 2001
From: BrianBlade <n.gelbertz@gmail.com>
Date: Wed, 1 Apr 2015 12:14:05 +0200
Subject: Add toggle account-state switch

Add a switch to AccountAdapter that allows self-contained enabling/disabling of
accounts without the need to bring up the context-menu
---
 src/main/res/layout/account_row.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 60b69090..1cd29d59 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -41,4 +41,12 @@
             android:textStyle="bold" />
     </LinearLayout>
 
+    <Switch
+        android:id="@+id/tgl_account_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:focusable="false"/>
+
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From b7b87e1a8d3c17f49eb9f9d5434224d38afabb24 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 1 Apr 2015 23:45:46 +0200
Subject: do not overlap account title and switch

---
 src/main/res/layout/account_row.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 1cd29d59..94c59111 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -20,7 +20,10 @@
         android:layout_centerVertical="true"
         android:layout_toRightOf="@+id/account_image"
         android:orientation="vertical"
-        android:paddingLeft="8dp" >
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:layout_toLeftOf="@+id/tgl_account_status"
+        android:layout_toStartOf="@+id/tgl_account_status">
 
         <TextView
             android:id="@+id/account_jid"
-- 
cgit v1.2.3


From dace8ba3d3815599a70d5e369cd3b1f418842a0e Mon Sep 17 00:00:00 2001
From: BrianBlade <n.gelbertz@gmail.com>
Date: Fri, 3 Apr 2015 00:06:37 +0200
Subject: Enable end-conversation by swipe gesture

Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4
to enable swipe-out for ListViews

Re-enable selectableItemBackground

Dont end selectedConversation on swipe

Call mConversationFragment.reinit() instead.
Add separate undo string for swipe MUC.

Add blacklistedConversation for undo swipe

Update title_undo_swipe_* strings

Fix undo(), rename blacklistedConversation

Fix discardUndo(); re-init selectedConversation

maintain scroll position after undo

clear notification when dismissing a conversation

modified / simplified maintain scroll position code

simplify handling of selectedConversation

change undo_muc string, remove notifyDataSetChanged()
---
 src/main/res/layout/conversation_list_row.xml      | 138 ++++++++++++---------
 .../res/layout/fragment_conversations_overview.xml |   2 +-
 2 files changed, 79 insertions(+), 61 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 21147b4a..de04780f 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -1,68 +1,86 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:padding="8dp" >
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:descendantFocusability="blocksDescendants">
 
-    <ImageView
-        android:id="@+id/conversation_image"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:layout_alignParentLeft="true"
-        android:scaleType="centerCrop" />
+	<View
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:background="@color/divider"/>
 
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_toRightOf="@+id/conversation_image"
-        android:paddingLeft="8dp" >
+	<FrameLayout
+		android:id="@+id/swipeable_item"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:background="@color/primarybackground">
 
-        <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" />
+	<RelativeLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:background="?android:selectableItemBackground"
+		android:orientation="horizontal"
+		android:padding="8dp" >
 
-        <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" >
+		<ImageView
+			android:id="@+id/conversation_image"
+			android:layout_width="56dp"
+			android:layout_height="56dp"
+			android:layout_alignParentLeft="true"
+			android:scaleType="centerCrop" />
 
-            <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" />
+		<RelativeLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_centerVertical="true"
+			android:layout_toRightOf="@+id/conversation_image"
+			android:paddingLeft="8dp" >
 
-            <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_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" />
 
-        <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>
+			<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" >
 
-</RelativeLayout>
\ No newline at end of file
+				<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>
+	</FrameLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index 69570028..24c653ae 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -10,7 +10,7 @@
         android:background="@color/primarybackground"
         android:orientation="vertical" >
 
-        <ListView
+        <de.timroes.android.listview.EnhancedListView
             android:id="@+id/list"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-- 
cgit v1.2.3


From 845b39cdcc4d20d916bdee5b661c31a19f6cbdac Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 13 Apr 2015 15:59:18 +0200
Subject: fixed regression where the selected conversation wasn't highlighted
 anymore on tabled layout

---
 src/main/res/layout/conversation_list_row.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index de04780f..69abb225 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -6,7 +6,7 @@
 	<View
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
-		android:background="@color/divider"/>
+		android:background="@color/primary"/>
 
 	<FrameLayout
 		android:id="@+id/swipeable_item"
-- 
cgit v1.2.3


From a4ff8e36337acab6fb3d945159f6d143e825f16b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 27 Apr 2015 12:19:05 +0200
Subject: increased padding around switches in manage accounts

---
 src/main/res/layout/account_row.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 94c59111..0e73dd64 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -3,7 +3,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/activatedBackgroundIndicator"
-    android:padding="8dp" >
+    android:paddingLeft="8dp"
+    android:paddingBottom="8dp"
+    android:paddingTop="8dp">
 
     <ImageView
         android:id="@+id/account_image"
@@ -21,7 +23,6 @@
         android:layout_toRightOf="@+id/account_image"
         android:orientation="vertical"
         android:paddingLeft="8dp"
-        android:paddingRight="8dp"
         android:layout_toLeftOf="@+id/tgl_account_status"
         android:layout_toStartOf="@+id/tgl_account_status">
 
@@ -50,6 +51,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
+        android:padding="8dp"
         android:focusable="false"/>
 
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 92d14c4a0090c71842440d96be1f84dab5a82d16 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 28 Apr 2015 14:46:52 +0200
Subject: increased padding on image buttons on v21 to match material
 guidelines

---
 src/main/res/layout/activity_edit_account.xml | 2 +-
 src/main/res/layout/activity_muc_details.xml  | 4 ++--
 src/main/res/layout/contact_key.xml           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 750c28e0..7d84a4af 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -337,7 +337,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:background="?android:selectableItemBackground"
-                        android:padding="8dp"
+                        android:padding="@dimen/image_button_padding"
                         android:src="?attr/icon_copy"
                         android:visibility="visible"
                         android:contentDescription="@string/copy_otr_clipboard_description"/>
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 36873654..11602651 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -75,7 +75,7 @@
 					android:layout_alignParentRight="true"
 					android:layout_centerVertical="true"
 					android:background="?android:selectableItemBackground"
-					android:padding="8dp"
+					android:padding="@dimen/image_button_padding"
 					android:src="?attr/icon_edit_dark"/>
 			</RelativeLayout>
 
@@ -102,7 +102,7 @@
 				android:layout_alignParentRight="true"
 				android:layout_centerVertical="true"
 				android:background="?android:selectableItemBackground"
-				android:padding="8dp"
+				android:padding="@dimen/image_button_padding"
 				android:src="?attr/icon_settings"/>
 				</RelativeLayout>
 
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 75572877..b7817b38 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -34,7 +34,7 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:background="?android:selectableItemBackground"
-        android:padding="8dp"
+        android:padding="@dimen/image_button_padding"
         android:src="?attr/icon_remove"
         android:visibility="invisible" />
 
-- 
cgit v1.2.3


From 53fea9e1fe25a1f0f2a7fe219195b0009ecb4f5b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 2 May 2015 11:38:56 +0200
Subject: replace send button with quick action button as long as no text has
 been entered

---
 src/main/res/layout/fragment_conversation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index f9aae10a..5aa7dffa 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -57,7 +57,7 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:background="?android:selectableItemBackground"
-            android:src="@drawable/ic_action_send_now_offline" />
+            android:src="@drawable/ic_send_text_offline" />
     </RelativeLayout>
 
     <RelativeLayout
-- 
cgit v1.2.3


From 22b12091a103a164a1d54874ad376d02dfee1519 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 11 May 2015 07:57:52 +0200
Subject: rewrote parts of message adapter to avoid using NULL views

---
 src/main/res/layout/message_null.xml | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 src/main/res/layout/message_null.xml

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/message_null.xml b/src/main/res/layout/message_null.xml
deleted file mode 100644
index 0e0f1c92..00000000
--- a/src/main/res/layout/message_null.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="0dp"
-    android:background="#00000000">
-
-</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From ffffca10f0c3e399fbbcde200ea4758acc5ba03f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 13 Jul 2015 12:55:13 +0200
Subject: renamed colors

---
 src/main/res/layout/account_row.xml                |  4 +-
 src/main/res/layout/actionview_search.xml          |  4 +-
 src/main/res/layout/activity_about.xml             |  4 +-
 src/main/res/layout/activity_change_password.xml   | 22 ++++----
 src/main/res/layout/activity_contact_details.xml   | 12 ++--
 src/main/res/layout/activity_edit_account.xml      | 64 +++++++++++-----------
 src/main/res/layout/activity_muc_details.xml       | 12 ++--
 .../layout/activity_publish_profile_picture.xml    | 16 +++---
 .../res/layout/activity_start_conversation.xml     |  2 +-
 src/main/res/layout/activity_verify_otr.xml        | 24 ++++----
 src/main/res/layout/contact.xml                    |  6 +-
 src/main/res/layout/contact_key.xml                |  4 +-
 src/main/res/layout/conversation_list_row.xml      | 12 ++--
 src/main/res/layout/create_contact_dialog.xml      |  8 +--
 src/main/res/layout/fragment_conversation.xml      | 14 ++---
 .../res/layout/fragment_conversations_overview.xml |  6 +-
 src/main/res/layout/join_conference_dialog.xml     |  8 +--
 src/main/res/layout/list_item_tag.xml              |  2 +-
 src/main/res/layout/manage_accounts.xml            |  4 +-
 src/main/res/layout/message_received.xml           |  8 +--
 src/main/res/layout/message_sent.xml               |  8 +--
 src/main/res/layout/message_status.xml             |  2 +-
 src/main/res/layout/quickedit.xml                  |  2 +-
 23 files changed, 125 insertions(+), 123 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 0e73dd64..06716a10 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -32,7 +32,7 @@
             android:layout_height="wrap_content"
             android:scrollHorizontally="false"
             android:singleLine="true"
-            android:textColor="@color/primarytext"
+            android:textColor="@color/black87"
             android:textSize="?attr/TextSizeHeadline" />
 
         <TextView
@@ -40,7 +40,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/account_status_unknown"
-            android:textColor="@color/secondarytext"
+            android:textColor="@color/black54"
             android:textSize="?attr/TextSizeBody"
             android:textStyle="bold" />
     </LinearLayout>
diff --git a/src/main/res/layout/actionview_search.xml b/src/main/res/layout/actionview_search.xml
index cc5fc9d7..8b657f4a 100644
--- a/src/main/res/layout/actionview_search.xml
+++ b/src/main/res/layout/actionview_search.xml
@@ -14,6 +14,8 @@
         android:layout_height="wrap_content"
         android:focusable="true"
         android:inputType="textEmailAddress|textNoSuggestions"
-        android:textColor="@color/ondarktext" />
+        android:textColor="@color/white"
+        android:textColorHint="@color/white70"
+        android:hint="@string/search_for_contacts_or_groups"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index ab0e34eb..d7d23f0f 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -1,7 +1,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="eu.siacs.conversations.ui.AboutActivity"
-    android:background="@color/primarybackground"
+    android:background="@color/grey50"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
@@ -15,7 +15,7 @@
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:layout_marginTop="@dimen/activity_vertical_margin"
         android:paddingBottom="@dimen/activity_vertical_margin"
-        android:textColor="@color/primarytext"
+        android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody"
         android:typeface="monospace"/>
 </ScrollView>
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 28d531c2..1a4d00d8 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -2,7 +2,7 @@
 <RelativeLayout 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/grey50">
 
 	<ScrollView
 		android:layout_width="fill_parent"
@@ -22,7 +22,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/current_password"
-				android:textColor="@color/primarytext"
+				android:textColor="@color/black87"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<EditText
@@ -32,15 +32,15 @@
 				android:layout_marginBottom="8dp"
 				android:hint="@string/password"
 				android:inputType="textPassword"
-				android:textColor="@color/primarytext"
-				android:textColorHint="@color/secondarytext"
+				android:textColor="@color/black87"
+				android:textColorHint="@color/black54"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/new_password"
-				android:textColor="@color/primarytext"
+				android:textColor="@color/black87"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<EditText
@@ -50,15 +50,15 @@
 				android:layout_marginBottom="8dp"
 				android:hint="@string/password"
 				android:inputType="textPassword"
-				android:textColor="@color/primarytext"
-				android:textColorHint="@color/secondarytext"
+				android:textColor="@color/black87"
+				android:textColorHint="@color/black54"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/account_settings_confirm_password"
-				android:textColor="@color/primarytext"
+				android:textColor="@color/black87"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<EditText
@@ -67,8 +67,8 @@
 				android:layout_height="wrap_content"
 				android:hint="@string/password"
 				android:inputType="textPassword"
-				android:textColor="@color/primarytext"
-				android:textColorHint="@color/secondarytext"
+				android:textColor="@color/black87"
+				android:textColorHint="@color/black54"
 				android:textSize="?attr/TextSizeBody"/>
 		</LinearLayout>
 	</ScrollView>
@@ -94,7 +94,7 @@
 			android:layout_height="fill_parent"
 			android:layout_marginBottom="7dp"
 			android:layout_marginTop="7dp"
-			android:background="@color/divider"/>
+			android:background="@color/black12"/>
 
 		<Button
 			android:id="@+id/right_button"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 1254a3ab..5f6a2dd0 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -2,7 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/secondarybackground" >
+    android:background="@color/grey200" >
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -39,7 +39,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/account_settings_example_jabber_id"
-                    android:textColor="@color/primarytext"
+                    android:textColor="@color/black87"
                     android:textSize="?attr/TextSizeHeadline"
                     android:textStyle="bold" />
 
@@ -61,7 +61,7 @@
                         android:id="@+id/details_lastseen"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/secondarytext"
+                        android:textColor="@color/black54"
                         android:textSize="?attr/TextSizeBody" />
                 </LinearLayout>
 
@@ -78,7 +78,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="@string/send_presence_updates"
-                    android:textColor="@color/primarytext"
+                    android:textColor="@color/black87"
                     android:textSize="?attr/TextSizeBody" />
 
                 <CheckBox
@@ -86,7 +86,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/receive_presence_updates"
-                    android:textColor="@color/primarytext"
+                    android:textColor="@color/black87"
                     android:textSize="?attr/TextSizeBody" />
             </LinearLayout>
 
@@ -98,7 +98,7 @@
                 android:layout_below="@+id/details_jidbox"
                 android:layout_marginTop="32dp"
                 android:text="@string/using_account"
-                android:textColor="@color/secondarytext"
+                android:textColor="@color/black54"
                 android:textSize="?attr/TextSizeInfo" />
         </RelativeLayout>
 
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 7d84a4af..98de84f5 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/secondarybackground" >
+    android:background="@color/grey200" >
 
     <ScrollView
         android:layout_width="fill_parent"
@@ -42,7 +42,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/account_settings_jabber_id"
-                    android:textColor="@color/primarytext"
+                    android:textColor="@color/black87"
                     android:textSize="?attr/TextSizeBody" />
 
                 <AutoCompleteTextView
@@ -51,8 +51,8 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/account_settings_example_jabber_id"
                     android:inputType="textEmailAddress"
-                    android:textColor="@color/primarytext"
-                    android:textColorHint="@color/secondarytext"
+                    android:textColor="@color/black87"
+                    android:textColorHint="@color/black54"
                     android:textSize="?attr/TextSizeBody" />
 
                 <TextView
@@ -60,7 +60,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="@string/account_settings_password"
-                    android:textColor="@color/primarytext"
+                    android:textColor="@color/black87"
                     android:textSize="?attr/TextSizeBody" />
 
                 <EditText
@@ -69,8 +69,8 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/password"
                     android:inputType="textPassword"
-                    android:textColor="@color/primarytext"
-                    android:textColorHint="@color/secondarytext"
+                    android:textColor="@color/black87"
+                    android:textColorHint="@color/black54"
                     android:textSize="?attr/TextSizeBody" />
 
                 <CheckBox
@@ -79,7 +79,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="@string/register_account"
-                    android:textColor="@color/primarytext"
+                    android:textColor="@color/black87"
                     android:textSize="?attr/TextSizeBody" />
 
                 <TextView
@@ -87,7 +87,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/account_settings_confirm_password"
-                    android:textColor="@color/primarytext"
+                    android:textColor="@color/black87"
                     android:textSize="?attr/TextSizeBody"
                     android:visibility="gone" />
 
@@ -99,8 +99,8 @@
                     android:hint="@string/confirm_password"
                     android:inputType="textPassword"
                     android:visibility="gone"
-                    android:textColor="@color/primarytext"
-                    android:textColorHint="@color/secondarytext"
+                    android:textColor="@color/black87"
+                    android:textColorHint="@color/black54"
                     android:textSize="?attr/TextSizeBody" />
                 </LinearLayout>
             </RelativeLayout>
@@ -132,7 +132,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_session_established"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -140,7 +140,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -161,7 +161,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_pep"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -169,7 +169,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -182,7 +182,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_blocking"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -190,7 +190,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -203,7 +203,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_stream_management"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -211,7 +211,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -224,7 +224,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_roster_version"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -232,7 +232,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -245,7 +245,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_carbon_messages"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -253,7 +253,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -266,7 +266,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_mam"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -274,7 +274,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -287,7 +287,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_csi"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -295,7 +295,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -318,14 +318,14 @@
                             android:id="@+id/otr_fingerprint"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             android:typeface="monospace" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="@color/secondarytext"
+                            android:textColor="@color/black54"
                             android:textSize="?attr/TextSizeInfo"
                             android:text="@string/otr_fingerprint"/>
                     </LinearLayout>
@@ -363,14 +363,14 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/cancel"
-            android:textColor="@color/primarytext" />
+            android:textColor="@color/black87" />
 
         <View
             android:layout_width="1dp"
             android:layout_height="fill_parent"
             android:layout_marginBottom="7dp"
             android:layout_marginTop="7dp"
-            android:background="@color/divider" />
+            android:background="@color/black12" />
 
         <Button
             android:id="@+id/save_button"
@@ -380,7 +380,7 @@
             android:layout_weight="1"
             android:enabled="false"
             android:text="@string/save"
-            android:textColor="@color/secondarytext" />
+            android:textColor="@color/black54" />
     </LinearLayout>
 
 </RelativeLayout>
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 11602651..b89c9945 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -2,7 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:background="@color/secondarybackground">
+            android:background="@color/grey200">
 
 	<LinearLayout
 		android:layout_width="fill_parent"
@@ -26,7 +26,7 @@
 				android:layout_height="wrap_content"
 				android:layout_marginBottom="16dp"
 				android:text="@string/account_settings_example_jabber_id"
-				android:textColor="@color/primarytext"
+				android:textColor="@color/black87"
 				android:textSize="?attr/TextSizeHeadline"
 				android:textStyle="bold"/>
 
@@ -56,7 +56,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:singleLine="true"
-						android:textColor="@color/primarytext"
+						android:textColor="@color/black87"
 						android:textSize="?attr/TextSizeHeadline"/>
 
 					<TextView
@@ -64,7 +64,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:singleLine="true"
-						android:textColor="@color/primarytext"
+						android:textColor="@color/black87"
 						android:textSize="?attr/TextSizeBody"/>
 				</LinearLayout>
 
@@ -88,7 +88,7 @@
 				android:layout_height="wrap_content"
 			    android:text="@string/private_conference"
 				android:layout_centerVertical="true"
-				android:textColor="@color/primarytext"
+				android:textColor="@color/black87"
 				android:textSize="?attr/TextSizeBody"
 				android:layout_alignParentLeft="true"
 				android:layout_toLeftOf="@+id/change_conference_button"
@@ -113,7 +113,7 @@
 				android:layout_gravity="right"
 				android:layout_marginTop="32dp"
 				android:text="@string/using_account"
-				android:textColor="@color/secondarytext"
+				android:textColor="@color/black54"
 				android:textSize="?attr/TextSizeInfo"/>
 		</LinearLayout>
 
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index fac499bc..4b249745 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -2,7 +2,7 @@
 <RelativeLayout 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/grey50" >
 
     <LinearLayout
         android:id="@+id/account_image_wrapper"
@@ -27,7 +27,7 @@
         android:layout_below="@id/account_image_wrapper"
         android:layout_centerHorizontal="true"
         android:text="@string/touch_to_choose_picture"
-        android:textColor="@color/secondarytext" />
+        android:textColor="@color/black54" />
 
     <TextView
         android:id="@+id/secondary_hint"
@@ -36,7 +36,7 @@
         android:layout_below="@id/hint"
         android:layout_centerHorizontal="true"
         android:text="@string/or_long_press_for_default"
-        android:textColor="@color/secondarytext" />
+        android:textColor="@color/black54" />
 
     <LinearLayout
         android:id="@+id/button_bar"
@@ -53,14 +53,14 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/cancel"
-            android:textColor="@color/primarytext" />
+            android:textColor="@color/black87" />
 
         <View
             android:layout_width="1dp"
             android:layout_height="fill_parent"
             android:layout_marginBottom="7dp"
             android:layout_marginTop="7dp"
-            android:background="@color/divider" />
+            android:background="@color/black12" />
 
         <Button
             android:id="@+id/publish_button"
@@ -70,7 +70,7 @@
             android:layout_weight="1"
             android:enabled="false"
             android:text="@string/publish"
-            android:textColor="@color/secondarytext" />
+            android:textColor="@color/black54" />
     </LinearLayout>
 
     <LinearLayout
@@ -89,7 +89,7 @@
             android:id="@+id/account"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/primarytext"
+            android:textColor="@color/black87"
             android:textSize="?attr/TextSizeHeadline" />
 
         <TextView
@@ -99,7 +99,7 @@
             android:layout_marginTop="8dp"
             android:minLines="3"
             android:text="@string/publish_avatar_explanation"
-            android:textColor="@color/primarytext"
+            android:textColor="@color/black87"
             android:textSize="?attr/TextSizeBody" />
     </LinearLayout>
 
diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
index f9c98529..d55ec196 100644
--- a/src/main/res/layout/activity_start_conversation.xml
+++ b/src/main/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/grey50" >
 
 </android.support.v4.view.ViewPager>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml
index 54f9a542..ab21c693 100644
--- a/src/main/res/layout/activity_verify_otr.xml
+++ b/src/main/res/layout/activity_verify_otr.xml
@@ -2,7 +2,7 @@
 <RelativeLayout 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/grey50">
 
 	<ScrollView
 		android:layout_width="fill_parent"
@@ -34,7 +34,7 @@
 					android:id="@+id/your_fingerprint"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:textColor="@color/primarytext"
+					android:textColor="@color/black87"
 					android:textSize="?attr/TextSizeBody"
 					android:typeface="monospace"/>
 
@@ -42,7 +42,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:text="@string/your_fingerprint"
-					android:textColor="@color/secondarytext"
+					android:textColor="@color/black54"
 					android:textSize="?attr/TextSizeInfo"/>
 
 				<TextView
@@ -50,7 +50,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginTop="20dp"
-					android:textColor="@color/primarytext"
+					android:textColor="@color/black87"
 					android:textSize="?attr/TextSizeBody"
 					android:typeface="monospace"/>
 
@@ -59,7 +59,7 @@
 					android:layout_height="wrap_content"
 					android:layout_marginBottom="20dp"
 					android:text="@string/remote_fingerprint"
-					android:textColor="@color/secondarytext"
+					android:textColor="@color/black54"
 					android:textSize="?attr/TextSizeInfo"/>
 
 			</LinearLayout>
@@ -77,7 +77,7 @@
 					android:layout_height="wrap_content"
 					android:layout_gravity="center_horizontal"
 					android:text="@string/verified"
-					android:textColor="@color/primarytext"
+					android:textColor="@color/black87"
 					android:textSize="?attr/TextSizeHeadline"
 					android:textStyle="bold"
 					android:visibility="gone"/>
@@ -87,7 +87,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginBottom="8dp"
-					android:textColor="@color/primarytext"
+					android:textColor="@color/black87"
 					android:textSize="?attr/TextSizeBody"
 					android:textStyle="bold"
 					android:visibility="gone"/>
@@ -99,8 +99,8 @@
 					android:layout_marginBottom="8dp"
 					android:hint="@string/shared_secret_hint"
 					android:inputType="textAutoComplete"
-					android:textColor="@color/primarytext"
-					android:textColorHint="@color/secondarytext"
+					android:textColor="@color/black87"
+					android:textColorHint="@color/black54"
 					android:textSize="?attr/TextSizeBody"/>
 
 				<EditText
@@ -110,8 +110,8 @@
 					android:layout_marginTop="8dp"
 					android:hint="@string/shared_secret_secret"
 					android:inputType="textPassword"
-					android:textColor="@color/primarytext"
-					android:textColorHint="@color/secondarytext"
+					android:textColor="@color/black87"
+					android:textColorHint="@color/black54"
 					android:textSize="?attr/TextSizeBody"/>
 			</LinearLayout>
 		</LinearLayout>
@@ -137,7 +137,7 @@
 			android:layout_height="fill_parent"
 			android:layout_marginBottom="7dp"
 			android:layout_marginTop="7dp"
-			android:background="@color/divider"/>
+			android:background="@color/black12"/>
 
 		<Button
 			android:id="@+id/right_button"
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 69545c25..a7f5bef5 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -27,7 +27,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textColor="@color/primarytext"
+            android:textColor="@color/black87"
             android:textSize="?attr/TextSizeHeadline" />
 
         <TextView
@@ -35,7 +35,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textColor="@color/primarytext"
+            android:textColor="@color/black87"
             android:textSize="?attr/TextSizeBody" />
         <LinearLayout
             android:id="@+id/tags"
@@ -48,7 +48,7 @@
             android:id="@+id/key"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/primarytext"
+            android:textColor="@color/black87"
             android:textSize="?attr/TextSizeHeadline"
             android:typeface="monospace"
             android:visibility="gone" />
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index b7817b38..933b72b4 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -15,7 +15,7 @@
             android:id="@+id/key"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/primarytext"
+            android:textColor="@color/black87"
             android:textSize="?attr/TextSizeBody"
             android:typeface="monospace" />
 
@@ -23,7 +23,7 @@
             android:id="@+id/key_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/secondarytext"
+            android:textColor="@color/black54"
             android:textSize="?attr/TextSizeInfo"/>
     </LinearLayout>
 
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 69abb225..28e526e0 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -6,13 +6,13 @@
 	<View
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
-		android:background="@color/primary"/>
+		android:background="@color/green500"/>
 
 	<FrameLayout
 		android:id="@+id/swipeable_item"
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
-		android:background="@color/primarybackground">
+		android:background="@color/grey50">
 
 	<RelativeLayout
 		android:layout_width="fill_parent"
@@ -42,7 +42,7 @@
 				android:layout_alignLeft="@+id/conversation_lastwrapper"
 				android:layout_toLeftOf="@+id/conversation_lastupdate"
 				android:singleLine="true"
-				android:textColor="@color/primarytext"
+				android:textColor="@color/black87"
 				android:textSize="?attr/TextSizeHeadline"
 				android:typeface="sans" />
 
@@ -60,14 +60,14 @@
 					android:layout_height="wrap_content"
 					android:scrollHorizontally="false"
 					android:singleLine="true"
-					android:textColor="@color/primarytext"
+					android:textColor="@color/black87"
 					android:textSize="?attr/TextSizeBody" />
 
 				<ImageView
 					android:id="@+id/conversation_lastimage"
 					android:layout_width="fill_parent"
 					android:layout_height="36dp"
-					android:background="@color/primarytext"
+					android:background="@color/black87"
 					android:scaleType="centerCrop" />
 			</LinearLayout>
 
@@ -78,7 +78,7 @@
 				android:layout_alignBaseline="@+id/conversation_name"
 				android:layout_alignParentRight="true"
 				android:gravity="right"
-				android:textColor="@color/secondarytext"
+				android:textColor="@color/black54"
 				android:textSize="?attr/TextSizeInfo" />
 		</RelativeLayout>
 	</RelativeLayout>
diff --git a/src/main/res/layout/create_contact_dialog.xml b/src/main/res/layout/create_contact_dialog.xml
index 1ab4b686..6333e340 100644
--- a/src/main/res/layout/create_contact_dialog.xml
+++ b/src/main/res/layout/create_contact_dialog.xml
@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/your_account"
-        android:textColor="@color/primarytext"
+        android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody" />
 
     <Spinner
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/account_settings_jabber_id"
-        android:textColor="@color/primarytext"
+        android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody" />
 
     <AutoCompleteTextView
@@ -33,7 +33,7 @@
         android:layout_height="wrap_content"
         android:hint="@string/account_settings_example_jabber_id"
         android:inputType="textEmailAddress"
-        android:textColor="@color/primarytext"
-        android:textColorHint="@color/secondarytext" />
+        android:textColor="@color/black87"
+        android:textColorHint="@color/black54" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 5aa7dffa..d0ac6ba7 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/secondarybackground" >
+    android:background="@color/grey200" >
 
     <ListView
         android:id="@+id/messages_view"
@@ -12,7 +12,7 @@
         android:layout_above="@+id/snackbar"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:background="@color/secondarybackground"
+        android:background="@color/grey200"
         android:divider="@null"
         android:dividerHeight="0dp"
         android:listSelector="@android:color/transparent"
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="@color/primarybackground" >
+        android:background="@color/grey50" >
 
         <eu.siacs.conversations.ui.EditMessage
             android:id="@+id/textinput"
@@ -35,7 +35,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@+id/textSendButton"
-            android:background="@color/primarybackground"
+            android:background="@color/grey50"
             android:ems="10"
             android:imeOptions="flagNoExtractUi|actionSend"
             android:inputType="textShortMessage|textMultiLine|textCapSentences"
@@ -45,7 +45,7 @@
             android:paddingLeft="8dp"
             android:paddingRight="8dp"
             android:paddingTop="12dp"
-            android:textColor="@color/primarytext" >
+            android:textColor="@color/black87" >
 
             <requestFocus />
         </eu.siacs.conversations.ui.EditMessage>
@@ -80,7 +80,7 @@
             android:layout_centerVertical="true"
             android:layout_toLeftOf="@+id/snackbar_action"
             android:paddingLeft="24dp"
-            android:textColor="@color/ondarktext"
+            android:textColor="@color/white"
             android:textSize="?attr/TextSizeBody" />
 
         <TextView
@@ -94,7 +94,7 @@
             android:paddingRight="24dp"
             android:paddingTop="16dp"
             android:textAllCaps="true"
-            android:textColor="@color/ondarktext"
+            android:textColor="@color/white"
             android:textSize="?attr/TextSizeBody"
             android:textStyle="bold" />
     </RelativeLayout>
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index 24c653ae..2223219a 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -7,15 +7,15 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="@dimen/conversations_overview_width"
         android:layout_height="match_parent"
-        android:background="@color/primarybackground"
+        android:background="@color/grey50"
         android:orientation="vertical" >
 
         <de.timroes.android.listview.EnhancedListView
             android:id="@+id/list"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:background="@color/primarybackground"
-            android:divider="@color/divider"
+            android:background="@color/grey50"
+            android:divider="@color/black12"
             android:dividerHeight="1dp" />
     </LinearLayout>
 
diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
index 95c9d24c..7609dd0d 100644
--- a/src/main/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/join_conference_dialog.xml
@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/your_account"
-        android:textColor="@color/primarytext"
+        android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody" />
 
     <Spinner
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/conference_address"
-        android:textColor="@color/primarytext"
+        android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody" />
 
     <AutoCompleteTextView
@@ -33,8 +33,8 @@
         android:layout_height="wrap_content"
         android:hint="@string/conference_address_example"
         android:inputType="textEmailAddress"
-        android:textColor="@color/primarytext"
-        android:textColorHint="@color/secondarytext" />
+        android:textColor="@color/black87"
+        android:textColorHint="@color/black54" />
 
     <CheckBox
         android:id="@+id/bookmark"
diff --git a/src/main/res/layout/list_item_tag.xml b/src/main/res/layout/list_item_tag.xml
index 7a77f710..1a6a5576 100644
--- a/src/main/res/layout/list_item_tag.xml
+++ b/src/main/res/layout/list_item_tag.xml
@@ -7,7 +7,7 @@
     android:paddingLeft="4dp"
     android:paddingRight="4dp"
     android:textSize="?attr/TextSizeInfo"
-    android:textColor="@color/ondarktext"
+    android:textColor="@color/white"
     android:textAllCaps="true"
     android:layout_marginRight="8dp"
 />
\ No newline at end of file
diff --git a/src/main/res/layout/manage_accounts.xml b/src/main/res/layout/manage_accounts.xml
index 11ce35b2..90ca7de0 100644
--- a/src/main/res/layout/manage_accounts.xml
+++ b/src/main/res/layout/manage_accounts.xml
@@ -3,13 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/primarybackground" >
+    android:background="@color/grey50" >
 
     <ListView
         android:id="@+id/account_list"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:divider="@color/divider"
+        android:divider="@color/black12"
         android:dividerHeight="1dp" >
     </ListView>
 
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 39bb842a..988fb593 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -21,7 +21,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
-            android:background="@color/primarybackground"
+            android:background="@color/grey50"
             android:gravity="center_vertical"
             android:orientation="vertical"
             android:paddingBottom="4dp"
@@ -34,7 +34,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:adjustViewBounds="true"
-                android:background="@color/primarytext"
+                android:background="@color/black87"
                 android:paddingBottom="2dp"
                 android:scaleType="centerCrop" />
 
@@ -43,7 +43,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="web"
-                android:textColor="@color/primarytext"
+                android:textColor="@color/black87"
                 android:textSize="?attr/TextSizeBody" />
 
             <Button
@@ -77,7 +77,7 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:text="@string/sending"
-                    android:textColor="@color/secondarytext"
+                    android:textColor="@color/black54"
                     android:textSize="?attr/TextSizeInfo" />
             </LinearLayout>
         </LinearLayout>
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 3e854643..e0a82df8 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -21,7 +21,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
-            android:background="@color/primarybackground"
+            android:background="@color/grey50"
             android:gravity="center_vertical"
             android:orientation="vertical"
             android:paddingBottom="4dp"
@@ -34,7 +34,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:adjustViewBounds="true"
-                android:background="@color/primarytext"
+                android:background="@color/black87"
                 android:paddingBottom="2dp"
                 android:scaleType="centerCrop" />
 
@@ -43,7 +43,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="web"
-                android:textColor="@color/primarytext"
+                android:textColor="@color/black87"
                 android:textSize="?attr/TextSizeBody" />
             
              <Button
@@ -68,7 +68,7 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:text="@string/sending"
-                    android:textColor="@color/secondarytext"
+                    android:textColor="@color/black54"
                     android:textSize="?attr/TextSizeInfo" />
 
                 <ImageView
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 20544cd5..2816f475 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -28,7 +28,7 @@
         android:layout_toEndOf="@+id/message_photo"
         android:layout_toRightOf="@+id/message_photo"
         android:text="@string/contact_has_read_up_to_this_point"
-        android:textColor="@color/secondarytext"
+        android:textColor="@color/black54"
         android:textSize="?attr/TextSizeInfo"
         android:textStyle="italic"/>
 
diff --git a/src/main/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml
index 20a2868a..ff6b0413 100644
--- a/src/main/res/layout/quickedit.xml
+++ b/src/main/res/layout/quickedit.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:ems="10"
         android:inputType="textPersonName"
-        android:textColor="@color/primarytext" >
+        android:textColor="@color/black87" >
 
         <requestFocus />
     </EditText>
-- 
cgit v1.2.3


From 6a329c7465b5aa6eab194071124269e2196456de Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 16 Jul 2015 13:42:52 +0200
Subject: fixed some ux glitches in editaccount

---
 src/main/res/layout/message_received.xml | 1 -
 src/main/res/layout/message_sent.xml     | 1 -
 2 files changed, 2 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 988fb593..44531b37 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -51,7 +51,6 @@
                 style="?android:attr/buttonStyleSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/download_image"
                 android:visibility="gone" />
 
             <LinearLayout
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index e0a82df8..f8365ad3 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -51,7 +51,6 @@
                 style="?android:attr/buttonStyleSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/download_image"
                 android:visibility="gone" />
 
             <LinearLayout
-- 
cgit v1.2.3


From f58b2afcaaf1977f02c590a8832bb67f77ee7be3 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 18 Jul 2015 19:38:52 +0200
Subject: changed switch widget

---
 src/main/res/layout/account_row.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 06716a10..077170b2 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -45,13 +45,14 @@
             android:textStyle="bold" />
     </LinearLayout>
 
-    <Switch
+    <eu.siacs.conversations.ui.widget.Switch
+        style="@style/MD"
         android:id="@+id/tgl_account_status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:padding="8dp"
+        android:padding="16dp"
         android:focusable="false"/>
 
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 7049904c326e6dabc02138fa436d209bf724e0bc Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Tue, 7 Jul 2015 19:36:22 +0200
Subject: Add basic PEP managemend UI to EditAccountActivity

EditAccountActivity now show own fingerprint, and gives an option to
regenerate local keying material (and wipe all sessions associated with
the old keys in the process).

It also now displays a list of other own devices, and gives an option to
remove all but the current device.
---
 src/main/res/layout/activity_edit_account.xml | 101 ++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 98de84f5..df20e6f2 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -342,6 +342,107 @@
                         android:visibility="visible"
                         android:contentDescription="@string/copy_otr_clipboard_description"/>
                 </RelativeLayout>
+               <RelativeLayout
+                   android:layout_width="wrap_content"
+                   android:layout_height="match_parent"
+                   android:id="@+id/axolotl_fingerprint_box"
+                   android:layout_marginTop="32dp">
+
+                   <LinearLayout
+                       android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_alignParentLeft="true"
+                       android:layout_toLeftOf="@+id/axolotl_actions"
+                       android:orientation="vertical">
+
+                       <TextView
+                           android:id="@+id/axolotl_fingerprint"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:textColor="@color/black87"
+                           android:textSize="?attr/TextSizeBody"
+                           android:typeface="monospace" />
+
+                       <TextView
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:textColor="@color/black54"
+                           android:textSize="?attr/TextSizeInfo"
+                           android:text="@string/axolotl_fingerprint"/>
+                   </LinearLayout>
+
+                   <LinearLayout
+                       android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:id="@+id/axolotl_actions"
+                       android:layout_centerVertical="true"
+                       android:layout_alignParentRight="true"
+                       android:orientation="vertical">
+
+                       <ImageButton
+                           android:id="@+id/action_copy_axolotl_to_clipboard"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:background="?android:selectableItemBackground"
+                           android:padding="@dimen/image_button_padding"
+                           android:src="?attr/icon_copy"
+                           android:visibility="visible"
+                           android:contentDescription="@string/copy_axolotl_clipboard_description"/>
+                       <ImageButton
+                           android:id="@+id/action_regenerate_axolotl_key"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:background="?android:selectableItemBackground"
+                           android:padding="@dimen/image_button_padding"
+                           android:src="?attr/icon_refresh"
+                           android:visibility="visible"
+                           android:contentDescription="@string/regenerate_axolotl_key"/>
+
+                   </LinearLayout>
+               </RelativeLayout>
+               <RelativeLayout
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+                   android:id="@+id/axolotl_devices_box"
+                   android:layout_marginTop="32dp">
+
+                   <LinearLayout
+                       android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_alignParentLeft="true"
+                       android:layout_toLeftOf="@+id/action_wipe_axolotl_pep"
+                       android:orientation="vertical">
+
+                       <TextView
+                           android:id="@+id/axolotl_devicelist"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:textColor="@color/black87"
+                           android:textSize="?attr/TextSizeBody"
+                           android:typeface="monospace" />
+
+                       <TextView
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:textColor="@color/black54"
+                           android:textSize="?attr/TextSizeInfo"
+                           android:text="@string/axolotl_devicelist"/>
+                   </LinearLayout>
+
+                   <ImageButton
+                       android:id="@+id/action_wipe_axolotl_pep"
+                       android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_centerVertical="true"
+                       android:layout_alignParentRight="true"
+                       android:background="?android:selectableItemBackground"
+                       android:padding="@dimen/image_button_padding"
+                       android:src="?attr/icon_remove"
+                       android:visibility="visible"
+                       android:contentDescription="@string/wipe_axolotl_pep"/>
+
+
+               </RelativeLayout>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
-- 
cgit v1.2.3


From 23a4e1e6fada4eb5309db35efcf80d6f1f6f4d34 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Thu, 9 Jul 2015 14:26:19 +0200
Subject: Display trust status in ContactDetailsActivity

---
 src/main/res/layout/contact_key.xml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 933b72b4..79b9af62 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -3,12 +3,11 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent" >
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_toLeftOf="@+id/button_remove"
-        android:orientation="vertical"
         android:padding="8dp" >
 
         <TextView
@@ -16,6 +15,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/black87"
+            android:layout_alignParentLeft="true"
             android:textSize="?attr/TextSizeBody"
             android:typeface="monospace" />
 
@@ -24,8 +24,20 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/black54"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/key"
             android:textSize="?attr/TextSizeInfo"/>
-    </LinearLayout>
+
+        <TextView
+            android:id="@+id/key_trust"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/key"
+            android:visibility="gone"
+            android:textColor="@color/black54"
+            android:textSize="?attr/TextSizeInfo"/>
+    </RelativeLayout>
 
     <ImageButton
         android:id="@+id/button_remove"
-- 
cgit v1.2.3


From 3d339460889644c859d932eb3f2e324bd5696707 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Fri, 10 Jul 2015 02:56:44 +0200
Subject: Add key trust toggle to ContactDetailsActivity

Can now toggle IdentityKey trust
---
 src/main/res/layout/contact_key.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 79b9af62..a43f8083 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -50,4 +50,14 @@
         android:src="?attr/icon_remove"
         android:visibility="invisible" />
 
+    <ImageButton
+        android:id="@+id/button_trust"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:background="?android:selectableItemBackground"
+        android:padding="@dimen/image_button_padding"
+        android:src="?attr/icon_done"
+        android:visibility="invisible" />
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 6f67469bda0ffe97cb8cd8d400affed5a17c34c5 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Sun, 19 Jul 2015 14:09:49 +0200
Subject: Refactor trust key ui and show in account details

Refactored the trust key row UI element so it can be used in multiple
places. It now also uses a slider to toggle the trust state, and the
redundant trust state description was removed.

EditAccountActivity now shows the keys of other devices associated with
that account.
---
 src/main/res/layout/activity_edit_account.xml | 33 ++++++++++++++++++++++++++-
 src/main/res/layout/contact_key.xml           | 20 ++++++++--------
 2 files changed, 43 insertions(+), 10 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index df20e6f2..3d65365d 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -368,7 +368,7 @@
                            android:layout_height="wrap_content"
                            android:textColor="@color/black54"
                            android:textSize="?attr/TextSizeInfo"
-                           android:text="@string/axolotl_fingerprint"/>
+                           android:text="@string/this_device_axolotl_fingerprint"/>
                    </LinearLayout>
 
                    <LinearLayout
@@ -444,6 +444,37 @@
 
                </RelativeLayout>
             </LinearLayout>
+            <LinearLayout
+                android:id="@+id/other_device_keys_card"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:layout_marginRight="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
+                android:background="@drawable/infocard_border"
+                android:orientation="vertical"
+                android:padding="@dimen/infocard_padding"
+                android:visibility="gone">
+
+                <TextView
+                    android:id="@+id/other_device_keys_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black87"
+                    android:textSize="?attr/TextSizeHeadline"
+                    android:textStyle="bold"
+                    android:text="@string/other_devices"/>
+
+                <LinearLayout
+                    android:id="@+id/other_device_keys"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:divider="?android:dividerHorizontal"
+                    android:orientation="vertical"
+                    android:showDividers="middle" >
+                </LinearLayout>
+            </LinearLayout>
         </LinearLayout>
     </ScrollView>
 
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index a43f8083..64f6075c 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -4,10 +4,10 @@
     android:layout_height="match_parent" >
 
     <RelativeLayout
+        android:id="@+id/key_data"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@+id/button_remove"
         android:padding="8dp" >
 
         <TextView
@@ -16,6 +16,7 @@
             android:layout_height="wrap_content"
             android:textColor="@color/black87"
             android:layout_alignParentLeft="true"
+            android:layout_toLeftOf="@+id/tgl_trust"
             android:textSize="?attr/TextSizeBody"
             android:typeface="monospace" />
 
@@ -37,27 +38,28 @@
             android:visibility="gone"
             android:textColor="@color/black54"
             android:textSize="?attr/TextSizeInfo"/>
-    </RelativeLayout>
 
     <ImageButton
         android:id="@+id/button_remove"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
+        android:layout_toRightOf="@+id/key"
         android:layout_centerVertical="true"
         android:background="?android:selectableItemBackground"
         android:padding="@dimen/image_button_padding"
         android:src="?attr/icon_remove"
-        android:visibility="invisible" />
+        android:visibility="gone" />
 
-    <ImageButton
-        android:id="@+id/button_trust"
+
+    <eu.siacs.conversations.ui.widget.Switch
+        android:id="@+id/tgl_trust"
+        android:visibility="invisible"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:background="?android:selectableItemBackground"
-        android:padding="@dimen/image_button_padding"
-        android:src="?attr/icon_done"
-        android:visibility="invisible" />
+        style="@style/MaterialDesignButton"/>
+
+    </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 14010bf5a6198e4e53ba3f86328d061cf20b8da1 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Sun, 19 Jul 2015 18:36:28 +0200
Subject: Ask for key trust when sending messages

If the contact (or the own account) has keys that have UNDECIDED trust,
we now drop the user into the new TrustKeysActivity, where they have to
decide for each new key whether it should be TRUSTED or UNTRUSTED.
---
 src/main/res/layout/activity_trust_keys.xml | 120 ++++++++++++++++++++++++++++
 1 file changed, 120 insertions(+)
 create mode 100644 src/main/res/layout/activity_trust_keys.xml

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
new file mode 100644
index 00000000..c535d51d
--- /dev/null
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="@color/grey200" >
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/button_bar"
+        android:layout_alignParentTop="true" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/own_keys_card"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:layout_marginRight="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
+                android:background="@drawable/infocard_border"
+                android:orientation="vertical"
+                android:padding="@dimen/infocard_padding"
+                android:visibility="gone">
+
+                <TextView
+                    android:id="@+id/own_keys_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black87"
+                    android:textSize="?attr/TextSizeHeadline"
+                    android:textStyle="bold"/>
+
+                <LinearLayout
+                    android:id="@+id/own_keys_details"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:divider="?android:dividerHorizontal"
+                    android:showDividers="middle"
+                    android:orientation="vertical">
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/foreign_keys_card"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:layout_marginRight="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
+                android:background="@drawable/infocard_border"
+                android:orientation="vertical"
+                android:padding="@dimen/infocard_padding"
+                android:visibility="gone">
+
+                <TextView
+                    android:id="@+id/foreign_keys_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black87"
+                    android:textSize="?attr/TextSizeHeadline"
+                    android:textStyle="bold"/>
+
+                <LinearLayout
+                    android:id="@+id/foreign_keys_details"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:divider="?android:dividerHorizontal"
+                    android:showDividers="middle"
+                    android:orientation="vertical">
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+    </ScrollView>
+    <LinearLayout
+        android:id="@+id/button_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true" >
+
+        <Button
+            android:id="@+id/cancel_button"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/cancel"
+            android:textColor="@color/black87" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="fill_parent"
+            android:layout_marginBottom="7dp"
+            android:layout_marginTop="7dp"
+            android:background="@color/black12" />
+
+        <Button
+            android:id="@+id/save_button"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:enabled="true"
+            android:textColor="@color/black54"
+            android:text="@string/done"/>
+    </LinearLayout>
+</RelativeLayout>
-- 
cgit v1.2.3


From 2240066bbe697ae4d32a40811a246132898a35ef Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Sun, 19 Jul 2015 23:38:09 +0200
Subject: Remove device list from EditAccount

---
 src/main/res/layout/activity_edit_account.xml | 43 ---------------------------
 1 file changed, 43 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 3d65365d..5034f734 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -400,49 +400,6 @@
 
                    </LinearLayout>
                </RelativeLayout>
-               <RelativeLayout
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:id="@+id/axolotl_devices_box"
-                   android:layout_marginTop="32dp">
-
-                   <LinearLayout
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_alignParentLeft="true"
-                       android:layout_toLeftOf="@+id/action_wipe_axolotl_pep"
-                       android:orientation="vertical">
-
-                       <TextView
-                           android:id="@+id/axolotl_devicelist"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:textColor="@color/black87"
-                           android:textSize="?attr/TextSizeBody"
-                           android:typeface="monospace" />
-
-                       <TextView
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:textColor="@color/black54"
-                           android:textSize="?attr/TextSizeInfo"
-                           android:text="@string/axolotl_devicelist"/>
-                   </LinearLayout>
-
-                   <ImageButton
-                       android:id="@+id/action_wipe_axolotl_pep"
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_centerVertical="true"
-                       android:layout_alignParentRight="true"
-                       android:background="?android:selectableItemBackground"
-                       android:padding="@dimen/image_button_padding"
-                       android:src="?attr/icon_remove"
-                       android:visibility="visible"
-                       android:contentDescription="@string/wipe_axolotl_pep"/>
-
-
-               </RelativeLayout>
             </LinearLayout>
             <LinearLayout
                 android:id="@+id/other_device_keys_card"
-- 
cgit v1.2.3


From 576330f6a937d2294bb3fd4f197acd0c3340ae8f Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Mon, 20 Jul 2015 14:14:27 +0200
Subject: Use MD style for key trust toggle switch

---
 src/main/res/layout/contact_key.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 64f6075c..7cb0bae7 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -59,7 +59,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        style="@style/MaterialDesignButton"/>
+        style="@style/MD"/>
 
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 8559ca05ab67f8f149be4beeb57b2aab86e1aa3c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 20 Jul 2015 15:43:28 +0200
Subject: fixed monospace font and android L

---
 src/main/res/layout/activity_about.xml        | 3 ++-
 src/main/res/layout/activity_edit_account.xml | 6 ++++--
 src/main/res/layout/activity_verify_otr.xml   | 6 ++++--
 src/main/res/layout/contact.xml               | 1 +
 src/main/res/layout/contact_key.xml           | 3 ++-
 5 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index d7d23f0f..247e96e5 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -17,5 +17,6 @@
         android:paddingBottom="@dimen/activity_vertical_margin"
         android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody"
-        android:typeface="monospace"/>
+        android:typeface="monospace"
+        android:fontFamily="monospace"/>
 </ScrollView>
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 5034f734..53226b82 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -320,7 +320,8 @@
                             android:layout_height="wrap_content"
                             android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
-                            android:typeface="monospace" />
+                            android:typeface="monospace"
+                            android:fontFamily="monospace"/>
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -361,7 +362,8 @@
                            android:layout_height="wrap_content"
                            android:textColor="@color/black87"
                            android:textSize="?attr/TextSizeBody"
-                           android:typeface="monospace" />
+                           android:typeface="monospace"
+                           android:fontFamily="monospace"/>
 
                        <TextView
                            android:layout_width="wrap_content"
diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml
index ab21c693..c15f19d5 100644
--- a/src/main/res/layout/activity_verify_otr.xml
+++ b/src/main/res/layout/activity_verify_otr.xml
@@ -36,7 +36,8 @@
 					android:layout_height="wrap_content"
 					android:textColor="@color/black87"
 					android:textSize="?attr/TextSizeBody"
-					android:typeface="monospace"/>
+					android:typeface="monospace"
+					android:fontFamily="monospace"/>
 
 				<TextView
 					android:layout_width="wrap_content"
@@ -52,7 +53,8 @@
 					android:layout_marginTop="20dp"
 					android:textColor="@color/black87"
 					android:textSize="?attr/TextSizeBody"
-					android:typeface="monospace"/>
+					android:typeface="monospace"
+					android:fontFamily="monospace"/>
 
 				<TextView
 					android:layout_width="wrap_content"
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index a7f5bef5..3c0c7487 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -51,6 +51,7 @@
             android:textColor="@color/black87"
             android:textSize="?attr/TextSizeHeadline"
             android:typeface="monospace"
+            android:fontFamily="monospace"
             android:visibility="gone" />
     </LinearLayout>
 
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 7cb0bae7..6b86f80a 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -18,7 +18,8 @@
             android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@+id/tgl_trust"
             android:textSize="?attr/TextSizeBody"
-            android:typeface="monospace" />
+            android:typeface="monospace"
+            android:fontFamily="monospace"/>
 
         <TextView
             android:id="@+id/key_type"
-- 
cgit v1.2.3


From e6cb12dfe414497b4317820497985c110cb81864 Mon Sep 17 00:00:00 2001
From: Raphael Pohl <eiszfuchs@eiszblu.me>
Date: Sun, 19 Jul 2015 14:26:03 +0200
Subject: changed message bubble appearance

---
 .../layout/activity_publish_profile_picture.xml    |  2 +-
 src/main/res/layout/fragment_conversation.xml      |  5 +-
 src/main/res/layout/message_received.xml           | 55 +++++++++++-----------
 src/main/res/layout/message_sent.xml               | 50 ++++++++++----------
 src/main/res/layout/message_status.xml             | 10 ++--
 5 files changed, 61 insertions(+), 61 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 4b249745..3b249a66 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -12,7 +12,7 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="8dp"
         android:layout_marginTop="24dp"
-        android:background="@drawable/message_border" >
+        android:background="@drawable/account_image_border" >
 
         <ImageView
             android:id="@+id/account_image"
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index d0ac6ba7..09d0573b 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -18,7 +18,10 @@
         android:listSelector="@android:color/transparent"
         android:stackFromBottom="true"
         android:transcriptMode="normal"
-        tools:listitem="@layout/message_sent" >
+        android:paddingTop="@dimen/activity_horizontal_margin"
+        android:paddingBottom="@dimen/activity_horizontal_margin"
+        android:clipToPadding="false"
+        tools:listitem="@layout/message_sent">
     </ListView>
 
     <RelativeLayout
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 44531b37..785e5b96 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -3,10 +3,21 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="4dp"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
-    android:paddingTop="4dp" >
+    android:paddingBottom="0dp"
+    android:paddingLeft="@dimen/activity_vertical_margin"
+    android:paddingRight="4dp"
+    android:paddingTop="0dp">
+
+    <ImageView
+        android:id="@+id/message_photo"
+        android:layout_width="36dp"
+        android:layout_height="38dp"
+        android:paddingTop="2dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="@dimen/message_profile_image_gap"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_profile" />
 
     <LinearLayout
         android:id="@+id/message_box"
@@ -14,28 +25,24 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_toRightOf="@+id/message_photo"
-        android:background="@drawable/message_border"
+        android:background="@drawable/message_bubble_received"
         android:minHeight="48dp"
         android:longClickable="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
-            android:background="@color/grey50"
             android:gravity="center_vertical"
-            android:orientation="vertical"
-            android:paddingBottom="4dp"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:paddingTop="4dp" >
+            android:orientation="vertical">
 
             <ImageView
                 android:id="@+id/message_image"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="4dp"
                 android:adjustViewBounds="true"
                 android:background="@color/black87"
-                android:paddingBottom="2dp"
                 android:scaleType="centerCrop" />
 
             <TextView
@@ -43,7 +50,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="web"
-                android:textColor="@color/black87"
+                android:textColorLink="@color/white"
+                android:textColor="@color/white"
                 android:textSize="?attr/TextSizeBody" />
 
             <Button
@@ -56,8 +64,9 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="left"
                 android:orientation="horizontal"
-                android:paddingTop="1dp" >
+                android:paddingBottom="2dp">
 
                 <ImageView
                     android:id="@+id/security_indicator"
@@ -65,9 +74,9 @@
                     android:layout_height="?attr/TextSizeInfo"
                     android:layout_gravity="center_vertical"
                     android:layout_marginRight="4sp"
-                    android:alpha="0.54"
+                    android:alpha="0.70"
                     android:gravity="center_vertical"
-                    android:src="@drawable/ic_secure_indicator" />
+                    android:src="@drawable/ic_secure_indicator_white" />
 
                 <TextView
                     android:id="@+id/message_time"
@@ -76,21 +85,11 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:text="@string/sending"
-                    android:textColor="@color/black54"
+                    android:textColor="@color/white70"
+                    android:alpha="0.70"
                     android:textSize="?attr/TextSizeInfo" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
 
-    <ImageView
-        android:id="@+id/message_photo"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        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/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index f8365ad3..15969d82 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -3,10 +3,21 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="4dp"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
-    android:paddingTop="4dp" >
+    android:paddingBottom="0dp"
+    android:paddingLeft="4dp"
+    android:paddingRight="@dimen/activity_vertical_margin"
+    android:paddingTop="0dp">
+
+    <ImageView
+        android:id="@+id/message_photo"
+        android:layout_width="36dp"
+        android:layout_height="40dp"
+        android:paddingBottom="4dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginLeft="@dimen/message_profile_image_gap"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_profile" />
 
     <LinearLayout
         android:id="@+id/message_box"
@@ -14,28 +25,24 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_toLeftOf="@+id/message_photo"
-        android:background="@drawable/message_border"
+        android:background="@drawable/message_bubble_sent"
         android:minHeight="48dp"
         android:longClickable="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
-            android:background="@color/grey50"
             android:gravity="center_vertical"
-            android:orientation="vertical"
-            android:paddingBottom="4dp"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:paddingTop="4dp" >
+            android:orientation="vertical">
 
             <ImageView
                 android:id="@+id/message_image"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="4dp"
                 android:adjustViewBounds="true"
                 android:background="@color/black87"
-                android:paddingBottom="2dp"
                 android:scaleType="centerCrop" />
 
             <TextView
@@ -43,10 +50,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="web"
+                android:textColorLink="@color/black87"
                 android:textColor="@color/black87"
                 android:textSize="?attr/TextSizeBody" />
-            
-             <Button
+
+            <Button
                 android:id="@+id/download_button"
                 style="?android:attr/buttonStyleSmall"
                 android:layout_width="wrap_content"
@@ -58,7 +66,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
                 android:orientation="horizontal"
-                android:paddingTop="1dp" >
+                android:paddingBottom="2dp">
 
                 <TextView
                     android:id="@+id/message_time"
@@ -68,6 +76,7 @@
                     android:gravity="center_vertical"
                     android:text="@string/sending"
                     android:textColor="@color/black54"
+                    android:alpha="0.54"
                     android:textSize="?attr/TextSizeInfo" />
 
                 <ImageView
@@ -93,15 +102,4 @@
         </LinearLayout>
     </LinearLayout>
 
-    <ImageView
-        android:id="@+id/message_photo"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginLeft="-1.5dp"
-        android:padding="0dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/ic_profile" />
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 2816f475..99a09527 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -3,15 +3,15 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="6dp"
+    android:paddingBottom="2dp"
     android:paddingLeft="8dp"
-    android:paddingRight="6dp"
-    android:paddingTop="6dp" >
+    android:paddingRight="8dp"
+    android:paddingTop="2dp" >
 
     <ImageView
         android:id="@+id/message_photo"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_marginRight="-1.5dp"
-- 
cgit v1.2.3


From dcf9117451877b1add21543910224b2120367393 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 19 Jul 2015 22:34:47 +0200
Subject: changed sizes of avatars and padding in new message bubbles

---
 src/main/res/layout/fragment_conversation.xml |  3 ---
 src/main/res/layout/message_received.xml      | 21 +++++++++++----------
 src/main/res/layout/message_sent.xml          | 26 ++++++++++++++------------
 src/main/res/layout/message_status.xml        |  8 ++++----
 4 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 09d0573b..db92c05f 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -18,9 +18,6 @@
         android:listSelector="@android:color/transparent"
         android:stackFromBottom="true"
         android:transcriptMode="normal"
-        android:paddingTop="@dimen/activity_horizontal_margin"
-        android:paddingBottom="@dimen/activity_horizontal_margin"
-        android:clipToPadding="false"
         tools:listitem="@layout/message_sent">
     </ListView>
 
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 785e5b96..4de9addd 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -3,19 +3,17 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="0dp"
-    android:paddingLeft="@dimen/activity_vertical_margin"
-    android:paddingRight="4dp"
-    android:paddingTop="0dp">
+    android:paddingBottom="3dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:paddingTop="3dp">
 
     <ImageView
         android:id="@+id/message_photo"
-        android:layout_width="36dp"
-        android:layout_height="38dp"
-        android:paddingTop="2dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:layout_marginRight="@dimen/message_profile_image_gap"
         android:scaleType="fitXY"
         android:src="@drawable/ic_profile" />
 
@@ -26,14 +24,17 @@
         android:layout_alignParentBottom="true"
         android:layout_toRightOf="@+id/message_photo"
         android:background="@drawable/message_bubble_received"
-        android:minHeight="48dp"
+        android:minHeight="53dp"
+        android:layout_marginTop="-2dp"
+        android:layout_marginRight="-4dp"
         android:longClickable="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
             android:gravity="center_vertical"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="2dp">
 
             <ImageView
                 android:id="@+id/message_image"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 15969d82..96e7808f 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -3,21 +3,21 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="0dp"
-    android:paddingLeft="4dp"
-    android:paddingRight="@dimen/activity_vertical_margin"
-    android:paddingTop="0dp">
+    android:paddingBottom="3dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:paddingTop="3dp">
 
     <ImageView
         android:id="@+id/message_photo"
-        android:layout_width="36dp"
-        android:layout_height="40dp"
-        android:paddingBottom="4dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scaleType="fitXY"
+        android:paddingBottom="3dp"
+        android:src="@drawable/ic_profile"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:layout_marginLeft="@dimen/message_profile_image_gap"
-        android:scaleType="fitXY"
-        android:src="@drawable/ic_profile" />
+        android:layout_alignParentEnd="true"/>
 
     <LinearLayout
         android:id="@+id/message_box"
@@ -26,14 +26,16 @@
         android:layout_alignParentBottom="true"
         android:layout_toLeftOf="@+id/message_photo"
         android:background="@drawable/message_bubble_sent"
-        android:minHeight="48dp"
+        android:minHeight="53dp"
+        android:layout_marginLeft="-4dp"
         android:longClickable="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
             android:gravity="center_vertical"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="2dp">
 
             <ImageView
                 android:id="@+id/message_image"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 99a09527..222e23f5 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -3,15 +3,15 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="2dp"
+    android:paddingBottom="5dp"
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
-    android:paddingTop="2dp" >
+    android:paddingTop="5dp" >
 
     <ImageView
         android:id="@+id/message_photo"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_marginRight="-1.5dp"
-- 
cgit v1.2.3


From 74e05023b4f884b31876357c013513c51aff5369 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 21 Jul 2015 02:21:34 +0200
Subject: very subtle

---
 src/main/res/layout/account_row.xml           | 19 ++++++++++---------
 src/main/res/layout/activity_edit_account.xml | 15 +++++++++------
 src/main/res/layout/activity_muc_details.xml  | 13 +++++++------
 src/main/res/layout/contact.xml               | 15 ++++++++-------
 src/main/res/layout/conversation_list_row.xml | 12 +++++++-----
 src/main/res/layout/message_received.xml      | 20 +++++++++++---------
 src/main/res/layout/message_sent.xml          | 20 +++++++++++---------
 src/main/res/layout/message_status.xml        | 20 +++++++++++---------
 8 files changed, 74 insertions(+), 60 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 077170b2..cac9a9fa 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/activatedBackgroundIndicator"
-    android:paddingLeft="8dp"
-    android:paddingBottom="8dp"
-    android:paddingTop="8dp">
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?android:attr/activatedBackgroundIndicator"
+                android:paddingLeft="8dp"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp">
 
-    <ImageView
+    <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/account_image"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentLeft="true"
         android:src="@drawable/ic_profile"
-        android:contentDescription="@string/account_image_description">
-    </ImageView>
+        android:contentDescription="@string/account_image_description"
+        app:riv_corner_radius="2dp" />
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 53226b82..3dabfc6f 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="@color/grey200" >
+                xmlns:tools="http://schemas.android.com/tools"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/grey200">
 
     <ScrollView
         android:layout_width="fill_parent"
@@ -27,12 +28,14 @@
                 android:background="@drawable/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding">
-                <ImageView android:id="@+id/avater"
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/avater"
                     android:layout_width="72dp"
                     android:layout_height="72dp"
                     android:layout_alignParentTop="true"
                     android:layout_marginRight="16dp"
-                    android:contentDescription="@string/account_image_description"/>
+                    android:contentDescription="@string/account_image_description"
+                    app:riv_corner_radius="2dp"/>
                 <LinearLayout
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index b89c9945..6edbb706 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:background="@color/grey200">
+			xmlns:app="http://schemas.android.com/apk/res-auto"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:background="@color/grey200">
 
 	<LinearLayout
 		android:layout_width="fill_parent"
@@ -35,13 +36,13 @@
 				android:layout_height="wrap_content"
 				android:layout_marginBottom="32dp">
 
-				<ImageView
+				<com.makeramen.roundedimageview.RoundedImageView
 					android:id="@+id/your_photo"
 					android:layout_width="48dp"
 					android:layout_height="48dp"
 					android:layout_alignParentLeft="true"
-					android:src="@drawable/ic_profile">
-				</ImageView>
+					android:src="@drawable/ic_profile"
+					app:riv_corner_radius="2dp" />
 
 				<LinearLayout
 					android:layout_width="fill_parent"
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 3c0c7487..56443c34 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/activatedBackgroundIndicator"
-    android:padding="8dp" >
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?android:attr/activatedBackgroundIndicator"
+                android:padding="8dp">
 
-    <ImageView
+    <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/contact_photo"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentLeft="true"
         android:scaleType="centerCrop"
-        android:src="@drawable/ic_profile" >
-    </ImageView>
+        android:src="@drawable/ic_profile"
+        app:riv_corner_radius="2dp" />
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 28e526e0..15fa60af 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -1,7 +1,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:descendantFocusability="blocksDescendants">
+			 xmlns:app="http://schemas.android.com/apk/res-auto"
+			 android:layout_width="fill_parent"
+			 android:layout_height="wrap_content"
+			 android:descendantFocusability="blocksDescendants">
 
 	<View
 		android:layout_width="fill_parent"
@@ -21,12 +22,13 @@
 		android:orientation="horizontal"
 		android:padding="8dp" >
 
-		<ImageView
+		<com.makeramen.roundedimageview.RoundedImageView
 			android:id="@+id/conversation_image"
 			android:layout_width="56dp"
 			android:layout_height="56dp"
 			android:layout_alignParentLeft="true"
-			android:scaleType="centerCrop" />
+			android:scaleType="centerCrop"
+			app:riv_corner_radius="2dp" />
 
 		<RelativeLayout
 			android:layout_width="fill_parent"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 4de9addd..1919c075 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -1,21 +1,23 @@
 <?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:paddingBottom="3dp"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
-    android:paddingTop="3dp">
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="3dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:paddingTop="3dp">
 
-    <ImageView
+    <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/message_photo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:scaleType="fitXY"
-        android:src="@drawable/ic_profile" />
+        android:src="@drawable/ic_profile"
+        app:riv_corner_radius="2dp" />
 
     <LinearLayout
         android:id="@+id/message_box"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 96e7808f..24750c9b 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -1,14 +1,15 @@
 <?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:paddingBottom="3dp"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
-    android:paddingTop="3dp">
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="3dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:paddingTop="3dp">
 
-    <ImageView
+    <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/message_photo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -17,7 +18,8 @@
         android:src="@drawable/ic_profile"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"/>
+        android:layout_alignParentEnd="true"
+        app:riv_corner_radius="2dp" />
 
     <LinearLayout
         android:id="@+id/message_box"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 222e23f5..ad2579fa 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -1,14 +1,15 @@
 <?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:paddingBottom="5dp"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
-    android:paddingTop="5dp" >
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="5dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:paddingTop="5dp">
 
-    <ImageView
+    <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/message_photo"
         android:layout_width="32dp"
         android:layout_height="32dp"
@@ -17,7 +18,8 @@
         android:layout_marginRight="-1.5dp"
         android:padding="0dp"
         android:scaleType="fitXY"
-        android:src="@drawable/ic_profile" />
+        android:src="@drawable/ic_profile"
+        app:riv_corner_radius="1dp"/>
 
     <TextView
         android:id="@+id/status_message"
-- 
cgit v1.2.3


From c2813cea290b59036bf6d162552e6df3b715ab81 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Wed, 22 Jul 2015 01:00:20 +0200
Subject: Hide regenerate keys button

Can re-enable it via Config.java setting
---
 src/main/res/layout/activity_edit_account.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 3dabfc6f..bbcef140 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -400,7 +400,7 @@
                            android:background="?android:selectableItemBackground"
                            android:padding="@dimen/image_button_padding"
                            android:src="?attr/icon_refresh"
-                           android:visibility="visible"
+                           android:visibility="gone"
                            android:contentDescription="@string/regenerate_axolotl_key"/>
 
                    </LinearLayout>
-- 
cgit v1.2.3


From 2b3bb0226121acb173080e4893421eefef4a9571 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Wed, 29 Jul 2015 20:21:37 +0200
Subject: Highlight selected message's fingerprint in list

---
 src/main/res/layout/contact_key.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 6b86f80a..0f61a15f 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -28,6 +28,7 @@
             android:textColor="@color/black54"
             android:layout_alignParentLeft="true"
             android:layout_below="@+id/key"
+            android:maxLines="1"
             android:textSize="?attr/TextSizeInfo"/>
 
         <TextView
-- 
cgit v1.2.3


From 1ed550b5c54ff873375c30fd94e4f20523f15187 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 30 Jul 2015 12:40:50 +0200
Subject: fixed some colors in message adapter

---
 src/main/res/layout/message_received.xml | 1 -
 src/main/res/layout/message_sent.xml     | 1 -
 2 files changed, 2 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 1919c075..f78b82cb 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -89,7 +89,6 @@
                     android:gravity="center_vertical"
                     android:text="@string/sending"
                     android:textColor="@color/white70"
-                    android:alpha="0.70"
                     android:textSize="?attr/TextSizeInfo" />
             </LinearLayout>
         </LinearLayout>
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 24750c9b..55368929 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -80,7 +80,6 @@
                     android:gravity="center_vertical"
                     android:text="@string/sending"
                     android:textColor="@color/black54"
-                    android:alpha="0.54"
                     android:textSize="?attr/TextSizeInfo" />
 
                 <ImageView
-- 
cgit v1.2.3


From c617cf6ef8ad0b00523a40f886ea64afe47b1712 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 3 Aug 2015 22:58:17 +0200
Subject: added Config.java varibale to lock account creation to specfic domain

---
 src/main/res/layout/activity_edit_account.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index bbcef140..240d7d6e 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -42,6 +42,7 @@
                     android:orientation="vertical"
                     android:layout_toRightOf="@+id/avater">
                 <TextView
+                    android:id="@+id/account_jid_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/account_settings_jabber_id"
-- 
cgit v1.2.3


From e10e9942ded6eac8c7c82244c0209c6d67d17370 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 5 Aug 2015 18:30:49 +0200
Subject: changed text selection color

---
 src/main/res/layout/message_received.xml | 1 +
 src/main/res/layout/message_sent.xml     | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index f78b82cb..76df710b 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -55,6 +55,7 @@
                 android:autoLink="web"
                 android:textColorLink="@color/white"
                 android:textColor="@color/white"
+                android:textColorHighlight="@color/grey800"
                 android:textSize="?attr/TextSizeBody" />
 
             <Button
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 55368929..e3b38cd9 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -56,6 +56,7 @@
                 android:autoLink="web"
                 android:textColorLink="@color/black87"
                 android:textColor="@color/black87"
+                android:textColorHighlight="@color/grey500"
                 android:textSize="?attr/TextSizeBody" />
 
             <Button
-- 
cgit v1.2.3


From 8b9b74ff7ee863160e0cf2827e2a5a431d4fb90f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 8 Aug 2015 13:29:21 +0200
Subject: renamed multi-end / axolotl to OMEMO

---
 src/main/res/layout/activity_edit_account.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 240d7d6e..2fdab08e 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -374,7 +374,7 @@
                            android:layout_height="wrap_content"
                            android:textColor="@color/black54"
                            android:textSize="?attr/TextSizeInfo"
-                           android:text="@string/this_device_axolotl_fingerprint"/>
+                           android:text="@string/this_device_omemo_fingerprint"/>
                    </LinearLayout>
 
                    <LinearLayout
@@ -393,7 +393,7 @@
                            android:padding="@dimen/image_button_padding"
                            android:src="?attr/icon_copy"
                            android:visibility="visible"
-                           android:contentDescription="@string/copy_axolotl_clipboard_description"/>
+                           android:contentDescription="@string/copy_omemo_clipboard_description"/>
                        <ImageButton
                            android:id="@+id/action_regenerate_axolotl_key"
                            android:layout_width="wrap_content"
@@ -402,7 +402,7 @@
                            android:padding="@dimen/image_button_padding"
                            android:src="?attr/icon_refresh"
                            android:visibility="gone"
-                           android:contentDescription="@string/regenerate_axolotl_key"/>
+                           android:contentDescription="@string/regenerate_omemo_key"/>
 
                    </LinearLayout>
                </RelativeLayout>
-- 
cgit v1.2.3


From a6e00837af31a7671013b5fe007008db55b4c84c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 8 Aug 2015 14:09:02 +0200
Subject: decreased right hand side padding in contact keys

---
 src/main/res/layout/contact_key.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 0f61a15f..a4fd29e9 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -8,7 +8,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-        android:padding="8dp" >
+        android:paddingTop="8dp"
+        android:paddingLeft="8dp"
+        android:paddingBottom="8dp">
 
         <TextView
             android:id="@+id/key"
-- 
cgit v1.2.3


From 4539643f27ce38e7de121655effcae4070e25385 Mon Sep 17 00:00:00 2001
From: hlad <hladma@gmail.com>
Date: Fri, 14 Aug 2015 22:24:05 +0200
Subject: show HTTP upload availability on Edit account screen

---
 src/main/res/layout/activity_edit_account.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 2fdab08e..0be934a8 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -303,6 +303,26 @@
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
+                    <TableRow
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content" >
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/server_info_http_upload"
+                            android:textColor="@color/black87"
+                            android:textSize="?attr/TextSizeBody" />
+
+                        <TextView
+                            android:id="@+id/server_info_http_upload"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right"
+                            android:textColor="@color/black87"
+                            android:textSize="?attr/TextSizeBody"
+                            tools:ignore="RtlHardcoded"/>
+                    </TableRow>
                 </TableLayout>
 
                 <RelativeLayout
-- 
cgit v1.2.3


From 45d68c200e8573abf43a6584d045baf4fcafd196 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Sat, 15 Aug 2015 18:52:47 +0200
Subject: Display error message if all contact keys purged

---
 src/main/res/layout/activity_trust_keys.xml | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index c535d51d..6f8a1bc9 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -15,6 +15,38 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
+            <LinearLayout
+                android:id="@+id/key_error_message_card"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:layout_marginRight="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
+                android:background="@drawable/infocard_border"
+                android:orientation="vertical"
+                android:padding="@dimen/infocard_padding"
+                android:visibility="gone">
+
+                <TextView
+                    android:id="@+id/key_error_message_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black87"
+                    android:textSize="?attr/TextSizeHeadline"
+                    android:textStyle="bold"
+                    android:text="@string/error_trustkeys_title"/>
+
+                <TextView
+                    android:id="@+id/key_error_message"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black87"
+                    android:textSize="?attr/TextSizeBody"
+                    android:padding="8dp"/>
+
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/own_keys_card"
                 android:layout_width="fill_parent"
-- 
cgit v1.2.3


From eff9e417e02bef9c4d94b659f7a90f3ff334ce25 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 26 Aug 2015 21:17:29 +0200
Subject: use dedicated colors for primary and primary_dark

---
 src/main/res/layout/conversation_list_row.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 15fa60af..7321b0f6 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -7,7 +7,7 @@
 	<View
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
-		android:background="@color/green500"/>
+		android:background="@color/primary"/>
 
 	<FrameLayout
 		android:id="@+id/swipeable_item"
-- 
cgit v1.2.3


From 403db3b0800ec0dcca5fd1f5c8d94ad1f8ee9e5d Mon Sep 17 00:00:00 2001
From: saqura <saqura@saqura.eu>
Date: Fri, 2 Oct 2015 22:00:11 +0200
Subject: Show whether MAM is supported in MUCs

The conference details in "Advanced Mode" now indicate whether MAM is
supported by the conference server.
---
 src/main/res/layout/activity_muc_details.xml | 31 +++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 6edbb706..1a88424e 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -87,7 +87,7 @@
 				android:id="@+id/muc_conference_type"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-			    android:text="@string/private_conference"
+				android:text="@string/private_conference"
 				android:layout_centerVertical="true"
 				android:textColor="@color/black87"
 				android:textSize="?attr/TextSizeBody"
@@ -107,6 +107,35 @@
 				android:src="?attr/icon_settings"/>
 				</RelativeLayout>
 
+			<TableLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:id="@+id/muc_info_more"
+				android:stretchColumns="1"
+				android:visibility="gone">
+
+				<TableRow
+					android:layout_width="fill_parent"
+					android:layout_height="match_parent">
+
+					<TextView
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:text="@string/server_info_mam"
+						android:textColor="@color/black87"
+						android:textSize="?attr/TextSizeBody" />
+
+					<TextView
+						android:id="@+id/muc_info_mam"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="right"
+						android:textColor="@color/black87"
+						android:textSize="?attr/TextSizeBody" />
+				</TableRow>
+
+			</TableLayout>
+
 			<TextView
 				android:id="@+id/details_account"
 				android:layout_width="wrap_content"
-- 
cgit v1.2.3


From 48f172fc9e9a464ee220afd2a82b719ec5b984e9 Mon Sep 17 00:00:00 2001
From: saqura <saqura@saqura.eu>
Date: Mon, 26 Oct 2015 00:59:32 +0100
Subject: Reset the margins manually after rotating

---
 src/main/res/layout/activity_contact_details.xml | 1 +
 src/main/res/layout/activity_edit_account.xml    | 1 +
 src/main/res/layout/activity_muc_details.xml     | 1 +
 3 files changed, 3 insertions(+)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 5f6a2dd0..c35f26bb 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -5,6 +5,7 @@
     android:background="@color/grey200" >
 
     <LinearLayout
+        android:id="@+id/details_main_layout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical" >
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 0be934a8..8d60f5f1 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -13,6 +13,7 @@
         android:layout_alignParentTop="true" >
 
         <LinearLayout
+            android:id="@+id/account_main_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical" >
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 1a88424e..5f9424a9 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -6,6 +6,7 @@
 			android:background="@color/grey200">
 
 	<LinearLayout
+		android:id="@+id/muc_main_layout"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical">
-- 
cgit v1.2.3


From a7fd629c051a3ba0031fba4e358ba4f3b843283d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 28 Oct 2015 22:40:09 +0100
Subject: show encryption type in warned/red messages

---
 src/main/res/layout/message_received.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 76df710b..b6a29e86 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -72,6 +72,17 @@
                 android:orientation="horizontal"
                 android:paddingBottom="2dp">
 
+                <TextView
+                    android:id="@+id/message_encryption"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:layout_marginRight="4sp"
+                    android:textColor="@color/white70"
+                    android:textStyle="bold"
+                    android:textSize="?attr/TextSizeInfo" />
+
                 <ImageView
                     android:id="@+id/security_indicator"
                     android:layout_width="?attr/TextSizeInfo"
-- 
cgit v1.2.3


From 1221cff561eb2ca321f96c7510e01f9218634bd6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 29 Oct 2015 12:08:15 +0100
Subject: load avatars in message adapter in background task

---
 src/main/res/layout/message_received.xml | 4 ++--
 src/main/res/layout/message_sent.xml     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index b6a29e86..a998bf37 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -11,8 +11,8 @@
 
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/message_photo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:scaleType="fitXY"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index e3b38cd9..55f874e6 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -11,8 +11,8 @@
 
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/message_photo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:scaleType="fitXY"
         android:paddingBottom="3dp"
         android:src="@drawable/ic_profile"
-- 
cgit v1.2.3


From f0b1761ec3826b72fe3b20032b532dc5b1adfc1c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 28 Nov 2015 20:11:38 +0100
Subject: initial tor support

---
 src/main/res/layout/activity_edit_account.xml | 54 ++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 8d60f5f1..73395bba 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -78,7 +78,59 @@
                     android:textColorHint="@color/black54"
                     android:textSize="?attr/TextSizeBody" />
 
-                <CheckBox
+                    <LinearLayout
+                        android:id="@+id/name_port"
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:weightSum="1">
+                        <LinearLayout
+                            android:orientation="vertical"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="0.8">
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/account_settings_hostname"
+                                android:textColor="@color/black87"
+                                android:textSize="?attr/TextSizeBody"
+                                android:id="@+id/textView"/>
+                            <EditText
+                                android:layout_width="fill_parent"
+                                android:layout_height="wrap_content"
+                                android:textColor="@color/black87"
+                                android:textColorHint="@color/black54"
+                                android:textSize="?attr/TextSizeBody"
+                                android:id="@+id/hostname"
+                                android:inputType="textNoSuggestions"
+                                android:hint="@string/hostname_or_onion"/>
+                        </LinearLayout>
+                        <LinearLayout
+                            android:orientation="vertical"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="0.2"
+                            >
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/account_settings_port"
+                                android:textColor="@color/black87"
+                                android:textSize="?attr/TextSizeBody"/>
+                            <EditText
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:inputType="number"
+                                android:maxLength="5"
+                                android:textColor="@color/black87"
+                                android:textColorHint="@color/black54"
+                                android:textSize="?attr/TextSizeBody"
+                                android:id="@+id/port"/>
+                        </LinearLayout>
+                    </LinearLayout>
+                    <CheckBox
                     android:id="@+id/account_register_new"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-- 
cgit v1.2.3


From f46cbb38a92ff5281a974ecc0932ba5459c7334e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 23 Dec 2015 19:18:53 +0100
Subject: show certificate information

---
 src/main/res/layout/certificate_information.xml | 88 +++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 src/main/res/layout/certificate_information.xml

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/certificate_information.xml b/src/main/res/layout/certificate_information.xml
new file mode 100644
index 00000000..4c085459
--- /dev/null
+++ b/src/main/res/layout/certificate_information.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+    android:padding="16dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/certificate_subject"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeHeadline"/>
+    <TextView
+        android:layout_marginTop="8dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/certificate_cn"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeBody"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/subject_cn"
+        android:textColor="@color/black54"
+        android:textSize="?attr/TextSizeBody"/>
+    <TextView
+        android:layout_marginTop="8dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/certificate_o"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeBody"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/subject_o"
+        android:textColor="@color/black54"
+        android:textSize="?attr/TextSizeBody"/>
+    <TextView
+        android:layout_marginTop="16dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/certificate_issuer"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeHeadline"/>
+    <TextView
+        android:layout_marginTop="8dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/certificate_cn"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeBody"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/issuer_cn"
+        android:textColor="@color/black54"
+        android:textSize="?attr/TextSizeBody"/>
+    <TextView
+        android:layout_marginTop="8dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/certificate_o"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeBody"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/issuer_o"
+        android:textColor="@color/black54"
+        android:textSize="?attr/TextSizeBody"/>
+    <TextView
+        android:layout_marginTop="16dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/certificate_sha1"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeBody"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/sha1"
+        android:textColor="@color/black54"
+        android:textSize="?attr/TextSizeBody"
+        android:typeface="monospace"
+        android:fontFamily="monospace"/>
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From f815a7cd2619f35ed47560c99cc299653f167cb0 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 4 Jan 2016 15:17:02 +0100
Subject: properly rotate avatars

---
 src/main/res/layout/activity_publish_profile_picture.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 3b249a66..8c7c359b 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -16,8 +16,8 @@
 
         <ImageView
             android:id="@+id/account_image"
-            android:layout_width="194dp"
-            android:layout_height="194dp" />
+            android:layout_width="192dp"
+            android:layout_height="192dp" />
     </LinearLayout>
 
     <TextView
-- 
cgit v1.2.3


From 501034fe0eb267f5100f4dd799fb1454fe7ba1a4 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 4 Jan 2016 17:27:51 +0100
Subject: Allow entering a JID from 'choose contact'. thanks @singpolyma fixes
 #1611 fixes #1602

---
 src/main/res/layout/create_contact_dialog.xml | 39 ---------------------------
 src/main/res/layout/enter_jid_dialog.xml      | 39 +++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 src/main/res/layout/create_contact_dialog.xml
 create mode 100644 src/main/res/layout/enter_jid_dialog.xml

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/create_contact_dialog.xml b/src/main/res/layout/create_contact_dialog.xml
deleted file mode 100644
index 6333e340..00000000
--- a/src/main/res/layout/create_contact_dialog.xml
+++ /dev/null
@@ -1,39 +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/your_account"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/your_account"
-        android:textColor="@color/black87"
-        android:textSize="?attr/TextSizeBody" />
-
-    <Spinner
-        android:id="@+id/account"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:id="@+id/jabber_id"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="@string/account_settings_jabber_id"
-        android:textColor="@color/black87"
-        android:textSize="?attr/TextSizeBody" />
-
-    <AutoCompleteTextView
-        android:id="@+id/jid"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/account_settings_example_jabber_id"
-        android:inputType="textEmailAddress"
-        android:textColor="@color/black87"
-        android:textColorHint="@color/black54" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
new file mode 100644
index 00000000..6333e340
--- /dev/null
+++ b/src/main/res/layout/enter_jid_dialog.xml
@@ -0,0 +1,39 @@
+<?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:text="@string/your_account"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeBody" />
+
+    <Spinner
+        android:id="@+id/account"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/jabber_id"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/account_settings_jabber_id"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeBody" />
+
+    <AutoCompleteTextView
+        android:id="@+id/jid"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/account_settings_example_jabber_id"
+        android:inputType="textEmailAddress"
+        android:textColor="@color/black87"
+        android:textColorHint="@color/black54" />
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 0bb3ae37f0762ad264a4b98b3ebc4753017441af Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 8 Jan 2016 14:41:55 +0100
Subject: show icon in conversations overview when notifications are disabled

---
 src/main/res/layout/conversation_list_row.xml | 173 +++++++++++++++-----------
 1 file changed, 97 insertions(+), 76 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 7321b0f6..984073b3 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -1,88 +1,109 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			 xmlns:app="http://schemas.android.com/apk/res-auto"
-			 android:layout_width="fill_parent"
-			 android:layout_height="wrap_content"
-			 android:descendantFocusability="blocksDescendants">
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:layout_width="fill_parent"
+             android:layout_height="wrap_content"
+             android:descendantFocusability="blocksDescendants">
 
-	<View
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:background="@color/primary"/>
+    <View
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/primary"/>
 
-	<FrameLayout
-		android:id="@+id/swipeable_item"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:background="@color/grey50">
+    <FrameLayout
+        android:id="@+id/swipeable_item"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/grey50">
 
-	<RelativeLayout
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:background="?android:selectableItemBackground"
-		android:orientation="horizontal"
-		android:padding="8dp" >
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="?android:selectableItemBackground"
+            android:orientation="horizontal"
+            android:padding="8dp">
 
-		<com.makeramen.roundedimageview.RoundedImageView
-			android:id="@+id/conversation_image"
-			android:layout_width="56dp"
-			android:layout_height="56dp"
-			android:layout_alignParentLeft="true"
-			android:scaleType="centerCrop"
-			app:riv_corner_radius="2dp" />
+            <com.makeramen.roundedimageview.RoundedImageView
+                android:id="@+id/conversation_image"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:layout_alignParentLeft="true"
+                android:scaleType="centerCrop"
+                app:riv_corner_radius="2dp"/>
 
-		<RelativeLayout
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_centerVertical="true"
-			android:layout_toRightOf="@+id/conversation_image"
-			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:textColor="@color/black87"
-				android:textSize="?attr/TextSizeHeadline"
-				android:typeface="sans" />
+                <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:paddingRight="4dp"
+                    android:singleLine="true"
+                    android:text="Awesome groupchat"
+                    android:textColor="@color/black87"
+                    android:textSize="?attr/TextSizeHeadline"
+                    android:typeface="sans"/>
 
-			<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" >
+                <RelativeLayout
+                    android:id="@+id/conversation_lastwrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/conversation_name"
+                    android:layout_marginTop="4dp">
 
-				<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/black87"
-					android:textSize="?attr/TextSizeBody" />
+                    <LinearLayout android:layout_width="match_parent"
+                                  android:layout_height="wrap_content"
+                                  android:layout_alignParentLeft="true"
+                                  android:layout_centerVertical="true"
+                                  android:layout_toLeftOf="@+id/notification_status"
+                                  android:orientation="vertical">
+                        <TextView
+                            android:id="@+id/conversation_lastmsg"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:scrollHorizontally="false"
+                            android:singleLine="true"
+                            android:text="This is a placeholder text to show the last messages"
+                            android:textColor="@color/black87"
+                            android:textSize="?attr/TextSizeBody"/>
 
-				<ImageView
-					android:id="@+id/conversation_lastimage"
-					android:layout_width="fill_parent"
-					android:layout_height="36dp"
-					android:background="@color/black87"
-					android:scaleType="centerCrop" />
-			</LinearLayout>
+                        <com.makeramen.roundedimageview.RoundedImageView
+                            android:id="@+id/conversation_lastimage"
+                            android:layout_width="fill_parent"
+                            android:layout_height="36dp"
+                            android:background="@color/black87"
+                            android:scaleType="centerCrop"
+                            android:visibility="gone"
+                            app:riv_corner_radius="2dp"/>
+                    </LinearLayout>
+                    <ImageView
+                        android:id="@+id/notification_status"
+                        android:layout_width="16sp"
+                        android:layout_height="16sp"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="4dp"
+                        android:src="@drawable/ic_notifications_grey600_24dp"
+                        />
+                </RelativeLayout>
 
-			<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/black54"
-				android:textSize="?attr/TextSizeInfo" />
-		</RelativeLayout>
-	</RelativeLayout>
-	</FrameLayout>
+                <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:text="23:42"
+                    android:textColor="@color/black54"
+                    android:textSize="?attr/TextSizeInfo"/>
+            </RelativeLayout>
+        </RelativeLayout>
+    </FrameLayout>
 </FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From a3e136b5504641f9782b9d94e35311dad19fbc1d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 8 Jan 2016 21:30:46 +0100
Subject: show per conference notification settings in details activity

---
 src/main/res/layout/activity_muc_details.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 5f9424a9..e7b11d9f 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -108,6 +108,33 @@
 				android:src="?attr/icon_settings"/>
 				</RelativeLayout>
 
+			<RelativeLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content">
+				<TextView
+					android:id="@+id/notification_status_text"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/notify_on_all_messages"
+					android:layout_centerVertical="true"
+					android:textColor="@color/black87"
+					android:textSize="?attr/TextSizeBody"
+					android:layout_alignParentLeft="true"
+					android:layout_toLeftOf="@+id/notification_status_button"
+					/>
+				<ImageButton
+					android:id="@+id/notification_status_button"
+					style="?android:attr/buttonStyleSmall"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_horizontal"
+					android:layout_alignParentRight="true"
+					android:layout_centerVertical="true"
+					android:background="?android:selectableItemBackground"
+					android:padding="@dimen/image_button_padding"
+					android:src="@drawable/ic_notifications_grey600_24dp"/>
+			</RelativeLayout>
+
 			<TableLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-- 
cgit v1.2.3


From c296d6f4466e2616432660bb01465f3746e1bb65 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 11 Jan 2016 11:17:45 +0100
Subject: ask to be excluded from battery optimization

---
 src/main/res/layout/activity_edit_account.xml | 381 ++++++++++++++------------
 1 file changed, 212 insertions(+), 169 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 73395bba..ed935819 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@color/grey200">
@@ -10,22 +10,22 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_above="@+id/button_bar"
-        android:layout_alignParentTop="true" >
+        android:layout_alignParentTop="true">
 
         <LinearLayout
             android:id="@+id/account_main_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <RelativeLayout
                 android:id="@+id/editor"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:background="@drawable/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding">
@@ -40,78 +40,78 @@
                 <LinearLayout
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_toRightOf="@+id/avater">
-                <TextView
-                    android:id="@+id/account_jid_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/account_settings_jabber_id"
-                    android:textColor="@color/black87"
-                    android:textSize="?attr/TextSizeBody" />
+                    android:layout_toRightOf="@+id/avater"
+                    android:orientation="vertical">
+                    <TextView
+                        android:id="@+id/account_jid_label"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/account_settings_jabber_id"
+                        android:textColor="@color/black87"
+                        android:textSize="?attr/TextSizeBody"/>
 
-                <AutoCompleteTextView
-                    android:id="@+id/account_jid"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/account_settings_example_jabber_id"
-                    android:inputType="textEmailAddress"
-                    android:textColor="@color/black87"
-                    android:textColorHint="@color/black54"
-                    android:textSize="?attr/TextSizeBody" />
+                    <AutoCompleteTextView
+                        android:id="@+id/account_jid"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/account_settings_example_jabber_id"
+                        android:inputType="textEmailAddress"
+                        android:textColor="@color/black87"
+                        android:textColorHint="@color/black54"
+                        android:textSize="?attr/TextSizeBody"/>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:text="@string/account_settings_password"
-                    android:textColor="@color/black87"
-                    android:textSize="?attr/TextSizeBody" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:text="@string/account_settings_password"
+                        android:textColor="@color/black87"
+                        android:textSize="?attr/TextSizeBody"/>
 
-                <EditText
-                    android:id="@+id/account_password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/password"
-                    android:inputType="textPassword"
-                    android:textColor="@color/black87"
-                    android:textColorHint="@color/black54"
-                    android:textSize="?attr/TextSizeBody" />
+                    <EditText
+                        android:id="@+id/account_password"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/password"
+                        android:inputType="textPassword"
+                        android:textColor="@color/black87"
+                        android:textColorHint="@color/black54"
+                        android:textSize="?attr/TextSizeBody"/>
 
                     <LinearLayout
                         android:id="@+id/name_port"
-                        android:layout_marginTop="8dp"
-                        android:orientation="horizontal"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal"
                         android:weightSum="1">
                         <LinearLayout
-                            android:orientation="vertical"
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
-                            android:layout_weight="0.8">
+                            android:layout_weight="0.8"
+                            android:orientation="vertical">
                             <TextView
+                                android:id="@+id/textView"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/account_settings_hostname"
                                 android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody"
-                                android:id="@+id/textView"/>
+                                android:textSize="?attr/TextSizeBody"/>
                             <EditText
+                                android:id="@+id/hostname"
                                 android:layout_width="fill_parent"
                                 android:layout_height="wrap_content"
+                                android:hint="@string/hostname_or_onion"
+                                android:inputType="textNoSuggestions"
                                 android:textColor="@color/black87"
                                 android:textColorHint="@color/black54"
-                                android:textSize="?attr/TextSizeBody"
-                                android:id="@+id/hostname"
-                                android:inputType="textNoSuggestions"
-                                android:hint="@string/hostname_or_onion"/>
+                                android:textSize="?attr/TextSizeBody"/>
                         </LinearLayout>
                         <LinearLayout
-                            android:orientation="vertical"
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_weight="0.2"
+                            android:orientation="vertical"
                             >
                             <TextView
                                 android:layout_width="wrap_content"
@@ -120,65 +120,108 @@
                                 android:textColor="@color/black87"
                                 android:textSize="?attr/TextSizeBody"/>
                             <EditText
+                                android:id="@+id/port"
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
                                 android:inputType="number"
                                 android:maxLength="5"
                                 android:textColor="@color/black87"
                                 android:textColorHint="@color/black54"
-                                android:textSize="?attr/TextSizeBody"
-                                android:id="@+id/port"/>
+                                android:textSize="?attr/TextSizeBody"/>
                         </LinearLayout>
                     </LinearLayout>
                     <CheckBox
-                    android:id="@+id/account_register_new"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:text="@string/register_account"
-                    android:textColor="@color/black87"
-                    android:textSize="?attr/TextSizeBody" />
+                        android:id="@+id/account_register_new"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:text="@string/register_account"
+                        android:textColor="@color/black87"
+                        android:textSize="?attr/TextSizeBody"/>
 
+                    <TextView
+                        android:id="@+id/account_confirm_password_desc"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/account_settings_confirm_password"
+                        android:textColor="@color/black87"
+                        android:textSize="?attr/TextSizeBody"
+                        android:visibility="gone"/>
+
+                    <EditText
+                        android:id="@+id/account_password_confirm"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:hint="@string/confirm_password"
+                        android:inputType="textPassword"
+                        android:textColor="@color/black87"
+                        android:textColorHint="@color/black54"
+                        android:textSize="?attr/TextSizeBody"
+                        android:visibility="gone"/>
+                </LinearLayout>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/battery_optimization"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:layout_marginRight="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:background="@drawable/infocard_border"
+                android:orientation="vertical"
+                android:padding="@dimen/infocard_padding"
+                android:visibility="gone">
                 <TextView
-                    android:id="@+id/account_confirm_password_desc"
+                    android:id="@+id/batt_op_headline"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/account_settings_confirm_password"
+                    android:text="@string/battery_optimizations_enabled"
                     android:textColor="@color/black87"
-                    android:textSize="?attr/TextSizeBody"
-                    android:visibility="gone" />
-
-                <EditText
-                    android:id="@+id/account_password_confirm"
-                    android:layout_width="match_parent"
+                    android:textSize="?attr/TextSizeHeadline"
+                    android:textStyle="bold"/>
+                <TextView
+                    android:id="@+id/batt_op_body"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_below="@+id/batt_op_headline"
+                    android:layout_marginBottom="8dp"
                     android:layout_marginTop="8dp"
-                    android:hint="@string/confirm_password"
-                    android:inputType="textPassword"
-                    android:visibility="gone"
+                    android:text="@string/battery_optimizations_enabled_explained"
                     android:textColor="@color/black87"
-                    android:textColorHint="@color/black54"
-                    android:textSize="?attr/TextSizeBody" />
-                </LinearLayout>
+                    android:textSize="?attr/TextSizeBody"/>
+                <Button
+                    android:id="@+id/batt_op_disable"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_marginRight="-8dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true" android:layout_below="@+id/batt_op_body"
+                    android:text="@string/disable" android:textColor="@color/accent"/>
             </RelativeLayout>
 
-           <LinearLayout
+
+            <LinearLayout
                 android:id="@+id/stats"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:background="@drawable/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding"
-                android:visibility="gone" >
+                android:visibility="gone">
 
                 <TableLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:stretchColumns="1" >
+                    android:stretchColumns="1">
 
                     <TableRow
                         android:layout_width="fill_parent"
@@ -190,7 +233,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_session_established"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/session_est"
@@ -208,18 +251,18 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:stretchColumns="1"
-                    android:visibility="gone" >
+                    android:visibility="gone">
 
                     <TableRow
                         android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
+                        android:layout_height="wrap_content">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_pep"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_pep"
@@ -233,14 +276,14 @@
 
                     <TableRow
                         android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
+                        android:layout_height="wrap_content">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_blocking"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_blocking"
@@ -254,14 +297,14 @@
 
                     <TableRow
                         android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
+                        android:layout_height="wrap_content">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_stream_management"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_sm"
@@ -275,14 +318,14 @@
 
                     <TableRow
                         android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
+                        android:layout_height="wrap_content">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_roster_version"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_roster_version"
@@ -296,14 +339,14 @@
 
                     <TableRow
                         android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
+                        android:layout_height="wrap_content">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_carbon_messages"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_carbons"
@@ -317,14 +360,14 @@
 
                     <TableRow
                         android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
+                        android:layout_height="wrap_content">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_mam"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_mam"
@@ -338,14 +381,14 @@
 
                     <TableRow
                         android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
+                        android:layout_height="wrap_content">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_csi"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_csi"
@@ -358,14 +401,14 @@
                     </TableRow>
                     <TableRow
                         android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
+                        android:layout_height="wrap_content">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_http_upload"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_http_upload"
@@ -379,9 +422,9 @@
                 </TableLayout>
 
                 <RelativeLayout
+                    android:id="@+id/otr_fingerprint_box"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:id="@+id/otr_fingerprint_box"
                     android:layout_marginTop="32dp">
 
                     <LinearLayout
@@ -395,17 +438,17 @@
                             android:id="@+id/otr_fingerprint"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:fontFamily="monospace"
                             android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
-                            android:typeface="monospace"
-                            android:fontFamily="monospace"/>
+                            android:typeface="monospace"/>
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:text="@string/otr_fingerprint"
                             android:textColor="@color/black54"
-                            android:textSize="?attr/TextSizeInfo"
-                            android:text="@string/otr_fingerprint"/>
+                            android:textSize="?attr/TextSizeInfo"/>
                     </LinearLayout>
 
                     <ImageButton
@@ -415,79 +458,79 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:background="?android:selectableItemBackground"
+                        android:contentDescription="@string/copy_otr_clipboard_description"
                         android:padding="@dimen/image_button_padding"
                         android:src="?attr/icon_copy"
-                        android:visibility="visible"
-                        android:contentDescription="@string/copy_otr_clipboard_description"/>
+                        android:visibility="visible"/>
+                </RelativeLayout>
+                <RelativeLayout
+                    android:id="@+id/axolotl_fingerprint_box"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="32dp">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_toLeftOf="@+id/axolotl_actions"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/axolotl_fingerprint"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="monospace"
+                            android:textColor="@color/black87"
+                            android:textSize="?attr/TextSizeBody"
+                            android:typeface="monospace"/>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/this_device_omemo_fingerprint"
+                            android:textColor="@color/black54"
+                            android:textSize="?attr/TextSizeInfo"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/axolotl_actions"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:orientation="vertical">
+
+                        <ImageButton
+                            android:id="@+id/action_copy_axolotl_to_clipboard"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="?android:selectableItemBackground"
+                            android:contentDescription="@string/copy_omemo_clipboard_description"
+                            android:padding="@dimen/image_button_padding"
+                            android:src="?attr/icon_copy"
+                            android:visibility="visible"/>
+                        <ImageButton
+                            android:id="@+id/action_regenerate_axolotl_key"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="?android:selectableItemBackground"
+                            android:contentDescription="@string/regenerate_omemo_key"
+                            android:padding="@dimen/image_button_padding"
+                            android:src="?attr/icon_refresh"
+                            android:visibility="gone"/>
+
+                    </LinearLayout>
                 </RelativeLayout>
-               <RelativeLayout
-                   android:layout_width="wrap_content"
-                   android:layout_height="match_parent"
-                   android:id="@+id/axolotl_fingerprint_box"
-                   android:layout_marginTop="32dp">
-
-                   <LinearLayout
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_alignParentLeft="true"
-                       android:layout_toLeftOf="@+id/axolotl_actions"
-                       android:orientation="vertical">
-
-                       <TextView
-                           android:id="@+id/axolotl_fingerprint"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:textColor="@color/black87"
-                           android:textSize="?attr/TextSizeBody"
-                           android:typeface="monospace"
-                           android:fontFamily="monospace"/>
-
-                       <TextView
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:textColor="@color/black54"
-                           android:textSize="?attr/TextSizeInfo"
-                           android:text="@string/this_device_omemo_fingerprint"/>
-                   </LinearLayout>
-
-                   <LinearLayout
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:id="@+id/axolotl_actions"
-                       android:layout_centerVertical="true"
-                       android:layout_alignParentRight="true"
-                       android:orientation="vertical">
-
-                       <ImageButton
-                           android:id="@+id/action_copy_axolotl_to_clipboard"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:background="?android:selectableItemBackground"
-                           android:padding="@dimen/image_button_padding"
-                           android:src="?attr/icon_copy"
-                           android:visibility="visible"
-                           android:contentDescription="@string/copy_omemo_clipboard_description"/>
-                       <ImageButton
-                           android:id="@+id/action_regenerate_axolotl_key"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:background="?android:selectableItemBackground"
-                           android:padding="@dimen/image_button_padding"
-                           android:src="?attr/icon_refresh"
-                           android:visibility="gone"
-                           android:contentDescription="@string/regenerate_omemo_key"/>
-
-                   </LinearLayout>
-               </RelativeLayout>
             </LinearLayout>
             <LinearLayout
                 android:id="@+id/other_device_keys_card"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:background="@drawable/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding"
@@ -497,10 +540,10 @@
                     android:id="@+id/other_device_keys_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:text="@string/other_devices"
                     android:textColor="@color/black87"
                     android:textSize="?attr/TextSizeHeadline"
-                    android:textStyle="bold"
-                    android:text="@string/other_devices"/>
+                    android:textStyle="bold"/>
 
                 <LinearLayout
                     android:id="@+id/other_device_keys"
@@ -508,7 +551,7 @@
                     android:layout_height="wrap_content"
                     android:divider="?android:dividerHorizontal"
                     android:orientation="vertical"
-                    android:showDividers="middle" >
+                    android:showDividers="middle">
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
@@ -519,10 +562,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentStart="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true" >
+        android:layout_alignParentRight="true"
+        android:layout_alignParentStart="true">
 
         <Button
             android:id="@+id/cancel_button"
@@ -531,14 +574,14 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/cancel"
-            android:textColor="@color/black87" />
+            android:textColor="@color/black87"/>
 
         <View
             android:layout_width="1dp"
             android:layout_height="fill_parent"
             android:layout_marginBottom="7dp"
             android:layout_marginTop="7dp"
-            android:background="@color/black12" />
+            android:background="@color/black12"/>
 
         <Button
             android:id="@+id/save_button"
@@ -548,7 +591,7 @@
             android:layout_weight="1"
             android:enabled="false"
             android:text="@string/save"
-            android:textColor="@color/black54" />
+            android:textColor="@color/black54"/>
     </LinearLayout>
 
 </RelativeLayout>
-- 
cgit v1.2.3


From 921d567dcbbf55fed97aa1c69c81316f0abde0f1 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 12 Jan 2016 15:35:23 +0100
Subject: use match_parent as height in conversations overview

---
 src/main/res/layout/conversation_list_row.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 984073b3..cd3f9266 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -6,13 +6,13 @@
 
     <View
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:background="@color/primary"/>
 
     <FrameLayout
         android:id="@+id/swipeable_item"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="wrap_content"
         android:background="@color/grey50">
 
         <RelativeLayout
-- 
cgit v1.2.3


From 3ff40a973377aca99ab8978f5517f92a123112cd Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 21 Jan 2016 18:10:19 +0100
Subject: increased padding in create contact/conference dialog

---
 src/main/res/layout/enter_jid_dialog.xml       | 21 ++++++++++++---------
 src/main/res/layout/join_conference_dialog.xml | 15 +++++++++------
 2 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
index 6333e340..1e715ce4 100644
--- a/src/main/res/layout/enter_jid_dialog.xml
+++ b/src/main/res/layout/enter_jid_dialog.xml
@@ -1,9 +1,12 @@
 <?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" >
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:paddingBottom="8dp"
+              android:paddingLeft="24dp"
+              android:paddingRight="24dp"
+              android:paddingTop="16dp">
 
     <TextView
         android:id="@+id/your_account"
@@ -11,21 +14,21 @@
         android:layout_height="wrap_content"
         android:text="@string/your_account"
         android:textColor="@color/black87"
-        android:textSize="?attr/TextSizeBody" />
+        android:textSize="?attr/TextSizeBody"/>
 
     <Spinner
         android:id="@+id/account"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"/>
 
     <TextView
         android:id="@+id/jabber_id"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="16dp"
         android:text="@string/account_settings_jabber_id"
         android:textColor="@color/black87"
-        android:textSize="?attr/TextSizeBody" />
+        android:textSize="?attr/TextSizeBody"/>
 
     <AutoCompleteTextView
         android:id="@+id/jid"
@@ -34,6 +37,6 @@
         android:hint="@string/account_settings_example_jabber_id"
         android:inputType="textEmailAddress"
         android:textColor="@color/black87"
-        android:textColorHint="@color/black54" />
+        android:textColorHint="@color/black54"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
index 7609dd0d..4be88872 100644
--- a/src/main/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/join_conference_dialog.xml
@@ -1,9 +1,12 @@
 <?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" >
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:paddingBottom="8dp"
+              android:paddingLeft="24dp"
+              android:paddingRight="24dp"
+              android:paddingTop="16dp">
 
     <TextView
         android:id="@+id/your_account"
@@ -22,7 +25,7 @@
         android:id="@+id/jabber_id"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="16dp"
         android:text="@string/conference_address"
         android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody" />
@@ -40,7 +43,7 @@
         android:id="@+id/bookmark"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="16dp"
         android:checked="true"
         android:text="@string/save_as_bookmark" />
 
-- 
cgit v1.2.3


From 77c0fb0b2ae257b7bf257417ed689f2334507f2c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 22 Jan 2016 11:14:56 +0100
Subject: changed spacing in create dialogs and notify user when no accounts
 are activated

---
 src/main/res/layout/enter_jid_dialog.xml       |  5 +++--
 src/main/res/layout/join_conference_dialog.xml | 11 +++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
index 1e715ce4..d4af0dfc 100644
--- a/src/main/res/layout/enter_jid_dialog.xml
+++ b/src/main/res/layout/enter_jid_dialog.xml
@@ -25,7 +25,7 @@
         android:id="@+id/jabber_id"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
         android:text="@string/account_settings_jabber_id"
         android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody"/>
@@ -37,6 +37,7 @@
         android:hint="@string/account_settings_example_jabber_id"
         android:inputType="textEmailAddress"
         android:textColor="@color/black87"
-        android:textColorHint="@color/black54"/>
+        android:textColorHint="@color/black54"
+        android:textSize="?attr/TextSizeBody" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
index 4be88872..f7aa3c46 100644
--- a/src/main/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/join_conference_dialog.xml
@@ -25,7 +25,7 @@
         android:id="@+id/jabber_id"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
         android:text="@string/conference_address"
         android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody" />
@@ -37,14 +37,17 @@
         android:hint="@string/conference_address_example"
         android:inputType="textEmailAddress"
         android:textColor="@color/black87"
-        android:textColorHint="@color/black54" />
+        android:textColorHint="@color/black54"
+        android:textSize="?attr/TextSizeBody"/>
 
     <CheckBox
         android:id="@+id/bookmark"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
         android:checked="true"
-        android:text="@string/save_as_bookmark" />
+        android:text="@string/save_as_bookmark"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeBody"/>
 
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From a6c5430cdd400389a311ea9c2ab8a6fabc2f72c5 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 22 Jan 2016 20:22:47 +0100
Subject: added UI wrapper for (some) form fields

---
 src/main/res/layout/form_text.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 src/main/res/layout/form_text.xml

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/form_text.xml b/src/main/res/layout/form_text.xml
new file mode 100644
index 00000000..e36ac74e
--- /dev/null
+++ b/src/main/res/layout/form_text.xml
@@ -0,0 +1,21 @@
+<?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">
+    <TextView
+        android:id="@+id/label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeBody"/>
+
+    <EditText
+        android:id="@+id/field"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/black87"
+        android:textColorHint="@color/black54"
+        android:textSize="?attr/TextSizeBody"/>
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 0569a1e7698141262e3f8443be26b5cb053954b8 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 23 Jan 2016 16:23:23 +0100
Subject: introduced boolean form field wrapper

---
 src/main/res/layout/form_boolean.xml | 13 +++++++++++++
 src/main/res/layout/form_text.xml    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 src/main/res/layout/form_boolean.xml

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/form_boolean.xml b/src/main/res/layout/form_boolean.xml
new file mode 100644
index 00000000..fd553acb
--- /dev/null
+++ b/src/main/res/layout/form_boolean.xml
@@ -0,0 +1,13 @@
+<?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:paddingTop="8dp"
+              android:orientation="vertical">
+    <CheckBox
+        android:id="@+id/field"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeBody"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/form_text.xml b/src/main/res/layout/form_text.xml
index e36ac74e..31b521e8 100644
--- a/src/main/res/layout/form_text.xml
+++ b/src/main/res/layout/form_text.xml
@@ -2,12 +2,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
+              android:paddingTop="8dp"
               android:orientation="vertical">
     <TextView
         android:id="@+id/label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
         android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody"/>
 
-- 
cgit v1.2.3


From 4fdb0d92fe854126ad5201d56752716b9ab581b2 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 4 Feb 2016 14:39:16 +0100
Subject: prevent previoulsly cleared messages from reloading. fixes #1110

---
 src/main/res/layout/message_status.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index ad2579fa..93a80d84 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -9,6 +9,15 @@
                 android:paddingRight="8dp"
                 android:paddingTop="5dp">
 
+    <Button
+        android:id="@+id/load_more_messages"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/load_more_messages"
+        android:textColor="@color/accent" android:layout_centerVertical="true"
+        android:layout_centerHorizontal="true"/>
+
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/message_photo"
         android:layout_width="32dp"
-- 
cgit v1.2.3


From 73084c9cd30dacb6228a0851efa928aaeabcb229 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Thu, 11 Feb 2016 21:20:51 +0100
Subject: Fixed XML errors after merge

---
 src/main/res/layout/conversation_list_row.xml | 4 ++--
 src/main/res/layout/message_received.xml      | 6 +++---
 src/main/res/layout/message_sent.xml          | 7 ++++---
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index cde94087..9f040676 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -1,6 +1,6 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:emojicon="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
@@ -88,7 +88,7 @@
                             android:text="This is a placeholder text to show the last messages"
 					android:textColor="@color/primaryText"
 					android:textSize="?attr/TextSizeBody"
-					emojicon:emojiconSize="20sp" />
+					app:emojiconSize="20sp" />
 
                         <com.makeramen.roundedimageview.RoundedImageView
                             android:id="@+id/conversation_lastimage"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 389b0f48..b68cc532 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:emojicon="http://schemas.android.com/apk/res-auto"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
@@ -34,7 +34,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
-            android:background="@color/primarybackground"
+            android:background="@color/primaryBackground"
             android:gravity="center_vertical"
             android:orientation="vertical"
             android:padding="2dp">
@@ -58,7 +58,7 @@
                 android:textColor="@color/white"
                 android:textColorHighlight="@color/grey800"
                 android:textSize="?attr/TextSizeBody"
-                emojicon:emojiconSize="28sp" />
+                app:emojiconSize="28sp" />
 
             <Button
                 android:id="@+id/download_button"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index d75f4bdb..58511f25 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:emojicon="http://schemas.android.com/apk/res-auto"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
@@ -49,7 +49,7 @@
                 android:background="@color/primaryText"
                 android:scaleType="centerCrop" />
 
-            <TextView
+            <github.ankushsachdeva.emojicon.EmojiconTextView
                 android:id="@+id/message_body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -57,7 +57,8 @@
                 android:textColorLink="@color/primaryText"
                 android:textColor="@color/primaryText"
                 android:textColorHighlight="@color/grey500"
-                android:textSize="?attr/TextSizeBody" />
+                android:textSize="?attr/TextSizeBody"
+                app:emojiconSize="28sp"/>
 
             <Button
                 android:id="@+id/download_button"
-- 
cgit v1.2.3


From 32da65f910207f08f50b57ba59af9474eaad75d8 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 12 Feb 2016 11:39:27 +0100
Subject: client side support for XEP-0357: Push Notifications

---
 src/main/res/layout/activity_edit_account.xml | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index ed935819..d308b4ce 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -399,6 +399,26 @@
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
+                    <TableRow
+                        android:id="@+id/push_row"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/server_info_push"
+                            android:textColor="@color/black87"
+                            android:textSize="?attr/TextSizeBody"/>
+
+                        <TextView
+                            android:id="@+id/server_info_push"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right"
+                            android:textColor="@color/black87"
+                            android:textSize="?attr/TextSizeBody"/>
+                    </TableRow>
                     <TableRow
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content">
@@ -416,8 +436,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
+                            android:textSize="?attr/TextSizeBody"/>
                     </TableRow>
                 </TableLayout>
 
-- 
cgit v1.2.3


From fb06783aa68b4f6af367040e2537f32359f7459f Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Fri, 12 Feb 2016 19:29:04 +0100
Subject: Fixed layout issue with emojicon tastatur button

---
 src/main/res/layout/fragment_conversation.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index d4c380d3..d14091fd 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -43,7 +43,6 @@
             android:id="@+id/textinput"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@+id/textSendButton"
             android:layout_toRightOf="@+id/emoji_btn"
             android:background="@color/grey50"
-- 
cgit v1.2.3


From 2028bb9b58a78577dfca037c39a887c7df53d802 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Fri, 12 Feb 2016 20:48:28 +0100
Subject: green bubbles and setting to choose green or white bubbles removed

---
 src/main/res/layout/message_received.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index b68cc532..61b1b669 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_toRightOf="@+id/message_photo"
-        android:background="@drawable/message_bubble_received"
+        android:background="@drawable/message_bubble_received_white"
         android:minHeight="53dp"
         android:layout_marginTop="-2dp"
         android:layout_marginRight="-4dp"
@@ -54,9 +54,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="web|phone|email"
-                android:textColorLink="@color/white"
-                android:textColor="@color/white"
-                android:textColorHighlight="@color/grey800"
+                android:textColorLink="@color/primaryText"
+                android:textColor="@color/primaryText"
+                android:textColorHighlight="@color/grey500"
                 android:textSize="?attr/TextSizeBody"
                 app:emojiconSize="28sp" />
 
-- 
cgit v1.2.3


From c0b3a3ff0c32c8025174ebb92fbcf4a7fc67f497 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 15 Feb 2016 23:15:04 +0100
Subject: basic support for XEP-0308: Last Message Correction. fixes #864

---
 src/main/res/layout/message_received.xml | 12 +++++++++++-
 src/main/res/layout/message_sent.xml     | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index a998bf37..466dd045 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -91,7 +91,17 @@
                     android:layout_marginRight="4sp"
                     android:alpha="0.70"
                     android:gravity="center_vertical"
-                    android:src="@drawable/ic_secure_indicator_white" />
+                    android:src="@drawable/ic_lock_white_18dp" />
+
+                <ImageView
+                    android:id="@+id/edit_indicator"
+                    android:layout_width="?attr/TextSizeInfo"
+                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="4sp"
+                    android:alpha="0.70"
+                    android:gravity="center_vertical"
+                    android:src="@drawable/ic_mode_edit_white_18dp" />
 
                 <TextView
                     android:id="@+id/message_time"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 55f874e6..fc68c389 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -91,7 +91,17 @@
                     android:layout_marginLeft="4sp"
                     android:alpha="0.54"
                     android:gravity="center_vertical"
-                    android:src="@drawable/ic_secure_indicator" />
+                    android:src="@drawable/ic_lock_black_18dp" />
+
+                <ImageView
+                    android:id="@+id/edit_indicator"
+                    android:layout_width="?attr/TextSizeInfo"
+                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4sp"
+                    android:alpha="0.54"
+                    android:gravity="center_vertical"
+                    android:src="@drawable/ic_mode_edit_black_18dp" />
 
                 <ImageView
                     android:id="@+id/indicator_received"
-- 
cgit v1.2.3


From 303a3a16217c1d102216ab8d91cb03ea8039dd3c Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Tue, 23 Feb 2016 13:40:24 +0100
Subject: Removed useless 'button-message' to load more messages.
 Implementation already done with a more convenient method

---
 src/main/res/layout/message_status.xml | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 80166901..aa02e154 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -9,15 +9,6 @@
                 android:paddingRight="8dp"
                 android:paddingTop="5dp">
 
-    <Button
-        android:id="@+id/load_more_messages"
-        style="?android:attr/borderlessButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/load_more_messages"
-        android:textColor="@color/accent" android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"/>
-
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/message_photo"
         android:layout_width="32dp"
-- 
cgit v1.2.3


From 6d4a55a08743032bb3f0a068d09aaae588eb0b17 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Tue, 23 Feb 2016 14:33:40 +0100
Subject: Removed stupid message correction

---
 src/main/res/layout/message_received.xml | 10 ----------
 src/main/res/layout/message_sent.xml     | 10 ----------
 2 files changed, 20 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 9362a74a..93ab095b 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -95,16 +95,6 @@
                     android:gravity="center_vertical"
                     android:src="@drawable/ic_lock_white_18dp" />
 
-                <ImageView
-                    android:id="@+id/edit_indicator"
-                    android:layout_width="?attr/TextSizeInfo"
-                    android:layout_height="?attr/TextSizeInfo"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginRight="4sp"
-                    android:alpha="0.70"
-                    android:gravity="center_vertical"
-                    android:src="@drawable/ic_mode_edit_white_18dp" />
-
                 <TextView
                     android:id="@+id/message_time"
                     android:layout_width="wrap_content"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index e5365a66..909ae9c7 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -94,16 +94,6 @@
                     android:gravity="center_vertical"
                     android:src="@drawable/ic_lock_black_18dp" />
 
-                <ImageView
-                    android:id="@+id/edit_indicator"
-                    android:layout_width="?attr/TextSizeInfo"
-                    android:layout_height="?attr/TextSizeInfo"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="4sp"
-                    android:alpha="0.54"
-                    android:gravity="center_vertical"
-                    android:src="@drawable/ic_mode_edit_black_18dp" />
-
                 <ImageView
                     android:id="@+id/indicator_received"
                     android:layout_width="?attr/TextSizeInfo"
-- 
cgit v1.2.3


From 6fb773875736a47e465ad7cb1554874ec1cd15e1 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Wed, 2 Mar 2016 10:28:06 +0100
Subject: Fixes FS#146: Remove Tor-Support

---
 src/main/res/layout/activity_edit_account.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 4d0e6056..cf49b3ac 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -102,7 +102,7 @@
                                 android:id="@+id/hostname"
                                 android:layout_width="fill_parent"
                                 android:layout_height="wrap_content"
-                                android:hint="@string/hostname_or_onion"
+                                android:hint="@string/hostname_example"
                                 android:inputType="textNoSuggestions"
                                 android:textColor="@color/primaryText"
                                 android:textColorHint="@color/secondaryText"
-- 
cgit v1.2.3


From 5d21abac1dd2fed7a5e87f8fb23bc15ee0912322 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Wed, 2 Mar 2016 16:54:18 +0100
Subject: Fixes FS#147: Disable OMEMO

---
 src/main/res/layout/activity_edit_account.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index cf49b3ac..58e168f3 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -504,7 +504,8 @@
                     android:id="@+id/axolotl_fingerprint_box"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginTop="32dp">
+                    android:layout_marginTop="32dp"
+                    android:visibility="gone">
 
                     <LinearLayout
                         android:layout_width="wrap_content"
-- 
cgit v1.2.3