diff options
| author | Allan Wang <me@allanwang.ca> | 2018-04-12 18:50:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-12 18:50:58 -0400 |
| commit | d9e2562267e549ee407e683262406581f2c4888e (patch) | |
| tree | 0dc063913b00a9dc4f10d0d5c7085218c2cc17c3 /app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt | |
| parent | 42e57597bcc3216778e9f14389f751eb62da1bd5 (diff) | |
| download | frost-d9e2562267e549ee407e683262406581f2c4888e.tar.gz frost-d9e2562267e549ee407e683262406581f2c4888e.tar.bz2 frost-d9e2562267e549ee407e683262406581f2c4888e.zip | |
Misc (#865)
* Clean up git code
* Update download link
* Update theme
* Reorder settings, resolvees #856
* Do not log undeliverable exception
* Handle potential lack of webview
* Set notification epoch default to now, resolves #857
* Fix notification epoch time init
* Update changelog
* Update theme
* Add slack url, resolves #880
* Prepare for image update
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt | 14 |
1 files changed, 4 insertions, 10 deletions
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 02f5bc49..237780b8 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt @@ -113,11 +113,6 @@ class SettingsActivity : KPrefActivity() { // iicon = GoogleMaterial.Icon.gmd_network_cell // } - subItems(R.string.experimental, getExperimentalPrefs()) { - descRes = R.string.experimental_desc - iicon = CommunityMaterial.Icon.cmd_flask_outline - } - // todo add donation? plainText(R.string.about_frost) { @@ -141,11 +136,10 @@ class SettingsActivity : KPrefActivity() { onClick = { launchNewTask<IntroActivity>(cookies(), true) } } -// plainText(R.string.updates) { -// descRes = R.string.updates_desc -// iicon = CommunityMaterial.Icon.cmd_github_circle -// onClick = { launchNewTask<UpdateActivity>() } -// } + subItems(R.string.experimental, getExperimentalPrefs()) { + descRes = R.string.experimental_desc + iicon = CommunityMaterial.Icon.cmd_flask_outline + } subItems(R.string.debug_frost, getDebugPrefs()) { descRes = R.string.debug_frost_desc |