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/join_conference_dialog.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

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"
-- 
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/join_conference_dialog.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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

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/join_conference_dialog.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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

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