diff options
| author | Allan Wang <me@allanwang.ca> | 2020-10-03 20:02:02 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2020-10-03 20:02:02 -0700 |
| commit | 64116d82b122c5bf9db2c62f3d3206a96a654cf5 (patch) | |
| tree | 55739cdcb182649ff215dc7c0d87e769dced6f9c /app/src/main/kotlin/com/pitchedapps/frost/activities | |
| parent | 8a8e7268a5bfbd0bc0d8ec5058365fb1109ad20f (diff) | |
| parent | 96812d2b83b81c0f9c48c7812d2600788a21eeec (diff) | |
| download | frost-64116d82b122c5bf9db2c62f3d3206a96a654cf5.tar.gz frost-64116d82b122c5bf9db2c62f3d3206a96a654cf5.tar.bz2 frost-64116d82b122c5bf9db2c62f3d3206a96a654cf5.zip | |
Merge branch 'dev' into feed-options
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt | 9 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt index 7a54a567..a012c426 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt @@ -178,10 +178,11 @@ class AboutActivity : AboutActivityBase(null) { arrayOf(R.drawable.ic_fdroid_24 to { c.startLink(R.string.fdroid_url) }) val iicons: Array<Pair<IIcon, () -> Unit>> = arrayOf( GoogleMaterial.Icon.gmd_file_download to { c.startLink(R.string.github_downloads_url) }, - CommunityMaterial.Icon2.cmd_reddit to { c.startLink(R.string.reddit_url) }, - CommunityMaterial.Icon.cmd_github_circle to { c.startLink(R.string.github_url) }, - CommunityMaterial.Icon2.cmd_slack to { c.startLink(R.string.slack_url) }, - CommunityMaterial.Icon2.cmd_xda to { c.startLink(R.string.xda_url) }) + CommunityMaterial.Icon3.cmd_reddit to { c.startLink(R.string.reddit_url) }, + CommunityMaterial.Icon2.cmd_github to { c.startLink(R.string.github_url) }, + CommunityMaterial.Icon3.cmd_slack to { c.startLink(R.string.slack_url) } +// CommunityMaterial.Icon3.cmd_xda to { c.startLink(R.string.xda_url) }, // TODO add back? + ) images = (icons.map { (icon, onClick) -> c.drawable(icon) to onClick } + iicons.map { (icon, onClick) -> 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 ef5b0b85..a016ca22 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt @@ -153,7 +153,7 @@ class SettingsActivity : KPrefActivity() { subItems(R.string.newsfeed, getFeedPrefs()) { descRes = R.string.newsfeed_desc - iicon = CommunityMaterial.Icon2.cmd_newspaper + iicon = CommunityMaterial.Icon3.cmd_newspaper } subItems(R.string.notifications, getNotificationPrefs()) { @@ -196,7 +196,7 @@ class SettingsActivity : KPrefActivity() { subItems(R.string.experimental, getExperimentalPrefs()) { descRes = R.string.experimental_desc - iicon = CommunityMaterial.Icon.cmd_flask_outline + iicon = CommunityMaterial.Icon2.cmd_flask_outline } subItems(R.string.debug_frost, getDebugPrefs()) { |