From a348bbb694da0df6a76e243d780ad92431896bbc Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 3 Oct 2020 19:08:28 -0700 Subject: Update iconics usage --- .../kotlin/com/pitchedapps/frost/activities/AboutActivity.kt | 9 +++++---- .../kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt | 4 ++-- app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt | 4 ++-- gradle.properties | 2 +- 4 files changed, 10 insertions(+), 9 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 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()) { diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt index 1a93393b..4c33fe8d 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt @@ -40,7 +40,7 @@ enum class FbItem( BIRTHDAYS(R.string.birthdays, GoogleMaterial.Icon.gmd_cake, "events/birthdays"), CHAT(R.string.chat, GoogleMaterial.Icon.gmd_chat, "buddylist"), EVENTS(R.string.events, GoogleMaterial.Icon.gmd_event_note, "events/upcoming"), - FEED(R.string.feed, CommunityMaterial.Icon2.cmd_newspaper, ""), + FEED(R.string.feed, CommunityMaterial.Icon3.cmd_newspaper, ""), FEED_MOST_RECENT(R.string.most_recent, GoogleMaterial.Icon.gmd_history, "home.php?sk=h_chr"), FEED_TOP_STORIES(R.string.top_stories, GoogleMaterial.Icon.gmd_star, "home.php?sk=h_nor"), FRIENDS(R.string.friends, GoogleMaterial.Icon.gmd_person_add, "friends/center/requests"), @@ -48,7 +48,7 @@ enum class FbItem( MARKETPLACE(R.string.marketplace, GoogleMaterial.Icon.gmd_store, "marketplace"), MENU(R.string.menu, GoogleMaterial.Icon.gmd_menu, "settings"), MESSAGES(R.string.messages, MaterialDesignIconic.Icon.gmi_comments, "messages"), - NOTES(R.string.notes, CommunityMaterial.Icon2.cmd_note, "notes"), + NOTES(R.string.notes, CommunityMaterial.Icon3.cmd_note, "notes"), NOTIFICATIONS(R.string.notifications, MaterialDesignIconic.Icon.gmi_globe, "notifications"), ON_THIS_DAY(R.string.on_this_day, GoogleMaterial.Icon.gmd_today, "onthisday"), PAGES(R.string.pages, GoogleMaterial.Icon.gmd_flag, "pages"), diff --git a/gradle.properties b/gradle.properties index 420bfda3..1f6e416d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.daemon = true APP_ID=Frost APP_GROUP=com.pitchedapps -KAU=6439e35 +KAU=ae98ea5 android.useAndroidX=true android.enableJetifier=true -- cgit v1.2.3