diff options
| author | Allan Wang <me@allanwang.ca> | 2017-09-12 00:19:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 00:19:46 -0400 |
| commit | 2e98f5b32c565dbb8e29f40af4b5b7f2ab978ef0 (patch) | |
| tree | a8e5c652a2d87ba9192a2245af2c8895a9022e3b /app/src/main/kotlin | |
| parent | cfa645abd84a7dc356e2e158145b039303cd919e (diff) | |
| download | frost-2e98f5b32c565dbb8e29f40af4b5b7f2ab978ef0.tar.gz frost-2e98f5b32c565dbb8e29f40af4b5b7f2ab978ef0.tar.bz2 frost-2e98f5b32c565dbb8e29f40af4b5b7f2ab978ef0.zip | |
Enhancement/link to autoplay (#271)
* Add link to autoplay
* Update changelog
* Update network strings
Diffstat (limited to 'app/src/main/kotlin')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/settings/Feed.kt | 12 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/settings/Network.kt | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Feed.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Feed.kt index 1487c969..cfc2bb6f 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Feed.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Feed.kt @@ -7,6 +7,7 @@ import com.pitchedapps.frost.activities.MainActivity import com.pitchedapps.frost.activities.SettingsActivity import com.pitchedapps.frost.enums.FeedSort import com.pitchedapps.frost.utils.Prefs +import com.pitchedapps.frost.utils.launchWebOverlay import com.pitchedapps.frost.utils.materialDialogThemed /** @@ -16,13 +17,11 @@ fun SettingsActivity.getFeedPrefs(): KPrefAdapterBuilder.() -> Unit = { text(R.string.newsfeed_sort, { Prefs.feedSort }, { Prefs.feedSort = it }) { descRes = R.string.newsfeed_sort_desc - onClick = { - _, _, item -> + onClick = { _, _, item -> materialDialogThemed { title(R.string.newsfeed_sort) items(FeedSort.values().map { string(it.textRes) }) - itemsCallbackSingleChoice(item.pref, { - _, _, which, _ -> + itemsCallbackSingleChoice(item.pref, { _, _, which, _ -> if (item.pref != which) { item.pref = which shouldRestartMain() @@ -35,6 +34,11 @@ fun SettingsActivity.getFeedPrefs(): KPrefAdapterBuilder.() -> Unit = { textGetter = { string(FeedSort(it).textRes) } } + plainText(R.string.autoplay_settings) { + descRes = R.string.autoplay_settings_desc + onClick = { _, _, _ -> launchWebOverlay("https://touch.facebook.com/settings/videos"); true } + } + header(R.string.pro_features) checkbox(R.string.suggested_friends, { Prefs.showSuggestedFriends }, { diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Network.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Network.kt index 30ab2579..b5515a52 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Network.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Network.kt @@ -10,7 +10,7 @@ import com.pitchedapps.frost.utils.Prefs */ fun SettingsActivity.getNetworkPrefs(): KPrefAdapterBuilder.() -> Unit = { - checkbox(R.string.network_media_on_metered, { Prefs.loadMediaOnMeteredNetwork }, { Prefs.loadMediaOnMeteredNetwork = it }) { + checkbox(R.string.network_media_on_metered, { !Prefs.loadMediaOnMeteredNetwork }, { Prefs.loadMediaOnMeteredNetwork = !it }) { descRes = R.string.network_media_on_metered_desc } |