From fe16a90741bb076cd0c3b63c17ddfa7de65da325 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Wed, 24 Jul 2019 10:09:02 +1000
Subject: [PATCH] Clean up splash screen

---
 res/layout/contact_selection_list_item.xml               | 4 ++--
 res/layout/create_passphrase_activity.xml                | 9 +++++----
 res/layout/prompt_passphrase_activity.xml                | 4 ++--
 .../securesms/contacts/ContactsCursorLoader.java         | 4 ++++
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/res/layout/contact_selection_list_item.xml b/res/layout/contact_selection_list_item.xml
index bda73818ad..e94d8ecead 100644
--- a/res/layout/contact_selection_list_item.xml
+++ b/res/layout/contact_selection_list_item.xml
@@ -9,8 +9,8 @@
         android:gravity="center_vertical"
         android:focusable="true"
         android:background="@drawable/conversation_item_background"
-        android:paddingStart="48dp"
-        android:paddingEnd="24dp">
+        android:paddingStart="16dp"
+        android:paddingEnd="8dp">
 
     <org.thoughtcrime.securesms.components.AvatarImageView
             android:id="@+id/contact_photo_image"
diff --git a/res/layout/create_passphrase_activity.xml b/res/layout/create_passphrase_activity.xml
index fbffc48422..3a7db22d44 100644
--- a/res/layout/create_passphrase_activity.xml
+++ b/res/layout/create_passphrase_activity.xml
@@ -4,7 +4,7 @@
                 android:id="@+id/prompt_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/signal_primary">
+                android:background="@color/loki_darkest_gray">
 
 
   <ProgressBar android:id="@+id/passphrase_edit"
@@ -13,15 +13,16 @@
                android:indeterminate="true"
                android:padding="10dp"
                android:layout_centerInParent="true"
+               android:visibility="gone"
                style="?android:attr/progressBarStyleLargeInverse"/>
 
   <ImageView android:id="@+id/watermark"
              android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_centerHorizontal="true"
+             android:layout_height="128dp"
+             android:layout_centerInParent="true"
              android:layout_marginBottom="20dp"
              android:layout_above="@id/passphrase_edit"
-             android:src="@drawable/icon_transparent"
+             android:src="@drawable/ic_launcher_foreground"
              android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"/>
 
 </RelativeLayout>
diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index addb8f5fd0..f851233471 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -30,8 +30,8 @@
 
         <ImageView
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/icon_transparent"
+                android:layout_height="128dp"
+                android:src="@drawable/ic_launcher_foreground"
                 android:layout_gravity="center"/>
 
     </android.support.v7.widget.Toolbar>
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java b/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
index 4045faf679..49f456b512 100644
--- a/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
+++ b/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
@@ -132,21 +132,25 @@ public class ContactsCursorLoader extends CursorLoader {
 
   private Cursor getRecentsHeaderCursor() {
     MatrixCursor recentsHeader = new MatrixCursor(CONTACT_PROJECTION);
+    /*
     recentsHeader.addRow(new Object[]{ getContext().getString(R.string.ContactsCursorLoader_recent_chats),
                                        "",
                                        ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
                                        "",
                                        ContactsDatabase.DIVIDER_TYPE });
+     */
     return recentsHeader;
   }
 
   private Cursor getContactsHeaderCursor() {
     MatrixCursor contactsHeader = new MatrixCursor(CONTACT_PROJECTION, 1);
+    /*
     contactsHeader.addRow(new Object[] { getContext().getString(R.string.ContactsCursorLoader_contacts),
                                          "",
                                          ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
                                          "",
                                          ContactsDatabase.DIVIDER_TYPE });
+     */
     return contactsHeader;
   }