Fix messenger theme for default

10 files changed, 27 insertions, 24 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/enums/Theme.kt b/app/src/main/kotlin/com/pitchedapps/frost/enums/Theme.kt
index 1f28d271..1c9d6aa5 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/enums/Theme.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/enums/Theme.kt
@@ -40,7 +40,7 @@ enum class Theme(
 ) {
 
     DEFAULT(R.string.kau_default,
-        null,
+        "default",
         { 0xde000000.toInt() },
         { FACEBOOK_BLUE },
         { 0xfffafafa.toInt() },
diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew
index fad19c9d..a02cbb99 100644
--- a/app/src/main/play/en-US/whatsnew
+++ b/app/src/main/play/en-US/whatsnew
@@ -1,4 +1,5 @@
 v3.0.0
 
 * Removed email support. Please use GitHub for all inquiries as I no longer have time to look through all emails
-* Added initial support for messenger.com
\ No newline at end of file
+* Added initial support for messenger.com
+* Fix swipe to refresh not disabling for certain pages
\ No newline at end of file
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 8badfc5f..e03eceb2 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -9,15 +9,14 @@
     <version title="v3.0.0" />
     <item text="Removed email support. Please use GitHub for all inquiries as I no longer have time to look through all emails" />
     <item text="Added initial support for messenger.com" />
+    <item text="Fix swipe to refresh not disabling for certain pages" />
+    <item text="" />
     <item text="" />
     <item text="" />
 
     <version title="v2.4.7" />
     <item text="Fix theme not always sticking on refresh" />
     <item text="Disable long press menu from appearing immediately after scrolling" />
-    <item text="" />
-    <item text="" />
-    <item text="" />
 
     <version title="v2.4.6" />
     <item text="Add option to hide likes and action bar in newsfeed" />
diff --git a/app/src/web/scss/facebook/core/_core_hider.scss b/app/src/web/scss/facebook/core/_core_hider.scss
new file mode 100644
index 00000000..a166db3b
--- /dev/null
+++ b/app/src/web/scss/facebook/core/_core_hider.scss
@@ -0,0 +1,4 @@
+[data-sigil=m_login_upsell],
+[data-sigil="m-loading-indicator-animate m-loading-indicator-root"] {
+  display: none !important;
+}
\ No newline at end of file
diff --git a/app/src/web/scss/facebook/core/core.scss b/app/src/web/scss/facebook/core/core.scss
index dd8fd398..ab77c091 100644
--- a/app/src/web/scss/facebook/core/core.scss
+++ b/app/src/web/scss/facebook/core/core.scss
@@ -4,6 +4,7 @@
 @import "core_bg";
 @import "core_border";
 @import "core_messages";
+@import "core_hider";
 
 //GLOBAL overrides; use with caution
 *, *::after, *::before {
@@ -15,11 +16,6 @@
 //   box-shadow: none !important;
 // }
 
-[data-sigil=m_login_upsell],
-[data-sigil="m-loading-indicator-animate m-loading-indicator-root"] {
-  display: none !important;
-}
-
 @include placeholder {
   color: $text !important;
 }
diff --git a/app/src/web/scss/facebook/themes/default.scss b/app/src/web/scss/facebook/themes/default.scss
new file mode 100644
index 00000000..92e352a7
--- /dev/null
+++ b/app/src/web/scss/facebook/themes/default.scss
@@ -0,0 +1 @@
+@import "../core/core_hider";
diff --git a/app/src/web/scss/messenger/core/_core_hider.scss b/app/src/web/scss/messenger/core/_core_hider.scss
new file mode 100644
index 00000000..94d2d87f
--- /dev/null
+++ b/app/src/web/scss/messenger/core/_core_hider.scss
@@ -0,0 +1,13 @@
+// Sizing adjustments
+[role="navigation"] {
+  .rq0escxv.l9j0dhe7.du4w35lb.j83agx80.g5gj957u.rj1gh0hx.buofh1pr.hpfvmrgz.i1fnvgqd.bp9cbjyn.owycx6da.btwxx1t3.dflh9lhu.scb9dxdr.sj5x9vvc.cxgpxx05.sn0e7ne5.f6rbj1fe.l3ldwz01 /* New! Messenger app for windows */,
+  .rq0escxv.l9j0dhe7.du4w35lb.n851cfcs.aahdfvyu /* Search messenger */,
+  .wkznzc2l /* Top left chat + menu entry */ {
+    display: none !important;
+  }
+}
+
+.rq0escxv.l9j0dhe7.du4w35lb.j83agx80.cbu4d94t.pfnyh3mw.d2edcug0.hpfvmrgz.p8fzw8mz.pcp91wgn.iuny7tx3.ipjc6fyt /* Top bar call video info icons */,
+.kuivcneq /* Right sidebar */ {
+  display: none !important;
+}
diff --git a/app/src/web/scss/messenger/core/core.scss b/app/src/web/scss/messenger/core/core.scss
index 7d49422d..3f09b42e 100644
--- a/app/src/web/scss/messenger/core/core.scss
+++ b/app/src/web/scss/messenger/core/core.scss
@@ -4,17 +4,4 @@
 @import "core_text";
 @import "core_bg";
 @import "core_border";
-
-// Sizing adjustments
-[role="navigation"] {
-  .rq0escxv.l9j0dhe7.du4w35lb.j83agx80.g5gj957u.rj1gh0hx.buofh1pr.hpfvmrgz.i1fnvgqd.bp9cbjyn.owycx6da.btwxx1t3.dflh9lhu.scb9dxdr.sj5x9vvc.cxgpxx05.sn0e7ne5.f6rbj1fe.l3ldwz01 /* New! Messenger app for windows */,
-  .rq0escxv.l9j0dhe7.du4w35lb.n851cfcs.aahdfvyu /* Search messenger */,
-  .wkznzc2l /* Top left chat + menu entry */ {
-    display: none !important;
-  }
-}
-
-.rq0escxv.l9j0dhe7.du4w35lb.j83agx80.cbu4d94t.pfnyh3mw.d2edcug0.hpfvmrgz.p8fzw8mz.pcp91wgn.iuny7tx3.ipjc6fyt /* Top bar call video info icons */,
-.kuivcneq /* Right sidebar */ {
-  display: none !important;
-}
+@import "core_hider";
diff --git a/app/src/web/scss/messenger/themes/default.scss b/app/src/web/scss/messenger/themes/default.scss
new file mode 100644
index 00000000..92e352a7
--- /dev/null
+++ b/app/src/web/scss/messenger/themes/default.scss
@@ -0,0 +1 @@
+@import "../core/core_hider";
diff --git a/docs/Changelog.md b/docs/Changelog.md
index f53b43d4..e1b1e889 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -3,6 +3,7 @@
 ## v3.0.0
 * Removed email support. Please use GitHub for all inquiries as I no longer have time to look through all emails
 * Added initial support for messenger.com
+* Fix swipe to refresh not disabling for certain pages
 
 ## v2.4.7
 * Fix theme not always sticking on refresh