From dd25736fb9572b4775032f6665f4d29d773fc467 Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Sat, 26 Oct 2019 18:26:31 -0700
Subject: [PATCH] Added Notch support

+ removed force dark where needed

Co-Authored-By: tonarii <tonarii@users.noreply.github.com>
---
 .../ui/reader/viewer/pager/PagerPageHolder.kt |  1 +
 .../main/res/layout/reader_settings_sheet.xml |  3 ++-
 .../main/res/values-notnight-v29/themes.xml   |  2 --
 app/src/main/res/values-v27/styles.xml        | 19 +++++++++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)
 delete mode 100644 app/src/main/res/values-notnight-v29/themes.xml
 create mode 100644 app/src/main/res/values-v27/styles.xml

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
index 892126fb31..4d1559167c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
@@ -347,6 +347,7 @@ class PagerPageHolder(
             })
         }
         addView(subsamplingImageView)
+        subsamplingImageView?.isForceDarkAllowed = false
         return subsamplingImageView!!
     }
 
diff --git a/app/src/main/res/layout/reader_settings_sheet.xml b/app/src/main/res/layout/reader_settings_sheet.xml
index d28155d704..73933fff36 100644
--- a/app/src/main/res/layout/reader_settings_sheet.xml
+++ b/app/src/main/res/layout/reader_settings_sheet.xml
@@ -8,7 +8,8 @@
     android:background="?android:colorBackground"
     android:clipToPadding="false"
     android:orientation="vertical"
-    android:padding="@dimen/material_component_dialogs_padding_around_content_area">
+    android:padding="@dimen/material_component_dialogs_padding_around_content_area"
+    android:forceDarkAllowed="false">
 
     <!-- General preferences -->
 
diff --git a/app/src/main/res/values-notnight-v29/themes.xml b/app/src/main/res/values-notnight-v29/themes.xml
deleted file mode 100644
index a6b3daec93..0000000000
--- a/app/src/main/res/values-notnight-v29/themes.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
new file mode 100644
index 0000000000..734630a9ad
--- /dev/null
+++ b/app/src/main/res/values-v27/styles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Base.Theme.AppCompat" parent="@style/Base.V26.Theme.AppCompat" />
+    <style name="Base.Theme.AppCompat.Light" parent="@style/Base.V26.Theme.AppCompat.Light" />
+    <style name="Base.Widget.AppCompat.Toolbar" parent="@style/Base.V26.Widget.AppCompat.Toolbar" />
+    <style name="Base.V26.Theme.AppCompat" parent="@style/Base.V23.Theme.AppCompat">
+        <item name="colorError">?android:colorError</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <style name="Base.V26.Theme.AppCompat.Light" parent="@style/Base.V23.Theme.AppCompat.Light">
+        <item name="colorError">?android:colorError</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <style name="Base.V26.Widget.AppCompat.Toolbar" parent="@style/Base.V7.Widget.AppCompat.Toolbar">
+        <item name="android:touchscreenBlocksFocus">true</item>
+        <item name="android:keyboardNavigationCluster">true</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+</resources>
\ No newline at end of file