Merge branch 'feature/pin-posts' into fork

fix simplified Chinese strings

README.md

@@ -1,16 +1,33 @@
-# Forked Mastodon for Android
-[![Crowdin](https://badges.crowdin.net/mastodon-for-android/localized.svg)](https://crowdin.com/project/mastodon-for-android)
+![Pink version of the Mastodon for Android launcher icon](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
 
-This is the repository for an officially forked Android app for Mastodon.
-
-Learn more about this app in the [blog post](https://blog.joinmastodon.org/2022/02/official-mastodon-for-android-app-is-coming-soon/).
+# Mastodon for Android Fork
 
 ## Changes
 
 * [Enable "Unlisted" as a visibility option](https://github.com/sk22/mastodon-android-fork/tree/feature/enable-unlisted)
   ([Pull request](https://github.com/mastodon/mastodon-android/pull/103)) and
   [set as default](https://github.com/sk22/mastodon-android-fork/tree/feature/enable-unlisted-as-default)
-* [Add "Federation" tab and change Discover tab order](https://github.com/sk22/mastodon-android-fork/tree/feature/add-federated-timeline)
+* [Add "Federation" tab and change Discover tab order](https://github.com/sk22/mastodon-android-fork/tree/feature/add-federated-timeline) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/8))
+* [Add image description button and viewer](https://github.com/sk22/mastodon-android-fork/tree/feature/display-alt-text) ([Pull request](https://github.com/mastodon/mastodon-android/pull/129))
+* [Implement pinning posts and displaying pinned posts](https://github.com/sk22/mastodon-android-fork/tree/feature/pin-posts) ([Pull request](https://github.com/mastodon/mastodon-android/pull/140))
+* [Display full image when adding image description](https://github.com/sk22/mastodon-android-fork/tree/feature/compose-image-description-full-image) ([Pull request](https://github.com/mastodon/mastodon-android/pull/182))
+* [Always preserve content warnings when replying](https://github.com/sk22/mastodon-android-fork/tree/feature/always-preserve-cw) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/113))
+* [Make back button return to the home tab before exiting the app](https://github.com/sk22/mastodon-android-fork/tree/feature/back-returns-home) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/118))
+* [Implement a bookmark button and list](https://github.com/sk22/mastodon-android-fork/tree/feature/bookmarks) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/22))
+* [Implement deleting and re-drafting](https://github.com/sk22/mastodon-android-fork/tree/feature/delete-redraft) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/21))
+
+## Fork-specific changes
+
+* Custom app name
+* Custom icon: Modulate upstream icon using ImageMagick
+
+  ```bash
+  mogrify -modulate 90,100,140 mastodon/src/main/res/mipmap-*/ic_launcher*.png
+  ```
+
+* Custom primary color: Hue of all `primary` colors in `colors.xml` is rotated, on basis of upstream Mastodon's [old branding](https://github.com/mastodon/mastodon-android/commit/74f03026cfcfcfd23237c38ff47d2b2a98a6f92a#diff-59134ec2a1cf3761f80b0ecccbbf8b9e433d9780d2f5c5d6ac3ac8cc254e808f)
+  by `109.8°` (equivalent of `161%`, done by hand using
+  [PineTools](https://pinetools.com/shift-hue-color))
 
 ## Building
 
@@ -22,4 +39,4 @@ As this app is using Java 17 features, you need JDK 17 or newer to build it. Oth
 
 ## License
 
-This project is released under the [GPL-3 License](./LICENSE).
+This project is released under the [GPL-3 License](./LICENSE).

fastlane/metadata/android/ar-SA/full_description.txt

@@ -0,0 +1,16 @@
+ماستودون هي أكبر شبكة اجتماعية لا مركزيَّة على الإنترنت. بدلاً من كونها على موقع ويب واحد مركزي، هي عبارة عن شبكة من ملايين المستخدمين في مجتمعات مُستقلَّة يمكنهم جميعًا التفاعل مع بعضهم البعض بسلاسة. بغض النظر عن اهتماماتك، يمكنك مقابلة أشخاص متحمسين ينشرون عنها في ماستودون!
+
+اِنضم إلَى مُجتَمع وأنشئ مِلَفَّكَ التَّعريفِيّ. ابحث عن أشخاص رائعين، تابعهم واقرأ منشوراتهم في خطٍّ زمني خالٍ من الإعلانات. عبِّر عَن نَفسِكَ باِستخدام رُموزٍ تَعبيرِيَّةٍ مُخصَّصَة، أو صُوَر، أو صُوَرٍ مُتحَرِّكَة، أو مَقاطِعٍ مَرئِّيَة أو مَقاطِعٍ صَوتِيَّةٍ فِي مَنشوراتٍ ذَاتُ خَمسِمائَة حَرف. رُدّ على سَلاسِلِ المَنشوراتِ، وأعِد تَدوينَ مَنشُوراتِ أيِّ شَخصٍ لِمُشارَكَةِ الأُمُورِ الرَّائِعَة. اِبحَث عَن حِساباتٍ جَديدَةٍ لِمُتابَعَتِها، وَعَن وُسُومٍ شَائِعَةٍ لِتَوسيعِ شَبَكَتِك.
+
+ماستودون مبني بتركيز على الأمان والخصوصيَّة. حدِّد ما إذا أردتَ مُشارَكَةَ مَنشُوراتِكَ مَعَ مُتابِعيك، أو الأشخاصِ الَّذينَ أشَرتَ إليهِم فَقَط أو العالَمَ بأسرِه. تتيح لك تحذيرات المحتوى إخفاء المنشورات التي تحتوي على مواد حساسة أو محفِّزَة حتى تكون مستعد للتفاعل مع محتواها. لكل مجتمع إرشاداته الخاصة ومشرفيه الخاصين للحفاظ على أمان أعضائه، كما تُساعد أدوات الحظر والإبلاغ القوية في منع إساءة الاستخدام.
+
+مَزيدٌ مِنَ المَزايَا:
+
+• النمط الداكِن: قراءة المنشورات في النمط المضيء، الداكِن أو الأسود الحقيقي
+• استطلاعات الرأي: اسأل المُتابعين عن آرائِهِم وسَتُسجَّل الأصوات
+• الاستكشاف: الأوسِمَة والحِسابات الرائجة على بُعد نقرة واحِدَة
+• الإشعارات: احصل على الجديد بشأن المُتابعات، الرُدود وعمليات إعادة التدوين
+• المشاركة: انشر مباشرة على ماستودون من أي لوح مُشاركة في أي تطبيق
+• الجاذبية: جالب الحظ لدينا هو فيل رائع، سَتراه يظهر فجأة في السطح بين الفينة والأُخرى
+
+مَاستودُون هي مُنَظَّمَةُ غَيرُ رِبحِيَّةٍ مُسَجَّلَة. مُساهَمَاتُكَ هِي الدَّاعِمُ المُباشِرُ لعَمَلِيَّةِ التَّطوير. لا توجد إعلانات، لا تسييل ولا رأس مال استثماري، نحن نخطط للبقاء على هذا النحو.

fastlane/metadata/android/ar-SA/short_description.txt

@@ -0,0 +1 @@
+شَبَكةٌ اِجتِماعِيَّةٌ لَا مَركزِيَّة

fastlane/metadata/android/ar-SA/title.txt

@@ -0,0 +1 @@
+مَاستودُون

fastlane/metadata/android/cs-CZ/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+
+Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+
+Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+
+More features:
+
+• Dark Mode: Read posts in light, dark, or true black mode
+• Polls: Ask followers for their opinion and tally the votes
+• Explore: Trending hashtags and accounts are a tap away
+• Notifications: Get notified about new follows, replies, and reblogs
+• Sharing: Post directly to Mastodon from any share sheet in any app
+• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+
+Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.

fastlane/metadata/android/cs-CZ/short_description.txt

@@ -0,0 +1 @@
+Decentralized social network

fastlane/metadata/android/cs-CZ/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/de-DE/full_description.txt

@@ -1,8 +1,8 @@
 Mastodon ist das größte dezentralisierte soziale Netzwerk im Internet. Statt einer einzigen Website ist es ein Netzwerk von Millionen von Benutzer*innen in unabhängigen Gemeinschaften, die alle miteinander interagieren können. Egal was dich interessiert, auf Mastodon kannst du interessierte Leute treffen, die darüber schreiben!
 
-Trete einer Gemeinschaft bei und erstelle dein Profil. Finde und verfolge faszinierende Leute und lese ihre Beiträge in einer werbefreien, chronologischen Zeitachse. Drücke dich mit benutzerdefinierten Emojis, Bilderns, GIFs, Videos und Audio in 500-Zeichen Beiträgen aus. Antworte auf Threads und teile Beiträge von anderen um großartige Sachen zu verbreiten. Finde neue Accounts zum Folgen und angesagte Hashtags, um dein Netzwerk zu erweitern.
+Tritt einer Gemeinschaft bei und erstelle dein Profil. Finde und folge faszinierenden Leuten und lies ihre Beiträge in einer werbefreien, chronologischen Zeitachse. Drücke dich mit benutzerdefinierten Emojis, Bilderns, GIFs, Videos und Audio in 500-Zeichen-Beiträgen aus. Antworte auf Threads und teile Beiträge von anderen, um großartige Sachen zu verbreiten. Finde neue Accounts zum Folgen und angesagte Hashtags, um dein Netzwerk zu erweitern.
 
-Mastodon wurde mit einem Schwerpunkt auf Privatsphäre und Sicherheit gebaut. Entscheide, ob du deine Beiträge mit deinen Followern, nur mit den Menschen, die du erwähnst, oder mit der ganzen Welt teilen möchtest. Mit Inhaltswarnungen kannst du Beiträge mit sensiblem oder triggerndem Inhalt ausblenden, bis du bereit bist, dich damit auseinanderzusetzen. Jede Gemeinschaft hat ihre eigenen Regeln und Moderator*innen, um die Sicherheit ihrer Mitglieder zu gewährleisten, sowie robuste Sperr- und Meldewerkzeuge um Missbrauch vorzubeugen.
+Mastodon wurde mit einem Schwerpunkt auf Privatsphäre und Sicherheit gebaut. Entscheide, ob du deine Beiträge mit deinen Followern, nur mit den Menschen, die du erwähnst, oder mit der ganzen Welt teilen möchtest. Mit Inhaltswarnungen kannst du Beiträge mit sensiblem oder triggerndem Inhalt ausblenden, bis du bereit bist, dich damit auseinanderzusetzen. Jede Gemeinschaft hat ihre eigenen Regeln und Moderator*innen, um die Sicherheit ihrer Mitglieder zu gewährleisten, sowie robuste Sperr- und Meldewerkzeuge, um Missbrauch vorzubeugen.
 
 Weitere Funktionen:
 
@@ -11,6 +11,6 @@ Weitere Funktionen:
 • Entdecken: Trending Hashtags und Accounts sind nur einen Fingertipp entfernt
 • Benachrichtigungen: Erhalte Benachrichtigungen über neue Follower, Antworten und geteilte Beiträge
 • Teilen: Veröffentliche auf Mastodon aus jeder beliebigen anderen App
-• Niedlichkeit: Unser Maskottchen ist ein entzückender Elefant und du wirst ihn von Zeit zu Zeit auftauchen sehen
+• Niedlichkeit: Unser Maskottchen ist ein entzückender Elefant, und du wirst ihn von Zeit zu Zeit auftauchen sehen
 
-Mastodon ist eine eingetragene gemeinnützige Organisation und die Entwicklung wird direkt durch deine Spenden unterstützt. Es gibt keine Werbung, keine Monetisierung und kein Venture-Capital, und wir planen es so zu erhalten.
+Mastodon ist eine eingetragene gemeinnützige Organisation, und die Entwicklung wird direkt durch deine Spenden unterstützt. Es gibt keine Werbung, keine Monetisierung und kein Venture-Capital, und wir planen es so zu erhalten.

fastlane/metadata/android/es-ES/full_description.txt

@@ -1,6 +1,6 @@
 Mastodon es la red social descentralizada más grande de internet. En lugar de ser una sola web, es una red de millones de usuarios en comunidades independientes que pueden interactuar entre ellas de forma transparente. No importa qué es lo que hagas, podrás encontrar gente apasionada escribiendo sobre ello en Mastodon!
 
-Únete a una comunidad y crea tu perfil. Encuentra y sigue a gente fascinante y lee sus publicaciones sin anuncios y de forma cronológica. Exprésate con emoticonos personalizados, imágenes, GIFs, vídeos y audio en publicaciónes de 500 caracteres. Responde a hilos e impulsa publicaciones de cualquiera para compartir contenido genial. Encuentra nuevas cuentas para seguir y los hashtags de actualidad para expandir tu red.
+Únete a una comunidad y crea tu perfil. Encuentra y sigue a gente fascinante y lee sus publicaciones sin anuncios y de forma cronológica. Exprésate con emoticonos personalizados, imágenes, GIFs, vídeos y audio en publicaciónes de 500 caracteres. Responde a hilos e rebloguea publicaciones de cualquiera para compartir contenido genial. Encuentra nuevas cuentas para seguir y los hashtags de actualidad para expandir tu red.
 
 Mastodon está construída con un enfoque en la privacidad y la seguridad. Decide si tus publicaciones se comparten con tus seguidores, solo a la gente que menciones, o a todo el mundo. Las advertencias de contenido te permiten esconder publicaciones con contenido sensible o limitarlas de tu visión hasta que estés listo para interactuar con ellas. Cada comunidad tiene sus propias reglas y moderadores para mantener a salvo a sus miembros, además de herramientas robustas para bloquear y reportar contenido para prevenir el abuso.
 
@@ -9,7 +9,7 @@ Más características:
 • Modo oscuro: Lee las publicaciones en modo claro, oscuro o negro real
 • Encuestas: Pide opinión a tus seguidores y cuenta los votos
 • Explora: Hashtags y cuentas en tendencia a un solo toque
-• Notificaciones: Recibe notificaciones sobre nuevos seguidores, respuestas e impulsos
+• Notificaciones: Recibe notificaciones sobre nuevos seguidores, respuestas y reblogueos
 • Compartir: Publica directamente a Mastodon desde cualquier hoja de acción en cualquier aplicación
 • Preciosidad: Nuestra mascota es un elefante adorable, y verás que aparece de vez en cuando
 

fastlane/metadata/android/fi-FI/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon on internetin suurin hajautettu sosiaalinen verkosto. Yhden verkkopalvelun sijaan, se on miljoonien itsenäisissä yhteisöissä olevien käyttäjien verkosto, jotka voivat olla vuorovaikutuksessa toistensa kanssa saumattomasti. Riippumatta siitä, mistä olet kiinnostunut, voit tavata intohimoisia ihmisiä, jotka julkaisevat aiheesta Mastodonissa!
+
+Liity yhteisöön ja luo itsellesi tili. Löydä ja seuraa kiehtovia ihmisiä ja lue heidän julkaisunsa ilman mainoksia, kronologisella aikajanalla. Ilmaise itseäsi mukautetuilla emojeilla, kuvilla, videoilla ja audiolla 500 merkin pituisissa julkaisuissa. Vastaa viestiketjuihin ja edelleen jaa julkaisuja keneltä tahansa, jakaaksesi hienoja juttuja. Löydä uusia tilejä seurattavaksi ja trendaavia hashtageja laajentaaksesi verkostoasi.
+
+Mastodon on rakennettu keskittyen yksityisyyteen ja turvallisuuteen. Päätä, jaetaanko julkaisusi seuraajille, vain mainitsemillesi ihmisille vai koko maailmalle. Sisältövaroitusten avulla, voit piilottaa julkaisut, jotka sisältävät arkaluontoista tai laukaisevaa materiaalia, kunnes olet valmis käsittelemään niitä. Jokaisella yhteisöllä on omat ohjeistonsa ja valvojansa, jotka pitävät jäsenensä turvassa, ja tehokkaat esto- ja ilmiantotyökalut auttavat torjumaan väärinkäytöksiä.
+
+Lisää ominaisuuksia:
+
+• Tumma tila: Lue julkaisut vaaleassa, tummassa tai mustan tummassa tilassa
+• Kyselyt: Kysy seuraajilta heidän mielipidettään ja laske äänet
+• Tutustu: Trendaavat hashtagit ja tilit ovat vain napsautuksen päässä
+• Ilmoitukset: Saat ilmoituksen uusista seuraajista, vastauksista ja edelleen jaoista
+• Jakaminen: Julkaise suoraan Mastodoniin minkä tahansa sovelluksen jakovalikon kautta
+• Suloisuus: Maskottimme on ihastuttava mastodontti ja näet sen ajoittain
+
+Mastodon on rekisteröity voittoa tavoittelematon organisaatio ja kehitystä tuetaan suoraan lahjoituksillasi. Ei mainontaa, kaupallistamista eikä riskipääomaa, ja aiomme pitää sen sellaisena.

fastlane/metadata/android/fi-FI/short_description.txt

@@ -0,0 +1 @@
+Hajautettu sosiaalinen verkosto

fastlane/metadata/android/fi-FI/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/hy-AM/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+
+Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+
+Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+
+More features:
+
+• Dark Mode: Read posts in light, dark, or true black mode
+• Polls: Ask followers for their opinion and tally the votes
+• Explore: Trending hashtags and accounts are a tap away
+• Notifications: Get notified about new follows, replies, and reblogs
+• Sharing: Post directly to Mastodon from any share sheet in any app
+• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+
+Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.

fastlane/metadata/android/hy-AM/short_description.txt

@@ -0,0 +1 @@
+Decentralized social network

fastlane/metadata/android/hy-AM/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/ja-JP/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+Mastodonは、インターネット上で最大の分散型ソーシャルネットワークです。 Mastodonは単一のウェブサイトではなく、それぞれ独立したコミュニティに参加している何百万人ものユーザーによって構成されたネットワークなのです。ユーザーたちはその中で、誰もがお互いとシームレスにやり取りできます。 あなたの興味関心がどんな分野にあっても、きっとMastodonのどこかで同じ情熱を投稿している仲間がいますよ！
 
-Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+まずはコミュニティに参加して、自分のプロフィールを作成しましょう。 そして素敵なユーザーを見つけて、フォローして、タイムラインで投稿を見てみましょう。タイムラインには広告なんてありませんし、順番も時系列順ですのでご安心を。 あるいは、500文字まで使える投稿で自分を表現してみましょう。カスタム絵文字や画像、GIF、動画、音声も使用できます。 スレッドに返事したり、他の誰かの面白い投稿をブーストして共有したりすることもできます。 新しいアカウントとホットなタグを見つけて、あなた自身のネットワークを広げていきましょう！
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Mastondonはプライバシーと安全性を重視しています。 自分の投稿をフォロワー限定公開にするのか、メンションした特定のユーザーにだけ共有するのか、全世界に大放流するのかは、すべてあなた次第。 また、入力中の投稿について「ちょっとセンシティブな内容だな」と思ったら、閲覧注意機能で内容を伏せることで、見たくない人に配慮した投稿が作成できます。 そして、各コミュニティにはそれぞれのガイドラインと管理者・モデレーターが存在し、コミュニティメンバーの安全を守っています。強力なブロック・通報機能も、不正利用の防止をお手伝いします。
 
-More features:
+その他の機能：
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• ダークモード対応：ライトモードだけでなく、ダークモードや「真っ黒」モードで投稿を閲覧
+• 投票機能：フォロワーたちの意見を投票形式で集計
+• 探索：話題のハッシュタグやアカウントに1タップでアクセス
+• 通知設定：新しいフォローやリプライ、ブーストがあった時に通知
+• 共有：どのアプリからでも、「共有」メニューを通じてMastodonへ直接投稿
+• 癒し：Mastodonが誇る象のマスコット（かわいい）が、画面にお邪魔したり、しなかったり
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+Mastodonは公認の非営利アプリです。開発は全てユーザーの寄付から成り立っています。 広告なし、アフィリエイトなし、第三者組織による出資なし。今でも、そしてこれからもそんなアプリであり続けるために、我々は日々努力し続けています。

fastlane/metadata/android/ja-JP/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+分散型ソーシャルネットワーク

fastlane/metadata/android/kab-KAB/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon d azeṭṭa anmetti asrummsan meqqren deg internet. Ideg ara yili d asmel web asuf, d azeṭṭa n yimelyan n yiseqdacen deg temɣiwin tilelliyin i izemren ad myigwent gar-asent, s wudem afrawan. Akken ibɣu yili usentel i tḥemmleḍ, tzemreḍ ad temlileḍ imdanen i d-isuffuɣen ɣef usentel-nni ɣef Mastodon!
+
+Rnu ɣer temɣiwent syen snulfu-d amaɣnu-inek. Af, rnu ḍfer imdanen yelhan. Teɣreḍ tisuffaɣ-nsen deg yizirig n wakud war adellel. Mmel iḥulfan-ik s yimujiten, tugniwin, GIFs, tividyutin d yimeslawen udmawanen deg tsuffaɣ n 500 yisekkilen. Ttekki deg usqerdec, talseḍ asuffeɣ n tsuffaɣ n yimdanen i beṭṭu n taktiwin igerrzen. Af imiḍanen ara tḍefreḍ akked hashtags mucaεen i wakken ad tesnerniḍ azeṭṭa-inek.
+
+Mastodon yettwabna s tikci n wazal i tbaḍnit d tɣellist. Gzem-itt deg ṛṛay ma yella tisuffaɣ-inek·inem ad ttwabḍunt akked yineḍfaren-ik·im, akked yimdanen kan i d-tbedreḍ neɣ akked yimdanen meṛṛa. Ilɣa n ugbur ad ak·akem-yeǧǧ d teffreḍ tisuffaɣ ideg yella ugbur amḥalfu neɣ yir agbur alamma d asmi ara twejdeḍ ad tkecmeḍ ɣer-sen. Yal tamɣiwent ɣur-s ilugan-ines d yiseɣyaden-is i wakken ad teḍmentaɣellist n yiεeggalen-is, akked yifecka iǧehden i usewḥel d tummla n yineqqisen mgal yir aseqdec.
+
+Ugar n temahilin:
+
+• Askar aberkan: Γeṛ tisuffaɣ deg uskar aceεlal, aberkan neɣ aberkan aḥeqqani
+• Isenqaden: Ssuter ṛṛay n yineḍfaren syen smiḍen afran
+• Snirem: Hashtags d yimiḍanen mucaεen llan ɣef wafus
+• Ilɣa: Ṭṭef ilɣa ɣef yineḍfaren, tiririyin d wallus n usuffeɣ imaynuten
+• Beṭṭu: Azen srid ɣer Mastodon seg kra n tferkit n beṭṭu deg kra n usnas
+• Ucbiḥ: Lfal-nneɣ d ilu icebḥen aṭas, ad t-tetttwaliḍ yettban-d sya ɣer da
+
+Mastodon d takebbanit ur nettnadi ara ɣef tedrimt, asnerni-ines yettili-d s tewsa-nni i as-tettmuddum. Ulac adellel, ur njemmeε tadrimt, ur nesεi win aɣ-d-yettakken tadrimt. Akka i nettxemmim ad nkemmel abrid-nneɣ.

fastlane/metadata/android/kab-KAB/short_description.txt

@@ -0,0 +1 @@
+Azeṭṭa anmetti asrummsan

fastlane/metadata/android/kab-KAB/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/ko-KR/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+마스토돈은 인터넷에서 가장 큰 분산 소셜 네트워크입니다. 단 하나의 통일된 웹사이트 대신, 수백만 명의 사용자들이, 서로 경계 없이 소통할 수 있는 독립적인 커뮤니티의 네트워크입니다. 당신이 어디에 속하든간에, 마스토돈에 열정적으로 게시물을 남기는 사람들을 만날 수 있습니다!
 
-Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+커뮤니티에 가입하고 프로필을 생성하세요. 매력적인 사람들을 찾아 팔로우하고 그들의 글을 광고가 없고, 시간순으로 정렬된 타임라인에서 읽으세요. 커스텀 에모지, 그림, 움짤, 동영상, 소리와 함께 500자의 글로 당신을 표현하세요. 아무에게나 글타래에 답장을 하고 게시물을 리블로그하여 멋진 것들을 공유하세요. 새로 팔로우 할 계정이나 유행 중인 해시태그를 찾아 당신의 인맥을 넓히세요.
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+마스토돈은 개인정보 보호와 안전에 중점을 두고 만들어졌습니다. 당신의 게시물을 팔로워들에게만 공개할지, 언급한 사람들에게만 공유할지, 아니면 전세계에 공유할 지 선택하세요. 열람주의는 민감하거나 남들에게 껄끄러울 수 있는 게시물을 마음의 준비가 된 사람들만 열람하도록 숨길 수 있도록 해줍니다. 각각의 커뮤니티는 구성원들을 안전하게 지키기 위한 각자의 규정과 중재자들을 가지고 있으며, 남용을 방지하기 위한 강력한 차단 도구와 신고 도구를 가지고 있습니다.
 
-More features:
+더 많은 기능:
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• 다크모드: 게시물을 밝음, 어두움, 진정한 검정 모드에서 읽으세요
+• 투표: 팔로워들에게 의견을 물어보고 투표를 집계하세요
+• 탐색: 유행 중인 해시태그와 계정을 탭 한 번에 볼 수 있습니다
+• 알림: 새로운 팔로우, 답글, 리블로그에 대한 알림을 받으세요
+• 공유: 어떤 앱에서든 공유 기능으로 바로 마스토돈에 게시하세요
+• 귀여움: 우리의 마스코트는 귀여운 코끼리입니다, 때때로 이들을 볼 수 있습니다
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+마스토돈은 등록된 상호이며 여러분들의 직접적인 기부를 통해 개발되고 있습니다. 광고도, 유료화도, 벤처 캐피탈도 없습니다, 그리고 계속 그렇게 할 생각입니다.

fastlane/metadata/android/ko-KR/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+분산화된 소셜 네트워크

fastlane/metadata/android/ko-KR/title.txt

@@ -1 +1 @@
-Mastodon
+마스토돈

fastlane/metadata/android/pl-PL/full_description.txt

@@ -1,16 +1,16 @@
 Mastodon to największa zdecentralizowana sieć społecznościowa w Internecie. Zamiast jednej strony internetowej, jest to sieć milionów użytkowników w niezależnych społecznościach, które mogą ze sobą wchodzić w interakcje. Niezależnie od swoich zainteresowań, momżesz poznać interesujących ludzi piszących o nich na Mastodonie!
 
-Dołącz do społeczności i utwórz swój profil. Poznaj i obserwuj fascynujących ludzi i czytaj ich wpisy w chronologicznym osi czasu. Wyrażaj siebie za pomocą niestandardowych emoji, obrazów, GIFów, filmów i audio w 500-znakowych wpisach. Odpowiadaj na wątki i podawaj dalej posty od każdego, aby dzielić się wspaniałymi rzeczami. Find new accounts to follow and trending hashtags to expand your network.
+Dołącz do społeczności i utwórz swój profil. Poznaj i obserwuj fascynujących ludzi i czytaj ich wpisy w chronologicznym osi czasu. Wyrażaj siebie za pomocą niestandardowych emoji, obrazów, GIFów, filmów i audio w 500-znakowych wpisach. Odpowiadaj na wątki i podawaj dalej posty od każdego, aby dzielić się wspaniałymi rzeczami. Odnajduj nowe konta do śledzenia i zyskujące popularność hashtagi, by poszerzać swoją sieć.
 
-Mastodon został zaprojektowany z myślą o prywatności i bezpieczeństwie. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Ostrzeżenia dotyczące zawartości pozwalają ukrywać posty zawierające wrażliwe lub wyzywające materiały, dopóki nie będziesz gotów się z nimi pogodzić. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Mastodon został zaprojektowany z myślą o prywatności i bezpieczeństwie. Decyduj, czy Twoje wpisy są udostępniane osobom śledzącym Cię, tylko wzmiankowanym, czy całemu światu. Ostrzeżenia dotyczące zawartości pozwalają ukrywać posty zawierające wrażliwe lub wyzywające materiały, dopóki nie będziesz gotów się z nimi pogodzić. Każda społeczność ma własne wytyczne i moderatorów, aby zapewniać swoim członkom bezpieczeństwo, a także solidne narzędzia blokowania i raportowania pomagające zapobiegać nadużyciom.
 
 Więcej funkcji:
 
 • Tryb ciemny: Czytaj wpisy w jasnym, ciemnym lub czarnym trybie
 • Ankiety: Poproś obserwujących o ich opinię i poznaj ich głosy
-• Explore: Trending hashtags and accounts are a tap away
+• Odkrywaj: Najpopularniejsze hashtagi i konta są dostępne za jednym dotknięciem
 • Powiadomienia: Otrzymuj powiadomienia o nowych obserwacjach, odpowiedziach i udostępnieniach
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• Udostępnianie: Publikuj bezpośrednio na Mastodonie z menu udostępniania w dowolnej aplikacji
+• Słodycz: Nasza maskotka to uroczy słoń i zobaczysz go pojawiającego się od czasu do czasu
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+Mastodon to zarejestrowana organizacja non-profit i rozwój jest wspierany bezpośrednio przez darowizny. Nie ma reklam, monetyzacji, ani kapitału inwestycyjnego i planujemy, by tak pozostało.

fastlane/metadata/android/pt-PT/full_description.txt

@@ -1,8 +1,8 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+O Mastodon é a maior rede social descentralizada da Internet. Em vez de ser um único site, é uma rede de milhões de utilizadores em comunidades independentes que podem facilmente interagir uns com os outros. Independemente dos teus gostos, consegues encontrar pessoas que os partilhem no Mastodon!
 
-Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+Junta-te a uma comunidade e cria o teu perfil. Encontra, segue gente fascinante e lê as suas publicações numa cronologia sem anúncios. Expressa-te com emojis personalizados imagens, GIFs, vídeos e áudio em publicações com até 500 caracteres. Responde a tópicos e promove publicações de qualquer pessoa para partilhares ótimas coisas. Encontra novas contas e tendências a seguir para expandires a tua rede.
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+O Mastodon é construído com foco na privacidade e segurança. Decide se as tuas publicações são partilhadas com os teus seguidores, apenas com as pessoas mencionadas, ou com o mundo inteiro. Avisos de conteúdo permitem-te esconder publicações que contenham material sensível ou provocatório até estares pronto(a) para o veres. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
 
 More features:
 

fastlane/metadata/android/pt-PT/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+Rede social descentralizada

fastlane/metadata/android/ru-RU/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+Mastodon — это крупнейшая распределённая социальная сеть в интернете. Вместо одного сайта, это сеть из независимых сообществ с миллионами пользователей, которые могут бесшовно взаимодействовать друг с другом. Вне зависимости от того, чем вы увлекаетесь, вы всегда найдёте себе единомышленников в Mastodon!
 
-Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+Вступите в сообщество по интересу и создайте свой профиль. Ищите и подписывайтесь на увлекательных пользователей, читайте их посты без рекламы в хронологической ленте. Выражайте себя в 500-символьных постах, дополняя их пользовательскими эмодзи, изображениями, гифками, видео и аудио. Участвуйте в обсуждениях и продвигайте отличные посты от других людей. Расширяйте свой кругозор, находя новых интересных людей и следя за актуальными хэштегами.
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Mastodon создан с акцентом на конфиденциальность и безопасность. Решайте с кем вы хотите поделиться своими постами: своими подписчиками, только упомянутыми людьми или же вообще со всем миром. Предупреждения о содержимом позволят вам скрыть посты содержащие материалы деликатного или шокирующего характера. В каждом сообществе свои правила и модераторы, следящие за порядком, а надёжные инструменты блокировки и система жалоб помогают предотвращать злоупотребление.
 
-More features:
+Ещё больше возможностей:
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• Темы на любой вкус: читайте посты в светлом, тёмном или OLED режимах
+• Спрашивайте мнение подписчиков и подсчитывайте их голоса с опросами
+• Найдите актуальные хэштеги, интересные посты и профили во вкладке «Обзор»
+• Будьте в курсе происходящего с уведомлениями о новых подписчиках, ответах и продвижениях
+• Делитесь в Mastodon содержимым из любого приложения
+• Умиляйтесь с нашим талисманом, восхитительным слонёнком, которого можно встретить и тут и там
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+Mastodon является зарегистрированной некоммерческой организацией, его разработка поддерживается непосредственно вашими пожертвованиями. У нас нет рекламы, монетизации и венчурного капитала, и мы не планируем это менять.

fastlane/metadata/android/sv-SE/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+Mastodon är det största decentraliserade sociala nätverket på internet. I stället för en enda webbplats är det ett nätverk av miljontals användare på oberoende servrar som alla kan interagera med varandra, sömlöst. Oavsett vad du är intresserad av kan du träffa passionerade personer som diskuterar ämnet på Mastodon!
 
-Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+Gå med på en server och skapa din profil. Hitta och följ fascinerande människor och läsa deras inlägg i en annonsfri, kronologisk tidslinje. Uttryck dig med anpassade emoji, bilder, GIF:ar, videor och ljud i 500-teckensinlägg. Svara på trådar och ompostningar från vem som helst för att dela bra saker. Hitta nya konton att följa och trendande hashtaggar för att utöka ditt nätverk.
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Mastodon är byggt med fokus på integritet och trygghet. Bestäm om dina inlägg delas med dina följare, bara personer du omnämner, eller hela världen. Innehållsvarningar låter dig dölja inlägg som innehåller känsligt eller triggande material tills du är redo att interagera med dem. Varje server har sina egna riktlinjer och moderatorer för att hålla sina medlemmar trygga, och robusta blockerings- och rapporteringsverktyg för att förhindra missbruk.
 
-More features:
+Fler funktioner:
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• Mörkt läge: Läs inlägg i ljust, mörkt eller helsvart läge
+• Omröstningar: Fråga följare om deras åsikt och sammanställ deras röster
+• Utforska: Trendande hashtaggar och konton är ett tryck bort
+• Notiser: Bli meddelad om nya följare, svar och ompostningar
+• Delning: Posta direkt till Mastodon från delningsbladet i alla appar
+• Gullighet: Vår maskot är en bedårande elefant, och du kommer att se dem dyka upp då och då
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+Mastodon är en registrerad ideell förening och utvecklingen stöds direkt av dina donationer. Det finns ingen reklam, ingen monetarisering, och inget riskkapital, och vi planerar att behålla det på det sättet.

fastlane/metadata/android/sv-SE/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+Decentraliserat socialt nätverk

fastlane/metadata/android/th-TH/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon เป็นเครือข่ายสังคมแบบกระจายศูนย์ที่ใหญ่ที่สุดบนอินเทอร์เน็ต ซึ่งไม่ได้เป็นเว็บไซต์เดียว แต่เป็นเครือข่ายของผู้ใช้หลายล้านคนในชุมชนอิสระที่ทุกคนสามารถโต้ตอบซึ่งกันและกันได้แบบไร้รอยต่อ ไม่ว่าคุณจะชอบอะไร คุณก็พบคนที่ชื่นชอบเหมือนกันโพสต์เกี่ยวกับสิ่งที่คุณชอบได้บน Mastodon!
+
+เข้าร่วมชุมชนและสร้างโปรไฟล์ ค้นหาและติดตามผู้คนที่น่าสนใจและอ่านโพสต์ของเขาในไทม์ไลน์ที่ไร้โฆษณาและเรียงตามลำดับเวลาล้วน ๆ แสดงความรู้สึกของตัวคุณเองด้วยอีโมจิที่กำหนดเอง รูปภาพ GIF วิดีโอ และเสียงในโพสต์ 500 ตัวอักษร ตอบกลับและดันโพสต์จากคนอื่น ๆ เพื่อแชร์สิ่งดี ๆ และค้นหาบัญชีใหม่ ๆ ที่จะติดตามและแฮชแท็กที่เป็นที่นิยมเพื่อขยายเครือข่ายของคุณ
+
+Mastodon สร้างขึ้นโดยเน้นความเป็นส่วนตัวและความปลอดภัยเป็นสำคัญ คุณสามารถตัดสินใจได้ว่าโพสต์ของคุณจะถูกแชร์กับผู้ติดตามของคุณ คนที่คุณกล่าวถึง หรือคนทั้งโลกก็ได้ ฟังก์ชั่นคำเตือนเนื้อหาช่วยให้คุณซ่อนโพสต์ที่มีเนื้อหาที่ละเอียดอ่อนจนกว่าคุณจะพร้อมเห็นเนื้อหานั้น แต่ละชุมชนจะมีหลักเกณฑ์และผู้ควบคุมเป็นของตนเองเพื่อรักษาความปลอดภัยของสมาชิก รวมถึงเครื่องมือการปิดกั้นและรายงานที่มีประสิทธิภาพเพื่อช่วยป้องกันการกระทำผิด
+
+คุณสมบัติอื่น ๆ:
+
+• โหมดมืด: อ่านโพสต์ในโหมดสว่าง มืด หรือโหมดมืดดำสนิท
+• การสำรวจความคิดเห็น: สำรวจความคิดเห็นของผู้ติดตามและนับจำนวนการลงคะแนน
+• สำรวจ: แตะปุ่มเดียวเพื่อดูแฮชแท็กและบัญชีที่เป็นที่นิยม
+• การแจ้งเตือน: รับการแจ้งเตือนเกี่ยวกับผู้ติดตามใหม่ การตอบกลับ และการดันโพสต์
+• การแชร์: โพสต์ลง Mastodon ได้โดยตรงจากแอปอื่น ๆ ที่อยู่ในเครื่อง
+• ความน่ารัก: มาสคอตของเราเป็นช้างน่ารัก และคุณจะเห็นมันโผล่ออกมาเป็นระยะ ๆ
+
+Mastodon เป็นองค์กรไม่แสวงหาผลกำไรที่จดทะเบียนแล้ว และการพัฒนาได้รับการสนับสนุนจากเงินบริจาคของคุณโดยตรง ดังนั้นจึงไม่มีโฆษณา ไม่มีการทำกำไร และไม่มีการร่วมลงทุน และเรามีแผนจะทำให้เป็นอย่างนี้ต่อไป

fastlane/metadata/android/th-TH/short_description.txt

@@ -0,0 +1 @@
+เครือข่ายสังคมแบบกระจายศูนย์

fastlane/metadata/android/th-TH/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/vi-VN/full_description.txt

@@ -1,8 +1,8 @@
-Mastodon là mạng xã hội liên hợp lớn nhất trên internet. Thay vì một trang web duy nhất, nó là một mạng lưới hàng triệu người dùng trong các cộng đồng độc lập, tất cả đều có thể tương tác với nhau một cách liền mạch. Bất kể bạn thích gì, bạn đều có thể gặp gỡ những người đăng tút về nó trên Mastodon!
+Mastodon là mạng xã hội liên hợp lớn nhất trên internet. Thay vì một trang web duy nhất, nó là một mạng lưới hàng triệu người dùng trong các máy chủ độc lập, tất cả đều có thể tương tác với nhau một cách liền mạch. Bất kể bạn thích gì, bạn đều có thể gặp gỡ những người đăng tút về nó trên Mastodon!
 
-Tham gia một cộng đồng và tạo trang hồ sơ của bạn. Tìm, theo dõi những người thú vị và đọc tút của họ theo trình tự thời gian, không có quảng cáo. Thể hiện bản thân bằng emoji, hình ảnh, GIF, video và âm thanh trong tút tối đa 500 ký tự. Trả lời tút và đăng lại tút từ bất kỳ ai để chia sẻ những điều tuyệt vời. Tìm những người dùng mới để theo dõi và các hashtag xu hướng để mở rộng mạng lưới của bạn.
+Tham gia một máy chủ và tạo trang hồ sơ của bạn. Tìm, theo dõi những người thú vị và đọc tút của họ theo trình tự thời gian, không có quảng cáo. Thể hiện bản thân bằng emoji, hình ảnh, GIF, video và âm thanh trong tút tối đa 500 ký tự. Trả lời tút và đăng lại tút từ bất kỳ ai để chia sẻ những điều tuyệt vời. Tìm những người dùng mới để theo dõi và các hashtag xu hướng để mở rộng mạng lưới của bạn.
 
-Mastodon được xây dựng tập trung vào sự riêng tư và an toàn. Quyết định xem tút của bạn được chia sẻ với những người theo dõi, chỉ những người bạn nhắc đến hay cả thế giới. Nội dung ẩn cho phép bạn ẩn các tút chứa nội dung nhạy cảm hoặc chơi chữ cho đến khi bạn sẵn sàng tương tác với chúng. Mỗi cộng đồng có các nguyên tắc riêng và kiểm duyệt viên riêng để giữ an toàn cho các thành viên, song song với các công cụ chặn và báo cáo mạnh mẽ giúp ngăn chặn hành vi bậy.
+Mastodon được xây dựng tập trung vào sự riêng tư và an toàn. Quyết định xem tút của bạn được chia sẻ với những người theo dõi, chỉ những người bạn nhắc đến hay cả thế giới. Nội dung ẩn cho phép bạn ẩn các tút chứa nội dung nhạy cảm hoặc chơi chữ cho đến khi bạn sẵn sàng tương tác với chúng. Mỗi máy chủ có các nguyên tắc riêng và kiểm duyệt viên riêng để giữ an toàn cho các thành viên, song song với các công cụ chặn và báo cáo mạnh mẽ giúp ngăn chặn hành vi bậy.
 
 Tính năng khác:
 

fastlane/metadata/android/zh-TW/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+Mastodon 是網際網路上最大的去中心化社交網路。 它是一個由能無縫互動的獨立社群中，數百萬使用者組成的網路，而非單一網站。 無論您對什麼事情感興趣，您都能在 Mastodon 上遇到充滿熱情的人們討論該話題。
 
-Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+加入社群並建立您的個人檔案。 尋找並追蹤迷人的夥伴，並在無廣告、按時間順序排列的時間軸上閱讀他們的貼文。 在 500 個字元的貼文中使用自訂表情符號、GIF、視訊與音訊來表達您自己。 回覆任何人的話題與轉發貼文以分享精彩內容。 尋找要追蹤的新帳號與熱門主題標籤來拓展您的網路。
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Mastodon 以隱私與安全為要。 決定您的貼文要與您的追蹤者分享、只與您提及的人們分享，又或是與全世界分享。 內容警告可讓您隱藏包含敏感或可能觸發強烈情緒反應的貼文，直到您準備好與它們進行互動。 每個社群都有它們自己的指導方針與管理原來確保其成員安全，強大的封鎖與回報工具有助於防止濫用。
 
-More features:
+更多功能：
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• 深色模式：以淺色、深色或純黑色模式閱讀貼文
+• 投票：詢問追蹤的意見並計票
+• 探索：僅需輕點一下，即可看到熱門主題標籤與帳號
+• 通知：取得關於新追蹤、回覆與轉發的通知
+• 分享：從任何應用程式中的分享表中直接發表貼文到 Mastodon 中
+• 可愛：我們的吉祥物是一隻可愛的大象，您會不時看到牠出現
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+Mastodon 是一家註冊的非營利組織，您的捐款會直接支援開發工作。 沒有廣告、沒有貨幣化、沒有風險投資，我們計畫維持這種狀態。

fastlane/metadata/android/zh-TW/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+去中心化社群網路

mastodon/build.gradle

@@ -6,11 +6,11 @@ plugins {
 android {
 	compileSdk 31
 	defaultConfig {
-		applicationId "org.joinmastodon.android"
+		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 31
-		versionCode 3
-		versionName '1.0.4-dev+fork.1.1'
+		versionCode 20
+		versionName '1.1.3+fork.20'
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
 

mastodon/proguard-rules.pro

@@ -46,4 +46,9 @@
 
 -keep class org.joinmastodon.android.AppCenterWrapper { *; }
 
--keepattributes LineNumberTable
+-keepattributes LineNumberTable
+
+# Parceler library
+-keep interface org.parceler.Parcel
+-keep @org.parceler.Parcel class * { *; }
+-keep class **$$Parcelable { *; }

mastodon/src/main/java/org/joinmastodon/android/MainActivity.java

@@ -9,6 +9,7 @@ import android.util.Log;
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.SplashFragment;
@@ -56,6 +57,8 @@ public class MainActivity extends FragmentStackActivity{
 				if(intent.getBooleanExtra("fromNotification", false) && intent.hasExtra("notification")){
 					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
 					showFragmentForNotification(notification, session.getID());
+				}else if(intent.getBooleanExtra("compose", false)){
+					showCompose();
 				}
 			}
 		}
@@ -91,6 +94,8 @@ public class MainActivity extends FragmentStackActivity{
 				fragment.setArguments(args);
 				showFragmentClearingBackStack(fragment);
 			}
+		}else if(intent.getBooleanExtra("compose", false)){
+			showCompose();
 		}
 	}
 
@@ -115,4 +120,15 @@ public class MainActivity extends FragmentStackActivity{
 		fragment.setArguments(args);
 		showFragment(fragment);
 	}
+
+	private void showCompose(){
+		AccountSession session=AccountSessionManager.getInstance().getLastActiveAccount();
+		if(session==null || !session.activated)
+			return;
+		ComposeFragment compose=new ComposeFragment();
+		Bundle composeArgs=new Bundle();
+		composeArgs.putString("account", session.getID());
+		compose.setArguments(composeArgs);
+		showFragment(compose);
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java

@@ -18,6 +18,7 @@ import android.util.Log;
 
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.requests.notifications.GetNotificationByID;
+import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.PushNotification;
@@ -52,10 +53,23 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 			String k=intent.getStringExtra("k");
 			String p=intent.getStringExtra("p");
 			String s=intent.getStringExtra("s");
-			String accountID=intent.getStringExtra("x");
-			if(!TextUtils.isEmpty(accountID) && !TextUtils.isEmpty(k) && !TextUtils.isEmpty(p) && !TextUtils.isEmpty(s)){
+			String pushAccountID=intent.getStringExtra("x");
+			if(!TextUtils.isEmpty(pushAccountID) && !TextUtils.isEmpty(k) && !TextUtils.isEmpty(p) && !TextUtils.isEmpty(s)){
 				MastodonAPIController.runInBackground(()->{
 					try{
+						List<AccountSession> accounts=AccountSessionManager.getInstance().getLoggedInAccounts();
+						AccountSession account=null;
+						for(AccountSession acc:accounts){
+							if(pushAccountID.equals(acc.pushAccountID)){
+								account=acc;
+								break;
+							}
+						}
+						if(account==null){
+							Log.w(TAG, "onReceive: account for id '"+pushAccountID+"' not found");
+							return;
+						}
+						String accountID=account.getID();
 						PushNotification pn=AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().decryptNotification(k, p, s);
 						new GetNotificationByID(pn.notificationId+"")
 								.setCallback(new Callback<>(){

mastodon/src/main/java/org/joinmastodon/android/api/AvatarResizedImageRequestBody.java

@@ -0,0 +1,39 @@
+package org.joinmastodon.android.api;
+
+import android.graphics.Rect;
+import android.net.Uri;
+
+import java.io.IOException;
+
+public class AvatarResizedImageRequestBody extends ResizedImageRequestBody{
+	public AvatarResizedImageRequestBody(Uri uri, ProgressListener progressListener) throws IOException{
+		super(uri, 0, progressListener);
+	}
+
+	@Override
+	protected int[] getTargetSize(int srcWidth, int srcHeight){
+		float factor=400f/Math.min(srcWidth, srcHeight);
+		return new int[]{Math.round(srcWidth*factor), Math.round(srcHeight*factor)};
+	}
+
+	@Override
+	protected boolean needResize(int srcWidth, int srcHeight){
+		return srcHeight>400 || srcWidth!=srcHeight;
+	}
+
+	@Override
+	protected boolean needCrop(int srcWidth, int srcHeight){
+		return srcWidth!=srcHeight;
+	}
+
+	@Override
+	protected Rect getCropBounds(int srcWidth, int srcHeight){
+		Rect rect=new Rect();
+		if(srcWidth>srcHeight){
+			rect.set(srcWidth/2-srcHeight/2, 0, srcWidth/2-srcHeight/2+srcHeight, srcHeight);
+		}else{
+			rect.set(0, srcHeight/2-srcWidth/2, srcWidth, srcHeight/2-srcWidth/2+srcWidth);
+		}
+		return rect;
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java

@@ -233,6 +233,12 @@ public class CacheController{
 		});
 	}
 
+	public void deleteStatus(String id){
+		runOnDbThread((db)->{
+			db.delete("home_timeline", "`id`=?", new String[]{id});
+		});
+	}
+
 	public void clearRecentSearches(){
 		runOnDbThread((db)->db.delete("recent_searches", null, null));
 	}

mastodon/src/main/java/org/joinmastodon/android/api/MastodonErrorResponse.java

@@ -26,6 +26,8 @@ public class MastodonErrorResponse extends ErrorResponse{
 
 	@Override
 	public void showToast(Context context){
+		if(context==null)
+			return;
 		Toast.makeText(context, error, Toast.LENGTH_SHORT).show();
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java

@@ -126,7 +126,7 @@ public class PushSubscriptionManager{
 			throw new IllegalStateException("No device push token available");
 		MastodonAPIController.runInBackground(()->{
 			Log.d(TAG, "registerAccountForPush: started for "+accountID);
-			String encodedPublicKey, encodedAuthKey;
+			String encodedPublicKey, encodedAuthKey, pushAccountID;
 			try{
 				KeyPairGenerator generator=KeyPairGenerator.getInstance("EC");
 				ECGenParameterSpec spec=new ECGenParameterSpec(EC_CURVE_NAME);
@@ -136,13 +136,17 @@ public class PushSubscriptionManager{
 				privateKey=keyPair.getPrivate();
 				encodedPublicKey=Base64.encodeToString(serializeRawPublicKey(publicKey), Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING);
 				authKey=new byte[16];
-				new SecureRandom().nextBytes(authKey);
+				SecureRandom secureRandom=new SecureRandom();
+				secureRandom.nextBytes(authKey);
+				byte[] randomAccountID=new byte[16];
+				secureRandom.nextBytes(randomAccountID);
 				AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);
 				if(session==null)
 					return;
 				session.pushPrivateKey=Base64.encodeToString(privateKey.getEncoded(), Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING);
 				session.pushPublicKey=Base64.encodeToString(publicKey.getEncoded(), Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING);
 				session.pushAuthKey=encodedAuthKey=Base64.encodeToString(authKey, Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING);
+				session.pushAccountID=pushAccountID=Base64.encodeToString(randomAccountID, Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING);
 				AccountSessionManager.getInstance().writeAccountsFile();
 			}catch(NoSuchAlgorithmException|InvalidAlgorithmParameterException e){
 				Log.e(TAG, "registerAccountForPush: error generating encryption key", e);
@@ -153,7 +157,7 @@ public class PushSubscriptionManager{
 					encodedAuthKey,
 					subscription==null ? PushSubscription.Alerts.ofAll() : subscription.alerts,
 					subscription==null ? PushSubscription.Policy.ALL : subscription.policy,
-					accountID)
+					pushAccountID)
 					.setCallback(new Callback<>(){
 						@Override
 						public void onSuccess(PushSubscription result){

mastodon/src/main/java/org/joinmastodon/android/api/ResizedImageRequestBody.java

@@ -14,6 +14,7 @@ import android.os.Build;
 import android.provider.OpenableColumns;
 
 import org.joinmastodon.android.MastodonApp;
+import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -30,62 +31,105 @@ public class ResizedImageRequestBody extends CountingRequestBody{
 	private File tempFile;
 	private Uri uri;
 	private String contentType;
+	private int maxSize;
 
 	public ResizedImageRequestBody(Uri uri, int maxSize, ProgressListener progressListener) throws IOException{
 		super(progressListener);
 		this.uri=uri;
-		contentType=MastodonApp.context.getContentResolver().getType(uri);
+		this.maxSize=maxSize;
 		BitmapFactory.Options opts=new BitmapFactory.Options();
 		opts.inJustDecodeBounds=true;
-		try(InputStream in=MastodonApp.context.getContentResolver().openInputStream(uri)){
-			BitmapFactory.decodeStream(in, null, opts);
+		if("file".equals(uri.getScheme())){
+			BitmapFactory.decodeFile(uri.getPath(), opts);
+			contentType=UiUtils.getFileMediaType(new File(uri.getPath())).type();
+		}else{
+			try(InputStream in=MastodonApp.context.getContentResolver().openInputStream(uri)){
+				BitmapFactory.decodeStream(in, null, opts);
+			}
+			contentType=MastodonApp.context.getContentResolver().getType(uri);
 		}
-		if(opts.outWidth*opts.outHeight>maxSize){
+		if(needResize(opts.outWidth, opts.outHeight) || needCrop(opts.outWidth, opts.outHeight)){
 			Bitmap bitmap;
-			if(Build.VERSION.SDK_INT>=29){
-				bitmap=ImageDecoder.decodeBitmap(ImageDecoder.createSource(MastodonApp.context.getContentResolver(), uri), (decoder, info, source)->{
-					int targetWidth=Math.round((float)Math.sqrt((float)maxSize*((float)info.getSize().getWidth()/info.getSize().getHeight())));
-					int targetHeight=Math.round((float)Math.sqrt((float)maxSize*((float)info.getSize().getHeight()/info.getSize().getWidth())));
+			if(Build.VERSION.SDK_INT>=28){
+				ImageDecoder.Source source;
+				if("file".equals(uri.getScheme())){
+					source=ImageDecoder.createSource(new File(uri.getPath()));
+				}else{
+					source=ImageDecoder.createSource(MastodonApp.context.getContentResolver(), uri);
+				}
+				bitmap=ImageDecoder.decodeBitmap(source, (decoder, info, _source)->{
+					int[] size=getTargetSize(info.getSize().getWidth(), info.getSize().getHeight());
 					decoder.setAllocator(ImageDecoder.ALLOCATOR_SOFTWARE);
-					decoder.setTargetSize(targetWidth, targetHeight);
+					decoder.setTargetSize(size[0], size[1]);
+					// Breaks images in mysterious ways
+//					if(needCrop(size[0], size[1]))
+//						decoder.setCrop(getCropBounds(size[0], size[1]));
 				});
+				if(needCrop(bitmap.getWidth(), bitmap.getHeight())){
+					Rect crop=getCropBounds(bitmap.getWidth(), bitmap.getHeight());
+					bitmap=Bitmap.createBitmap(bitmap, crop.left, crop.top, crop.width(), crop.height());
+				}
 			}else{
-				int targetWidth=Math.round((float)Math.sqrt((float)maxSize*((float)opts.outWidth/opts.outHeight)));
-				int targetHeight=Math.round((float)Math.sqrt((float)maxSize*((float)opts.outHeight/opts.outWidth)));
+				int[] size=getTargetSize(opts.outWidth, opts.outHeight);
+				int targetWidth=size[0];
+				int targetHeight=size[1];
 				float factor=opts.outWidth/(float)targetWidth;
 				opts=new BitmapFactory.Options();
 				opts.inSampleSize=(int)factor;
-				try(InputStream in=MastodonApp.context.getContentResolver().openInputStream(uri)){
-					bitmap=BitmapFactory.decodeStream(in, null, opts);
+				if("file".equals(uri.getScheme())){
+					bitmap=BitmapFactory.decodeFile(uri.getPath(), opts);
+				}else{
+					try(InputStream in=MastodonApp.context.getContentResolver().openInputStream(uri)){
+						bitmap=BitmapFactory.decodeStream(in, null, opts);
+					}
 				}
-				if(factor%1f!=0f){
-					Bitmap scaled=Bitmap.createBitmap(targetWidth, targetHeight, Bitmap.Config.ARGB_8888);
-					new Canvas(scaled).drawBitmap(bitmap, null, new Rect(0, 0, targetWidth, targetHeight), new Paint(Paint.FILTER_BITMAP_FLAG));
+				boolean needCrop=needCrop(targetWidth, targetHeight);
+				if(factor%1f!=0f || needCrop){
+					Rect srcBounds=null;
+					Rect dstBounds;
+					if(needCrop){
+						Rect crop=getCropBounds(targetWidth, targetHeight);
+						dstBounds=new Rect(0, 0, crop.width(), crop.height());
+						srcBounds=new Rect(
+								Math.round(crop.left/(float)targetWidth*bitmap.getWidth()),
+								Math.round(crop.top/(float)targetHeight*bitmap.getHeight()),
+								Math.round(crop.right/(float)targetWidth*bitmap.getWidth()),
+								Math.round(crop.bottom/(float)targetHeight*bitmap.getHeight())
+						);
+					}else{
+						dstBounds=new Rect(0, 0, targetWidth, targetHeight);
+					}
+					Bitmap scaled=Bitmap.createBitmap(dstBounds.width(), dstBounds.height(), Bitmap.Config.ARGB_8888);
+					new Canvas(scaled).drawBitmap(bitmap, srcBounds, dstBounds, new Paint(Paint.FILTER_BITMAP_FLAG));
 					bitmap=scaled;
 				}
-				if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
-					int rotation;
+				int orientation=0;
+				if("file".equals(uri.getScheme())){
+					ExifInterface exif=new ExifInterface(uri.getPath());
+					orientation=exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
+				}else if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
 					try(InputStream in=MastodonApp.context.getContentResolver().openInputStream(uri)){
 						ExifInterface exif=new ExifInterface(in);
-						int orientation=exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
-						rotation=switch(orientation){
-							case ExifInterface.ORIENTATION_ROTATE_90 -> 90;
-							case ExifInterface.ORIENTATION_ROTATE_180 -> 180;
-							case ExifInterface.ORIENTATION_ROTATE_270 -> 270;
-							default -> 0;
-						};
-					}
-					if(rotation!=0){
-						Matrix matrix=new Matrix();
-						matrix.setRotate(rotation);
-						bitmap=Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, false);
+						orientation=exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
 					}
 				}
+				int rotation=switch(orientation){
+					case ExifInterface.ORIENTATION_ROTATE_90 -> 90;
+					case ExifInterface.ORIENTATION_ROTATE_180 -> 180;
+					case ExifInterface.ORIENTATION_ROTATE_270 -> 270;
+					default -> 0;
+				};
+				if(rotation!=0){
+					Matrix matrix=new Matrix();
+					matrix.setRotate(rotation);
+					bitmap=Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, false);
+				}
 			}
 
-			tempFile=new File(MastodonApp.context.getCacheDir(), "tmp_upload_image");
+			boolean isPNG="image/png".equals(contentType);
+			tempFile=File.createTempFile("mastodon_tmp_resized", null);
 			try(FileOutputStream out=new FileOutputStream(tempFile)){
-				if("image/png".equals(contentType)){
+				if(isPNG){
 					bitmap.compress(Bitmap.CompressFormat.PNG, 0, out);
 				}else{
 					bitmap.compress(Bitmap.CompressFormat.JPEG, 97, out);
@@ -94,9 +138,13 @@ public class ResizedImageRequestBody extends CountingRequestBody{
 			}
 			length=tempFile.length();
 		}else{
-			try(Cursor cursor=MastodonApp.context.getContentResolver().query(uri, new String[]{OpenableColumns.SIZE}, null, null, null)){
-				cursor.moveToFirst();
-				length=cursor.getInt(0);
+			if("file".equals(uri.getScheme())){
+				length=new File(uri.getPath()).length();
+			}else{
+				try(Cursor cursor=MastodonApp.context.getContentResolver().query(uri, new String[]{OpenableColumns.SIZE}, null, null, null)){
+					cursor.moveToFirst();
+					length=cursor.getInt(0);
+				}
 			}
 		}
 	}
@@ -125,4 +173,22 @@ public class ResizedImageRequestBody extends CountingRequestBody{
 			}
 		}
 	}
+
+	protected int[] getTargetSize(int srcWidth, int srcHeight){
+		int targetWidth=Math.round((float)Math.sqrt((float)maxSize*((float)srcWidth/srcHeight)));
+		int targetHeight=Math.round((float)Math.sqrt((float)maxSize*((float)srcHeight/srcWidth)));
+		return new int[]{targetWidth, targetHeight};
+	}
+
+	protected boolean needResize(int srcWidth, int srcHeight){
+		return srcWidth*srcHeight>maxSize;
+	}
+
+	protected boolean needCrop(int srcWidth, int srcHeight){
+		return false;
+	}
+
+	protected Rect getCropBounds(int srcWidth, int srcHeight){
+		return null;
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/StatusInteractionController.java

@@ -4,6 +4,7 @@ import android.os.Looper;
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.MastodonApp;
+import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
 import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
 import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
@@ -18,6 +19,7 @@ public class StatusInteractionController{
 	private final String accountID;
 	private final HashMap<String, SetStatusFavorited> runningFavoriteRequests=new HashMap<>();
 	private final HashMap<String, SetStatusReblogged> runningReblogRequests=new HashMap<>();
+	private final HashMap<String, SetStatusBookmarked> runningBookmarkRequests=new HashMap<>();
 
 	public StatusInteractionController(String accountID){
 		this.accountID=accountID;
@@ -58,6 +60,37 @@ public class StatusInteractionController{
 			status.favouritesCount++;
 		else
 			status.favouritesCount--;
+		E.post(new StatusCountersUpdatedEvent(status));
+	}
+
+	public void setBookmarked(Status status, boolean bookmarked){
+		if(!Looper.getMainLooper().isCurrentThread())
+			throw new IllegalStateException("Can only be called from main thread");
+
+		SetStatusBookmarked current=runningBookmarkRequests.remove(status.id);
+		if(current!=null){
+			current.cancel();
+		}
+		SetStatusBookmarked req=(SetStatusBookmarked) new SetStatusBookmarked(status.id, bookmarked)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Status result){
+						runningBookmarkRequests.remove(status.id);
+						E.post(new StatusCountersUpdatedEvent(result));
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						runningBookmarkRequests.remove(status.id);
+						error.showToast(MastodonApp.context);
+						status.bookmarked=!bookmarked;
+						E.post(new StatusCountersUpdatedEvent(status));
+					}
+				})
+				.exec(accountID);
+		runningBookmarkRequests.put(status.id, req);
+		status.bookmarked=bookmarked;
+		E.post(new StatusCountersUpdatedEvent(status));
 	}
 
 	public void setReblogged(Status status, boolean reblogged){
@@ -95,5 +128,6 @@ public class StatusInteractionController{
 			status.reblogsCount++;
 		else
 			status.reblogsCount--;
+		E.post(new StatusCountersUpdatedEvent(status));
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountStatuses.java

@@ -21,6 +21,7 @@ public class GetAccountStatuses extends MastodonAPIRequest<List<Status>>{
 		switch(filter){
 			case DEFAULT -> addQueryParameter("exclude_replies", "true");
 			case INCLUDE_REPLIES -> {}
+			case PINNED -> addQueryParameter("pinned", "true");
 			case MEDIA -> addQueryParameter("only_media", "true");
 			case NO_REBLOGS -> {
 				addQueryParameter("exclude_replies", "true");
@@ -32,6 +33,7 @@ public class GetAccountStatuses extends MastodonAPIRequest<List<Status>>{
 	public enum Filter{
 		DEFAULT,
 		INCLUDE_REPLIES,
+		PINNED,
 		MEDIA,
 		NO_REBLOGS
 	}

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetBookmarks.java

@@ -0,0 +1,52 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import okhttp3.Response;
+
+public class GetBookmarks extends MastodonAPIRequest<List<Status>>{
+	private String maxId;
+
+	public GetBookmarks(String maxID, String minID, int limit){
+		super(HttpMethod.GET, "/bookmarks", new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(minID!=null)
+			addQueryParameter("min_id", minID);
+		if(limit>0)
+			addQueryParameter("limit", ""+limit);
+	}
+
+	@Override
+	public void validateAndPostprocessResponse(List<Status> respObj, Response httpResponse) throws IOException {
+		super.validateAndPostprocessResponse(respObj, httpResponse);
+		// <https://mastodon.social/api/v1/bookmarks?max_id=268962>; rel="next",
+		// <https://mastodon.social/api/v1/bookmarks?min_id=268981>; rel="prev"
+		String link=httpResponse.header("link");
+		// parsing link header by hand; using a library would be cleaner
+		// (also, the functionality should be part of the max id logics and implemented in MastodonAPIRequest)
+		if(link==null) return;
+		String maxIdEq="max_id=";
+		for(String s : link.split(",")) {
+			if(s.contains("rel=\"next\"")) {
+				int start=s.indexOf(maxIdEq)+maxIdEq.length();
+				int end=s.indexOf('>');
+				if(start<0 || start>end) return;
+				this.maxId=s.substring(start, end);
+			}
+		}
+	}
+
+	public String getMaxId() {
+		return maxId;
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/UpdateAccountCredentials.java

@@ -2,13 +2,16 @@ package org.joinmastodon.android.api.requests.accounts;
 
 import android.net.Uri;
 
+import org.joinmastodon.android.api.AvatarResizedImageRequestBody;
 import org.joinmastodon.android.api.ContentUriRequestBody;
 import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.ResizedImageRequestBody;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.List;
 
 import okhttp3.MultipartBody;
@@ -39,21 +42,21 @@ public class UpdateAccountCredentials extends MastodonAPIRequest<Account>{
 	}
 
 	@Override
-	public RequestBody getRequestBody(){
+	public RequestBody getRequestBody() throws IOException{
 		MultipartBody.Builder bldr=new MultipartBody.Builder()
 				.setType(MultipartBody.FORM)
 				.addFormDataPart("display_name", displayName)
 				.addFormDataPart("note", bio);
 
 		if(avatar!=null){
-			bldr.addFormDataPart("avatar", UiUtils.getFileName(avatar), new ContentUriRequestBody(avatar, null));
+			bldr.addFormDataPart("avatar", UiUtils.getFileName(avatar), new AvatarResizedImageRequestBody(avatar, null));
 		}else if(avatarFile!=null){
-			bldr.addFormDataPart("avatar", avatarFile.getName(), RequestBody.create(UiUtils.getFileMediaType(avatarFile), avatarFile));
+			bldr.addFormDataPart("avatar", avatarFile.getName(), new AvatarResizedImageRequestBody(Uri.fromFile(avatarFile), null));
 		}
 		if(cover!=null){
-			bldr.addFormDataPart("header", UiUtils.getFileName(cover), new ContentUriRequestBody(cover, null));
+			bldr.addFormDataPart("header", UiUtils.getFileName(cover), new ResizedImageRequestBody(cover, 1500*500, null));
 		}else if(coverFile!=null){
-			bldr.addFormDataPart("header", coverFile.getName(), RequestBody.create(UiUtils.getFileMediaType(coverFile), coverFile));
+			bldr.addFormDataPart("header", coverFile.getName(), new ResizedImageRequestBody(Uri.fromFile(coverFile), 1500*500, null));
 		}
 		if(fields.isEmpty()){
 			bldr.addFormDataPart("fields_attributes[0][name]", "").addFormDataPart("fields_attributes[0][value]", "");

mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java

@@ -11,9 +11,9 @@ public class CreateOAuthApp extends MastodonAPIRequest<Application>{
 	}
 
 	private static class Request{
-		public String clientName="Mastodon for Android";
+		public String clientName="Mastodon for Android Fork";
 		public String redirectUris=AccountSessionManager.REDIRECT_URI;
 		public String scopes=AccountSessionManager.SCOPE;
-		public String website="https://app.joinmastodon.org/android";
+		public String website="https://github.com/sk22/mastodon-android-fork";
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusFavorites.java

@@ -0,0 +1,16 @@
+package org.joinmastodon.android.api.requests.statuses;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.model.Account;
+
+public class GetStatusFavorites extends HeaderPaginationRequest<Account>{
+	public GetStatusFavorites(String id, String maxID, int limit){
+		super(HttpMethod.GET, "/statuses/"+id+"/favourited_by", new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(limit>0)
+			addQueryParameter("limit", limit+"");
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusReblogs.java

@@ -0,0 +1,16 @@
+package org.joinmastodon.android.api.requests.statuses;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.model.Account;
+
+public class GetStatusReblogs extends HeaderPaginationRequest<Account>{
+	public GetStatusReblogs(String id, String maxID, int limit){
+		super(HttpMethod.GET, "/statuses/"+id+"/reblogged_by", new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(limit>0)
+			addQueryParameter("limit", limit+"");
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusBookmarked.java

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.statuses;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+
+public class SetStatusBookmarked extends MastodonAPIRequest<Status>{
+	public SetStatusBookmarked(String id, boolean bookmarked){
+		super(HttpMethod.POST, "/statuses/"+id+"/"+(bookmarked ? "bookmark" : "unbookmark"), Status.class);
+		setRequestBody(new Object());
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusPinned.java

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.statuses;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+
+public class SetStatusPinned extends MastodonAPIRequest<Status>{
+	public SetStatusPinned(String id, boolean pinned){
+		super(HttpMethod.POST, "/statuses/"+id+"/"+(pinned ? "pin" : "unpin"), Status.class);
+		setRequestBody(new Object());
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java

@@ -27,6 +27,7 @@ public class AccountSession{
 	public boolean needUpdatePushSettings;
 	public long filtersLastUpdated;
 	public List<Filter> wordFilters=new ArrayList<>();
+	public String pushAccountID;
 	private transient MastodonAPIController apiController;
 	private transient StatusInteractionController statusInteractionController;
 	private transient CacheController cacheController;

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java

@@ -2,15 +2,22 @@ package org.joinmastodon.android.api.session;
 
 import android.app.Activity;
 import android.app.NotificationManager;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.graphics.drawable.Icon;
 import android.net.Uri;
 import android.os.Build;
 import android.util.Log;
 
 import com.google.gson.JsonParseException;
 
+import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.E;
+import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
@@ -85,11 +92,12 @@ public class AccountSessionManager{
 				domains.add(session.domain.toLowerCase());
 				sessions.put(session.getID(), session);
 			}
-		}catch(IOException|JsonParseException x){
+		}catch(Exception x){
 			Log.e(TAG, "Error loading accounts", x);
 		}
 		lastActiveAccountID=prefs.getString("lastActiveAccount", null);
 		MastodonAPIController.runInBackground(()->readInstanceInfo(domains));
+		maybeUpdateShortcuts();
 	}
 
 	public void addAccount(Instance instance, Token token, Account self, Application app, boolean active){
@@ -102,6 +110,7 @@ public class AccountSessionManager{
 		if(PushSubscriptionManager.arePushNotificationsAvailable()){
 			session.getPushSubscriptionManager().registerAccountForPush(null);
 		}
+		maybeUpdateShortcuts();
 	}
 
 	public synchronized void writeAccountsFile(){
@@ -181,6 +190,7 @@ public class AccountSessionManager{
 			NotificationManager nm=MastodonApp.context.getSystemService(NotificationManager.class);
 			nm.deleteNotificationChannelGroup(id);
 		}
+		maybeUpdateShortcuts();
 	}
 
 	@NonNull
@@ -358,7 +368,7 @@ public class AccountSessionManager{
 				customEmojis.put(domain, groupCustomEmojis(emojis));
 				instances.put(domain, emojis.instance);
 				instancesLastUpdated.put(domain, emojis.lastUpdated);
-			}catch(IOException|JsonParseException x){
+			}catch(Exception x){
 				Log.w(TAG, "Error reading instance info file for "+domain, x);
 			}
 		}
@@ -395,6 +405,29 @@ public class AccountSessionManager{
 		writeAccountsFile();
 	}
 
+	private void maybeUpdateShortcuts(){
+		if(Build.VERSION.SDK_INT<26)
+			return;
+		ShortcutManager sm=MastodonApp.context.getSystemService(ShortcutManager.class);
+		if((sm.getDynamicShortcuts().isEmpty() || BuildConfig.DEBUG) && !sessions.isEmpty()){
+			// There are no shortcuts, but there are accounts. Add a compose shortcut.
+			ShortcutInfo info=new ShortcutInfo.Builder(MastodonApp.context, "compose")
+					.setActivity(ComponentName.createRelative(MastodonApp.context, MainActivity.class.getName()))
+					.setShortLabel(MastodonApp.context.getString(R.string.new_post))
+					.setIcon(Icon.createWithResource(MastodonApp.context, R.mipmap.ic_shortcut_compose))
+					.setIntent(new Intent(MastodonApp.context, MainActivity.class)
+							.setAction(Intent.ACTION_MAIN)
+							.putExtra("compose", true))
+					.build();
+			sm.setDynamicShortcuts(Collections.singletonList(info));
+		}else if(sessions.isEmpty()){
+			// There are shortcuts, but no accounts. Disable existing shortcuts.
+			sm.disableShortcuts(Collections.singletonList("compose"), MastodonApp.context.getString(R.string.err_not_logged_in));
+		}else{
+			sm.enableShortcuts(Collections.singletonList("compose"));
+		}
+	}
+
 	private static class SessionsStorageWrapper{
 		public List<AccountSession> accounts;
 	}

mastodon/src/main/java/org/joinmastodon/android/events/StatusCountersUpdatedEvent.java

@@ -5,7 +5,7 @@ import org.joinmastodon.android.model.Status;
 public class StatusCountersUpdatedEvent{
 	public String id;
 	public int favorites, reblogs, replies;
-	public boolean favorited, reblogged;
+	public boolean favorited, reblogged, pinned;
 
 	public StatusCountersUpdatedEvent(Status s){
 		id=s.id;
@@ -14,5 +14,6 @@ public class StatusCountersUpdatedEvent{
 		replies=s.repliesCount;
 		favorited=s.favourited;
 		reblogged=s.reblogged;
+		pinned=s.pinned;
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/events/StatusUnpinnedEvent.java

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.events;
+
+public class StatusUnpinnedEvent {
+	public final String id;
+	public final String accountID;
+
+	public StatusUnpinnedEvent(String id, String accountID){
+		this.id=id;
+		this.accountID=accountID;
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java

@@ -8,8 +8,10 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusCreatedEvent;
+import org.joinmastodon.android.events.StatusUnpinnedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
 import org.parceler.Parcels;
 
 import java.util.Collections;
@@ -76,6 +78,7 @@ public class AccountTimelineFragment extends StatusListFragment{
 	protected void onStatusCreated(StatusCreatedEvent ev){
 		if(!AccountSessionManager.getInstance().isSelf(accountID, ev.status.account))
 			return;
+		if(filter==GetAccountStatuses.Filter.PINNED) return;
 		if(filter==GetAccountStatuses.Filter.DEFAULT){
 			// Keep replies to self, discard all other replies
 			if(ev.status.inReplyToAccountId!=null && !ev.status.inReplyToAccountId.equals(AccountSessionManager.getInstance().getAccount(accountID).self.id))
@@ -86,4 +89,24 @@ public class AccountTimelineFragment extends StatusListFragment{
 		}
 		prependItems(Collections.singletonList(ev.status), true);
 	}
+
+	protected void onStatusUnpinned(StatusUnpinnedEvent ev){
+		if(!ev.accountID.equals(accountID) || filter!=GetAccountStatuses.Filter.PINNED)
+			return;
+
+		Status status=getStatusByID(ev.id);
+		data.remove(status);
+		preloadedData.remove(status);
+		HeaderStatusDisplayItem item=findItemOfType(ev.id, HeaderStatusDisplayItem.class);
+		if(item==null)
+			return;
+		int index=displayItems.indexOf(item);
+		int lastIndex;
+		for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
+			if(!displayItems.get(lastIndex).parentID.equals(ev.id))
+				break;
+		}
+		displayItems.subList(index, lastIndex).clear();
+		adapter.notifyItemRangeRemoved(index, lastIndex-index);
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java

@@ -31,6 +31,7 @@ import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.TileGridLayoutManager;
+import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ImageStatusDisplayItem;
@@ -363,6 +364,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	public abstract void onItemClick(String id);
 
 	protected void updatePoll(String itemID, Status status, Poll poll){
+		status.poll=poll;
 		int firstOptionIndex=-1, footerIndex=-1;
 		int i=0;
 		for(StatusDisplayItem item:displayItems){
@@ -459,9 +461,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		HeaderStatusDisplayItem.Holder header=findHolderOfType(itemID, HeaderStatusDisplayItem.Holder.class);
 		if(header!=null)
 			header.rebind();
-		for(ImageStatusDisplayItem.Holder photo:(List<ImageStatusDisplayItem.Holder>)findAllHoldersOfType(itemID, ImageStatusDisplayItem.Holder.class)){
-			photo.setRevealed(true);
-		}
+		updateImagesSpoilerState(status, itemID);
 	}
 
 	public void onVisibilityIconClick(HeaderStatusDisplayItem.Holder holder){
@@ -470,12 +470,25 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		if(!TextUtils.isEmpty(status.spoilerText)){
 			TextStatusDisplayItem.Holder text=findHolderOfType(holder.getItemID(), TextStatusDisplayItem.Holder.class);
 			if(text!=null){
-				adapter.notifyItemChanged(text.getAbsoluteAdapterPosition()+getMainAdapterOffset());
+				adapter.notifyItemChanged(text.getAbsoluteAdapterPosition());
 			}
 		}
 		holder.rebind();
-		for(ImageStatusDisplayItem.Holder<?> photo:(List<ImageStatusDisplayItem.Holder>)findAllHoldersOfType(holder.getItemID(), ImageStatusDisplayItem.Holder.class)){
+		updateImagesSpoilerState(status, holder.getItemID());
+	}
+
+	protected void updateImagesSpoilerState(Status status, String itemID){
+		ArrayList<Integer> updatedPositions=new ArrayList<>();
+		for(ImageStatusDisplayItem.Holder photo:(List<ImageStatusDisplayItem.Holder>)findAllHoldersOfType(itemID, ImageStatusDisplayItem.Holder.class)){
 			photo.setRevealed(status.spoilerRevealed);
+			updatedPositions.add(photo.getAbsoluteAdapterPosition()-getMainAdapterOffset());
+		}
+		int i=0;
+		for(StatusDisplayItem item:displayItems){
+			if(itemID.equals(item.parentID) && item instanceof ImageStatusDisplayItem && !updatedPositions.contains(i)){
+				adapter.notifyItemChanged(i);
+			}
+			i++;
 		}
 	}
 
@@ -661,7 +674,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				RecyclerView.ViewHolder holder=parent.getChildViewHolder(child);
 				RecyclerView.ViewHolder siblingHolder=parent.getChildViewHolder(bottomSibling);
 				if(holder instanceof StatusDisplayItem.Holder<?> ih && siblingHolder instanceof StatusDisplayItem.Holder<?> sh
-						&& !ih.getItemID().equals(sh.getItemID()) && ih.getItem().getType()!=StatusDisplayItem.Type.GAP){
+						&& (!ih.getItemID().equals(sh.getItemID()) || sh instanceof ExtendedFooterStatusDisplayItem.Holder) && ih.getItem().getType()!=StatusDisplayItem.Type.GAP){
 					drawDivider(child, bottomSibling, holder, siblingHolder, parent, c, dividerPaint);
 				}
 			}

mastodon/src/main/java/org/joinmastodon/android/fragments/BookmarksListFragment.java

@@ -0,0 +1,53 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetBookmarks;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Status;
+
+import java.util.List;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class BookmarksListFragment extends StatusListFragment{
+
+    private String accountID;
+    private Account self;
+    private String lastMaxId=null;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState){
+        super.onCreate(savedInstanceState);
+        accountID=getArguments().getString("account");
+        AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+        self=session.self;
+        setTitle(R.string.bookmarks);
+    }
+
+    @Override
+    protected void onShown(){
+        super.onShown();
+        if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
+            loadData();
+    }
+
+    @Override
+    protected void doLoadData(int offset, int count) {
+        GetBookmarks b=new GetBookmarks(offset>0 ? lastMaxId : null, null, count);
+        currentRequest=b.setCallback(new SimpleCallback<>(this){
+                    @Override
+                    public void onSuccess(List<Status> result){
+                        onDataLoaded(result, b.getMaxId()!=null);
+                        lastMaxId=b.getMaxId();
+                    }
+                })
+                .exec(accountID);
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java

@@ -22,6 +22,7 @@ import android.text.Layout;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.text.format.DateUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -174,6 +175,14 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private Instance instance;
 	private boolean attachmentsErrorShowing;
 
+	public static DraftMediaAttachment redraftAttachment(Attachment att) {
+		DraftMediaAttachment draft=new DraftMediaAttachment();
+		draft.serverAttachment=att;
+		draft.description=att.description;
+		draft.uri=Uri.parse(att.url);
+		return draft;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -204,6 +213,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			replyTo=Parcels.unwrap(getArguments().getParcelable("replyTo"));
 			statusVisibility=replyTo.visibility;
 		}
+
+		if(getArguments().containsKey("visibility")){
+			statusVisibility=(StatusPrivacy) getArguments().getSerializable("visibility");
+		}
+
 		if(savedInstanceState!=null){
 			statusVisibility=(StatusPrivacy) savedInstanceState.getSerializable("visibility");
 		}
@@ -286,11 +300,18 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		pollDurationView.setOnClickListener(v->showPollDurationMenu());
 
 		pollOptions.clear();
-		if(savedInstanceState!=null && savedInstanceState.containsKey("pollOptions")){
+		ArrayList<String> restoredPollOptions=(savedInstanceState!=null ? savedInstanceState : getArguments())
+				.getStringArrayList("pollOptions");
+		if(restoredPollOptions!=null){
+			if(savedInstanceState==null){
+				// restoring from arguments
+				pollDuration=getArguments().getInt("pollDuration");
+				pollDurationStr=DateUtils.formatElapsedTime(pollDuration); // getResources().getQuantityString(R.plurals.x_hours, pollDuration/3600);
+			}
 			pollBtn.setSelected(true);
 			mediaBtn.setEnabled(false);
 			pollWrap.setVisibility(View.VISIBLE);
-			for(String oldText:savedInstanceState.getStringArrayList("pollOptions")){
+			for(String oldText:restoredPollOptions){
 				DraftPollOption opt=createDraftPollOption();
 				opt.edit.setText(oldText);
 			}
@@ -310,8 +331,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			spoilerBtn.setSelected(true);
 		}
 
-		if(savedInstanceState!=null && savedInstanceState.containsKey("attachments")){
-			ArrayList<Parcelable> serializedAttachments=savedInstanceState.getParcelableArrayList("attachments");
+		ArrayList<Parcelable> serializedAttachments=(savedInstanceState!=null ? savedInstanceState : getArguments())
+				.getParcelableArrayList("attachments");
+		if(serializedAttachments!=null){
 			for(Parcelable a:serializedAttachments){
 				DraftMediaAttachment att=Parcels.unwrap(a);
 				attachmentsView.addView(createMediaAttachmentView(att));
@@ -453,11 +475,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			if(savedInstanceState==null){
 				mainEditText.setText(initialText);
 				mainEditText.setSelection(mainEditText.length());
-				if(!TextUtils.isEmpty(replyTo.spoilerText) && AccountSessionManager.getInstance().isSelf(accountID, replyTo.account)){
+				// TODO: setting for preserving cw always / only when replying to own posts
+				// && AccountSessionManager.getInstance().isSelf(accountID, replyTo.account)
+				if(!TextUtils.isEmpty(replyTo.spoilerText)){
+					insertSpoiler(replyTo.spoilerText);
 					hasSpoiler=true;
-					spoilerEdit.setVisibility(View.VISIBLE);
-					spoilerEdit.setText(replyTo.spoilerText);
-					spoilerBtn.setSelected(true);
 				}
 			}
 		}else{
@@ -470,6 +492,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				mainEditText.setSelection(mainEditText.length());
 				initialText=prefilledText;
 			}
+			String spoilerText=getArguments().getString("spoilerText");
+			if(!TextUtils.isEmpty(spoilerText)) insertSpoiler(spoilerText);
 			ArrayList<Uri> mediaUris=getArguments().getParcelableArrayList("mediaAttachments");
 			if(mediaUris!=null && !mediaUris.isEmpty()){
 				for(Uri uri:mediaUris){
@@ -479,6 +503,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		}
 	}
 
+	private void insertSpoiler(String text) {
+		hasSpoiler=true;
+		if (text!=null) spoilerEdit.setText(text);
+		spoilerEdit.setVisibility(View.VISIBLE);
+		spoilerBtn.setSelected(true);
+	}
+
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		publishButton=new Button(getActivity());
@@ -547,8 +578,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			if(opt.edit.length()>0)
 				nonEmptyPollOptionsCount++;
 		}
-		publishButton.setEnabled((trimmedCharCount>0 || !attachments.isEmpty()) && charCount<=charLimit && uploadingAttachment==null && failedAttachments.isEmpty() && queuedAttachments.isEmpty()
-				&& (pollOptions.isEmpty() || nonEmptyPollOptionsCount>1));
+		if(publishButton!=null){
+			publishButton.setEnabled((trimmedCharCount>0 || !attachments.isEmpty()) && charCount<=charLimit
+					&& uploadingAttachment==null && failedAttachments.isEmpty() && queuedAttachments.isEmpty()
+					&& (pollOptions.isEmpty() || nonEmptyPollOptionsCount>1));
+		}
 	}
 
 	private void onCustomEmojiClick(Emoji emoji){
@@ -609,17 +643,19 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					@Override
 					public void onSuccess(Status result){
 						wm.removeView(sendingOverlay);
-						Nav.finish(ComposeFragment.this);
+						sendingOverlay=null;
 						E.post(new StatusCreatedEvent(result));
 						if(replyTo!=null){
 							replyTo.repliesCount++;
 							E.post(new StatusCountersUpdatedEvent(replyTo));
 						}
+						Nav.finish(ComposeFragment.this);
 					}
 
 					@Override
 					public void onError(ErrorResponse error){
 						wm.removeView(sendingOverlay);
+						sendingOverlay=null;
 						sendProgress.setVisibility(View.GONE);
 						sendError.setVisibility(View.VISIBLE);
 						publishButton.setEnabled(true);
@@ -633,8 +669,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		boolean pollFieldsHaveContent=false;
 		for(DraftPollOption opt:pollOptions)
 			pollFieldsHaveContent|=opt.edit.length()>0;
-		return (mainEditText.length()>0 && !mainEditText.getText().toString().equals(initialText)) || !attachments.isEmpty()
-				|| uploadingAttachment!=null || !queuedAttachments.isEmpty() || !failedAttachments.isEmpty() || pollFieldsHaveContent;
+		return getArguments().getBoolean("hasDraft", false)
+				|| (mainEditText.length()>0 && !mainEditText.getText().toString().equals(initialText))
+				|| !attachments.isEmpty() || uploadingAttachment!=null || !queuedAttachments.isEmpty()
+				|| !failedAttachments.isEmpty() || pollFieldsHaveContent;
 	}
 
 	@Override
@@ -647,6 +685,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			confirmDiscardDraftAndFinish();
 			return true;
 		}
+		if(sendingOverlay!=null)
+			return true;
 		return false;
 	}
 

mastodon/src/main/java/org/joinmastodon/android/fragments/FollowingListFragment.java

@@ -1,49 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import android.os.Bundle;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.accounts.GetAccountFollowing;
-import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.HeaderPaginationList;
-import org.parceler.Parcels;
-
-import java.util.stream.Collectors;
-
-import me.grishka.appkit.api.SimpleCallback;
-
-public class FollowingListFragment extends BaseAccountListFragment{
-	private Account account;
-	private String nextMaxID;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState){
-		super.onCreate(savedInstanceState);
-		account=Parcels.unwrap(getArguments().getParcelable("targetAccount"));
-		setTitle("@"+account.acct);
-		setSubtitle(getResources().getQuantityString(R.plurals.x_following, account.followingCount, account.followingCount));
-	}
-
-	@Override
-	public void onResume(){
-		super.onResume();
-		if(!loaded && !dataLoading)
-			loadData();
-	}
-
-	@Override
-	protected void doLoadData(int offset, int count){
-		currentRequest=new GetAccountFollowing(account.id, offset==0 ? null : nextMaxID, count)
-				.setCallback(new SimpleCallback<>(this){
-					@Override
-					public void onSuccess(HeaderPaginationList<Account> result){
-						if(result.nextPageUri!=null)
-							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
-						else
-							nextMaxID=null;
-						onDataLoaded(result.stream().map(AccountItem::new).collect(Collectors.toList()), nextMaxID!=null);
-					}
-				})
-				.exec(accountID);
-	}
-}

mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java

@@ -255,9 +255,14 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	@Override
 	public boolean onBackPressed(){
 		if(currentTab==R.id.tab_profile)
-			return profileFragment.onBackPressed();
+			if (profileFragment.onBackPressed()) return true;
 		if(currentTab==R.id.tab_search)
-			return searchFragment.onBackPressed();
+			if (searchFragment.onBackPressed()) return true;
+		if (currentTab!=R.id.tab_home) {
+			tabBar.selectTab(R.id.tab_home);
+			onTabSelected(R.id.tab_home);
+			return true;
+		}
 		return false;
 	}
 

mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java

@@ -161,7 +161,7 @@ public class HomeTimelineFragment extends StatusListFragment{
 							return;
 						Status last=result.get(result.size()-1);
 						List<Status> toAdd;
-						if(last.id.equals(data.get(0).id)){ // This part intersects with the existing one
+						if(!data.isEmpty() && last.id.equals(data.get(0).id)){ // This part intersects with the existing one
 							toAdd=result.subList(0, result.size()-1); // Remove the already known last post
 						}else{
 							result.get(result.size()-1).hasGapAfter=true;

mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java

@@ -9,6 +9,7 @@ import android.app.Fragment;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Outline;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
@@ -44,12 +45,17 @@ import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.account_list.FollowerListFragment;
+import org.joinmastodon.android.fragments.account_list.FollowingListFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
+import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.ui.SimpleViewHolder;
+import org.joinmastodon.android.ui.SingleImagePhotoViewerListener;
 import org.joinmastodon.android.ui.drawables.CoverOverlayGradientDrawable;
+import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
 import org.joinmastodon.android.ui.text.CustomEmojiSpan;
@@ -95,7 +101,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private ProgressBarButton actionButton;
 	private ViewPager2 pager;
 	private NestedRecyclerScrollView scrollView;
-	private AccountTimelineFragment postsFragment, postsWithRepliesFragment, mediaFragment;
+	private AccountTimelineFragment postsFragment, postsWithRepliesFragment, pinnedPostsFragment, mediaFragment;
 	private ProfileAboutFragment aboutFragment;
 	private TabLayout tabbar;
 	private SwipeRefreshLayout refreshLayout;
@@ -121,6 +127,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private boolean refreshing;
 	private View fab;
 	private WindowInsets childInsets;
+	private PhotoViewer currentPhotoViewer;
+	private boolean editModeLoading;
 
 	public ProfileFragment(){
 		super(R.layout.loader_fragment_overlay_toolbar);
@@ -201,14 +209,15 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			}
 		};
 
-		tabViews=new FrameLayout[4];
+		tabViews=new FrameLayout[5];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			tabView.setId(switch(i){
 				case 0 -> R.id.profile_posts;
 				case 1 -> R.id.profile_posts_with_replies;
-				case 2 -> R.id.profile_media;
-				case 3 -> R.id.profile_about;
+				case 2 -> R.id.profile_pinned_posts;
+				case 3 -> R.id.profile_media;
+				case 4 -> R.id.profile_about;
 				default -> throw new IllegalStateException("Unexpected value: "+i);
 			});
 			tabView.setVisibility(View.GONE);
@@ -216,7 +225,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			tabViews[i]=tabView;
 		}
 
-		pager.setOffscreenPageLimit(4);
+		pager.setOffscreenPageLimit(5);
 		pager.setAdapter(new ProfilePagerAdapter());
 		pager.getLayoutParams().height=getResources().getDisplayMetrics().heightPixels;
 
@@ -232,8 +241,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				tab.setText(switch(position){
 					case 0 -> R.string.posts;
 					case 1 -> R.string.posts_and_replies;
-					case 2 -> R.string.media;
-					case 3 -> R.string.profile_about;
+					case 2 -> R.string.pinned_posts;
+					case 3 -> R.string.media;
+					case 4 -> R.string.profile_about;
 					default -> throw new IllegalStateException();
 				});
 			}
@@ -290,6 +300,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 								postsFragment.onRefresh();
 							if(postsWithRepliesFragment.loaded)
 								postsWithRepliesFragment.onRefresh();
+							if(pinnedPostsFragment.loaded)
+								pinnedPostsFragment.onRefresh();
 							if(mediaFragment.loaded)
 								mediaFragment.onRefresh();
 						}
@@ -314,6 +326,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(postsFragment==null){
 			postsFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.DEFAULT, true);
 			postsWithRepliesFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.INCLUDE_REPLIES, false);
+			pinnedPostsFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.PINNED, false);
 			mediaFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.MEDIA, false);
 			aboutFragment=new ProfileAboutFragment();
 			aboutFragment.setFields(fields);
@@ -394,6 +407,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(postsFragment!=null && postsFragment.isAdded() && childInsets!=null){
 			postsFragment.onApplyWindowInsets(childInsets);
 			postsWithRepliesFragment.onApplyWindowInsets(childInsets);
+			pinnedPostsFragment.onApplyWindowInsets(childInsets);
 			mediaFragment.onApplyWindowInsets(childInsets);
 		}
 	}
@@ -501,10 +515,17 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 			return;
 		}
-		if(relationship==null)
+		if(relationship==null && !isOwnProfile)
 			return;
 		inflater.inflate(R.menu.profile, menu);
 		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getDisplayUsername()));
+		if(isOwnProfile){
+			for(int i=0;i<menu.size();i++){
+				MenuItem item=menu.getItem(i);
+				item.setVisible(item.getItemId()==R.id.share || item.getItemId()==R.id.bookmarks);
+			}
+			return;
+		}
 		menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
 		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
@@ -521,11 +542,16 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item){
 		int id=item.getItemId();
-		if(id==R.id.share){
-			Intent intent=new Intent(Intent.ACTION_SEND);
+		if(id==R.id.share) {
+			Intent intent = new Intent(Intent.ACTION_SEND);
 			intent.setType("text/plain");
 			intent.putExtra(Intent.EXTRA_TEXT, account.url);
 			startActivity(Intent.createChooser(intent, item.getTitle()));
+		}else if(id==R.id.bookmarks) {
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("profileAccount", Parcels.wrap(account));
+			Nav.go(getActivity(), BookmarksListFragment.class, args);
 		}else if(id==R.id.mute){
 			confirmToggleMuted();
 		}else if(id==R.id.block){
@@ -595,12 +621,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){
 		int topBarsH=getToolbar().getHeight()+statusBarHeight;
-		if(scrollY>avatar.getTop()-topBarsH){
-			float avaAlpha=Math.max(1f-((scrollY-(avatar.getTop()-topBarsH))/(float)V.dp(38)), 0f);
-			avatar.setAlpha(avaAlpha);
+		if(scrollY>avatarBorder.getTop()-topBarsH){
+			float avaAlpha=Math.max(1f-((scrollY-(avatarBorder.getTop()-topBarsH))/(float)V.dp(38)), 0f);
 			avatarBorder.setAlpha(avaAlpha);
 		}else{
-			avatar.setAlpha(1f);
 			avatarBorder.setAlpha(1f);
 		}
 		if(scrollY>cover.getHeight()-topBarsH){
@@ -622,14 +646,18 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			toolbarTitleView.setTranslationY(titleTransY);
 			toolbarSubtitleView.setTranslationY(titleTransY);
 		}
+		if(currentPhotoViewer!=null){
+			currentPhotoViewer.offsetView(0, oldScrollY-scrollY);
+		}
 	}
 
 	private Fragment getFragmentForPage(int page){
 		return switch(page){
 			case 0 -> postsFragment;
 			case 1 -> postsWithRepliesFragment;
-			case 2 -> mediaFragment;
-			case 3 -> aboutFragment;
+			case 2 -> pinnedPostsFragment;
+			case 3 -> mediaFragment;
+			case 4 -> aboutFragment;
 			default -> throw new IllegalStateException();
 		};
 	}
@@ -656,17 +684,26 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	}
 
 	private void loadAccountInfoAndEnterEditMode(){
+		if(editModeLoading)
+			return;
+		editModeLoading=true;
 		setActionProgressVisible(true);
 		new GetOwnAccount()
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Account result){
+						editModeLoading=false;
+						if(getActivity()==null)
+							return;
 						enterEditMode(result);
 						setActionProgressVisible(false);
 					}
 
 					@Override
 					public void onError(ErrorResponse error){
+						editModeLoading=false;
+						if(getActivity()==null)
+							return;
 						error.showToast(getActivity());
 						setActionProgressVisible(false);
 					}
@@ -681,9 +718,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		invalidateOptionsMenu();
 		pager.setUserInputEnabled(false);
 		actionButton.setText(R.string.done);
-		pager.setCurrentItem(3);
+		pager.setCurrentItem(4);
 		ArrayList<Animator> animators=new ArrayList<>();
-		for(int i=0;i<3;i++){
+		for(int i=0;i<tabViews.length-1;i++){
 			animators.add(ObjectAnimator.ofFloat(tabbar.getTabAt(i).view, View.ALPHA, .3f));
 			tabbar.getTabAt(i).view.setEnabled(false);
 		}
@@ -724,7 +761,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		invalidateOptionsMenu();
 		ArrayList<Animator> animators=new ArrayList<>();
 		actionButton.setText(R.string.edit_profile);
-		for(int i=0;i<3;i++){
+		for(int i=0;i<tabViews.length-1;i++){
 			animators.add(ObjectAnimator.ofFloat(tabbar.getTabAt(i).view, View.ALPHA, 1f));
 		}
 		animators.add(ObjectAnimator.ofInt(avatar.getForeground(), "alpha", 0));
@@ -742,7 +779,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		set.addListener(new AnimatorListenerAdapter(){
 			@Override
 			public void onAnimationEnd(Animator animation){
-				for(int i=0;i<3;i++){
+				for(int i=0;i<tabViews.length-1;i++){
 					tabbar.getTabAt(i).view.setEnabled(true);
 				}
 				pager.setUserInputEnabled(true);
@@ -804,15 +841,38 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		return false;
 	}
 
+	private List<Attachment> createFakeAttachments(String url, Drawable drawable){
+		Attachment att=new Attachment();
+		att.type=Attachment.Type.IMAGE;
+		att.url=url;
+		att.meta=new Attachment.Metadata();
+		att.meta.width=drawable.getIntrinsicWidth();
+		att.meta.height=drawable.getIntrinsicHeight();
+		return Collections.singletonList(att);
+	}
+
 	private void onAvatarClick(View v){
 		if(isInEditMode){
 			startImagePicker(AVATAR_RESULT);
+		}else{
+			Drawable ava=avatar.getDrawable();
+			if(ava==null)
+				return;
+			int radius=V.dp(25);
+			currentPhotoViewer=new PhotoViewer(getActivity(), createFakeAttachments(account.avatar, ava), 0,
+					new SingleImagePhotoViewerListener(avatar, avatarBorder, new int[]{radius, radius, radius, radius}, this, ()->currentPhotoViewer=null, ()->ava, null, null));
 		}
 	}
 
 	private void onCoverClick(View v){
 		if(isInEditMode){
 			startImagePicker(COVER_RESULT);
+		}else{
+			Drawable drawable=cover.getDrawable();
+			if(drawable==null || drawable instanceof ColorDrawable)
+				return;
+			currentPhotoViewer=new PhotoViewer(getActivity(), createFakeAttachments(account.header, drawable), 0,
+					new SingleImagePhotoViewerListener(cover, cover, null, this, ()->currentPhotoViewer=null, ()->drawable, ()->avatarBorder.setTranslationZ(2), ()->avatarBorder.setTranslationZ(0)));
 		}
 	}
 
@@ -896,7 +956,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		@Override
 		public int getItemCount(){
-			return loaded ? 4 : 0;
+			return loaded ? tabViews.length : 0;
 		}
 
 		@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/ScrollableToTop.java

@@ -13,6 +13,8 @@ public interface ScrollableToTop{
 	 * @param list
 	 */
 	default void smoothScrollRecyclerViewToTop(RecyclerView list){
+		if(list==null) // TODO find out why this happens because it should not be possible
+			return;
 		if(list.getChildCount()>0 && list.getChildAdapterPosition(list.getChildAt(0))>10){
 			list.scrollToPosition(0);
 			list.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){

mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java

@@ -9,9 +9,10 @@ import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusDeletedEvent;
+import org.joinmastodon.android.events.StatusUnpinnedEvent;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.parceler.Parcels;
 
@@ -60,6 +61,8 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 
 	protected void onStatusCreated(StatusCreatedEvent ev){}
 
+	protected void onStatusUnpinned(StatusUnpinnedEvent ev){}
+
 	protected Status getContentStatusByID(String id){
 		Status s=getStatusByID(id);
 		return s==null ? null : s.getContentStatus();
@@ -90,16 +93,15 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 						RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
 						if(holder instanceof FooterStatusDisplayItem.Holder footer && footer.getItem().status==s.getContentStatus()){
 							footer.rebind();
-							return;
+						}else if(holder instanceof ExtendedFooterStatusDisplayItem.Holder footer && footer.getItem().status==s.getContentStatus()){
+							footer.rebind();
 						}
 					}
-					return;
 				}
 			}
 			for(Status s:preloadedData){
 				if(s.id.equals(ev.id)){
 					s.update(ev);
-					return;
 				}
 			}
 		}
@@ -113,10 +115,15 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 				return;
 			data.remove(status);
 			preloadedData.remove(status);
-			HeaderStatusDisplayItem item=findItemOfType(ev.id, HeaderStatusDisplayItem.class);
-			if(item==null)
+			int index=-1;
+			for(int i=0;i<displayItems.size();i++){
+				if(ev.id.equals(displayItems.get(i).parentID)){
+					index=i;
+					break;
+				}
+			}
+			if(index==-1)
 				return;
-			int index=displayItems.indexOf(item);
 			int lastIndex;
 			for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
 				if(!displayItems.get(lastIndex).parentID.equals(ev.id))
@@ -131,6 +138,11 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 			StatusListFragment.this.onStatusCreated(ev);
 		}
 
+		@Subscribe
+		public void onStatusUnpinned(StatusUnpinnedEvent ev){
+			StatusListFragment.this.onStatusUnpinned(ev);
+		}
+
 		@Subscribe
 		public void onPollUpdated(PollUpdatedEvent ev){
 			if(!ev.accountID.equals(accountID))

mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java

@@ -11,6 +11,8 @@ import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusContext;
+import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.text.HtmlParser;
@@ -45,7 +47,10 @@ public class ThreadFragment extends StatusListFragment{
 			for(StatusDisplayItem item:items){
 				if(item instanceof TextStatusDisplayItem text)
 					text.textSelectable=true;
+				else if(item instanceof FooterStatusDisplayItem footer)
+					footer.hideCounts=true;
 			}
+			items.add(new ExtendedFooterStatusDisplayItem(s.id, this, s.getContentStatus()));
 		}
 		return items;
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AccountRelatedAccountListFragment.java

@@ -0,0 +1,17 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.model.Account;
+import org.parceler.Parcels;
+
+public abstract class AccountRelatedAccountListFragment extends PaginatedAccountListFragment{
+	protected Account account;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		account=Parcels.unwrap(getArguments().getParcelable("targetAccount"));
+		setTitle("@"+account.acct);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.fragments;
+package org.joinmastodon.android.fragments.account_list;
 
 import android.app.ProgressDialog;
 import android.content.Intent;
@@ -7,7 +7,6 @@ import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -23,6 +22,8 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Relationship;
@@ -141,14 +142,20 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 		Toolbar toolbar=getToolbar();
 		if(toolbar!=null && toolbar.getNavigationIcon()!=null){
 			toolbar.setNavigationContentDescription(R.string.back);
-			toolbar.setTitleTextAppearance(getActivity(), R.style.m3_title_medium);
-			toolbar.setSubtitleTextAppearance(getActivity(), R.style.m3_body_medium);
-			int color=UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary);
-			toolbar.setTitleTextColor(color);
-			toolbar.setSubtitleTextColor(color);
+			if(hasSubtitle()){
+				toolbar.setTitleTextAppearance(getActivity(), R.style.m3_title_medium);
+				toolbar.setSubtitleTextAppearance(getActivity(), R.style.m3_body_medium);
+				int color=UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary);
+				toolbar.setTitleTextColor(color);
+				toolbar.setSubtitleTextColor(color);
+			}
 		}
 	}
 
+	protected boolean hasSubtitle(){
+		return true;
+	}
+
 	@Override
 	public void onApplyWindowInsets(WindowInsets insets){
 		if(Build.VERSION.SDK_INT>=29 && insets.getTappableElementInsets().bottom==0){
@@ -228,7 +235,7 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 
 		public void bindRelationship(){
 			Relationship rel=relationships.get(item.account.id);
-			if(rel==null){
+			if(rel==null || AccountSessionManager.getInstance().isSelf(accountID, item.account)){
 				button.setVisibility(View.GONE);
 			}else{
 				button.setVisibility(View.VISIBLE);
@@ -279,14 +286,20 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 			menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
 			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
 			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
-			if(relationship.following)
-				menu.findItem(R.id.hide_boosts).setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
-			else
-				menu.findItem(R.id.hide_boosts).setVisible(false);
-			if(!account.isLocal())
-				menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
-			else
-				menu.findItem(R.id.block_domain).setVisible(false);
+			MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
+			if(relationship.following){
+				hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
+				hideBoosts.setVisible(true);
+			}else{
+				hideBoosts.setVisible(false);
+			}
+			MenuItem blockDomain=menu.findItem(R.id.block_domain);
+			if(!account.isLocal()){
+				blockDomain.setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
+				blockDomain.setVisible(true);
+			}else{
+				blockDomain.setVisible(false);
+			}
 
 			menuAnchor.setTranslationX(x);
 			menuAnchor.setTranslationY(y);

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java

@@ -0,0 +1,22 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.accounts.GetAccountFollowers;
+import org.joinmastodon.android.model.Account;
+
+public class FollowerListFragment extends AccountRelatedAccountListFragment{
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setSubtitle(getResources().getQuantityString(R.plurals.x_followers, account.followersCount, account.followersCount));
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetAccountFollowers(account.id, maxID, count);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java

@@ -0,0 +1,22 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.accounts.GetAccountFollowing;
+import org.joinmastodon.android.model.Account;
+
+public class FollowingListFragment extends AccountRelatedAccountListFragment{
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setSubtitle(getResources().getQuantityString(R.plurals.x_following, account.followingCount, account.followingCount));
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetAccountFollowing(account.id, maxID, count);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java

@@ -1,39 +1,21 @@
-package org.joinmastodon.android.fragments;
+package org.joinmastodon.android.fragments.account_list;
 
-import android.os.Bundle;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.accounts.GetAccountFollowers;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.HeaderPaginationList;
-import org.parceler.Parcels;
 
 import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.SimpleCallback;
 
-public class FollowerListFragment extends BaseAccountListFragment{
-	private Account account;
+public abstract class PaginatedAccountListFragment extends BaseAccountListFragment{
 	private String nextMaxID;
 
-	@Override
-	public void onCreate(Bundle savedInstanceState){
-		super.onCreate(savedInstanceState);
-		account=Parcels.unwrap(getArguments().getParcelable("targetAccount"));
-		setTitle("@"+account.acct);
-		setSubtitle(getResources().getQuantityString(R.plurals.x_followers, account.followersCount, account.followersCount));
-	}
-
-	@Override
-	public void onResume(){
-		super.onResume();
-		if(!loaded && !dataLoading)
-			loadData();
-	}
+	public abstract HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count);
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetAccountFollowers(account.id, offset==0 ? null : nextMaxID, count)
+		currentRequest=onCreateRequest(offset==0 ? null : nextMaxID, count)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(HeaderPaginationList<Account> result){
@@ -46,4 +28,11 @@ public class FollowerListFragment extends BaseAccountListFragment{
 				})
 				.exec(accountID);
 	}
+
+	@Override
+	public void onResume(){
+		super.onResume();
+		if(!loaded && !dataLoading)
+			loadData();
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java

@@ -0,0 +1,21 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.statuses.GetStatusFavorites;
+import org.joinmastodon.android.model.Account;
+
+public class StatusFavoritesListFragment extends StatusRelatedAccountListFragment{
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(getResources().getQuantityString(R.plurals.x_favorites, status.favouritesCount, status.favouritesCount));
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetStatusFavorites(status.id, maxID, count);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java

@@ -0,0 +1,21 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.statuses.GetStatusReblogs;
+import org.joinmastodon.android.model.Account;
+
+public class StatusReblogsListFragment extends StatusRelatedAccountListFragment{
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(getResources().getQuantityString(R.plurals.x_reblogs, status.reblogsCount, status.reblogsCount));
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetStatusReblogs(status.id, maxID, count);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusRelatedAccountListFragment.java

@@ -0,0 +1,21 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.model.Status;
+import org.parceler.Parcels;
+
+public abstract class StatusRelatedAccountListFragment extends PaginatedAccountListFragment{
+	protected Status status;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		status=Parcels.unwrap(getArguments().getParcelable("status"));
+	}
+
+	@Override
+	protected boolean hasSubtitle(){
+		return false;
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java

@@ -157,6 +157,18 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			}
 		});
 		tabLayoutMediator.attach();
+		tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener(){
+			@Override
+			public void onTabSelected(TabLayout.Tab tab){}
+
+			@Override
+			public void onTabUnselected(TabLayout.Tab tab){}
+
+			@Override
+			public void onTabReselected(TabLayout.Tab tab){
+				scrollToTop();
+			}
+		});
 
 		searchEdit=view.findViewById(R.id.search_edit);
 		searchEdit.setOnFocusChangeListener(this::onSearchEditFocusChanged);

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java

@@ -117,6 +117,8 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 	protected void doLoadData(int offset, int count){
 		if(isInRecentMode()){
 			AccountSessionManager.getInstance().getAccount(accountID).getCacheController().getRecentSearches(sr->{
+				if(getActivity()==null)
+					return;
 				unfilteredResults=sr;
 				prevDisplayItems=new ArrayList<>(displayItems);
 				onDataLoaded(sr, false);
@@ -203,7 +205,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 
 			@Override
 			public void onTabReselected(TabLayout.Tab tab){
-
+				scrollToTop();
 			}
 		});
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java

@@ -2,6 +2,7 @@ package org.joinmastodon.android.fragments.onboarding;
 
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.LocaleList;
@@ -349,7 +350,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 		currentSearchQuery=searchEdit.getText().toString().toLowerCase();
 		updateFilteredList();
 		searchEdit.removeCallbacks(searchDebouncer);
-		Instance instance=instancesCache.get(currentSearchQuery);
+		Instance instance=instancesCache.get(normalizeInstanceDomain(currentSearchQuery));
 		if(instance==null){
 			showProgressDialog();
 			loadInstanceInfo(currentSearchQuery);
@@ -412,15 +413,27 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 		instanceProgressDialog.show();
 	}
 
-	private void loadInstanceInfo(String _domain){
+	private String normalizeInstanceDomain(String _domain){
 		if(TextUtils.isEmpty(_domain))
-			return;
+			return null;
+		if(_domain.contains(":")){
+			try{
+				_domain=Uri.parse(_domain).getAuthority();
+			}catch(Exception ignore){}
+			if(TextUtils.isEmpty(_domain))
+				return null;
+		}
 		String domain;
 		try{
 			domain=IDN.toASCII(_domain);
 		}catch(IllegalArgumentException x){
-			return;
+			return null;
 		}
+		return domain;
+	}
+
+	private void loadInstanceInfo(String _domain){
+		String domain=normalizeInstanceDomain(_domain);
 		Instance cachedInstance=instancesCache.get(domain);
 		if(cachedInstance!=null){
 			for(CatalogInstance ci:filteredData){

mastodon/src/main/java/org/joinmastodon/android/model/Status.java

@@ -126,6 +126,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 		repliesCount=ev.replies;
 		favourited=ev.favorited;
 		reblogged=ev.reblogged;
+		pinned=ev.pinned;
 	}
 
 	public Status getContentStatus(){

mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java

@@ -162,6 +162,7 @@ public class ComposeAutocompleteViewController{
 					.map(WrappedEmoji::new)
 					.collect(Collectors.toList());
 			UiUtils.updateList(oldList, emojis, list, emojisAdapter, (e1, e2)->e1.emoji.shortcode.equals(e2.emoji.shortcode));
+			imgLoader.updateImages();
 		}
 	}
 
@@ -186,6 +187,7 @@ public class ComposeAutocompleteViewController{
 						List<WrappedAccount> oldList=users;
 						users=result.accounts.stream().map(WrappedAccount::new).collect(Collectors.toList());
 						UiUtils.updateList(oldList, users, list, usersAdapter, (a1, a2)->a1.account.id.equals(a2.account.id));
+						imgLoader.updateImages();
 						if(listIsHidden){
 							listIsHidden=false;
 							V.setVisibilityAnimated(list, View.VISIBLE);
@@ -210,6 +212,7 @@ public class ComposeAutocompleteViewController{
 						List<Hashtag> oldList=hashtags;
 						hashtags=result.hashtags;
 						UiUtils.updateList(oldList, hashtags, list, hashtagsAdapter, (t1, t2)->t1.name.equals(t2.name));
+						imgLoader.updateImages();
 						if(listIsHidden){
 							listIsHidden=false;
 							V.setVisibilityAnimated(list, View.VISIBLE);

mastodon/src/main/java/org/joinmastodon/android/ui/ImageDescriptionSheet.java

@@ -0,0 +1,87 @@
+package org.joinmastodon.android.ui;
+
+import android.app.Activity;
+import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.Attachment;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.BottomSheet;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class ImageDescriptionSheet extends BottomSheet{
+	private UsableRecyclerView list;
+
+	public ImageDescriptionSheet(@NonNull Activity activity, Attachment attachment){
+		super(activity);
+
+		View handleView=new View(activity);
+		handleView.setBackgroundResource(R.drawable.bg_bottom_sheet_handle);
+		ViewGroup handle=new FrameLayout(activity);
+		handle.addView(handleView);
+		handle.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(24)));
+
+		TextView textView = new TextView(activity);
+		if (attachment.description == null || attachment.description.isEmpty()) {
+			textView.setText(R.string.media_no_description);
+			textView.setTypeface(null, Typeface.ITALIC);
+		} else {
+			textView.setText(attachment.description);
+			textView.setTextIsSelectable(true);
+		}
+
+		TextView heading=new TextView(activity);
+		heading.setText(R.string.image_description);
+		heading.setAllCaps(true);
+		heading.setTypeface(null, Typeface.BOLD);
+		heading.setPadding(0, V.dp(24), 0, V.dp(8));
+
+		LinearLayout linearLayout = new LinearLayout(activity);
+		linearLayout.setOrientation(LinearLayout.VERTICAL);
+		linearLayout.setPadding(V.dp(24), 0, V.dp(24), 0);
+		linearLayout.addView(heading);
+		linearLayout.addView(textView);
+
+		FrameLayout layout=new FrameLayout(activity);
+		layout.addView(handle);
+		layout.addView(linearLayout);
+
+		list=new UsableRecyclerView(activity);
+		list.setLayoutManager(new LinearLayoutManager(activity));
+		list.setBackgroundResource(R.drawable.bg_bottom_sheet);
+		list.setAdapter(new SingleViewRecyclerAdapter(layout));
+		list.setClipToPadding(false);
+
+		setContentView(list);
+		setNavigationBarBackground(new ColorDrawable(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground)), !UiUtils.isDarkTheme());
+	}
+
+	@Override
+	protected void onWindowInsetsUpdated(WindowInsets insets){
+		if(Build.VERSION.SDK_INT>=29){
+			int tappableBottom=insets.getTappableElementInsets().bottom;
+			int insetBottom=insets.getSystemWindowInsetBottom();
+			if(tappableBottom==0 && insetBottom>0){
+				list.setPadding(0, 0, 0, V.dp(48)-insetBottom);
+			}else{
+				list.setPadding(0, 0, 0, V.dp(24));
+			}
+		}else{
+			list.setPadding(0, 0, 0, V.dp(24));
+		}
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/ui/SingleImagePhotoViewerListener.java

@@ -0,0 +1,87 @@
+package org.joinmastodon.android.ui;
+
+import android.app.Fragment;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+
+import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
+
+import java.util.function.Supplier;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public class SingleImagePhotoViewerListener implements PhotoViewer.Listener{
+	private final View sourceView, transformView;
+	private final int[] cornerRadius;
+	private final Runnable onDismissed;
+	private final Fragment parentFragment;
+	private final Supplier<Drawable> currentDrawableSupplier;
+	private final Runnable onStart, onEnd;
+
+	private float origAlpha;
+
+	public SingleImagePhotoViewerListener(View sourceView, View transformView, int[] cornerRadius, Fragment parentFragment, Runnable onDismissed, Supplier<Drawable> currentDrawableSupplier, Runnable onStart, Runnable onEnd){
+		this.sourceView=sourceView;
+		this.transformView=transformView;
+		this.cornerRadius=cornerRadius;
+		this.onDismissed=onDismissed;
+		this.parentFragment=parentFragment;
+		this.currentDrawableSupplier=currentDrawableSupplier;
+		this.onStart=onStart;
+		this.onEnd=onEnd;
+		if(cornerRadius!=null && cornerRadius.length!=4)
+			throw new IllegalArgumentException("Corner radius must be null or have length of 4");
+	}
+
+	@Override
+	public void setPhotoViewVisibility(int index, boolean visible){
+		transformView.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
+	}
+
+	@Override
+	public boolean startPhotoViewTransition(int index, @NonNull Rect outRect, @NonNull int[] outCornerRadius){
+		int[] loc={0, 0};
+		sourceView.getLocationOnScreen(loc);
+		outRect.set(loc[0], loc[1], loc[0]+sourceView.getWidth(), loc[1]+sourceView.getHeight());
+		if(cornerRadius!=null)
+			System.arraycopy(cornerRadius, 0, outCornerRadius, 0, 4);
+		transformView.setTranslationZ(1);
+		if(onStart!=null)
+			onStart.run();
+		return true;
+	}
+
+	@Override
+	public void setTransitioningViewTransform(float translateX, float translateY, float scale){
+		transformView.setTranslationX(translateX);
+		transformView.setTranslationY(translateY);
+		transformView.setScaleX(scale);
+		transformView.setScaleY(scale);
+	}
+
+	@Override
+	public void endPhotoViewTransition(){
+		setTransitioningViewTransform(0f, 0f, 1f);
+		transformView.setTranslationZ(0);
+		if(onEnd!=null)
+			onEnd.run();
+	}
+
+	@Nullable
+	@Override
+	public Drawable getPhotoViewCurrentDrawable(int index){
+		return currentDrawableSupplier.get();
+	}
+
+	@Override
+	public void photoViewerDismissed(){
+		onDismissed.run();
+	}
+
+	@Override
+	public void onRequestPermissions(String[] permissions){
+		parentFragment.requestPermissions(permissions, PhotoViewer.PERMISSION_REQUEST);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java

@@ -92,7 +92,9 @@ public class AudioStatusDisplayItem extends StatusDisplayItem{
 		public void onBind(AudioStatusDisplayItem item){
 			int seconds=(int)item.attachment.getDuration();
 			String duration=formatDuration(seconds);
-			time.getLayoutParams().width=(int)Math.ceil(time.getPaint().measureText("-"+duration));
+			// Some fonts (not Roboto) have different-width digits. 0 is supposedly the widest.
+			time.getLayoutParams().width=(int)Math.ceil(Math.max(time.getPaint().measureText("-"+duration),
+					time.getPaint().measureText("-"+duration.replaceAll("\\d", "0"))));
 			time.setText(duration);
 			AudioPlayerService service=AudioPlayerService.getInstance();
 			if(service!=null && service.getAttachmentID().equals(item.attachment.id)){

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java

@@ -0,0 +1,112 @@
+package org.joinmastodon.android.ui.displayitems;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.TypefaceSpan;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.fragments.account_list.StatusFavoritesListFragment;
+import org.joinmastodon.android.fragments.account_list.StatusReblogsListFragment;
+import org.joinmastodon.android.fragments.account_list.StatusRelatedAccountListFragment;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
+import java.util.Locale;
+
+import androidx.annotation.PluralsRes;
+import me.grishka.appkit.Nav;
+
+public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
+	public final Status status;
+
+	private static final DateTimeFormatter TIME_FORMATTER=DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG, FormatStyle.SHORT);
+
+	public ExtendedFooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status){
+		super(parentID, parentFragment);
+		this.status=status;
+	}
+
+	@Override
+	public Type getType(){
+		return Type.EXTENDED_FOOTER;
+	}
+
+	public static class Holder extends StatusDisplayItem.Holder<ExtendedFooterStatusDisplayItem>{
+		private final TextView reblogs, favorites, time;
+		private final View buttonsView;
+
+		public Holder(Context context, ViewGroup parent){
+			super(context, R.layout.display_item_extended_footer, parent);
+			reblogs=findViewById(R.id.reblogs);
+			favorites=findViewById(R.id.favorites);
+			time=findViewById(R.id.timestamp);
+			buttonsView=findViewById(R.id.button_bar);
+
+			reblogs.setOnClickListener(v->startAccountListFragment(StatusReblogsListFragment.class));
+			favorites.setOnClickListener(v->startAccountListFragment(StatusFavoritesListFragment.class));
+		}
+
+		@Override
+		public void onBind(ExtendedFooterStatusDisplayItem item){
+			Status s=item.status;
+			if(s.favouritesCount>0){
+				favorites.setVisibility(View.VISIBLE);
+				favorites.setText(getFormattedPlural(R.plurals.x_favorites, s.favouritesCount));
+			}else{
+				favorites.setVisibility(View.GONE);
+			}
+			if(s.reblogsCount>0){
+				reblogs.setVisibility(View.VISIBLE);
+				reblogs.setText(getFormattedPlural(R.plurals.x_reblogs, s.reblogsCount));
+			}else{
+				reblogs.setVisibility(View.GONE);
+			}
+			if(s.favouritesCount==0 && s.reblogsCount==0){
+				buttonsView.setVisibility(View.GONE);
+			}else{
+				buttonsView.setVisibility(View.VISIBLE);
+			}
+			String timeStr=TIME_FORMATTER.format(item.status.createdAt.atZone(ZoneId.systemDefault()));
+			if(item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)){
+				time.setText(item.parentFragment.getString(R.string.timestamp_via_app, timeStr, item.status.application.name));
+			}else{
+				time.setText(timeStr);
+			}
+		}
+
+		@Override
+		public boolean isEnabled(){
+			return false;
+		}
+
+		private SpannableStringBuilder getFormattedPlural(@PluralsRes int res, int quantity){
+			String str=item.parentFragment.getResources().getQuantityString(res, quantity, quantity);
+			String formattedNumber=String.format(Locale.getDefault(), "%,d", quantity);
+			int index=str.indexOf(formattedNumber);
+			SpannableStringBuilder ssb=new SpannableStringBuilder(str);
+			if(index>=0){
+				ssb.setSpan(new TypefaceSpan("sans-serif-medium"), index, index+formattedNumber.length(), 0);
+				ssb.setSpan(new ForegroundColorSpan(UiUtils.getThemeColor(item.parentFragment.getActivity(), android.R.attr.textColorPrimary)), index, index+formattedNumber.length(), 0);
+			}
+			return ssb;
+		}
+
+		private void startAccountListFragment(Class<? extends StatusRelatedAccountListFragment> cls){
+			Bundle args=new Bundle();
+			args.putString("account", item.parentFragment.getAccountID());
+			args.putParcelable("status", Parcels.wrap(item.status));
+			Nav.go(item.parentFragment.getActivity(), cls, args);
+		}
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java

@@ -29,6 +29,7 @@ import me.grishka.appkit.utils.V;
 public class FooterStatusDisplayItem extends StatusDisplayItem{
 	public final Status status;
 	private final String accountID;
+	public boolean hideCounts;
 
 	public FooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status, String accountID){
 		super(parentID, parentFragment);
@@ -42,7 +43,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<FooterStatusDisplayItem>{
-		private final TextView reply, boost, favorite;
+		private final TextView reply, boost, favorite, bookmark;
 		private final ImageView share;
 
 		private final View.AccessibilityDelegate buttonAccessibilityDelegate=new View.AccessibilityDelegate(){
@@ -59,22 +60,27 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			reply=findViewById(R.id.reply);
 			boost=findViewById(R.id.boost);
 			favorite=findViewById(R.id.favorite);
+			bookmark=findViewById(R.id.bookmark);
 			share=findViewById(R.id.share);
 			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N){
 				UiUtils.fixCompoundDrawableTintOnAndroid6(reply);
 				UiUtils.fixCompoundDrawableTintOnAndroid6(boost);
 				UiUtils.fixCompoundDrawableTintOnAndroid6(favorite);
+				UiUtils.fixCompoundDrawableTintOnAndroid6(bookmark);
 			}
 			View reply=findViewById(R.id.reply_btn);
 			View boost=findViewById(R.id.boost_btn);
 			View favorite=findViewById(R.id.favorite_btn);
 			View share=findViewById(R.id.share_btn);
+			View bookmark=findViewById(R.id.bookmark_btn);
 			reply.setOnClickListener(this::onReplyClick);
 			reply.setAccessibilityDelegate(buttonAccessibilityDelegate);
 			boost.setOnClickListener(this::onBoostClick);
 			boost.setAccessibilityDelegate(buttonAccessibilityDelegate);
 			favorite.setOnClickListener(this::onFavoriteClick);
 			favorite.setAccessibilityDelegate(buttonAccessibilityDelegate);
+			bookmark.setOnClickListener(this::onBookmarkClick);
+			bookmark.setAccessibilityDelegate(buttonAccessibilityDelegate);
 			share.setOnClickListener(this::onShareClick);
 			share.setAccessibilityDelegate(buttonAccessibilityDelegate);
 		}
@@ -86,12 +92,13 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			bindButton(favorite, item.status.favouritesCount);
 			boost.setSelected(item.status.reblogged);
 			favorite.setSelected(item.status.favourited);
+			bookmark.setSelected(item.status.bookmarked);
 			boost.setEnabled(item.status.visibility==StatusPrivacy.PUBLIC || item.status.visibility==StatusPrivacy.UNLISTED
 					|| (item.status.visibility==StatusPrivacy.PRIVATE && item.status.account.id.equals(AccountSessionManager.getInstance().getAccount(item.accountID).self.id)));
 		}
 
 		private void bindButton(TextView btn, int count){
-			if(count>0){
+			if(count>0 && !item.hideCounts){
 				btn.setText(DecimalFormat.getIntegerInstance().format(count));
 				btn.setCompoundDrawablePadding(V.dp(8));
 			}else{
@@ -119,6 +126,11 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			bindButton(favorite, item.status.favouritesCount);
 		}
 
+		private void onBookmarkClick(View v){
+			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setBookmarked(item.status, !item.status.bookmarked);
+			bookmark.setSelected(item.status.bookmarked);
+		}
+
 		private void onShareClick(View v){
 			Intent intent=new Intent(Intent.ACTION_SEND);
 			intent.setType("text/plain");
@@ -133,6 +145,8 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 				return R.string.button_reblog;
 			if(id==R.id.favorite_btn)
 				return R.string.button_favorite;
+			if(id==R.id.bookmark_btn)
+				return R.string.button_bookmark;
 			if(id==R.id.share_btn)
 				return R.string.button_share;
 			return 0;

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java

@@ -137,6 +137,10 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				int id=menuItem.getItemId();
 				if(id==R.id.delete){
 					UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{});
+				}else if(id==R.id.delete_and_redraft) {
+					UiUtils.confirmDeleteAndRedraftPost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{});
+				}else if(id==R.id.pin || id==R.id.unpin){
+					UiUtils.confirmPinPost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, !item.status.pinned, s->{});
 				}else if(id==R.id.mute){
 					UiUtils.confirmToggleMuteUser(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), account, relationship!=null && relationship.muting, r->{});
 				}else if(id==R.id.block){
@@ -250,6 +254,9 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			Menu menu=optionsMenu.getMenu();
 			boolean isOwnPost=AccountSessionManager.getInstance().isSelf(item.parentFragment.getAccountID(), account);
 			menu.findItem(R.id.delete).setVisible(item.status!=null && isOwnPost);
+			menu.findItem(R.id.delete_and_redraft).setVisible(item.status!=null && isOwnPost);
+			menu.findItem(R.id.pin).setVisible(item.status!=null && isOwnPost && !item.status.pinned);
+			menu.findItem(R.id.unpin).setVisible(item.status!=null && isOwnPost && item.status.pinned);
 			menu.findItem(R.id.open_in_browser).setVisible(item.status!=null);
 			MenuItem blockDomain=menu.findItem(R.id.block_domain);
 			MenuItem mute=menu.findItem(R.id.mute);

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java

@@ -64,6 +64,7 @@ public abstract class StatusDisplayItem{
 			case ACCOUNT -> new AccountStatusDisplayItem.Holder(activity, parent);
 			case HASHTAG -> new HashtagStatusDisplayItem.Holder(activity, parent);
 			case GAP -> new GapStatusDisplayItem.Holder(activity, parent);
+			case EXTENDED_FOOTER -> new ExtendedFooterStatusDisplayItem.Holder(activity, parent);
 		};
 	}
 
@@ -146,7 +147,8 @@ public abstract class StatusDisplayItem{
 		ACCOUNT_CARD,
 		ACCOUNT,
 		HASHTAG,
-		GAP
+		GAP,
+		EXTENDED_FOOTER
 	}
 
 	public static abstract class Holder<T extends StatusDisplayItem> extends BindableViewHolder<T> implements UsableRecyclerView.DisableableClickable{

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java

@@ -11,6 +11,7 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.views.LinkedTextView;
 
@@ -20,7 +21,8 @@ import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
 
 public class TextStatusDisplayItem extends StatusDisplayItem{
 	private CharSequence text;
-	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
+	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper(), spoilerEmojiHelper;
+	private CharSequence parsedSpoilerText;
 	public boolean textSelectable;
 	public final Status status;
 
@@ -29,6 +31,11 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 		this.text=text;
 		this.status=status;
 		emojiHelper.setText(text);
+		if(!TextUtils.isEmpty(status.spoilerText)){
+			parsedSpoilerText=HtmlParser.parseCustomEmoji(status.spoilerText, status.emojis);
+			spoilerEmojiHelper=new CustomEmojiHelper();
+			spoilerEmojiHelper.setText(parsedSpoilerText);
+		}
 	}
 
 	@Override
@@ -38,11 +45,15 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 	@Override
 	public int getImageCount(){
+		if(spoilerEmojiHelper!=null && !status.spoilerRevealed)
+			return spoilerEmojiHelper.getImageCount();
 		return emojiHelper.getImageCount();
 	}
 
 	@Override
 	public ImageLoaderRequest getImageRequest(int index){
+		if(spoilerEmojiHelper!=null && !status.spoilerRevealed)
+			return spoilerEmojiHelper.getImageRequest(index);
 		return emojiHelper.getImageRequest(index);
 	}
 
@@ -65,7 +76,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			text.setTextIsSelectable(item.textSelectable);
 			text.setInvalidateOnEveryFrame(false);
 			if(!TextUtils.isEmpty(item.status.spoilerText)){
-				spoilerTitle.setText(item.status.spoilerText);
+				spoilerTitle.setText(item.parsedSpoilerText);
 				if(item.status.spoilerRevealed){
 					spoilerOverlay.setVisibility(View.GONE);
 					text.setVisibility(View.VISIBLE);
@@ -84,8 +95,9 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 		@Override
 		public void setImage(int index, Drawable image){
-			item.emojiHelper.setImageDrawable(index, image);
+			getEmojiHelper().setImageDrawable(index, image);
 			text.invalidate();
+			spoilerTitle.invalidate();
 			if(image instanceof Animatable){
 				((Animatable) image).start();
 				if(image instanceof MovieDrawable)
@@ -95,8 +107,12 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 		@Override
 		public void clearImage(int index){
-			item.emojiHelper.setImageDrawable(index, null);
+			getEmojiHelper().setImageDrawable(index, null);
 			text.invalidate();
 		}
+
+		private CustomEmojiHelper getEmojiHelper(){
+			return item.spoilerEmojiHelper!=null && !item.status.spoilerRevealed ? item.spoilerEmojiHelper : item.emojiHelper;
+		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java

@@ -19,6 +19,7 @@ import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.media.MediaScannerConnection;
 import android.net.Uri;
+import android.opengl.Visibility;
 import android.os.Build;
 import android.os.Environment;
 import android.os.SystemClock;
@@ -48,6 +49,7 @@ import android.widget.Toolbar;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.model.Attachment;
+import org.joinmastodon.android.ui.ImageDescriptionSheet;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 
 import java.io.File;
@@ -97,6 +99,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 	private TextView videoTimeView;
 	private ImageButton videoPlayPauseButton;
 	private View videoControls;
+	private MenuItem imageDescriptionButton;
 	private boolean uiVisible=true;
 	private AudioManager.OnAudioFocusChangeListener audioFocusListener=this::onAudioFocusChanged;
 	private Runnable uiAutoHider=()->{
@@ -174,11 +177,24 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		toolbarWrap=uiOverlay.findViewById(R.id.toolbar_wrap);
 		toolbar=uiOverlay.findViewById(R.id.toolbar);
 		toolbar.setNavigationOnClickListener(v->onStartSwipeToDismissTransition(0));
-		toolbar.getMenu().add(R.string.download).setIcon(R.drawable.ic_fluent_arrow_download_24_regular).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-		toolbar.setOnMenuItemClickListener(item->{
-			saveCurrentFile();
-			return true;
-		});
+		imageDescriptionButton = toolbar.getMenu()
+				.add(R.string.image_description)
+				.setIcon(R.drawable.ic_fluent_image_alt_text_24_regular)
+				.setVisible(attachments.get(pager.getCurrentItem()).description != null
+						&& !attachments.get(pager.getCurrentItem()).description.isEmpty())
+				.setOnMenuItemClickListener(item -> {
+					new ImageDescriptionSheet(activity,attachments.get(pager.getCurrentItem())).show();
+					return true;
+				});
+		imageDescriptionButton.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+		toolbar.getMenu()
+				.add(R.string.download)
+				.setIcon(R.drawable.ic_fluent_arrow_download_24_regular)
+				.setOnMenuItemClickListener(item -> {
+					saveCurrentFile();
+					return true;
+				})
+				.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		uiOverlay.setAlpha(0f);
 		videoControls=uiOverlay.findViewById(R.id.video_player_controls);
 		videoSeekBar=uiOverlay.findViewById(R.id.seekbar);
@@ -374,6 +390,8 @@ public class PhotoViewer implements ZoomPanView.Listener{
 	private void onPageChanged(int index){
 		currentIndex=index;
 		Attachment att=attachments.get(index);
+		imageDescriptionButton.setVisible(att.description != null && !att.description.isEmpty());
+		toolbar.invalidate();
 		V.setVisibilityAnimated(videoControls, att.type==Attachment.Type.VIDEO ? View.VISIBLE : View.GONE);
 		if(att.type==Attachment.Type.VIDEO){
 			videoSeekBar.setSecondaryProgress(0);

mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
+import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.util.AttributeSet;
@@ -54,6 +55,9 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 	private float lastFlingVelocityY;
 	private float backgroundAlphaForTransition=1f;
 	private boolean forceUpdateLayout;
+	private int[] transitionCornerRadius;
+	private Path transitionClipPath=new Path();
+	private float[] tmpFloatArray=new float[8];
 
 	private static final String TAG="ZoomPanView";
 
@@ -148,10 +152,25 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 			child.getMatrix().mapRect(tmpRect2);
 			tmpRect2.offset(child.getLeft(), child.getTop());
 			canvas.save();
-			canvas.clipRect(interpolate(tmpRect2.left, tmpRect.left, cropAnimationValue),
-					interpolate(tmpRect2.top, tmpRect.top, cropAnimationValue),
-					interpolate(tmpRect2.right, tmpRect.right, cropAnimationValue),
-					interpolate(tmpRect2.bottom, tmpRect.bottom, cropAnimationValue));
+			if(transitionCornerRadius!=null){
+				float radiusScale=child.getScaleX();
+				tmpFloatArray[0]=tmpFloatArray[1]=(float)transitionCornerRadius[0]*radiusScale*(1f-cropAnimationValue);
+				tmpFloatArray[2]=tmpFloatArray[3]=(float)transitionCornerRadius[1]*radiusScale*(1f-cropAnimationValue);
+				tmpFloatArray[4]=tmpFloatArray[5]=(float)transitionCornerRadius[2]*radiusScale*(1f-cropAnimationValue);
+				tmpFloatArray[6]=tmpFloatArray[7]=(float)transitionCornerRadius[3]*radiusScale*(1f-cropAnimationValue);
+				transitionClipPath.rewind();
+				transitionClipPath.addRoundRect(interpolate(tmpRect2.left, tmpRect.left, cropAnimationValue),
+						interpolate(tmpRect2.top, tmpRect.top, cropAnimationValue),
+						interpolate(tmpRect2.right, tmpRect.right, cropAnimationValue),
+						interpolate(tmpRect2.bottom, tmpRect.bottom, cropAnimationValue),
+						tmpFloatArray, Path.Direction.CW);
+				canvas.clipPath(transitionClipPath);
+			}else{
+				canvas.clipRect(interpolate(tmpRect2.left, tmpRect.left, cropAnimationValue),
+						interpolate(tmpRect2.top, tmpRect.top, cropAnimationValue),
+						interpolate(tmpRect2.right, tmpRect.right, cropAnimationValue),
+						interpolate(tmpRect2.bottom, tmpRect.bottom, cropAnimationValue));
+			}
 			boolean res=super.drawChild(canvas, child, drawingTime);
 			canvas.restore();
 			return res;
@@ -189,6 +208,18 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 		return initialScale;
 	}
 
+	private void validateAndSetCornerRadius(int[] cornerRadius){
+		transitionCornerRadius=null;
+		if(cornerRadius!=null && cornerRadius.length==4){
+			for(int corner:cornerRadius){
+				if(corner>0){
+					transitionCornerRadius=cornerRadius;
+					break;
+				}
+			}
+		}
+	}
+
 	public void animateIn(Rect rect, int[] cornerRadius){
 		int[] loc={0, 0};
 		getLocationOnScreen(loc);
@@ -204,6 +235,7 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 		animatingTransition=true;
 
 		matrix.getValues(matrixValues);
+		validateAndSetCornerRadius(cornerRadius);
 
 		child.setAlpha(0f);
 		setupAndStartTransitionAnim(new SpringAnimation(this, CROP_AND_FADE, 1f).setMinimumVisibleChange(DynamicAnimation.MIN_VISIBLE_CHANGE_SCALE));
@@ -233,6 +265,7 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 		animatingTransition=true;
 		dismissAfterTransition=true;
 		rawCropAndFadeValue=1f;
+		validateAndSetCornerRadius(cornerRadius);
 
 		setupAndStartTransitionAnim(new SpringAnimation(this, CROP_AND_FADE, 0f).setMinimumVisibleChange(DynamicAnimation.MIN_VISIBLE_CHANGE_SCALE));
 		setupAndStartTransitionAnim(new SpringAnimation(child, DynamicAnimation.SCALE_X, initialScale));

mastodon/src/main/java/org/joinmastodon/android/ui/text/DeleteWhenCopiedSpan.java

@@ -0,0 +1,8 @@
+package org.joinmastodon.android.ui.text;
+
+/**
+ * A span to mark character ranges that should be deleted when copied to the clipboard.
+ * Works with {@link org.joinmastodon.android.ui.views.LinkedTextView}.
+ */
+public class DeleteWhenCopiedSpan{
+}

mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java

@@ -67,10 +67,9 @@ public class HtmlParser{
 
 			@Override
 			public void head(@NonNull Node node, int depth){
-				if(node instanceof TextNode){
-					ssb.append(((TextNode) node).text());
-				}else if(node instanceof Element){
-					Element el=(Element)node;
+				if(node instanceof TextNode textNode){
+					ssb.append(textNode.text());
+				}else if(node instanceof Element el){
 					switch(el.nodeName()){
 						case "a" -> {
 							String href=el.attr("href");
@@ -108,10 +107,9 @@ public class HtmlParser{
 
 			@Override
 			public void tail(@NonNull Node node, int depth){
-				if(node instanceof Element){
-					Element el=(Element)node;
+				if(node instanceof Element el){
 					if("span".equals(el.nodeName()) && el.hasClass("ellipsis")){
-						ssb.append('…');
+						ssb.append("…", new DeleteWhenCopiedSpan(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 					}else if("p".equals(el.nodeName())){
 						if(node.nextSibling()!=null)
 							ssb.append("\n\n");

mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java

@@ -2,6 +2,7 @@ package org.joinmastodon.android.ui.utils;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
@@ -18,6 +19,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.Parcelable;
 import android.provider.OpenableColumns;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
@@ -28,6 +30,7 @@ import android.webkit.MimeTypeMap;
 import android.widget.Button;
 import android.widget.PopupMenu;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
@@ -39,8 +42,13 @@ import org.joinmastodon.android.api.requests.accounts.SetAccountMuted;
 import org.joinmastodon.android.api.requests.accounts.SetDomainBlocked;
 import org.joinmastodon.android.api.requests.statuses.DeleteStatus;
 import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
+import org.joinmastodon.android.api.requests.statuses.SetStatusPinned;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusDeletedEvent;
+import org.joinmastodon.android.events.StatusUnpinnedEvent;
+import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.HashtagTimelineFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
@@ -48,8 +56,10 @@ import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.text.CustomEmojiSpan;
+import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.text.SpacerSpan;
 import org.parceler.Parcels;
 
@@ -59,6 +69,8 @@ import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -71,6 +83,10 @@ import androidx.annotation.StringRes;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.gson.Gson;
+import com.google.gson.annotations.SerializedName;
+
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -86,13 +102,17 @@ public class UiUtils{
 	private UiUtils(){}
 
 	public static void launchWebBrowser(Context context, String url){
-		if(GlobalUserPreferences.useCustomTabs){
-			new CustomTabsIntent.Builder()
-					.setShowTitle(true)
-					.build()
-					.launchUrl(context, Uri.parse(url));
-		}else{
-			context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+		try{
+			if(GlobalUserPreferences.useCustomTabs){
+				new CustomTabsIntent.Builder()
+						.setShowTitle(true)
+						.build()
+						.launchUrl(context, Uri.parse(url));
+			}else{
+				context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+			}
+		}catch(ActivityNotFoundException x){
+			Toast.makeText(context, R.string.no_app_to_handle_action, Toast.LENGTH_SHORT).show();
 		}
 	}
 
@@ -100,7 +120,9 @@ public class UiUtils{
 		long t=instant.toEpochMilli();
 		long now=System.currentTimeMillis();
 		long diff=now-t;
-		if(diff<60_000L){
+		if(diff<1000L){
+			return context.getString(R.string.time_now);
+		}else if(diff<60_000L){
 			return context.getString(R.string.time_seconds, diff/1000L);
 		}else if(diff<3600_000L){
 			return context.getString(R.string.time_minutes, diff/60_000L);
@@ -329,6 +351,7 @@ public class UiUtils{
 						@Override
 						public void onSuccess(Status result){
 							resultCallback.accept(result);
+							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().deleteStatus(status.id);
 							E.post(new StatusDeletedEvent(status.id, accountID));
 						}
 
@@ -342,6 +365,88 @@ public class UiUtils{
 		});
 	}
 
+	public static void confirmPinPost(Activity activity, String accountID, Status status, boolean pinned, Consumer<Status> resultCallback){
+		showConfirmationAlert(activity,
+				pinned ? R.string.confirm_pin_post_title : R.string.confirm_unpin_post_title,
+				pinned ? R.string.confirm_pin_post : R.string.confirm_unpin_post,
+				pinned ? R.string.pin_post : R.string.unpin_post,
+				()->{
+					new SetStatusPinned(status.id, pinned)
+							.setCallback(new Callback<>() {
+								@Override
+								public void onSuccess(Status result) {
+									resultCallback.accept(result);
+									E.post(new StatusCountersUpdatedEvent(result));
+									if (!result.pinned)
+										E.post(new StatusUnpinnedEvent(status.id, accountID));
+								}
+
+								@Override
+								public void onError(ErrorResponse error) {
+									error.showToast(activity);
+								}
+							})
+							.wrapProgress(activity, pinned ? R.string.pinning : R.string.unpinning, false)
+							.exec(accountID);
+				}
+		);
+	}
+
+	public static void confirmDeleteAndRedraftPost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback){
+		showConfirmationAlert(activity, R.string.confirm_delete_and_redraft_title, R.string.confirm_delete_and_redraft, R.string.delete_and_redraft, ()->{
+			new DeleteStatus(status.id)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(Status result){
+							resultCallback.accept(result);
+							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().deleteStatus(status.id);
+							E.post(new StatusDeletedEvent(status.id, accountID));
+							UiUtils.redraftStatus(status, accountID, activity);
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							error.showToast(activity);
+						}
+					})
+					.wrapProgress(activity, R.string.deleting, false)
+					.exec(accountID);
+		});
+	}
+
+	public static void redraftStatus(Status status, String accountID, Activity activity) {
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putBoolean("hasDraft", true);
+		args.putString("prefilledText", HtmlParser.parse(status.content, status.emojis, status.mentions, status.tags, accountID).toString());
+		args.putString("spoilerText", status.spoilerText);
+		args.putSerializable("visibility", status.visibility);
+		if(status.poll!=null){
+			args.putInt("pollDuration", (int)status.poll.expiresAt.minus(status.createdAt.getEpochSecond(), ChronoUnit.SECONDS).getEpochSecond());
+			ArrayList<String> opts=status.poll.options.stream().map(o -> o.title).collect(Collectors.toCollection(ArrayList::new));
+			args.putStringArrayList("pollOptions", opts);
+		}
+		if(!status.mediaAttachments.isEmpty()){
+			ArrayList<Parcelable> serializedAttachments=status.mediaAttachments.stream()
+					.map(att -> Parcels.wrap(ComposeFragment.redraftAttachment(att)))
+					.collect(Collectors.toCollection(ArrayList::new));
+			args.putParcelableArrayList("attachments", serializedAttachments);
+		}
+		Callback<Status> cb=new Callback<>(){
+			@Override public void onError(ErrorResponse error) {
+				onSuccess(null);
+				error.showToast(activity);
+			}
+			@Override public void onSuccess(Status status) {
+				if (status!=null) args.putParcelable("replyTo", Parcels.wrap(status));
+				Nav.go(activity, ComposeFragment.class, args);
+			}
+		};
+
+		if(status.inReplyToId!=null) new GetStatusByID(status.inReplyToId).setCallback(cb).exec(accountID);
+		else cb.onSuccess(null);
+	}
+
 	public static void setRelationshipToActionButton(Relationship relationship, Button button){
 		boolean secondaryStyle;
 		if(relationship.blocking){

mastodon/src/main/java/org/joinmastodon/android/ui/views/ImageAttachmentFrameLayout.java

@@ -36,7 +36,7 @@ public class ImageAttachmentFrameLayout extends FrameLayout{
 			super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 			return;
 		}
-		int w=Math.min(((View)getParent()).getMeasuredWidth()-horizontalInset, V.dp(MAX_WIDTH));
+		int w=Math.min(((View)getParent()).getMeasuredWidth(), V.dp(MAX_WIDTH))-horizontalInset;
 		int actualHeight=Math.round(tile.height/1000f*w)+V.dp(1)*(tile.rowSpan-1);
 		int actualWidth=Math.round(tile.width/1000f*w);
 		if(tile.startCol+tile.colSpan<tileLayout.columnSizes.length)

mastodon/src/main/java/org/joinmastodon/android/ui/views/LinkedTextView.java

@@ -1,38 +1,68 @@
 package org.joinmastodon.android.ui.views;
 
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.graphics.Canvas;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
 import android.util.AttributeSet;
+import android.util.Log;
+import android.view.ActionMode;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.widget.TextView;
 
 import org.joinmastodon.android.ui.text.ClickableLinksDelegate;
+import org.joinmastodon.android.ui.text.DeleteWhenCopiedSpan;
 
-public class LinkedTextView extends TextView {
+public class LinkedTextView extends TextView{
 
 	private ClickableLinksDelegate delegate=new ClickableLinksDelegate(this);
 	private boolean needInvalidate;
-	
-	public LinkedTextView(Context context) {
-		super(context);
-		// TODO Auto-generated constructor stub
+	private ActionMode currentActionMode;
+
+	public LinkedTextView(Context context){
+		this(context, null);
 	}
 
-	public LinkedTextView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		// TODO Auto-generated constructor stub
+	public LinkedTextView(Context context, AttributeSet attrs){
+		this(context, attrs, 0);
 	}
 
-	public LinkedTextView(Context context, AttributeSet attrs, int defStyle) {
+	public LinkedTextView(Context context, AttributeSet attrs, int defStyle){
 		super(context, attrs, defStyle);
-		// TODO Auto-generated constructor stub
+		setCustomSelectionActionModeCallback(new ActionMode.Callback(){
+			@Override
+			public boolean onCreateActionMode(ActionMode mode, Menu menu){
+				currentActionMode=mode;
+				return true;
+			}
+
+			@Override
+			public boolean onPrepareActionMode(ActionMode mode, Menu menu){
+				return true;
+			}
+
+			@Override
+			public boolean onActionItemClicked(ActionMode mode, MenuItem item){
+				onTextContextMenuItem(item.getItemId());
+				return true;
+			}
+
+			@Override
+			public void onDestroyActionMode(ActionMode mode){
+				currentActionMode=null;
+			}
+		});
 	}
-	
+
 	public boolean onTouchEvent(MotionEvent ev){
 		if(delegate.onTouch(ev)) return true;
-        return super.onTouchEvent(ev);
+		return super.onTouchEvent(ev);
 	}
-	
+
 	public void onDraw(Canvas c){
 		super.onDraw(c);
 		delegate.onDraw(c);
@@ -47,4 +77,43 @@ public class LinkedTextView extends TextView {
 			invalidate();
 	}
 
+	@Override
+	public boolean onTextContextMenuItem(int id){
+		if(id==android.R.id.copy){
+			final int selStart=getSelectionStart();
+			final int selEnd=getSelectionEnd();
+			int min=Math.max(0, Math.min(selStart, selEnd));
+			int max=Math.max(0, Math.max(selStart, selEnd));
+			final ClipData copyData=ClipData.newPlainText(null, deleteTextWithinDeleteSpans(getText().subSequence(min, max)));
+			ClipboardManager clipboard=getContext().getSystemService(ClipboardManager.class);
+			try {
+				clipboard.setPrimaryClip(copyData);
+			} catch (Throwable t) {
+				Log.w("LinkedTextView", t);
+			}
+			if(currentActionMode!=null){
+				currentActionMode.finish();
+			}
+			return true;
+		}
+		return super.onTextContextMenuItem(id);
+	}
+
+	private CharSequence deleteTextWithinDeleteSpans(CharSequence text){
+		if(text instanceof Spanned spanned){
+			DeleteWhenCopiedSpan[] delSpans=spanned.getSpans(0, text.length(), DeleteWhenCopiedSpan.class);
+			if(delSpans.length>0){
+				SpannableStringBuilder ssb=new SpannableStringBuilder(spanned);
+				for(DeleteWhenCopiedSpan span:delSpans){
+					int start=ssb.getSpanStart(span);
+					int end=ssb.getSpanStart(span);
+					if(start==-1)
+						continue;
+					ssb.delete(start, end+1);
+				}
+				return ssb;
+			}
+		}
+		return text;
+	}
 }

mastodon/src/main/res/color/bookmark_icon.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="@color/bookmark_selected" android:state_selected="true"/>
+	<item android:color="?android:textColorSecondary"/>
+</selector>

mastodon/src/main/res/drawable/bg_text_button.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:attr/colorControlHighlight">
+	<item android:id="@android:id/mask">
+		<shape>
+			<solid android:color="#000"/>
+			<corners android:radius="4dp"/>
+		</shape>
+	</item>
+</ripple>

mastodon/src/main/res/drawable/ic_compose_foreground.xml

@@ -0,0 +1,7 @@
+<vector android:height="108dp"
+    android:viewportHeight="48" android:viewportWidth="48"
+    android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group android:translateX="12" android:translateY="12">
+        <path android:fillColor="@color/shortcut_icon_foreground" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+    </group>
+</vector>