Use black colorless theme for GalleryActivity

This commit is contained in:
Moez Bhatti
2018-02-13 20:37:27 -05:00
parent a51b0af779
commit 943d6bab5f
5 changed files with 37 additions and 14 deletions
+3 -1
View File
@@ -62,7 +62,9 @@
<activity android:name="presentation.feature.setup.SetupActivity" /> <activity android:name="presentation.feature.setup.SetupActivity" />
<activity android:name="presentation.feature.themepicker.ThemePickerActivity" /> <activity android:name="presentation.feature.themepicker.ThemePickerActivity" />
<activity android:name="presentation.feature.plus.PlusActivity" /> <activity android:name="presentation.feature.plus.PlusActivity" />
<activity android:name="presentation.feature.gallery.GalleryActivity" /> <activity
android:name="presentation.feature.gallery.GalleryActivity"
android:theme="@style/AppThemeBlack" />
<receiver android:name="presentation.receiver.DefaultSmsChangedReceiver"> <receiver android:name="presentation.receiver.DefaultSmsChangedReceiver">
<intent-filter> <intent-filter>
@@ -40,7 +40,7 @@ class GalleryActivity : QkActivity<GalleryViewModel>(), GalleryView {
} }
override fun render(state: GalleryState) { override fun render(state: GalleryState) {
navigation.setVisible(state.navigationVisible) toolbar.setVisible(state.navigationVisible)
if (image.drawable == null) { if (image.drawable == null) {
GlideApp.with(this).load(state.imagePath).into(image) GlideApp.with(this).load(state.imagePath).into(image)
+19 -12
View File
@@ -19,29 +19,36 @@
--> -->
<FrameLayout android:id="@+id/root" <FrameLayout android:id="@+id/root"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:animateLayoutChanges="true" tools:context="presentation.feature.gallery.GalleryActivity">
android:background="@color/black">
<com.github.chrisbanes.photoview.PhotoView <com.github.chrisbanes.photoview.PhotoView
android:id="@+id/image" android:id="@+id/image"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<LinearLayout <android.support.v7.widget.Toolbar
android:id="@+id/navigation" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="56dp"
android:orientation="vertical"> android:background="@color/toolbarTranslucent"
android:gravity="center_vertical"
android:minHeight="56dp">
<include layout="@layout/toolbar" /> <presentation.common.widget.QkTextView
android:id="@+id/toolbarTitle"
<View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="8dp" android:layout_height="match_parent"
android:background="@drawable/ab_shadow" /> android:background="@null"
android:gravity="left|center_vertical"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/textPrimaryDark"
android:textSize="20sp"
tools:text="Conversations" />
</LinearLayout> </android.support.v7.widget.Toolbar>
</FrameLayout> </FrameLayout>
+1
View File
@@ -26,6 +26,7 @@
<color name="toolbarLight">#FFFFFF</color> <color name="toolbarLight">#FFFFFF</color>
<color name="toolbarDark">#1d262b</color> <color name="toolbarDark">#1d262b</color>
<color name="toolbarTranslucent">#88000000</color>
<color name="backgroundLight">#ECEFF1</color> <color name="backgroundLight">#ECEFF1</color>
<color name="backgroundDark">#192025</color> <color name="backgroundDark">#192025</color>
+13
View File
@@ -34,6 +34,14 @@
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
</style> </style>
<style name="AppThemeBlack" parent="Theme.AppCompat.NoActionBar">
<item name="android:windowBackground">@color/black</item>
<item name="actionBarPopupTheme">@style/PopupThemeDark</item>
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="windowActionBar">false</item>
</style>
<style name="TextPrimary"> <style name="TextPrimary">
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
<item name="textColor">primary</item> <item name="textColor">primary</item>
@@ -110,6 +118,11 @@
<item name="android:textColor">@color/textPrimaryDark</item> <item name="android:textColor">@color/textPrimaryDark</item>
</style> </style>
<style name="PopupThemeBlack" parent="ThemeOverlay.AppCompat">
<item name="android:colorBackground">@color/black</item>
<item name="android:textColor">@color/textPrimaryDark</item>
</style>
<style name="PopupThemeLight" parent="ThemeOverlay.AppCompat.Light"> <style name="PopupThemeLight" parent="ThemeOverlay.AppCompat.Light">
<item name="android:colorBackground">@color/white</item> <item name="android:colorBackground">@color/white</item>
<item name="android:textColor">@color/textPrimary</item> <item name="android:textColor">@color/textPrimary</item>