More crash fixes

fixes #854

.github/workflows/build_and_deploy.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.2
+          ruby-version: 3.3.0
           bundler-cache: true
 
       - name: Set up Android SDK

Gemfile.lock

@@ -0,0 +1,218 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    artifactory (3.0.17)
+    atomos (0.1.3)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.913.0)
+    aws-sdk-core (3.191.6)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.78.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.146.1)
+      aws-sdk-core (~> 3, >= 3.191.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    base64 (0.2.0)
+    claide (1.1.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    declarative (0.0.20)
+    digest-crc (0.6.5)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.6.20240107)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    excon (0.110.0)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    fastimage (2.3.1)
+    fastlane (2.220.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored (~> 1.2)
+      commander (~> 4.6)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      naturally (~> 2.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.5)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (~> 3)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.0)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.31.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    jmespath (1.6.2)
+    json (2.7.2)
+    jwt (2.8.1)
+      base64
+    mini_magick (4.12.0)
+    mini_mime (1.1.5)
+    multi_json (1.15.0)
+    multipart-post (2.4.0)
+    nanaimo (0.3.0)
+    naturally (2.2.1)
+    nkf (0.2.0)
+    optparse (0.4.0)
+    os (1.1.4)
+    plist (3.7.1)
+    public_suffix (5.0.5)
+    rake (13.2.1)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rexml (3.2.6)
+    rouge (2.0.7)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    security (0.1.5)
+    signet (0.19.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.10)
+      CFPropertyList
+      naturally
+    terminal-notifier (2.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unicode-display_width (2.5.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.24.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  arm64-darwin-22
+  ruby
+
+DEPENDENCIES
+  fastlane
+
+BUNDLED WITH
+   2.5.4

fastlane/metadata/android/en-US/changelogs/102.txt

@@ -0,0 +1,2 @@
+- Updated look for link previews and the News tab
+- Bug fixes and improvements

fastlane/metadata/android/en-US/changelogs/93.txt

@@ -0,0 +1,8 @@
+- Adjust filters in the Notifications tab to silence unwanted alerts*
+- Opt into push notifications when a user posts by tapping the bell 🔔 in the top corner of a user's profile.
+- Mute overly active conversation notifications via the More button ⋮ on your posts
+- When writing a post, choose Quiet public 🌙 visibility to avoid appearing in feeds or searches
+- Improved post legibility with adjusted line height
+- Bug fixes
+
+*Your server must support filtered notifications to see this option.

fastlane/metadata/android/hu-HU/full_description.txt

@@ -1,16 +1,16 @@
 A Mastodon a legnagyobb decentralizált közösségi hálózat az interneten. Egyetlen weboldal helyett, ez több millió felhasználóból álló, független közösségek hálózata, amelyek egymással kapcsolatba tudnak lépni, zökkenőmentesen. Nem számít, mi az érdeklődésed, a Mastodonon találkozhatsz róla posztoló lelkes emberekkel!
 
-Csatlakozz egy közösséghez és készítsd el a profilodat. Találj meg és kövess be fantasztikus embereket, olvasd el a bejegyzéseiket reklámmentesen, időrendben. Fejezd ki magad egyedi hangulatjelekkel, képekkel, GIFekkel, videókkal és hanggal, 500 karakter hosszúságú bejegyzésekben. Válaszolj szálakban, told meg bárki bejegyzését, hogy megoszthass szuper dolgokat. Fedezz fel új fiókokat amiket követhetsz és felkapott hashtageket, hogy bővíthesd a kapcsolataidat.
+Csatlakozz egy közösséghez és készítsd el a profilodat. Találj meg és kövess fantasztikus embereket, olvasd el a bejegyzéseiket reklámmentesen, időrendben. Fejezd ki magad egyedi hangulatjelekkel, képekkel, GIFekkel, videókkal és hanggal, 500 karakter hosszúságú bejegyzésekben. Válaszolj szálakban, told meg bárki bejegyzését, hogy megoszthass szuper dolgokat. Fedezz fel új fiókokat amiket követhetsz és felkapott hashtageket, hogy bővíthesd a kapcsolataidat.
 
-A Mastodon az adatvédelemre és a biztonságra összpontosítva épült. Döntsd el, hogy a bejegyzéseidet csak a követőiddel, csak azokkal akiket megemlítesz, vagy az egész világgal osztod meg. A tartalomfigyelmeztetések elrejthetővé teszik az érzékeny vagy ingerlő tartalmakat addig, amíg nem vagy kész azok megtekintésére. Minden közösségnek saját irényelvei és moderátorai vannak arra, hogy biztonságban tudják a tagjaikat. Erőteljes letiltási és bejelentési eszközök segítik a visszaélések megelőzését.
+A Mastodon az adatvédelemre és a biztonságra összpontosítva épült. Döntsd el, hogy a bejegyzéseidet csak a követőiddel, csak azokkal akiket megemlítesz, vagy az egész világgal osztod meg. A tartalmi figyelmeztetések elrejthetővé teszik az érzékeny vagy ingerlő tartalmakat addig, amíg nem vagy kész azok megtekintésére. Minden közösségnek saját irányelvei és moderátorai vannak arra, hogy biztonságban tudják a tagjaikat. Robusztus letiltási és jelentési eszközök segítik a visszaélések megelőzését.
 
 További funkciók:
 
-• Sötét mód: Olvasd a bejegyzéseket világos, sötét vagy teljesen fekete módban
+• Sötét mód: olvasd a bejegyzéseket világos, sötét vagy valódi fekete módban
 • Szavazás: Kérd ki a követőid véleményét és összesítsd a szavazataikat
 • Felfedezés: A felkapott hashtagek és fiókok egyetlen kattintásra vannak
 • Értesítések: Értesülj az új követőidről, válaszokról, megtolásokról
 • Megosztás: Írj bejegyzést Mastodonra bármely app megosztási funkciójával
 • Cukiság: A kabalánk egy cuki elefánt, mely fel fog bukkanni időről időre
 
-A Mastodon egy bejegyzett non-profit szervezet, a fejlesztés közvetlenül a te adományaidból történik. Nincs hirdetés, se monetizáció, se kockázati tőke, és ez így is fog maradni.
+A Mastodon egy bejegyzett nonprofit szervezet, a fejlesztés közvetlenül a felhasználók adományaiból történik. Nincs hirdetés, se monetizáció, se kockázati tőke, és ez így is fog maradni.

fastlane/metadata/android/ia/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon es le plus grande rete social decentralisate sur internet. In vice que un sol sito web, illo es un rete de milliones de usatores in communitates independente que pote tote interager le un con le altere, perfectemente. Non importa que te interessa, tu pote incontrar personas passionate que posta re illo sur Mastodon!
+
+Junge te a un communitate e crea tu profilo. Trova e seque personas fascinante e lege lor messages in un chronogramma chronologic libere de avisos publicitari. Exprime te mesme con emoticone personalisate, imagines, GIFs, videos, e audio in messages de 500-characteres. Responde a messages argumentos e promotiones de quicunque pro compartir grande substantias. Trova nove contos a sequer e hashtags de tendentia pro expander tu rete.
+
+Mastodon es producite con attention a confidentialitate e securitate. Decide si tu messages es compartite con tu sequaces, solo le gente que tu mentiona, o tote le mundo. Le avisos re contentos te permitte de celar messages que contine material sensibile o provocatori usque tu es preste a interager con illes. Cata communitate ha su proprie lineas guida e moderatores pro mantener su membros secur. Robuste utensiles de blocada e de reporto pro adjutar a impedir abusos.
+
+Altere functiones:
+
+• Modo obscur: lege messages in modo clar, obscur, o francamente nigre
+• Modo obscur: lege messages in modo clar, obscur, o francamente nigre
+• Explora: hashtags de tendentia e contos es a portata de mano
+• Notificationes: recipe notificationes circa nove sequaces, responsas, e promotiones
+• Compartir: publica directemente sur Mastodon ab qualcunque folio de compartimento in ulle app
+• Pachydermo: nostre mascotte es un adorabile elephante, e tu lo videra apparer de tempore in tempore
+
+Mastodon es un organisation non lucrative registrate e le disveloppamento es supportate directemente per tu donationes. Il non ha alcun annuncios publicitari, alcun monetisation e capital de hasardo, e nos projecta mantener lo in iste condition.

fastlane/metadata/android/ia/short_description.txt

@@ -0,0 +1 @@
+Rete social decentralisate

fastlane/metadata/android/ia/title.txt

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

fastlane/metadata/android/id-ID/full_description.txt

@@ -1,6 +1,6 @@
 Mastodon dalah jaringan sosial terdesentralisasi terbesar di internet. Bukan hanya satu situs web, ini adalah jaringan dari jutaan pengguna dalam komunitas tersendiri yang dapat saling interaksi antar sesama, tanpa batasan. Apapun yang kamu minati, kamu dapat bertemu orang-orang baru yang mengirimkan apa yang mereka minati di Mastodon!
 
-Bergabunglah dalam sebuah komunitas dan buat profil kalian. Temukan dan ikuti orang-orang yang menarik dan baca postingan mereka dalam linimasa yang kronologis serta bebas iklan. Ekspresikan diri Anda dengan emoji kustom, gambar, GIF, video, dan audio dalam kiriman dengan batasan 500 karakter. Balas ke utasan dan bagikan kiriman dari siapa pun ke pengikut Anda untuk membagikan hal-hal yang keren. Temukan akun baru untuk diikuti dan tagar yang sedang tren untuk memperluas jejaring Anda.
+Bergabunglah dalam sebuah komunitas dan buat profil kalian. Temukan dan ikuti orang-orang yang menarik dan baca postingan mereka dalam lini masa yang kronologis serta bebas iklan. Ekspresikan diri Anda dengan emoji kustom, gambar, GIF, video, dan audio dalam kiriman dengan batasan 500 karakter. Balas ke utasan dan bagikan kiriman dari siapa pun ke pengikut Anda untuk membagikan hal-hal yang keren. Temukan akun baru untuk diikuti dan tagar yang sedang tren untuk memperluas jejaring Anda.
 
 Mastodon dibuat dengan fokus pada privasi dan keamanan. Tentukan apakah kiriman Anda dibagikan kepada pengikut, hanya orang yang disebut, atau seluruh dunia. Peringatan konten memungkinkan Anda untuk menyembunyikan kiriman yang berisi material sensitif atau memicu sampai Anda siap untuk terlibat dengan mereka. Setiap komunitas memiliki pedoman dan moderator sendiri-sendiri untuk menjaga anggotanya aman, dan alat pemblokiran dan pelaporan yang kokoh membantu mencegah pelecehan.
 

fastlane/metadata/android/lt-LT/full_description.txt

@@ -1,6 +1,6 @@
-Mastodon – didžiausias decentralizuotas socialinis tinklas internete. Vietoj vienos svetainės tai yra milijonų naudotojų, priklausančių nepriklausomoms bendruomenėms, kurios gali sklandžiai bendrauti tarpusavyje, tinklas. Nesvarbu, kuo domiesi, Mastodon gali sutikti aistringų žmonių, skelbiančių apie tai!
+Mastodon – tai didžiausias decentralizuotas socialinis tinklas internete. Vietoj vienos svetainės tai yra milijonų naudotojų, priklausančių nepriklausomoms bendruomenėms, kurios gali sklandžiai bendrauti tarpusavyje, tinklas. Nesvarbu, kuo domiesi, Mastodon gali sutikti aistringų žmonių, skelbiančių apie tai!
 
-Prisijunk prie bendruomenės ir susikurk savo profilį. Rask ir sek žavius žmones bei skaityk jų įrašus chronologinėje laiko skalėje be reklamų. Išreikšk save su pasirinktais jaustukais, vaizdais, GIF, vaizdo ir garso įrašais 500 simbolių įrašuose. Atsakyk į gijas ir perrašyk bet kurio asmens įrašus, kad galėtum dalytis puikiais dalykais. Ieškok naujų paskyrų sekti ir tendencingų saitažodžių, kad praplėstum savo tinklą.
+Prisijunk prie bendruomenės ir susikurk savo profilį. Rask ir sek žavius žmones bei skaityk jų įrašus chronologinėje laiko skalėje be reklamų. Išreikšk save su pasirinktais jaustukais, vaizdais, GIF, vaizdo ir garso įrašais 500 simbolių įrašuose. Atsakyk į gijas ir perdalyk bet kurio asmens įrašus, kad galėtum bendrinti puikiais dalykais. Ieškok naujų paskyrų sekti ir tendencingų saitažodžių, kad praplėstum savo tinklą.
 
 Mastodon sukurtas daugiausia dėmesio skiriant privatumui ir saugumui. Nuspręsk, ar tavo įrašai bus bendrinami tavo sekėjams, tik tavo paminėtiems žmonėms, ar visam pasauliui. Turinio įspėjimai leidžia paslėpti įrašus, kuriuose yra jautrios ar dirginančios medžiagos, kol būsi pasiruošęs (-usi) su jais bendrauti. Kiekviena bendruomenė turi savo gaires ir prižiūrėtojus, kad jos nariai būtų saugūs, o patikimi blokavimo ir pranešimo įrankiai padeda užkirsti kelią piktnaudžiavimui.
 
@@ -9,8 +9,8 @@ Daugiau funkcijų:
 • Tamsusis režimas: skaityk įrašus šviesiu, tamsiu arba tikru juodu režimu
 • Apklausos: paklausk sekėjų nuomonės ir suskaičiuok balsus
 • Naršyti: tendencingos saitažodžiai ir paskyros – vos nuo vieno prisilietimo
-• Pranešimai: gauk pranešimus apie naujus sekėjus, atsakymus ir tinklaraščių perrašymus
-• Bendrinimas: skelbk tiesiogiai į Mastodon iš bet kurio bendrinimo lapo bet kurioje programėlėje
-• Mielumas: mūsų talismanas yra žavus drambliukas, kurį retkarčiais pamatysi
+• Pranešimai: gauk pranešimus apie naujus sekėjus, atsakymus ir pasidalijimus
+• Bendrinti: skelbk tiesiogiai į Mastodon iš bet kurio bendrinimo lapo bet kurioje programėlėje
+• Mielumas: mūsų talismanas – žavus drambliukas, kurį retkarčiais pamatysi
 
-Mastodon yra registruota ne pelno siekianti organizacija, kurios plėtra yra tiesiogiai paremta aukomis. Nėra jokios reklamos, jokių monetizacijos ir rizikos kapitalo, ir mes planuojame, kad taip ir liks.
+Mastodon registruota ne pelno siekianti organizacija, kurios plėtra yra tiesiogiai paremta aukomis. Nėra jokių reklamų, jokių monetizacijos ir rizikos kapitalo, ir mes planuojame, kad taip ir liks.

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

@@ -1,6 +1,6 @@
-Mastodon 是互联网上最大的去中心化社交网络。 它不是一个网站，而是由独立社区节点及其数以百万计的用户组成的网络，所有这些用户都能够无缝地相互交流。 无论你关注什么话题，你都能在 Mastodon 上找到兴趣相投的人进行交流。
+Mastodon 是互联网上最大的去中心化社交网络。 它不是一个单一的网站，而是由一个个独立社区中的数百万用户组成的网络，所有这些用户都可以无缝交流。 无论你关注什么话题，你都能在 Mastodon 上找到兴趣相投的人进行交流。
 
-加入一个社区节点并创建你的账户。 查找、关注有趣的同好，无广告、无时间线干扰地阅读他们的帖子。 借助自定义 emoji、图像、GIF、视频和音频，在最多 500 字的帖文中表达自我。 通过回复或转发其他人的帖文来分享美好的事物。 通过准寻新账户并关注热门话题标签来扩展你的社交网络。
+加入一个社区并创建你的账户。 查找、关注有趣的同好，无广告、无时间线干扰地阅读他们的帖子。 借助自定义 emoji、图像、GIF、视频和音频，在最多 500 字的帖文中表达自我。 通过回复或转发其他人的帖文来分享美好的事物。 通过准寻新账户并关注热门话题标签来扩展你的社交网络。
 
 Mastodon 以隐私和安全为首要目标。 你可以自主决定帖文的分享分享对象，可以是你的关注者、你提到的人或是整个世界。 在你做好充足的互动准备之前，内容警告可以隐藏包含敏感或刺激内容的帖文。 每个社区都有自己的规则和管理员来保证其成员安全，同时还有强力的屏蔽和举报工具来避免滥用。
 
@@ -10,7 +10,7 @@ Mastodon 以隐私和安全为首要目标。 你可以自主决定帖文的分
 • 投票：询问关注者的意见并统计他们的投票
 • 探索：热门的话题标签及账号只有一触之遥
 • 通知：获取关注、回复和转发相关的通知提醒
-• 分享：从其他应用中的分享菜单中直接发布到 Mastodon
+• 分享：从任意应用的分享菜单直接发布到 Mastodon
 • 吉祥物：你会不时地看到我们可爱的长毛象
 
 Mastodon 是一个直接由用户捐赠支持、已注册非营利开发项目。 它没有广告、没有商业化，也没有风险资本，并且我们也计划保持这种方式。

mastodon/build.gradle

@@ -4,15 +4,18 @@ plugins {
 }
 
 android {
+	androidResources {
+		generateLocaleConfig = true
+	}
+
 	compileSdk 33
 	defaultConfig {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 33
-		versionCode 89
-		versionName "2.4.1"
+		versionCode 104
+		versionName "2.5.3"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "da-rDK", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fa-rIR", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "ig-rNG", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "ka-rGE", "kab", "ko-rKR", "lt-rLT", "my-rMM", "nl-rNL", "no-rNO", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "ur-rIN", "vi-rVN", "zh-rCN", "zh-rTW"
 	}
 
 	buildTypes {
@@ -87,7 +90,7 @@ dependencies {
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
 	implementation 'me.grishka.litex:palette:1.0.0'
-	implementation 'me.grishka.appkit:appkit:1.2.16'
+	implementation 'me.grishka.appkit:appkit:1.3.0'
 	implementation 'com.google.code.gson:gson:2.8.9'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'

mastodon/src/main/AndroidManifest.xml

@@ -31,10 +31,11 @@
 		android:allowBackup="true"
 		android:label="@string/app_name"
 		android:supportsRtl="true"
-		android:localeConfig="@xml/locales_config"
+		android:networkSecurityConfig="@xml/network_security_config"
 		android:icon="@mipmap/ic_launcher"
 		android:theme="@style/Theme.Mastodon.AutoLightDark"
-		android:largeHeap="true">
+		android:largeHeap="true"
+		android:enableOnBackInvokedCallback="true">
 
 		<meta-data
 			android:name="com.google.mlkit.vision.DEPENDENCIES"
@@ -80,6 +81,7 @@
 		</activity>
 
 		<service android:name=".AudioPlayerService" android:foregroundServiceType="mediaPlayback"/>
+		<service android:name=".NotificationActionHandlerService" android:exported="false"/>
 
 		<receiver android:name=".PushNotificationReceiver" android:exported="true" android:permission="com.google.android.c2dm.permission.SEND">
 			<intent-filter>

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

@@ -61,6 +61,7 @@ public class MainActivity extends FragmentStackActivity{
 	@Override
 	protected void onNewIntent(Intent intent){
 		super.onNewIntent(intent);
+		setIntent(intent);
 		if(intent.getBooleanExtra("fromNotification", false)){
 			String accountID=intent.getStringExtra("accountID");
 			AccountSession accountSession;
@@ -85,6 +86,8 @@ public class MainActivity extends FragmentStackActivity{
 			showCompose();
 		}else if(Intent.ACTION_VIEW.equals(intent.getAction())){
 			handleURL(intent.getData(), null);
+		}else if(intent.getBooleanExtra("explore", false)){
+			restartHomeFragment();
 		}/*else if(intent.hasExtra(PackageInstaller.EXTRA_STATUS) && GithubSelfUpdater.needSelfUpdating()){
 			GithubSelfUpdater.getInstance().handleIntentFromInstaller(intent, this);
 		}*/
@@ -152,6 +155,11 @@ public class MainActivity extends FragmentStackActivity{
 		}
 		fragment.setArguments(args);
 		showFragment(fragment);
+		Intent intent=getIntent();
+		intent.removeExtra("fromNotification");
+		intent.removeExtra("notification");
+		intent.removeExtra("accountID");
+		setIntent(intent);
 	}
 
 	private void showCompose(){
@@ -206,6 +214,8 @@ public class MainActivity extends FragmentStackActivity{
 				}
 			}else if(intent.getBooleanExtra("compose", false)){
 				showCompose();
+			}else if(intent.getBooleanExtra("explore", false) && fragment instanceof HomeFragment hf){
+				getWindow().getDecorView().post(()->hf.setCurrentTab(R.id.tab_search));
 			}else if(Intent.ACTION_VIEW.equals(intent.getAction())){
 				handleURL(intent.getData(), null);
 			}else{
@@ -213,4 +223,10 @@ public class MainActivity extends FragmentStackActivity{
 			}
 		}
 	}
+
+	public Fragment getTopmostFragment(){
+		if(fragmentContainers.isEmpty())
+			return null;
+		return getFragmentManager().findFragmentById(fragmentContainers.get(fragmentContainers.size()-1).getId());
+	}
 }

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

@@ -0,0 +1,177 @@
+package org.joinmastodon.android;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.RemoteInput;
+import android.app.Service;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.service.notification.StatusBarNotification;
+
+import org.joinmastodon.android.api.requests.statuses.CreateStatus;
+import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
+import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
+import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.events.StatusCreatedEvent;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.StatusPrivacy;
+
+import java.util.UUID;
+
+import androidx.annotation.Nullable;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+
+public class NotificationActionHandlerService extends Service{
+	private static final String TAG="NotificationActionHandl";
+	private int runningRequestCount=0;
+
+	@Nullable
+	@Override
+	public IBinder onBind(Intent intent){
+		return null;
+	}
+
+	@Override
+	public int onStartCommand(Intent intent, int flags, int startId){
+		String action=intent.getStringExtra("action");
+		String account=intent.getStringExtra("account");
+		String postID=intent.getStringExtra("post");
+		String notificationTag=intent.getStringExtra("notificationTag");
+		if(action==null || account==null || postID==null || notificationTag==null){
+			maybeStopSelf();
+			return START_NOT_STICKY;
+		}
+		NotificationManager nm=getSystemService(NotificationManager.class);
+		StatusBarNotification notification=findNotification(notificationTag);
+		if("reply".equals(action)){
+			Bundle remoteInputResults=RemoteInput.getResultsFromIntent(intent);
+			if(remoteInputResults==null){
+				maybeStopSelf();
+				return START_NOT_STICKY;
+			}
+			CharSequence replyText=remoteInputResults.getCharSequence("replyText");
+			if(replyText==null){
+				maybeStopSelf();
+				return START_NOT_STICKY;
+			}
+			CreateStatus.Request req=new CreateStatus.Request();
+			req.inReplyToId=postID;
+			req.status=intent.getStringExtra("replyPrefix")+replyText;
+			req.visibility=StatusPrivacy.valueOf(intent.getStringExtra("visibility"));
+			runningRequestCount++;
+			new CreateStatus(req, UUID.randomUUID().toString())
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(Status result){
+							E.post(new StatusCreatedEvent(result, account));
+							if(notification!=null){
+								Notification n=notification.getNotification();
+								nm.notify(notificationTag, PushNotificationReceiver.NOTIFICATION_ID, n);
+							}
+							runningRequestCount--;
+							maybeStopSelf();
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							error.showToast(NotificationActionHandlerService.this);
+							if(notification!=null){
+								Notification n=notification.getNotification();
+								nm.notify(notificationTag, PushNotificationReceiver.NOTIFICATION_ID, n);
+							}
+							runningRequestCount--;
+							maybeStopSelf();
+						}
+					})
+					.exec(account);
+		}else if("favorite".equals(action)){
+			PendingIntent prevActionIntent;
+			if(notification!=null){
+				Notification n=notification.getNotification();
+				prevActionIntent=n.actions[1].actionIntent;
+				n.actions[1].actionIntent=null;
+				n.actions[1].title=getString(R.string.button_favorited);
+				nm.notify(notificationTag, PushNotificationReceiver.NOTIFICATION_ID, n);
+			}else{
+				prevActionIntent=null;
+			}
+			runningRequestCount++;
+			new SetStatusFavorited(postID, true)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(Status result){
+							E.post(new StatusCountersUpdatedEvent(result));
+							runningRequestCount--;
+							maybeStopSelf();
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							if(notification!=null){
+								Notification n=notification.getNotification();
+								n.actions[1].actionIntent=prevActionIntent;
+								n.actions[1].title=getString(R.string.button_favorite);
+								nm.notify(notificationTag, PushNotificationReceiver.NOTIFICATION_ID, n);
+							}
+							error.showToast(NotificationActionHandlerService.this);
+							runningRequestCount--;
+							maybeStopSelf();
+						}
+					})
+					.exec(account);
+		}else if("boost".equals(action)){
+			PendingIntent prevActionIntent;
+			if(notification!=null){
+				Notification n=notification.getNotification();
+				prevActionIntent=n.actions[2].actionIntent;
+				n.actions[2].actionIntent=null;
+				n.actions[2].title=getString(R.string.button_reblogged);
+				nm.notify(notificationTag, PushNotificationReceiver.NOTIFICATION_ID, n);
+			}else{
+				prevActionIntent=null;
+			}
+			runningRequestCount++;
+			new SetStatusReblogged(postID, true)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(Status result){
+							E.post(new StatusCountersUpdatedEvent(result));
+							runningRequestCount--;
+							maybeStopSelf();
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							if(notification!=null){
+								Notification n=notification.getNotification();
+								n.actions[2].actionIntent=prevActionIntent;
+								n.actions[2].title=getString(R.string.button_reblog);
+								nm.notify(notificationTag, PushNotificationReceiver.NOTIFICATION_ID, n);
+							}
+							error.showToast(NotificationActionHandlerService.this);
+							runningRequestCount--;
+							maybeStopSelf();
+						}
+					})
+					.exec(account);
+		}
+		return START_NOT_STICKY;
+	}
+
+	private void maybeStopSelf(){
+		if(runningRequestCount==0)
+			stopSelf();
+	}
+
+	private StatusBarNotification findNotification(String tag){
+		for(StatusBarNotification sbn:getSystemService(NotificationManager.class).getActiveNotifications()){
+			if(tag.equals(sbn.getTag())){
+				return sbn;
+			}
+		}
+		return null;
+	}
+}

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

@@ -5,14 +5,15 @@ import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.app.RemoteInput;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.os.Build;
 import android.os.Bundle;
+import android.service.notification.StatusBarNotification;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -21,10 +22,13 @@ 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.Mention;
 import org.joinmastodon.android.model.PushNotification;
+import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -75,7 +79,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 						}
 						String accountID=account.getID();
 						PushNotification pn=AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().decryptNotification(k, p, s);
-						new GetNotificationByID(pn.notificationId+"")
+						new GetNotificationByID(pn.notificationId)
 								.setCallback(new Callback<>(){
 									@Override
 									public void onSuccess(org.joinmastodon.android.model.Notification result){
@@ -144,19 +148,114 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				.setContentText(pn.body)
 				.setStyle(new Notification.BigTextStyle().bigText(pn.body))
 				.setSmallIcon(R.drawable.ic_ntf_logo)
-				.setContentIntent(PendingIntent.getActivity(context, accountID.hashCode() & 0xFFFF, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
+				.setContentIntent(PendingIntent.getActivity(context, (accountID+pn.notificationId).hashCode() & 0xFFFF, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
 				.setWhen(notification==null ? System.currentTimeMillis() : notification.createdAt.toEpochMilli())
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
+				.setOnlyAlertOnce(true)
 				.setLights(context.getColor(R.color.primary_700), 500, 1000)
-				.setColor(context.getColor(R.color.primary_700));
+				.setColor(context.getColor(R.color.primary_700))
+				.setGroup(accountID);
 		if(avatar!=null){
 			builder.setLargeIcon(UiUtils.getBitmapFromDrawable(avatar));
 		}
 		if(AccountSessionManager.getInstance().getLoggedInAccounts().size()>1){
 			builder.setSubText(accountName);
 		}
-		nm.notify(accountID, NOTIFICATION_ID, builder.build());
+		String notificationTag=accountID+"_"+(notification==null ? 0 : notification.id);
+		if(notification!=null && (notification.type==org.joinmastodon.android.model.Notification.Type.MENTION)){
+			ArrayList<String> mentions=new ArrayList<>();
+			String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
+			if(!notification.status.account.id.equals(ownID))
+				mentions.add('@'+notification.status.account.acct);
+			for(Mention mention:notification.status.mentions){
+				if(mention.id.equals(ownID))
+					continue;
+				String m='@'+mention.acct;
+				if(!mentions.contains(m))
+					mentions.add(m);
+			}
+			String replyPrefix=mentions.isEmpty() ? "" : TextUtils.join(" ", mentions)+" ";
+
+			if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
+				Intent replyIntent=new Intent(context, NotificationActionHandlerService.class);
+				replyIntent.putExtra("action", "reply");
+				replyIntent.putExtra("account", accountID);
+				replyIntent.putExtra("post", notification.status.id);
+				replyIntent.putExtra("notificationTag", notificationTag);
+				replyIntent.putExtra("visibility", notification.status.visibility.toString());
+				replyIntent.putExtra("replyPrefix", replyPrefix);
+				builder.addAction(new Notification.Action.Builder(Icon.createWithResource(context, R.drawable.ic_reply_24px),
+						context.getString(R.string.button_reply), PendingIntent.getService(context, (accountID+pn.notificationId+"reply").hashCode(), replyIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE))
+								.addRemoteInput(new RemoteInput.Builder("replyText").setLabel(context.getString(R.string.button_reply)).build())
+								.build());
+			}
+
+			Intent favIntent=new Intent(context, NotificationActionHandlerService.class);
+			favIntent.putExtra("action", "favorite");
+			favIntent.putExtra("account", accountID);
+			favIntent.putExtra("post", notification.status.id);
+			favIntent.putExtra("notificationTag", notificationTag);
+			builder.addAction(new Notification.Action.Builder(Icon.createWithResource(context, R.drawable.ic_star_24px),
+					context.getString(R.string.button_favorite), PendingIntent.getService(context, (accountID+pn.notificationId+"favorite").hashCode(), favIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE)).build());
+
+			PendingIntent boostActionIntent;
+			if(notification.status.visibility!=StatusPrivacy.DIRECT){
+				Intent boostIntent=new Intent(context, NotificationActionHandlerService.class);
+				boostIntent.putExtra("action", "boost");
+				boostIntent.putExtra("account", accountID);
+				boostIntent.putExtra("post", notification.status.id);
+				boostIntent.putExtra("notificationTag", notificationTag);
+				boostActionIntent=PendingIntent.getService(context, (accountID+pn.notificationId+"boost").hashCode(), boostIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+			}else{
+				boostActionIntent=null;
+			}
+			builder.addAction(new Notification.Action.Builder(Icon.createWithResource(context, R.drawable.ic_boost_24px),
+					context.getString(R.string.button_reblog), boostActionIntent).build());
+		}
+		nm.notify(notificationTag, NOTIFICATION_ID, builder.build());
+
+		StatusBarNotification[] activeNotifications=nm.getActiveNotifications();
+		ArrayList<String> summaryLines=new ArrayList<>();
+		int notificationCount=0;
+		for(StatusBarNotification sbn:activeNotifications){
+			String tag=sbn.getTag();
+			if(tag!=null && tag.startsWith(accountID+"_")){
+				if((sbn.getNotification().flags & Notification.FLAG_GROUP_SUMMARY)==0){
+					if(summaryLines.size()<5){
+						summaryLines.add(sbn.getNotification().extras.getString("android.title"));
+					}
+					notificationCount++;
+				}
+			}
+		}
+
+		if(summaryLines.size()>1){
+			Notification.Builder summaryBuilder;
+			if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.O){
+				summaryBuilder=new Notification.Builder(context, accountID+"_"+pn.notificationType);
+			}else{
+				summaryBuilder=new Notification.Builder(context)
+						.setPriority(Notification.PRIORITY_DEFAULT);
+			}
+			Notification.InboxStyle inboxStyle=new Notification.InboxStyle();
+			for(String line:summaryLines){
+				inboxStyle.addLine(line);
+			}
+			summaryBuilder.setContentTitle(context.getString(R.string.app_name))
+					.setContentText(context.getResources().getQuantityString(R.plurals.x_new_notifications, notificationCount, notificationCount))
+					.setSmallIcon(R.drawable.ic_ntf_logo)
+					.setColor(context.getColor(R.color.primary_700))
+					.setContentIntent(PendingIntent.getActivity(context, accountID.hashCode() & 0xFFFF, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
+					.setWhen(notification==null ? System.currentTimeMillis() : notification.createdAt.toEpochMilli())
+					.setShowWhen(true)
+					.setCategory(Notification.CATEGORY_SOCIAL)
+					.setAutoCancel(true)
+					.setGroup(accountID)
+					.setGroupSummary(true)
+					.setStyle(inboxStyle.setSummaryText(accountName));
+			nm.notify(accountID+"_summary", NOTIFICATION_ID, summaryBuilder.build());
+		}
 	}
 }

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

@@ -113,8 +113,10 @@ public class MastodonAPIController{
 
 					@Override
 					public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException{
-						if(req.canceled)
+						if(req.canceled){
+							response.close();
 							return;
+						}
 						if(BuildConfig.DEBUG)
 							Log.d(TAG, logTag(session)+hreq+" received response: "+response);
 						synchronized(req){

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

@@ -5,31 +5,62 @@ import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonSyntaxException;
+
 import org.joinmastodon.android.R;
 
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+
 import me.grishka.appkit.api.ErrorResponse;
 
 public class MastodonErrorResponse extends ErrorResponse{
 	public final String error;
 	public final int httpStatus;
 	public final Throwable underlyingException;
+	public final int messageResource;
 
 	public MastodonErrorResponse(String error, int httpStatus, Throwable exception){
 		this.error=error;
 		this.httpStatus=httpStatus;
 		this.underlyingException=exception;
+
+		if(exception instanceof UnknownHostException){
+			this.messageResource=R.string.could_not_reach_server;
+		}else if(exception instanceof SocketTimeoutException){
+			this.messageResource=R.string.connection_timed_out;
+		}else if(exception instanceof JsonSyntaxException || exception instanceof JsonIOException || httpStatus>=500){
+			this.messageResource=R.string.server_error;
+		}else if(httpStatus==404){
+			this.messageResource=R.string.not_found;
+		}else{
+			this.messageResource=0;
+		}
 	}
 
 	@Override
 	public void bindErrorView(View view){
 		TextView text=view.findViewById(R.id.error_text);
-		text.setText(error);
+		String message;
+		if(messageResource>0){
+			message=view.getContext().getString(messageResource, error);
+		}else{
+			message=error;
+		}
+		text.setText(message);
 	}
 
 	@Override
 	public void showToast(Context context){
 		if(context==null)
 			return;
-		Toast.makeText(context, error, Toast.LENGTH_SHORT).show();
+		String message;
+		if(messageResource>0){
+			message=context.getString(messageResource, error);
+		}else{
+			message=error;
+		}
+		Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
 	}
 }

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

@@ -4,10 +4,10 @@ import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;
 
 public class SetAccountFollowed extends MastodonAPIRequest<Relationship>{
-	public SetAccountFollowed(String id, boolean followed, boolean showReblogs){
+	public SetAccountFollowed(String id, boolean followed, boolean showReblogs, boolean notify){
 		super(HttpMethod.POST, "/accounts/"+id+"/"+(followed ? "follow" : "unfollow"), Relationship.class);
 		if(followed)
-			setRequestBody(new Request(showReblogs, null));
+			setRequestBody(new Request(showReblogs, notify));
 		else
 			setRequestBody(new Object());
 	}

mastodon/src/main/java/org/joinmastodon/android/api/requests/catalog/GetCatalogInstances.java

@@ -13,11 +13,13 @@ import java.util.List;
 public class GetCatalogInstances extends MastodonAPIRequest<List<CatalogInstance>>{
 
 	private String lang, category;
+	private boolean includeClosedSignups;
 
-	public GetCatalogInstances(String lang, String category){
+	public GetCatalogInstances(String lang, String category, boolean includeClosedSignups){
 		super(HttpMethod.GET, null, new TypeToken<>(){});
 		this.lang=lang;
 		this.category=category;
+		this.includeClosedSignups=includeClosedSignups;
 	}
 
 	@Override
@@ -30,6 +32,8 @@ public class GetCatalogInstances extends MastodonAPIRequest<List<CatalogInstance
 			builder.appendQueryParameter("language", lang);
 		if(!TextUtils.isEmpty(category))
 			builder.appendQueryParameter("category", category);
+		if(includeClosedSignups)
+			builder.appendQueryParameter("registrations", "all");
 		return builder.build();
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/GetNotificationRequests.java

@@ -0,0 +1,14 @@
+package org.joinmastodon.android.api.requests.notifications;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.model.NotificationRequest;
+
+public class GetNotificationRequests extends HeaderPaginationRequest<NotificationRequest>{
+	public GetNotificationRequests(String maxID){
+		super(HttpMethod.GET, "/notifications/requests", new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/GetNotifications.java

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.api.requests.notifications;
 
-import com.google.gson.annotations.SerializedName;
+import android.text.TextUtils;
+
 import com.google.gson.reflect.TypeToken;
 
 import org.joinmastodon.android.api.ApiUtils;
@@ -12,6 +13,10 @@ import java.util.List;
 
 public class GetNotifications extends MastodonAPIRequest<List<Notification>>{
 	public GetNotifications(String maxID, int limit, EnumSet<Notification.Type> includeTypes){
+		this(maxID, limit, includeTypes, null);
+	}
+
+	public GetNotifications(String maxID, int limit, EnumSet<Notification.Type> includeTypes, String onlyAccountID){
 		super(HttpMethod.GET, "/notifications", new TypeToken<>(){});
 		if(maxID!=null)
 			addQueryParameter("max_id", maxID);
@@ -25,6 +30,8 @@ public class GetNotifications extends MastodonAPIRequest<List<Notification>>{
 				addQueryParameter("exclude_types[]", type);
 			}
 		}
+		if(!TextUtils.isEmpty(onlyAccountID))
+			addQueryParameter("account_id", onlyAccountID);
 		removeUnsupportedItems=true;
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/GetNotificationsPolicy.java

@@ -0,0 +1,10 @@
+package org.joinmastodon.android.api.requests.notifications;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.NotificationsPolicy;
+
+public class GetNotificationsPolicy extends MastodonAPIRequest<NotificationsPolicy>{
+	public GetNotificationsPolicy(){
+		super(HttpMethod.GET, "/notifications/policy", NotificationsPolicy.class);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/RespondToNotificationRequest.java

@@ -0,0 +1,10 @@
+package org.joinmastodon.android.api.requests.notifications;
+
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
+
+public class RespondToNotificationRequest extends ResultlessMastodonAPIRequest{
+	public RespondToNotificationRequest(String id, boolean allow){
+		super(HttpMethod.POST, "/notifications/requests/"+id+(allow ? "/accept" : "/dismiss"));
+		setRequestBody(new Object());
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/SetNotificationsPolicy.java

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.notifications;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.NotificationsPolicy;
+
+public class SetNotificationsPolicy extends MastodonAPIRequest<NotificationsPolicy>{
+	public SetNotificationsPolicy(NotificationsPolicy policy){
+		super(HttpMethod.PUT, "/notifications/policy", NotificationsPolicy.class);
+		setRequestBody(policy);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusConversationMuted.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 SetStatusConversationMuted extends MastodonAPIRequest<Status>{
+	public SetStatusConversationMuted(String id, boolean muted){
+		super(HttpMethod.POST, "/statuses/"+id+(muted ? "/mute" : "/unmute"), Status.class);
+		setRequestBody(new Object());
+	}
+}

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

@@ -425,7 +425,7 @@ public class AccountSessionManager{
 		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")
+			ShortcutInfo compose=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))
@@ -433,12 +433,20 @@ public class AccountSessionManager{
 							.setAction(Intent.ACTION_MAIN)
 							.putExtra("compose", true))
 					.build();
-			sm.setDynamicShortcuts(Collections.singletonList(info));
+			ShortcutInfo explore=new ShortcutInfo.Builder(MastodonApp.context, "explore")
+					.setActivity(ComponentName.createRelative(MastodonApp.context, MainActivity.class.getName()))
+					.setShortLabel(MastodonApp.context.getString(R.string.tab_search))
+					.setIcon(Icon.createWithResource(MastodonApp.context, R.mipmap.ic_shortcut_explore))
+					.setIntent(new Intent(MastodonApp.context, MainActivity.class)
+							.setAction(Intent.ACTION_MAIN)
+							.putExtra("explore", true))
+					.build();
+			sm.setDynamicShortcuts(List.of(compose, explore));
 		}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));
+			sm.disableShortcuts(List.of("compose", "explore"), MastodonApp.context.getString(R.string.err_not_logged_in));
 		}else{
-			sm.enableShortcuts(Collections.singletonList("compose"));
+			sm.enableShortcuts(List.of("compose", "explore"));
 		}
 	}
 

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

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

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

@@ -0,0 +1,181 @@
+package org.joinmastodon.android.fragments;
+
+import android.content.res.ColorStateList;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.notifications.GetNotifications;
+import org.joinmastodon.android.api.requests.notifications.RespondToNotificationRequest;
+import org.joinmastodon.android.events.NotificationRequestRespondedEvent;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Notification;
+import org.joinmastodon.android.ui.Snackbar;
+import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+
+public class AccountNotificationsListFragment extends BaseNotificationsListFragment{
+	private Account account;
+	private String requestID;
+	private TextView expandedTitle;
+	private boolean choiceMade, allowed;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		account=Parcels.unwrap(getArguments().getParcelable("targetAccount"));
+		requestID=getArguments().getString("requestID");
+		setTitleMarqueeEnabled(false);
+		loadData();
+		setTitle(getString(R.string.notifications_from_user, account.displayName));
+		setHasOptionsMenu(true);
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		if(!refreshing && endMark!=null)
+			endMark.setVisibility(View.GONE);
+		currentRequest=new GetNotifications(offset==0 ? null : maxID, count, EnumSet.allOf(Notification.Type.class), account.id)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Notification> result){
+						onDataLoaded(result, !result.isEmpty());
+						maxID=result.isEmpty() ? null : result.get(result.size()-1).id;
+						endMark.setVisibility(result.isEmpty() ? View.VISIBLE : View.GONE);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected boolean needDividerForExtraItem(View child, View bottomSibling, RecyclerView.ViewHolder holder, RecyclerView.ViewHolder siblingHolder){
+		return super.needDividerForExtraItem(child, bottomSibling, holder, siblingHolder) || (siblingHolder!=null && siblingHolder.getAbsoluteAdapterPosition()>=list.getAdapter().getItemCount());
+	}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		MergeRecyclerAdapter mergeAdapter=new MergeRecyclerAdapter();
+
+		expandedTitle=(TextView) LayoutInflater.from(getActivity()).inflate(R.layout.expanded_title_medium, list, false);
+		expandedTitle.setText(getTitle());
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(expandedTitle));
+
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
+			@Override
+			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
+				if(recyclerView.getChildCount()==0)
+					return;
+				float fraction;
+				View topChild=recyclerView.getChildAt(0);
+				if(recyclerView.getChildAdapterPosition(topChild)>0){
+					fraction=1;
+				}else{
+					fraction=(-topChild.getTop())/(float)(topChild.getHeight()-topChild.getPaddingBottom());
+				}
+				expandedTitle.setAlpha(1f-fraction);
+				toolbarTitleView.setAlpha(fraction);
+			}
+		});
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.notification_request, menu);
+		MenuItem mute=menu.findItem(R.id.mute);
+		MenuItem allow=menu.findItem(R.id.allow);
+		if(choiceMade && allowed){
+			allow.setIcon(R.drawable.ic_check_wght700_24px);
+			tintMenuIcon(allow, R.attr.colorM3Primary);
+		}else{
+			tintMenuIcon(allow, R.attr.colorM3OnSurfaceVariant);
+		}
+		if(choiceMade && !allowed){
+			mute.setIcon(R.drawable.ic_delete_wght700_24px);
+			tintMenuIcon(mute, R.attr.colorM3Primary);
+		}else{
+			tintMenuIcon(mute, R.attr.colorM3OnSurfaceVariant);
+		}
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		if(choiceMade)
+			return true;
+		allowed=item.getItemId()==R.id.allow;
+		new RespondToNotificationRequest(requestID, allowed)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						choiceMade=true;
+						invalidateOptionsMenu();
+						E.post(new NotificationRequestRespondedEvent(accountID, requestID));
+						new Snackbar.Builder(getActivity())
+								.setText(getString(allowed ? R.string.notifications_allowed : R.string.notifications_muted, account.displayName))
+								.show();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, false)
+				.exec(accountID);
+		return true;
+	}
+
+	@Override
+	protected List<StatusDisplayItem> buildDisplayItems(Notification n){
+		if(n.type==Notification.Type.MENTION || n.type==Notification.Type.STATUS){
+			return StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, StatusDisplayItem.FLAG_MEDIA_FORCE_HIDDEN);
+		}
+		return super.buildDisplayItems(n);
+	}
+
+	@Override
+	protected boolean wantsToolbarMenuIconsTinted(){
+		return false;
+	}
+
+	private void tintMenuIcon(MenuItem item, int color){
+		int tintColor=UiUtils.getThemeColor(getActivity(), color);
+		if(Build.VERSION.SDK_INT<Build.VERSION_CODES.O){
+			Drawable icon=item.getIcon();
+			if(icon!=null && icon.getColorFilter()==null){
+				icon=icon.mutate();
+				icon.setTintList(ColorStateList.valueOf(tintColor));
+				item.setIcon(icon);
+			}
+		}else{
+			item.setIconTintList(ColorStateList.valueOf(tintColor));
+		}
+	}
+}

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

@@ -140,11 +140,6 @@ public class AccountTimelineFragment extends StatusListFragment{
 		return mergeAdapter;
 	}
 
-	@Override
-	protected int getMainAdapterOffset(){
-		return super.getMainAdapterOffset()+1;
-	}
-
 	private FilterChipView getViewForFilter(GetAccountStatuses.Filter filter){
 		return switch(filter){
 			case DEFAULT -> defaultFilter;

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

@@ -0,0 +1,120 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.Notification;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.displayitems.NotificationHeaderStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.utils.InsetStatusItemDecoration;
+import org.parceler.Parcels;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
+
+public abstract class BaseNotificationsListFragment extends BaseStatusListFragment<Notification>{
+	protected String maxID;
+	protected View endMark;
+
+	@Override
+	protected List<StatusDisplayItem> buildDisplayItems(Notification n){
+		NotificationHeaderStatusDisplayItem titleItem;
+		if(n.type==Notification.Type.MENTION || n.type==Notification.Type.STATUS){
+			titleItem=null;
+		}else{
+			titleItem=new NotificationHeaderStatusDisplayItem(n.id, this, n, accountID);
+			if(n.status!=null){
+				n.status.card=null;
+				n.status.spoilerText=null;
+			}
+		}
+		if(n.status!=null){
+			int flags=titleItem==null ? 0 : (StatusDisplayItem.FLAG_NO_FOOTER | StatusDisplayItem.FLAG_INSET | StatusDisplayItem.FLAG_NO_HEADER);
+			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, flags);
+			if(titleItem!=null)
+				items.add(0, titleItem);
+			return items;
+		}else if(titleItem!=null){
+			return Collections.singletonList(titleItem);
+		}else{
+			return Collections.emptyList();
+		}
+	}
+
+	@Override
+	protected void addAccountToKnown(Notification s){
+		if(!knownAccounts.containsKey(s.account.id))
+			knownAccounts.put(s.account.id, s.account);
+		if(s.status!=null && !knownAccounts.containsKey(s.status.account.id))
+			knownAccounts.put(s.status.account.id, s.status.account);
+	}
+
+	@Override
+	public void onItemClick(String id){
+		Notification n=getNotificationByID(id);
+		if(n.status!=null){
+			Status status=n.status;
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("status", Parcels.wrap(status.clone()));
+			if(status.inReplyToAccountId!=null && knownAccounts.containsKey(status.inReplyToAccountId))
+				args.putParcelable("inReplyToAccount", Parcels.wrap(knownAccounts.get(status.inReplyToAccountId)));
+			Nav.go(getActivity(), ThreadFragment.class, args);
+		}else{
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("profileAccount", Parcels.wrap(n.account));
+			Nav.go(getActivity(), ProfileFragment.class, args);
+		}
+	}
+
+	private Notification getNotificationByID(String id){
+		for(Notification n : data){
+			if(n.id.equals(id))
+				return n;
+		}
+		return null;
+	}
+
+	protected void removeNotification(Notification n){
+		data.remove(n);
+		preloadedData.remove(n);
+		int index=-1;
+		for(int i=0; i<displayItems.size(); i++){
+			if(n.id.equals(displayItems.get(i).parentID)){
+				index=i;
+				break;
+			}
+		}
+		if(index==-1)
+			return;
+		int lastIndex;
+		for(lastIndex=index; lastIndex<displayItems.size(); lastIndex++){
+			if(!displayItems.get(lastIndex).parentID.equals(n.id))
+				break;
+		}
+		displayItems.subList(index, lastIndex).clear();
+		adapter.notifyItemRangeRemoved(index, lastIndex-index);
+	}
+
+	@Override
+	protected View onCreateFooterView(LayoutInflater inflater){
+		View v=inflater.inflate(R.layout.load_more_with_end_mark, null);
+		endMark=v.findViewById(R.id.end_mark);
+		endMark.setVisibility(View.GONE);
+		return v;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		list.addItemDecoration(new InsetStatusItemDecoration(this));
+	}
+}

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

@@ -59,6 +59,9 @@ import java.util.stream.Collectors;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.dynamicanimation.animation.DynamicAnimation;
+import androidx.dynamicanimation.animation.SpringAnimation;
+import androidx.dynamicanimation.animation.SpringForce;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -79,6 +82,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	protected HashMap<String, Relationship> relationships=new HashMap<>();
 	protected Rect tmpRect=new Rect();
 	protected TypedObjectPool<MediaGridStatusDisplayItem.GridItemType, MediaAttachmentViewController> attachmentViewsPool=new TypedObjectPool<>(this::makeNewMediaAttachmentView);
+	private SpringAnimation listShakeAnimation;
 
 	public BaseStatusListFragment(){
 		super(20);
@@ -283,8 +287,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 					outRect.set(view.getLeft(), view.getTop(), view.getRight(), view.getBottom());
 				}
 				RecyclerView.ViewHolder holder=list.getChildViewHolder(view);
-				if(holder instanceof StatusDisplayItem.Holder){
-					if(((StatusDisplayItem.Holder<?>) holder).getItem().getType()==StatusDisplayItem.Type.GAP){
+				if(holder instanceof StatusDisplayItem.Holder<?> sih){
+					if(sih.getItem() instanceof StatusDisplayItem sdi && sdi.getType()==StatusDisplayItem.Type.GAP){
 						outRect.setEmpty();
 						return;
 					}
@@ -292,8 +296,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 					for(int i=0;i<list.getChildCount();i++){
 						View child=list.getChildAt(i);
 						holder=list.getChildViewHolder(child);
-						if(holder instanceof StatusDisplayItem.Holder){
-							String otherID=((StatusDisplayItem.Holder<?>) holder).getItemID();
+						if(holder instanceof StatusDisplayItem.Holder<?> sih2){
+							String otherID=sih2.getItemID();
 							if(otherID.equals(id)){
 								list.getDecoratedBoundsWithMargins(child, tmpRect);
 								outRect.left=Math.min(outRect.left, tmpRect.left);
@@ -325,7 +329,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		toolbar.setNavigationContentDescription(R.string.back);
 	}
 
-	protected int getMainAdapterOffset(){
+	public int getMainAdapterOffset(){
 		if(list.getAdapter() instanceof MergeRecyclerAdapter mergeAdapter){
 			return mergeAdapter.getPositionForAdapter(adapter);
 		}
@@ -675,6 +679,17 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 
 	protected void onModifyItemViewHolder(BindableViewHolder<StatusDisplayItem> holder){}
 
+	public void shakeListView(){
+		if(listShakeAnimation!=null)
+			listShakeAnimation.cancel();
+		SpringAnimation anim=new SpringAnimation(list, DynamicAnimation.TRANSLATION_X, 0);
+		anim.setStartVelocity(V.dp(-500));
+		anim.getSpring().setStiffness(500).setDampingRatio(SpringForce.DAMPING_RATIO_LOW_BOUNCY);
+		listShakeAnimation=anim;
+		anim.addEndListener((animation, canceled, value, velocity)->listShakeAnimation=null);
+		anim.start();
+	}
+
 	protected class DisplayItemsAdapter extends UsableRecyclerView.Adapter<BindableViewHolder<StatusDisplayItem>> implements ImageLoaderRecyclerAdapter{
 
 		public DisplayItemsAdapter(){
@@ -745,7 +760,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				// Do not draw dividers between hashtag and/or account rows
 				if((ih instanceof HashtagStatusDisplayItem.Holder || ih instanceof AccountStatusDisplayItem.Holder) && (sh instanceof HashtagStatusDisplayItem.Holder || sh instanceof AccountStatusDisplayItem.Holder))
 					return false;
-				return !ih.getItemID().equals(sh.getItemID()) && ih.getItem().getType()!=StatusDisplayItem.Type.GAP;
+				return !ih.getItemID().equals(sh.getItemID()) && ih.getItem() instanceof StatusDisplayItem sdi && sdi.getType()!=StatusDisplayItem.Type.GAP;
 			}
 			return false;
 		}

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

@@ -23,6 +23,10 @@ import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.style.BackgroundColorSpan;
 import android.text.style.ForegroundColorSpan;
+import android.transition.ChangeBounds;
+import android.transition.Fade;
+import android.transition.TransitionManager;
+import android.transition.TransitionSet;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -32,15 +36,14 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.WindowManager;
+import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.PopupMenu;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -66,7 +69,9 @@ import org.joinmastodon.android.model.Mention;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
+import org.joinmastodon.android.model.viewmodel.ListItem;
 import org.joinmastodon.android.ui.CustomEmojiPopupKeyboard;
+import org.joinmastodon.android.ui.ExtendedPopupMenu;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.PopupKeyboard;
@@ -87,21 +92,22 @@ import org.parceler.Parcels;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import androidx.annotation.NonNull;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.CustomTransitionsFragment;
-import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
-public class ComposeFragment extends MastodonToolbarFragment implements OnBackPressedListener, ComposeEditText.SelectionListener, CustomTransitionsFragment{
+public class ComposeFragment extends MastodonToolbarFragment implements ComposeEditText.SelectionListener, CustomTransitionsFragment{
 
 	private static final int MEDIA_RESULT=717;
 	public static final int IMAGE_DESCRIPTION_RESULT=363;
@@ -131,7 +137,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, languageBtn;
 	private TextView replyText;
-	private Button visibilityBtn;
+	private LinearLayout visibilityBtn;
+	private TextView visibilityText1, visibilityText2, visibilityCurrentText;
 	private LinearLayout bottomBar;
 	private View autocompleteDivider;
 
@@ -165,6 +172,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private BackgroundColorSpan overLimitBG;
 	private ForegroundColorSpan overLimitFG;
 
+	private Runnable emojiKeyboardHider;
+	private Runnable sendingBackButtonBlocker=()->{};
+	private Runnable discardConfirmationCallback=this::confirmDiscardDraftAndFinish;
+	private boolean prevHadDraft;
+
 	public ComposeFragment(){
 		super(R.layout.toolbar_fragment_with_progressbar);
 	}
@@ -241,6 +253,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				getActivity().dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
 			}
 		});
+		emojiKeyboardHider=emojiKeyboard::hide;
 
 		View view=inflater.inflate(R.layout.fragment_compose, container, false);
 		mainLayout=view.findViewById(R.id.compose_main_ll);
@@ -271,6 +284,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		emojiBtn=view.findViewById(R.id.btn_emoji);
 		spoilerBtn=view.findViewById(R.id.btn_spoiler);
 		visibilityBtn=view.findViewById(R.id.btn_visibility);
+		visibilityText1=view.findViewById(R.id.visibility_text1);
+		visibilityText2=view.findViewById(R.id.visibility_text2);
+		visibilityCurrentText=visibilityText1;
 		languageBtn=view.findViewById(R.id.btn_language);
 		replyText=view.findViewById(R.id.reply_text);
 
@@ -280,14 +296,24 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		spoilerBtn.setOnClickListener(v->toggleSpoiler());
 		languageBtn.setOnClickListener(v->showLanguageAlert());
 		visibilityBtn.setOnClickListener(this::onVisibilityClick);
+		visibilityBtn.setAccessibilityDelegate(new View.AccessibilityDelegate(){
+			@Override
+			public void onInitializeAccessibilityNodeInfo(@NonNull View host, @NonNull AccessibilityNodeInfo info){
+				super.onInitializeAccessibilityNodeInfo(host, info);
+				info.setClassName("android.widget.Spinner");
+			}
+		});
 		Drawable arrow=getResources().getDrawable(R.drawable.ic_baseline_arrow_drop_down_18, getActivity().getTheme()).mutate();
 		arrow.setTint(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurface));
-		visibilityBtn.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, arrow, null);
 		emojiKeyboard.setOnIconChangedListener(new PopupKeyboard.OnIconChangeListener(){
 			@Override
 			public void onIconChanged(int icon){
 				emojiBtn.setSelected(icon!=PopupKeyboard.ICON_HIDDEN);
 				updateNavigationBarColor(icon!=PopupKeyboard.ICON_HIDDEN);
+				if(icon!=PopupKeyboard.ICON_HIDDEN)
+					addBackCallback(emojiKeyboardHider);
+				else
+					removeBackCallback(emojiKeyboardHider);
 				if(autocompleteViewController.getMode()==ComposeAutocompleteViewController.Mode.EMOJIS){
 					contentView.layout(contentView.getLeft(), contentView.getTop(), contentView.getRight(), contentView.getBottom());
 					if(icon==PopupKeyboard.ICON_HIDDEN)
@@ -323,7 +349,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		if(editingStatus!=null && editingStatus.visibility!=null) {
 			statusVisibility=editingStatus.visibility;
 		}
-		updateVisibilityIcon();
+		updateVisibilityIcon(false);
 
 		autocompleteViewController=new ComposeAutocompleteViewController(getActivity(), accountID);
 		autocompleteViewController.setCompletionSelectedListener(new ComposeAutocompleteViewController.AutocompleteListener(){
@@ -378,6 +404,21 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		super.onResume();
 	}
 
+	@Override
+	protected void onHidden(){
+		super.onHidden();
+		if(prevHadDraft){
+			prevHadDraft=false;
+			removeBackCallback(discardConfirmationCallback);
+		}
+	}
+
+	@Override
+	protected void onShown(){
+		super.onShown();
+		updateDraftState();
+	}
+
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
@@ -463,6 +504,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				}
 
 				updateCharCounter();
+				updateDraftState();
 			}
 		});
 		spoilerEdit.addTextChangedListener(new SimpleTextWatcher(e->updateCharCounter()));
@@ -604,6 +646,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		if(publishButton==null)
 			return;
 		publishButton.setEnabled((trimmedCharCount>0 || !mediaViewController.isEmpty()) && charCount<=charLimit && mediaViewController.getNonDoneAttachmentCount()==0 && (pollViewController.isEmpty() || pollViewController.getNonEmptyOptionsCount()>1));
+		updateDraftState();
 	}
 
 	private void onCustomEmojiClick(Emoji emoji){
@@ -679,6 +722,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		overlayParams.softInputMode=WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED;
 		overlayParams.token=mainEditText.getWindowToken();
 		wm.addView(sendingOverlay, overlayParams);
+		addBackCallback(sendingBackButtonBlocker);
 
 		publishButton.setEnabled(false);
 		V.setVisibilityAnimated(sendProgress, View.VISIBLE);
@@ -703,8 +747,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		if(!pollViewController.isEmpty()){
 			req.poll=pollViewController.getPollForRequest();
 		}
-		if(hasSpoiler && spoilerEdit.length()>0){
-			req.spoilerText=spoilerEdit.getText().toString();
+		if(hasSpoiler){
+			if(spoilerEdit.length()>0)
+				req.spoilerText=spoilerEdit.getText().toString();
+			else
+				req.sensitive=true;
 		}
 		if(postLang!=null){
 			req.language=postLang.locale.toLanguageTag();
@@ -717,6 +764,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			public void onSuccess(Status result){
 				wm.removeView(sendingOverlay);
 				sendingOverlay=null;
+				removeBackCallback(sendingBackButtonBlocker);
+				removeBackCallback(discardConfirmationCallback);
+				removeBackCallback(emojiKeyboardHider);
 				if(editingStatus==null){
 					E.post(new StatusCreatedEvent(result, accountID));
 					if(replyTo!=null){
@@ -749,6 +799,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private void handlePublishError(ErrorResponse error){
 		wm.removeView(sendingOverlay);
 		sendingOverlay=null;
+		removeBackCallback(sendingBackButtonBlocker);
 		V.setVisibilityAnimated(sendProgress, View.GONE);
 		publishButton.setEnabled(true);
 		if(error instanceof MastodonErrorResponse me){
@@ -776,19 +827,16 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		return (mainEditText.length()>0 && !mainEditText.getText().toString().equals(initialText)) || !mediaViewController.isEmpty() || pollFieldsHaveContent;
 	}
 
-	@Override
-	public boolean onBackPressed(){
-		if(emojiKeyboard.isVisible()){
-			emojiKeyboard.hide();
-			return true;
+	private void updateDraftState(){
+		boolean hasDraft=hasDraft();
+		if(hasDraft!=prevHadDraft){
+			prevHadDraft=hasDraft;
+			if(hasDraft){
+				addBackCallback(discardConfirmationCallback);
+			}else{
+				removeBackCallback(discardConfirmationCallback);
+			}
 		}
-		if(hasDraft()){
-			confirmDiscardDraftAndFinish();
-			return true;
-		}
-		if(sendingOverlay!=null)
-			return true;
-		return false;
 	}
 
 	@Override
@@ -822,7 +870,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private void confirmDiscardDraftAndFinish(){
 		new M3AlertDialogBuilder(getActivity())
 				.setTitle(editingStatus==null ? R.string.discard_draft : R.string.discard_changes)
-				.setPositiveButton(R.string.discard, (dialog, which)->Nav.finish(this))
+				.setPositiveButton(R.string.discard, (dialog, which)->{
+					removeBackCallback(discardConfirmationCallback);
+					Nav.finish(this);
+				})
 				.setNegativeButton(R.string.cancel, null)
 				.show();
 	}
@@ -909,22 +960,20 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	private void onVisibilityClick(View v){
-		PopupMenu menu=new PopupMenu(getActivity(), v);
-		menu.inflate(R.menu.compose_visibility);
-		menu.setOnMenuItemClickListener(item->{
-			int id=item.getItemId();
-			if(id==R.id.vis_public){
-				statusVisibility=StatusPrivacy.PUBLIC;
-			}else if(id==R.id.vis_followers){
-				statusVisibility=StatusPrivacy.PRIVATE;
-			}else if(id==R.id.vis_private){
-				statusVisibility=StatusPrivacy.DIRECT;
+		ArrayList<ListItem<StatusPrivacy>> items=new ArrayList<>();
+		ExtendedPopupMenu menu=new ExtendedPopupMenu(getActivity(), items);
+		Consumer<ListItem<StatusPrivacy>> onClick=i->{
+			if(statusVisibility!=i.parentObject){
+				statusVisibility=i.parentObject;
+				updateVisibilityIcon(true);
 			}
-			item.setChecked(true);
-			updateVisibilityIcon();
-			return true;
-		});
-		menu.show();
+			menu.dismiss();
+		};
+		items.add(new ListItem<>(R.string.visibility_public, R.string.visibility_subtitle_public, R.drawable.ic_public_24px, StatusPrivacy.PUBLIC, onClick));
+		items.add(new ListItem<>(R.string.visibility_unlisted, R.string.visibility_subtitle_unlisted, R.drawable.ic_clear_night_24px, StatusPrivacy.UNLISTED, onClick));
+		items.add(new ListItem<>(R.string.visibility_followers_only, R.string.visibility_subtitle_followers, R.drawable.ic_lock_24px, StatusPrivacy.PRIVATE, onClick));
+		items.add(new ListItem<>(R.string.visibility_private, R.string.visibility_subtitle_private, R.drawable.ic_alternate_email_24px, StatusPrivacy.DIRECT, onClick));
+		menu.showAsDropDown(v);
 	}
 
 	private void loadDefaultStatusVisibility(Bundle savedInstanceState){
@@ -950,12 +999,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private void applyPreferencesForPostVisibility(Preferences prefs, Bundle savedInstanceState){
 		// Only override the reply visibility if our preference is more private
 		if(prefs.postingDefaultVisibility.isLessVisibleThan(statusVisibility)){
-			// Map unlisted from the API onto public, because we don't have unlisted in the UI
-			statusVisibility=switch(prefs.postingDefaultVisibility){
-				case PUBLIC, UNLISTED -> StatusPrivacy.PUBLIC;
-				case PRIVATE -> StatusPrivacy.PRIVATE;
-				case DIRECT -> StatusPrivacy.DIRECT;
-			};
+			statusVisibility=prefs.postingDefaultVisibility;
 		}
 
 		// A saved privacy setting from a previous compose session wins over all
@@ -963,28 +1007,45 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			statusVisibility=(StatusPrivacy) savedInstanceState.getSerializable("visibility");
 		}
 
-		updateVisibilityIcon();
+		updateVisibilityIcon(false);
 	}
 
-	private void updateVisibilityIcon(){
+	private void updateVisibilityIcon(boolean animated){
 		if(getActivity()==null)
 			return;
 		if(statusVisibility==null){ // TODO find out why this happens
 			statusVisibility=StatusPrivacy.PUBLIC;
 		}
-		visibilityBtn.setText(switch(statusVisibility){
-			case PUBLIC, UNLISTED -> R.string.visibility_public;
+		TextView visibilityText;
+		if(!animated){
+			visibilityText=visibilityCurrentText;
+		}else{
+			TransitionManager.beginDelayedTransition(visibilityBtn, new TransitionSet()
+					.addTransition(new Fade(Fade.IN | Fade.OUT))
+					.addTransition(new ChangeBounds().excludeTarget(TextView.class, true))
+					.setDuration(250)
+					.setInterpolator(CubicBezierInterpolator.DEFAULT)
+			);
+			visibilityText=visibilityCurrentText==visibilityText1 ? visibilityText2 : visibilityText1;
+			visibilityText.setVisibility(View.VISIBLE);
+			visibilityCurrentText.setVisibility(View.GONE);
+			visibilityCurrentText=visibilityText;
+		}
+		visibilityText.setText(switch(statusVisibility){
+			case PUBLIC -> R.string.visibility_public;
+			case UNLISTED -> R.string.visibility_unlisted;
 			case PRIVATE -> R.string.visibility_followers_only;
 			case DIRECT -> R.string.visibility_private;
 		});
 		Drawable icon=getResources().getDrawable(switch(statusVisibility){
-			case PUBLIC, UNLISTED -> R.drawable.ic_public_20px;
+			case PUBLIC -> R.drawable.ic_public_20px;
+			case UNLISTED -> R.drawable.ic_clear_night_20px;
 			case PRIVATE -> R.drawable.ic_group_20px;
 			case DIRECT -> R.drawable.ic_alternate_email_20px;
 		}, getActivity().getTheme()).mutate();
 		icon.setBounds(0, 0, V.dp(18), V.dp(18));
 		icon.setTint(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary));
-		visibilityBtn.setCompoundDrawablesRelative(icon, null, visibilityBtn.getCompoundDrawablesRelative()[2], null);
+		visibilityText.setCompoundDrawablesRelative(icon, null, null, null);
 	}
 
 	@Override

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

@@ -32,12 +32,11 @@ import java.util.Collections;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.V;
 
-public class ComposeImageDescriptionFragment extends MastodonToolbarFragment implements OnBackPressedListener{
+public class ComposeImageDescriptionFragment extends MastodonToolbarFragment{
 	private static final String TAG="ComposeImageDescription";
 
 	private String accountID, attachmentID;
@@ -138,9 +137,9 @@ public class ComposeImageDescriptionFragment extends MastodonToolbarFragment imp
 	}
 
 	@Override
-	public boolean onBackPressed(){
+	public void onStop(){
+		super.onStop();
 		deliverResult();
-		return false;
 	}
 
 	@Override

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

@@ -42,13 +42,11 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.fragments.OnBackPressedListener;
-import me.grishka.appkit.fragments.WindowInsetsAwareFragment;
 import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 
-public class CreateListAddMembersFragment extends BaseAccountListFragment implements OnBackPressedListener, AddNewListMembersFragment.Listener{
+public class CreateListAddMembersFragment extends BaseAccountListFragment implements AddNewListMembersFragment.Listener{
 	private FollowList followList;
 	private Button nextButton;
 	private View buttonBar;
@@ -59,6 +57,7 @@ public class CreateListAddMembersFragment extends BaseAccountListFragment implem
 	private WindowInsets lastInsets;
 	private boolean dismissingSearchFragment;
 	private HashSet<String> accountIDsInList=new HashSet<>();
+	private Runnable searchFragmentDismisser=this::dismissSearchFragment;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -156,6 +155,7 @@ public class CreateListAddMembersFragment extends BaseAccountListFragment implem
 		searchFragmentContainer.animate().translationX(0).alpha(1).setDuration(300).withLayer().setInterpolator(CubicBezierInterpolator.DEFAULT).withEndAction(()->{
 			rootView.setVisibility(View.GONE);
 		}).start();
+		addBackCallback(searchFragmentDismisser);
 		return true;
 	}
 
@@ -183,6 +183,7 @@ public class CreateListAddMembersFragment extends BaseAccountListFragment implem
 	private void dismissSearchFragment(){
 		if(searchFragment==null || dismissingSearchFragment)
 			return;
+		removeBackCallback(searchFragmentDismisser);
 		dismissingSearchFragment=true;
 		rootView.setVisibility(View.VISIBLE);
 		searchFragmentContainer.animate().translationX(V.dp(100)).alpha(0).setDuration(200).withLayer().setInterpolator(CubicBezierInterpolator.DEFAULT).withEndAction(()->{
@@ -201,15 +202,6 @@ public class CreateListAddMembersFragment extends BaseAccountListFragment implem
 		Nav.finish(this);
 	}
 
-	@Override
-	public boolean onBackPressed(){
-		if(searchFragment!=null){
-			dismissSearchFragment();
-			return true;
-		}
-		return false;
-	}
-
 	@Override
 	public boolean isAccountInList(AccountViewModel account){
 		return accountIDsInList.contains(account.account.id);

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

@@ -34,7 +34,6 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
@@ -155,7 +154,7 @@ public class HashtagTimelineFragment extends StatusListFragment{
 	}
 
 	@Override
-	protected int getMainAdapterOffset(){
+	public int getMainAdapterOffset(){
 		return 1;
 	}
 
@@ -276,4 +275,8 @@ public class HashtagTimelineFragment extends StatusListFragment{
 				})
 				.exec(accountID);
 	}
+
+	public String getHashtagName(){
+		return hashtagName;
+	}
 }

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

@@ -30,8 +30,8 @@ import org.joinmastodon.android.fragments.onboarding.OnboardingFollowSuggestions
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
-import org.joinmastodon.android.ui.sheets.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.OutlineProviders;
+import org.joinmastodon.android.ui.sheets.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.TabBar;
 import org.joinmastodon.android.utils.ObjectIdComparator;
@@ -48,13 +48,12 @@ import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.AppKitFragment;
 import me.grishka.appkit.fragments.LoaderFragment;
-import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 
-public class HomeFragment extends AppKitFragment implements OnBackPressedListener{
+public class HomeFragment extends AppKitFragment{
 	private FragmentRootLinearLayout content;
 	private HomeTimelineFragment homeTimelineFragment;
 	private NotificationsListFragment notificationsFragment;
@@ -272,15 +271,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		return false;
 	}
 
-	@Override
-	public boolean onBackPressed(){
-		if(currentTab==R.id.tab_profile)
-			return profileFragment.onBackPressed();
-		if(currentTab==R.id.tab_search)
-			return searchFragment.onBackPressed();
-		return false;
-	}
-
 	@Override
 	public void onSaveInstanceState(Bundle outState){
 		super.onSaveInstanceState(outState);

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

@@ -44,12 +44,11 @@ import java.util.stream.Collectors;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 
-public class ListMembersFragment extends PaginatedAccountListFragment implements AddNewListMembersFragment.Listener, OnBackPressedListener{
+public class ListMembersFragment extends PaginatedAccountListFragment implements AddNewListMembersFragment.Listener{
 	private ImageButton fab;
 	private FollowList followList;
 	private boolean inSelectionMode;
@@ -63,6 +62,8 @@ public class ListMembersFragment extends PaginatedAccountListFragment implements
 	private WindowInsets lastInsets;
 	private HashSet<String> accountIDsInList=new HashSet<>();
 	private boolean dismissingSearchFragment;
+	private Runnable searchFragmentDismisser=this::dismissSearchFragment;;
+	private Runnable actionModeDismisser=()->actionMode.finish();
 
 	public ListMembersFragment(){
 		setListLayoutId(R.layout.recycler_fragment_with_fab);
@@ -214,6 +215,7 @@ public class ListMembersFragment extends PaginatedAccountListFragment implements
 		searchFragmentContainer.animate().translationX(0).alpha(1).setDuration(300).withLayer().setInterpolator(CubicBezierInterpolator.DEFAULT).withEndAction(()->{
 			rootView.setVisibility(View.GONE);
 		}).start();
+		addBackCallback(searchFragmentDismisser);
 	}
 
 	private void onItemClick(AccountViewHolder holder){
@@ -293,9 +295,11 @@ public class ListMembersFragment extends PaginatedAccountListFragment implements
 				selectedAccounts.clear();
 				updateItemsForSelectionModeTransition();
 				V.setVisibilityAnimated(fab, View.VISIBLE);
+				removeBackCallback(actionModeDismisser);
 			}
 		});
 		updateActionModeTitle();
+		addBackCallback(actionModeDismisser);
 	}
 
 	private void updateActionModeTitle(){
@@ -371,15 +375,6 @@ public class ListMembersFragment extends PaginatedAccountListFragment implements
 		removeAccounts(Set.of(account.account.id), onDone);
 	}
 
-	@Override
-	public boolean onBackPressed(){
-		if(searchFragment!=null){
-			dismissSearchFragment();
-			return true;
-		}
-		return false;
-	}
-
 	private void dismissSearchFragment(){
 		if(searchFragment==null || dismissingSearchFragment)
 			return;
@@ -393,6 +388,7 @@ public class ListMembersFragment extends PaginatedAccountListFragment implements
 			searchFragment=null;
 			dismissingSearchFragment=false;
 		}).start();
+		removeBackCallback(searchFragmentDismisser);
 		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
 	}
 

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

@@ -0,0 +1,250 @@
+package org.joinmastodon.android.fragments;
+
+import android.annotation.SuppressLint;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.notifications.GetNotificationRequests;
+import org.joinmastodon.android.api.requests.notifications.RespondToNotificationRequest;
+import org.joinmastodon.android.events.NotificationRequestRespondedEvent;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.NotificationRequest;
+import org.joinmastodon.android.model.viewmodel.AccountViewModel;
+import org.joinmastodon.android.ui.BetterItemAnimator;
+import org.joinmastodon.android.ui.DividerItemDecoration;
+import org.joinmastodon.android.ui.OutlineProviders;
+import org.joinmastodon.android.ui.Snackbar;
+import org.parceler.Parcels;
+
+import java.util.HashMap;
+import java.util.Objects;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
+import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
+import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class NotificationRequestsFragment extends MastodonRecyclerFragment<NotificationRequest>{
+	private String accountID;
+	private String maxID;
+	private HashMap<String, AccountViewModel> accountViewModels=new HashMap<>();
+	private View endMark;
+	private NotificationRequestsAdapter adapter;
+
+	public NotificationRequestsFragment(){
+		super(50);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		accountID=getArguments().getString("account");
+		setTitle(R.string.filtered_notifications);
+		loadData();
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy(){
+		E.unregister(this);
+		super.onDestroy();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		if(!refreshing && endMark!=null)
+			endMark.setVisibility(View.GONE);
+		currentRequest=new GetNotificationRequests(offset==0 ? null : maxID)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(HeaderPaginationList<NotificationRequest> result){
+						if(data.isEmpty() || refreshing)
+							accountViewModels.clear();
+						maxID=result.getNextPageMaxID();
+						for(NotificationRequest req:result){
+							accountViewModels.put(req.account.id, new AccountViewModel(req.account, accountID, false));
+						}
+						onDataLoaded(result, !TextUtils.isEmpty(maxID));
+						endMark.setVisibility(TextUtils.isEmpty(maxID) ? View.VISIBLE : View.GONE);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected RecyclerView.Adapter<?> getAdapter(){
+		return adapter=new NotificationRequestsAdapter();
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		list.setItemAnimator(new BetterItemAnimator());
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorM3OutlineVariant, 1, 0, 0, vh->vh instanceof NotificationRequestViewHolder).setDrawBelowLastItem(true));
+	}
+
+	@Override
+	protected View onCreateFooterView(LayoutInflater inflater){
+		View v=inflater.inflate(R.layout.load_more_with_end_mark, null);
+		endMark=v.findViewById(R.id.end_mark);
+		endMark.setVisibility(View.GONE);
+		return v;
+	}
+
+	@Subscribe
+	public void onNotificationRequestResponded(NotificationRequestRespondedEvent ev){
+		if(adapter==null || !ev.accountID.equals(accountID))
+			return;
+		for(int i=0;i<data.size();i++){
+			if(data.get(i).id.equals(ev.requestID)){
+				data.remove(i);
+				adapter.notifyItemRemoved(i);
+				return;
+			}
+		}
+		for(NotificationRequest nr:preloadedData){
+			if(nr.id.equals(ev.requestID)){
+				preloadedData.remove(nr);
+				break;
+			}
+		}
+	}
+
+	private class NotificationRequestsAdapter extends UsableRecyclerView.Adapter<NotificationRequestViewHolder> implements ImageLoaderRecyclerAdapter{
+
+		public NotificationRequestsAdapter(){
+			super(imgLoader);
+		}
+
+		@NonNull
+		@Override
+		public NotificationRequestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new NotificationRequestViewHolder();
+		}
+
+		@Override
+		public int getItemCount(){
+			return data.size();
+		}
+
+		@Override
+		public void onBindViewHolder(NotificationRequestViewHolder holder, int position){
+			holder.bind(data.get(position));
+			super.onBindViewHolder(holder, position);
+		}
+
+		@Override
+		public int getImageCountForItem(int position){
+			return Objects.requireNonNull(accountViewModels.get(data.get(position).account.id)).emojiHelper.getImageCount()+1;
+		}
+
+		@Override
+		public ImageLoaderRequest getImageRequest(int position, int image){
+			AccountViewModel model=Objects.requireNonNull(accountViewModels.get(data.get(position).account.id));
+			return switch(image){
+				case 0 -> model.avaRequest;
+				default -> model.emojiHelper.getImageRequest(image-1);
+			};
+		}
+	}
+
+	private class NotificationRequestViewHolder extends BindableViewHolder<NotificationRequest> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable{
+		private final TextView name, username, badge;
+		private final ImageView ava;
+		private final ImageButton allow, mute;
+
+		public NotificationRequestViewHolder(){
+			super(getActivity(), R.layout.item_notification_request, list);
+			name=findViewById(R.id.name);
+			username=findViewById(R.id.username);
+			badge=findViewById(R.id.badge);
+			ava=findViewById(R.id.ava);
+			allow=findViewById(R.id.btn_allow);
+			mute=findViewById(R.id.btn_mute);
+			ava.setOutlineProvider(OutlineProviders.roundedRect(8));
+			ava.setClipToOutline(true);
+			allow.setOnClickListener(this::onAllowClick);
+			mute.setOnClickListener(this::onMuteClick);
+		}
+
+		@SuppressLint("DefaultLocale")
+		@Override
+		public void onBind(NotificationRequest item){
+			AccountViewModel model=Objects.requireNonNull(accountViewModels.get(item.account.id));
+			name.setText(model.parsedName);
+			username.setText(item.account.getDisplayUsername());
+			badge.setText(item.notificationsCount>99 ? String.format("%d+", 99) : String.format("%d", item.notificationsCount));
+		}
+
+		@Override
+		public void setImage(int index, Drawable image){
+			if(index==0){
+				if(image==null)
+					 ava.setImageResource(R.drawable.image_placeholder);
+				else
+					 ava.setImageDrawable(image);
+			}else{
+				AccountViewModel model=Objects.requireNonNull(accountViewModels.get(item.account.id));
+				model.emojiHelper.setImageDrawable(index-1, image);
+				name.invalidate();
+			}
+		}
+
+		@Override
+		public void onClick(){
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("targetAccount", Parcels.wrap(item.account));
+			args.putString("requestID", item.id);
+			Nav.go(getActivity(), AccountNotificationsListFragment.class, args);
+		}
+
+		private void onAllowClick(View v){
+			acceptOrDecline(true);
+		}
+
+		private void onMuteClick(View v){
+			acceptOrDecline(false);
+		}
+
+		private void acceptOrDecline(boolean accept){
+			new RespondToNotificationRequest(item.id, accept)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(Void result){
+							int pos=data.indexOf(item);
+							data.remove(pos);
+							adapter.notifyItemRemoved(pos);
+							new Snackbar.Builder(getActivity())
+									.setText(getString(accept ? R.string.notifications_allowed : R.string.notifications_muted, item.account.displayName))
+									.show();
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							error.showToast(getActivity());
+						}
+					})
+					.wrapProgress(getActivity(), R.string.loading, false)
+					.exec(accountID);
+		}
+	}
+}

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

@@ -1,57 +1,70 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Button;
 
 import com.squareup.otto.Subscribe;
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
+import org.joinmastodon.android.api.requests.notifications.GetNotificationsPolicy;
+import org.joinmastodon.android.api.requests.notifications.SetNotificationsPolicy;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.model.Notification;
+import org.joinmastodon.android.model.NotificationsPolicy;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.OutlineProviders;
-import org.joinmastodon.android.ui.displayitems.NotificationHeaderStatusDisplayItem;
+import org.joinmastodon.android.ui.adapters.GenericListItemsAdapter;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.utils.InsetStatusItemDecoration;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.viewcontrollers.GenericListItemsViewController;
 import org.joinmastodon.android.ui.views.NestedRecyclerScrollView;
 import org.joinmastodon.android.utils.ObjectIdComparator;
-import org.parceler.Parcels;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
 
-public class NotificationsListFragment extends BaseStatusListFragment<Notification>{
+public class NotificationsListFragment extends BaseNotificationsListFragment{
 	private boolean onlyMentions;
-	private String maxID;
 	private View tabBar;
 	private View mentionsTab, allTab;
-	private View endMark;
 	private String unreadMarker, realUnreadMarker;
 	private MenuItem markAllReadItem;
 	private boolean reloadingFromCache;
+	private ListItem<Void> requestsItem=new ListItem<>(R.string.filtered_notifications, 0, R.drawable.ic_inventory_2_24px, i->openNotificationRequests());
+	private ArrayList<ListItem<Void>> requestsItems=new ArrayList<>();
+	private GenericListItemsAdapter<Void> requestsRowAdapter=new GenericListItemsAdapter<>(requestsItems);
+	private NotificationsPolicy lastPolicy;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -74,43 +87,12 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		setTitle(R.string.notifications);
 	}
 
-	@Override
-	protected List<StatusDisplayItem> buildDisplayItems(Notification n){
-		NotificationHeaderStatusDisplayItem titleItem;
-		if(n.type==Notification.Type.MENTION || n.type==Notification.Type.STATUS){
-			titleItem=null;
-		}else{
-			titleItem=new NotificationHeaderStatusDisplayItem(n.id, this, n, accountID);
-			if(n.status!=null){
-				n.status.card=null;
-				n.status.spoilerText=null;
-			}
-		}
-		if(n.status!=null){
-			int flags=titleItem==null ? 0 : (StatusDisplayItem.FLAG_NO_FOOTER | StatusDisplayItem.FLAG_INSET | StatusDisplayItem.FLAG_NO_HEADER);
-			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, flags);
-			if(titleItem!=null)
-				items.add(0, titleItem);
-			return items;
-		}else if(titleItem!=null){
-			return Collections.singletonList(titleItem);
-		}else{
-			return Collections.emptyList();
-		}
-	}
-
-	@Override
-	protected void addAccountToKnown(Notification s){
-		if(!knownAccounts.containsKey(s.account.id))
-			knownAccounts.put(s.account.id, s.account);
-		if(s.status!=null && !knownAccounts.containsKey(s.status.account.id))
-			knownAccounts.put(s.status.account.id, s.status.account);
-	}
-
 	@Override
 	protected void doLoadData(int offset, int count){
 		if(!refreshing && !reloadingFromCache)
 			endMark.setVisibility(View.GONE);
+		if(offset==0)
+			reloadPolicy();
 		AccountSessionManager.getInstance()
 				.getAccount(accountID).getCacheController()
 				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, refreshing && !reloadingFromCache, new SimpleCallback<>(this){
@@ -142,30 +124,10 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		resetUnreadBackground();
 	}
 
-	@Override
-	public void onItemClick(String id){
-		Notification n=getNotificationByID(id);
-		if(n.status!=null){
-			Status status=n.status;
-			Bundle args=new Bundle();
-			args.putString("account", accountID);
-			args.putParcelable("status", Parcels.wrap(status.clone()));
-			if(status.inReplyToAccountId!=null && knownAccounts.containsKey(status.inReplyToAccountId))
-				args.putParcelable("inReplyToAccount", Parcels.wrap(knownAccounts.get(status.inReplyToAccountId)));
-			Nav.go(getActivity(), ThreadFragment.class, args);
-		}else{
-			Bundle args=new Bundle();
-			args.putString("account", accountID);
-			args.putParcelable("profileAccount", Parcels.wrap(n.account));
-			Nav.go(getActivity(), ProfileFragment.class, args);
-		}
-	}
-
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		tabBar=view.findViewById(R.id.tabbar);
 		super.onViewCreated(view, savedInstanceState);
-		list.addItemDecoration(new InsetStatusItemDecoration(this));
 
 		View tabBarItself=view.findViewById(R.id.tabbar_inner);
 		tabBarItself.setOutlineProvider(OutlineProviders.roundedRect(20));
@@ -215,14 +177,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		return views;
 	}
 
-	private Notification getNotificationByID(String id){
-		for(Notification n:data){
-			if(n.id.equals(id))
-				return n;
-		}
-		return null;
-	}
-
 	@Subscribe
 	public void onPollUpdated(PollUpdatedEvent ev){
 		if(!ev.accountID.equals(accountID))
@@ -249,25 +203,9 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		}
 	}
 
-	private void removeNotification(Notification n){
-		data.remove(n);
-		preloadedData.remove(n);
-		int index=-1;
-		for(int i=0;i<displayItems.size();i++){
-			if(n.id.equals(displayItems.get(i).parentID)){
-				index=i;
-				break;
-			}
-		}
-		if(index==-1)
-			return;
-		int lastIndex;
-		for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
-			if(!displayItems.get(lastIndex).parentID.equals(n.id))
-				break;
-		}
-		displayItems.subList(index, lastIndex).clear();
-		adapter.notifyItemRangeRemoved(index, lastIndex-index);
+	@Override
+	protected boolean needDividerForExtraItem(View child, View bottomSibling, RecyclerView.ViewHolder holder, RecyclerView.ViewHolder siblingHolder){
+		return super.needDividerForExtraItem(child, bottomSibling, holder, siblingHolder) || (siblingHolder!=null && siblingHolder.getAbsoluteAdapterPosition()>=adapter.getItemCount()) || holder.getAbsoluteAdapterPosition()<requestsItems.size();
 	}
 
 	private void onTabClick(View v){
@@ -285,34 +223,34 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		AccountSessionManager.get(accountID).setNotificationsMentionsOnly(onlyMentions);
 	}
 
-	@Override
-	protected View onCreateFooterView(LayoutInflater inflater){
-		View v=inflater.inflate(R.layout.load_more_with_end_mark, null);
-		endMark=v.findViewById(R.id.end_mark);
-		endMark.setVisibility(View.GONE);
-		return v;
-	}
-
-	@Override
-	protected boolean needDividerForExtraItem(View child, View bottomSibling, RecyclerView.ViewHolder holder, RecyclerView.ViewHolder siblingHolder){
-		return super.needDividerForExtraItem(child, bottomSibling, holder, siblingHolder) || (siblingHolder!=null && siblingHolder.getAbsoluteAdapterPosition()>=adapter.getItemCount());
-	}
-
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		inflater.inflate(R.menu.notifications, menu);
 		markAllReadItem=menu.findItem(R.id.mark_all_read);
+		MenuItem filters=menu.findItem(R.id.filters);
+		filters.setVisible(lastPolicy!=null);
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item){
-		if(item.getItemId()==R.id.mark_all_read){
+		int id=item.getItemId();
+		if(id==R.id.mark_all_read){
 			markAsRead();
 			resetUnreadBackground();
+		}else if(id==R.id.filters){
+			showFiltersAlert();
 		}
 		return true;
 	}
 
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		MergeRecyclerAdapter mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(requestsRowAdapter);
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
 	private void markAsRead(){
 		if(data.isEmpty())
 			return;
@@ -366,4 +304,93 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		}
 		return true;
 	}
+
+	private void updatePolicy(NotificationsPolicy policy){
+		int count=policy.summary==null ? 0 : policy.summary.pendingRequestsCount;
+		boolean isShown=!requestsItems.isEmpty();
+		boolean needShow=count>0;
+		if(isShown && !needShow){
+			requestsItems.clear();
+			requestsRowAdapter.notifyItemRemoved(0);
+		}else if(!isShown && needShow){
+			requestsItem.subtitle=getResources().getQuantityString(R.plurals.x_people_you_may_know, count, count);
+			requestsItems.add(requestsItem);
+			requestsRowAdapter.notifyItemInserted(0);
+		}else if(isShown){
+			requestsItem.subtitle=getResources().getQuantityString(R.plurals.x_people_you_may_know, count, count);
+			requestsRowAdapter.notifyItemChanged(0);
+		}
+		lastPolicy=policy;
+		invalidateOptionsMenu();
+	}
+
+	private void reloadPolicy(){
+		new GetNotificationsPolicy()
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(NotificationsPolicy policy){
+						updatePolicy(policy);
+					}
+
+					@Override
+					public void onError(ErrorResponse errorResponse){
+
+					}
+				})
+				.exec(accountID);
+	}
+
+	private void showFiltersAlert(){
+		GenericListItemsViewController<Void> controller=new GenericListItemsViewController<>(getActivity());
+		Consumer<CheckableListItem<Void>> toggler=item->{
+			item.toggle();
+			controller.rebindItem(item);
+		};
+		CheckableListItem<Void> followingItem, followersItem, newAccountsItem, mentionsItem;
+		List<ListItem<Void>> items=List.of(
+				followingItem=new CheckableListItem<>(R.string.notification_filter_following, R.string.notification_filter_following_explanation, CheckableListItem.Style.CHECKBOX, lastPolicy.filterNotFollowing, toggler, true),
+				followersItem=new CheckableListItem<>(R.string.notification_filter_followers, R.string.notification_filter_followers_explanation, CheckableListItem.Style.CHECKBOX, lastPolicy.filterNotFollowers, toggler, true),
+				newAccountsItem=new CheckableListItem<>(R.string.notification_filter_new_accounts, R.string.notification_filter_new_accounts_explanation, CheckableListItem.Style.CHECKBOX, lastPolicy.filterNewAccounts, toggler, true),
+				mentionsItem=new CheckableListItem<>(R.string.notification_filter_mentions, R.string.notification_filter_mentions_explanation, CheckableListItem.Style.CHECKBOX, lastPolicy.filterPrivateMentions, toggler, true)
+		);
+		controller.setItems(items);
+		AlertDialog dlg=new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.filter_notifications)
+				.setView(controller.getView())
+				.setPositiveButton(R.string.save, null)
+				.show();
+		Button btn=dlg.getButton(Dialog.BUTTON_POSITIVE);
+		btn.setOnClickListener(v->{
+			UiUtils.showProgressForAlertButton(btn, true);
+			NotificationsPolicy newPolicy=new NotificationsPolicy();
+			newPolicy.filterNotFollowing=followingItem.checked;
+			newPolicy.filterNotFollowers=followersItem.checked;
+			newPolicy.filterNewAccounts=newAccountsItem.checked;
+			newPolicy.filterPrivateMentions=mentionsItem.checked;
+			new SetNotificationsPolicy(newPolicy)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(NotificationsPolicy policy){
+							updatePolicy(policy);
+							dlg.dismiss();
+						}
+
+						@Override
+						public void onError(ErrorResponse errorResponse){
+							Activity activity=getActivity();
+							if(activity==null)
+								return;
+							UiUtils.showProgressForAlertButton(btn, false);
+							errorResponse.showToast(activity);
+						}
+					})
+					.exec(accountID);
+		});
+	}
+
+	private void openNotificationRequests(){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.go(getActivity(), NotificationRequestsFragment.class, args);
+	}
 }

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

@@ -198,6 +198,7 @@ public class ProfileFeaturedFragment extends BaseStatusListFragment<SearchResult
 	private void showAllFeaturedHashtags(){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
+		args.putParcelable("profileAccount", Parcels.wrap(profileAccount));
 		ArrayList<Parcelable> tags=featuredTags.stream().map(Parcels::wrap).collect(Collectors.toCollection(ArrayList::new));
 		args.putParcelableArrayList("hashtags", tags);
 		Nav.go(getActivity(), FeaturedHashtagsListFragment.class, args);

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

@@ -20,7 +20,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
-import android.text.SpannedString;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.ImageSpan;
@@ -29,7 +28,6 @@ import android.transition.Fade;
 import android.transition.Transition;
 import android.transition.TransitionManager;
 import android.transition.TransitionSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -67,6 +65,7 @@ import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.SingleImagePhotoViewerListener;
+import org.joinmastodon.android.ui.Snackbar;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
 import org.joinmastodon.android.ui.sheets.DecentralizationExplainerSheet;
 import org.joinmastodon.android.ui.tabs.TabLayout;
@@ -101,14 +100,13 @@ import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.fragments.LoaderFragment;
-import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 
-public class ProfileFragment extends LoaderFragment implements OnBackPressedListener, ScrollableToTop{
+public class ProfileFragment extends LoaderFragment implements ScrollableToTop{
 	private static final int AVATAR_RESULT=722;
 	private static final int COVER_RESULT=343;
 
@@ -136,6 +134,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private View actionButtonWrap;
 	private CustomDrawingOrderLinearLayout scrollableContent;
 	private ImageButton qrCodeButton;
+	private ProgressBar innerProgress;
+	private View actions;
 
 	private Account account;
 	private String accountID;
@@ -157,6 +157,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private Animator tabBarColorAnim;
 	private MenuItem editSaveMenuItem;
 	private boolean savingEdits;
+	private Runnable editModeBackCallback=this::onEditModeBackCallback;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -219,6 +220,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		actionButtonWrap=content.findViewById(R.id.profile_action_btn_wrap);
 		scrollableContent=content.findViewById(R.id.scrollable_content);
 		qrCodeButton=content.findViewById(R.id.qr_code);
+		innerProgress=content.findViewById(R.id.profile_progress);
+		actions=content.findViewById(R.id.profile_actions);
 
 		avatar.setOutlineProvider(OutlineProviders.roundedRect(24));
 		avatar.setClipToOutline(true);
@@ -306,6 +309,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followingBtn.setOnClickListener(this::onFollowersOrFollowingClick);
 
 		username.setOnLongClickListener(v->{
+			if(account==null)
+				return true;
 			String username=account.acct;
 			if(!username.contains("@")){
 				username+="@"+AccountSessionManager.getInstance().getAccount(accountID).domain;
@@ -331,7 +336,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		nameEdit.addTextChangedListener(new SimpleTextWatcher(e->editDirty=true));
 		bioEdit.addTextChangedListener(new SimpleTextWatcher(e->editDirty=true));
 
-		usernameDomain.setOnClickListener(v->new DecentralizationExplainerSheet(getActivity(), accountID, account).show());
+		usernameDomain.setOnClickListener(v->{
+			if(account==null)
+				return;
+			new DecentralizationExplainerSheet(getActivity(), accountID, account).show();
+		});
 		qrCodeButton.setOnClickListener(v->{
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
@@ -462,6 +471,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				return true;
 			}
 		});
+		if(!loaded)
+			bindHeaderViewForPreviewMaybe();
 	}
 
 	@Override
@@ -506,7 +517,41 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 	}
 
+	private void bindHeaderViewForPreviewMaybe(){
+		if(loaded)
+			return;
+		String username=getArguments().getString("accountUsername");
+		String domain=getArguments().getString("accountDomain");
+		if(TextUtils.isEmpty(username) || TextUtils.isEmpty(domain))
+			return;
+		content.setVisibility(View.VISIBLE);
+		progress.setVisibility(View.GONE);
+		errorView.setVisibility(View.GONE);
+		innerProgress.setVisibility(View.VISIBLE);
+		this.username.setText(username);
+		name.setText(username);
+		usernameDomain.setText(domain);
+		avatar.setImageResource(R.drawable.image_placeholder);
+		cover.setImageResource(R.drawable.image_placeholder);
+		actions.setVisibility(View.GONE);
+		bio.setVisibility(View.GONE);
+		countersLayout.setVisibility(View.GONE);
+		tabsDivider.setVisibility(View.GONE);
+	}
+
 	private void bindHeaderView(){
+		if(innerProgress.getVisibility()==View.VISIBLE){
+			TransitionManager.beginDelayedTransition(contentView, new TransitionSet()
+					.addTransition(new Fade(Fade.IN | Fade.OUT))
+					.excludeChildren(actions, true)
+					.setDuration(250)
+					.setInterpolator(CubicBezierInterpolator.DEFAULT)
+			);
+			innerProgress.setVisibility(View.GONE);
+			countersLayout.setVisibility(View.VISIBLE);
+			actions.setVisibility(View.VISIBLE);
+			tabsDivider.setVisibility(View.VISIBLE);
+		}
 		setTitle(account.displayName);
 		setSubtitle(getResources().getQuantityString(R.plurals.x_posts, (int)(account.statusesCount%1000), account.statusesCount));
 		ViewImageLoader.load(avatar, null, new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? account.avatar : account.avatarStatic, V.dp(100), V.dp(100)));
@@ -635,7 +680,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			menu.findItem(R.id.block_domain).setVisible(false);
 		menu.findItem(R.id.add_to_list).setVisible(relationship.following);
 
-		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI()){
+		if(relationship.following){
+			MenuItem notifications=menu.findItem(R.id.notifications);
+			notifications.setVisible(true);
+			notifications.setIcon(relationship.notifying ? R.drawable.ic_notifications_fill1_24px : R.drawable.ic_notifications_24px);
+			notifications.setTitle(getString(relationship.notifying ? R.string.disable_new_post_notifications : R.string.enable_new_post_notifications, account.getDisplayUsername()));
+		}
+
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI() && !UiUtils.isMagic()){
 			menu.setGroupDividerEnabled(true);
 		}
 	}
@@ -663,7 +715,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				updateRelationship();
 			}, this::updateRelationship);
 		}else if(id==R.id.hide_boosts){
-			new SetAccountFollowed(account.id, true, !relationship.showingReblogs)
+			new SetAccountFollowed(account.id, true, !relationship.showingReblogs, relationship.notifying)
 					.setCallback(new Callback<>(){
 						@Override
 						public void onSuccess(Relationship result){
@@ -693,6 +745,24 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			args.putString("account", accountID);
 			args.putParcelable("targetAccount", Parcels.wrap(account));
 			Nav.go(getActivity(), AddAccountToListsFragment.class, args);
+		}else if(id==R.id.notifications){
+			new SetAccountFollowed(account.id, true, relationship.showingReblogs, !relationship.notifying)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(Relationship result){
+							updateRelationship(result);
+							new Snackbar.Builder(getActivity())
+									.setText(result.notifying ? R.string.new_post_notifications_enabled : R.string.new_post_notifications_disabled)
+									.show();
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							error.showToast(getActivity());
+						}
+					})
+					.wrapProgress(getActivity(), R.string.loading, false)
+					.exec(accountID);
 		}
 		return true;
 	}
@@ -913,12 +983,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		refreshLayout.setEnabled(false);
 		editDirty=false;
 		V.setVisibilityAnimated(fab, View.GONE);
+		addBackCallback(editModeBackCallback);
 	}
 
 	private void exitEditMode(){
 		if(!isInEditMode)
 			throw new IllegalStateException();
 		isInEditMode=false;
+		removeBackCallback(editModeBackCallback);
 
 		invalidateOptionsMenu();
 		actionButton.setText(R.string.edit_profile);
@@ -1028,23 +1100,18 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		updateRelationship();
 	}
 
-	@Override
-	public boolean onBackPressed(){
-		if(isInEditMode){
-			if(savingEdits)
-				return true;
-			if(editDirty || aboutFragment.isEditDirty()){
-				new M3AlertDialogBuilder(getActivity())
-						.setTitle(R.string.discard_changes)
-						.setPositiveButton(R.string.discard, (dlg, btn)->exitEditMode())
-						.setNegativeButton(R.string.cancel, null)
-						.show();
-			}else{
-				exitEditMode();
-			}
-			return true;
+	private void onEditModeBackCallback(){
+		if(savingEdits)
+			return;
+		if(editDirty || aboutFragment.isEditDirty()){
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.discard_changes)
+					.setPositiveButton(R.string.discard, (dlg, btn)->exitEditMode())
+					.setNegativeButton(R.string.cancel, null)
+					.show();
+		}else{
+			exitEditMode();
 		}
-		return false;
 	}
 
 	private List<Attachment> createFakeAttachments(String url, Drawable drawable){
@@ -1058,6 +1125,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	}
 
 	private void onAvatarClick(View v){
+		if(account==null)
+			return;
 		if(isInEditMode){
 			startImagePicker(AVATAR_RESULT);
 		}else{
@@ -1071,11 +1140,13 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	}
 
 	private void onCoverClick(View v){
+		if(account==null)
+			return;
 		if(isInEditMode){
 			startImagePicker(COVER_RESULT);
 		}else{
 			Drawable drawable=cover.getDrawable();
-			if(drawable==null || drawable instanceof ColorDrawable)
+			if(drawable==null || drawable instanceof ColorDrawable || account.headerStatic.endsWith("/missing.png"))
 				return;
 			currentPhotoViewer=new PhotoViewer(getActivity(), createFakeAttachments(account.header, drawable), 0,
 					null, accountID, new SingleImagePhotoViewerListener(cover, cover, null, this, ()->currentPhotoViewer=null, ()->drawable, ()->avatarBorder.setTranslationZ(2), ()->avatarBorder.setTranslationZ(0)));

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

@@ -53,6 +53,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.window.OnBackInvokedCallback;
+import android.window.OnBackInvokedDispatcher;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
@@ -144,12 +146,16 @@ public class ProfileQrCodeFragment extends AppKitFragment{
 		if(!isTablet){
 			getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
 		}
-		dlg.setOnKeyListener((dialog, keyCode, event)->{
-			if(keyCode==KeyEvent.KEYCODE_BACK && event.getAction()==KeyEvent.ACTION_DOWN){
-				dismiss();
-			}
-			return true;
-		});
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.TIRAMISU){
+			dlg.getOnBackInvokedDispatcher().registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT, this::dismiss);
+		}else{
+			dlg.setOnKeyListener((dialog, keyCode, event)->{
+				if(keyCode==KeyEvent.KEYCODE_BACK && event.getAction()==KeyEvent.ACTION_DOWN){
+					dismiss();
+				}
+				return true;
+			});
+		}
 	}
 
 	@Override

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

@@ -36,10 +36,9 @@ import androidx.viewpager2.widget.ViewPager2;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.fragments.AppKitFragment;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
-import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.utils.V;
 
-public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, OnBackPressedListener{
+public class DiscoverFragment extends AppKitFragment implements ScrollableToTop{
 	private static final int QUERY_RESULT=937;
 	private static final int SCAN_RESULT=456;
 
@@ -62,6 +61,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	private String accountID;
 	private String currentQuery;
 	private Intent scannerIntent;
+	private Runnable searchExitCallback=this::exitSearch;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -232,6 +232,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			searchBack.setEnabled(true);
 			searchBack.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
 			tabsDivider.setVisibility(View.GONE);
+			addBackCallback(searchExitCallback);
 		}
 	}
 
@@ -248,6 +249,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		searchBack.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
 		tabsDivider.setVisibility(View.VISIBLE);
 		currentQuery=null;
+		removeBackCallback(searchExitCallback);
 	}
 
 	private Fragment getFragmentForPage(int page){
@@ -260,15 +262,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		};
 	}
 
-	@Override
-	public boolean onBackPressed(){
-		if(searchActive){
-			exitSearch();
-			return true;
-		}
-		return false;
-	}
-
 	@Override
 	public void onFragmentResult(int reqCode, boolean success, Bundle result){
 		if(reqCode==QUERY_RESULT && success){

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

@@ -2,56 +2,35 @@ package org.joinmastodon.android.fragments.discover;
 
 import android.annotation.SuppressLint;
 import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
 
-import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.trends.GetTrendingLinks;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Card;
 import org.joinmastodon.android.model.viewmodel.CardViewModel;
-import org.joinmastodon.android.ui.DividerItemDecoration;
-import org.joinmastodon.android.ui.OutlineProviders;
-import org.joinmastodon.android.ui.drawables.BlurhashCrossfadeDrawable;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
-import org.joinmastodon.android.ui.utils.HorizontalScrollingTouchListener;
-import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.viewholders.LinkCardHolder;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
-import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
-import me.grishka.appkit.imageloader.ListImageLoaderAdapter;
 import me.grishka.appkit.imageloader.ListImageLoaderWrapper;
-import me.grishka.appkit.imageloader.RecyclerViewDelegate;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
-import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
-import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
-import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class DiscoverNewsFragment extends BaseRecyclerFragment<CardViewModel> implements ScrollableToTop{
+public class DiscoverNewsFragment extends BaseRecyclerFragment<DiscoverNewsFragment.CardItem> implements ScrollableToTop{
 	private String accountID;
 	private DiscoverInfoBannerHelper bannerHelper;
 	private MergeRecyclerAdapter mergeAdapter;
-	private UsableRecyclerView cardsList;
-	private ArrayList<CardViewModel> top3=new ArrayList<>();
-	private CardLinksAdapter cardsAdapter;
 
 	public DiscoverNewsFragment(){
 		super(10);
@@ -70,12 +49,14 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment<CardViewModel> im
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Card> result){
-						top3.clear();
-						top3.addAll(result.subList(0, Math.min(3, result.size())).stream().map(card->new CardViewModel(card, 280, 140)).collect(Collectors.toList()));
-						cardsAdapter.notifyDataSetChanged();
-
-						onDataLoaded(result.subList(top3.size(), result.size()).stream()
-								.map(card->new CardViewModel(card, 56, 56))
+						int[] index={0};
+						onDataLoaded(result.stream()
+								.map(card->{
+									int actualIndex=index[0]+(refreshing ? 0 : (data.size()+preloadedData.size()));
+									index[0]++;
+									int size=actualIndex==0 ? 1000 : 192;
+									return new CardItem(new CardViewModel(card, size, size, card, accountID));
+								})
 								.collect(Collectors.toList()), false);
 						bannerHelper.onBannerBecameVisible();
 					}
@@ -86,27 +67,9 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment<CardViewModel> im
 	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	protected RecyclerView.Adapter getAdapter(){
-		cardsList=new UsableRecyclerView(getActivity());
-		cardsList.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false));
-		ListImageLoaderWrapper cardsImageLoader=new ListImageLoaderWrapper(getActivity(), cardsList, new RecyclerViewDelegate(cardsList), this);
-		cardsList.setAdapter(cardsAdapter=new CardLinksAdapter(cardsImageLoader, top3));
-		cardsList.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(256)));
-		cardsList.setPadding(V.dp(16), V.dp(8), 0, 0);
-		cardsList.setClipToPadding(false);
-		cardsList.addItemDecoration(new RecyclerView.ItemDecoration(){
-			@Override
-			public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
-				outRect.right=V.dp(16);
-			}
-		});
-		cardsList.setSelector(R.drawable.bg_rect_12dp_ripple);
-		cardsList.setDrawSelectorOnTop(true);
-		cardsList.setOnTouchListener(new HorizontalScrollingTouchListener(getActivity()));
-
 		mergeAdapter=new MergeRecyclerAdapter();
 		bannerHelper.maybeAddBanner(list, mergeAdapter);
-		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(cardsList));
-		mergeAdapter.addAdapter(new LinksAdapter(imgLoader, data));
+		mergeAdapter.addAdapter(new LinksAdapter(imgLoader));
 		return mergeAdapter;
 	}
 
@@ -115,18 +78,46 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment<CardViewModel> im
 		smoothScrollRecyclerViewToTop(list);
 	}
 
-	private class LinksAdapter extends UsableRecyclerView.Adapter<BaseLinkViewHolder> implements ImageLoaderRecyclerAdapter{
-		private final List<CardViewModel> data;
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		list.addItemDecoration(new RecyclerView.ItemDecoration(){
+			@Override
+			public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
+				if(parent.getChildAdapterPosition(view)==0 && !bannerHelper.isBannerShown()){
+					outRect.top=V.dp(16);
+				}
+				if(parent.getChildViewHolder(view) instanceof LinkCardHolder<?>){
+					outRect.bottom=V.dp(8);
+				}
+			}
+		});
+	}
 
-		public LinksAdapter(ListImageLoaderWrapper imgLoader, List<CardViewModel> data){
+	public static class CardItem implements LinkCardHolder.LinkCardProvider{
+		public final CardViewModel card;
+
+		private CardItem(CardViewModel card){
+			this.card=card;
+		}
+
+		@Override
+		public CardViewModel getCard(){
+			return card;
+		}
+	}
+
+	private class LinksAdapter extends UsableRecyclerView.Adapter<LinkCardHolder<CardItem>> implements ImageLoaderRecyclerAdapter{
+		public LinksAdapter(ListImageLoaderWrapper imgLoader){
 			super(imgLoader);
-			this.data=data;
 		}
 
 		@NonNull
 		@Override
-		public BaseLinkViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			return new LinkViewHolder();
+		public LinkCardHolder<CardItem> onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			LinkCardHolder<CardItem> vh=new LinkCardHolder<>(getActivity(), list, viewType==1, accountID);
+			vh.setTryResolving(false);
+			return vh;
 		}
 
 		@Override
@@ -135,91 +126,24 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment<CardViewModel> im
 		}
 
 		@Override
-		public void onBindViewHolder(BaseLinkViewHolder holder, int position){
-			holder.bind(data.get(position).card);
+		public void onBindViewHolder(LinkCardHolder<CardItem> holder, int position){
+			holder.bind(data.get(position));
 			super.onBindViewHolder(holder, position);
 		}
 
 		@Override
 		public int getImageCountForItem(int position){
-			return data.get(position).imageRequest==null ? 0 : 1;
+			return data.get(position).card.getImageCount();
 		}
 
 		@Override
 		public ImageLoaderRequest getImageRequest(int position, int image){
-			return data.get(position).imageRequest;
-		}
-	}
-
-	private class CardLinksAdapter extends LinksAdapter{
-		public CardLinksAdapter(ListImageLoaderWrapper imgLoader, List<CardViewModel> data){
-			super(imgLoader, data);
-		}
-
-		@NonNull
-		@Override
-		public BaseLinkViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			return new LinkCardViewHolder();
-		}
-	}
-
-	private class BaseLinkViewHolder extends BindableViewHolder<Card> implements UsableRecyclerView.Clickable, ImageLoaderViewHolder{
-		protected final TextView name, title;
-		protected final ImageView photo;
-		private BlurhashCrossfadeDrawable crossfadeDrawable=new BlurhashCrossfadeDrawable();
-		private boolean didClear;
-
-		public BaseLinkViewHolder(int layout){
-			super(getActivity(), layout, list);
-			name=findViewById(R.id.name);
-			title=findViewById(R.id.title);
-			photo=findViewById(R.id.photo);
+			return data.get(position).card.getImageRequest(image);
 		}
 
 		@Override
-		public void onBind(Card item){
-			name.setText(item.providerName);
-			title.setText(item.title);
-			crossfadeDrawable.setSize(item.width, item.height);
-			crossfadeDrawable.setBlurhashDrawable(item.blurhashPlaceholder);
-			crossfadeDrawable.setCrossfadeAlpha(0f);
-			photo.setImageDrawable(null);
-			photo.setImageDrawable(crossfadeDrawable);
-			didClear=false;
-		}
-
-		@Override
-		public void setImage(int index, Drawable drawable){
-			crossfadeDrawable.setImageDrawable(drawable);
-			if(didClear)
-				crossfadeDrawable.animateAlpha(0f);
-		}
-
-		@Override
-		public void clearImage(int index){
-			crossfadeDrawable.setCrossfadeAlpha(1f);
-			didClear=true;
-		}
-
-		@Override
-		public void onClick(){
-			UiUtils.launchWebBrowser(getActivity(), item.url);
-		}
-	}
-
-	private class LinkViewHolder extends BaseLinkViewHolder{
-		public LinkViewHolder(){
-			super(R.layout.item_trending_link);
-			photo.setOutlineProvider(OutlineProviders.roundedRect(12));
-			photo.setClipToOutline(true);
-		}
-	}
-
-	private class LinkCardViewHolder extends BaseLinkViewHolder{
-		public LinkCardViewHolder(){
-			super(R.layout.item_trending_link_card);
-			itemView.setOutlineProvider(OutlineProviders.roundedRect(12));
-			itemView.setClipToOutline(true);
+		public int getItemViewType(int position){
+			return position==0 ? 1 : 2;
 		}
 	}
 }

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

@@ -57,14 +57,13 @@ import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.CustomTransitionsFragment;
-import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultViewModel> implements CustomTransitionsFragment, OnBackPressedListener{
+public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultViewModel> implements CustomTransitionsFragment{
 	private static final Pattern HASHTAG_REGEX=Pattern.compile("^(\\w*[a-zA-Z·]\\w*)$", Pattern.CASE_INSENSITIVE);
 	private static final Pattern USERNAME_REGEX=Pattern.compile("^@?([a-z0-9_-]+)(@[^\\s]+)?$", Pattern.CASE_INSENSITIVE);
 
@@ -371,6 +370,11 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 			container.invalidateOutline();
 			navigationIcon.invalidateSelf();
 		});
+		if(!enter){
+			String initialQuery=getArguments().getString("query");
+			searchViewHelper.setQuery(TextUtils.isEmpty(initialQuery) ? "" : initialQuery);
+			currentQuery=initialQuery;
+		}
 		return set;
 	}
 
@@ -437,14 +441,6 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 		Nav.finish(this);
 	}
 
-	@Override
-	public boolean onBackPressed(){
-		String initialQuery=getArguments().getString("query");
-		searchViewHelper.setQuery(TextUtils.isEmpty(initialQuery) ? "" : initialQuery);
-		currentQuery=initialQuery;
-		return false;
-	}
-
 	private static class AnimatableOutlineProvider extends ViewOutlineProvider{
 		private float boundsFraction, radius;
 		private final Rect boundsFrom, boundsTo;

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

@@ -73,8 +73,6 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 	protected boolean isSignup;
 	protected CatalogInstance fakeInstance=new CatalogInstance();
 
-	private static final double DUNBAR=Math.log(800);
-
 	public InstanceCatalogFragment(int layout, int perPage){
 		super(layout, perPage);
 	}
@@ -155,7 +153,7 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 	}
 
 	protected void loadInstanceInfo(String _domain, boolean isFromRedirect, Consumer<Object> onError){
-		if(TextUtils.isEmpty(_domain))
+		if(TextUtils.isEmpty(_domain) || _domain.indexOf('.')==-1)
 			return;
 		String domain=normalizeInstanceDomain(_domain);
 		Instance cachedInstance=instancesCache.get(domain);
@@ -316,8 +314,10 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 				loadingInstanceRedirectRequest=null;
 				loadingInstanceDomain=null;
 				Activity a=getActivity();
-				if(a==null)
+				if(a==null) {
+					response.close();
 					return;
+				}
 				try(response){
 					if(!response.isSuccessful()){
 						a.runOnUiThread(()->{

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

@@ -5,8 +5,9 @@ import android.app.AlertDialog;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.res.ColorStateList;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.Editable;
@@ -26,16 +27,12 @@ import android.widget.PopupMenu;
 import android.widget.RadioButton;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.MastodonErrorResponse;
 import org.joinmastodon.android.api.requests.accounts.CheckInviteLink;
-import org.joinmastodon.android.api.requests.catalog.GetCatalogCategories;
 import org.joinmastodon.android.api.requests.catalog.GetCatalogInstances;
 import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.model.catalog.CatalogCategory;
 import org.joinmastodon.android.model.catalog.CatalogInstance;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
@@ -49,11 +46,9 @@ import org.parceler.Parcels;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
-import java.util.Random;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -63,17 +58,11 @@ import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.utils.BindableViewHolder;
-import me.grishka.appkit.utils.MergeRecyclerAdapter;
-import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class InstanceCatalogSignupFragment extends InstanceCatalogFragment implements OnBackPressedListener{
-	private MastodonAPIRequest<?> getCategoriesRequest;
-	private String currentCategory="all";
-	private List<CatalogCategory> categories=new ArrayList<>();
+public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
 	private View topBar;
 
 	private List<String> languages=Collections.emptyList();
@@ -94,6 +83,8 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 	private String inviteCode, inviteCodeHost;
 	private AlertDialog currentInviteLinkAlert;
 
+	private Runnable exitQueryModeCallback=()->setSearchQueryMode(false);
+
 	public InstanceCatalogSignupFragment(){
 		super(R.layout.fragment_onboarding_common, 10);
 	}
@@ -113,7 +104,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetCatalogInstances(null, null)
+		currentRequest=new GetCatalogInstances(null, null, false)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(List<CatalogInstance> result){
@@ -149,58 +140,17 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 					}
 				})
 				.execNoAuth("");
-		getCategoriesRequest=new GetCatalogCategories(null)
-				.setCallback(new Callback<>(){
-					@Override
-					public void onSuccess(List<CatalogCategory> result){
-						getCategoriesRequest=null;
-						CatalogCategory all=new CatalogCategory();
-						all.category="all";
-						categories.add(all);
-						result.stream().sorted(Comparator.comparingInt((CatalogCategory cc)->cc.serversCount).reversed()).forEach(categories::add);
-						updateCategories();
-					}
-
-					@Override
-					public void onError(ErrorResponse error){
-						getCategoriesRequest=null;
-						error.showToast(getActivity());
-						CatalogCategory all=new CatalogCategory();
-						all.category="all";
-						categories.add(all);
-						updateCategories();
-					}
-				})
-				.execNoAuth("");
-	}
-
-	private void updateCategories(){
-//		categoriesList.removeAllTabs();
-//		for(CatalogCategory cat:categories){
-//			int titleRes=getTitleForCategory(cat.category);
-//			TabLayout.Tab tab=categoriesList.newTab().setText(titleRes!=0 ? getString(titleRes) : cat.category).setCustomView(R.layout.item_instance_category);
-//			ImageView emoji=tab.getCustomView().findViewById(R.id.emoji);
-//			emoji.setImageResource(getEmojiForCategory(cat.category));
-//			categoriesList.addTab(tab);
-//		}
 	}
 
 	@Override
 	public void onDestroy(){
+		removeBackCallback(exitQueryModeCallback);
 		super.onDestroy();
-		if(getCategoriesRequest!=null)
-			getCategoriesRequest.cancel();
 	}
 
 	@Override
 	protected RecyclerView.Adapter getAdapter(){
-		View headerView=new View(getActivity());
-		headerView.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 1));
-
-		mergeAdapter=new MergeRecyclerAdapter();
-		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
-		mergeAdapter.addAdapter(adapter=new InstancesAdapter());
-		return mergeAdapter;
+		return adapter=new InstancesAdapter();
 	}
 
 	@SuppressLint("ClickableViewAccessibility")
@@ -222,7 +172,16 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 		setStatusBarColor(0);
 		topBar=view.findViewById(R.id.top_bar);
 
-		list.addOnScrollListener(new ElevationOnScrollListener(null, topBar, buttonBar));
+		list.addOnScrollListener(new ElevationOnScrollListener(null, topBar));
+		if(buttonBar.getBackground() instanceof LayerDrawable ld){
+			ld=(LayerDrawable) ld.mutate();
+			buttonBar.setBackground(ld);
+			Drawable overlay=ld.findDrawableByLayerId(R.id.color_overlay);
+			if(overlay!=null){
+				overlay.setAlpha(20);
+			}
+		}
+		buttonBar.setElevation(V.dp(3));
 
 		searchEdit=view.findViewById(R.id.search_edit);
 		searchEdit.setOnEditorActionListener(this::onSearchEnterPressed);
@@ -572,6 +531,9 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 						filteredData.add(instance);
 					}
 				}
+				setEmptyText(getString(R.string.no_servers_found, currentSearchQuery));
+			}else{
+				setEmptyText("");
 			}
 		}else{
 			for(CatalogInstance instance:data){
@@ -591,27 +553,29 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 				}
 			}
 		}
-		DiffUtil.calculateDiff(new DiffUtil.Callback(){
-			@Override
-			public int getOldListSize(){
-				return prevData.size();
-			}
+		UiUtils.updateRecyclerViewKeepingAbsoluteScrollPosition(list, ()->{
+			DiffUtil.calculateDiff(new DiffUtil.Callback(){
+				@Override
+				public int getOldListSize(){
+					return prevData.size();
+				}
 
-			@Override
-			public int getNewListSize(){
-				return filteredData.size();
-			}
+				@Override
+				public int getNewListSize(){
+					return filteredData.size();
+				}
 
-			@Override
-			public boolean areItemsTheSame(int oldItemPosition, int newItemPosition){
-				return prevData.get(oldItemPosition)==filteredData.get(newItemPosition);
-			}
+				@Override
+				public boolean areItemsTheSame(int oldItemPosition, int newItemPosition){
+					return prevData.get(oldItemPosition)==filteredData.get(newItemPosition);
+				}
 
-			@Override
-			public boolean areContentsTheSame(int oldItemPosition, int newItemPosition){
-				return prevData.get(oldItemPosition)==filteredData.get(newItemPosition);
-			}
-		}).dispatchUpdatesTo(adapter);
+				@Override
+				public boolean areContentsTheSame(int oldItemPosition, int newItemPosition){
+					return prevData.get(oldItemPosition)==filteredData.get(newItemPosition);
+				}
+			}).dispatchUpdatesTo(adapter);
+		});
 	}
 
 	@Override
@@ -620,19 +584,13 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 		super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
 	}
 
-	@Override
-	public boolean onBackPressed(){
-		if(searchQueryMode){
-			setSearchQueryMode(false);
-			return true;
-		}
-		return false;
-	}
-
 	private void setSearchQueryMode(boolean enabled){
+		if(searchQueryMode==enabled)
+			return;
 		searchQueryMode=enabled;
 		RelativeLayout.LayoutParams lp=(RelativeLayout.LayoutParams) searchEdit.getLayoutParams();
 		if(searchQueryMode){
+			addBackCallback(exitQueryModeCallback);
 			filtersScroll.setVisibility(View.GONE);
 			lp.removeRule(RelativeLayout.END_OF);
 			backBtn.setScaleX(0.83333333f);
@@ -640,6 +598,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 			backBtn.setTranslationX(V.dp(8));
 			searchEdit.setCompoundDrawableTintList(ColorStateList.valueOf(0));
 		}else{
+			removeBackCallback(exitQueryModeCallback);
 			filtersScroll.setVisibility(View.VISIBLE);
 			focusThing.requestFocus();
 			searchEdit.setText("");

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

@@ -1,12 +1,11 @@
 package org.joinmastodon.android.fragments.onboarding;
 
-import android.graphics.Canvas;
 import android.graphics.Outline;
 import android.graphics.Rect;
-import android.graphics.RectF;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.View;
 import android.view.ViewGroup;
@@ -65,7 +64,7 @@ public class InstanceChooserLoginFragment extends InstanceCatalogFragment{
 	protected void updateFilteredList(){
 		ArrayList<CatalogInstance> prevData=new ArrayList<>(filteredData);
 		filteredData.clear();
-		if(currentSearchQuery.length()>0){
+		if(!TextUtils.isEmpty(currentSearchQuery)){
 			boolean foundExactMatch=false;
 			for(CatalogInstance inst:data){
 				if(inst.normalizedDomain.contains(currentSearchQuery)){
@@ -74,9 +73,16 @@ public class InstanceChooserLoginFragment extends InstanceCatalogFragment{
 						foundExactMatch=true;
 				}
 			}
-			if(!foundExactMatch)
+			if(!foundExactMatch && currentSearchQuery.indexOf('.')!=-1)
 				filteredData.add(0, fakeInstance);
 		}
+		if(filteredData.isEmpty()){
+			for(CatalogInstance inst:data){
+				if(inst.normalizedDomain.equals("mastodon.social") || inst.normalizedDomain.equals("mastodon.online")){
+					filteredData.add(inst);
+				}
+			}
+		}
 		UiUtils.updateList(prevData, filteredData, list, adapter, Objects::equals);
 		for(int i=0;i<list.getChildCount();i++){
 			list.getChildAt(i).invalidateOutline();
@@ -90,12 +96,15 @@ public class InstanceChooserLoginFragment extends InstanceCatalogFragment{
 
 	private void loadAutocompleteServers(){
 		loadedAutocomplete=true;
-		new GetCatalogInstances(null, null)
+		new GetCatalogInstances(null, null, true)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(List<CatalogInstance> result){
+						if(getActivity()==null)
+							return;
 						data.clear();
 						data.addAll(sortInstances(result));
+						updateFilteredList();
 					}
 
 					@Override
@@ -112,6 +121,9 @@ public class InstanceChooserLoginFragment extends InstanceCatalogFragment{
 		Toolbar toolbar=getToolbar();
 		toolbar.setElevation(0);
 		toolbar.setBackground(null);
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
+			toolbar.setContentInsetStartWithNavigation(V.dp(80));
+		}
 	}
 
 	@Override

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

@@ -133,7 +133,7 @@ public class OnboardingFollowSuggestionsFragment extends BaseAccountListFragment
 		}
 		numRunningFollowRequests++;
 		String id=accountIdsToFollow.remove(0);
-		new SetAccountFollowed(id, true, true)
+		new SetAccountFollowed(id, true, true, false)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Relationship result){

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

@@ -50,6 +50,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import androidx.annotation.Nullable;
@@ -62,6 +63,7 @@ import me.grishka.appkit.views.FragmentRootLinearLayout;
 
 public class SignupFragment extends ToolbarFragment{
 	private static final String TAG="SignupFragment";
+	private final Pattern emailRegex=Pattern.compile("^[^@]+@[^@]+\\.[^@]{2,}$");
 
 	private Instance instance;
 
@@ -97,6 +99,7 @@ public class SignupFragment extends ToolbarFragment{
 		View view=inflater.inflate(R.layout.fragment_onboarding_signup, container, false);
 
 		TextView domain=view.findViewById(R.id.domain);
+		TextView atSign=view.findViewById(R.id.at_sign);
 		displayName=view.findViewById(R.id.display_name);
 		username=view.findViewById(R.id.username);
 		email=view.findViewById(R.id.email);
@@ -118,7 +121,7 @@ public class SignupFragment extends ToolbarFragment{
 			@Override
 			public boolean onPreDraw(){
 				username.getViewTreeObserver().removeOnPreDrawListener(this);
-				username.setPadding(username.getPaddingLeft(), username.getPaddingTop(), domain.getWidth(), username.getPaddingBottom());
+				username.setPadding(atSign.getWidth(), username.getPaddingTop(), domain.getWidth(), username.getPaddingBottom());
 				return true;
 			}
 		});
@@ -145,6 +148,10 @@ public class SignupFragment extends ToolbarFragment{
 			reasonExplain.setVisibility(View.GONE);
 		}
 
+		password.setOnFocusChangeListener(this::onPasswordFieldFocusChange);
+		passwordConfirm.setOnFocusChangeListener(this::onPasswordFieldFocusChange);
+		email.setOnFocusChangeListener(this::onEmailFieldFocusChange);
+
 		return view;
 	}
 
@@ -281,34 +288,44 @@ public class SignupFragment extends ToolbarFragment{
 				.exec(instance.uri, apiToken);
 	}
 
+	private CharSequence makeLinkInErrorMessage(String source, LinkSpan.OnLinkClickListener onClick){
+		SpannableStringBuilder ssb=new SpannableStringBuilder();
+		Jsoup.parseBodyFragment(source).body().traverse(new NodeVisitor(){
+			private int spanStart;
+			@Override
+			public void head(Node node, int depth){
+				if(node instanceof TextNode tn){
+					ssb.append(tn.text());
+				}else if(node instanceof Element){
+					spanStart=ssb.length();
+				}
+			}
+
+			@Override
+			public void tail(Node node, int depth){
+				if(node instanceof Element){
+					ssb.setSpan(new LinkSpan("", onClick, LinkSpan.Type.CUSTOM, null, null, null), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+					ssb.setSpan(new TypefaceSpan("sans-serif-medium"), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+				}
+			}
+		});
+		return ssb;
+	}
+
 	private CharSequence getErrorDescription(MastodonDetailedErrorResponse.FieldError error, String fieldName){
 		return switch(fieldName){
 			case "email" -> switch(error.error){
 				case "ERR_BLOCKED" -> {
 					String emailAddr=email.getText().toString();
 					String s=getResources().getString(R.string.signup_email_domain_blocked, TextUtils.htmlEncode(instance.uri), TextUtils.htmlEncode(emailAddr.substring(emailAddr.lastIndexOf('@')+1)));
-					SpannableStringBuilder ssb=new SpannableStringBuilder();
-					Jsoup.parseBodyFragment(s).body().traverse(new NodeVisitor(){
-						private int spanStart;
-						@Override
-						public void head(Node node, int depth){
-							if(node instanceof TextNode tn){
-								ssb.append(tn.text());
-							}else if(node instanceof Element){
-								spanStart=ssb.length();
-							}
-						}
-
-						@Override
-						public void tail(Node node, int depth){
-							if(node instanceof Element){
-								ssb.setSpan(new LinkSpan("", SignupFragment.this::onGoBackLinkClick, LinkSpan.Type.CUSTOM, null, null, null), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-								ssb.setSpan(new TypefaceSpan("sans-serif-medium"), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-							}
-						}
-					});
-					yield ssb;
+					yield makeLinkInErrorMessage(s, this::onGoBackLinkClick);
 				}
+				case "ERR_INVALID" -> getString(R.string.signup_email_invalid);
+				case "ERR_TAKEN" -> makeLinkInErrorMessage(getString(R.string.signup_email_taken), this::onForgotPasswordLinkClick);
+				default -> error.description;
+			};
+			case "username" -> switch(error.error){
+				case "ERR_TAKEN" -> makeLinkInErrorMessage(getString(R.string.signup_username_taken), this::onGoBackLinkClick);
 				default -> error.description;
 			};
 			default -> error.description;
@@ -345,7 +362,9 @@ public class SignupFragment extends ToolbarFragment{
 	}
 
 	private void updateButtonState(){
-		btn.setEnabled(username.length()>0 && email.length()>0 && email.getText().toString().contains("@") && password.length()>=8 && passwordConfirm.length()>=8 && (!instance.approvalRequired || reason.length()>0));
+		btn.setEnabled(username.length()>0 && email.length()>0 && emailRegex.matcher(email.getText()).find()
+				&& password.length()>=8 && passwordConfirm.length()>=8 && password.getText().toString().equals(passwordConfirm.getText().toString())
+				&& (!instance.approvalRequired || reason.length()>0));
 	}
 
 	private void createAppAndGetToken(){
@@ -406,6 +425,24 @@ public class SignupFragment extends ToolbarFragment{
 		Nav.finish(this);
 	}
 
+	private void onForgotPasswordLinkClick(LinkSpan span){
+		UiUtils.launchWebBrowser(getActivity(), "https://"+instance.uri+"/auth/password/new");
+	}
+
+	private void onPasswordFieldFocusChange(View v, boolean hasFocus){
+		if(hasFocus || password.length()==0 || passwordConfirm.length()==0)
+			return;
+		if(!password.getText().toString().equals(passwordConfirm.getText().toString())){
+			passwordConfirmWrap.setErrorState(getString(R.string.signup_passwords_dont_match));
+		}
+	}
+
+	private void onEmailFieldFocusChange(View v, boolean hasFocus){
+		if(!hasFocus && email.length()>0 && !emailRegex.matcher(email.getText()).find()){
+			emailWrap.setErrorState(getString(R.string.signup_email_invalid));
+		}
+	}
+
 	private class ErrorClearingListener implements TextWatcher{
 		public final EditText editText;
 

mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java

@@ -134,7 +134,7 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 	}
 
 	@Override
-	protected int getMainAdapterOffset(){
+	public int getMainAdapterOffset(){
 		return 1;
 	}
 

mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java

@@ -34,7 +34,6 @@ import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
 public class ReportDoneFragment extends MastodonToolbarFragment{
@@ -177,7 +176,7 @@ public class ReportDoneFragment extends MastodonToolbarFragment{
 	}
 
 	private void onUnfollowClick(){
-		new SetAccountFollowed(reportAccount.id, false, false)
+		new SetAccountFollowed(reportAccount.id, false, false, false)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Relationship result){

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/EditFilterFragment.java

@@ -24,6 +24,7 @@ import org.joinmastodon.android.model.FilterKeyword;
 import org.joinmastodon.android.model.viewmodel.CheckableListItem;
 import org.joinmastodon.android.model.viewmodel.ListItem;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.FloatingHintEditTextLayout;
 import org.parceler.Parcels;
@@ -44,11 +45,10 @@ import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 
-public class EditFilterFragment extends BaseSettingsFragment<Void> implements OnBackPressedListener{
+public class EditFilterFragment extends BaseSettingsFragment<Void>{
 	private static final int WORDS_RESULT=370;
 	private static final int CONTEXT_RESULT=651;
 
@@ -63,6 +63,13 @@ public class EditFilterFragment extends BaseSettingsFragment<Void> implements On
 	private ArrayList<String> deletedWordIDs=new ArrayList<>();
 	private EnumSet<FilterContext> context=EnumSet.allOf(FilterContext.class);
 	private boolean dirty;
+	private boolean wasDirty;
+
+	private Runnable confirmCallback=()->{
+		if(isDirty()){
+			UiUtils.showConfirmationAlert(getActivity(), R.string.discard_changes, 0, R.string.discard, ()->Nav.finish(this));
+		}
+	};
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -90,6 +97,12 @@ public class EditFilterFragment extends BaseSettingsFragment<Void> implements On
 		setRetainInstance(true);
 	}
 
+	@Override
+	public void onDestroy(){
+		removeBackCallback(confirmCallback);
+		super.onDestroy();
+	}
+
 	@Override
 	protected void doLoadData(int offset, int count){}
 
@@ -101,6 +114,7 @@ public class EditFilterFragment extends BaseSettingsFragment<Void> implements On
 		titleEditLayout.updateHint();
 		if(filter!=null)
 			titleEdit.setText(filter.title);
+		titleEdit.addTextChangedListener(new SimpleTextWatcher(e->updateBackCallback()));
 
 		MergeRecyclerAdapter adapter=new MergeRecyclerAdapter();
 		adapter.addAdapter(new SingleViewRecyclerAdapter(titleEditLayout));
@@ -158,6 +172,7 @@ public class EditFilterFragment extends BaseSettingsFragment<Void> implements On
 						}
 						a.dismiss();
 					}
+					updateBackCallback();
 				})
 				.show();
 		alert.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
@@ -309,6 +324,7 @@ public class EditFilterFragment extends BaseSettingsFragment<Void> implements On
 				}
 				deletedWordIDs.addAll(result.getStringArrayList("deleted"));
 			}
+			updateBackCallback();
 		}
 	}
 
@@ -317,11 +333,19 @@ public class EditFilterFragment extends BaseSettingsFragment<Void> implements On
 	}
 
 	@Override
-	public boolean onBackPressed(){
-		if(isDirty()){
-			UiUtils.showConfirmationAlert(getActivity(), R.string.discard_changes, 0, R.string.discard, ()->Nav.finish(this));
-			return true;
+	protected void toggleCheckableItem(ListItem<?> item){
+		super.toggleCheckableItem(item);
+		updateBackCallback();
+	}
+
+	private void updateBackCallback(){
+		boolean dirty=isDirty();
+		if(dirty!=wasDirty){
+			wasDirty=dirty;
+			if(dirty)
+				addBackCallback(confirmCallback);
+			else
+				removeBackCallback(confirmCallback);
 		}
-		return false;
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/FilterContextFragment.java

@@ -11,9 +11,7 @@ import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.stream.Collectors;
 
-import me.grishka.appkit.fragments.OnBackPressedListener;
-
-public class FilterContextFragment extends BaseSettingsFragment<FilterContext> implements OnBackPressedListener{
+public class FilterContextFragment extends BaseSettingsFragment<FilterContext>{
 	private EnumSet<FilterContext> context;
 
 	@Override
@@ -33,7 +31,8 @@ public class FilterContextFragment extends BaseSettingsFragment<FilterContext> i
 	protected void doLoadData(int offset, int count){}
 
 	@Override
-	public boolean onBackPressed(){
+	public void onStop(){
+		super.onStop();
 		context=EnumSet.noneOf(FilterContext.class);
 		for(ListItem<FilterContext> item:data){
 			if(((CheckableListItem<FilterContext>) item).checked)
@@ -42,6 +41,5 @@ public class FilterContextFragment extends BaseSettingsFragment<FilterContext> i
 		Bundle args=new Bundle();
 		args.putSerializable("context", context);
 		setResult(true, args);
-		return false;
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/FilterWordsFragment.java

@@ -1,7 +1,6 @@
 package org.joinmastodon.android.fragments.settings;
 
 import android.app.AlertDialog;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.text.InputType;
@@ -11,11 +10,9 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageButton;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.model.FilterKeyword;
@@ -33,15 +30,15 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.utils.V;
 
-public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> implements OnBackPressedListener{
+public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword>{
 	private Button fab;
 	private ActionMode actionMode;
 	private ArrayList<ListItem<FilterKeyword>> selectedItems=new ArrayList<>();
 	private ArrayList<String> deletedItemIDs=new ArrayList<>();
 	private MenuItem deleteItem;
+	private Runnable actionModeDismisser=()->actionMode.finish();
 
 	public FilterWordsFragment(){
 		setListLayoutId(R.layout.recycler_fragment_with_text_fab);
@@ -80,12 +77,12 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 	}
 
 	@Override
-	public boolean onBackPressed(){
+	public void onStop(){
+		super.onStop();
 		Bundle result=new Bundle();
 		result.putParcelableArrayList("words", (ArrayList<? extends Parcelable>) data.stream().map(i->i.parentObject).map(Parcels::wrap).collect(Collectors.toCollection(ArrayList::new)));
 		result.putStringArrayList("deleted", deletedItemIDs);
 		setResult(true, result);
-		return false;
 	}
 
 	@Override
@@ -259,6 +256,7 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 		}
 		itemsAdapter.notifyItemRangeChanged(0, data.size());
 		updateActionModeTitle();
+		addBackCallback(actionModeDismisser);
 	}
 
 	private void leaveSelectionMode(boolean fromActionMode){
@@ -280,6 +278,7 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 			data.set(i, newItem);
 		}
 		itemsAdapter.notifyItemRangeChanged(0, data.size());
+		removeBackCallback(actionModeDismisser);
 	}
 
 	private void updateActionModeTitle(){

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsServerAboutFragment.java

@@ -100,15 +100,19 @@ public class SettingsServerAboutFragment extends LoaderFragment{
 		scroller.setClipToPadding(false);
 		scroller.addView(scrollingLayout);
 
-		FixedAspectRatioImageView banner=new FixedAspectRatioImageView(getActivity());
-		banner.setAspectRatio(1.914893617f);
-		banner.setScaleType(ImageView.ScaleType.CENTER_CROP);
-		banner.setOutlineProvider(OutlineProviders.bottomRoundedRect(16));
-		banner.setClipToOutline(true);
-		ViewImageLoader.loadWithoutAnimation(banner, getResources().getDrawable(R.drawable.image_placeholder, getActivity().getTheme()), new UrlImageLoaderRequest(instance.thumbnail));
-		LinearLayout.LayoutParams blp=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-		blp.bottomMargin=V.dp(24);
-		scrollingLayout.addView(banner, blp);
+		if(!TextUtils.isEmpty(instance.thumbnail)){
+			FixedAspectRatioImageView banner=new FixedAspectRatioImageView(getActivity());
+			banner.setAspectRatio(1.914893617f);
+			banner.setScaleType(ImageView.ScaleType.CENTER_CROP);
+			banner.setOutlineProvider(OutlineProviders.bottomRoundedRect(16));
+			banner.setClipToOutline(true);
+			ViewImageLoader.loadWithoutAnimation(banner, getResources().getDrawable(R.drawable.image_placeholder, getActivity().getTheme()), new UrlImageLoaderRequest(instance.thumbnail));
+			LinearLayout.LayoutParams blp=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+			blp.bottomMargin=V.dp(24);
+			scrollingLayout.addView(banner, blp);
+		}else{
+			scrollingLayout.setPadding(0, V.dp(24), 0, 0);
+		}
 
 		boolean needDivider=false;
 		if(instance.contactAccount!=null){

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

@@ -36,6 +36,7 @@ public class Card extends BaseModel{
 	public String blurhash;
 	public List<History> history;
 	public Instant publishedAt;
+	public Account authorAccount;
 
 	public transient Drawable blurhashPlaceholder;
 
@@ -49,6 +50,8 @@ public class Card extends BaseModel{
 			if(placeholder!=null)
 				blurhashPlaceholder=new BlurHashDrawable(placeholder, width, height);
 		}
+		if(authorAccount!=null)
+			authorAccount.postprocess();
 	}
 
 	@Override

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

@@ -0,0 +1,27 @@
+package org.joinmastodon.android.model;
+
+import org.joinmastodon.android.api.ObjectValidationException;
+import org.joinmastodon.android.api.RequiredField;
+
+import java.time.Instant;
+
+public class NotificationRequest extends BaseModel{
+	@RequiredField
+	public String id;
+	@RequiredField
+	public Instant createdAt;
+	@RequiredField
+	public Instant updatedAt;
+	public int notificationsCount;
+	@RequiredField
+	public Account account;
+	public Status lastStatus;
+
+	@Override
+	public void postprocess() throws ObjectValidationException{
+		super.postprocess();
+		account.postprocess();
+		if(lastStatus!=null)
+			lastStatus.postprocess();
+	}
+}

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

@@ -0,0 +1,14 @@
+package org.joinmastodon.android.model;
+
+public class NotificationsPolicy extends BaseModel{
+	public boolean filterNewAccounts;
+	public boolean filterNotFollowers;
+	public boolean filterNotFollowing;
+	public boolean filterPrivateMentions;
+	public Summary summary;
+
+	public static class Summary{
+		public int pendingNotificationsCount;
+		public int pendingRequestsCount;
+	}
+}

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

@@ -10,7 +10,7 @@ import androidx.annotation.StringRes;
 public class PushNotification extends BaseModel{
 	public String accessToken;
 	public String preferredLocale;
-	public long notificationId;
+	public String notificationId;
 	@RequiredField
 	public Type notificationType;
 	@RequiredField

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

@@ -58,7 +58,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 
 	public boolean favourited;
 	public boolean reblogged;
-	public boolean muted;
+	public Boolean muted;
 	public boolean bookmarked;
 	public Boolean pinned;
 

mastodon/src/main/java/org/joinmastodon/android/model/catalog/CatalogInstance.java

@@ -7,6 +7,7 @@ import com.google.gson.annotations.SerializedName;
 
 import org.joinmastodon.android.api.AllFieldsAreRequired;
 import org.joinmastodon.android.api.ObjectValidationException;
+import org.joinmastodon.android.api.RequiredField;
 import org.joinmastodon.android.model.BaseModel;
 
 import java.net.IDN;
@@ -15,14 +16,18 @@ import java.util.List;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.V;
 
-@AllFieldsAreRequired
 public class CatalogInstance extends BaseModel{
+	@RequiredField
 	public String domain;
+	@RequiredField
 	public String version;
+	@RequiredField
 	public String description;
+	@RequiredField
 	public List<String> languages;
 	@SerializedName("region")
 	private String _region;
+	@RequiredField
 	public List<String> categories;
 	public String proxiedThumbnail;
 	public int totalUsers;

mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/AccountViewModel.java

@@ -25,6 +25,10 @@ public class AccountViewModel{
 	public final String verifiedLink;
 
 	public AccountViewModel(Account account, String accountID){
+		this(account, accountID, true);
+	}
+
+	public AccountViewModel(Account account, String accountID, boolean needBio){
 		this.account=account;
 		avaRequest=new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? account.avatar : account.avatarStatic, V.dp(50), V.dp(50));
 		emojiHelper=new CustomEmojiHelper();
@@ -32,9 +36,13 @@ public class AccountViewModel{
 			parsedName=HtmlParser.parseCustomEmoji(account.displayName, account.emojis);
 		else
 			parsedName=account.displayName;
-		parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID, account);
 		SpannableStringBuilder ssb=new SpannableStringBuilder(parsedName);
-		ssb.append(parsedBio);
+		if(needBio){
+			parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID, account);
+			ssb.append(parsedBio);
+		}else{
+			parsedBio=null;
+		}
 		emojiHelper.setText(ssb);
 		String verifiedLink=null;
 		for(AccountField fld:account.fields){

mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/CardViewModel.java

@@ -1,19 +1,52 @@
 package org.joinmastodon.android.model.viewmodel;
 
+import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Card;
+import org.joinmastodon.android.ui.text.HtmlParser;
+import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.V;
 
 public class CardViewModel{
+	public final Object parentObject;
 	public final Card card;
 	public final ImageLoaderRequest imageRequest;
+	public final UrlImageLoaderRequest authorAvaRequest;
+	public final SpannableStringBuilder parsedAuthorName;
+	public final CustomEmojiHelper authorNameEmojiHelper=new CustomEmojiHelper();
 
-	public CardViewModel(Card card, int width, int height){
+	public CardViewModel(Card card, int width, int height, Object parentObject, String accountID){
 		this.card=card;
+		this.parentObject=parentObject;
 		this.imageRequest=TextUtils.isEmpty(card.image) ? null : new UrlImageLoaderRequest(card.image, V.dp(width), V.dp(height));
+
+		if(card.authorAccount!=null){
+			parsedAuthorName=new SpannableStringBuilder(card.authorAccount.displayName);
+			if(AccountSessionManager.get(accountID).getLocalPreferences().customEmojiInNames)
+				HtmlParser.parseCustomEmoji(parsedAuthorName, card.authorAccount.emojis);
+			authorNameEmojiHelper.setText(parsedAuthorName);
+			authorAvaRequest=new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? card.authorAccount.avatar : card.authorAccount.avatarStatic, V.dp(50), V.dp(50));
+		}else{
+			parsedAuthorName=null;
+			authorAvaRequest=null;
+		}
+	}
+
+	public int getImageCount(){
+		return 1+(card.authorAccount!=null ? (1+authorNameEmojiHelper.getImageCount()) : 0);
+	}
+
+	public ImageLoaderRequest getImageRequest(int index){
+		return switch(index){
+			case 0 -> imageRequest;
+			case 1 -> authorAvaRequest;
+			default -> authorNameEmojiHelper.getImageRequest(index-2);
+		};
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/ListItem.java

@@ -68,6 +68,12 @@ public class ListItem<T>{
 		this.subtitleRes=subtitleRes;
 	}
 
+	public ListItem(@StringRes int titleRes, @StringRes int subtitleRes, @DrawableRes int iconRes, T parentObject, Consumer<ListItem<T>> onClick){
+		this(null, null, iconRes, onClick, parentObject, 0, false);
+		this.titleRes=titleRes;
+		this.subtitleRes=subtitleRes;
+	}
+
 	public ListItem(@StringRes int titleRes, @StringRes int subtitleRes, @DrawableRes int iconRes, Consumer<ListItem<T>> onClick, int colorOverrideAttr, boolean dividerAfter){
 		this(null, null, iconRes, onClick, null, colorOverrideAttr, dividerAfter);
 		this.titleRes=titleRes;

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

@@ -35,8 +35,9 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration{
 		this.drawDividerPredicate=drawDividerPredicate;
 	}
 
-	public void setDrawBelowLastItem(boolean drawBelowLastItem){
+	public DividerItemDecoration setDrawBelowLastItem(boolean drawBelowLastItem){
 		this.drawBelowLastItem=drawBelowLastItem;
+		return this;
 	}
 
 	@Override

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

@@ -0,0 +1,61 @@
+package org.joinmastodon.android.ui;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.PopupWindow;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.ui.adapters.GenericListItemsAdapter;
+import org.joinmastodon.android.ui.viewholders.ListItemViewHolder;
+
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class ExtendedPopupMenu extends PopupWindow{
+	private UsableRecyclerView list;
+
+	public <T> ExtendedPopupMenu(Context context, List<ListItem<T>> items){
+		super(context, null, 0, R.style.Widget_Mastodon_PopupMenu);
+		setWidth(V.dp(200));
+		setElevation(V.dp(3));
+		setOutsideTouchable(true);
+		setFocusable(true);
+		setInputMethodMode(INPUT_METHOD_NOT_NEEDED);
+		list=new UsableRecyclerView(context);
+		list.setLayoutManager(new LinearLayoutManager(context));
+		list.setAdapter(new ReducedPaddingItemsAdapter<>(items));
+		list.setClipToPadding(false);
+		setContentView(list);
+	}
+
+	@Override
+	public void showAsDropDown(View anchor, int xoff, int yoff, int gravity){
+		super.showAsDropDown(anchor, xoff, yoff, gravity);
+		View bgView=(View) list.getParent();
+		list.setPadding(0, bgView.getPaddingTop(), 0, bgView.getPaddingBottom());
+		bgView.setPadding(0, 0, 0, 0);
+	}
+
+	private static class ReducedPaddingItemsAdapter<T> extends GenericListItemsAdapter<T>{
+		public ReducedPaddingItemsAdapter(List<ListItem<T>> listItems){
+			super(listItems);
+		}
+
+		@NonNull
+		@Override
+		public ListItemViewHolder<?> onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			ListItemViewHolder<?> holder=super.onCreateViewHolder(parent, viewType);
+			int padH=V.dp(12), padV=V.dp(8);
+			holder.itemView.setPadding(padH, padV, padH, padV);
+			View icon=holder.itemView.findViewById(R.id.icon);
+			((ViewGroup.MarginLayoutParams)icon.getLayoutParams()).setMarginEnd(padH);
+			return holder;
+		}
+	}
+}

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

@@ -50,6 +50,11 @@ public class M3AlertDialogBuilder extends AlertDialog.Builder{
 				helpButton.setSelected(helpText.getVisibility()==View.VISIBLE);
 			});
 			setCustomTitle(titleLayout);
+		}else if(!TextUtils.isEmpty(title)){
+			View titleLayout=getContext().getSystemService(LayoutInflater.class).inflate(R.layout.alert_title, null);
+			TextView title=titleLayout.findViewById(R.id.title);
+			title.setText(this.title);
+			setCustomTitle(titleLayout);
 		}
 
 		alert=super.create();

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

@@ -58,7 +58,7 @@ public class PhotoLayoutHelper{
 		float avgRatio=!ratios.isEmpty() ? sum(ratios)/ratios.size() : 1.0f;
 
 		if(cnt==2){
-			if(allAreWide && avgRatio>1.4*maxRatio && (ratios.get(1)-ratios.get(0))<0.2){ // two wide photos, one above the other
+			if(allAreWide && avgRatio>1.4*maxRatio && Math.abs(ratios.get(1)-ratios.get(0))<0.2){ // two wide photos, one above the other
 				float h=Math.max(Math.min(MAX_WIDTH/ratios.get(0), Math.min(MAX_WIDTH/ratios.get(1), (MAX_HEIGHT-GAP)/2.0f)), MIN_HEIGHT/2f);
 
 				result.width=MAX_WIDTH;
@@ -69,7 +69,23 @@ public class PhotoLayoutHelper{
 						new TiledLayoutResult.Tile(1, 1, 0, 0),
 						new TiledLayoutResult.Tile(1, 1, 0, 1)
 				};
-			}else if(allAreWide || allAreSquare){ // next to each other, same ratio
+			}else if(allAreWide){ // two wide photos, one above the other, different ratios
+				result.width=MAX_WIDTH;
+				float h0=MAX_WIDTH/ratios.get(0);
+				float h1=MAX_WIDTH/ratios.get(1);
+				if(h0+h1<MIN_HEIGHT){
+					float prevTotalHeight=h0+h1;
+					h0=MIN_HEIGHT*(h0/prevTotalHeight);
+					h1=MIN_HEIGHT*(h1/prevTotalHeight);
+				}
+				result.height=Math.round(h0+h1+GAP);
+				result.rowSizes=new int[]{Math.round(h0), Math.round(h1)};
+				result.columnSizes=new int[]{MAX_WIDTH};
+				result.tiles=new TiledLayoutResult.Tile[]{
+						new TiledLayoutResult.Tile(1, 1, 0, 0),
+						new TiledLayoutResult.Tile(1, 1, 0, 1)
+				};
+			}else if(allAreSquare){ // next to each other, same ratio
 				float w=((MAX_WIDTH-GAP)/2);
 				float h=Math.max(Math.min(w/ratios.get(0), Math.min(w/ratios.get(1), MAX_HEIGHT)), MIN_HEIGHT);
 

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

@@ -6,6 +6,7 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityNodeInfo;
@@ -19,6 +20,9 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.ComposeFragment;
+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.model.StatusPrivacy;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -48,6 +52,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		private final ImageView share;
 		private final ColorStateList buttonColors;
 		private final View replyBtn, boostBtn, favoriteBtn, shareBtn;
+		private final PopupMenu boostLongTapMenu, favoriteLongTapMenu;
 
 		private final View.AccessibilityDelegate buttonAccessibilityDelegate=new View.AccessibilityDelegate(){
 			@Override
@@ -97,11 +102,20 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			replyBtn.setOnClickListener(this::onReplyClick);
 			replyBtn.setAccessibilityDelegate(buttonAccessibilityDelegate);
 			boostBtn.setOnClickListener(this::onBoostClick);
+			boostBtn.setOnLongClickListener(this::onBoostLongClick);
 			boostBtn.setAccessibilityDelegate(buttonAccessibilityDelegate);
 			favoriteBtn.setOnClickListener(this::onFavoriteClick);
+			favoriteBtn.setOnLongClickListener(this::onFavoriteLongClick);
 			favoriteBtn.setAccessibilityDelegate(buttonAccessibilityDelegate);
 			shareBtn.setOnClickListener(this::onShareClick);
 			shareBtn.setAccessibilityDelegate(buttonAccessibilityDelegate);
+
+			favoriteLongTapMenu=new PopupMenu(activity, favoriteBtn);
+			favoriteLongTapMenu.inflate(R.menu.favorite_longtap);
+			favoriteLongTapMenu.setOnMenuItemClickListener(this::onLongTapMenuItemSelected);
+			boostLongTapMenu=new PopupMenu(activity, boostBtn);
+			boostLongTapMenu.inflate(R.menu.boost_longtap);
+			boostLongTapMenu.setOnMenuItemClickListener(this::onLongTapMenuItemSelected);
 		}
 
 		@Override
@@ -172,6 +186,45 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			UiUtils.openSystemShareSheet(v.getContext(), item.status);
 		}
 
+		private boolean onBoostLongClick(View v){
+			MenuItem boost=boostLongTapMenu.getMenu().findItem(R.id.boost);
+			boost.setTitle(item.status.reblogged ? R.string.undo_reblog : R.string.button_reblog);
+			boostLongTapMenu.show();
+			return true;
+		}
+
+		private boolean onFavoriteLongClick(View v){
+			MenuItem favorite=favoriteLongTapMenu.getMenu().findItem(R.id.favorite);
+			MenuItem bookmark=favoriteLongTapMenu.getMenu().findItem(R.id.bookmark);
+			favorite.setTitle(item.status.favourited ? R.string.undo_favorite : R.string.button_favorite);
+			bookmark.setTitle(item.status.bookmarked ? R.string.remove_bookmark : R.string.add_bookmark);
+			favoriteLongTapMenu.show();
+			return true;
+		}
+
+		private boolean onLongTapMenuItemSelected(MenuItem item){
+			int id=item.getItemId();
+			if(id==R.id.favorite){
+				onFavoriteClick(null);
+			}else if(id==R.id.boost){
+				onBoostClick(null);
+			}else if(id==R.id.bookmark){
+				AccountSessionManager.getInstance().getAccount(this.item.accountID).getStatusInteractionController().setBookmarked(this.item.status, !this.item.status.bookmarked);
+			}else if(id==R.id.view_favorites){
+				startAccountListFragment(StatusFavoritesListFragment.class);
+			}else if(id==R.id.view_boosts){
+				startAccountListFragment(StatusReblogsListFragment.class);
+			}
+			return true;
+		}
+
+		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);
+		}
+
 		private int descriptionForId(int id){
 			if(id==R.id.reply_btn)
 				return R.string.button_reply;

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

@@ -25,11 +25,13 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.statuses.GetStatusSourceText;
+import org.joinmastodon.android.api.requests.statuses.SetStatusConversationMuted;
 import org.joinmastodon.android.api.requests.statuses.SetStatusPinned;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.AddAccountToListsFragment;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.ComposeFragment;
+import org.joinmastodon.android.fragments.NotificationsListFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
@@ -117,6 +119,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		private final TextView name, timeAndUsername, extraText;
 		private final ImageView avatar, more;
 		private final PopupMenu optionsMenu;
+		private final View clickableThing;
 
 		public Holder(Activity activity, ViewGroup parent){
 			this(activity, R.layout.display_item_header, parent);
@@ -129,14 +132,16 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			avatar=findViewById(R.id.avatar);
 			more=findViewById(R.id.more);
 			extraText=findViewById(R.id.extra_text);
-			avatar.setOnClickListener(this::onAvaClick);
+			clickableThing=findViewById(R.id.clickable_thing);
+			if(clickableThing!=null)
+				clickableThing.setOnClickListener(this::onAvaClick);
 			avatar.setOutlineProvider(OutlineProviders.roundedRect(10));
 			avatar.setClipToOutline(true);
 			more.setOnClickListener(this::onMoreClick);
 
 			optionsMenu=new PopupMenu(activity, more);
 			optionsMenu.inflate(R.menu.post);
-			if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI())
+			if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI() && !UiUtils.isMagic())
 				optionsMenu.getMenu().setGroupDividerEnabled(true);
 			optionsMenu.setOnMenuItemClickListener(menuItem->{
 				Account account=item.user;
@@ -228,6 +233,22 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 							})
 							.wrapProgress(activity, R.string.loading, true)
 							.exec(item.accountID);
+				}else if(id==R.id.mute_conversation){
+					new SetStatusConversationMuted(item.status.id, !item.status.muted)
+							.setCallback(new Callback<>(){
+								@Override
+								public void onSuccess(Status result){
+									// TODO snackbar?
+									item.status.muted=result.muted;
+								}
+
+								@Override
+								public void onError(ErrorResponse error){
+									error.showToast(activity);
+								}
+							})
+							.wrapProgress(activity, R.string.loading, true)
+							.exec(item.accountID);
 				}
 				return true;
 			});
@@ -244,7 +265,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				time=item.parentFragment.getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(itemView.getContext(), item.status.editedAt));
 
 			timeAndUsername.setText(time+" · @"+item.user.acct);
-			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), item.needBottomPadding ? V.dp(16) : 0);
+			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), item.needBottomPadding ? V.dp(16) : V.dp(4));
 			if(TextUtils.isEmpty(item.extraText)){
 				extraText.setVisibility(View.GONE);
 			}else{
@@ -252,8 +273,10 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				extraText.setText(item.extraText);
 			}
 			more.setVisibility(item.inset ? View.GONE : View.VISIBLE);
-			avatar.setClickable(!item.inset);
-			avatar.setContentDescription(item.parentFragment.getString(R.string.avatar_description, item.user.acct));
+			if(clickableThing!=null){
+				clickableThing.setClickable(!item.inset);
+				clickableThing.setContentDescription(item.parentFragment.getString(R.string.avatar_description, item.user.acct));
+			}
 		}
 
 		@Override
@@ -314,6 +337,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			MenuItem follow=menu.findItem(R.id.follow);
 			MenuItem bookmark=menu.findItem(R.id.bookmark);
 			MenuItem pin=menu.findItem(R.id.pin);
+			MenuItem muteConversation=menu.findItem(R.id.mute_conversation);
 			if(item.status!=null){
 				bookmark.setVisible(true);
 				bookmark.setTitle(item.status.bookmarked ? R.string.remove_bookmark : R.string.add_bookmark);
@@ -340,6 +364,12 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				report.setTitle(item.parentFragment.getString(R.string.report_user, account.displayName));
 				follow.setTitle(item.parentFragment.getString(relationship!=null && relationship.following ? R.string.unfollow_user : R.string.follow_user, account.displayName));
 			}
+			if(item.status.muted!=null){
+				muteConversation.setVisible(isOwnPost || item.parentFragment instanceof NotificationsListFragment);
+				muteConversation.setTitle(item.status.muted ? R.string.unmute_conversation : R.string.mute_conversation);
+			}else{
+				muteConversation.setVisible(false);
+			}
 			menu.findItem(R.id.add_to_list).setVisible(relationship!=null && relationship.following);
 		}
 	}

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

@@ -1,143 +1,55 @@
 package org.joinmastodon.android.ui.displayitems;
 
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.text.TextUtils;
-import android.view.View;
+import android.app.Activity;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
 
-import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Card;
 import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.ui.OutlineProviders;
-import org.joinmastodon.android.ui.drawables.BlurhashCrossfadeDrawable;
-import org.joinmastodon.android.ui.text.HtmlParser;
-import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.model.viewmodel.CardViewModel;
+import org.joinmastodon.android.ui.viewholders.LinkCardHolder;
 
-import java.util.Objects;
-
-import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
-import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 
-public class LinkCardStatusDisplayItem extends StatusDisplayItem{
+public class LinkCardStatusDisplayItem extends StatusDisplayItem implements LinkCardHolder.LinkCardProvider{
 	private final Status status;
-	private final UrlImageLoaderRequest imgRequest;
+	private final CardViewModel cardViewModel;
 
 	public LinkCardStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status){
 		super(parentID, parentFragment);
 		this.status=status;
-		if(status.card.image!=null)
-			imgRequest=new UrlImageLoaderRequest(status.card.image, 1000, 1000);
-		else
-			imgRequest=null;
+		int size=shouldUseLargeCard() ? 1000 : 192;
+		cardViewModel=new CardViewModel(status.card, size, size, status, parentFragment.getAccountID());
+	}
+
+	private boolean shouldUseLargeCard(){
+		return status.card.type==Card.Type.VIDEO || (status.card.image!=null && status.card.width>status.card.height);
 	}
 
 	@Override
 	public Type getType(){
-		return status.card.type==Card.Type.VIDEO || (status.card.image!=null && status.card.width>status.card.height) ? Type.CARD_LARGE : Type.CARD_COMPACT;
+		return shouldUseLargeCard() ? Type.CARD_LARGE : Type.CARD_COMPACT;
 	}
 
 	@Override
 	public int getImageCount(){
-		return imgRequest==null ? 0 : 1;
+		return cardViewModel.getImageCount();
 	}
 
 	@Override
 	public ImageLoaderRequest getImageRequest(int index){
-		return imgRequest;
+		return cardViewModel.getImageRequest(index);
 	}
 
-	public static class Holder extends StatusDisplayItem.Holder<LinkCardStatusDisplayItem> implements ImageLoaderViewHolder{
-		private final TextView title, description, domain, timestamp;
-		private final ImageView photo;
-		private BlurhashCrossfadeDrawable crossfadeDrawable=new BlurhashCrossfadeDrawable();
-		private boolean didClear;
-		private final View inner;
-		private final boolean isLarge;
+	@Override
+	public CardViewModel getCard(){
+		return cardViewModel;
+	}
 
-		public Holder(Context context, ViewGroup parent, boolean isLarge){
-			super(context, isLarge ? R.layout.display_item_link_card : R.layout.display_item_link_card_compact, parent);
-			this.isLarge=isLarge;
-			title=findViewById(R.id.title);
-			description=findViewById(R.id.description);
-			domain=findViewById(R.id.domain);
-			timestamp=findViewById(R.id.timestamp);
-			photo=findViewById(R.id.photo);
-			inner=findViewById(R.id.inner);
-			inner.setOnClickListener(this::onClick);
-			inner.setOutlineProvider(OutlineProviders.roundedRect(12));
-			inner.setClipToOutline(true);
-		}
+	public static class Holder extends LinkCardHolder<LinkCardStatusDisplayItem>{
 
-		@SuppressLint("SetTextI18n")
-		@Override
-		public void onBind(LinkCardStatusDisplayItem item){
-			Card card=item.status.card;
-			title.setText(card.title);
-			if(description!=null){
-				description.setText(card.description);
-				description.setVisibility(TextUtils.isEmpty(card.description) ? View.GONE : View.VISIBLE);
-			}
-			String cardDomain=HtmlParser.normalizeDomain(Objects.requireNonNull(Uri.parse(card.url).getHost()));
-			if(isLarge && !TextUtils.isEmpty(card.authorName)){
-				domain.setText(itemView.getContext().getString(R.string.article_by_author, card.authorName)+" · "+cardDomain);
-			}else{
-				domain.setText(cardDomain);
-			}
-			if(card.publishedAt!=null){
-				timestamp.setVisibility(View.VISIBLE);
-				timestamp.setText(" · "+UiUtils.formatRelativeTimestamp(itemView.getContext(), card.publishedAt));
-			}else{
-				timestamp.setVisibility(View.GONE);
-			}
-
-			photo.setImageDrawable(null);
-			if(item.imgRequest!=null){
-				photo.setScaleType(ImageView.ScaleType.CENTER_CROP);
-				photo.setBackground(null);
-				photo.setImageTintList(null);
-				crossfadeDrawable.setSize(card.width, card.height);
-				crossfadeDrawable.setBlurhashDrawable(card.blurhashPlaceholder);
-				crossfadeDrawable.setCrossfadeAlpha(0f);
-				photo.setImageDrawable(null);
-				photo.setImageDrawable(crossfadeDrawable);
-				didClear=false;
-			}else{
-				photo.setBackgroundColor(UiUtils.getThemeColor(itemView.getContext(), R.attr.colorM3SurfaceVariant));
-				photo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(itemView.getContext(), R.attr.colorM3Outline)));
-				photo.setScaleType(ImageView.ScaleType.CENTER);
-				photo.setImageResource(R.drawable.ic_feed_48px);
-			}
-		}
-
-		@Override
-		public void setImage(int index, Drawable drawable){
-			crossfadeDrawable.setImageDrawable(drawable);
-			if(didClear)
-				crossfadeDrawable.animateAlpha(0f);
-			Card card=item.status.card;
-			// Make sure the image is not stretched if the server returned wrong dimensions
-			if(drawable!=null && (drawable.getIntrinsicWidth()!=card.width || drawable.getIntrinsicHeight()!=card.height)){
-				photo.setImageDrawable(null);
-				photo.setImageDrawable(crossfadeDrawable);
-			}
-		}
-
-		@Override
-		public void clearImage(int index){
-			crossfadeDrawable.setCrossfadeAlpha(1f);
-			didClear=true;
-		}
-
-		private void onClick(View v){
-			UiUtils.openURL(itemView.getContext(), item.parentFragment.getAccountID(), item.status.card.url, item.status);
+		public Holder(Activity context, ViewGroup parent, boolean isLarge, String accountID){
+			super(context, parent, isLarge, accountID);
 		}
 	}
 }

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

@@ -173,7 +173,7 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 				}
 				controllers.add(c);
 
-				if (item.status.translation != null){
+				if (item.status.translation!=null && item.status.translation.mediaAttachments!=null){
 					if(item.status.translationState==Status.TranslationState.SHOWN){
 						if(!item.translatedAttachments.containsKey(att.id)){
 							Optional<Translation.MediaAttachment> translatedAttachment=Arrays.stream(item.status.translation.mediaAttachments).filter(mediaAttachment->mediaAttachment.id.equals(att.id)).findFirst();

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

@@ -125,7 +125,8 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 		public void onBind(NotificationHeaderStatusDisplayItem item){
 			text.setText(item.text);
 			avatar.setVisibility(item.notification.type==Notification.Type.POLL ? View.GONE : View.VISIBLE);
-			// TODO use real icons
+			if(item.notification.type!=Notification.Type.POLL)
+				avatar.setContentDescription(item.parentFragment.getString(R.string.avatar_description, item.notification.account.acct));
 			icon.setImageResource(switch(item.notification.type){
 				case FAVORITE -> R.drawable.ic_star_fill1_24px;
 				case REBLOG -> R.drawable.ic_repeat_fill1_24px;

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

@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
@@ -68,8 +69,8 @@ public abstract class StatusDisplayItem{
 			case AUDIO -> new AudioStatusDisplayItem.Holder(activity, parent);
 			case POLL_OPTION -> new PollOptionStatusDisplayItem.Holder(activity, parent);
 			case POLL_FOOTER -> new PollFooterStatusDisplayItem.Holder(activity, parent);
-			case CARD_LARGE -> new LinkCardStatusDisplayItem.Holder(activity, parent, true);
-			case CARD_COMPACT -> new LinkCardStatusDisplayItem.Holder(activity, parent, false);
+			case CARD_LARGE -> new LinkCardStatusDisplayItem.Holder(activity, parent, true, ((BaseStatusListFragment<?>)parentFragment).getAccountID());
+			case CARD_COMPACT -> new LinkCardStatusDisplayItem.Holder(activity, parent, false, ((BaseStatusListFragment<?>)parentFragment).getAccountID());
 			case FOOTER -> new FooterStatusDisplayItem.Holder(activity, parent);
 			case ACCOUNT -> new AccountStatusDisplayItem.Holder(new AccountViewHolder(parentFragment, parent, null));
 			case HASHTAG -> new HashtagStatusDisplayItem.Holder(activity, parent);
@@ -151,10 +152,12 @@ public abstract class StatusDisplayItem{
 		if(!imageAttachments.isEmpty()){
 			PhotoLayoutHelper.TiledLayoutResult layout=PhotoLayoutHelper.processThumbs(imageAttachments);
 			MediaGridStatusDisplayItem mediaGrid=new MediaGridStatusDisplayItem(parentID, fragment, layout, imageAttachments, statusForContent);
-			if((flags & FLAG_MEDIA_FORCE_HIDDEN)!=0)
+			if((flags & FLAG_MEDIA_FORCE_HIDDEN)!=0){
 				mediaGrid.sensitiveTitle=fragment.getString(R.string.media_hidden);
-			else if(statusForContent.sensitive && !AccountSessionManager.get(accountID).getLocalPreferences().hideSensitiveMedia)
+				mediaGrid.sensitiveRevealed=false;
+			}else if(statusForContent.sensitive && !AccountSessionManager.get(accountID).getLocalPreferences().hideSensitiveMedia){
 				mediaGrid.sensitiveRevealed=true;
+			}
 			contentItems.add(mediaGrid);
 		}
 		for(Attachment att:statusForContent.mediaAttachments){
@@ -224,7 +227,7 @@ public abstract class StatusDisplayItem{
 		FILTER_SPOILER
 	}
 
-	public static abstract class Holder<T extends StatusDisplayItem> extends BindableViewHolder<T> implements UsableRecyclerView.DisableableClickable{
+	public static abstract class Holder<T> extends BindableViewHolder<T> implements UsableRecyclerView.DisableableClickable{
 		public Holder(View itemView){
 			super(itemView);
 		}
@@ -234,17 +237,18 @@ public abstract class StatusDisplayItem{
 		}
 
 		public String getItemID(){
-			return item.parentID;
+			return item instanceof StatusDisplayItem sdi ? sdi.parentID : null;
 		}
 
 		@Override
 		public void onClick(){
-			item.parentFragment.onItemClick(item.parentID);
+			if(item instanceof StatusDisplayItem sdi)
+				sdi.parentFragment.onItemClick(sdi.parentID);
 		}
 
 		@Override
 		public boolean isEnabled(){
-			return item.parentFragment.isItemEnabled(item.parentID);
+			return item instanceof StatusDisplayItem sdi && sdi.parentFragment.isItemEnabled(sdi.parentID);
 		}
 	}
 }

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

@@ -94,7 +94,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			text.setTextIsSelectable(item.textSelectable);
 			text.setInvalidateOnEveryFrame(false);
 			itemView.setClickable(false);
-			text.setPadding(text.getPaddingLeft(), item.reduceTopPadding ? V.dp(8) : V.dp(16), text.getPaddingRight(), text.getPaddingBottom());
+			text.setPadding(text.getPaddingLeft(), item.reduceTopPadding ? V.dp(8) : V.dp(12), text.getPaddingRight(), text.getPaddingBottom());
 			text.setTextColor(UiUtils.getThemeColor(text.getContext(), item.inset ? R.attr.colorM3OnSurfaceVariant : R.attr.colorM3OnSurface));
 			updateTranslation(false);
 		}

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

@@ -54,6 +54,7 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
+import android.window.OnBackInvokedDispatcher;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
@@ -169,7 +170,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		windowView=new FrameLayout(activity){
 			@Override
 			public boolean dispatchKeyEvent(KeyEvent event){
-				if(event.getKeyCode()==KeyEvent.KEYCODE_BACK){
+				if(Build.VERSION.SDK_INT<Build.VERSION_CODES.TIRAMISU && event.getKeyCode()==KeyEvent.KEYCODE_BACK){
 					if(event.getAction()==KeyEvent.ACTION_DOWN){
 						onStartSwipeToDismissTransition(0f);
 					}
@@ -257,6 +258,10 @@ public class PhotoViewer implements ZoomPanView.Listener{
 			wlp.layoutInDisplayCutoutMode=Build.VERSION.SDK_INT>=30 ? WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS : WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
 		windowView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
 		wm.addView(windowView, wlp);
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.TIRAMISU){
+			// TODO make use of the progress callback for nicer animation
+			windowView.findOnBackInvokedDispatcher().registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT, ()->onStartSwipeToDismissTransition(0));
+		}
 
 		windowView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
 			@Override

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

@@ -69,6 +69,7 @@ public class PhotoViewerInfoSheet extends BottomSheet{
 		backButton.setOutlineProvider(ViewOutlineProvider.BACKGROUND);
 		backButton.setElevation(V.dp(2));
 		backButton.setAlpha(0f);
+		backButton.setContentDescription(context.getString(R.string.back));
 		backButton.setOnClickListener(v->{
 			listener.onDismissEntireViewer();
 			dismiss();
@@ -82,6 +83,7 @@ public class PhotoViewerInfoSheet extends BottomSheet{
 		infoButton.setElevation(V.dp(2));
 		infoButton.setAlpha(0f);
 		infoButton.setSelected(true);
+		infoButton.setContentDescription(context.getString(R.string.info));
 		infoButton.setOnClickListener(v->dismiss());
 
 		FrameLayout.LayoutParams lp=new FrameLayout.LayoutParams(V.dp(48), V.dp(48));

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

@@ -86,6 +86,7 @@ public class HtmlParser{
 		// Hashtags in remote posts have remote URLs, these have local URLs so they don't match.
 //		Map<String, String> tagsByUrl=tags.stream().collect(Collectors.toMap(t->t.url, t->t.name));
 		Map<String, Hashtag> tagsByTag=tags.stream().distinct().collect(Collectors.toMap(t->t.name.toLowerCase(), Function.identity()));
+		Map<String, Mention> mentionsByID=mentions.stream().distinct().collect(Collectors.toMap(m->m.id, Function.identity()));
 
 		final SpannableStringBuilder ssb=new SpannableStringBuilder();
 		Jsoup.parseBodyFragment(source).body().traverse(new NodeVisitor(){
@@ -115,6 +116,7 @@ public class HtmlParser{
 								if(id!=null){
 									linkType=LinkSpan.Type.MENTION;
 									href=id;
+									linkObject=mentionsByID.get(id);
 								}else{
 									linkType=LinkSpan.Type.URL;
 								}

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

@@ -2,9 +2,12 @@ package org.joinmastodon.android.ui.text;
 
 import android.content.Context;
 import android.text.TextPaint;
+import android.text.TextUtils;
 import android.text.style.CharacterStyle;
 
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Hashtag;
+import org.joinmastodon.android.model.Mention;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 public class LinkSpan extends CharacterStyle {
@@ -39,7 +42,21 @@ public class LinkSpan extends CharacterStyle {
 	public void onClick(Context context){
 		switch(getType()){
 			case URL -> UiUtils.openURL(context, accountID, link, parentObject);
-			case MENTION -> UiUtils.openProfileByID(context, accountID, link);
+			case MENTION -> {
+				String username, domain;
+				if(linkObject instanceof Mention m && !TextUtils.isEmpty(m.acct)){
+					String[] parts=m.acct.split("@", 2);
+					username=parts[0];
+					if(parts.length==2){
+						domain=parts[1];
+					}else{
+						domain=AccountSessionManager.get(accountID).domain;
+					}
+				}else{
+					username=domain=null;
+				}
+				UiUtils.openProfileByID(context, accountID, link, username, domain);
+			}
 			case HASHTAG -> {
 				if(linkObject instanceof Hashtag ht)
 					UiUtils.openHashtagTimeline(context, accountID, ht);

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

@@ -85,6 +85,10 @@ public class DiscoverInfoBannerHelper{
 		bannerTypesToShow=EnumSet.allOf(BannerType.class);
 	}
 
+	public boolean isBannerShown(){
+		return added;
+	}
+
 	public enum BannerType{
 		TRENDING_POSTS,
 		TRENDING_LINKS,

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

@@ -37,8 +37,8 @@ public class InsetStatusItemDecoration extends RecyclerView.ItemDecoration{
 		for(int i=0; i<parent.getChildCount(); i++){
 			View child=parent.getChildAt(i);
 			RecyclerView.ViewHolder holder=parent.getChildViewHolder(child);
-			pos=holder.getAbsoluteAdapterPosition();
-			boolean inset=(holder instanceof StatusDisplayItem.Holder<?> sdi) && sdi.getItem().inset;
+			pos=holder.getAbsoluteAdapterPosition()-listFragment.getMainAdapterOffset();
+			boolean inset=holder instanceof StatusDisplayItem.Holder<?> sdi && sdi.getItem() instanceof StatusDisplayItem item && item.inset;
 			if(inset){
 				if(rect.isEmpty()){
 					float childY=child.getY();
@@ -80,13 +80,13 @@ public class InsetStatusItemDecoration extends RecyclerView.ItemDecoration{
 	public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
 		List<StatusDisplayItem> displayItems=listFragment.getDisplayItems();
 		RecyclerView.ViewHolder holder=parent.getChildViewHolder(view);
-		if(holder instanceof StatusDisplayItem.Holder<?> sdi){
-			boolean inset=sdi.getItem().inset;
-			int pos=holder.getAbsoluteAdapterPosition();
+		if(holder instanceof StatusDisplayItem.Holder<?> sdi && sdi.getItem() instanceof StatusDisplayItem item){
+			boolean inset=item.inset;
+			int pos=holder.getAbsoluteAdapterPosition()-listFragment.getMainAdapterOffset();
 			if(inset){
 				boolean topSiblingInset=pos>0 && displayItems.get(pos-1).inset;
 				boolean bottomSiblingInset=pos<displayItems.size()-1 && displayItems.get(pos+1).inset;
-				StatusDisplayItem.Type type=sdi.getItem().getType();
+				StatusDisplayItem.Type type=item.getType();
 				if(type==StatusDisplayItem.Type.CARD_LARGE || type==StatusDisplayItem.Type.MEDIA_GRID)
 					outRect.left=outRect.right=V.dp(16);
 				else

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

@@ -26,8 +26,6 @@ import android.os.SystemClock;
 import android.os.ext.SdkExtensions;
 import android.provider.MediaStore;
 import android.provider.OpenableColumns;
-import android.system.ErrnoException;
-import android.system.Os;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -37,7 +35,6 @@ import android.transition.ChangeScroll;
 import android.transition.Fade;
 import android.transition.TransitionManager;
 import android.transition.TransitionSet;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -47,12 +44,10 @@ import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.webkit.MimeTypeMap;
 import android.widget.Button;
-import android.widget.FrameLayout;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.widget.Toolbar;
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.FileProvider;
@@ -359,13 +354,23 @@ public class UiUtils{
 	}
 
 	public static void openProfileByID(Context context, String selfID, String id){
+		openProfileByID(context, selfID, id, null, null);
+	}
+
+	public static void openProfileByID(Context context, String selfID, String id, String username, String domain){
 		Bundle args=new Bundle();
 		args.putString("account", selfID);
 		args.putString("profileAccountID", id);
+		if(username!=null && domain!=null){
+			args.putString("accountUsername", username);
+			args.putString("accountDomain", domain);
+		}
 		Nav.go((Activity)context, ProfileFragment.class, args);
 	}
 
 	public static void openHashtagTimeline(Context context, String accountID, Hashtag hashtag){
+		if(checkIfAlreadyDisplayingSameHashtag(context, hashtag.name))
+			return;
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		args.putParcelable("hashtag", Parcels.wrap(hashtag));
@@ -373,12 +378,22 @@ public class UiUtils{
 	}
 
 	public static void openHashtagTimeline(Context context, String accountID, String hashtag){
+		if(checkIfAlreadyDisplayingSameHashtag(context, hashtag))
+			return;
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		args.putString("hashtagName", hashtag);
 		Nav.go((Activity)context, HashtagTimelineFragment.class, args);
 	}
 
+	private static boolean checkIfAlreadyDisplayingSameHashtag(Context context, String hashtag){
+		if(context instanceof MainActivity ma && ma.getTopmostFragment() instanceof HashtagTimelineFragment htf && htf.getHashtagName().equalsIgnoreCase(hashtag)){
+			htf.shakeListView();
+			return true;
+		}
+		return false;
+	}
+
 	public static void showConfirmationAlert(Context context, @StringRes int title, @StringRes int message, @StringRes int confirmButton, Runnable onConfirmed){
 		showConfirmationAlert(context, context.getString(title), message==0 ? null : context.getString(message), context.getString(confirmButton), onConfirmed);
 	}
@@ -590,7 +605,7 @@ public class UiUtils{
 		}else{
 			Runnable action=()->{
 				progressCallback.accept(true);
-				new SetAccountFollowed(account.id, !relationship.following && !relationship.requested, true)
+				new SetAccountFollowed(account.id, !relationship.following && !relationship.requested, true, false)
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(Relationship result){
@@ -794,6 +809,10 @@ public class UiUtils{
 		return !TextUtils.isEmpty(getSystemProperty("ro.build.version.emui"));
 	}
 
+	public static boolean isMagic() {
+		return !TextUtils.isEmpty(getSystemProperty("ro.build.version.magic"));
+	}
+
 	public static int alphaBlendColors(int color1, int color2, float alpha){
 		float alpha0=1f-alpha;
 		int r=Math.round(((color1 >> 16) & 0xFF)*alpha0+((color2 >> 16) & 0xFF)*alpha);
@@ -1038,4 +1057,20 @@ public class UiUtils{
 			button.setTextColor(origColor);
 		}
 	}
+
+	public static void updateRecyclerViewKeepingAbsoluteScrollPosition(RecyclerView rv, Runnable onUpdate){
+		int topItem=-1;
+		int topItemOffset=0;
+		if(rv.getChildCount()>0){
+			View item=rv.getChildAt(0);
+			topItem=rv.getChildAdapterPosition(item);
+			topItemOffset=item.getTop();
+		}
+		onUpdate.run();
+		int newCount=rv.getAdapter().getItemCount();
+		if(newCount>=topItem){
+			rv.scrollToPosition(topItem);
+			rv.scrollBy(0, -topItemOffset);
+		}
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java

@@ -313,7 +313,12 @@ public class ComposeMediaViewController{
 		int maxSize=0;
 		String contentType=fragment.getActivity().getContentResolver().getType(attachment.uri);
 		if(contentType!=null && contentType.startsWith("image/")){
-			maxSize=2_073_600; // TODO get this from instance configuration when it gets added there
+			Instance instance=fragment.instance;
+			if(instance.configuration!=null && instance.configuration.mediaAttachments!=null && instance.configuration.mediaAttachments.imageMatrixLimit>0){
+				maxSize=instance.configuration.mediaAttachments.imageMatrixLimit;
+			}else{
+				maxSize=2_073_600;
+			}
 		}
 		attachment.progressBar.setProgress(0);
 		attachment.speedTracker.reset();
@@ -545,7 +550,7 @@ public class ComposeMediaViewController{
 	}
 	
 	public List<String> getAttachmentIDs(){
-		return attachments.stream().map(a->a.serverAttachment.id).collect(Collectors.toList());
+		return attachments.stream().filter(a->a.serverAttachment!=null).map(a->a.serverAttachment.id).collect(Collectors.toList());
 	}
 
 	public List<CreateStatus.Request.MediaAttribute> getAttachmentAttributes(){

mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/GenericListItemsViewController.java

@@ -0,0 +1,60 @@
+package org.joinmastodon.android.ui.viewcontrollers;
+
+import android.content.Context;
+import android.view.View;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.ui.BetterItemAnimator;
+import org.joinmastodon.android.ui.DividerItemDecoration;
+import org.joinmastodon.android.ui.adapters.GenericListItemsAdapter;
+import org.joinmastodon.android.ui.viewholders.CheckableListItemViewHolder;
+import org.joinmastodon.android.ui.viewholders.ListItemViewHolder;
+import org.joinmastodon.android.ui.viewholders.SimpleListItemViewHolder;
+
+import java.util.List;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class GenericListItemsViewController<T>{
+	private UsableRecyclerView list;
+	private List<ListItem<T>> items;
+	private GenericListItemsAdapter<T> adapter;
+	private Context context;
+
+	public GenericListItemsViewController(Context context, List<ListItem<T>> items){
+		this.context=context;
+		setItems(items);
+	}
+
+	public GenericListItemsViewController(Context context){
+		this.context=context;
+	}
+
+	public void setItems(List<ListItem<T>> items){
+		if(this.items!=null)
+			throw new IllegalStateException("items already set");
+		this.items=items;
+		adapter=new GenericListItemsAdapter<>(items);
+		list=new UsableRecyclerView(context);
+		list.setLayoutManager(new LinearLayoutManager(context));
+		list.setAdapter(adapter);
+		list.addItemDecoration(new DividerItemDecoration(context, R.attr.colorM3OutlineVariant, 1, 16, 16, vh->(vh instanceof SimpleListItemViewHolder ivh && ivh.getItem().dividerAfter) || (vh instanceof CheckableListItemViewHolder cvh && cvh.getItem().dividerAfter)));
+		list.setItemAnimator(new BetterItemAnimator());
+	}
+
+	public GenericListItemsAdapter<T> getAdapter(){
+		return adapter;
+	}
+
+	public View getView(){
+		return list;
+	}
+
+	public void rebindItem(ListItem<?> item){
+		if(list.findViewHolderForAdapterPosition(items.indexOf(item)) instanceof ListItemViewHolder<?> holder){
+			holder.rebind();
+		}
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ToolbarDropdownMenuController.java

@@ -10,6 +10,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
+import android.os.Build;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
@@ -19,6 +20,7 @@ import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.Toolbar;
+import android.window.OnBackInvokedDispatcher;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.ui.OutlineProviders;
@@ -83,6 +85,15 @@ public class ToolbarDropdownMenuController{
 				.withLayer()
 				.start();
 		controllerStack.add(initialSubmenu);
+
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.TIRAMISU){
+			windowView.findOnBackInvokedDispatcher().registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT, ()->{
+				if(controllerStack.size()>1)
+					popSubmenuController();
+				else
+					dismiss();
+			});
+		}
 	}
 
 	public void dismiss(){
@@ -243,7 +254,7 @@ public class ToolbarDropdownMenuController{
 
 		@Override
 		public boolean dispatchKeyEvent(KeyEvent event){
-			if(event.getKeyCode()==KeyEvent.KEYCODE_BACK){
+			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.TIRAMISU && event.getKeyCode()==KeyEvent.KEYCODE_BACK){
 				if(event.getAction()==KeyEvent.ACTION_DOWN){
 					if(controllerStack.size()>1)
 						popSubmenuController();

mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AccountViewHolder.java

@@ -3,8 +3,6 @@ package org.joinmastodon.android.ui.viewholders;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Fragment;
-import android.app.ProgressDialog;
-import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
@@ -15,7 +13,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -254,7 +251,7 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 				bindRelationship();
 			}, this::updateRelationship);
 		}else if(id==R.id.hide_boosts){
-			new SetAccountFollowed(account.id, true, !relationship.showingReblogs)
+			new SetAccountFollowed(account.id, true, !relationship.showingReblogs, relationship.notifying)
 					.setCallback(new Callback<>(){
 						@Override
 						public void onSuccess(Relationship result){

mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/LinkCardHolder.java

@@ -0,0 +1,196 @@
+package org.joinmastodon.android.ui.viewholders;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.res.ColorStateList;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.fragments.ProfileFragment;
+import org.joinmastodon.android.model.Card;
+import org.joinmastodon.android.model.viewmodel.CardViewModel;
+import org.joinmastodon.android.ui.OutlineProviders;
+import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.drawables.BlurhashCrossfadeDrawable;
+import org.joinmastodon.android.ui.text.HtmlParser;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.Objects;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
+import me.grishka.appkit.utils.V;
+
+public class LinkCardHolder<T extends LinkCardHolder.LinkCardProvider> extends StatusDisplayItem.Holder<T> implements ImageLoaderViewHolder{
+	private final TextView title, description, domain, timestamp, authorBefore, authorAfter, authorName;
+	private final ImageView photo, authorAva;
+	private BlurhashCrossfadeDrawable crossfadeDrawable=new BlurhashCrossfadeDrawable();
+	private boolean didClear;
+	private final View inner, authorFooter, authorChip;
+	private final boolean isLarge;
+	private final Drawable logoIcon;
+	private final String accountID;
+	private Activity activity;
+	private boolean tryResolving=true;
+
+	public LinkCardHolder(Activity context, ViewGroup parent, boolean isLarge, String accountID){
+		super(context, isLarge ? R.layout.display_item_link_card : R.layout.display_item_link_card_compact, parent);
+		this.isLarge=isLarge;
+		this.accountID=accountID;
+		activity=context;
+		title=findViewById(R.id.title);
+		description=findViewById(R.id.description);
+		domain=findViewById(R.id.domain);
+		timestamp=findViewById(R.id.timestamp);
+		photo=findViewById(R.id.photo);
+		inner=findViewById(R.id.inner);
+		authorBefore=findViewById(R.id.author_before);
+		authorAfter=findViewById(R.id.author_after);
+		authorName=findViewById(R.id.author_name);
+		authorAva=findViewById(R.id.author_ava);
+		authorChip=findViewById(R.id.author_chip);
+		authorFooter=findViewById(R.id.author_footer);
+
+		inner.setOnClickListener(this::onClick);
+		inner.setOutlineProvider(OutlineProviders.roundedRect(8));
+		inner.setClipToOutline(true);
+		if(!isLarge){
+			photo.setOutlineProvider(OutlineProviders.roundedRect(4));
+			photo.setClipToOutline(true);
+		}
+		authorAva.setOutlineProvider(OutlineProviders.roundedRect(3));
+		authorAva.setClipToOutline(true);
+		authorChip.setOnClickListener(this::onAuthorChipClick);
+
+		logoIcon=context.getResources().getDrawable(R.drawable.ic_ntf_logo, context.getTheme()).mutate();
+		logoIcon.setBounds(0, 0, V.dp(17), V.dp(17));
+	}
+
+	@SuppressLint("SetTextI18n")
+	@Override
+	public void onBind(T item){
+		CardViewModel cardVM=item.getCard();
+		Card card=cardVM.card;
+		title.setText(card.title);
+		if(description!=null){
+			description.setText(card.description);
+			description.setVisibility(TextUtils.isEmpty(card.description) ? View.GONE : View.VISIBLE);
+		}
+		String cardDomain=HtmlParser.normalizeDomain(Objects.requireNonNull(Uri.parse(card.url).getHost()));
+		domain.setText(TextUtils.isEmpty(card.providerName) ? cardDomain : card.providerName);
+		if(card.authorAccount!=null){
+			authorFooter.setVisibility(View.VISIBLE);
+			authorChip.setVisibility(View.VISIBLE);
+			authorBefore.setVisibility(View.VISIBLE);
+			String[] authorParts=itemView.getContext().getString(R.string.article_by_author, "{author}").split("\\{author\\}");
+			String before=authorParts[0].trim();
+			String after=authorParts.length>1 ? authorParts[1].trim() : "";
+			if(!TextUtils.isEmpty(before)){
+				authorBefore.setText(before);
+			}
+			if(TextUtils.isEmpty(after)){
+				authorAfter.setVisibility(View.GONE);
+			}else{
+				authorAfter.setVisibility(View.VISIBLE);
+				authorAfter.setText(after);
+			}
+			authorName.setText(cardVM.parsedAuthorName);
+			authorBefore.setCompoundDrawablesRelative(logoIcon, null, null, null);
+		}else if(!TextUtils.isEmpty(card.authorName)){
+			authorFooter.setVisibility(View.VISIBLE);
+			authorBefore.setVisibility(View.VISIBLE);
+			authorBefore.setCompoundDrawables(null, null, null, null);
+			authorChip.setVisibility(View.GONE);
+			authorAfter.setVisibility(View.GONE);
+			authorBefore.setText(itemView.getContext().getString(R.string.article_by_author, card.authorName));
+		}else{
+			authorFooter.setVisibility(View.GONE);
+		}
+
+		if(card.publishedAt!=null){
+			timestamp.setVisibility(View.VISIBLE);
+			timestamp.setText(" · "+UiUtils.formatRelativeTimestamp(itemView.getContext(), card.publishedAt));
+		}else{
+			timestamp.setVisibility(View.GONE);
+		}
+
+		photo.setImageDrawable(null);
+		if(cardVM.imageRequest!=null){
+			photo.setScaleType(ImageView.ScaleType.CENTER_CROP);
+			photo.setBackground(null);
+			photo.setImageTintList(null);
+			crossfadeDrawable.setSize(card.width, card.height);
+			crossfadeDrawable.setBlurhashDrawable(card.blurhashPlaceholder);
+			crossfadeDrawable.setCrossfadeAlpha(0f);
+			photo.setImageDrawable(null);
+			photo.setImageDrawable(crossfadeDrawable);
+			didClear=false;
+		}else{
+			photo.setBackgroundColor(UiUtils.getThemeColor(itemView.getContext(), R.attr.colorM3SurfaceVariant));
+			photo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(itemView.getContext(), R.attr.colorM3Outline)));
+			photo.setScaleType(ImageView.ScaleType.CENTER);
+			photo.setImageResource(R.drawable.ic_feed_48px);
+		}
+	}
+
+	@Override
+	public void setImage(int index, Drawable drawable){
+		if(index==0){
+			crossfadeDrawable.setImageDrawable(drawable);
+			if(didClear)
+				crossfadeDrawable.animateAlpha(0f);
+			CardViewModel card=item.getCard();
+			// Make sure the image is not stretched if the server returned wrong dimensions
+			if(drawable!=null && (drawable.getIntrinsicWidth()!=card.card.width || drawable.getIntrinsicHeight()!=card.card.height)){
+				photo.setImageDrawable(null);
+				photo.setImageDrawable(crossfadeDrawable);
+			}
+		}else if(index==1){
+			authorAva.setImageDrawable(drawable);
+		}else{
+			item.getCard().authorNameEmojiHelper.setImageDrawable(index-2, drawable);
+			authorName.invalidate();
+		}
+	}
+
+	@Override
+	public void clearImage(int index){
+		if(index==0){
+			crossfadeDrawable.setCrossfadeAlpha(1f);
+			didClear=true;
+		}else{
+			setImage(index, null);
+		}
+	}
+
+	public void setTryResolving(boolean tryResolving){
+		this.tryResolving=tryResolving;
+	}
+
+	private void onClick(View v){
+		CardViewModel card=item.getCard();
+		if(tryResolving)
+			UiUtils.openURL(activity, accountID, card.card.url, card.parentObject);
+		else
+			UiUtils.launchWebBrowser(activity, card.card.url);
+	}
+
+	private void onAuthorChipClick(View v){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("profileAccount", Parcels.wrap(item.getCard().card.authorAccount));
+		Nav.go(activity, ProfileFragment.class, args);
+	}
+
+	public interface LinkCardProvider{
+		CardViewModel getCard();
+	}
+}

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

@@ -158,6 +158,9 @@ public class FloatingHintEditTextLayout extends FrameLayout implements CustomVie
 				}else{
 					transY=edit.getHeight()/2f-edit.getLineHeight()/2f+(edit.getTop()-label.getTop())-(label.getHeight()/2f-label.getLineHeight()/2f);
 				}
+				int labelX=label.getLeft();
+				int editX=edit.getLeft()+edit.getPaddingLeft();
+				float xOffset=editX-labelX;
 
 				AnimatorSet anim=new AnimatorSet();
 				if(hintVisible){
@@ -166,6 +169,7 @@ public class FloatingHintEditTextLayout extends FrameLayout implements CustomVie
 							ObjectAnimator.ofFloat(label, SCALE_X, scale),
 							ObjectAnimator.ofFloat(label, SCALE_Y, scale),
 							ObjectAnimator.ofFloat(label, TRANSLATION_Y, transY),
+							ObjectAnimator.ofFloat(label, TRANSLATION_X, xOffset),
 							ObjectAnimator.ofFloat(FloatingHintEditTextLayout.this, "animProgress", 0f)
 					);
 					edit.setHintTextColor(0);
@@ -173,11 +177,13 @@ public class FloatingHintEditTextLayout extends FrameLayout implements CustomVie
 					label.setScaleX(scale);
 					label.setScaleY(scale);
 					label.setTranslationY(transY);
+					label.setTranslationX(xOffset);
 					anim.playTogether(
 							ObjectAnimator.ofFloat(edit, TRANSLATION_Y, offsetY),
 							ObjectAnimator.ofFloat(label, SCALE_X, 1f),
 							ObjectAnimator.ofFloat(label, SCALE_Y, 1f),
 							ObjectAnimator.ofFloat(label, TRANSLATION_Y, 0f),
+							ObjectAnimator.ofFloat(label, TRANSLATION_X, 0f),
 							ObjectAnimator.ofFloat(FloatingHintEditTextLayout.this, "animProgress", 1f)
 					);
 				}

mastodon/src/main/res/animator/alt_badge.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true">
+		<set>
+			<objectAnimator
+				android:duration="100"
+				android:propertyName="alpha"
+				android:valueTo="0.85"
+				android:valueFrom="1.0"
+				android:valueType="floatType"/>
+			<objectAnimator
+				android:duration="100"
+				android:propertyName="textColor"
+				android:valueTo="#80ffffff"
+				android:valueFrom="#fff"
+				android:valueType="colorType"/>
+		</set>
+	</item>
+	<item>
+		<set>
+			<objectAnimator
+				android:duration="200"
+				android:propertyName="alpha"
+				android:valueTo="1.0"
+				android:valueFrom="0.85"
+				android:valueType="floatType"/>
+			<objectAnimator
+				android:duration="200"
+				android:propertyName="textColor"
+				android:valueTo="#fff"
+				android:valueFrom="#80ffffff"
+				android:valueType="colorType"/>
+		</set>
+	</item>
+</selector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:color="?colorM3OnSurfaceVariant" android:state_enabled="true"/>
-	<item android:color="?colorM3OnSurfaceVariant" android:alpha="0.38"/>
+	<item android:color="?colorM3OnSurface" android:alpha="0.38"/>
 </selector>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	 <item android:color="?colorM3OnSurfaceVariant" android:alpha="0.4"/>
+</selector>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<solid android:color="?colorM3Primary"/>
+	<corners android:radius="100dp"/>
+	<stroke android:color="?colorM3Background" android:width="1dp"/>
+</shape>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:gravity="top">
+		<shape>
+			<solid android:color="?colorM3OutlineVariant"/>
+			<size android:height="1dp"/>
+		</shape>
+	</item>
+</layer-list>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/m3_on_surface_overlay">
+	<item>
+		<shape>
+			<solid android:color="?colorM3SurfaceVariant"/>
+			<corners android:radius="6dp"/>
+		</shape>
+	</item>
+</ripple>

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

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

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

@@ -2,14 +2,14 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/m3_on_surface_overlay">
 	<item android:id="@android:id/mask">
 		<shape>
-			<corners android:radius="11dp"/>
+			<corners android:radius="7dp"/>
 			<solid android:color="#000"/>
 		</shape>
 	</item>
-	<item>
+	<item android:left="-1dp" android:top="-1dp" android:right="-1dp" android:bottom="-1dp">
 		<shape>
-			<corners android:radius="11dp"/>
-			<stroke android:color="?colorM3OutlineVariant" android:width="1dp"/>
+			<corners android:radius="8dp"/>
+			<stroke android:color="?colorM3OutlineVariant" android:width="2dp"/>
 		</shape>
 	</item>
 </ripple>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<stroke android:color="?colorM3OutlineVariant" android:width="0.5dp"/>
+	<corners android:radius="2.5dp"/>
+</shape>