From fb122b7af6e230e9458ab7d892d5d20f551b98ed Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 10 Jan 2021 20:50:20 -0800
Subject: Rename old messenger scss to messages

---
 .../kotlin/com/pitchedapps/frost/facebook/FbConst.kt |  2 +-
 .../com/pitchedapps/frost/facebook/FbCookie.kt       |  1 +
 app/src/web/scss/core/_core_messages.scss            | 20 ++++++++++++++++++++
 app/src/web/scss/core/_core_messenger.scss           | 20 --------------------
 app/src/web/scss/core/core.scss                      |  2 +-
 5 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 app/src/web/scss/core/_core_messages.scss
 delete mode 100644 app/src/web/scss/core/_core_messenger.scss

(limited to 'app')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
index 9edcc496..7a65a818 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
@@ -24,7 +24,7 @@ const val FACEBOOK_COM = "facebook.com"
 const val FBCDN_NET = "fbcdn.net"
 const val WWW_FACEBOOK_COM = "www.$FACEBOOK_COM"
 const val HTTPS_FACEBOOK_COM = "https://$WWW_FACEBOOK_COM"
-const val HTTPS_MESSENGER_COM = "https://www.messenger.com/"
+const val HTTPS_MESSENGER_COM = "https://www.messenger.com"
 const val FACEBOOK_BASE_COM = "m.$FACEBOOK_COM"
 const val FB_URL_BASE = "https://$FACEBOOK_BASE_COM/"
 const val FACEBOOK_MBASIC_COM = "mbasic.$FACEBOOK_COM"
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
index 78d51aef..36d51ec9 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
@@ -117,6 +117,7 @@ class FbCookie(private val prefs: Prefs, private val cookieDao: CookieDao) {
         }
         withContext(Dispatchers.IO + NonCancellable) {
             L.d { "Switching User" }
+            // TODO save old messenger cookie
             prefs.userId = cookie.id
             CookieManager.getInstance().apply {
                 removeAllCookies()
diff --git a/app/src/web/scss/core/_core_messages.scss b/app/src/web/scss/core/_core_messages.scss
new file mode 100644
index 00000000..aa3c04eb
--- /dev/null
+++ b/app/src/web/scss/core/_core_messages.scss
@@ -0,0 +1,20 @@
+// Not all message related components are here; only the main ones.
+// Borders for instance are merged into core_border
+
+// Other person's message bubble
+._34ee {
+  background: $background2 !important;
+  color: $text !important;
+
+}
+
+// Your message bubble; order matters
+._34em ._34ee {
+  background: $accent !important;
+  color: $accent_text !important;
+}
+
+// Sticker page
+._5as0, ._5cni, ._5as2 {
+  background: $bg_opaque !important;
+}
\ No newline at end of file
diff --git a/app/src/web/scss/core/_core_messenger.scss b/app/src/web/scss/core/_core_messenger.scss
deleted file mode 100644
index 608fc23d..00000000
--- a/app/src/web/scss/core/_core_messenger.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-// Not all messenger related components are here; only the main ones.
-// Borders for instance are merged into core_border
-
-// Other person's message bubble
-._34ee {
-  background: $background2 !important;
-  color: $text !important;
-
-}
-
-// Your message bubble; order matters
-._34em ._34ee {
-  background: $accent !important;
-  color: $accent_text !important;
-}
-
-// Sticker page
-._5as0, ._5cni, ._5as2 {
-  background: $bg_opaque !important;
-}
\ No newline at end of file
diff --git a/app/src/web/scss/core/core.scss b/app/src/web/scss/core/core.scss
index 38086529..112c0003 100644
--- a/app/src/web/scss/core/core.scss
+++ b/app/src/web/scss/core/core.scss
@@ -3,7 +3,7 @@
 @import "core_text";
 @import "core_bg";
 @import "core_border";
-@import "core_messenger";
+@import "core_messages";
 
 //GLOBAL overrides; use with caution
 *, *::after, *::before {
-- 
cgit v1.2.3