blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #2723 - Cleans up code formatting

master
Jeff Boek 2019-05-30 16:14:25 -07:00
parent f9d70dbc92
commit 209b50016e
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/BrowsingModeManager.kt
View File

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

27
app/src/main/java/org/mozilla/fenix/HomeActivity.kt
View File

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