diff options
author | Allan Wang <me@allanwang.ca> | 2017-07-04 11:13:47 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2017-07-04 11:13:47 -0700 |
commit | 4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e (patch) | |
tree | dec58af06d220ba80920fcf9c816b71413c61108 /app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt | |
parent | 43885c6c063a76738ed7220aba619e47db7c4080 (diff) | |
parent | d6c5bcd56e293eaf281663b6c1e6b0ab7236be9f (diff) | |
download | frost-4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e.tar.gz frost-4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e.tar.bz2 frost-4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e.zip |
Fix merge
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt index e0e18622..6022ee26 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt @@ -5,6 +5,7 @@ import com.pitchedapps.frost.MainActivity import com.pitchedapps.frost.R import com.pitchedapps.frost.SettingsActivity import com.pitchedapps.frost.utils.Prefs +import com.pitchedapps.frost.utils.Showcase /** * Created by Allan Wang on 2017-06-29. @@ -15,6 +16,10 @@ fun SettingsActivity.getExperimentalPrefs(): KPrefAdapterBuilder.() -> Unit = { descRes = R.string.experimental_disclaimer_info } + checkbox(R.string.experimental_by_default, { Showcase.experimentalDefault }, { Showcase.experimentalDefault = it }) { + descRes = R.string.experimental_by_default_desc + } + checkbox(R.string.search_bar, { Prefs.searchBar }, { Prefs.searchBar = it; setResult(MainActivity.REQUEST_SEARCH) }) { descRes = R.string.search_bar_desc } |