aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-04-03 00:00:38 -0400
committerGitHub <noreply@github.com>2019-04-03 00:00:38 -0400
commit2f6069d85d4e3bf1ef2bed4cf1c4203ecdc996bd (patch)
tree7ab68f04a5b098a847b88cb1e4dfa3e08c5df24e
parentd2fc0356ad90645a772876d60dcf80f3ec869d39 (diff)
parent54361fc2840e52f56ccf1fec8d4f595c8c0782ee (diff)
downloadfrost-2f6069d85d4e3bf1ef2bed4cf1c4203ecdc996bd.tar.gz
frost-2f6069d85d4e3bf1ef2bed4cf1c4203ecdc996bd.tar.bz2
frost-2f6069d85d4e3bf1ef2bed4cf1c4203ecdc996bd.zip
Merge pull request #1384 from AllanWang/fix-share
Fix share
-rw-r--r--.idea/inspectionProfiles/profiles_settings.xml6
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt1
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt1
-rw-r--r--app/src/main/res/xml/frost_changelog.xml5
-rw-r--r--app/src/web/assets/js/header_hider.js12
-rw-r--r--app/src/web/assets/js/header_hider.ts17
8 files changed, 13 insertions, 33 deletions
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 00000000..30d5fbc6
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+ <settings>
+ <option name="PROJECT_PROFILE" value="ktlint" />
+ <version value="1.0" />
+ </settings>
+</component> \ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
index 292b7ff5..891a1dbf 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
@@ -26,7 +26,7 @@ import android.webkit.WebView
enum class CssHider(vararg val items: String) : InjectorContract {
CORE("[data-sigil=m_login_upsell]", "[role=progressbar]"),
HEADER(
- "#header", "#mJewelNav", "[data-sigil=MTopBlueBarHeader]",
+ "#header:not(.mFuturePageHeader):not(.titled)", "#mJewelNav", "[data-sigil=MTopBlueBarHeader]",
"#header-notices", "[data-sigil*=m-promo-jewel-header]"
),
ADS(
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
index e0be7977..ad42418e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
@@ -33,7 +33,7 @@ import java.util.Locale
* The enum name must match the css file name
*/
enum class JsAssets : InjectorContract {
- MENU, CLICK_A, CONTEXT_A, MEDIA, HEADER_BADGES, HEADER_HIDER, TEXTAREA_LISTENER, NOTIF_MSG,
+ MENU, CLICK_A, CONTEXT_A, MEDIA, HEADER_BADGES, TEXTAREA_LISTENER, NOTIF_MSG,
DOCUMENT_WATCHER
;
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 c5c4ad28..003ed7f9 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
@@ -105,7 +105,6 @@ open class FrostWebViewClient(val web: FrostWebView) : BaseWebViewClient() {
JsAssets.CLICK_A,
CssHider.ADS.maybe(!Prefs.showFacebookAds),
JsAssets.CONTEXT_A,
-// JsAssets.HEADER_HIDER,
JsAssets.MEDIA
)
else
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
index c21ce93b..1c300b03 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
@@ -98,7 +98,6 @@ class LoginWebView @JvmOverloads constructor(
view.setBackgroundColor(Color.TRANSPARENT)
if (url.isFacebookUrl)
view.jsInject(
- JsAssets.HEADER_HIDER,
CssHider.CORE,
Prefs.themeInjector
)
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 2c5fc03e..c9b8477e 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -6,6 +6,11 @@
<item text="" />
-->
+ <version title="v2.2.4" />
+ <item text="Show top bar to allow sharing posts" />
+ <item text="" />
+ <item text="" />
+
<version title="v2.2.3" />
<item text="Add ability to hide stories" />
<item text="Remove fbclid from urls" />
diff --git a/app/src/web/assets/js/header_hider.js b/app/src/web/assets/js/header_hider.js
deleted file mode 100644
index faa9f66d..00000000
--- a/app/src/web/assets/js/header_hider.js
+++ /dev/null
@@ -1,12 +0,0 @@
-"use strict";
-(function () {
- var header = document.querySelector('#header');
- if (!header) {
- return;
- }
- var jewel = header.querySelector('#mJewelNav');
- if (!jewel) {
- return;
- }
- header.style.display = 'none';
-}).call(undefined);
diff --git a/app/src/web/assets/js/header_hider.ts b/app/src/web/assets/js/header_hider.ts
deleted file mode 100644
index 1a8f27f2..00000000
--- a/app/src/web/assets/js/header_hider.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-(function () {
- const header = document.querySelector('#header');
-
- if (!header) {
- return
- }
-
- const jewel = header.querySelector('#mJewelNav');
-
- if (!jewel) {
- return
- }
-
- (<HTMLElement>header).style.display = 'none'
-}).call(undefined);
-
-