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/enter_jid_dialog.xml | 39 ++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 src/main/res/layout/enter_jid_dialog.xml

(limited to 'src/main/res/layout/enter_jid_dialog.xml')

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 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 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'src/main/res/layout/enter_jid_dialog.xml')

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
-- 
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 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/res/layout/enter_jid_dialog.xml')

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
-- 
cgit v1.2.3