From 8a8e7268a5bfbd0bc0d8ec5058365fb1109ad20f Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 27 Sep 2020 20:09:52 -0700 Subject: [PATCH 1/3] Add option to hide feed likes and bottom bar --- .../com/pitchedapps/frost/injectors/CssHider.kt | 6 ++++++ .../pitchedapps/frost/prefs/sections/FeedPrefs.kt | 8 ++++++++ .../kotlin/com/pitchedapps/frost/settings/Feed.kt | 13 ++++++++++--- .../pitchedapps/frost/web/FrostWebViewClients.kt | 2 ++ app/src/main/res/values/strings_pref_feed.xml | 4 ++++ 5 files changed, 30 insertions(+), 3 deletions(-) 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 558017fd5..7b400a43d 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt @@ -46,6 +46,12 @@ enum class CssHider(private vararg val items: String) : InjectorContract { "#MStoriesTray", // Sub element with just the tray; title is not a part of this "[data-testid=story_tray]" + ), + POST_ACTIONS( + "footer [data-sigil=\"ufi-inline-actions\"]" + ), + POST_REACTIONS( + "footer [data-sigil=\"reactions-bling-bar\"]" ) ; diff --git a/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/FeedPrefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/FeedPrefs.kt index 0060f9ade..232a5ca38 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/FeedPrefs.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/FeedPrefs.kt @@ -45,6 +45,10 @@ interface FeedPrefs : PrefsBase { var mainActivityLayoutType: Int val mainActivityLayout: MainActivityLayout + + var showPostActions: Boolean + + var showPostReactions: Boolean } class FeedPrefsImpl( @@ -95,4 +99,8 @@ class FeedPrefsImpl( override val mainActivityLayout: MainActivityLayout get() = MainActivityLayout(mainActivityLayoutType) + + override var showPostActions: Boolean by kpref("show_post_actions", true) + + override var showPostReactions: Boolean by kpref("show_post_reactions", true) } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Feed.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Feed.kt index 22917106d..f8d10437a 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Feed.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Feed.kt @@ -91,11 +91,18 @@ fun SettingsActivity.getFeedPrefs(): KPrefAdapterBuilder.() -> Unit = { descRes = R.string.show_stories_desc } - checkbox(R.string.facebook_ads, prefs::showFacebookAds, { - prefs.showFacebookAds = it + checkbox(R.string.show_post_actions, prefs::showPostActions, { + prefs.showPostActions = it shouldRefreshMain() }) { - descRes = R.string.facebook_ads_desc + descRes = R.string.show_post_actions_desc + } + + checkbox(R.string.show_post_reactions, prefs::showPostReactions, { + prefs.showPostReactions = it + shouldRefreshMain() + }) { + descRes = R.string.show_post_reactions_desc } checkbox(R.string.full_size_image, prefs::fullSizeImage, { 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 e2171896c..5826f3834 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt @@ -130,6 +130,8 @@ open class FrostWebViewClient(val web: FrostWebView) : BaseWebViewClient() { prefs.aggressiveRecents ), CssHider.ADS.maybe(!prefs.showFacebookAds), + CssHider.POST_ACTIONS.maybe(!prefs.showPostActions), + CssHider.POST_REACTIONS.maybe(!prefs.showPostReactions), CssSmallAssets.FullSizeImage.maybe(prefs.fullSizeImage), JsAssets.DOCUMENT_WATCHER, JsAssets.HORIZONTAL_SCROLLING, diff --git a/app/src/main/res/values/strings_pref_feed.xml b/app/src/main/res/values/strings_pref_feed.xml index 330c900cc..58d832cc8 100644 --- a/app/src/main/res/values/strings_pref_feed.xml +++ b/app/src/main/res/values/strings_pref_feed.xml @@ -16,6 +16,10 @@ Show \"Suggested Groups\" in the feed Show Stories Show stories in the feed + Show Post Actions + Show Like, Comment, and Share options + Show Post Reactions + Show reaction counts to post Facebook Ads Show native Facebook ads Full Size Images From 709afd07af8856cfeebea2c1044dc5883dbdc627 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 3 Oct 2020 20:23:16 -0700 Subject: [PATCH 2/3] Update changelog --- app/src/main/res/xml/frost_changelog.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml index d66a41ddf..c380b27a7 100644 --- a/app/src/main/res/xml/frost_changelog.xml +++ b/app/src/main/res/xml/frost_changelog.xml @@ -6,6 +6,11 @@ --> + + + + + From 23b619c5398312f370441acbcb57a7f0627b148d Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 3 Oct 2020 20:29:29 -0700 Subject: [PATCH 3/3] Add back room schema for travis --- app/build.gradle | 12 ++++++------ app/src/main/play/en-US/whatsnew | 6 ++---- docs/Changelog.md | 3 +++ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c8d469678..daf98d197 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,12 +48,12 @@ android { if (versionName != androidGitVersion.name()) { throw new GradleException("Version name mismatch, expected ${androidGitVersion.name()}, got $versionName") } - multiDexEnabled true - testInstrumentationRunner "com.pitchedapps.frost.FrostTestRunner" - javaCompileOptions { - annotationProcessorOptions { - arguments = ["room.schemaLocation": "$projectDir/src/schemas".toString()] - } + } + multiDexEnabled true + testInstrumentationRunner "com.pitchedapps.frost.FrostTestRunner" + javaCompileOptions { + annotationProcessorOptions { + arguments = ["room.schemaLocation": "$projectDir/src/schemas".toString()] } } } diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew index 844d7f61e..9c5d87065 100644 --- a/app/src/main/play/en-US/whatsnew +++ b/app/src/main/play/en-US/whatsnew @@ -1,5 +1,3 @@ -v2.4.5 +v2.4.6 -* Fix url query encoding -* Add option to make images full screen (settings > news feed) -* Auto expand text area when typing \ No newline at end of file +* Add option to hide likes and action bar in newsfeed \ No newline at end of file diff --git a/docs/Changelog.md b/docs/Changelog.md index 6af4b6ace..ac484d969 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -1,5 +1,8 @@ # Changelog +## v2.4.6 +* Add option to hide likes and action bar in newsfeed + ## v2.4.5 * Fix url query encoding * Add option to make images full screen (settings > news feed)