Merge branch 'dev' into compose_iv

bitfireAT · Aug 21, 2023 · 54f5602 · 54f5602
2 parents 271d7fb + 50089bd
commit 54f5602
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 38 deletions.
diff --git a/app/src/main/java/at/bitfire/icsdroid/ui/InfoActivity.kt b/app/src/main/java/at/bitfire/icsdroid/ui/InfoActivity.kt
@@ -69,8 +69,8 @@ class InfoActivity: ComponentActivity() {
         launchUri(Uri.parse("https://icsx5.bitfire.at/?pk_campaign=icsx5-app&pk_kwd=info-activity"))
     }
 
-    fun showTwitter() {
-        launchUri(Uri.parse("https://twitter.com/icsx5app"))
+    fun showMastodon() {
+        launchUri(Uri.parse("https://fosstodon.org/@davx5app"))
     }
 
     private fun launchUri(uri: Uri) {
@@ -111,10 +111,10 @@ class InfoActivity: ComponentActivity() {
                                     contentDescription = stringResource(R.string.app_info_web_site)
                                 )
                             }
-                            IconButton({ showTwitter() }) {
+                            IconButton({ showMastodon() }) {
                                 Icon(
-                                    painter = painterResource(R.drawable.twitter_white),
-                                    contentDescription = stringResource(R.string.app_info_web_site)
+                                    painter = painterResource(R.drawable.mastodon_white),
+                                    contentDescription = stringResource(R.string.app_info_mastodon)
                                 )
                             }
                         }

diff --git a/app/src/main/res/drawable/mastodon_white.xml b/app/src/main/res/drawable/mastodon_white.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M20.94,14C20.66,15.41 18.5,16.96 15.97,17.26C14.66,17.41 13.37,17.56 12,17.5C9.75,17.39 8,16.96 8,16.96V17.58C8.32,19.8 10.22,19.93 12.03,20C13.85,20.05 15.47,19.54 15.47,19.54L15.55,21.19C15.55,21.19 14.27,21.87 12,22C10.75,22.07 9.19,21.97 7.38,21.5C3.46,20.45 2.78,16.26 2.68,12L2.67,8.57C2.67,4.23 5.5,2.96 5.5,2.96C6.95,2.3 9.41,2 11.97,2H12.03C14.59,2 17.05,2.3 18.5,2.96C18.5,2.96 21.33,4.23 21.33,8.57C21.33,8.57 21.37,11.78 20.94,14M18,8.91C18,7.83 17.7,7 17.15,6.35C16.59,5.72 15.85,5.39 14.92,5.39C13.86,5.39 13.05,5.8 12.5,6.62L12,7.5L11.5,6.62C10.94,5.8 10.14,5.39 9.07,5.39C8.15,5.39 7.41,5.72 6.84,6.35C6.29,7 6,7.83 6,8.91V14.17H8.1V9.06C8.1,8 8.55,7.44 9.46,7.44C10.46,7.44 10.96,8.09 10.96,9.37V12.16H13.03V9.37C13.03,8.09 13.53,7.44 14.54,7.44C15.44,7.44 15.89,8 15.89,9.06V14.17H18V8.91Z" />
+</vector>
diff --git a/app/src/main/res/drawable/twitter_white.xml b/app/src/main/res/drawable/twitter_white.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -127,6 +127,7 @@ along with this program.  If not, see <a href="https://www.gnu.org/licenses/">ht
     <string name="app_info_description">Subscribe to Webcal feeds</string>
     <string name="app_info_twitter">News &amp; updates</string>
     <string name="app_info_web_site">Web site</string>
+    <string name="app_info_mastodon" translatable="false">Mastodon</string>
 
     <string name="donate_title">Open-Source Information</string>
     <string name="donate_message">We\'re happy that you use ICSx⁵, which is open-source software (GPLv3). Because it was and still is much work to develop and maintain ICSx⁵, please consider a donation.</string>