From ea7aa63bb951ce8680d28a131f4f7230076708ef Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 31 Mar 2018 15:25:57 +0200
Subject: updated manage account activity to new colors

---
 src/main/res/layout/account_row.xml              |  9 +++------
 src/main/res/layout/activity_choose_contact.xml  |  5 ++++-
 src/main/res/layout/activity_contact_details.xml |  4 +---
 src/main/res/layout/activity_manage_accounts.xml | 14 ++++++++++++++
 src/main/res/layout/activity_share_with.xml      | 15 +++++++++++++++
 src/main/res/layout/conversation_list_row.xml    |  4 +---
 src/main/res/layout/manage_accounts.xml          | 14 --------------
 src/main/res/layout/share_with.xml               | 13 -------------
 8 files changed, 38 insertions(+), 40 deletions(-)
 create mode 100644 src/main/res/layout/activity_manage_accounts.xml
 create mode 100644 src/main/res/layout/activity_share_with.xml
 delete mode 100644 src/main/res/layout/manage_accounts.xml
 delete mode 100644 src/main/res/layout/share_with.xml

(limited to 'src/main/res')

diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index c50485f56..d0cf3d96c 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -24,7 +24,7 @@
         android:layout_centerVertical="true"
         android:layout_toRightOf="@+id/account_image"
         android:orientation="vertical"
-        android:paddingLeft="8dp">
+        android:paddingLeft="@dimen/avatar_item_distance">
 
         <TextView
             android:id="@+id/account_jid"
@@ -32,17 +32,14 @@
             android:layout_height="wrap_content"
             android:scrollHorizontally="false"
             android:singleLine="true"
-            android:textColor="@color/black87"
-            android:textSize="?attr/TextSizeHeadline" />
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
         <TextView
             android:id="@+id/account_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/account_status_unknown"
-            android:textColor="@color/black54"
-            android:textSize="?attr/TextSizeBody"
-            android:textStyle="bold" />
+            android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml
index 66e416de5..c5158510b 100644
--- a/src/main/res/layout/activity_choose_contact.xml
+++ b/src/main/res/layout/activity_choose_contact.xml
@@ -2,12 +2,15 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/color_background_primary">
 
     <ListView
         android:id="@+id/choose_contact_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:divider="@android:color/transparent"
+        android:dividerHeight="0dp"
         tools:listitem="@layout/contact" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 75ef17978..ef8fe4134 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/src/main/res/layout/activity_manage_accounts.xml b/src/main/res/layout/activity_manage_accounts.xml
new file mode 100644
index 000000000..99b6ad920
--- /dev/null
+++ b/src/main/res/layout/activity_manage_accounts.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="?attr/color_background_primary">
+
+    <ListView
+        android:id="@+id/account_list"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:divider="@android:color/transparent"
+        android:dividerHeight="0dp"></ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_share_with.xml b/src/main/res/layout/activity_share_with.xml
new file mode 100644
index 000000000..0b0e11f54
--- /dev/null
+++ b/src/main/res/layout/activity_share_with.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:id="@+id/choose_conversation_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="@android:color/transparent"
+        android:dividerHeight="0dp"
+        tools:listitem="@layout/conversation_list_row" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 9addc66cb..08d176f11 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -50,9 +50,7 @@
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:paddingRight="4dp"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="@color/black87"
-                    android:textSize="?attr/TextSizeHeadline" />
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
                 <RelativeLayout
                     android:id="@+id/conversation_lastwrapper"
diff --git a/src/main/res/layout/manage_accounts.xml b/src/main/res/layout/manage_accounts.xml
deleted file mode 100644
index 8d7167ea6..000000000
--- a/src/main/res/layout/manage_accounts.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@color/grey50">
-
-    <ListView
-        android:id="@+id/account_list"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:divider="@color/black12"
-        android:dividerHeight="1dp"></ListView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/share_with.xml b/src/main/res/layout/share_with.xml
deleted file mode 100644
index 162d02efe..000000000
--- a/src/main/res/layout/share_with.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ListView
-        android:id="@+id/choose_conversation_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:listitem="@layout/conversation_list_row" />
-
-</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3