diff options
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities')
4 files changed, 12 insertions, 10 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt index af49cb33..f41f19e5 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt @@ -48,7 +48,7 @@ abstract class BaseActivity : KauBaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - if (this !is WebOverlayActivityBase) setFrostTheme() + if (this !is WebOverlayActivityBase) setFrostTheme(prefs) } override fun onStop() { diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt index 8d580ebd..bfb87a2f 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt @@ -313,7 +313,7 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract, val item = FbItem.values[it.itemId] frostEvent("Drawer Tab", "name" to item.name) drawer.closeDrawer(navigation) - launchWebOverlay(item.url, fbCookie) + launchWebOverlay(item.url, fbCookie, prefs) false } val navBg = prefs.bgColor.withMinAlpha(200) @@ -464,7 +464,7 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract, setOptionsIcon(GoogleMaterial.Icon.gmd_exit_to_app) setOnClickListener { launch { - val currentCookie = cookieDao.currentCookie() + val currentCookie = cookieDao.currentCookie(prefs) if (currentCookie == null) { toast(R.string.account_not_found) fbCookie.reset() @@ -596,7 +596,7 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract, .into(this) setOnClickListener { if (primary) { - launchWebOverlay(FbItem.PROFILE.url, fbCookie) + launchWebOverlay(FbItem.PROFILE.url, fbCookie, prefs) } else { switchAccount(cookie.id) } @@ -661,11 +661,11 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract, } textDebounceInterval = 300 searchCallback = - { query, _ -> launchWebOverlay("${FbItem._SEARCH.url}/?q=$query", fbCookie); true } + { query, _ -> launchWebOverlay("${FbItem._SEARCH.url}/?q=$query", fbCookie, prefs); true } closeListener = { _ -> searchViewCache.clear() } foregroundColor = prefs.textColor backgroundColor = prefs.bgColor.withMinAlpha(200) - onItemClick = { _, key, _, _ -> launchWebOverlay(key, fbCookie) } + onItemClick = { _, key, _, _ -> launchWebOverlay(key, fbCookie, prefs) } } } } @@ -723,7 +723,7 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract, fragmentChannel.offer(REQUEST_REFRESH) } if (hasRequest(REQUEST_NAV)) { - frostNavigationBar() + frostNavigationBar(prefs) } if (hasRequest(REQUEST_TEXT_ZOOM)) { fragmentChannel.offer(REQUEST_TEXT_ZOOM) 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 d594963e..232fc56d 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt @@ -114,7 +114,7 @@ class IntroActivity : KauBaseActivity(), ViewPager.PageTransformer, indicator.invalidate() } fragments.forEach { it.themeFragment() } - setFrostTheme(true) + setFrostTheme(prefs, true) } /** 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 55ff3fba..67f605be 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt @@ -40,6 +40,7 @@ import com.afollestad.materialdialogs.list.listItems import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial 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.settings.getAppearancePrefs @@ -70,6 +71,7 @@ import org.koin.android.ext.android.inject class SettingsActivity : KPrefActivity() { val fbCookie: FbCookie by inject() + val notifDao: NotificationDao by inject() val prefs: Prefs by inject() private var resultFlag = Activity.RESULT_CANCELED @@ -218,7 +220,7 @@ class SettingsActivity : KPrefActivity() { @SuppressLint("MissingSuperCall") override fun onCreate(savedInstanceState: Bundle?) { - setFrostTheme(true) + setFrostTheme(prefs, true) super.onCreate(savedInstanceState) animate = prefs.animate themeExterior(false) @@ -229,7 +231,7 @@ class SettingsActivity : KPrefActivity() { else bgCanvas.set(prefs.bgColor) if (animate) toolbarCanvas.ripple(prefs.headerColor, RippleCanvas.MIDDLE, RippleCanvas.END) else toolbarCanvas.set(prefs.headerColor) - frostNavigationBar() + frostNavigationBar(prefs) } override fun onBackPressed() { |