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 +
 src/main/res/values/strings.xml               | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'src/main/res')

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index bbcef140c..240d7d6e1 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"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 722eec2d7..41e1ccff2 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -499,4 +499,7 @@
 	<string name="search_for_contacts_or_groups">Search for contacts or groups</string>
 	<string name="send_private_message">Send private message</string>
 	<string name="user_has_left_conference">%s has left the conference!</string>
+	<string name="username">Username</string>
+	<string name="username_hint">Username</string>
+	<string name="invalid_username">This is not a valid username</string>
 </resources>
-- 
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 +
 src/main/res/values/colors.xml           | 1 +
 3 files changed, 3 insertions(+)

(limited to 'src/main/res')

diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index f78b82cbe..76df710bf 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 553689298..e3b38cd97 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
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index a5d7eea30..c2a3ad60c 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -11,6 +11,7 @@
 	<color name="white70">#b2ffffff</color>
 	<color name="grey50">#fffafafa</color>
 	<color name="grey200">#ffeeeeee</color>
+	<color name="grey500">#ff9e9e9e</color>
 	<color name="grey800">#ff424242</color>
 	<color name="red500">#fff44336</color>
 	<color name="red800">#ffc62828</color>
-- 
cgit v1.2.3