aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-07-01 21:03:23 -0700
committerAllan Wang <me@allanwang.ca>2019-07-01 21:03:23 -0700
commit1472aa3bba0b5865aee1c52168bbc49a9f37c40b (patch)
tree119146b9891068e1aace612883ce3161fe89ac4d
parentbed28fe6a28735135978ed550a84e1866a8dd0d1 (diff)
downloadfrost-1472aa3bba0b5865aee1c52168bbc49a9f37c40b.tar.gz
frost-1472aa3bba0b5865aee1c52168bbc49a9f37c40b.tar.bz2
frost-1472aa3bba0b5865aee1c52168bbc49a9f37c40b.zip
Make image activity overlay
-rw-r--r--app/src/main/AndroidManifest.xml2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt2
-rw-r--r--app/src/main/res/values/styles.xml10
3 files changed, 6 insertions, 8 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bd8776d1..e4fc0415 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -147,7 +147,7 @@
android:theme="@style/Kau.About" />
<activity
android:name=".activities.ImageActivity"
- android:theme="@style/FrostTheme.Transparent" />
+ android:theme="@style/FrostTheme.Overlay" />
<activity android:name=".activities.DebugActivity" />
<service
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
index 814ce778..661b4526 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
@@ -162,7 +162,7 @@ class ImageActivity : KauBaseActivity() {
setContentView(layout)
image_container.setBackgroundColor(
if (Prefs.blackMediaBg) Color.BLACK
- else Prefs.bgColor.withMinAlpha(222)
+ else Prefs.bgColor.withMinAlpha(235)
)
image_text?.setTextColor(if (Prefs.blackMediaBg) Color.WHITE else Prefs.textColor)
image_text?.setBackgroundColor(
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7816533b..33f36174 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -38,6 +38,9 @@
</style>
<style name="FrostTheme.Overlay">
+ <item name="android:windowBackground">@android:color/transparent</item>
+ <item name="android:backgroundDimEnabled">false</item>
+ <item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowIsTranslucent">true</item>
</style>
@@ -49,12 +52,7 @@
<item name="android:windowAnimationStyle">@style/KauFadeInFadeOut</item>
</style>
- <style name="FrostTheme.Video" parent="FrostTheme.Overlay.Fade">
- <item name="android:windowBackground">@android:color/transparent</item>
- <item name="android:backgroundDimEnabled">false</item>
- <item name="android:colorBackgroundCacheHint">@null</item>
- <item name="android:windowIsTranslucent">true</item>
- </style>
+ <style name="FrostTheme.Video" parent="FrostTheme.Overlay.Fade" />
<style name="FrostTheme.Settings" parent="FrostTheme">
<item name="android:windowAnimationStyle">@style/KauSlideInFadeOut</item>