From 943d6bab5f2361f33d20f62b4e1e72f9f00aad88 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 13 Feb 2018 20:37:27 -0500 Subject: [PATCH] Use black colorless theme for GalleryActivity --- qksms/src/main/AndroidManifest.xml | 4 ++- .../feature/gallery/GalleryActivity.kt | 2 +- .../src/main/res/layout/gallery_activity.xml | 31 ++++++++++++------- qksms/src/main/res/values/colors.xml | 1 + qksms/src/main/res/values/styles.xml | 13 ++++++++ 5 files changed, 37 insertions(+), 14 deletions(-) diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index 19f22a70..3e807f1d 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -62,7 +62,9 @@ - + diff --git a/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt b/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt index 7c9835d6..c5589b2b 100644 --- a/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt +++ b/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt @@ -40,7 +40,7 @@ class GalleryActivity : QkActivity(), GalleryView { } override fun render(state: GalleryState) { - navigation.setVisible(state.navigationVisible) + toolbar.setVisible(state.navigationVisible) if (image.drawable == null) { GlideApp.with(this).load(state.imagePath).into(image) diff --git a/qksms/src/main/res/layout/gallery_activity.xml b/qksms/src/main/res/layout/gallery_activity.xml index 0a6b9813..63f14069 100644 --- a/qksms/src/main/res/layout/gallery_activity.xml +++ b/qksms/src/main/res/layout/gallery_activity.xml @@ -19,29 +19,36 @@ --> + tools:context="presentation.feature.gallery.GalleryActivity"> - + android:layout_height="56dp" + android:background="@color/toolbarTranslucent" + android:gravity="center_vertical" + android:minHeight="56dp"> - - - + android:layout_height="match_parent" + android:background="@null" + android:gravity="left|center_vertical" + android:maxLines="1" + android:singleLine="true" + android:textColor="@color/textPrimaryDark" + android:textSize="20sp" + tools:text="Conversations" /> - + \ No newline at end of file diff --git a/qksms/src/main/res/values/colors.xml b/qksms/src/main/res/values/colors.xml index 51554890..f1b3b6ab 100644 --- a/qksms/src/main/res/values/colors.xml +++ b/qksms/src/main/res/values/colors.xml @@ -26,6 +26,7 @@ #FFFFFF #1d262b + #88000000 #ECEFF1 #192025 diff --git a/qksms/src/main/res/values/styles.xml b/qksms/src/main/res/values/styles.xml index 6c5889ff..74768b5a 100644 --- a/qksms/src/main/res/values/styles.xml +++ b/qksms/src/main/res/values/styles.xml @@ -34,6 +34,14 @@ false + + + +