From a6ded241536b82d71917e2d88bf2e0a1b7189021 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 10 Jan 2021 18:56:38 -0800
Subject: Delete links for slack, xda, and paypal

---
 README.md                                                             | 3 +--
 app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt | 2 --
 app/src/main/res/values/strings_no_translate.xml                      | 4 ----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 98a47162..d2dc77c0 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,7 @@
 [![ZenHub](https://img.shields.io/badge/Shipping%20faster%20with-ZenHub-45529A.svg)](https://app.zenhub.com/workspace/o/allanwang/frost-for-facebook/boards)
 [![GitHub license](https://img.shields.io/badge/license-GPL--v3-blue.svg)](https://raw.githubusercontent.com/AllanWang/Frost-for-Facebook/dev/LICENSE)
 
-[Download from Github Releases](https://github.com/AllanWang/Frost-for-Facebook/releases) <br/>
-[Join the Slack Workspace](https://frost-slack.allanwang.ca)
+[Download from Github Releases](https://github.com/AllanWang/Frost-for-Facebook/releases)
 
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
     alt="Get it on F-Droid"
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 a012c426..ed5a2c25 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
@@ -180,8 +180,6 @@ class AboutActivity : AboutActivityBase(null) {
                     GoogleMaterial.Icon.gmd_file_download to { c.startLink(R.string.github_downloads_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 =
diff --git a/app/src/main/res/values/strings_no_translate.xml b/app/src/main/res/values/strings_no_translate.xml
index d9aa6cee..897e79ff 100644
--- a/app/src/main/res/values/strings_no_translate.xml
+++ b/app/src/main/res/values/strings_no_translate.xml
@@ -1,15 +1,11 @@
 <resources>
     <string name="dev_name" translatable="false">Pitched Apps</string>
     <string name="dev_email" translatable="false">pitchedapps@gmail.com</string>
-    <string name="dev_paypal" translatable="false">https://www.paypal.me/Allanw9</string>
-    <string name="paypal" translatable="false">PayPal</string>
     <string name="translation_url" translatable="false">https://crwd.in/frost-for-facebook</string>
     <string name="github_url" translatable="false">https://github.com/AllanWang/Frost-for-Facebook</string>
     <string name="github_downloads_url" translatable="false">https://github.com/AllanWang/Frost-for-Facebook/releases</string>
     <string name="fdroid_url" translatable="false">https://f-droid.org/en/packages/com.pitchedapps.frost</string>
     <string name="reddit_url" translatable="false">https://www.reddit.com/r/FrostForFacebook</string>
-    <string name="slack_url" translatable="false">https://frost-slack.allanwang.ca</string>
-    <string name="xda_url" translatable="false">https://forum.xda-developers.com/android/apps-games/app-frost-facebook-t3685896</string>
     <string name="frost_prefix" translatable="false">Frost for Facebook:</string>
     <string name="feedback" translatable="false">Feedback</string>
     <string name="bug_report" translatable="false">Bug Report</string>
-- 
cgit v1.2.3


From 1e3956cd6ef81ee7d272f6dd06feaa1aa5b7b1e8 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 10 Jan 2021 19:02:26 -0800
Subject: Remove trailing comma because ktlint isn't updated

---
 app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ed5a2c25..17cac703 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
@@ -179,7 +179,7 @@ class AboutActivity : AboutActivityBase(null) {
                 val iicons: Array<Pair<IIcon, () -> Unit>> = arrayOf(
                     GoogleMaterial.Icon.gmd_file_download to { c.startLink(R.string.github_downloads_url) },
                     CommunityMaterial.Icon3.cmd_reddit to { c.startLink(R.string.reddit_url) },
-                    CommunityMaterial.Icon2.cmd_github to { c.startLink(R.string.github_url) },
+                    CommunityMaterial.Icon2.cmd_github to { c.startLink(R.string.github_url) }
                 )
 
                 images =
-- 
cgit v1.2.3