aboutsummaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt18
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt1
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/contracts/ActivityContract.kt1
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/enums/Theme.kt12
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/facebook/FbUrlFormatter.kt1
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/facebook/parsers/SearchParser.kt3
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt1
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt3
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/kotlin/Flyweight.kt4
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/prefs/OldPrefs.kt149
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/prefs/Prefs.kt226
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/BehaviourPrefs.kt108
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/CorePrefs.kt120
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/FeedPrefs.kt97
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/NotifPrefs.kt111
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/ThemePrefs.kt146
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt3
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/services/NotificationUtils.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/services/UpdateReceiver.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/Const.kt1
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt5
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/views/FrostContentView.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt1
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt3
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt3
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt10
43 files changed, 839 insertions, 228 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
index 4640735b..aaaaf605 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
@@ -28,12 +28,12 @@ import com.bugsnag.android.Bugsnag
import com.bugsnag.android.Configuration
import com.pitchedapps.frost.db.FrostDatabase
import com.pitchedapps.frost.facebook.FbCookie
+import com.pitchedapps.frost.prefs.Prefs
import com.pitchedapps.frost.services.scheduleNotificationsFromPrefs
import com.pitchedapps.frost.services.setupNotificationChannels
import com.pitchedapps.frost.utils.BuildUtils
import com.pitchedapps.frost.utils.FrostPglAdBlock
import com.pitchedapps.frost.utils.L
-import com.pitchedapps.frost.prefs.Prefs
import com.pitchedapps.frost.utils.Showcase
import java.util.Random
import org.koin.android.ext.koin.androidContext
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt
index e690f3ca..b2031f96 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt
@@ -37,10 +37,10 @@ import com.pitchedapps.frost.db.CookieEntity
import com.pitchedapps.frost.db.GenericDao
import com.pitchedapps.frost.db.selectAll
import com.pitchedapps.frost.facebook.FbCookie
+import com.pitchedapps.frost.prefs.Prefs
import com.pitchedapps.frost.utils.BiometricUtils
import com.pitchedapps.frost.utils.EXTRA_COOKIES
import com.pitchedapps.frost.utils.L
-import com.pitchedapps.frost.prefs.Prefs
import com.pitchedapps.frost.utils.launchNewTask
import com.pitchedapps.frost.utils.loadAssets
import java.util.ArrayList
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
index 685002d5..7a54a567 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
@@ -47,8 +47,8 @@ import com.mikepenz.iconics.typeface.library.community.material.CommunityMateria
import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
import com.pitchedapps.frost.BuildConfig
import com.pitchedapps.frost.R
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import org.koin.android.ext.android.inject
/**
@@ -108,13 +108,15 @@ class AboutActivity : AboutActivityBase(null) {
isOpenSource = true,
libraryDescription = string(R.string.frost_description),
libraryVersion = BuildConfig.VERSION_NAME,
- licenses = setOf(License(
- definedName = "gplv3",
- licenseName = "GNU GPL v3",
- licenseWebsite = "https://www.gnu.org/licenses/gpl-3.0.en.html",
- licenseDescription = "",
- licenseShortDescription = ""
- ))
+ licenses = setOf(
+ License(
+ definedName = "gplv3",
+ licenseName = "GNU GPL v3",
+ licenseWebsite = "https://www.gnu.org/licenses/gpl-3.0.en.html",
+ licenseDescription = "",
+ licenseShortDescription = ""
+ )
+ )
)
adapter.add(LibraryIItem(frost)).add(AboutLinks())
adapter.onClickListener = { _, _, item, _ ->
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
index 4554432b..54baa184 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
@@ -30,8 +30,8 @@ import com.pitchedapps.frost.R
import com.pitchedapps.frost.databinding.ActivityDebugBinding
import com.pitchedapps.frost.facebook.FbItem
import com.pitchedapps.frost.injectors.JsActions
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.createFreshDir
import com.pitchedapps.frost.utils.setFrostColors
import java.io.File
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
index 4c75730d..bcfd9c99 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
@@ -55,11 +55,11 @@ import com.pitchedapps.frost.facebook.get
import com.pitchedapps.frost.facebook.requests.call
import com.pitchedapps.frost.facebook.requests.getFullSizedImageUrl
import com.pitchedapps.frost.facebook.requests.requestBuilder
+import com.pitchedapps.frost.prefs.Prefs
import com.pitchedapps.frost.services.LocalService
import com.pitchedapps.frost.utils.ARG_COOKIE
import com.pitchedapps.frost.utils.ARG_IMAGE_URL
import com.pitchedapps.frost.utils.ARG_TEXT
-import com.pitchedapps.frost.prefs.Prefs
import com.pitchedapps.frost.utils.frostDownload
import com.pitchedapps.frost.utils.frostSnackbar
import com.pitchedapps.frost.utils.frostUriFromFile
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
index efb9956c..31cf1684 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
@@ -28,7 +28,6 @@ import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentPagerAdapter
import androidx.viewpager.widget.ViewPager
import ca.allanwang.kau.internal.KauBaseActivity
-import ca.allanwang.kau.utils.blendWith
import ca.allanwang.kau.utils.color
import ca.allanwang.kau.utils.fadeScaleTransition
import ca.allanwang.kau.utils.navigationBarColor
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
index cec8d494..ef5b0b85 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
@@ -43,6 +43,7 @@ import com.pitchedapps.frost.R
import com.pitchedapps.frost.db.NotificationDao
import com.pitchedapps.frost.enums.Support
import com.pitchedapps.frost.facebook.FbCookie
+import com.pitchedapps.frost.prefs.Prefs
import com.pitchedapps.frost.settings.getAppearancePrefs
import com.pitchedapps.frost.settings.getBehaviourPrefs
import com.pitchedapps.frost.settings.getDebugPrefs
@@ -52,7 +53,6 @@ import com.pitchedapps.frost.settings.getNotificationPrefs
import com.pitchedapps.frost.settings.getSecurityPrefs
import com.pitchedapps.frost.settings.sendDebug
import com.pitchedapps.frost.utils.L
-import com.pitchedapps.frost.prefs.Prefs
import com.pitchedapps.frost.utils.REQUEST_REFRESH
import com.pitchedapps.frost.utils.REQUEST_RESTART
import com.pitchedapps.frost.utils.cookies
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/contracts/ActivityContract.kt b/app/src/main/kotlin/com/pitchedapps/frost/contracts/ActivityContract.kt
index 385c2919..84edfee9 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/contracts/ActivityContract.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/contracts/ActivityContract.kt
@@ -33,6 +33,7 @@ interface MainActivityContract : ActivityContract, MainFabContract {
val headerBadgeChannel: BroadcastChannel<String>
fun setTitle(res: Int)
fun setTitle(text: CharSequence)
+
/**
* Available on all threads
*/
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 d682ad3b..bb2514f5 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/enums/Theme.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/enums/Theme.kt
@@ -22,7 +22,7 @@ import com.pitchedapps.frost.R
import com.pitchedapps.frost.injectors.CssAssets
import com.pitchedapps.frost.injectors.InjectorContract
import com.pitchedapps.frost.injectors.JsActions
-import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.prefs.sections.ThemePrefs
/**
* Created by Allan Wang on 2017-06-14.
@@ -33,11 +33,11 @@ const val BLUE_LIGHT = 0xff5d86dd.toInt()
enum class Theme(
@StringRes val textRes: Int,
val injector: InjectorContract,
- val textColorGetter: (Prefs) -> Int,
- val accentColorGetter: (Prefs) -> Int,
- val backgroundColorGetter: (Prefs) -> Int,
- val headerColorGetter: (Prefs) -> Int,
- val iconColorGetter: (Prefs) -> Int
+ val textColorGetter: (ThemePrefs) -> Int,
+ val accentColorGetter: (ThemePrefs) -> Int,
+ val backgroundColorGetter: (ThemePrefs) -> Int,
+ val headerColorGetter: (ThemePrefs) -> Int,
+ val iconColorGetter: (ThemePrefs) -> Int
) {
DEFAULT(R.string.kau_default,
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 e36abd15..61745b95 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
@@ -41,6 +41,7 @@ const val FB_HOME_URL = "${FB_URL_BASE}home.php"
// Default user agent
const val USER_AGENT_MOBILE_CONST =
"Mozilla/5.0 (Linux; Android 8.0.0; ONEPLUS A3000) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36"
+
// Desktop agent, for pages like messages
const val USER_AGENT_DESKTOP_CONST =
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Safari/537.36"
@@ -52,6 +53,7 @@ const val USER_AGENT = USER_AGENT_DESKTOP_CONST
* have properly set in
*/
const val WEB_LOAD_DELAY = 50L
+
/**
* Additional delay for transition when called from commit.
* Note that transitions are also called from onFinish, so this value
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 6356ff75..e66eaf27 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
@@ -24,8 +24,8 @@ import com.pitchedapps.frost.db.CookieEntity
import com.pitchedapps.frost.db.deleteById
import com.pitchedapps.frost.db.save
import com.pitchedapps.frost.db.selectById
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.cookies
import com.pitchedapps.frost.utils.launchLogin
import kotlin.coroutines.resume
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt
index 8d200c4f..1a93393b 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt
@@ -55,6 +55,7 @@ enum class FbItem(
PHOTOS(R.string.photos, GoogleMaterial.Icon.gmd_photo, "me/photos"),
PROFILE(R.string.profile, CommunityMaterial.Icon.cmd_account, "me"),
SAVED(R.string.saved, GoogleMaterial.Icon.gmd_bookmark, "saved"),
+
/**
* Note that this url only works if a query (?q=) is provided
*/
@@ -63,6 +64,7 @@ enum class FbItem(
GoogleMaterial.Icon.gmd_search,
"search/top"
),
+
/**
* Non mbasic search cannot be parsed.
*/
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbUrlFormatter.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbUrlFormatter.kt
index 093c8c94..8ee85752 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbUrlFormatter.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbUrlFormatter.kt
@@ -114,6 +114,7 @@ class FbUrlFormatter(url: String) {
companion object {
const val VIDEO_REDIRECT = "/video_redirect/?src="
+
/**
* Items here are explicitly removed from the url
* Taken from FaceSlim
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/parsers/SearchParser.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/parsers/SearchParser.kt
index 42a6ab53..68c629a9 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/parsers/SearchParser.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/parsers/SearchParser.kt
@@ -32,7 +32,8 @@ import org.jsoup.nodes.Element
*/
object SearchParser : FrostParser<FrostSearches> by SearchParserImpl() {
fun query(cookie: String?, input: String): ParseResponse<FrostSearches>? {
- val url = "${FbItem._SEARCH_PARSE.url}/?q=${if (input.isNotBlank()) input.urlEncode() else "a"}"
+ val url =
+ "${FbItem._SEARCH_PARSE.url}/?q=${if (input.isNotBlank()) input.urlEncode() else "a"}"
L._i { "Search Query $url" }
return parseFromUrl(cookie, url)
}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt
index 5ad459f8..0232694e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt
@@ -34,9 +34,9 @@ import com.pitchedapps.frost.contracts.MainFabContract
import com.pitchedapps.frost.enums.FeedSort
import com.pitchedapps.frost.facebook.FbCookie
import com.pitchedapps.frost.facebook.FbItem
+import com.pitchedapps.frost.prefs.Prefs
import com.pitchedapps.frost.utils.ARG_URL
import com.pitchedapps.frost.utils.L
-import com.pitchedapps.frost.prefs.Prefs
import com.pitchedapps.frost.utils.REQUEST_REFRESH
import com.pitchedapps.frost.utils.REQUEST_TEXT_ZOOM
import com.pitchedapps.frost.utils.frostEvent
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
index b13102f7..abbfc639 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
@@ -25,7 +25,6 @@ import ca.allanwang.kau.ui.createSimpleRippleDrawable
import ca.allanwang.kau.utils.bindView
import ca.allanwang.kau.utils.gone
import ca.allanwang.kau.utils.visible
-import ca.allanwang.kau.utils.withAlpha
import com.mikepenz.fastadapter.FastAdapter
import com.mikepenz.fastadapter.adapters.ItemAdapter
import com.mikepenz.fastadapter.diff.DiffCallback
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt
index 4b93bb3a..9aaf5c9d 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt
@@ -26,8 +26,8 @@ import ca.allanwang.kau.utils.colorToForeground
import ca.allanwang.kau.utils.toRgbaString
import ca.allanwang.kau.utils.use
import ca.allanwang.kau.utils.withAlpha
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import java.io.BufferedReader
import java.io.FileNotFoundException
import java.util.Locale
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 fbd10b18..b629fb91 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
@@ -20,8 +20,8 @@ import android.content.Context
import android.webkit.WebView
import androidx.annotation.VisibleForTesting
import ca.allanwang.kau.kotlin.lazyContext
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import java.io.BufferedReader
import java.io.FileNotFoundException
import java.util.Locale
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt
index 73a62f17..2959974f 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt
@@ -18,8 +18,8 @@ package com.pitchedapps.frost.injectors
import android.webkit.WebView
import androidx.annotation.VisibleForTesting
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.web.FrostWebViewClient
import kotlin.random.Random
import org.apache.commons.text.StringEscapeUtils
@@ -85,6 +85,7 @@ class JsBuilder {
*/
interface InjectorContract {
fun inject(webView: WebView, prefs: Prefs)
+
/**
* Toggle the injector (usually through Prefs
* If false, will fallback to an empty action
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/kotlin/Flyweight.kt b/app/src/main/kotlin/com/pitchedapps/frost/kotlin/Flyweight.kt
index 55a4c372..854dcf28 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/kotlin/Flyweight.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/kotlin/Flyweight.kt
@@ -45,15 +45,19 @@ class Flyweight<K, V>(
// Receives a key and a pending request
private val actionChannel = Channel<Pair<K, CompletableDeferred<V>>>(Channel.UNLIMITED)
+
// Receives a key to invalidate the associated value
private val invalidatorChannel = Channel<K>(Channel.UNLIMITED)
+
// Receives a key and the resulting value
private val receiverChannel = Channel<Pair<K, Result<V>>>(Channel.UNLIMITED)
// Keeps track of keys and associated update times
private val conditionMap: MutableMap<K, Long> = mutableMapOf()
+
// Keeps track of keys and associated values
private val resultMap: MutableMap<K, Result<V>> = mutableMapOf()
+
// Keeps track of unfulfilled actions
// Note that the explicit type is very important here. See https://youtrack.jetbrains.net/issue/KT-18053
private val pendingMap: MutableMap<K, MutableList<CompletableDeferred<V>>> = ConcurrentHashMap()
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/prefs/OldPrefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/prefs/OldPrefs.kt
new file mode 100644
index 00000000..954c7f9a
--- /dev/null
+++ b/app/src/main/kotlin/com/pitchedapps/frost/prefs/OldPrefs.kt
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2018 Allan Wang
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.pitchedapps.frost.prefs
+
+import ca.allanwang.kau.kpref.KPref
+import ca.allanwang.kau.kpref.KPrefFactory
+import com.pitchedapps.frost.BuildConfig
+import com.pitchedapps.frost.enums.FeedSort
+
+/**
+ * Created by Allan Wang on 2017-05-28.
+ *
+ * Shared Preference object with lazy cached retrievals
+ *
+ * As of 2020-07-18, prefs have been split up into multiple folders
+ */
+@Deprecated(level = DeprecationLevel.WARNING, message = "Use pref segments")
+class OldPrefs(factory: KPrefFactory) : KPref("${BuildConfig.APPLICATION_ID}.prefs", factory) {
+
+ var lastLaunch: Long by kpref("last_launch", -1L)
+
+ var userId: Long by kpref("user_id", -1L)
+
+ var prevId: Long by kpref("prev_id", -1L)
+
+ var theme: Int by kpref("theme", 0)
+
+ var customTextColor: Int by kpref("color_text", 0xffeceff1.toInt())
+
+ var customAccentColor: Int by kpref("color_accent", 0xff0288d1.toInt())
+
+ var customBackgroundColor: Int by kpref("color_bg", 0xff212121.toInt())
+
+ var customHeaderColor: Int by kpref("color_header", 0xff01579b.toInt())
+
+ var customIconColor: Int by kpref("color_icons", 0xffeceff1.toInt())
+
+ var exitConfirmation: Boolean by kpref("exit_confirmation", true)
+
+ var notificationFreq: Long by kpref("notification_freq", 15L)
+
+ var versionCode: Int by kpref("version_code", -1)
+
+ var prevVersionCode: Int by kpref("prev_version_code", -1)
+
+ var installDate: Long by kpref("install_date", -1L)
+
+ var identifier: Int by kpref("identifier", -1)
+
+ var tintNavBar: Boolean by kpref("tint_nav_bar", true)
+
+ var webTextScaling: Int by kpref("web_text_scaling", 100)
+
+ var feedSort: Int by kpref("feed_sort", FeedSort.DEFAULT.ordinal)
+
+ var aggressiveRecents: Boolean by kpref("aggressive_recents", false)
+
+ var showComposer: Boolean by kpref("status_composer_feed", true)
+
+ var showSuggestedFriends: Boolean by kpref("suggested_friends_feed", true)
+
+ var showSuggestedGroups: Boolean by kpref("suggested_groups_feed", true)
+
+ var showFacebookAds: Boolean by kpref("facebook_ads", false)
+
+ var showStories: Boolean by kpref("show_stories", true)
+
+ var animate: Boolean by kpref("fancy_animations", true)
+
+ var notificationKeywords: Set<String> by kpref("notification_keywords", mutableSetOf())
+
+ var notificationsGeneral: Boolean by kpref("notification_general", true)
+
+ var notificationAllAccounts: Boolean by kpref("notification_all_accounts", true)
+
+ var notificationsInstantMessages: Boolean by kpref("notification_im", true)
+
+ var notificationsImAllAccounts: Boolean by kpref("notification_im_all_accounts", false)
+
+ var notificationVibrate: Boolean by kpref("notification_vibrate", true)
+
+ var notificationSound: Boolean by kpref("notification_sound", true)
+
+ var notificationRingtone: String by kpref("notification_ringtone", "")
+
+ var messageRingtone: String by kpref("message_ringtone", "")
+
+ var notificationLights: Boolean by kpref("notification_lights", true)
+
+ var messageScrollToBottom: Boolean by kpref("message_scroll_to_bottom", false)
+
+ var enablePip: Boolean by kpref("enable_pip", true)
+
+ /**
+ * Despite the naming, this toggle currently only enables debug logging.
+ * Verbose is never logged in release builds.
+ */
+ var verboseLogging: Boolean by kpref("verbose_logging", false)
+
+ var analytics: Boolean by kpref("analytics", false) {
+// if (!BuildConfig.DEBUG) {
+// if (it) {
+// Bugsnag.setAutoCaptureSessions(true)
+// Bugsnag.enableExceptionHandler()
+// } else {
+// Bugsnag.setAutoCaptureSessions(false)
+// Bugsnag.disableExceptionHandler()
+// }
+// }
+ }
+
+ var biometricsEnabled: Boolean by kpref("biometrics_enabled", false)
+
+ var overlayEnabled: Boolean by kpref("overlay_enabled", true)
+
+ var overlayFullScreenSwipe: Boolean by kpref("overlay_full_screen_swipe", true)
+
+ var viewpagerSwipe: Boolean by kpref("viewpager_swipe", true)
+
+ var loadMediaOnMeteredNetwork: Boolean by kpref("media_on_metered_network", true)
+
+ var debugSettings: Boolean by kpref("debug_settings", false)
+
+ var linksInDefaultApp: Boolean by kpref("link_in_default_app", false)
+
+ var mainActivityLayoutType: Int by kpref("main_activity_layout_type", 0)
+
+ var blackMediaBg: Boolean by kpref("black_media_bg", false)
+
+ var autoRefreshFeed: Boolean by kpref("auto_refresh_feed", false)
+
+ var showCreateFab: Boolean by kpref("show_create_fab", true)
+
+ var fullSizeImage: Boolean by kpref("full_size_image", false)
+}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/prefs/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/prefs/Prefs.kt
index a745c9b2..ec0a9cad 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/prefs/Prefs.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/prefs/Prefs.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2018 Allan Wang
+ * Copyright 2020 Allan Wang
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,197 +16,53 @@
*/
package com.pitchedapps.frost.prefs
-import android.graphics.Color
-import ca.allanwang.kau.kotlin.lazyResettable
-import ca.allanwang.kau.kpref.KPref
-import ca.allanwang.kau.kpref.KPrefFactory
-import ca.allanwang.kau.utils.colorToForeground
-import ca.allanwang.kau.utils.isColorVisibleOn
-import ca.allanwang.kau.utils.withAlpha
-import com.pitchedapps.frost.BuildConfig
-import com.pitchedapps.frost.enums.FACEBOOK_BLUE
-import com.pitchedapps.frost.enums.FeedSort
-import com.pitchedapps.frost.enums.MainActivityLayout
-import com.pitchedapps.frost.enums.Theme
-import com.pitchedapps.frost.injectors.InjectorContract
+import com.pitchedapps.frost.prefs.sections.BehaviourPrefs
+import com.pitchedapps.frost.prefs.sections.BehaviourPrefsImpl
+import com.pitchedapps.frost.prefs.sections.CorePrefs
+import com.pitchedapps.frost.prefs.sections.CorePrefsImpl
+import com.pitchedapps.frost.prefs.sections.FeedPrefs
+import com.pitchedapps.frost.prefs.sections.FeedPrefsImpl
+import com.pitchedapps.frost.prefs.sections.NotifPrefs
+import com.pitchedapps.frost.prefs.sections.NotifPrefsImpl
+import com.pitchedapps.frost.prefs.sections.ThemePrefs
+import com.pitchedapps.frost.prefs.sections.ThemePrefsImpl
import org.koin.core.context.KoinContextHandler
import org.koin.dsl.module
-/**
- * Created by Allan Wang on 2017-05-28.
- *
- * Shared Preference object with lazy cached retrievals
- */
-class Prefs(factory: KPrefFactory) : KPref("${BuildConfig.APPLICATION_ID}.prefs", factory) {
-
- var lastLaunch: Long by kpref("last_launch", -1L)
-
- var userId: Long by kpref("user_id", -1L)
-
- var prevId: Long by kpref("prev_id", -1L)
-
- var theme: Int by kpref("theme", 0) { _: Int ->
- loader.invalidate()
- }
-
- var customTextColor: Int by kpref("color_text", 0xffeceff1.toInt())
-
- var customAccentColor: Int by kpref("color_accent", 0xff0288d1.toInt())
-
- var customBackgroundColor: Int by kpref("color_bg", 0xff212121.toInt())
-
- var customHeaderColor: Int by kpref("color_header", 0xff01579b.toInt())
-
- var customIconColor: Int by kpref("color_icons", 0xffeceff1.toInt())
-
- var exitConfirmation: Boolean by kpref("exit_confirmation", true)
-
- var notificationFreq: Long by kpref("notification_freq", 15L)
-
- var versionCode: Int by kpref("version_code", -1)
-
- var prevVersionCode: Int by kpref("prev_version_code", -1)
-
- var installDate: Long by kpref("install_date", -1L)
-
- var identifier: Int by kpref("identifier", -1)
-
- private val loader = lazyResettable { Theme.values[theme] }
-
- val t: Theme by loader
-
- val textColor: Int
- get() = t.textColorGetter(this)
-
- val accentColor: Int
- get() = t.accentColorGetter(this)
-
- inline val accentColorForWhite: Int
- get() = when {
- accentColor.isColorVisibleOn(Color.WHITE) -> accentColor
- textColor.isColorVisibleOn(Color.WHITE) -> textColor
- else -> FACEBOOK_BLUE
- }
-
- inline val nativeBgColor: Int
- get() = bgColor.withAlpha(30)
-
- fun nativeBgColor(unread: Boolean) = bgColor
- .colorToForeground(if (unread) 0.7f else 0.0f)
- .withAlpha(30)
-
- val bgColor: Int
- get() = t.backgroundColorGetter(this)
-
- val headerColor: Int
- get() = t.headerColorGetter(this)
-
- val iconColor: Int
- get() = t.iconColorGetter(this)
-
- val themeInjector: InjectorContract
- get() = t.injector
-
- val isCustomTheme: Boolean
- get() = t == Theme.CUSTOM
-
- inline val frostId: String
- get() = "$installDate-$identifier"
-
- var tintNavBar: Boolean by kpref("tint_nav_bar", true)
-
- var webTextScaling: Int by kpref("web_text_scaling", 100)
-
- var feedSort: Int by kpref("feed_sort", FeedSort.DEFAULT.ordinal)
-
- var aggressiveRecents: Boolean by kpref("aggressive_recents", false)
-
- var showComposer: Boolean by kpref("status_composer_feed", true)
-
- var showSuggestedFriends: Boolean by kpref("suggested_friends_feed", true)
-
- var showSuggestedGroups: Boolean by kpref("suggested_groups_feed", true)
-
- var showFacebookAds: Boolean by kpref("facebook_ads", false)
-
- var showStories: Boolean by kpref("show_stories", true)
-
- var animate: Boolean by kpref("fancy_animations", true)
-
- var notificationKeywords: Set<String> by kpref("notification_keywords", mutableSetOf())
-
- var notificationsGeneral: Boolean by kpref("notification_general", true)
-
- var notificationAllAccounts: Boolean by kpref("notification_all_accounts", true)
-
- var notificationsInstantMessages: Boolean by kpref("notification_im", true)
-
- var notificationsImAllAccounts: Boolean by kpref("notification_im_all_accounts", false)
-
- var notificationVibrate: Boolean by kpref("notification_vibrate", true)
-
- var notificationSound: Boolean by kpref("notification_sound", true)
-
- var notificationRingtone: String by kpref("notification_ringtone", "")
-
- var messageRingtone: String by kpref("message_ringtone", "")
-
- var notificationLights: Boolean by kpref("notification_lights", true)
-
- var messageScrollToBottom: Boolean by kpref("message_scroll_to_bottom", false)
-
- var enablePip: Boolean by kpref("enable_pip", true)
-
- /**
- * Despite the naming, this toggle currently only enables debug logging.
- * Verbose is never logged in release builds.
- */
- var verboseLogging: Boolean by kpref("verbose_logging", false)
-
- var analytics: Boolean by kpref("analytics", false) {
-// if (!BuildConfig.DEBUG) {
-// if (it) {
-// Bugsnag.setAutoCaptureSessions(true)
-// Bugsnag.enableExceptionHandler()
-// } else {
-// Bugsnag.setAutoCaptureSessions(false)
-// Bugsnag.disableExceptionHandler()
-// }
-// }
- }
-
- var biometricsEnabled: Boolean by kpref("biometrics_enabled", false)
-
- var overlayEnabled: Boolean by kpref("overlay_enabled", true)
-
- var overlayFullScreenSwipe: Boolean by kpref("overlay_full_screen_swipe", true)
-
- var viewpagerSwipe: Boolean by kpref("viewpager_swipe", true)
-
- var loadMediaOnMeteredNetwork: Boolean by kpref("media_on_metered_network", true)
-
- var debugSettings: Boolean by kpref("debug_settings", false)
-
- var linksInDefaultApp: Boolean by kpref("link_in_default_app", false)
-
- var mainActivityLayoutType: Int by kpref("main_activity_layout_type", 0)
-
- var blackMediaBg: Boolean by kpref("black_media_bg", false)
-
- var autoRefreshFeed: Boolean by kpref("auto_refresh_feed", false)
-
- var showCreateFab: Boolean by kpref("show_create_fab", true)
-
- var fullSizeImage: Boolean by kpref("full_size_image", false)
-
- inline val mainActivityLayout: MainActivityLayout
- get() = MainActivityLayout(mainActivityLayoutType)
-
+interface Prefs : BehaviourPrefs, CorePrefs, FeedPrefs, NotifPrefs, ThemePrefs {
companion object {
fun get(): Prefs = KoinContextHandler.get().get()
fun module() = module {
- single { Prefs(get()) }
+ single<BehaviourPrefs> { BehaviourPrefsImpl(factory = get()) }
+ single<CorePrefs> { CorePrefsImpl(factory = get()) }
+ single<FeedPrefs> { FeedPrefsImpl(factory = get()) }
+ single<NotifPrefs> { NotifPrefsImpl(factory = get()) }
+ single<ThemePrefs> { ThemePrefsImpl(factory = get()) }
+ single<Prefs> {
+ PrefsImpl(
+ behaviourPrefs = get(),
+ corePrefs = get(),
+ feedPrefs = get(),
+ notifPrefs = get(),
+ themePrefs = get()
+ )
+ }
+ // Needed for migration
+ single<OldPrefs> { OldPrefs(factory = get()) }
}
}
}
+
+class PrefsImpl(
+ behaviourPrefs: BehaviourPrefs,
+ corePrefs: CorePrefs,
+ feedPrefs: FeedPrefs,
+ notifPrefs: NotifPrefs,
+ themePrefs: ThemePrefs
+) : Prefs,
+ BehaviourPrefs by behaviourPrefs,
+ CorePrefs by corePrefs,
+ FeedPrefs by feedPrefs,
+ NotifPrefs by notifPrefs,
+ ThemePrefs by themePrefs
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/BehaviourPrefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/BehaviourPrefs.kt
new file mode 100644
index 00000000..ea55f7e3
--- /dev/null
+++ b/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/BehaviourPrefs.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2020 Allan Wang
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.pitchedapps.frost.prefs.sections
+
+import ca.allanwang.kau.kpref.KPref
+import ca.allanwang.kau.kpref.KPrefFactory
+import com.pitchedapps.frost.BuildConfig
+import com.pitchedapps.frost.prefs.OldPrefs
+import org.koin.core.KoinComponent
+import org.koin.core.inject
+
+interface BehaviourPrefs {
+ var biometricsEnabled: Boolean
+
+ var overlayEnabled: Boolean
+
+ var overlayFullScreenSwipe: Boolean
+
+ var viewpagerSwipe: Boolean
+
+ var loadMediaOnMeteredNetwork: Boolean
+
+ var debugSettings: Boolean
+
+ var linksInDefaultApp: Boolean
+
+ var blackMediaBg: Boolean
+
+ var autoRefreshFeed: Boolean
+
+ var showCreateFab: Boolean
+
+ var fullSizeImage: Boolean
+}
+
+class BehaviourPrefsImpl(
+ factory: KPrefFactory
+) : KPref("${BuildConfig.APPLICATION_ID}.prefs.behaviour", factory),
+ BehaviourPrefs, KoinComponent {
+
+ private val oldPrefs: OldPrefs by inject()
+
+ override var biometricsEnabled: Boolean by kpref(
+ "biometrics_enabled",
+ oldPrefs.biometricsEnabled /* false */
+ )
+
+ override var overlayEnabled: Boolean by kpref(
+ "overlay_enabled",
+ oldPrefs.overlayEnabled /* true */
+ )
+
+ override var overlayFullScreenSwipe: Boolean by kpref(
+ "overlay_full_screen_swipe",
+ oldPrefs.overlayFullScreenSwipe /* true */
+ )
+
+ override var viewpagerSwipe: Boolean by kpref(
+ "viewpager_swipe",
+ oldPrefs.viewpagerSwipe /* true */
+ )
+
+ override var loadMediaOnMeteredNetwork: Boolean by kpref(
+ "media_on_metered_network",
+ oldPrefs.loadMediaOnMeteredNetwork /* true */
+ )
+
+ override var debugSettings: Boolean by kpref(
+ "debug_settings",
+ oldPrefs.debugSettings /* false */
+ )
+
+ override var linksInDefaultApp: Boolean by kpref(
+ "link_in_default_app",
+ oldPrefs.linksInDefaultApp /* false */
+ )
+
+ override var blackMediaBg: Boolean by kpref("black_media_bg", oldPrefs.blackMediaBg /* false */)
+
+ override var autoRefreshFeed: Boolean by kpref(
+ "auto_refresh_feed",
+ oldPrefs.autoRefreshFeed /* false */
+ )
+
+ override var showCreateFab: Boolean by kpref(
+ "show_create_fab",
+ oldPrefs.showCreateFab /* true */
+ )
+
+ override var fullSizeImage: Boolean by kpref(
+ "full_size_image",
+ oldPrefs.fullSizeImage /* false */
+ )
+}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/CorePrefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/CorePrefs.kt
new file mode 100644
index 00000000..f5cab25e
--- /dev/null
+++ b/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/CorePrefs.kt
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2020 Allan Wang
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.pitchedapps.frost.prefs.sections
+
+import ca.allanwang.kau.kpref.KPref
+import ca.allanwang.kau.kpref.KPrefFactory
+import com.pitchedapps.frost.BuildConfig
+import com.pitchedapps.frost.prefs.OldPrefs
+import org.koin.core.KoinComponent
+import org.koin.core.inject
+
+interface CorePrefs {
+ var lastLaunch: Long
+
+ var userId: Long
+
+ var prevId: Long
+
+ val frostId: String
+
+ var versionCode: Int
+
+ var prevVersionCode: Int
+
+ var installDate: Long
+
+ var identifier: Int
+
+ /**
+ * Despite the naming, this toggle currently only enables debug logging.
+ * Verbose is never logged in release builds.
+ */
+ var verboseLogging: Boolean
+
+ /**
+ * True to enable analytic reports (BugSnag)
+ */
+ var analytics: Boolean
+
+ var enablePip: Boolean
+
+ var exitConfirmation: Boolean
+
+ var animate: Boolean
+
+ var messageScrollToBottom: Boolean
+}
+
+class CorePrefsImpl(
+ factory: KPrefFactory
+) : KPref("${BuildConfig.APPLICATION_ID}.prefs.core", factory),
+ CorePrefs, KoinComponent {
+
+ private val oldPrefs: OldPrefs by inject()
+
+ override var lastLaunch: Long by kpref("last_launch", oldPrefs.lastLaunch /* -1L */)
+
+ override var userId: Long by kpref("user_id", oldPrefs.userId /* -1L */)
+
+ override var prevId: Long by kpref("prev_id", oldPrefs.prevId /* -1L */)
+
+ override val frostId: String
+ get() = "$installDate-$identifier"
+
+ override var versionCode: Int by kpref("version_code", oldPrefs.versionCode /* -1 */)
+
+ override var prevVersionCode: Int by kpref(
+ "prev_version_code",
+ oldPrefs.prevVersionCode /* -1 */
+ )
+
+ override var installDate: Long by kpref("install_date", oldPrefs.installDate /* -1L */)
+
+ override var identifier: Int by kpref("identifier", oldPrefs.identifier /* -1 */)
+
+ override var verboseLogging: Boolean by kpref(
+ "verbose_logging",
+ oldPrefs.verboseLogging /* false */
+ )
+
+ override var analytics: Boolean by kpref("analytics", oldPrefs.analytics /* false */) {
+// if (!BuildConfig.DEBUG) {
+// if (it) {
+// Bugsnag.setAutoCaptureSessions(true)
+// Bugsnag.enableExceptionHandler()
+// } else {
+// Bugsnag.setAutoCaptureSessions(false)
+// Bugsnag.disableExceptionHandler()
+// }
+// }
+ }
+
+ override var enablePip: Boolean by kpref("enable_pip", oldPrefs.enablePip /* true */)
+
+ override var exitConfirmation: Boolean by kpref(
+ "exit_confirmation",
+ oldPrefs.exitConfirmation /* true */
+ )
+
+ override var animate: Boolean by kpref("fancy_animations", oldPrefs.animate /* true */)
+
+ override var messageScrollToBottom: Boolean by kpref(
+ "message_scroll_to_bottom",
+ oldPrefs.messageScrollToBottom /* false */
+ )
+}
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
new file mode 100644
index 00000000..e99bce75
--- /dev/null
+++ b/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/FeedPrefs.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2020 Allan Wang
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.pitchedapps.frost.prefs.sections
+
+import ca.allanwang.kau.kpref.KPref
+import ca.allanwang.kau.kpref.KPrefFactory
+import com.pitchedapps.frost.BuildConfig
+import com.pitchedapps.frost.enums.MainActivityLayout
+import com.pitchedapps.frost.prefs.OldPrefs
+import org.koin.core.KoinComponent
+import org.koin.core.inject
+
+interface FeedPrefs {
+ var webTextScaling: Int
+
+ var feedSort: Int
+
+ var aggressiveRecents: Boolean
+
+ var showComposer: Boolean
+
+ var showSuggestedFriends: Boolean
+
+ var showSuggestedGroups: Boolean
+
+ var showFacebookAds: Boolean
+
+ var showStories: Boolean
+
+ var mainActivityLayoutType: Int
+
+ val mainActivityLayout: MainActivityLayout
+}
+
+class FeedPrefsImpl(
+ factory: KPrefFactory
+) : KPref("${BuildConfig.APPLICATION_ID}.prefs.feed", factory),
+ FeedPrefs, KoinComponent {
+
+ private val oldPrefs: OldPrefs by inject()
+
+ override var webTextScaling: Int by kpref("web_text_scaling", oldPrefs.webTextScaling /* 100 */)
+
+ override var feedSort: Int by kpref(
+ "feed_sort",
+ oldPrefs.feedSort /* FeedSort.DEFAULT.ordinal */
+ )
+
+ override var aggressiveRecents: Boolean by kpref(
+ "aggressive_recents",
+ oldPrefs.aggressiveRecents /* false */
+ )
+
+ override var showComposer: Boolean by kpref(
+ "status_composer_feed",
+ oldPrefs.showComposer /* true */
+ )
+
+ override var showSuggestedFriends: Boolean by kpref(
+ "suggested_friends_feed",
+ oldPrefs.showSuggestedFriends /* true */
+ )
+
+ override var showSuggestedGroups: Boolean by kpref(
+ "suggested_groups_feed",
+ oldPrefs.showSuggestedGroups /* true */
+ )
+
+ override var showFacebookAds: Boolean by kpref(
+ "facebook_ads",
+ oldPrefs.showFacebookAds /* false */
+ )
+
+ override var showStories: Boolean by kpref("show_stories", oldPrefs.showStories /* true */)
+
+ override var mainActivityLayoutType: Int by kpref(
+ "main_activity_layout_type",
+ oldPrefs.mainActivityLayoutType /* 0 */
+ )
+
+ override val mainActivityLayout: MainActivityLayout
+ get() = MainActivityLayout(mainActivityLayoutType)
+}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/NotifPrefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/NotifPrefs.kt
new file mode 100644
index 00000000..45d12453
--- /dev/null
+++ b/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/NotifPrefs.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2020 Allan Wang
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.pitchedapps.frost.prefs.sections
+
+import ca.allanwang.kau.kpref.KPref
+import ca.allanwang.kau.kpref.KPrefFactory
+import com.pitchedapps.frost.BuildConfig
+import com.pitchedapps.frost.prefs.OldPrefs
+import org.koin.core.KoinComponent
+import org.koin.core.inject
+
+interface NotifPrefs {
+ var notificationKeywords: Set<String>
+
+ var notificationsGeneral: Boolean
+
+ var notificationAllAccounts: Boolean
+
+ var notificationsInstantMessages: Boolean
+
+ var notificationsImAllAccounts: Boolean
+
+ var notificationVibrate: Boolean
+
+ var notificationSound: Boolean
+
+ var notificationRingtone: String
+
+ var messageRingtone: String
+
+ var notificationLights: Boolean
+
+ var notificationFreq: Long
+}
+
+class NotifPrefsImpl(
+ factory: KPrefFactory
+) : KPref("${BuildConfig.APPLICATION_ID}.prefs.notif", factory),
+ NotifPrefs, KoinComponent {
+
+ private val oldPrefs: OldPrefs by inject()
+
+ override var notificationKeywords: Set<String> by kpref(
+ "notification_keywords",
+ oldPrefs.notificationKeywords /* mutableSetOf() */
+ )
+
+ override var notificationsGeneral: Boolean by kpref(
+ "notification_general",
+ oldPrefs.notificationsGeneral /* true */
+ )
+
+ override var notificationAllAccounts: Boolean by kpref(
+ "notification_all_accounts",
+ oldPrefs.notificationAllAccounts /* true */
+ )
+
+ override var notificationsInstantMessages: Boolean by kpref(
+ "notification_im",
+ oldPrefs.notificationsInstantMessages /* true */
+ )
+
+ override var notificationsImAllAccounts: Boolean by kpref(
+ "notification_im_all_accounts",
+ oldPrefs.notificationsImAllAccounts /* false */
+ )
+
+ override var notificationVibrate: Boolean by kpref(
+ "notification_vibrate",
+ oldPrefs.notificationVibrate /* true */
+ )
+
+ override var notificationSound: Boolean by kpref(
+ "notification_sound",
+ oldPrefs.notificationSound /* true */
+ )
+
+ override var notificationRingtone: String by kpref(
+ "notification_ringtone",
+ oldPrefs.notificationRingtone /* "" */
+ )
+
+ override var messageRingtone: String by kpref(
+ "message_ringtone",
+ oldPrefs.messageRingtone /* "" */
+ )
+
+ override var notificationLights: Boolean by kpref(
+ "notification_lights",
+ oldPrefs.notificationLights /* true */
+ )
+
+ override var notificationFreq: Long by kpref(
+ "notification_freq",
+ oldPrefs.notificationFreq /* 15L */
+ )
+}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/ThemePrefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/ThemePrefs.kt
new file mode 100644
index 00000000..c5ecb68b
--- /dev/null
+++ b/app/src/main/kotlin/com/pitchedapps/frost/prefs/sections/ThemePrefs.kt
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2020 Allan Wang
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.pitchedapps.frost.prefs.sections
+
+import android.graphics.Color
+import ca.allanwang.kau.kotlin.lazyResettable
+import ca.allanwang.kau.kpref.KPref
+import ca.allanwang.kau.kpref.KPrefFactory
+import ca.allanwang.kau.utils.colorToForeground
+import ca.allanwang.kau.utils.isColorVisibleOn
+import ca.allanwang.kau.utils.withAlpha
+import com.pitchedapps.frost.BuildConfig
+import com.pitchedapps.frost.enums.FACEBOOK_BLUE
+import com.pitchedapps.frost.enums.Theme
+import com.pitchedapps.frost.injectors.InjectorContract
+import com.pitchedapps.frost.prefs.OldPrefs
+import org.koin.core.KoinComponent
+import org.koin.core.inject
+
+interface ThemePrefs {
+ var theme: Int
+
+ var customTextColor: Int
+
+ var customAccentColor: Int
+
+ var customBackgroundColor: Int
+
+ var customHeaderColor: Int
+
+ var customIconColor: Int
+
+ val textColor: Int
+
+ val accentColor: Int
+
+ val accentColorForWhite: Int
+
+ val nativeBgColor: Int
+
+ fun nativeBgColor(unread: Boolean): Int
+
+ val bgColor: Int
+
+ val headerColor: Int
+
+ val iconColor: Int
+
+ val themeInjector: InjectorContract
+
+ val isCustomTheme: Boolean
+
+ var tintNavBar: Boolean
+}
+
+class ThemePrefsImpl(
+ factory: KPrefFactory
+) : KPref("${BuildConfig.APPLICATION_ID}.prefs.theme", factory),
+ ThemePrefs, KoinComponent {
+
+ private val oldPrefs: OldPrefs by inject()
+
+ override var theme: Int by kpref("theme", oldPrefs.theme /* 0 */) { _: Int ->
+ loader.invalidate()
+ }
+
+ override var customTextColor: Int by kpref(
+ "color_text",
+ oldPrefs.customTextColor /* 0xffeceff1.toInt() */
+ )
+
+ override var customAccentColor: Int by kpref(
+ "color_accent",
+ oldPrefs.customAccentColor /* 0xff0288d1.toInt() */
+ )
+
+ override var customBackgroundColor: Int by kpref(
+ "color_bg",
+ oldPrefs.customBackgroundColor /* 0xff212121.toInt() */
+ )
+
+ override var customHeaderColor: Int by kpref(
+ "color_header",
+ oldPrefs.customHeaderColor /* 0xff01579b.toInt() */
+ )
+
+ override var customIconColor: Int by kpref(
+ "color_icons",
+ oldPrefs.customIconColor /* 0xffeceff1.toInt() */
+ )
+
+ private val loader = lazyResettable { Theme.values[theme] }
+
+ private val t: Theme by loader
+
+ override val textColor: Int
+ get() = t.textColorGetter(this)
+
+ override val accentColor: Int
+ get() = t.accentColorGetter(this)
+
+ override val accentColorForWhite: Int
+ get() = when {
+ accentColor.isColorVisibleOn(Color.WHITE) -> accentColor
+ textColor.isColorVisibleOn(Color.WHITE) -> textColor
+ else -> FACEBOOK_BLUE
+ }
+
+ override val nativeBgColor: Int
+ get() = bgColor.withAlpha(30)
+
+ override fun nativeBgColor(unread: Boolean) = bgColor
+ .colorToForeground(if (unread) 0.7f else 0.0f)
+ .withAlpha(30)
+
+ override val bgColor: Int
+ get() = t.backgroundColorGetter(this)
+
+ override val headerColor: Int
+ get() = t.headerColorGetter(this)
+
+ override val iconColor: Int
+ get() = t.iconColorGetter(this)
+
+ override val themeInjector: InjectorContract
+ get() = t.injector
+
+ override val isCustomTheme: Boolean
+ get() = t == Theme.CUSTOM
+
+ override var tintNavBar: Boolean by kpref("tint_nav_bar", oldPrefs.tintNavBar /* true */)
+}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
index 92cce44b..099c3180 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
@@ -43,10 +43,9 @@ import com.pitchedapps.frost.facebook.parsers.NotifParser
import com.pitchedapps.frost.facebook.parsers.ParseNotification
import com.pitchedapps.frost.glide.FrostGlide
import com.pitchedapps.frost.glide.GlideApp
-import com.pitchedapps.frost.settings.hasNotifications
+import com.pitchedapps.frost.prefs.Prefs
import com.pitchedapps.frost.utils.ARG_USER_ID
import com.pitchedapps.frost.utils.L
-import com.pitchedapps.frost.prefs.Prefs
import com.pitchedapps.frost.utils.frostEvent
import com.pitchedapps.frost.utils.isIndependent
import java.util.Locale
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
index 98a8db96..55dad065 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
@@ -25,8 +25,8 @@ import com.pitchedapps.frost.db.CookieDao
import com.pitchedapps.frost.db.CookieEntity
import com.pitchedapps.frost.db.NotificationDao
import com.pitchedapps.frost.db.selectAll
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.frostEvent
import com.pitchedapps.frost.widgets.NotificationWidget
import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationUtils.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationUtils.kt
index d9a77c2b..0a90895e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationUtils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationUtils.kt
@@ -31,8 +31,8 @@ import androidx.core.app.NotificationCompat
import ca.allanwang.kau.utils.color
import ca.allanwang.kau.utils.string
import com.pitchedapps.frost.R
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.frostUri
/**
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/UpdateReceiver.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/UpdateReceiver.kt
index 24b0643f..5506c812 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/UpdateReceiver.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/UpdateReceiver.kt
@@ -19,8 +19,8 @@ package com.pitchedapps.frost.services
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import org.koin.core.KoinComponent
import org.koin.core.inject
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt
index ed0c27b0..397825f6 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt
@@ -33,8 +33,8 @@ import com.pitchedapps.frost.BuildConfig
import com.pitchedapps.frost.R
import com.pitchedapps.frost.activities.SettingsActivity
import com.pitchedapps.frost.db.deleteAll
-import com.pitchedapps.frost.services.fetchNotifications
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.services.fetchNotifications
import com.pitchedapps.frost.utils.REQUEST_NOTIFICATION
import com.pitchedapps.frost.utils.frostSnackbar
import com.pitchedapps.frost.utils.frostUri
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Const.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Const.kt
index 5f65bba1..e0ad802e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Const.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Const.kt
@@ -20,6 +20,7 @@ package com.pitchedapps.frost.utils
* Created by Allan Wang on 20/12/17.
*/
const val ACTIVITY_SETTINGS = 97
+
/*
* Possible responses from the SettingsActivity
* after the configurations have changed.
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
index b36ba83f..ebefa4ca 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
@@ -397,7 +397,10 @@ fun Context.frostUri(entry: String): Uri {
return uri
}
-inline fun Context.sendFrostEmail(@StringRes subjectId: Int, crossinline builder: EmailBuilder.() -> Unit) =
+inline fun Context.sendFrostEmail(
+ @StringRes subjectId: Int,
+ crossinline builder: EmailBuilder.() -> Unit
+) =
sendFrostEmail(string(subjectId), builder)
inline fun Context.sendFrostEmail(subjectId: String, crossinline builder: EmailBuilder.() -> Unit) =
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostContentView.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostContentView.kt
index a40d6e48..7245e64e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostContentView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostContentView.kt
@@ -40,8 +40,8 @@ import com.pitchedapps.frost.contracts.FrostContentParent
import com.pitchedapps.frost.facebook.FbItem
import com.pitchedapps.frost.facebook.WEB_LOAD_DELAY
import com.pitchedapps.frost.kotlin.subscribeDuringJob
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.channels.BroadcastChannel
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt
index 351f2236..30f8c5f7 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt
@@ -172,6 +172,7 @@ class FrostVideoView @JvmOverloads constructor(
// todo use provided ratio?
val ratio =
min(width.toFloat() / intrinsicWidth, height.toFloat() / intrinsicHeight.toFloat())
+
/**
* Only remap if not expanded and if dimensions have changed
*/
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt
index c7c63d66..9c10cd01 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoViewer.kt
@@ -43,8 +43,8 @@ import com.pitchedapps.frost.R
import com.pitchedapps.frost.databinding.ViewVideoBinding
import com.pitchedapps.frost.db.CookieDao
import com.pitchedapps.frost.db.currentCookie
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.ctxCoroutine
import com.pitchedapps.frost.utils.frostDownload
import org.koin.core.KoinComponent
@@ -218,6 +218,7 @@ class FrostVideoViewer @JvmOverloads constructor(
interface FrostVideoViewerContract : VideoControlsVisibilityListener {
fun onSingleTapConfirmed(event: MotionEvent): Boolean
+
/**
* Process of expansion
* 1f represents an expanded view, 0f represents a minimized view
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt
index abce17f4..ad8e9c77 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt
@@ -34,8 +34,8 @@ import com.pitchedapps.frost.facebook.FB_HOME_URL
import com.pitchedapps.frost.facebook.FbCookie
import com.pitchedapps.frost.facebook.USER_AGENT
import com.pitchedapps.frost.fragments.WebFragment
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.ctxCoroutine
import com.pitchedapps.frost.utils.frostDownload
import com.pitchedapps.frost.web.FrostChromeClient
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt
index 6b905b52..35efaeaf 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt
@@ -28,8 +28,8 @@ import com.pitchedapps.frost.facebook.USER_AGENT
import com.pitchedapps.frost.injectors.CssHider
import com.pitchedapps.frost.injectors.CssSmallAssets
import com.pitchedapps.frost.injectors.jsInject
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.createFreshFile
import com.pitchedapps.frost.utils.isFacebookUrl
import java.io.File
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
index 71427bf0..e17ef99e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
@@ -24,8 +24,8 @@ import com.pitchedapps.frost.contracts.MainActivityContract
import com.pitchedapps.frost.contracts.VideoViewHolder
import com.pitchedapps.frost.db.CookieEntity
import com.pitchedapps.frost.facebook.FbCookie
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.WebContext
import com.pitchedapps.frost.utils.cookies
import com.pitchedapps.frost.utils.ctxCoroutine
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 32d58f00..e2171896 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
@@ -33,8 +33,8 @@ import com.pitchedapps.frost.injectors.CssSmallAssets
import com.pitchedapps.frost.injectors.JsActions
import com.pitchedapps.frost.injectors.JsAssets
import com.pitchedapps.frost.injectors.jsInject
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.isExplicitIntent
import com.pitchedapps.frost.utils.isFacebookUrl
import com.pitchedapps.frost.utils.isImageUrl
@@ -72,6 +72,7 @@ open class FrostWebViewClient(val web: FrostWebView) : BaseWebViewClient() {
private val prefs: Prefs get() = web.prefs
private val refresh: SendChannel<Boolean> = web.parent.refreshChannel
private val isMain = web.parent.baseEnum != null
+
/**
* True if current url supports refresh. See [doUpdateVisitedHistory] for updates
*/
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 fd0d864e..e111e5c3 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
@@ -37,8 +37,8 @@ import com.pitchedapps.frost.facebook.USER_AGENT
import com.pitchedapps.frost.facebook.get
import com.pitchedapps.frost.injectors.CssHider
import com.pitchedapps.frost.injectors.jsInject
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.prefs.Prefs
+import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.isFacebookUrl
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.coroutineScope
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt b/app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt
index 5c959277..0fdc19ae 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt
@@ -43,9 +43,9 @@ import com.pitchedapps.frost.db.NotificationDao
import com.pitchedapps.frost.db.selectNotificationsSync
import com.pitchedapps.frost.glide.FrostGlide
import com.pitchedapps.frost.glide.GlideApp
+import com.pitchedapps.frost.prefs.Prefs
import com.pitchedapps.frost.services.NotificationContent
import com.pitchedapps.frost.services.NotificationType
-import com.pitchedapps.frost.prefs.Prefs
import com.pitchedapps.frost.utils.toReadableTime
import org.koin.core.KoinComponent
import org.koin.core.inject
@@ -114,7 +114,12 @@ private fun RemoteViews.setBackgroundColor(@IdRes viewId: Int, @ColorInt color:
/**
* Adds backward compatibility to setting tinted icons
*/
-private fun RemoteViews.setIcon(@IdRes viewId: Int, context: Context, @DrawableRes res: Int, @ColorInt color: Int) {
+private fun RemoteViews.setIcon(
+ @IdRes viewId: Int,
+ context: Context,
+ @DrawableRes res: Int,
+ @ColorInt color: Int
+) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
val icon =
Icon.createWithResource(context, res).setTint(color).setTintMode(PorterDuff.Mode.SRC_IN)
@@ -154,6 +159,7 @@ class NotificationWidgetDataProvider(val context: Context, val intent: Intent) :
private val prefs: Prefs by inject()
private val notifDao: NotificationDao by inject()
+
@Volatile
private var content: List<NotificationContent> = emptyList()