Clean up splash screen

This commit is contained in:
Niels Andriesse 2019-07-24 10:09:02 +10:00
parent 1b7a04ab50
commit fe16a90741
4 changed files with 13 additions and 8 deletions

View File

@ -9,8 +9,8 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:focusable="true" android:focusable="true"
android:background="@drawable/conversation_item_background" android:background="@drawable/conversation_item_background"
android:paddingStart="48dp" android:paddingStart="16dp"
android:paddingEnd="24dp"> android:paddingEnd="8dp">
<org.thoughtcrime.securesms.components.AvatarImageView <org.thoughtcrime.securesms.components.AvatarImageView
android:id="@+id/contact_photo_image" android:id="@+id/contact_photo_image"

View File

@ -4,7 +4,7 @@
android:id="@+id/prompt_layout" android:id="@+id/prompt_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/signal_primary"> android:background="@color/loki_darkest_gray">
<ProgressBar android:id="@+id/passphrase_edit" <ProgressBar android:id="@+id/passphrase_edit"
@ -13,15 +13,16 @@
android:indeterminate="true" android:indeterminate="true"
android:padding="10dp" android:padding="10dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:visibility="gone"
style="?android:attr/progressBarStyleLargeInverse"/> style="?android:attr/progressBarStyleLargeInverse"/>
<ImageView android:id="@+id/watermark" <ImageView android:id="@+id/watermark"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="128dp"
android:layout_centerHorizontal="true" android:layout_centerInParent="true"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:layout_above="@id/passphrase_edit" android:layout_above="@id/passphrase_edit"
android:src="@drawable/icon_transparent" android:src="@drawable/ic_launcher_foreground"
android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"/> android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"/>
</RelativeLayout> </RelativeLayout>

View File

@ -30,8 +30,8 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="128dp"
android:src="@drawable/icon_transparent" android:src="@drawable/ic_launcher_foreground"
android:layout_gravity="center"/> android:layout_gravity="center"/>
</android.support.v7.widget.Toolbar> </android.support.v7.widget.Toolbar>

View File

@ -132,21 +132,25 @@ public class ContactsCursorLoader extends CursorLoader {
private Cursor getRecentsHeaderCursor() { private Cursor getRecentsHeaderCursor() {
MatrixCursor recentsHeader = new MatrixCursor(CONTACT_PROJECTION); MatrixCursor recentsHeader = new MatrixCursor(CONTACT_PROJECTION);
/*
recentsHeader.addRow(new Object[]{ getContext().getString(R.string.ContactsCursorLoader_recent_chats), recentsHeader.addRow(new Object[]{ getContext().getString(R.string.ContactsCursorLoader_recent_chats),
"", "",
ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE, ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
"", "",
ContactsDatabase.DIVIDER_TYPE }); ContactsDatabase.DIVIDER_TYPE });
*/
return recentsHeader; return recentsHeader;
} }
private Cursor getContactsHeaderCursor() { private Cursor getContactsHeaderCursor() {
MatrixCursor contactsHeader = new MatrixCursor(CONTACT_PROJECTION, 1); MatrixCursor contactsHeader = new MatrixCursor(CONTACT_PROJECTION, 1);
/*
contactsHeader.addRow(new Object[] { getContext().getString(R.string.ContactsCursorLoader_contacts), contactsHeader.addRow(new Object[] { getContext().getString(R.string.ContactsCursorLoader_contacts),
"", "",
ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE, ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
"", "",
ContactsDatabase.DIVIDER_TYPE }); ContactsDatabase.DIVIDER_TYPE });
*/
return contactsHeader; return contactsHeader;
} }