Merge pull request #1650 from AllanWang/sharing

Sharing

7 files changed, 39 insertions, 24 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostChromeClients.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostChromeClients.kt
index bdaf22ba..43b7071e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostChromeClients.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostChromeClients.kt
@@ -48,6 +48,7 @@ import kotlinx.coroutines.channels.SendChannel
  */
 class FrostChromeClient(web: FrostWebView) : WebChromeClient() {
 
+    private val refresh: SendChannel<Boolean> = web.parent.refreshChannel
     private val progress: SendChannel<Int> = web.parent.progressChannel
     private val title: SendChannel<String> = web.parent.titleChannel
     private val activity = (web.context as? ActivityContract)
@@ -83,6 +84,12 @@ class FrostChromeClient(web: FrostWebView) : WebChromeClient() {
         return activity != null
     }
 
+    private fun JsResult.frostCancel() {
+        cancel()
+        refresh.offer(false)
+        progress.offer(100)
+    }
+
     override fun onJsAlert(
         view: WebView,
         url: String,
@@ -93,7 +100,7 @@ class FrostChromeClient(web: FrostWebView) : WebChromeClient() {
             title(text = url)
             message(text = message)
             positiveButton { result.confirm() }
-            onDismiss { result.cancel() }
+            onDismiss { result.frostCancel() }
         }
         return true
     }
@@ -108,8 +115,8 @@ class FrostChromeClient(web: FrostWebView) : WebChromeClient() {
             title(text = url)
             message(text = message)
             positiveButton { result.confirm() }
-            negativeButton { result.cancel() }
-            onDismiss { result.cancel() }
+            negativeButton { result.frostCancel() }
+            onDismiss { result.frostCancel() }
         }
         return true
     }
@@ -124,8 +131,8 @@ class FrostChromeClient(web: FrostWebView) : WebChromeClient() {
             title(text = url)
             message(text = message)
             positiveButton { result.confirm() }
-            negativeButton { result.cancel() }
-            onDismiss { result.cancel() }
+            negativeButton { result.frostCancel() }
+            onDismiss { result.frostCancel() }
         }
         return true
     }
@@ -144,8 +151,8 @@ class FrostChromeClient(web: FrostWebView) : WebChromeClient() {
                 result.confirm(charSequence.toString())
             }
             // positive button added through input
-            negativeButton { result.cancel() }
-            onDismiss { result.cancel() }
+            negativeButton { result.frostCancel() }
+            onDismiss { result.frostCancel() }
         }
         return true
     }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
index a3c61323..4d635547 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
@@ -215,7 +215,7 @@ open class FrostWebViewClient(val web: FrostWebView) : BaseWebViewClient() {
             return true
         }
         // Convert desktop urls to mobile ones
-        if (url.contains("https://www.facebook.com")) {
+        if (url.contains("https://www.facebook.com") && urlSupportsRefresh(url)) {
             view.loadUrl(url.replace(WWW_FACEBOOK_COM, FACEBOOK_BASE_COM))
             return true
         }
diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew
index 6c10ef6b..4474eebc 100644
--- a/app/src/main/play/en-US/whatsnew
+++ b/app/src/main/play/en-US/whatsnew
@@ -1,5 +1,4 @@
-v2.4.3
+v2.4.4
 
-* Fix Android theme
-* Fix nav header expansion when animations are disabled
-* Fix search page UI
\ No newline at end of file
+* Lots of under the hood fixes
+* Fixed sharing
\ 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 8e400347..99a48160 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -6,12 +6,16 @@
     <item text="" />
     -->
 
+    <version title="v2.4.4" />
+    <item text="Lots of under the hood fixes" />
+    <item text="Fixed sharing" />
+    <item text="" />
+    <item text="" />
+
     <version title="v2.4.3" />
     <item text="Fix Android theme" />
     <item text="Fix nav header expansion when animations are disabled" />
     <item text="Fix search page UI" />
-    <item text="" />
-    <item text="" />
 
     <version title="v2.4.2" />
     <item text="Fix townhall loading" />
diff --git a/app/src/web/scss/core/_core_bg.scss b/app/src/web/scss/core/_core_bg.scss
index 3abb62a3..b649ddf5 100644
--- a/app/src/web/scss/core/_core_bg.scss
+++ b/app/src/web/scss/core/_core_bg.scss
@@ -15,7 +15,8 @@ html, body, :root, #root, #header, #MComposer, ._1upc, input, ._2f9r, ._59e9, ._
 ._5q_r, ._5yt8, ._idb, ._2ip_, ._f6s, ._2l5v, ._8i2, ._kr5, ._2q7u, ._2q7v, ._5xp2, div.fullwidthMore,
 ._577z, ._2u4w, ._3u9p, ._3u9t, ._cw4, ._5_y-, ._5_y_, ._5_z3, ._cwy, ._5_z0, ._voz, ._vos, ._7i8m,
 ._5_z1, ._5_z2, ._2mtc, ._206a, ._1_-1, ._1ybg, .appCenterCategorySelectorButton, ._5_ee, ._3clk,
-._5c9u, div._5y57::before, ._59f6._55so::before, .structuredPublisher, ._94v, ._vqv, ._5lp5,
+._5c9u, div._5y57::before, ._59f6._55so::before, .structuredPublisher, ._94v, ._vqv, 
+._5lp5, ._1ho1, ._39y9._39ya, ._59_m,
 ._55wm, ._2om3, ._2ol-, ._1f9d, ._vee, ._31a-, ._3r8b, ._3r9d, ._5vq5, ._3tl8, ._65wz, ._4edl,
 .acw, ._4_xl, ._1p70, ._1p70, ._1ih_, ._51v6, ._u2c, ._484w, ._3ils, ._rm7, ._32qk, ._d01, ._1glm,
 ._ue6, ._hdn._hdn, ._6vzw, ._77xj, ._38nq, ._9_7, ._51li, ._7hkf, ._6vzz, ._3iyw ._37fb,
@@ -27,9 +28,9 @@ html, body, :root, #root, #header, #MComposer, ._1upc, input, ._2f9r, ._59e9, ._
   background: $bg_transparent !important;
 }
 
-//card related
+// card related
 ._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s, ._13fn, ._7kxe, [style*="background-color: #F5F8FF"],
-._84lx {
+._84lx, ._517h, ._59pe:focus, ._59pe:hover, ._m_1, ._3eqz, ._6m2 {
   background: $card !important;
 }
 
@@ -39,7 +40,7 @@ html, body, :root, #root, #header, #MComposer, ._1upc, input, ._2f9r, ._59e9, ._
   background: $tint !important;
 }
 
-//contains images so must have background-color
+// contains images so must have background-color
 ._cv_, ._2sq8 {
   background-color: $bg_transparent !important;
 }
@@ -49,7 +50,9 @@ html, body, :root, #root, #header, #MComposer, ._1upc, input, ._2f9r, ._59e9, ._
 }
 
 .jewel, .flyout, ._52z5, ._13e_, ._5-lw, ._5c0e, .jx-result, ._336p, .mentions-suggest-item, ._2suk, ._-j7, ._4d0v, ._4d0m,
-.mentions-suggest, ._1xoz, ._1xow {
+.mentions-suggest, ._1xoz, ._1xow,
+// desktop sharing page
+.uiBoxLightblue, .uiBoxWhite, .uiBoxGray, .uiTokenizer, .uiTypeahead, ._558b ._54ng, ._2_bh, ._509o, ._509o:hover {
   background: $bg_opaque !important;
 }
 
diff --git a/app/src/web/scss/core/_core_border.scss b/app/src/web/scss/core/_core_border.scss
index 595fbbbf..a20bb623 100644
--- a/app/src/web/scss/core/_core_border.scss
+++ b/app/src/web/scss/core/_core_border.scss
@@ -5,7 +5,7 @@
   border-left: 1px solid $divider !important;
 }
 
-._4_d1, ._5cni, ._3jcq {
+._4_d1, ._5cni, ._3jcq, ._1ho1 {
   border-right: 1px solid $divider !important;
 }
 
@@ -26,7 +26,7 @@
 .mAppCenterFatLabel, .appCenterCategorySelectorButton, ._1q6v, ._5q_r, ._5yt8, ._38do, ._38dt,
 ._ap1, ._52x1, ._59tu, ._usq, ._13e_, ._59f6._55so::before, ._4gj3, .error, ._35--, ._1wev,
 .jx-result, ._1f9d, ._vef, ._55x2 > *, .al, ._44qk, ._5rgs, ._5xuj, ._1sv1, ._idb, ._5_g-,
-._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before, ._5hu6, ._2wn5,
+._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before, ._5hu6, ._2wn5, ._1ho1, ._1xk6,
 ._3c9h::before, ._2s20, ._gui, ._5jku, ._2foa, ._2y60, ._5fu3, ._4en9, ._1kb:not(:last-child) ._1kc,
 ._5pz4, ._5lp4, ._5lp5, ._5h6z, ._5h6x, ._2om4, ._5fjw > div, ._5fjv > :first-child,
 ._5fjw > :first-child {
@@ -48,7 +48,8 @@
 ._4kcb, ._2lut, .jewel .touchable-notification.touched, .touchable-notification .touchable.touched,
 .home-notification .touchable.touched, ._6beo ._6ber, ._7kxg,
 ._73ku ._73jw, ._6--d, ._26vk._56bt, ._3iyw ._2whz ._13-g, ._-jx,
-._4e8n, ._uww, .mentions-placeholder, .mentions-shadow, .mentions-measurer,
+._4e8n, ._uww, .mentions-placeholder, .mentions-shadow, .mentions-measurer, ._517h, ._59pe:focus, ._59pe:hover,
+.uiBoxLightblue, .uiBoxWhite, ._558b ._54nc,
 ._5whq, ._59tt, ._41ft::after, .jx-tokenizer, ._3uqf, ._4756, ._1rrd, ._5n_f {
   border: 1px solid $divider !important;
 }
diff --git a/app/src/web/scss/core/_core_text.scss b/app/src/web/scss/core/_core_text.scss
index 31d6b433..e3a3f08b 100644
--- a/app/src/web/scss/core/_core_text.scss
+++ b/app/src/web/scss/core/_core_text.scss
@@ -2,7 +2,7 @@ html, body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
 ._1tcc, ._3g9-, ._29z_, ._3xz7, ._ib-, ._3bg5 ._56dq, ._477i, ._2vxk, ._29e6,
 .touched *, ._1_yj, ._1_yl, ._4pj9, ._2bdc, ._3qdh ._3qdn ._3qdk, ._3qdk ._48_q, ._7iah,
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr, #mErrorView .message,
-._5xu2, ._3ml8, ._3mla, ._50vk, ._1m2u, ._31y7, ._4kcb, ._1lf6, ._1lf5, ._7-1j, ._4ajz,
+._5xu2, ._3ml8, ._3mla, ._50vk, ._1m2u, ._31y7, ._4kcb, ._1lf6, ._1lf5, ._7-1j, ._4ajz, ._m_1 ._2aha,
 ._1lf4, ._1hiz, ._xod, ._5ag5, ._zmk, ._3t_h, ._5lm6, ._3clv, ._3zlc, ._36rd, ._6oby, ._6_qk,
 ._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul, ._3z10, ._4mo, ._2om6, ._33r5, ._82y3, ._82y1,
 ._43mh, .touch .btn, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35, ._ctg, ._5300, ._5302, ._5_o0,
@@ -13,6 +13,7 @@ html, body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
 textarea:not([style*="color: rgb"]), ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
 ._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh, ._6--d, ._77p7, ._7h_g,
 ._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg, ._21dc,
+.uiStickyPlaceholderInput .placeholder,
 ._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions, ._6xqt, ._7cui, ._84lx [style*="color: rgb"],
 ._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g, ._7cdj, ._1_yd, ._1_yc,
 ._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd, ._3gir, ._3gis,
@@ -20,7 +21,7 @@ div.sharerSelector, .footer, ._4pv_, ._1dbp, ._3kad, ._20zc, ._2i5v, ._2i5w, ._6
 a, ._5fpq, ._4gux, ._3bg5 ._52x1, ._3bg5 ._52x2, ._6dsj ._3gin, ._hdn._hdn, ._3iyw ._2whz ._13-g,
 .mentions-input:not([style*="color: rgb"]), .mentions-placeholder:not([style*="color: rgb"]),
 .largeStatusBox .placeHolder, .fcw, ._2rgt, ._67i4 ._5hu6 ._59tt, ._2bu3, ._2bu4, ._1ii2, ._1ii3,
-._5-7t, .fcl, ._4qas, .thread-title, .title, ._46pa, ._336p, ._1rrd, ._2om4, ._4yxo,
+._5-7t, .fcl, ._4qas, .thread-title, .title, ._46pa, ._336p, ._1rrd, ._2om4, ._4yxo, ._6m3, ._6m7, ._6m3 ._1t62,
 ._3m1m, ._2om2, ._5n_e, .appListExplanation, ._5yt8, ._8he, ._2luw, ._5rgs, ._t86 ._t87, ._t86 ._t88,
 h1, h2, h3, h4, h5, h6 {
   color: $text !important;