pull/600/head
Jeff Boek 5 years ago
parent b2f4e4327b
commit 71309d11f3

@ -15,7 +15,6 @@ interface BrowsingModeManager {
val isPrivate: Boolean val isPrivate: Boolean
var mode: Mode var mode: Mode
} }
interface BrowserModeStorage { interface BrowserModeStorage {
@ -35,7 +34,6 @@ fun Settings.createBrowserModeStorage(): BrowserModeStorage = object : BrowserMo
override fun setMode(mode: BrowsingModeManager.Mode) { override fun setMode(mode: BrowsingModeManager.Mode) {
this@createBrowserModeStorage.setPrivateMode(mode == BrowsingModeManager.Mode.Private) this@createBrowserModeStorage.setPrivateMode(mode == BrowsingModeManager.Mode.Private)
} }
} }
class DefaultBrowsingModeManager( class DefaultBrowsingModeManager(

@ -47,7 +47,6 @@ open class HomeActivity : AppCompatActivity() {
lateinit var themeManager: ThemeManager lateinit var themeManager: ThemeManager
private val navHost by lazy { private val navHost by lazy {
supportFragmentManager.findFragmentById(R.id.container) as NavHostFragment supportFragmentManager.findFragmentById(R.id.container) as NavHostFragment
} }
@ -258,20 +257,26 @@ open class HomeActivity : AppCompatActivity() {
} }
private fun createBrowsingModeManager(): BrowsingModeManager { private fun createBrowsingModeManager(): BrowsingModeManager {
return if (isCustomTab) CustomTabBrowsingModeManager() return if (isCustomTab) {
else DefaultBrowsingModeManager(Settings.getInstance(this).createBrowserModeStorage()) { CustomTabBrowsingModeManager()
themeManager.setTheme(when (it.isPrivate()) { } else {
true -> ThemeManager.Theme.Private DefaultBrowsingModeManager(Settings.getInstance(this).createBrowserModeStorage()) {
false -> ThemeManager.Theme.Normal themeManager.setTheme(when (it.isPrivate()) {
}) true -> ThemeManager.Theme.Private
false -> ThemeManager.Theme.Normal
})
}
} }
} }
private fun createThemeManager(currentTheme: ThemeManager.Theme): ThemeManager { private fun createThemeManager(currentTheme: ThemeManager.Theme): ThemeManager {
return if (isCustomTab) CustomTabThemeManager() return if (isCustomTab) {
else DefaultThemeManager(currentTheme) { CustomTabThemeManager()
setTheme(it) } else {
recreate() DefaultThemeManager(currentTheme) {
setTheme(it)
recreate()
}
} }
} }

Loading…
Cancel
Save