aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-06-20 16:32:43 -0700
committerAllan Wang <me@allanwang.ca>2017-06-20 16:32:43 -0700
commit13b8505674e08cc1610ce7e77d7db8fa292372cf (patch)
tree29ae719c5639f518e2337afdab3bffbf5e4d2598 /app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt
parente916afddb89550d7f99f17e1477ad17f3bd770f9 (diff)
downloadfrost-13b8505674e08cc1610ce7e77d7db8fa292372cf.tar.gz
frost-13b8505674e08cc1610ce7e77d7db8fa292372cf.tar.bz2
frost-13b8505674e08cc1610ce7e77d7db8fa292372cf.zip
Fix up settings and overlay web
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt
index 19fa6362..1fcdf798 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt
@@ -6,7 +6,6 @@ import ca.allanwang.kau.kpref.KPrefAdapterBuilder
import ca.allanwang.kau.utils.*
import ca.allanwang.kau.views.RippleCanvas
import com.pitchedapps.frost.utils.*
-import org.jetbrains.anko.toast
/**
* Created by Allan Wang on 2017-06-06.
@@ -29,7 +28,7 @@ class SettingsActivity : KPrefActivity() {
if (item.pref != which) {
item.pref = which
reload()
- setFrostTheme()
+ setFrostTheme(true)
themeExterior()
}
true
@@ -98,8 +97,8 @@ class SettingsActivity : KPrefActivity() {
}
override fun onCreate(savedInstanceState: Bundle?) {
+ setFrostTheme(true)
super.onCreate(savedInstanceState)
- setFrostTheme()
themeExterior(false)
}
@@ -113,7 +112,7 @@ class SettingsActivity : KPrefActivity() {
}
override fun onBackPressed() {
- startActivitySlideOut(MainActivity::class.java, clearStack = true, intentBuilder = {
+ startActivity(MainActivity::class.java, clearStack = true, intentBuilder = {
putParcelableArrayListExtra(EXTRA_COOKIES, cookies())
})
}