bump version

for grishka's code style must prevail

README.md

@@ -1,16 +1,19 @@
 # Forked Mastodon for Android
-[![Crowdin](https://badges.crowdin.net/mastodon-for-android/localized.svg)](https://crowdin.com/project/mastodon-for-android)
 
 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/).
+Learn more about the official app in the [blog post](https://blog.joinmastodon.org/2022/02/official-mastodon-for-android-app-is-coming-soon/).
 
 ## 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))
 
 ## Building
 
@@ -22,4 +25,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/fi-FI/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/fi-FI/short_description.txt

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

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

@@ -4,9 +4,9 @@ Join a community and create your profile. Find and and follow fascinating folks
 
 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

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/pt-PT/full_description.txt

@@ -1,4 +1,4 @@
-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. 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.
 

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/th-TH/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/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 13
+		versionName '1.1.1+fork.13'
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
 

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/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/StatusInteractionController.java

@@ -58,6 +58,7 @@ public class StatusInteractionController{
 			status.favouritesCount++;
 		else
 			status.favouritesCount--;
+		E.post(new StatusCountersUpdatedEvent(status));
 	}
 
 	public void setReblogged(Status status, boolean reblogged){
@@ -95,5 +96,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/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/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/ComposeFragment.java

@@ -453,7 +453,9 @@ 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)){
 					hasSpoiler=true;
 					spoilerEdit.setVisibility(View.VISIBLE);
 					spoilerEdit.setText(replyTo.spoilerText);
@@ -609,17 +611,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);
@@ -647,6 +651,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);
+			}
+			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()));
@@ -595,12 +616,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 +641,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 +679,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 +713,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 +756,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 +774,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 +836,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 +951,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);
@@ -91,7 +92,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		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{

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

@@ -137,6 +137,8 @@ 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.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 +252,8 @@ 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.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;
@@ -28,6 +29,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 +41,11 @@ 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.HashtagTimelineFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
@@ -86,13 +91,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 +109,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 +340,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 +354,32 @@ 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 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/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>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M1 3c0-1.105 0.895-2 2-2h7c1.105 0 2 0.895 2 2v6c0 1.105-0.895 2-2 2H3c-1.105 0-2-0.895-2-2V3zm2.5 1C3.224 4 3 4.224 3 4.5S3.224 5 3.5 5h6C9.776 5 10 4.776 10 4.5S9.776 4 9.5 4h-6zm0 3C3.224 7 3 7.224 3 7.5S3.224 8 3.5 8h6C9.776 8 10 7.776 10 7.5S9.776 7 9.5 7h-6zM4 12h1.5v6.75c0 0.208 0.036 0.408 0.103 0.594l5.823-5.701c0.833-0.816 2.142-0.854 3.02-0.116l0.128 0.116 5.822 5.702c0.067-0.186 0.104-0.386 0.104-0.595V7.25c0-0.966-0.784-1.75-1.75-1.75H13V4h5.75C20.545 4 22 5.455 22 7.25v11.5c0 1.795-1.455 3.25-3.25 3.25H7.25C5.455 22 4 20.545 4 18.75V12zm15.33 8.401l-5.805-5.686c-0.265-0.26-0.675-0.283-0.966-0.071l-0.084 0.07-5.807 5.687C6.85 20.465 7.046 20.5 7.25 20.5h11.5c0.203 0 0.399-0.035 0.58-0.099zM16.253 7.5c1.244 0 2.252 1.008 2.252 2.252 0 1.244-1.008 2.252-2.252 2.252-1.244 0-2.252-1.008-2.252-2.252C14 8.508 15.008 7.5 16.252 7.5zm0 1.5C15.837 9 15.5 9.337 15.5 9.752s0.337 0.752 0.752 0.752c0.416 0 0.752-0.336 0.752-0.752C17.004 9.337 16.667 9 16.252 9z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/layout/display_item_audio.xml

@@ -46,6 +46,7 @@
 			android:textAppearance="@style/m3_label_medium"
 			android:textColor="?colorButtonText"
 			android:gravity="end"
+			android:singleLine="true"
 			tools:text="1:23"/>
 
 	</LinearLayout>

mastodon/src/main/res/layout/display_item_extended_footer.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical"
+	android:padding="8dp"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?colorBackgroundLightest">
+
+	<org.joinmastodon.android.ui.views.AutoOrientationLinearLayout
+		android:id="@+id/button_bar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<Button
+			android:id="@+id/reblogs"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="center"
+			android:padding="8dp"
+			android:textSize="14sp"
+			android:minHeight="36dp"
+			android:textColor="?android:textColorSecondary"
+			android:background="@drawable/bg_text_button"
+			android:fontFamily="sans-serif"
+			tools:text="4 reblogs"/>
+
+		<Button
+			android:id="@+id/favorites"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="center"
+			android:padding="8dp"
+			android:textSize="14sp"
+			android:minHeight="36dp"
+			android:textColor="?android:textColorSecondary"
+			android:background="@drawable/bg_text_button"
+			android:fontFamily="sans-serif"
+			tools:text="12 favorites"/>
+
+	</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
+
+	<TextView
+		android:id="@+id/timestamp"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="8dp"
+		android:minHeight="20dp"
+		android:gravity="center_vertical"
+		android:textSize="14sp"
+		android:textColor="?android:textColorSecondary"
+		tools:text="Dec 12, 2021, 12:42 PM via Mastodon for Android"/>
+
+</LinearLayout>

mastodon/src/main/res/layout/fragment_image_description.xml

@@ -9,20 +9,21 @@
 		android:layout_height="wrap_content"
 		android:orientation="vertical">
 
-		<org.joinmastodon.android.ui.views.ComposeMediaLayout
-			android:layout_width="wrap_content"
+		<org.joinmastodon.android.ui.views.MaxWidthFrameLayout
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal">
+			android:layout_gravity="center"
+			android:maxWidth="400dp">
 
 			<ImageView
 				android:id="@+id/photo"
 				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:scaleType="centerCrop"
+				android:layout_height="wrap_content"
+				android:adjustViewBounds="true"
 				android:importantForAccessibility="no"
 				tools:src="#0f0"/>
 
-		</org.joinmastodon.android.ui.views.ComposeMediaLayout>
+		</org.joinmastodon.android.ui.views.MaxWidthFrameLayout>
 
 		<TextView
 			android:id="@+id/title"

mastodon/src/main/res/layout/fragment_profile.xml

@@ -52,7 +52,7 @@
 						tools:visibility="visible"
 						android:text="@string/follows_you"/>
 
-					<View
+					<FrameLayout
 						android:id="@+id/avatar_border"
 						android:layout_width="102dp"
 						android:layout_height="102dp"
@@ -60,19 +60,19 @@
 						android:layout_alignParentStart="true"
 						android:layout_marginTop="-40dp"
 						android:layout_marginStart="14dp"
-						android:background="@drawable/profile_ava_bg"/>
+						android:outlineProvider="@null"
+						android:background="@drawable/profile_ava_bg">
 
-					<ImageView
-						android:id="@+id/avatar"
-						android:layout_width="98dp"
-						android:layout_height="98dp"
-						android:layout_below="@id/cover"
-						android:layout_alignParentStart="true"
-						android:layout_marginStart="16dp"
-						android:layout_marginTop="-38dp"
-						android:scaleType="centerCrop"
-						android:contentDescription="@string/profile_picture"
-						tools:src="#0f0" />
+						<ImageView
+							android:id="@+id/avatar"
+							android:layout_width="98dp"
+							android:layout_height="98dp"
+							android:layout_gravity="center"
+							android:scaleType="centerCrop"
+							android:contentDescription="@string/profile_picture"
+							tools:src="#0f0" />
+
+					</FrameLayout>
 
 					<LinearLayout
 						android:id="@+id/profile_counters"
@@ -196,10 +196,10 @@
 						android:id="@+id/name"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_below="@id/avatar"
+						android:layout_below="@id/avatar_border"
 						android:layout_alignParentStart="true"
 						android:layout_marginStart="16dp"
-						android:layout_marginTop="16dp"
+						android:layout_marginTop="12dp"
 						android:layout_toStartOf="@id/profile_action_btn_wrap"
 						android:textAppearance="@style/m3_headline_small"
 						android:textAlignment="viewStart"
@@ -232,10 +232,10 @@
 						android:id="@+id/name_edit"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_below="@id/avatar"
+						android:layout_below="@id/avatar_border"
 						android:layout_alignParentStart="true"
 						android:layout_marginStart="16dp"
-						android:layout_marginTop="16dp"
+						android:layout_marginTop="12dp"
 						android:layout_toStartOf="@id/profile_action_btn_wrap"
 						android:textAppearance="@style/m3_body_large"
 						android:textSize="16sp"

mastodon/src/main/res/layout/item_discover_account.xml

@@ -78,102 +78,110 @@
 		tools:text="Founder, CEO and lead developer @Mastodon, Germany." />
 
 	<LinearLayout
-		android:id="@+id/posts_btn"
-		android:layout_width="wrap_content"
-		android:layout_height="48dp"
-		android:layout_below="@id/bio"
-		android:layout_marginStart="16dp"
-		android:layout_marginTop="16dp"
-		android:gravity="center_horizontal"
-		android:orientation="vertical">
-
-		<TextView
-			android:id="@+id/posts_count"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="@style/m3_title_large"
-			tools:text="123" />
-
-		<TextView
-			android:id="@+id/posts_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="@style/m3_title_small"
-			tools:text="following" />
-	</LinearLayout>
-
-	<LinearLayout
-		android:id="@+id/followers_btn"
-		android:layout_width="wrap_content"
-		android:layout_height="48dp"
-		android:layout_toEndOf="@id/posts_btn"
-		android:layout_alignTop="@id/posts_btn"
-		android:layout_marginStart="12dp"
-		android:orientation="vertical"
-		android:gravity="center_horizontal">
-		<TextView
-			android:id="@+id/followers_count"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="@style/m3_title_large"
-			tools:text="123"/>
-		<TextView
-			android:id="@+id/followers_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="@style/m3_title_small"
-			tools:text="following"/>
-	</LinearLayout>
-
-	<LinearLayout
-		android:id="@+id/following_btn"
-		android:layout_width="wrap_content"
-		android:layout_height="48dp"
-		android:layout_alignTop="@id/posts_btn"
-		android:layout_toEndOf="@id/followers_btn"
-		android:layout_marginStart="12dp"
-		android:orientation="vertical"
-		android:gravity="center_horizontal">
-		<TextView
-			android:id="@+id/following_count"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="@style/m3_title_large"
-			tools:text="123"/>
-		<TextView
-			android:id="@+id/following_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="@style/m3_title_small"
-			tools:text="following"/>
-	</LinearLayout>
-
-	<FrameLayout
-		android:id="@+id/action_btn_wrap"
-		android:layout_width="wrap_content"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_alignParentEnd="true"
-		android:layout_alignTop="@id/posts_btn"
-		android:layout_marginTop="-8dp"
-		android:padding="8dp"
-		android:layout_marginEnd="8dp"
-		android:clipToPadding="false">
-		<org.joinmastodon.android.ui.views.ProgressBarButton
-			android:id="@+id/action_btn"
+		android:layout_below="@id/bio"
+		android:orientation="horizontal">
+
+		<LinearLayout
+			android:id="@+id/posts_btn"
+			android:layout_width="wrap_content"
+			android:layout_height="48dp"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="16dp"
+			android:gravity="center_horizontal"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/posts_count"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAppearance="@style/m3_title_large"
+				tools:text="123" />
+
+			<TextView
+				android:id="@+id/posts_label"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAppearance="@style/m3_title_small"
+				tools:text="following" />
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/followers_btn"
+			android:layout_width="wrap_content"
+			android:layout_height="48dp"
+			android:layout_marginTop="16dp"
+			android:layout_marginStart="12dp"
+			android:orientation="vertical"
+			android:gravity="center_horizontal">
+			<TextView
+				android:id="@+id/followers_count"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAppearance="@style/m3_title_large"
+				tools:text="123"/>
+			<TextView
+				android:id="@+id/followers_label"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAppearance="@style/m3_title_small"
+				tools:text="following"/>
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/following_btn"
+			android:layout_width="wrap_content"
+			android:layout_height="48dp"
+			android:layout_marginTop="16dp"
+			android:layout_marginStart="12dp"
+			android:orientation="vertical"
+			android:gravity="center_horizontal">
+			<TextView
+				android:id="@+id/following_count"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAppearance="@style/m3_title_large"
+				tools:text="123"/>
+			<TextView
+				android:id="@+id/following_label"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAppearance="@style/m3_title_small"
+				tools:text="following"/>
+		</LinearLayout>
+
+		<Space
+			android:layout_width="0px"
+			android:layout_height="1px"
+			android:layout_weight="1"/>
+
+		<FrameLayout
+			android:id="@+id/action_btn_wrap"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			tools:text="Edit Profile"/>
-		<ProgressBar
-			android:id="@+id/action_progress"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center"
-			android:indeterminate="true"
-			style="?android:progressBarStyleSmall"
-			android:elevation="10dp"
-			android:outlineProvider="none"
-			android:indeterminateTint="?colorButtonText"
-			android:visibility="gone"/>
-	</FrameLayout>
+			android:layout_marginTop="8dp"
+			android:padding="8dp"
+			android:layout_marginEnd="8dp"
+			android:clipToPadding="false">
+			<org.joinmastodon.android.ui.views.ProgressBarButton
+				android:id="@+id/action_btn"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				tools:text="@string/follow_back"/>
+			<ProgressBar
+				android:id="@+id/action_progress"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:indeterminate="true"
+				style="?android:progressBarStyleSmall"
+				android:elevation="10dp"
+				android:outlineProvider="none"
+				android:indeterminateTint="?colorButtonText"
+				android:visibility="gone"/>
+		</FrameLayout>
+	</LinearLayout>
 
 </RelativeLayout>

mastodon/src/main/res/menu/post.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:id="@+id/delete" android:title="@string/delete"/>
+	<item android:id="@+id/pin" android:title="@string/pin_post"/>
+	<item android:id="@+id/unpin" android:title="@string/unpin_post"/>
 	<item android:id="@+id/mute" android:title="@string/mute_user"/>
 	<item android:id="@+id/block" android:title="@string/block_user"/>
 	<item android:id="@+id/block_domain" android:title="@string/block_domain"/>

mastodon/src/main/res/mipmap-anydpi-v26/ic_shortcut_compose.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background>
+        <shape>
+            <solid android:color="@color/shortcut_icon_background"/>
+            <size android:width="108dp" android:height="108dp"/>
+        </shape>
+    </background>
+    <foreground android:drawable="@drawable/ic_compose_foreground"/>
+</adaptive-icon>

mastodon/src/main/res/values-ar-rSA/strings.xml

@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="app_name">مَاستودُون</string>
+	<string name="get_started">ابدأ</string>
+	<string name="log_in">تسجيل الدخول</string>
+	<string name="next">التالي</string>
+	<string name="loading_instance">يَجري الحُصُول على معلومات المَثيل…</string>
+	<string name="error">خطأ</string>
+	<string name="not_a_mastodon_instance">%s لا يبدو كمثيل ماستدون.</string>
+	<string name="ok">حسنًا</string>
+	<string name="preparing_auth">جَارٍ الإعدَادُ لِلمُصادَقَة…</string>
+	<string name="finishing_auth">يُنهي المصادقة…</string>
+	<string name="user_boosted">أعادَ %s تَدوينَها</string>
+	<string name="in_reply_to">ردًا على %s</string>
+	<string name="notifications">الإشعارات</string>
+	<string name="user_followed_you">بَدَأ بِمُتابَعَتِك</string>
+	<string name="user_sent_follow_request">أرسَلَ طَلَبًا لِمُتابَعَتِك</string>
+	<string name="user_favorited">فَضَّلَ مَنشُورَك</string>
+	<string name="notification_boosted">أعادَ تَدوينَ مَنشُورَك</string>
+	<string name="poll_ended">انتهى استطلاع الرأي</string>
+	<string name="time_seconds">%d ثا</string>
+	<string name="time_minutes">%d د</string>
+	<string name="time_hours">%d سا</string>
+	<string name="time_days">%d يوم</string>
+	<string name="share_toot_title">شارك</string>
+	<string name="settings">الإعدادات</string>
+	<string name="publish">انشر</string>
+	<string name="discard_draft">أتريد التخلص من المسودة؟</string>
+	<string name="discard">تخلص</string>
+	<string name="cancel">إلغاء</string>
+	<plurals name="followers">
+		<item quantity="zero">لا متابِعين</item>
+		<item quantity="one">متابِع</item>
+		<item quantity="two">متابِعان</item>
+		<item quantity="few">متابِعين</item>
+		<item quantity="many">متابِعًا</item>
+		<item quantity="other">متابِع</item>
+	</plurals>
+	<plurals name="following">
+		<item quantity="zero">لا متابَعين</item>
+		<item quantity="one">متابَع</item>
+		<item quantity="two">متابَعان</item>
+		<item quantity="few">متابَعين</item>
+		<item quantity="many">متابَعًا</item>
+		<item quantity="other">متابَع</item>
+	</plurals>
+	<plurals name="posts">
+		<item quantity="zero">لا منشورات</item>
+		<item quantity="one">منشور</item>
+		<item quantity="two">منشوران</item>
+		<item quantity="few">منشورات</item>
+		<item quantity="many">منشورًا</item>
+		<item quantity="other">منشور</item>
+	</plurals>
+	<string name="posts">منشورات</string>
+	<string name="posts_and_replies">مَنشُوراتٌ وَرُدُود</string>
+	<string name="media">وسائط</string>
+	<string name="profile_about">حَول</string>
+	<string name="button_follow">تابِع</string>
+	<string name="button_following">يُتابِع</string>
+	<string name="edit_profile">حرّر الملف الشخصي</string>
+	<string name="mention_user">ذِكر @%s</string>
+	<string name="share_user">مُشارَكَةُ %s</string>
+	<string name="mute_user">كَتمُ %s</string>
+	<string name="unmute_user">إلغاء الكَتم عن @%s</string>
+	<string name="block_user">حَظرُ %s</string>
+	<string name="unblock_user">رفع الحَظر عن %s</string>
+	<string name="report_user">الإبلاغُ عَن %s</string>
+	<string name="block_domain">حَظرُ %s</string>
+	<string name="unblock_domain">رفع الحَظر عن %s</string>
+	<plurals name="x_posts">
+		<item quantity="zero">لا مَنشورات</item>
+		<item quantity="one">منشورٌ واحِد</item>
+		<item quantity="two">منشورانِ اثنان</item>
+		<item quantity="few">%,d منشورات</item>
+		<item quantity="many">%,d منشورًا</item>
+		<item quantity="other">%,d منشور</item>
+	</plurals>
+	<string name="profile_joined">انضم في</string>
+	<string name="done">تمّ</string>
+	<string name="loading">يحمل…</string>
+	<string name="field_label">التسمية</string>
+	<string name="field_content">المحتوى</string>
+	<string name="saving">يحفظ…</string>
+	<string name="post_from_user">نُشر من %s</string>
+	<string name="poll_option_hint">الخيار %d</string>
+	<plurals name="x_minutes">
+		<item quantity="zero">أقل من دقيقة</item>
+		<item quantity="one">دقيقة واحدة</item>
+		<item quantity="two">دقيقتان</item>
+		<item quantity="few">%d دقائق</item>
+		<item quantity="many">%d دقيقة</item>
+		<item quantity="other">%d دقيقة</item>
+	</plurals>
+	<plurals name="x_hours">
+		<item quantity="zero">أقل من ساعة</item>
+		<item quantity="one">ساعة واحدة</item>
+		<item quantity="two">ساعتان</item>
+		<item quantity="few">%d ساعات</item>
+		<item quantity="many">%d ساعة</item>
+		<item quantity="other">%d ساعة</item>
+	</plurals>
+	<plurals name="x_days">
+		<item quantity="zero">أقل من يوم</item>
+		<item quantity="one">يُومٌ واحِد</item>
+		<item quantity="two">يَومان اِثنان</item>
+		<item quantity="few">%d أيام</item>
+		<item quantity="many">%d يومًا</item>
+		<item quantity="other">%d يوم</item>
+	</plurals>
+	<string name="compose_poll_duration">المُدَّة: %s</string>
+	<plurals name="x_seconds_left">
+		<item quantity="zero">تتبقى لَحظة</item>
+		<item quantity="one">تتبقى ثانية واحِدة</item>
+		<item quantity="two">تتبقى ثانيتان</item>
+		<item quantity="few">تتبقى %d ثوان</item>
+		<item quantity="many">تتبقى %d ثانية</item>
+		<item quantity="other">تتبقى %d ثانية</item>
+	</plurals>
+	<plurals name="x_minutes_left">
+		<item quantity="zero">تبقت أقل من دقيقة</item>
+		<item quantity="one">تبقت دقيقة</item>
+		<item quantity="two">تبقت دقيقتان</item>
+		<item quantity="few">تبقت %d دقائق</item>
+		<item quantity="many">تبقت %d دقيقة</item>
+		<item quantity="other">تبقت %d دقيقة</item>
+	</plurals>
+	<plurals name="x_hours_left">
+		<item quantity="zero">تبقت أقل من ساعة</item>
+		<item quantity="one">تبقت ساعة واحدة</item>
+		<item quantity="two">تبقت ساعتان</item>
+		<item quantity="few">تبقت %d ساعات</item>
+		<item quantity="many">تبقت %d ساعة</item>
+		<item quantity="other">تبقت %d ساعة</item>
+	</plurals>
+	<plurals name="x_days_left">
+		<item quantity="zero">تبقى أقل من يوم</item>
+		<item quantity="one">تبقى يوم واحد</item>
+		<item quantity="two">تبقى يومان</item>
+		<item quantity="few">تبقى %d أيام</item>
+		<item quantity="many">تبقى %d يومًا</item>
+		<item quantity="other">تبقى %d يوم</item>
+	</plurals>
+	<plurals name="x_voters">
+		<item quantity="zero">لا يوجد مصوتون</item>
+		<item quantity="one">مصوت واحد</item>
+		<item quantity="two">مصوتان</item>
+		<item quantity="few">%,d مصوتين</item>
+		<item quantity="many">%,d مصوتًا</item>
+		<item quantity="other">%,d مصوت</item>
+	</plurals>
+	<string name="poll_closed">انتهى</string>
+	<string name="confirm_mute_title">اكتم الحساب</string>
+	<string name="confirm_mute">أكّد كتم %s</string>
+	<string name="do_mute">اكتم</string>
+	<string name="confirm_unmute_title">ارفع الكتم عن الحساب</string>
+	<string name="confirm_unmute">أكِّد رفع الكتم عن %s</string>
+	<string name="do_unmute">ارفع الكتم</string>
+	<string name="confirm_block_title">احجب الحساب</string>
+	<string name="confirm_block_domain_title">احجب النطاق</string>
+	<string name="confirm_block">أكّد حجب %s</string>
+	<string name="do_block">احجب</string>
+	<string name="confirm_unblock_title">ارفع الحجب عن الحساب</string>
+	<string name="confirm_unblock_domain_title">ارفع الحجب عن النطاق</string>
+	<string name="confirm_unblock">أكّد رفع الحجب عن %s</string>
+	<string name="do_unblock">ارفع الحجب</string>
+	<string name="button_muted">مَكتوم</string>
+	<string name="button_blocked">محجوب</string>
+	<string name="action_vote">صَوّت</string>
+	<string name="tap_to_reveal">اُنقُر لِلكَشف</string>
+	<string name="delete">احذف</string>
+	<string name="confirm_delete_title">احذف المنشور</string>
+	<string name="confirm_delete">أمتأكد من حذف هذا المنشور؟</string>
+	<string name="deleting">يحذف…</string>
+	<string name="notification_channel_audio_player">تشغيل الصوت</string>
+	<string name="play">شغّل</string>
+	<string name="pause">ألبث</string>
+	<string name="log_out">خروج</string>
+	<string name="add_account">أضف حساباً</string>
+	<string name="search_hint">ابحث</string>
+	<string name="hashtags">وُسُوم</string>
+	<string name="news">الأخبار</string>
+	<string name="for_you">لأجلك</string>
+	<string name="all_notifications">الكل</string>
+	<string name="mentions">الذِكر</string>
+	<plurals name="x_people_talking">
+		<item quantity="zero">لا أحد يتحدث</item>
+		<item quantity="one">شخص واحد يتحدث</item>
+		<item quantity="two">شخصان يتحدثان</item>
+		<item quantity="few">%d أشخاص يتحدثون</item>
+		<item quantity="many">%d شخصًا يتحدثون</item>
+		<item quantity="other">%d شخص يتحدثون</item>
+	</plurals>
+	<plurals name="discussed_x_times">
+		<item quantity="zero">لم يُناقش</item>
+		<item quantity="one">نوقش مرة واحدة</item>
+		<item quantity="two">نوقش مرتين</item>
+		<item quantity="few">نوقش %d مرات</item>
+		<item quantity="many">نوقش %d مرة</item>
+		<item quantity="other">نوقش %d مرة</item>
+	</plurals>
+	<string name="report_title">بلّغ عن %s</string>
+	<string name="report_choose_reason">ما هي المشكلة في هذا المنشور؟</string>
+	<string name="report_choose_reason_account">ما هي المشكلة مع %s؟</string>
+	<string name="report_choose_reason_subtitle">اختر أفضل تطابق</string>
+	<string name="report_reason_personal">لا يعجبني</string>
+	<string name="report_reason_personal_subtitle">ألا ترغب برؤيته</string>
+	<string name="report_reason_spam">إزعاج</string>
+	<string name="report_reason_spam_subtitle">روابط خبيثة أو تفاعل كاذب أو ردود متكررة</string>
+	<string name="report_reason_violation">ينتهك قواعد الخادم</string>
+	<string name="report_reason_violation_subtitle">تعلم أنه ينتهك قواعد محددة</string>
+	<string name="report_reason_other">شيء آخر</string>
+	<string name="report_reason_other_subtitle">لا تندرج هذه المشكلة ضمن فئات أخرى</string>
+	<string name="report_choose_rule">ما هي القواعد المنتهكة؟</string>
+	<string name="report_choose_rule_subtitle">اختر كل ما ينطبق</string>
+	<string name="report_choose_posts">هل توجد منشورات تدعم صحة هذا البلاغ؟</string>
+	<string name="report_choose_posts_subtitle">اختر كل ما ينطبق</string>
+	<string name="report_comment_title">هل لديك شيء آخر لتخبرنا به؟</string>
+	<string name="report_comment_hint">تعليقات إضافية</string>
+	<string name="sending_report">يرسل البلاغ…</string>
+	<string name="report_sent_title">شُكرًا لَكَ على التبليغ، سَنَنظُرُ فِي هَذَا الأمر.</string>
+	<string name="report_sent_subtitle">في أثناء مراجعتنا للبلاغ، يمكنك اتخاذ إجراء ضد @%s.</string>
+	<string name="unfollow_user">ألغ متابعة %s</string>
+	<string name="unfollow">ألغ المتابعة</string>
+	<string name="mute_user_explain">لن ترى منشوراتهم أو إعادة تدوينهم في التغذية الرئيسية. ولن يعلموا أنهم كتموا.</string>
+	<string name="block_user_explain">لن يتمكنوا من متابعتك أو رؤية منشوراتك، وسيكون بديهيًا لهم أنهم حجبوا.</string>
+	<string name="report_personal_title">لاترغب في مشاهدة هذا؟</string>
+	<string name="report_personal_subtitle">عندما ترى ما لا يعجبك في ماستدون، يمكنك إزالة صاحبها من تجربتك كمستخدم.</string>
+	<string name="back">العودة</string>
+	<string name="instance_catalog_title">ماستدون مكون من مستخدمين منقسمين عبر خوادم مختلفة.</string>
+	<string name="instance_catalog_subtitle">اختر خادمًا بناءً على اهتماماتك، منطقتك أو يمكنك حتى اختيارُ مجتمعٍ ذي غرضٍ عام. وسيضل بامكانك التواصل مع المستخدمين من الخوادم الأخرى.</string>
+	<string name="search_communities">ابحث عن خادم أو أدخل رابطه</string>
+	<string name="instance_rules_title">بعض القواعد الأساسية</string>
+	<string name="instance_rules_subtitle">خذ دقيقة لمراجعة القواعد التي حددها وفرضها مديروا %s.</string>
+	<string name="signup_title">دعنا نجهزك في %s</string>
+	<string name="edit_photo">حرّر</string>
+	<string name="display_name">الاسم العلني</string>
+	<string name="username">اسم المستخدم</string>
+	<string name="email">البريد الإلكتروني</string>
+	<string name="password">كلمة المرور</string>
+	<string name="password_note">ضمّن الأحرف الكبيرة والأحرف الخاصة والأرقام لزيادة قوة كلمة المرور.</string>
+	<string name="category_academia">أكاديمي</string>
+	<string name="category_activism">النشطاء</string>
+	<string name="category_all">الكل</string>
+	<string name="category_art">فنون</string>
+	<string name="category_food">طعام</string>
+	<string name="category_furry">حيوان ذو فرو</string>
+	<string name="category_games">ألعاب</string>
+	<string name="category_general">عام</string>
+	<string name="category_journalism">صحافة</string>
+	<string name="category_lgbt">LGBT</string>
+	<string name="category_music">موسيقى</string>
+	<string name="category_regional">إقليمي</string>
+	<string name="category_tech">تقني</string>
+	<string name="confirm_email_title">شيءٌ أخير</string>
+	<string name="confirm_email_subtitle">أنقر على الرابط المرسل إليك لاستيثاق حسابك.</string>
+	<string name="resend">أعد الإرسال</string>
+	<string name="open_email_app">افتح تطبيق البريد الإلكتروني</string>
+	<string name="resent_email">أُرسلت رسالة التأكيد</string>
+	<string name="compose_hint">عَبِّر عَمَّ يَجُولُ فِي ذِهنِك</string>
+	<string name="content_warning">تحذير من المحتوى</string>
+	<string name="add_image_description">أضف وصفًا للصورة…</string>
+	<string name="retry_upload">حاول الرفع مجددًا</string>
+	<string name="image_upload_failed">فشل رفع الصورة</string>
+	<string name="video_upload_failed">فشل رفع الفيديو</string>
+	<string name="edit_image">حرّر الصورة</string>
+	<string name="save">احفظ</string>
+	<string name="add_alt_text">أضف نصًا بديلًا</string>
+	<string name="alt_text_subtitle">يصف النص البديل محتوى الصور للمكفوفين وضعاف البصر. حاول تضمين أكبر قدر ممكن من التفاصيل ليفهموا السياق.</string>
+	<string name="alt_text_hint">مثال: كلب ينظر حوله بارتياب وعيناه مثبتتان على الكاميرا.</string>
+	<string name="visibility_public">علني</string>
+	<string name="visibility_followers_only">للمُتابِعينَ فقط</string>
+	<string name="visibility_private">لمن ذكرتُهم فقط</string>
+	<string name="search_all">الكل</string>
+	<string name="search_people">أشخاص</string>
+	<string name="recent_searches">عَمَليَّاُت البَحثِ الأخيرَة</string>
+	<string name="step_x_of_n">الخطوة %1$d من %2$d</string>
+	<string name="skip">تخطى</string>
+	<string name="notification_type_follow">متابعُون جُدُد</string>
+	<string name="notification_type_favorite">المفضلة</string>
+	<string name="notification_type_mention">الذِكر</string>
+	<string name="notification_type_poll">استطلاع رأي</string>
+	<string name="choose_account">اختر حسابًا</string>
+	<string name="err_not_logged_in">سجل الدخول إلى حساب ماستودون أولًا</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="zero">يجب عليك إرفاق ملف</item>
+		<item quantity="one">لا يمكنك إرفاق ملف</item>
+		<item quantity="two">لا يمكنك إرفاق أكثر من ملفين</item>
+		<item quantity="few">لا يمكنك إرفاق أكثر من %d ملفات</item>
+		<item quantity="many">لا يمكنك إرفاق أكثر من %d ملفًا</item>
+		<item quantity="other">لا يمكنك إرفاق أكثر من %d ملف</item>
+	</plurals>
+	<string name="media_attachment_unsupported_type">نوع الملف %s غير مدعوم</string>
+	<string name="media_attachment_too_big">الملف %1$s يتجاوز حدّ %2$s مب</string>
+	<string name="settings_theme">المظهر</string>
+	<string name="theme_auto">تلقائي</string>
+	<string name="theme_light">فاتح</string>
+	<string name="theme_dark">داكن</string>
+	<string name="theme_true_black">الوضع الداكن الحقيقي</string>
+	<string name="settings_behavior">السلوك</string>
+	<string name="settings_gif">تشغيل الصور الرمزية المتحركة والرموز التعبيرية المتحركة</string>
+	<string name="settings_custom_tabs">استخدم المتصفح المضمن</string>
+	<string name="settings_notifications">الإشعارات</string>
+	<string name="notify_me_when">أشعِرني بـ</string>
+	<string name="notify_anyone">أيُّ شخصٍ</string>
+	<string name="notify_follower">مُتابِعٌ</string>
+	<string name="notify_followed">شخص أُتابِعُه</string>
+	<string name="notify_none">لَا أحد</string>
+	<string name="notify_favorites">بِالإعْجاب بِمَنشوري</string>
+	<string name="notify_follow">متابعتي</string>
+	<string name="notify_reblog">إعادة تدوين مَنشوري</string>
+	<string name="notify_mention">ذكرني</string>
+	<string name="settings_boring">المنطِقَةُ المُملَّة</string>
+	<string name="settings_account">إعدادات الحساب</string>
+	<string name="settings_contribute">ساهم في ماستدون</string>
+	<string name="settings_tos">شروط الخدمة</string>
+	<string name="settings_privacy_policy">سياسة الخصوصية</string>
+	<string name="settings_spicy">المنطِقَةُ اللَّاذِعَة</string>
+	<string name="settings_clear_cache">امسح التخزين المؤقت للوسائط</string>
+	<string name="settings_app_version">تطبيق ماستودون لأندرويد نسخة %1$s (%2$d)</string>
+	<string name="media_cache_cleared">مُسح التخزين المؤقت للوسائط</string>
+	<string name="confirm_log_out">أمتأكد من الخروج؟</string>
+	<string name="sensitive_content">محتوى حساس</string>
+	<string name="sensitive_content_explain">علّم المؤلف هته الوسائط كحساسة. اضغط لكشفها.</string>
+	<string name="media_hidden">اُنقُر لِلكَشف</string>
+	<string name="avatar_description">انتقل للصفحة الشخصية لـ %s</string>
+	<string name="more_options">مزيد من الخيارات</string>
+	<string name="reveal_content">اكشف المحتوى</string>
+	<string name="hide_content">اخف المحتوى</string>
+	<string name="new_post">منشور جديد</string>
+	<string name="button_reply">ردّ</string>
+	<string name="button_reblog">أعد تدوين</string>
+	<string name="button_favorite">فضّل</string>
+	<string name="button_share">شارك</string>
+	<string name="media_no_description">وسائط بدون وصف</string>
+	<string name="add_media">أضف وسائط</string>
+	<string name="add_poll">أضف استطلاع رأي</string>
+	<string name="emoji">إيموجي</string>
+	<string name="post_visibility">مرئية المنشور</string>
+	<string name="home_timeline">الخيط الزمني الرئيسي</string>
+	<string name="my_profile">ملفي الشخصي</string>
+	<string name="media_viewer">عارض الوسائط</string>
+	<string name="follow_user">تابع %s</string>
+	<string name="unfollowed_user">ألغ متابعة %s</string>
+	<string name="followed_user">أنت تتابع %s</string>
+	<string name="open_in_browser">افتح في المتصفح</string>
+	<string name="signup_reason">لماذا ترغب في الانضمام؟</string>
+	<string name="signup_reason_note">هذا سوف يساعدنا في مراجعة تطبيقك.</string>
+	<string name="clear">امسح</string>
+	<string name="profile_header">الصورة الفوقية</string>
+	<string name="profile_picture">صورة الملفّ الشخصي</string>
+	<string name="reorder">أعد الترتيب</string>
+	<string name="download">نزّل</string>
+	<string name="permission_required">يتطلب أذونات</string>
+	<string name="storage_permission_to_download">يحتاج هذا التطبيق أذن الوصول للتخزين لحفظ الملف.</string>
+	<string name="open_settings">افتح الإعدادات</string>
+	<string name="error_saving_file">خطأ أثناء حفظ الملف</string>
+	<string name="file_saved">حُفظ الملف</string>
+	<string name="downloading">ينزّل…</string>
+	<string name="no_app_to_handle_action">لا يوجد تطبيق لمعالجة هذا الإجراء</string>
+	<string name="local_timeline">المجتمع</string>
+	<string name="trending_posts_info_banner">هَذِهِ هِيَ المَنشُوراتُ الَّتي تَكْتَسِبُ شَعبِيَّةً فِي الرُّكنِ الخاصِّ بِكَ مِن مَاستودُون.</string>
+	<string name="trending_hashtags_info_banner">هَذِهِ هِيَ الوُسُومُ الَّتي تَكْتَسِبُ شَعبِيَّةً فِي الرُّكنِ الخاصِّ بِكَ مِن مَاستودُون.</string>
+	<string name="trending_links_info_banner">هَذِهِ هِيَ القِصَصُ الأخبارِيَّةُ المُتَنَاقَلَةُ بِكِثرَةٍ فِي الرُّكنِ الخاصِّ بِكَ مِن مَاستودُون.</string>
+	<string name="local_timeline_info_banner">هذه هي أحدث منشورات المستخدمين المتواجدين على نفس الخادم الذي تستخدمه.</string>
+	<string name="dismiss">رفض</string>
+	<string name="see_new_posts">استعرض المنشورات الجديدة</string>
+	<string name="load_missing_posts">حمّل المَنشورات المَفقودَة</string>
+	<string name="follow_back">رُدّ المتابعة</string>
+	<string name="button_follow_pending">معلق</string>
+	<string name="follows_you">يُتابِعُك</string>
+	<string name="manually_approves_followers">الموافقة اليدوية على طلبات المتابعة</string>
+	<string name="current_account">الحِسابُ الحاليّ</string>
+	<string name="log_out_account">تَسجيلُ الخُرُوجِ مِن %s</string>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<plurals name="x_followers">
+		<item quantity="zero">ليس له متابِعون</item>
+		<item quantity="one">متابِع واحد</item>
+		<item quantity="two">متابِعان</item>
+		<item quantity="few">%,d متابِعين</item>
+		<item quantity="many">%,d متابِعًا</item>
+		<item quantity="other">%,d متابِع</item>
+	</plurals>
+	<plurals name="x_following">
+		<item quantity="zero">ليس له متابَعون</item>
+		<item quantity="one">متابَع واحد</item>
+		<item quantity="two">متابَعان</item>
+		<item quantity="few">%,d متابَعين</item>
+		<item quantity="many">%,d متابَعًا</item>
+		<item quantity="other">%,d متابَع</item>
+	</plurals>
+</resources>

mastodon/src/main/res/values-bs-rBA/strings.xml

@@ -10,13 +10,10 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Pripremamo autorizaciju…</string>
 	<string name="finishing_auth">Završavamo autorizaciju…</string>
-	<string name="user_boosted">%s dijeljeno</string>
 	<string name="in_reply_to">Odgovor za %s</string>
 	<string name="notifications">Obavijesti</string>
 	<string name="user_followed_you">vas prati</string>
 	<string name="user_sent_follow_request">poslao/la zahtjev za prijateljstvo</string>
-	<string name="user_favorited">se svidja vaša objava</string>
-	<string name="notification_boosted">objavio/la vašu objavu</string>
 	<string name="poll_ended">anketa je završena</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -135,9 +132,6 @@
 	<string name="report_personal_title">Ne želite ovo vidjeti?</string>
 	<string name="report_personal_subtitle">Kada vidite nešto nepoželjno na Mastodon-u, možete blokirati odredjeni profil.</string>
 	<string name="back">Nazad</string>
-	<string name="instance_catalog_title">Mastodon sačinjava mnogo korisnika na više različitih platformi.</string>
-	<string name="instance_catalog_subtitle">Odaberite platformu / zajednicu baziranu na vašim interesima, regionu ili neku sa generalnim sadržajem. Možete se povezati sa bilo kim, bez obzira na kojoj platformi su oni.</string>
-	<string name="search_communities">Pretražite platforme / zajednice ili unesite URL / link</string>
 	<string name="instance_rules_title">Važna pravila</string>
 	<string name="instance_rules_subtitle">Pogledajte pravila koja je odredila %s administracija.</string>
 	<string name="signup_title">Krenimo sa postavkama na %s</string>
@@ -186,7 +180,6 @@
 	<string name="skip">Preskoči</string>
 	<string name="notification_type_follow">Novi pratioci</string>
 	<string name="notification_type_favorite">Favoriti</string>
-	<string name="notification_type_reblog">Re-objave</string>
 	<string name="notification_type_mention">Spominjanja</string>
 	<string name="notification_type_poll">Ankete</string>
 	<string name="choose_account">Odaberi račun</string>
@@ -250,8 +243,6 @@
 	<string name="unfollowed_user">Ne pratite %s</string>
 	<string name="followed_user">Sada pratite %s</string>
 	<string name="open_in_browser">Otvori u pregledniku</string>
-	<string name="hide_boosts_from_user">Sakrij re-objave od %s</string>
-	<string name="show_boosts_from_user">Vidi re-objave od %s</string>
 	<string name="signup_reason">zašto se želite pridružiti?</string>
 	<string name="signup_reason_note">Ovo nam pomaže prilikom odobravanja vašeg zahtjeva.</string>
 	<string name="clear">Briši</string>
@@ -265,4 +256,5 @@
 	<string name="error_saving_file">Greška prilikom procesiranja</string>
 	<string name="file_saved">Datoteka sačuvana</string>
 	<string name="downloading">Downloading…</string>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 </resources>

mastodon/src/main/res/values-ca-rES/strings.xml

@@ -10,13 +10,10 @@
 	<string name="ok">D\'acord</string>
 	<string name="preparing_auth">Preparant a l\'autenticació…</string>
 	<string name="finishing_auth">Finalitzant autentificació…</string>
-	<string name="user_boosted">%s ha impulsat</string>
 	<string name="in_reply_to">En resposta a %s</string>
 	<string name="notifications">Notificacions</string>
 	<string name="user_followed_you">t\'ha començat a seguir</string>
 	<string name="user_sent_follow_request">t\'ha enviat una sol·licitud de seguiment</string>
-	<string name="user_favorited">ha afavorit la teva publicació</string>
-	<string name="notification_boosted">ha impulsat la teva publicació</string>
 	<string name="poll_ended">l\'enquesta ha finalitzat</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -171,9 +168,6 @@
 	<string name="report_personal_title">No vols veure això?</string>
 	<string name="report_personal_subtitle">Quan veus alguna cosa que no t\'agrada a Mastodon, pots eliminar la persona de la vostra experiència.</string>
 	<string name="back">Enrere</string>
-	<string name="instance_catalog_title">Mastodon està format per usuaris de diferents comunitats.</string>
-	<string name="instance_catalog_subtitle">Tria una comunitat en funció dels teus interessos, regió o una de propòsit general. Seguiràs podent connectar amb tothom, independentment de la comunitat.</string>
-	<string name="search_communities">Cerca comunitats o introdueix l\'URL</string>
 	<string name="instance_rules_title">Algunes normes bàsiques</string>
 	<string name="instance_rules_subtitle">Pren un minut per revisar les normes establertes i aplicades pels administradors de %s.</string>
 	<string name="signup_title">Deixa que et posem en marxa a %s</string>
@@ -222,7 +216,6 @@
 	<string name="skip">Ometre</string>
 	<string name="notification_type_follow">Nous seguidors</string>
 	<string name="notification_type_favorite">Preferits</string>
-	<string name="notification_type_reblog">Impulsos</string>
 	<string name="notification_type_mention">Mencions</string>
 	<string name="notification_type_poll">Enquestes</string>
 	<string name="choose_account">Seleccionar compte</string>
@@ -285,8 +278,6 @@
 	<string name="unfollowed_user">S\'ha deixat de seguir %s</string>
 	<string name="followed_user">Ara estàs seguint %s</string>
 	<string name="open_in_browser">Obrir al navegador</string>
-	<string name="hide_boosts_from_user">Amagar els impulsos de %s</string>
-	<string name="show_boosts_from_user">Mostrar els impulsos de %s</string>
 	<string name="signup_reason">per què vols unir-te?</string>
 	<string name="signup_reason_note">Això ens ajudarà a revisar la teva petició.</string>
 	<string name="clear">Netejar</string>
@@ -300,4 +291,12 @@
 	<string name="error_saving_file">Error en desar el fitxer</string>
 	<string name="file_saved">Fitxer desat</string>
 	<string name="downloading">Descarregant…</string>
+	<string name="no_app_to_handle_action">No hi ha cap aplicació que gestioni aquesta acció</string>
+	<string name="local_timeline">Comunitat</string>
+	<string name="trending_posts_info_banner">Aquestes son les publicacions que criden l\'atenció en el teu racó de Mastodon.</string>
+	<string name="trending_hashtags_info_banner">Aquests són els hashtags que criden l\'atenció en el teu racó de Mastodon.</string>
+	<string name="trending_links_info_banner">Aquestes són les notícies que més es comparteixen en el teu racó de Mastodon.</string>
+	<string name="local_timeline_info_banner">Aquestes són les publicacions més recents de les persones que utilitzen el mateix servidor Mastodon que tu.</string>
+	<string name="dismiss">Ometre</string>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 </resources>

mastodon/src/main/res/values-de-rDE/strings.xml

@@ -10,13 +10,13 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Bereite Authentifizierung vor…</string>
 	<string name="finishing_auth">Authentifizierung erfolgt…</string>
-	<string name="user_boosted">%s hat geteilt</string>
+	<string name="user_boosted">%s teilte</string>
 	<string name="in_reply_to">Antwort auf %s</string>
 	<string name="notifications">Benachrichtigungen</string>
 	<string name="user_followed_you">ist dir gefolgt</string>
 	<string name="user_sent_follow_request">hat dir eine Folgeanfrage gesendet</string>
-	<string name="user_favorited">favorisierte deinen Beitrag</string>
-	<string name="notification_boosted">teilte deinen Beitrag</string>
+	<string name="user_favorited">hat deinen Beitrag favorisiert</string>
+	<string name="notification_boosted">hat deinen Beitrag geteilt</string>
 	<string name="poll_ended">Abstimmung beendet</string>
 	<string name="time_seconds">%dSek.</string>
 	<string name="time_minutes">%dMin.</string>
@@ -42,6 +42,7 @@
 	</plurals>
 	<string name="posts">Beiträge</string>
 	<string name="posts_and_replies">Beiträge und Antworten</string>
+	<string name="pinned_posts">Angeheftet</string>
 	<string name="media">Medien</string>
 	<string name="profile_about">Über</string>
 	<string name="button_follow">Folgen</string>
@@ -124,6 +125,14 @@
 	<string name="confirm_delete_title">Beitrag löschen</string>
 	<string name="confirm_delete">Bist du dir sicher, dass du den Beitrag löschen möchtest?</string>
 	<string name="deleting">Wird gelöscht…</string>
+	<string name="pin_post">An Profil anheften</string>
+	<string name="confirm_pin_post_title">Beitrag an Profil anheften</string>
+	<string name="confirm_pin_post">Möchtest du den Beitrag an dein Profil anheften?</string>
+	<string name="pinning">Wird angeheftet…</string>
+	<string name="unpin_post">Von Profil lösen</string>
+	<string name="confirm_unpin_post_title">Angehefteten Beitrag von Profil lösen</string>
+	<string name="confirm_unpin_post">Bist du dir sicher, dass du den angehefteten Beitrag von deinem Profil lösen möchtest?</string>
+	<string name="unpinning">Wird vom Profil gelöst…</string>
 	<string name="notification_channel_audio_player">Audiowiedergabe</string>
 	<string name="play">Abspielen</string>
 	<string name="pause">Pausieren</string>
@@ -171,9 +180,9 @@
 	<string name="report_personal_title">Du willst das nicht mehr sehen?</string>
 	<string name="report_personal_subtitle">Wenn du etwas auf Mastodon nicht sehen willst, kannst du den Nutzer aus deiner Erfahrung streichen.</string>
 	<string name="back">Zurück</string>
-	<string name="instance_catalog_title">Mastodon besteht aus Benutzern in verschiedenen Communities.</string>
-	<string name="instance_catalog_subtitle">Wähle eine Community basierend auf deinen Interessen, deiner Region oder für allgemeine Zwecke aus. Du kannst dich immer noch mit allen verbinden, unabhängig von der Community.</string>
-	<string name="search_communities">Suche nach einer Community oder gib eine URL ein</string>
+	<string name="instance_catalog_title">Mastodon besteht aus Benutzern auf verschiedenen Servern.</string>
+	<string name="instance_catalog_subtitle">Wähle einen Server basierend auf deinen Interessen, deiner Region oder einen Allgemeinen. Du kannst trotzdem mit jedem Interagieren, egal auf welchem Server.</string>
+	<string name="search_communities">Nach Server suchen oder URL eingeben</string>
 	<string name="instance_rules_title">Hier ein paar Regeln</string>
 	<string name="instance_rules_subtitle">Nimm dir eine Minute Zeit und gehe kurz durch alle Regeln durch, die %s machen.</string>
 	<string name="signup_title">Okay, lass uns mit %s anfangen</string>
@@ -203,6 +212,7 @@
 	<string name="resent_email">Bestätigungs-E-Mail gesendet</string>
 	<string name="compose_hint">Was gibt\'s Neues?</string>
 	<string name="content_warning">Inhaltswarnung</string>
+	<string name="image_description">Bildbeschreibung</string>
 	<string name="add_image_description">Füge eine Bildbeschreibung hinzu…</string>
 	<string name="retry_upload">Upload erneut versuchen</string>
 	<string name="image_upload_failed">Fehler beim Hochladen des Bildes</string>
@@ -223,7 +233,7 @@
 	<string name="skip">Überspringen</string>
 	<string name="notification_type_follow">Neue Follower</string>
 	<string name="notification_type_favorite">Favoriten</string>
-	<string name="notification_type_reblog">Geteilte Beiträge</string>
+	<string name="notification_type_reblog">Teilungen</string>
 	<string name="notification_type_mention">Erwähnungen</string>
 	<string name="notification_type_poll">Umfragen</string>
 	<string name="choose_account">Konto auswählen</string>
@@ -286,8 +296,8 @@
 	<string name="unfollowed_user">%s entfolgt</string>
 	<string name="followed_user">Du folgst nun %s</string>
 	<string name="open_in_browser">Im Browser öffnen</string>
-	<string name="hide_boosts_from_user">Verstecke Boosts von %s</string>
-	<string name="show_boosts_from_user">Zeige Boosts von %s</string>
+	<string name="hide_boosts_from_user">Verstecke Teilungen von %s</string>
+	<string name="show_boosts_from_user">Zeige Teilungen von %s</string>
 	<string name="signup_reason">Warum möchtest du beitreten?</string>
 	<string name="signup_reason_note">Dies wird uns dabei helfen, deine Anmeldungsanfrage besser zu verarbeiten.</string>
 	<string name="clear">Löschen</string>
@@ -301,4 +311,36 @@
 	<string name="error_saving_file">Fehler beim Speichern der Datei</string>
 	<string name="file_saved">Datei gespeichert</string>
 	<string name="downloading">Herunterladen…</string>
+	<string name="no_app_to_handle_action">Es gibt keine App, um diese Aktion auszuführen</string>
+	<string name="local_timeline">Community</string>
+	<string name="trending_posts_info_banner">Dies sind die Beiträge, die in deiner Mastodon-Bubble beliebter werden.</string>
+	<string name="trending_hashtags_info_banner">Dies sind die Hashtags in deiner Mastodon-Bubble.</string>
+	<string name="trending_links_info_banner">Dies sind die Nachrichten, die am meisten in deiner Mastodon-Bubble geteilt werden.</string>
+	<string name="local_timeline_info_banner">Dies sind die neuesten Beiträge der Leute, die den gleichen Mastodon-Server verwenden wie du.</string>
+	<string name="dismiss">Verwerfen</string>
+	<string name="see_new_posts">Neue Beiträge anzeigen</string>
+	<string name="load_missing_posts">Fehlende Beiträge Laden</string>
+	<string name="follow_back">Zurück folgen</string>
+	<string name="button_follow_pending">Ausstehend</string>
+	<string name="follows_you">Folgt dir</string>
+	<string name="manually_approves_followers">Genehmigt Folgende manuell</string>
+	<string name="current_account">Aktuelles Konto</string>
+	<string name="log_out_account">%s ausloggen</string>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<plurals name="x_followers">
+		<item quantity="one">%,d Follower</item>
+		<item quantity="other">%,d Follower</item>
+	</plurals>
+	<plurals name="x_following">
+		<item quantity="one">%,d Gefolgt</item>
+		<item quantity="other">%,d Gefolgt</item>
+	</plurals>
+	<plurals name="x_favorites">
+		<item quantity="one">%,d Favorit</item>
+		<item quantity="other">%,d Favoriten</item>
+	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d Reblog</item>
+		<item quantity="other">%,d Reblogs</item>
+	</plurals>
 </resources>

mastodon/src/main/res/values-el-rGR/strings.xml

@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+</resources>

mastodon/src/main/res/values-es-rES/strings.xml

@@ -10,13 +10,10 @@
 	<string name="ok">Aceptar</string>
 	<string name="preparing_auth">Preparando para autenticación…</string>
 	<string name="finishing_auth">Terminando autenticación…</string>
-	<string name="user_boosted">%s impulsó</string>
 	<string name="in_reply_to">En respuesta a %s</string>
 	<string name="notifications">Notificaciones</string>
 	<string name="user_followed_you">te siguió</string>
 	<string name="user_sent_follow_request">te quiere seguir</string>
-	<string name="user_favorited">ha marcado como favorita tu publicación</string>
-	<string name="notification_boosted">ha impulsado tu publicación</string>
 	<string name="poll_ended">encuesta finalizada</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -171,9 +168,6 @@
 	<string name="report_personal_title">¿No quieres ver esto?</string>
 	<string name="report_personal_subtitle">Cuando veas algo que no te gusta en Mastodon, puedes quitar a la persona de tu experiencia.</string>
 	<string name="back">Atrás</string>
-	<string name="instance_catalog_title">Mastodon está compuesto de usuarios de diferentes comunidades.</string>
-	<string name="instance_catalog_subtitle">Escoge una comunidad basada en tus intereses, región o propósito general. Aún así podrás conectar con todo el mundo, independientemente de la comunidad.</string>
-	<string name="search_communities">Buscar comunidades o introducir URL</string>
 	<string name="instance_rules_title">Algunas reglas básicas</string>
 	<string name="instance_rules_subtitle">Tómate un minuto para revisar las reglas establecidas y aplicadas por las personas que administran %s.</string>
 	<string name="signup_title">Deja que te preparemos en %s</string>
@@ -222,7 +216,6 @@
 	<string name="skip">Saltar</string>
 	<string name="notification_type_follow">Nuevos seguidores</string>
 	<string name="notification_type_favorite">Favoritos</string>
-	<string name="notification_type_reblog">Impulsos</string>
 	<string name="notification_type_mention">Menciones</string>
 	<string name="notification_type_poll">Encuestas</string>
 	<string name="choose_account">Elegir cuenta</string>
@@ -285,8 +278,6 @@
 	<string name="unfollowed_user">No sigues a %s</string>
 	<string name="followed_user">Ahora estás siguiendo a %s</string>
 	<string name="open_in_browser">Abrir en el navegador</string>
-	<string name="hide_boosts_from_user">Ocultar impulsos de %s</string>
-	<string name="show_boosts_from_user">Mostrar impulsos de %s</string>
 	<string name="signup_reason">¿por qué quieres unirte?</string>
 	<string name="signup_reason_note">Esto nos ayudará a revisar su solicitud.</string>
 	<string name="clear">Borrar</string>
@@ -300,4 +291,5 @@
 	<string name="error_saving_file">Error al guardar el archivo</string>
 	<string name="file_saved">Archivo guardado</string>
 	<string name="downloading">Descargando…</string>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 </resources>

mastodon/src/main/res/values-eu-rES/strings.xml

@@ -10,13 +10,10 @@
 	<string name="ok">Ados</string>
 	<string name="preparing_auth">Autentifikaziorako prestatzen…</string>
 	<string name="finishing_auth">Autentikazioa bukatzen…</string>
-	<string name="user_boosted">%s(e)k bultzatu du</string>
 	<string name="in_reply_to">%s-(r)i erantzunez</string>
 	<string name="notifications">Jakinarazpenak</string>
 	<string name="user_followed_you">jarraitu zaitu</string>
 	<string name="user_sent_follow_request">jarraitzeko eskaera bidali dizu</string>
-	<string name="user_favorited">zure mezua gogoko du</string>
-	<string name="notification_boosted">zure tuta bultza du</string>
 	<string name="poll_ended">inkesta amaitu da</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -160,8 +157,6 @@
 	<string name="unfollow">Utzi jarraitzeari</string>
 	<string name="report_personal_title">Ez duzu hau ikusi nahi?</string>
 	<string name="back">Atzera</string>
-	<string name="instance_catalog_title">Mastodon komunitate ezberdinetako erabiltzaileez egina dago.</string>
-	<string name="search_communities">Buscar comunidades o ingresar URL</string>
 	<string name="instance_rules_title">Oinarrizko arau batzuk</string>
 	<string name="edit_photo">editatu</string>
 	<string name="display_name">pantaila-izena</string>
@@ -204,7 +199,6 @@
 	<string name="skip">Saltatu</string>
 	<string name="notification_type_follow">Jarraitzaile berriak</string>
 	<string name="notification_type_favorite">Gogokoak</string>
-	<string name="notification_type_reblog">Bultzadak</string>
 	<string name="notification_type_mention">Aipamenak</string>
 	<string name="notification_type_poll">Inkestak</string>
 	<string name="choose_account">Aukeratu kontua</string>
@@ -251,8 +245,6 @@
 	<string name="follow_user">Jarraitu %s</string>
 	<string name="unfollowed_user">Utzi %s jarraitzeari</string>
 	<string name="open_in_browser">Ireki nabigatzailean</string>
-	<string name="hide_boosts_from_user">Ezkutatu @%s(r)en bultzadak</string>
-	<string name="show_boosts_from_user">Erakutsi @%s(r)en bultzadak</string>
 	<string name="signup_reason">zergatik elkartu nahi duzu?</string>
 	<string name="signup_reason_note">Honek zure eskaera berrikustean lagunduko digu.</string>
 	<string name="clear">Garbitu</string>
@@ -266,4 +258,5 @@
 	<string name="error_saving_file">Errorea fitxategia gordetzerakoan</string>
 	<string name="file_saved">Fitxategia gorde da</string>
 	<string name="downloading">Jeisten…</string>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 </resources>

mastodon/src/main/res/values-fi-rFI/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+</resources>

mastodon/src/main/res/values-fr-rFR/strings.xml

@@ -10,13 +10,10 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Préparation à l’authentification…</string>
 	<string name="finishing_auth">Fin de l’authentification…</string>
-	<string name="user_boosted">%s a partagé</string>
 	<string name="in_reply_to">En réponse à %s</string>
 	<string name="notifications">Notifications</string>
 	<string name="user_followed_you">s’est abonné à vous</string>
 	<string name="user_sent_follow_request">vous a envoyé une demande de suivi</string>
-	<string name="user_favorited">a mis votre pouet en favori</string>
-	<string name="notification_boosted">a partagé votre pouet</string>
 	<string name="poll_ended">sondage terminé</string>
 	<string name="time_seconds">%d s</string>
 	<string name="time_minutes">%d m</string>
@@ -98,8 +95,8 @@
 		<item quantity="other">%d jours restants</item>
 	</plurals>
 	<plurals name="x_voters">
-		<item quantity="one">%,d votant</item>
-		<item quantity="other">%,d votants</item>
+		<item quantity="one">%,d personne a voté</item>
+		<item quantity="other">%,d personnes ont voté</item>
 	</plurals>
 	<string name="poll_closed">Fermé</string>
 	<string name="confirm_mute_title">Masquer le compte</string>
@@ -171,9 +168,9 @@
 	<string name="report_personal_title">Vous ne voulez pas voir cela ?</string>
 	<string name="report_personal_subtitle">Quand vous voyez quelque chose que vous n’aimez pas sur Mastodon, vous pouvez retirer la personne de votre expérience.</string>
 	<string name="back">Retour</string>
-	<string name="instance_catalog_title">Mastodon est composé d’utilisateurs de différentes communautés.</string>
-	<string name="instance_catalog_subtitle">Choisissez une communauté basée sur vos intérêts, votre région ou un but général. Vous pouvez toujours vous connecter avec tout le monde, quelle que soit la communauté.</string>
-	<string name="search_communities">Rechercher parmi les communautés ou entrer une URL</string>
+	<string name="instance_catalog_title">Mastodon est composé d\'utilisateurs sur différents serveurs.</string>
+	<string name="instance_catalog_subtitle">Choisissez un serveur en fonction de vos intérêts, de votre région ou alors rejoignez un serveur général. Vous pouvez toujours vous connecter avec tout le monde, quel que soit le serveur.</string>
+	<string name="search_communities">Rechercher des serveurs ou entrer une URL</string>
 	<string name="instance_rules_title">Quelques règles de base</string>
 	<string name="instance_rules_subtitle">Prenez une minute pour revoir les règles définies et appliquées par les administrateurs de %s.</string>
 	<string name="signup_title">Mettons les choses en place pour %s</string>
@@ -222,7 +219,6 @@
 	<string name="skip">Passer</string>
 	<string name="notification_type_follow">Nouveaux⋅elles abonné⋅e⋅s</string>
 	<string name="notification_type_favorite">Favoris</string>
-	<string name="notification_type_reblog">Partages</string>
 	<string name="notification_type_mention">Mentions</string>
 	<string name="notification_type_poll">Sondages</string>
 	<string name="choose_account">Choisir un compte</string>
@@ -285,8 +281,6 @@
 	<string name="unfollowed_user">Vous ne suivez plus %s</string>
 	<string name="followed_user">Vous suivez maintenant %s</string>
 	<string name="open_in_browser">Ouvrir dans le navigateur</string>
-	<string name="hide_boosts_from_user">Masquer les partages de %s</string>
-	<string name="show_boosts_from_user">Afficher les partages de %s</string>
 	<string name="signup_reason">pourquoi voulez-vous vous inscrire ?</string>
 	<string name="signup_reason_note">Cela nous aidera à examiner votre demande.</string>
 	<string name="clear">Effacer</string>
@@ -301,4 +295,17 @@
 	<string name="file_saved">Fichier enregistré</string>
 	<string name="downloading">Téléchargement…</string>
 	<string name="no_app_to_handle_action">Aucune application ne permet de gérer ce type d\'action</string>
+	<string name="local_timeline">Communauté</string>
+	<string name="trending_posts_info_banner">Ce sont les postes qui gagnent en popularité sur votre serveur Mastodon.</string>
+	<string name="trending_hashtags_info_banner">Ce sont les hashtags qui gagnent en popularité sur votre serveur Mastodon.</string>
+	<string name="trending_links_info_banner">Ce sont les nouvelles les plus partagées sur votre serveur Mastodon.</string>
+	<string name="local_timeline_info_banner">Ce sont les messages les plus récents des personnes qui utilisent le même serveur Mastodon que vous.</string>
+	<string name="dismiss">Rejeter</string>
+	<string name="see_new_posts">Voir les nouveaux postes</string>
+	<string name="load_missing_posts">Charger les postes manquants</string>
+	<string name="follow_back">Suivre en retour</string>
+	<string name="button_follow_pending">En attente</string>
+	<string name="follows_you">Vous suit</string>
+	<string name="manually_approves_followers">Approuver manuellement les demande de suivie</string>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 </resources>