Domain badges & info sheet & my fanciest animation yet

closes #767

.github/FUNDING.yml

@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: mastodon
-open_collective: # Replace with a single Open Collective username e.g., user1
-ko_fi: # Replace with a single Ko-fi username e.g., user1
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username e.g., user1
-issuehunt: # Replace with a single IssueHunt username e.g., user1
-otechie: # Replace with a single Otechie username e.g., user1
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

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

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

fastlane/metadata/android/da-DK/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon er det største decentraliserede sociale netværk på internettet. I stedet for et enkelt website, er det et netværk af millioner af brugere i uafhængige fællesskaber som alle sammen kan interagere med hinanden. Uanset hvad du interesserer dig for, kan du møde engagerede mennesker som skriver om det på Mastodon!
+Mastodon er det største decentraliserede sociale netværk på internet. Frem for ét enkelt website, er det i stedet et netværk af millioner af brugere i uafhængige fællesskaber, som alle kan interagere med hinanden. Uanset interessesfære, kan man møde engagerede personer, som skriver herom på Mastodon!
 
-Find et fællesskab og opret din profil. Find og følg fascinerende mennesker og læs deres indlæg i en reklamefri, kronologisk tidslinje. Udtryk dig selv med emojis, billeder, GIFs, videoer og lyd i indlæg på op til 500 tegn. Svar på tråde og del alt det gode ved at booste indlæg fra andre. Find nye brugere at følge og aktuelle hashtags så dit netværk udvides.
+Find et fællesskab og opret din profil. Find og følg fascinerende folk og læs deres indlæg i en reklamefri, kronologisk tidslinje. Udtryk dig selv med tilpassede emojis, billeder, GIF'er, videoer og lyd i 500-tegns indlæg. Svar på tråde og genpost indlæg fra enhver for dele alt det gode. Find nye konti at følge, og populære hashtags, for at udvide dit netværk.
 
-Mastodon er bygget med fokus på privatliv og sikkerhed. Beslut om dine indlæg skal deles med dine følgere, bare dem du nævner eller hele verden. Indholdsadvarsler giver dig mulighed for at gemme indlæg med sensitivt eller triggende indhold indtil du er klar til at læse dem. Hvert fællesskab har sine egne regler og moderatorer som holder øje og sikrer medlemmerne mod spam og trolde. De har robuste blokerings- og rapporteringsredskaber til deres rådighed.
+Mastodon er bygget med fokus på fortrolighed og sikkerhed. Afgør, hvorvidt dine indlæg skal deles med Følgere, blot dem du nævner eller hele verden. Indholdsadvarsler muliggør at skjule indlæg med sensitivt eller udløsende indhold, indtil du er klar til at læse dem. Hvert fællesskab har deres egne retningslinjer og moderatorer til at holde deres medlemmer sikre, og robuste blokerings- og anmeldelsesværktøjer hjælper med at forhindre misbrug.
 
 Flere funktioner:
 
-• Mørk Mode: Læs indlæg i lys, mørk eller ægte sort tilstand
-• Afstemninger: Spørg tilhængere om deres mening og stemme
-• Udforsk: Populære hashtags og konti er et tryk væk
-• Notifikationer: Få besked om nye følgere, svar og boosts
-• Deling: Send direkte til Mastodon fra en hvilken som app
-• Nuttethedsfaktor: Vores maskot er en yndig elefant, og du vil se dem dukke op fra tid til anden
+• Mørk tilstand: Læs indlæg i lys, mørk eller ægte sort tilstand
+• Afstemninger: Spørg Følgere om deres mening og stemme
+• Udforsk: Populære hashtags og konti er ét tryk væk
+• Notifikationer: Få besked om nye Følgere, svar og genpostninger
+• Deling: Post direkte til Mastodon fra enhver apps delingsfunktion
+• Nuttethed: Vores maskot er en yndig elefant, som du vil se dukke op fra tid til anden
 
-Mastodon er en registreret nonprofit og udvikling understøttes direkte af dine donationer. Der er ingen reklame, ingen indtægtsgenerering og ingen risikovillig kapital, og sådan forbliver det.
+Mastodon er en registreret nonprofit, hvis udvikling direkte understøttes af dine donationer. Der er ingen annoncering, ingen indtægtsgenerering og ingen risikovillig kapital, og intentionen er, at det forbliver sådan.

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

@@ -1,6 +1,6 @@
 Mastodon Interneteko sare sozial deszentralizatu handiena da. Webgune bakar bat izan ordez, beren artean elkarreragin dezaketen komunitate independenteetako milioika erabiltzailek osatutako sarea da. Zure interesak direnak direla ere, jende interesgarria aurkituko duzu Mastodonen!
 
-Batu komunitate batera eta sortu zure profila. Find and follow fascinating folks and read their posts in an ad-free, chronological timeline. Adierazi nahi duzuna 500 karaktereko bidalketetan emoji pertsonalizatuak, irudiak, GIFak, bideoak eta audioak erabiliz. Erantzun edozeinen hariak eta eman bultzada bidalketei edukiak partekatzeko. Bilatu jarraitzeko kontu berriak eta traolen joerak zure sarea zabaltzeko.
+Batu komunitate batera eta sortu zure profila. Bilatu eta jarraitu jende zoragarria eta irakurri beren bidalketak, publizitaterik gabeko denbora-lerro kronologikoan. Adierazi nahi duzuna 500 karaktereko bidalketetan emoji pertsonalizatuak, irudiak, GIFak, bideoak eta audioak erabiliz. Erantzun edozeinen hariak eta eman bultzada bidalketei edukiak partekatzeko. Bilatu jarraitzeko kontu berriak eta traolen joerak zure sarea zabaltzeko.
 
 Mastodon pribatutasunean eta segurtasunean arreta jarriz eraikia dago. Erabaki zure bidalketak norekin partekatu: zure jarraitzaileekin, aipatzen dituzunekin edo mundu osoarekin. Edukiaren abisuek aukera ematen dute eduki sentibera edo zuregan eragina izan dezaketen bidalketak zuk erabaki arte ezkutatzeko. Komunitate bakoitzak bere gidalerro eta moderatzaileak ditu, bertako kideak seguru mantentzeko. Baita blokeatzeko eta salatzeko tresna sendoak ere abusuak galarazteko.
 

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

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

fastlane/metadata/android/hi-IN/full_description.txt

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

fastlane/metadata/android/hi-IN/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+डिसेंट्रलाइज़्ड सोशल नेटवर्क

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

@@ -1 +1 @@
-Decentralizált szociális hálózat
+Decentralizált közösségi hálózat

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

@@ -1,16 +1,16 @@
-Մաստոդոնը համացանցի ամենամեծ ապակենտրոնացված սոցցանցն է։ Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+Մաստոդոնը համացանցի ամենամեծ ապակենտրոնացված սոցցանցն է։ Այն մի կայք չէ, այլ իրար հետ կապակցված անկախ համայնքների միլիոնավոր օգտատերերից կազմված ցանց։ No matter what you’re into, you can meet passionate people posting about it on Mastodon!
 
-Join a community and create your profile. Find and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+Միացեք համայնքին և ստեղծեք հաշիվ։ Find and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Զգայուն կամ հրահրող թեմաներով գրառումները կարելի է թաքցնել նախազգուշացումներով։ Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
 
 Ավելին՝
 
 • Մուգ տարբերակ՝ կարդացեք գրառումներ մուգ, բաց կամ իսկական սև տարբերակներում
-• Հարցումներ՝ իմացեք ձեր հետևորդների կարծիքը և հաշվեք քվեները
+• Հարցումներ՝ իմացեք ձեր հետևորդների կարծիքը և հաշվեք ձայները
 • Explore: Trending hashtags and accounts are a tap away
 • Notifications: Get notified about new follows, replies, and reblogs
 • Sharing: Post directly to Mastodon from any share sheet in any app
 • Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+Մաստոդոնը գրանցված շահույթ չհետապնդող կազմակերպություն է, և աջակցվում է ձեր նվիրաբերություններով։ There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.

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

@@ -1 +1 @@
-Decentralized social network
+Ապակենտրոնացված սոցիալական ցանց

fastlane/metadata/android/ka-GE/full_description.txt

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

fastlane/metadata/android/ka-GE/short_description.txt

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

fastlane/metadata/android/ka-GE/title.txt

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

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

@@ -0,0 +1,16 @@
+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!
+
+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ą.
+
+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.
+
+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
+
+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.

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

@@ -0,0 +1 @@
+Decentralizuotas socialinis tinklas

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

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

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

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

fastlane/metadata/android/tr-TR/full_description.txt

@@ -1,6 +1,6 @@
 Mastodon, internetteki merkezi olmayan en büyük sosyal ağdır. Tek bir web siteye bağlı kalmaksızın, milyonlarca kullanıcının bağımsız olarak birbiri ile kolayca etkileşebileceği bir ağdır. Hangi konuyla ilgili olduğunuz önemli değil, Mastodon'da onunla ilgili gönderi paylaşan tutkulu insanlarla tanışabilirsiniz!
 
-Bir topluluğa katılın ve profilinizi oluşturun. Olağanüstü kişileri bulun ve takip edin; gönderilerini reklamsız ve kronolojik bir zaman çizelgesinde okuyun. Gönderilerinizde 500 karakter sınırlamasıyla kendinizi emojiler, görseller, GIFler, videolar ve sesler ile ifade edin. Harika içerikler paylaşmak için başlıklara yanıt yazın, insanların gönderilerini yineleyin. Ağınızı genişletmek için takip edilecek yeni hesaplar ve hashtagler bulun.
+Bir topluluğa katılın ve profilinizi oluşturun. Olağanüstü kişileri bulun ve takip edin; gönderilerini reklamsız ve kronolojik bir zaman çizelgesinde okuyun. Gönderilerinizde şimdilik 500 karakter sınırlamasıyla kendinizi emojiler, görseller, GIFler, videolar ve sesler ile ifade edin. Harika içerikler paylaşmak için başlıklara yanıt yazın, insanların gönderilerini yineleyin. Ağınızı genişletmek için takip edilecek yeni hesaplar ve hashtagler bulun.
 
 Mastodon, mahremiyet ve güvenliğe odaklanılarak inşa edilmiştir. Gönderilerinizi takipçilerinizle mi, sadece bahsettiğiniz kişilerle mi yoksa tüm dünyayla mı paylaşılacağına karar verin. İçerik uyarıları, hassas veya tetikleyici materyal içeren gönderileri, siz onlarla etkileşim kurmaya hazır olana kadar gizlemenize olanak tanır. Her topluluk, üyelerini güvende tutmak için kendi kurallarına ve moderatörlerine; istismarı önlemek için de güçlü engelleme ve bildirme araçlarına sahiptir.
 
@@ -8,9 +8,9 @@ Diğer özellikler:
 
 • Karanlık Mod: Gönderileri aydınlık, karanlık ya da gerçek karanlık modunda okuyabilirsin
 • Anketler: Takipçilere fikirlerini sorun ve oylarını görün
-• Keşfet: Trend hashtagler ve hesaplar bir tık uzağınızda
-• Bildirimler: Yeni takipçilerden, yanıtlardan ve yinelemelerden haberiniz olsun
-• Paylaşım: Doğrudan Mastodon'a herhangi bir tipte gönderi paylaş
+• Keşfet: Öne çıkan etiketlerler ve hesaplar bir tık uzağınızda
+• Bildirimler: Yeni takipçilerden, yanıtlardan ve yeniden paylaşımlardan haberiniz olsun
+• Paylaşım: Doğrudan Mastodon'a herhangi bir türde gönderi paylaş
 • Sevimlilik: Maskotumuz şirin bir fil ve onu uygulamada zaman zaman göreceksiniz
 
 Mastodon kar amacı gütmeyen bir kuruluştur ve geliştirilmesi doğrudan bağışlarınızla sağlanmaktadır. Reklam yok, para kazanma güdüsü yok, risk sermayesi yok ve bu şekilde devam etmeyi planlıyoruz.

mastodon/build.gradle

@@ -9,10 +9,10 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 33
-		versionCode 61
-		versionName "2.0.1"
+		versionCode 84
+		versionName "2.3.0"
 		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", "kab", "ko-rKR", "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"
+		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 {
@@ -76,7 +76,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.9'
+	implementation 'me.grishka.appkit:appkit:1.2.16'
 	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/java/org/joinmastodon/android/GlobalUserPreferences.java

@@ -3,6 +3,9 @@ package org.joinmastodon.android;
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+
 public class GlobalUserPreferences{
 	public static boolean playGifs;
 	public static boolean useCustomTabs;
@@ -13,6 +16,10 @@ public class GlobalUserPreferences{
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
 
+	private static SharedPreferences getPreReplyPrefs(){
+		return MastodonApp.context.getSharedPreferences("pre_reply_sheets", Context.MODE_PRIVATE);
+	}
+
 	public static void load(){
 		SharedPreferences prefs=getPrefs();
 		playGifs=prefs.getBoolean("playGifs", true);
@@ -36,9 +43,42 @@ public class GlobalUserPreferences{
 				.apply();
 	}
 
+	public static boolean isOptedOutOfPreReplySheet(PreReplySheetType type, Account account, String accountID){
+		if(getPreReplyPrefs().getBoolean("opt_out_"+type, false))
+			return true;
+		if(account==null)
+			return false;
+		String accountKey=account.acct;
+		if(!accountKey.contains("@"))
+			accountKey+="@"+AccountSessionManager.get(accountID).domain;
+		return getPreReplyPrefs().getBoolean("opt_out_"+type+"_"+accountKey.toLowerCase(), false);
+	}
+
+	public static void optOutOfPreReplySheet(PreReplySheetType type, Account account, String accountID){
+		String key;
+		if(account==null){
+			key="opt_out_"+type;
+		}else{
+			String accountKey=account.acct;
+			if(!accountKey.contains("@"))
+				accountKey+="@"+AccountSessionManager.get(accountID).domain;
+			key="opt_out_"+type+"_"+accountKey.toLowerCase();
+		}
+		getPreReplyPrefs().edit().putBoolean(key, true).apply();
+	}
+
+	public static void resetPreReplySheets(){
+		getPreReplyPrefs().edit().clear().apply();
+	}
+
 	public enum ThemePreference{
 		AUTO,
 		LIGHT,
 		DARK
 	}
+
+	public enum PreReplySheetType{
+		OLD_POST,
+		NON_MUTUAL
+	}
 }

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

@@ -6,6 +6,7 @@ import android.app.Fragment;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.BadParcelableException;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
@@ -36,46 +37,15 @@ import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 
 public class MainActivity extends FragmentStackActivity{
+	private static final String TAG="MainActivity";
+
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState){
 		UiUtils.setUserPreferredTheme(this);
 		super.onCreate(savedInstanceState);
 
 		if(savedInstanceState==null){
-			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
-				showFragmentClearingBackStack(new SplashFragment());
-			}else{
-				AccountSessionManager.getInstance().maybeUpdateLocalInfo();
-				AccountSession session;
-				Bundle args=new Bundle();
-				Intent intent=getIntent();
-				if(intent.getBooleanExtra("fromNotification", false)){
-					String accountID=intent.getStringExtra("accountID");
-					try{
-						session=AccountSessionManager.getInstance().getAccount(accountID);
-						if(!intent.hasExtra("notification"))
-							args.putString("tab", "notifications");
-					}catch(IllegalStateException x){
-						session=AccountSessionManager.getInstance().getLastActiveAccount();
-					}
-				}else{
-					session=AccountSessionManager.getInstance().getLastActiveAccount();
-				}
-				args.putString("account", session.getID());
-				Fragment fragment=session.activated ? new HomeFragment() : new AccountActivationFragment();
-				fragment.setArguments(args);
-				showFragmentClearingBackStack(fragment);
-				if(intent.getBooleanExtra("fromNotification", false) && intent.hasExtra("notification")){
-					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
-					showFragmentForNotification(notification, session.getID());
-				}else if(intent.getBooleanExtra("compose", false)){
-					showCompose();
-				}else if(Intent.ACTION_VIEW.equals(intent.getAction())){
-					handleURL(intent.getData(), null);
-				}else{
-					maybeRequestNotificationsPermission();
-				}
-			}
+			restartHomeFragment();
 		}
 
 		if(BuildConfig.BUILD_TYPE.startsWith("appcenter")){
@@ -132,11 +102,11 @@ public class MainActivity extends FragmentStackActivity{
 			session=AccountSessionManager.get(accountID);
 		if(session==null || !session.activated)
 			return;
-		openSearchQuery(uri.toString(), session.getID(), R.string.opening_link, false);
+		openSearchQuery(uri.toString(), session.getID(), R.string.opening_link, false, null);
 	}
 
-	public void openSearchQuery(String q, String accountID, int progressText, boolean fromSearch){
-		new GetSearchResults(q, null, true)
+	public void openSearchQuery(String q, String accountID, int progressText, boolean fromSearch, GetSearchResults.Type type){
+		new GetSearchResults(q, type, true, null, 0, 0)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(SearchResults result){
@@ -200,4 +170,47 @@ public class MainActivity extends FragmentStackActivity{
 			requestPermissions(new String[]{Manifest.permission.POST_NOTIFICATIONS}, 100);
 		}
 	}
+
+	public void restartHomeFragment(){
+		if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
+			showFragmentClearingBackStack(new SplashFragment());
+		}else{
+			AccountSessionManager.getInstance().maybeUpdateLocalInfo();
+			AccountSession session;
+			Bundle args=new Bundle();
+			Intent intent=getIntent();
+			if(intent.getBooleanExtra("fromNotification", false)){
+				String accountID=intent.getStringExtra("accountID");
+				try{
+					session=AccountSessionManager.getInstance().getAccount(accountID);
+					if(!intent.hasExtra("notification"))
+						args.putString("tab", "notifications");
+				}catch(IllegalStateException x){
+					session=AccountSessionManager.getInstance().getLastActiveAccount();
+				}
+			}else{
+				session=AccountSessionManager.getInstance().getLastActiveAccount();
+			}
+			args.putString("account", session.getID());
+			Fragment fragment=session.activated ? new HomeFragment() : new AccountActivationFragment();
+			fragment.setArguments(args);
+			showFragmentClearingBackStack(fragment);
+			if(intent.getBooleanExtra("fromNotification", false) && intent.hasExtra("notification")){
+				// Parcelables might not be compatible across app versions so this protects against possible crashes
+				// when a notification was received, then the app was updated, and then the user opened the notification
+				try{
+					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
+					showFragmentForNotification(notification, session.getID());
+				}catch(BadParcelableException x){
+					Log.w(TAG, x);
+				}
+			}else if(intent.getBooleanExtra("compose", false)){
+				showCompose();
+			}else if(Intent.ACTION_VIEW.equals(intent.getAction())){
+				handleURL(intent.getData(), null);
+			}else{
+				maybeRequestNotificationsPermission();
+			}
+		}
+	}
 }

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

@@ -118,6 +118,8 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				List<NotificationChannel> channels=Arrays.stream(PushNotification.Type.values())
 						.map(type->{
 							NotificationChannel channel=new NotificationChannel(accountID+"_"+type, context.getString(type.localizedName), NotificationManager.IMPORTANCE_DEFAULT);
+							channel.setLightColor(context.getColor(R.color.primary_700));
+							channel.enableLights(true);
 							channel.setGroup(accountID);
 							return channel;
 						})
@@ -147,6 +149,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
+				.setLights(context.getColor(R.color.primary_700), 500, 1000)
 				.setColor(context.getColor(R.color.primary_700));
 		if(avatar!=null){
 			builder.setLargeIcon(UiUtils.getBitmapFromDrawable(avatar));

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

@@ -9,20 +9,31 @@ import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
+import com.google.gson.reflect.TypeToken;
+
 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.MastodonApp;
+import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.notifications.GetNotifications;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.FilterContext;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.utils.UiUtils;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.function.Consumer;
@@ -42,6 +53,7 @@ public class CacheController{
 	private final Runnable databaseCloseRunnable=this::closeDatabase;
 	private boolean loadingNotifications;
 	private final ArrayList<Callback<PaginatedResponse<List<Notification>>>> pendingNotificationsCallbacks=new ArrayList<>();
+	private List<FollowList> lists;
 
 	private static final int POST_FLAG_GAP_AFTER=1;
 
@@ -300,6 +312,99 @@ public class CacheController{
 		}, 0);
 	}
 
+	public void reloadLists(Callback<List<FollowList>> callback){
+		new GetLists()
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(List<FollowList> result){
+						result.sort(Comparator.comparing(l->l.title));
+						lists=result;
+						if(callback!=null)
+							callback.onSuccess(result);
+						writeListsToFile();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						if(callback!=null)
+							callback.onError(error);
+					}
+				})
+				.exec(accountID);
+	}
+
+	private List<FollowList> loadListsFromFile(){
+		File file=getListsFile();
+		if(!file.exists())
+			return null;
+		try(InputStreamReader in=new InputStreamReader(new FileInputStream(file))){
+			return MastodonAPIController.gson.fromJson(in, new TypeToken<List<FollowList>>(){}.getType());
+		}catch(Exception x){
+			Log.w(TAG, "failed to read lists from cache file", x);
+			return null;
+		}
+	}
+
+	private void writeListsToFile(){
+		databaseThread.postRunnable(()->{
+			try(OutputStreamWriter out=new OutputStreamWriter(new FileOutputStream(getListsFile()))){
+				MastodonAPIController.gson.toJson(lists, out);
+			}catch(IOException x){
+				Log.w(TAG, "failed to write lists to cache file", x);
+			}
+		}, 0);
+	}
+
+	public void getLists(Callback<List<FollowList>> callback){
+		if(lists!=null){
+			if(callback!=null)
+				callback.onSuccess(lists);
+			return;
+		}
+		databaseThread.postRunnable(()->{
+			List<FollowList> lists=loadListsFromFile();
+			if(lists!=null){
+				this.lists=lists;
+				if(callback!=null)
+					uiHandler.post(()->callback.onSuccess(lists));
+				return;
+			}
+			reloadLists(callback);
+		}, 0);
+	}
+
+	public File getListsFile(){
+		return new File(MastodonApp.context.getFilesDir(), "lists_"+accountID+".json");
+	}
+
+	public void addList(FollowList list){
+		if(lists==null)
+			return;
+		lists.add(list);
+		lists.sort(Comparator.comparing(l->l.title));
+		writeListsToFile();
+	}
+
+	public void deleteList(String id){
+		if(lists==null)
+			return;
+		lists.removeIf(l->l.id.equals(id));
+		writeListsToFile();
+	}
+
+	public void updateList(FollowList list){
+		if(lists==null)
+			return;
+		for(int i=0;i<lists.size();i++){
+			if(lists.get(i).id.equals(list.id)){
+				lists.set(i, list);
+				lists.sort(Comparator.comparing(l->l.title));
+				writeListsToFile();
+				break;
+			}
+		}
+	}
+
 	private class DatabaseHelper extends SQLiteOpenHelper{
 
 		public DatabaseHelper(){

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

@@ -45,7 +45,11 @@ public class MastodonAPIController{
 			.registerTypeAdapter(LocalDate.class, new IsoLocalDateTypeAdapter())
 			.create();
 	private static WorkerThread thread=new WorkerThread("MastodonAPIController");
-	private static OkHttpClient httpClient=new OkHttpClient.Builder().build();
+	private static OkHttpClient httpClient=new OkHttpClient.Builder()
+			.connectTimeout(60, TimeUnit.SECONDS)
+			.writeTimeout(60, TimeUnit.SECONDS)
+			.readTimeout(60, TimeUnit.SECONDS)
+			.build();
 
 	private AccountSession session;
 
@@ -92,15 +96,15 @@ public class MastodonAPIController{
 				}
 
 				if(BuildConfig.DEBUG)
-					Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] Sending request: "+hreq);
+					Log.d(TAG, logTag(session)+"Sending request: "+hreq);
 
 				call.enqueue(new Callback(){
 					@Override
 					public void onFailure(@NonNull Call call, @NonNull IOException e){
-						if(call.isCanceled())
+						if(req.canceled)
 							return;
 						if(BuildConfig.DEBUG)
-							Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+hreq+" failed", e);
+							Log.w(TAG, logTag(session)+""+hreq+" failed", e);
 						synchronized(req){
 							req.okhttpCall=null;
 						}
@@ -109,10 +113,10 @@ public class MastodonAPIController{
 
 					@Override
 					public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException{
-						if(call.isCanceled())
+						if(req.canceled)
 							return;
 						if(BuildConfig.DEBUG)
-							Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+hreq+" received response: "+response);
+							Log.d(TAG, logTag(session)+hreq+" received response: "+response);
 						synchronized(req){
 							req.okhttpCall=null;
 						}
@@ -123,7 +127,7 @@ public class MastodonAPIController{
 								try{
 									if(BuildConfig.DEBUG){
 										JsonElement respJson=JsonParser.parseReader(reader);
-										Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] response body: "+respJson);
+										Log.d(TAG, logTag(session)+"response body: "+respJson);
 										if(req.respTypeToken!=null)
 											respObj=gson.fromJson(respJson, req.respTypeToken.getType());
 										else if(req.respClass!=null)
@@ -140,7 +144,7 @@ public class MastodonAPIController{
 									}
 								}catch(JsonIOException|JsonSyntaxException x){
 									if(BuildConfig.DEBUG)
-										Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" error parsing or reading body", x);
+										Log.w(TAG, logTag(session)+response+" error parsing or reading body", x);
 									req.onError(x.getLocalizedMessage(), response.code(), x);
 									return;
 								}
@@ -149,19 +153,19 @@ public class MastodonAPIController{
 									req.validateAndPostprocessResponse(respObj, response);
 								}catch(IOException x){
 									if(BuildConfig.DEBUG)
-										Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" error post-processing or validating response", x);
+										Log.w(TAG, logTag(session)+response+" error post-processing or validating response", x);
 									req.onError(x.getLocalizedMessage(), response.code(), x);
 									return;
 								}
 
 								if(BuildConfig.DEBUG)
-									Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" parsed successfully: "+respObj);
+									Log.d(TAG, logTag(session)+response+" parsed successfully: "+respObj);
 
 								req.onSuccess(respObj);
 							}else{
 								try{
 									JsonObject error=JsonParser.parseReader(reader).getAsJsonObject();
-									Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" received error: "+error);
+									Log.w(TAG, logTag(session)+response+" received error: "+error);
 									if(error.has("details")){
 										MastodonDetailedErrorResponse err=new MastodonDetailedErrorResponse(error.get("error").getAsString(), response.code(), null);
 										HashMap<String, List<MastodonDetailedErrorResponse.FieldError>> details=new HashMap<>();
@@ -196,7 +200,7 @@ public class MastodonAPIController{
 				});
 			}catch(Exception x){
 				if(BuildConfig.DEBUG)
-					Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] error creating and sending http request", x);
+					Log.w(TAG, logTag(session)+"error creating and sending http request", x);
 				req.onError(x.getLocalizedMessage(), 0, x);
 			}
 		}, 0);
@@ -209,4 +213,8 @@ public class MastodonAPIController{
 	public static OkHttpClient getHttpClient(){
 		return httpClient;
 	}
+
+	private static String logTag(AccountSession session){
+		return "["+(session==null ? "no-auth" : session.getID())+"] ";
+	}
 }

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

@@ -154,6 +154,8 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 	}
 
 	public RequestBody getRequestBody() throws IOException{
+		if(requestBody instanceof RequestBody rb)
+			return rb;
 		return requestBody==null ? null : new JsonObjectRequestBody(requestBody);
 	}
 

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

@@ -0,0 +1,22 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.RequiredField;
+import org.joinmastodon.android.model.BaseModel;
+
+public class CheckInviteLink extends MastodonAPIRequest<CheckInviteLink.Response>{
+	public CheckInviteLink(String path){
+		super(HttpMethod.GET, path, Response.class);
+		addHeader("Accept", "application/json");
+	}
+
+	@Override
+	protected String getPathPrefix(){
+		return "";
+	}
+
+	public static class Response extends BaseModel{
+		@RequiredField
+		public String inviteCode;
+	}
+}

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

@@ -0,0 +1,14 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.FollowList;
+
+import java.util.List;
+
+public class GetAccountLists extends MastodonAPIRequest<List<FollowList>>{
+	public GetAccountLists(String id){
+		super(HttpMethod.GET, "/accounts/"+id+"/lists", new TypeToken<>(){});
+	}
+}

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

@@ -4,22 +4,23 @@ import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Token;
 
 public class RegisterAccount extends MastodonAPIRequest<Token>{
-	public RegisterAccount(String username, String email, String password, String locale, String reason, String timezone){
+	public RegisterAccount(String username, String email, String password, String locale, String reason, String timezone, String inviteCode){
 		super(HttpMethod.POST, "/accounts", Token.class);
-		setRequestBody(new Body(username, email, password, locale, reason, timezone));
+		setRequestBody(new Body(username, email, password, locale, reason, timezone, inviteCode));
 	}
 
 	private static class Body{
-		public String username, email, password, locale, reason, timeZone;
+		public String username, email, password, locale, reason, timeZone, inviteCode;
 		public boolean agreement=true;
 
-		public Body(String username, String email, String password, String locale, String reason, String timeZone){
+		public Body(String username, String email, String password, String locale, String reason, String timeZone, String inviteCode){
 			this.username=username;
 			this.email=email;
 			this.password=password;
 			this.locale=locale;
 			this.reason=reason;
 			this.timeZone=timeZone;
+			this.inviteCode=inviteCode;
 		}
 	}
 }

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

@@ -0,0 +1,23 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Account;
+
+import java.util.List;
+
+public class SearchAccounts extends MastodonAPIRequest<List<Account>>{
+	public SearchAccounts(String q, int limit, int offset, boolean resolve, boolean following){
+		super(HttpMethod.GET, "/accounts/search", new TypeToken<>(){});
+		addQueryParameter("q", q);
+		if(limit>0)
+			addQueryParameter("limit", limit+"");
+		if(offset>0)
+			addQueryParameter("offset", offset+"");
+		if(resolve)
+			addQueryParameter("resolve", "true");
+		if(following)
+			addQueryParameter("following", "true");
+	}
+}

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

@@ -22,6 +22,7 @@ public class UpdateAccountCredentials extends MastodonAPIRequest<Account>{
 	private Uri avatar, cover;
 	private File avatarFile, coverFile;
 	private List<AccountField> fields;
+	private Boolean discoverable, indexable;
 
 	public UpdateAccountCredentials(String displayName, String bio, Uri avatar, Uri cover, List<AccountField> fields){
 		super(HttpMethod.PATCH, "/accounts/update_credentials", Account.class);
@@ -41,6 +42,12 @@ public class UpdateAccountCredentials extends MastodonAPIRequest<Account>{
 		this.fields=fields;
 	}
 
+	public UpdateAccountCredentials setDiscoverableIndexable(boolean discoverable, boolean indexable){
+		this.discoverable=discoverable;
+		this.indexable=indexable;
+		return this;
+	}
+
 	@Override
 	public RequestBody getRequestBody() throws IOException{
 		MultipartBody.Builder bldr=new MultipartBody.Builder()
@@ -58,15 +65,21 @@ public class UpdateAccountCredentials extends MastodonAPIRequest<Account>{
 		}else if(coverFile!=null){
 			bldr.addFormDataPart("header", coverFile.getName(), new ResizedImageRequestBody(Uri.fromFile(coverFile), 1500*500, null));
 		}
-		if(fields.isEmpty()){
-			bldr.addFormDataPart("fields_attributes[0][name]", "").addFormDataPart("fields_attributes[0][value]", "");
-		}else{
-			int i=0;
-			for(AccountField field:fields){
-				bldr.addFormDataPart("fields_attributes["+i+"][name]", field.name).addFormDataPart("fields_attributes["+i+"][value]", field.value);
-				i++;
+		if(fields!=null){
+			if(fields.isEmpty()){
+				bldr.addFormDataPart("fields_attributes[0][name]", "").addFormDataPart("fields_attributes[0][value]", "");
+			}else{
+				int i=0;
+				for(AccountField field:fields){
+					bldr.addFormDataPart("fields_attributes["+i+"][name]", field.name).addFormDataPart("fields_attributes["+i+"][value]", field.value);
+					i++;
+				}
 			}
 		}
+		if(discoverable!=null)
+			bldr.addFormDataPart("discoverable", discoverable.toString());
+		if(indexable!=null)
+			bldr.addFormDataPart("indexable", indexable.toString());
 
 		return bldr.build();
 	}

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

@@ -6,18 +6,19 @@ import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.StatusPrivacy;
 
 public class UpdateAccountCredentialsPreferences extends MastodonAPIRequest<Account>{
-	public UpdateAccountCredentialsPreferences(Preferences preferences, Boolean locked, Boolean discoverable){
+	public UpdateAccountCredentialsPreferences(Preferences preferences, Boolean locked, Boolean discoverable, Boolean indexable){
 		super(HttpMethod.PATCH, "/accounts/update_credentials", Account.class);
-		setRequestBody(new Request(locked, discoverable, new RequestSource(preferences.postingDefaultVisibility, preferences.postingDefaultLanguage)));
+		setRequestBody(new Request(locked, discoverable, indexable, new RequestSource(preferences.postingDefaultVisibility, preferences.postingDefaultLanguage)));
 	}
 
 	private static class Request{
-		public Boolean locked, discoverable;
+		public Boolean locked, discoverable, indexable;
 		public RequestSource source;
 
-		public Request(Boolean locked, Boolean discoverable, RequestSource source){
+		public Request(Boolean locked, Boolean discoverable, Boolean indexable, RequestSource source){
 			this.locked=locked;
 			this.discoverable=discoverable;
+			this.indexable=indexable;
 			this.source=source;
 		}
 	}

mastodon/src/main/java/org/joinmastodon/android/api/requests/filters/FilterRequest.java

@@ -6,6 +6,9 @@ import org.joinmastodon.android.model.FilterContext;
 import java.util.EnumSet;
 import java.util.List;
 
+import androidx.annotation.Keep;
+
+@Keep
 class FilterRequest{
 	public String title;
 	public EnumSet<FilterContext> context;

mastodon/src/main/java/org/joinmastodon/android/api/requests/filters/KeywordAttribute.java

@@ -2,6 +2,9 @@ package org.joinmastodon.android.api.requests.filters;
 
 import com.google.gson.annotations.SerializedName;
 
+import androidx.annotation.Keep;
+
+@Keep
 class KeywordAttribute{
 	public String id;
 	@SerializedName("_destroy")

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddAccountsToList.java

@@ -0,0 +1,19 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+
+import okhttp3.FormBody;
+
+public class AddAccountsToList extends ResultlessMastodonAPIRequest{
+	public AddAccountsToList(String listID, Collection<String> accountIDs){
+		super(HttpMethod.POST, "/lists/"+listID+"/accounts");
+		FormBody.Builder builder=new FormBody.Builder(StandardCharsets.UTF_8);
+		for(String id:accountIDs){
+			builder.add("account_ids[]", id);
+		}
+		setRequestBody(builder.build());
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java

@@ -0,0 +1,23 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.FollowList;
+
+public class CreateList extends MastodonAPIRequest<FollowList>{
+	public CreateList(String title, FollowList.RepliesPolicy repliesPolicy, boolean exclusive){
+		super(HttpMethod.POST, "/lists", FollowList.class);
+		setRequestBody(new Request(title, repliesPolicy, exclusive));
+	}
+
+	private static class Request{
+		public String title;
+		public FollowList.RepliesPolicy repliesPolicy;
+		public boolean exclusive;
+
+		public Request(String title, FollowList.RepliesPolicy repliesPolicy, boolean exclusive){
+			this.title=title;
+			this.repliesPolicy=repliesPolicy;
+			this.exclusive=exclusive;
+		}
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java

@@ -0,0 +1,9 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
+
+public class DeleteList extends ResultlessMastodonAPIRequest{
+	public DeleteList(String id){
+		super(HttpMethod.DELETE, "/lists/"+id);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetListAccounts.java

@@ -0,0 +1,17 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import android.text.TextUtils;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.model.Account;
+
+public class GetListAccounts extends HeaderPaginationRequest<Account>{
+	public GetListAccounts(String listID, String maxID, int limit){
+		super(HttpMethod.GET, "/lists/"+listID+"/accounts", new TypeToken<>(){});
+		if(!TextUtils.isEmpty(maxID))
+			addQueryParameter("max_id", maxID);
+		addQueryParameter("limit", String.valueOf(limit));
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetLists.java

@@ -0,0 +1,14 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.FollowList;
+
+import java.util.List;
+
+public class GetLists extends MastodonAPIRequest<List<FollowList>>{
+	public GetLists(){
+		super(HttpMethod.GET, "/lists", new TypeToken<>(){});
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveAccountsFromList.java

@@ -0,0 +1,19 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+
+import okhttp3.FormBody;
+
+public class RemoveAccountsFromList extends ResultlessMastodonAPIRequest{
+	public RemoveAccountsFromList(String listID, Collection<String> accountIDs){
+		super(HttpMethod.DELETE, "/lists/"+listID+"/accounts");
+		FormBody.Builder builder=new FormBody.Builder(StandardCharsets.UTF_8);
+		for(String id:accountIDs){
+			builder.add("account_ids[]", id);
+		}
+		setRequestBody(builder.build());
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java

@@ -0,0 +1,23 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.FollowList;
+
+public class UpdateList extends MastodonAPIRequest<FollowList>{
+	public UpdateList(String listID, String title, FollowList.RepliesPolicy repliesPolicy, boolean exclusive){
+		super(HttpMethod.PUT, "/lists/"+listID, FollowList.class);
+		setRequestBody(new Request(title, repliesPolicy, exclusive));
+	}
+
+	private static class Request{
+		public String title;
+		public FollowList.RepliesPolicy repliesPolicy;
+		public boolean exclusive;
+
+		public Request(String title, FollowList.RepliesPolicy repliesPolicy, boolean exclusive){
+			this.title=title;
+			this.repliesPolicy=repliesPolicy;
+			this.exclusive=exclusive;
+		}
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/search/GetSearchResults.java

@@ -4,13 +4,19 @@ import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.SearchResults;
 
 public class GetSearchResults extends MastodonAPIRequest<SearchResults>{
-	public GetSearchResults(String query, Type type, boolean resolve){
+	public GetSearchResults(String query, Type type, boolean resolve, String maxID, int offset, int count){
 		super(HttpMethod.GET, "/search", SearchResults.class);
 		addQueryParameter("q", query);
 		if(type!=null)
 			addQueryParameter("type", type.name().toLowerCase());
 		if(resolve)
 			addQueryParameter("resolve", "true");
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(offset>0)
+			addQueryParameter("offset", String.valueOf(offset));
+		if(count>0)
+			addQueryParameter("limit", String.valueOf(count));
 	}
 
 	public GetSearchResults limit(int limit){

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

@@ -17,6 +17,7 @@ public class CreateStatus extends MastodonAPIRequest<Status>{
 
 	public static class Request{
 		public String status;
+		public List<MediaAttribute> mediaAttributes;
 		public List<String> mediaIds;
 		public Poll poll;
 		public String inReplyToId;
@@ -32,5 +33,17 @@ public class CreateStatus extends MastodonAPIRequest<Status>{
 			public boolean multiple;
 			public boolean hideTotals;
 		}
+
+		public static class MediaAttribute{
+			public String id;
+			public String description;
+			public String focus;
+
+			public MediaAttribute(String id, String description, String focus){
+				this.id=id;
+				this.description=description;
+				this.focus=focus;
+			}
+		}
 	}
 }

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

@@ -26,6 +26,11 @@ public class GetStatusEditHistory extends MastodonAPIRequest<List<Status>>{
 			s.visibility=StatusPrivacy.PUBLIC;
 			s.mentions=Collections.emptyList();
 			s.tags=Collections.emptyList();
+			if(s.poll!=null){
+				s.poll.id="fakeID"+i;
+				s.poll.emojis=Collections.emptyList();
+				s.poll.ownVotes=Collections.emptyList();
+			}
 			i++;
 		}
 		super.validateAndPostprocessResponse(respObj, httpResponse);

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

@@ -0,0 +1,13 @@
+package org.joinmastodon.android.api.requests.statuses;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Translation;
+
+import java.util.Map;
+
+public class TranslateStatus extends MastodonAPIRequest<Translation>{
+	public TranslateStatus(String id, String lang){
+		super(HttpMethod.POST, "/statuses/"+id+"/translate", Translation.class);
+		setRequestBody(Map.of("lang", lang));
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/GetFollowedTags.java

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

mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/GetTag.java

@@ -0,0 +1,10 @@
+package org.joinmastodon.android.api.requests.tags;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Hashtag;
+
+public class GetTag extends MastodonAPIRequest<Hashtag>{
+	public GetTag(String tag){
+		super(HttpMethod.GET, "/tags/"+tag, Hashtag.class);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/SetTagFollowed.java

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.tags;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Hashtag;
+
+public class SetTagFollowed extends MastodonAPIRequest<Hashtag>{
+	public SetTagFollowed(String tag, boolean followed){
+		super(HttpMethod.POST, "/tags/"+tag+(followed ? "/follow" : "/unfollow"), Hashtag.class);
+		setRequestBody(new Object());
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetListTimeline.java

@@ -0,0 +1,22 @@
+package org.joinmastodon.android.api.requests.timelines;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+
+import java.util.List;
+
+public class GetListTimeline extends MastodonAPIRequest<List<Status>>{
+	public GetListTimeline(String listID, String maxID, String minID, int limit, String sinceID){
+		super(HttpMethod.GET, "/timelines/list/"+listID, new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(minID!=null)
+			addQueryParameter("min_id", minID);
+		if(limit>0)
+			addQueryParameter("limit", ""+limit);
+		if(sinceID!=null)
+			addQueryParameter("since_id", sinceID);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java

@@ -10,7 +10,7 @@ import org.joinmastodon.android.model.Status;
 import java.util.List;
 
 public class GetPublicTimeline extends MastodonAPIRequest<List<Status>>{
-	public GetPublicTimeline(boolean local, boolean remote, String maxID, int limit){
+	public GetPublicTimeline(boolean local, boolean remote, String maxID, String minID, int limit, String sinceID){
 		super(HttpMethod.GET, "/timelines/public", new TypeToken<>(){});
 		if(local)
 			addQueryParameter("local", "true");
@@ -18,6 +18,10 @@ public class GetPublicTimeline extends MastodonAPIRequest<List<Status>>{
 			addQueryParameter("remote", "true");
 		if(!TextUtils.isEmpty(maxID))
 			addQueryParameter("max_id", maxID);
+		if(!TextUtils.isEmpty(minID))
+			addQueryParameter("min_id", minID);
+		if(!TextUtils.isEmpty(sinceID))
+			addQueryParameter("since_id", sinceID);
 		if(limit>0)
 			addQueryParameter("limit", limit+"");
 	}

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

@@ -24,6 +24,7 @@ import org.joinmastodon.android.model.Application;
 import org.joinmastodon.android.model.FilterAction;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.FilterResult;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushSubscription;
@@ -32,6 +33,7 @@ import org.joinmastodon.android.model.TimelineMarkers;
 import org.joinmastodon.android.model.Token;
 import org.joinmastodon.android.utils.ObjectIdComparator;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
@@ -66,6 +68,7 @@ public class AccountSession{
 	private transient SharedPreferences prefs;
 	private transient boolean preferencesNeedSaving;
 	private transient AccountLocalPreferences localPreferences;
+	private transient List<FollowList> lists;
 
 	AccountSession(Token token, Account self, Application app, String domain, boolean activated, AccountActivationInfo activationInfo){
 		this.token=token;
@@ -195,7 +198,7 @@ public class AccountSession{
 
 	public void savePreferencesIfPending(){
 		if(preferencesNeedSaving){
-			new UpdateAccountCredentialsPreferences(preferences, null, null)
+			new UpdateAccountCredentialsPreferences(preferences, null, self.discoverable, self.source.indexable)
 					.setCallback(new Callback<>(){
 						@Override
 						public void onSuccess(Account result){
@@ -261,4 +264,16 @@ public class AccountSession{
 			return false;
 		});
 	}
+
+	public void updateAccountInfo(){
+		AccountSessionManager.getInstance().updateSessionLocalInfo(this);
+	}
+
+	public boolean isNotificationsMentionsOnly(){
+		return getRawLocalPreferences().getBoolean("notificationsMentionsOnly", false);
+	}
+
+	public void setNotificationsMentionsOnly(boolean mentionsOnly){
+		getRawLocalPreferences().edit().putBoolean("notificationsMentionsOnly", mentionsOnly).apply();
+	}
 }

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

@@ -175,12 +175,17 @@ public class AccountSessionManager{
 	public void removeAccount(String id){
 		AccountSession session=getAccount(id);
 		session.getCacheController().closeDatabase();
+		session.getCacheController().getListsFile().delete();
 		MastodonApp.context.deleteDatabase(id+".db");
 		MastodonApp.context.getSharedPreferences(id, 0).edit().clear().commit();
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
 			MastodonApp.context.deleteSharedPreferences(id);
 		}else{
-			new File(MastodonApp.context.getDir("shared_prefs", Context.MODE_PRIVATE), id+".xml").delete();
+			String dataDir=MastodonApp.context.getApplicationInfo().dataDir;
+			if(dataDir!=null){
+				File prefsDir=new File(dataDir, "shared_prefs");
+				new File(prefsDir, id+".xml").delete();
+			}
 		}
 		sessions.remove(id);
 		if(lastActiveAccountID.equals(id)){
@@ -279,7 +284,7 @@ public class AccountSessionManager{
 		}
 	}
 
-	private void updateSessionLocalInfo(AccountSession session){
+	/*package*/ void updateSessionLocalInfo(AccountSession session){
 		new GetOwnAccount()
 				.setCallback(new Callback<>(){
 					@Override

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

@@ -0,0 +1,15 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.model.Account;
+
+public class AccountAddedToListEvent{
+	public final String accountID;
+	public final String listID;
+	public final Account account;
+
+	public AccountAddedToListEvent(String accountID, String listID, Account account){
+		this.accountID=accountID;
+		this.listID=listID;
+		this.account=account;
+	}
+}

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

@@ -0,0 +1,13 @@
+package org.joinmastodon.android.events;
+
+public class AccountRemovedFromListEvent{
+	public final String accountID;
+	public final String listID;
+	public final String targetAccountID;
+
+	public AccountRemovedFromListEvent(String accountID, String listID, String targetAccountID){
+		this.accountID=accountID;
+		this.listID=listID;
+		this.targetAccountID=targetAccountID;
+	}
+}

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

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

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

@@ -0,0 +1,13 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.model.FollowList;
+
+public class ListCreatedEvent{
+	public final String accountID;
+	public final FollowList list;
+
+	public ListCreatedEvent(String accountID, FollowList list){
+		this.accountID=accountID;
+		this.list=list;
+	}
+}

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

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

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

@@ -0,0 +1,13 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.model.FollowList;
+
+public class ListUpdatedEvent{
+	public final String accountID;
+	public final FollowList list;
+
+	public ListUpdatedEvent(String accountID, FollowList list){
+		this.accountID=accountID;
+		this.list=list;
+	}
+}

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

@@ -0,0 +1,114 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.widget.TextView;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.ResultlessMastodonAPIRequest;
+import org.joinmastodon.android.api.requests.accounts.GetAccountLists;
+import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
+import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.AccountAddedToListEvent;
+import org.joinmastodon.android.events.AccountRemovedFromListEvent;
+import org.joinmastodon.android.fragments.settings.BaseSettingsFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+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;
+import me.grishka.appkit.utils.V;
+
+public class AddAccountToListsFragment extends BaseSettingsFragment<FollowList>{
+	private Account account;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.add_user_to_list_title);
+		account=Parcels.unwrap(getArguments().getParcelable("targetAccount"));
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		AccountSessionManager.get(accountID).getCacheController().getLists(new SimpleCallback<>(this){
+			@Override
+			public void onSuccess(List<FollowList> allLists){
+				if(getActivity()==null)
+					return;
+				loadAccountLists(allLists);
+			}
+		});
+	}
+
+	private void loadAccountLists(final List<FollowList> allLists){
+		currentRequest=new GetAccountLists(account.id)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<FollowList> result){
+						Set<String> lists=result.stream().map(l->l.id).collect(Collectors.toSet());
+						onDataLoaded(allLists.stream()
+								.map(l->new CheckableListItem<>(l.title, null, CheckableListItem.Style.CHECKBOX, lists.contains(l.id),
+										R.drawable.ic_list_alt_24px, AddAccountToListsFragment.this::onItemClick, l))
+								.collect(Collectors.toList()), false);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected int indexOfItemsAdapter(){
+		return 1;
+	}
+
+	@Override
+	protected RecyclerView.Adapter<?> getAdapter(){
+		TextView topText=new TextView(getActivity());
+		topText.setTextAppearance(R.style.m3_body_medium);
+		topText.setTextColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurface));
+		topText.setPadding(V.dp(16), V.dp(8), V.dp(16), V.dp(8));
+		topText.setText(getString(R.string.manage_user_lists, account.getDisplayUsername()));
+
+		MergeRecyclerAdapter mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(topText));
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
+	private void onItemClick(CheckableListItem<FollowList> item){
+		boolean add=!item.checked;
+		ResultlessMastodonAPIRequest req=add ? new AddAccountsToList(item.parentObject.id, Set.of(account.id)) : new RemoveAccountsFromList(item.parentObject.id, Set.of(account.id));
+		req.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						item.checked=add;
+						rebindItem(item);
+						if(add){
+							E.post(new AccountAddedToListEvent(accountID, item.parentObject.id, account));
+						}else{
+							E.post(new AccountRemovedFromListEvent(accountID, item.parentObject.id, account.id));
+						}
+					}
+
+					@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/BaseEditListFragment.java

@@ -0,0 +1,176 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.DeleteList;
+import org.joinmastodon.android.api.requests.lists.GetListAccounts;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.ListDeletedEvent;
+import org.joinmastodon.android.fragments.settings.BaseSettingsFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.viewmodel.AvatarPileListItem;
+import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.ui.views.FloatingHintEditTextLayout;
+import org.parceler.Parcels;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.APIRequest;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
+
+public abstract class BaseEditListFragment extends BaseSettingsFragment<Void>{
+	protected FollowList followList;
+	protected AvatarPileListItem<Void> membersItem;
+	protected CheckableListItem<Void> exclusiveItem;
+	protected FloatingHintEditTextLayout titleEditLayout;
+	protected EditText titleEdit;
+	protected Spinner showRepliesSpinner;
+	private APIRequest<?> getMembersRequest;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		followList=Parcels.unwrap(getArguments().getParcelable("list"));
+
+		membersItem=new AvatarPileListItem<>(getString(R.string.list_members), null, List.of(), 0, i->onMembersClick(), null, false);
+		List<ListItem<Void>> items=new ArrayList<>();
+		if(followList!=null){
+			items.add(membersItem);
+		}
+		exclusiveItem=new CheckableListItem<>(R.string.list_exclusive, R.string.list_exclusive_subtitle, CheckableListItem.Style.SWITCH, followList!=null && followList.exclusive, this::toggleCheckableItem);
+		items.add(exclusiveItem);
+		onDataLoaded(items);
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		if(getMembersRequest!=null)
+			getMembersRequest.cancel();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){}
+
+	@Override
+	protected RecyclerView.Adapter<?> getAdapter(){
+		LinearLayout topView=new LinearLayout(getActivity());
+		topView.setOrientation(LinearLayout.VERTICAL);
+
+		titleEditLayout=(FloatingHintEditTextLayout) getActivity().getLayoutInflater().inflate(R.layout.floating_hint_edit_text, topView, false);
+		titleEdit=titleEditLayout.findViewById(R.id.edit);
+		titleEdit.setHint(R.string.list_name);
+		titleEditLayout.updateHint();
+		if(followList!=null)
+			titleEdit.setText(followList.title);
+		topView.addView(titleEditLayout);
+
+		FloatingHintEditTextLayout showRepliesLayout=(FloatingHintEditTextLayout) getActivity().getLayoutInflater().inflate(R.layout.floating_hint_spinner, topView, false);
+		showRepliesSpinner=showRepliesLayout.findViewById(R.id.spinner);
+		showRepliesLayout.setHint(R.string.list_show_replies_to);
+		topView.addView(showRepliesLayout);
+		ArrayAdapter<String> spinnerAdapter=new ArrayAdapter<>(getActivity(), R.layout.item_spinner, List.of(
+				getString(R.string.list_replies_no_one),
+				getString(R.string.list_replies_members),
+				getString(R.string.list_replies_anyone)
+		));
+		showRepliesSpinner.setAdapter(spinnerAdapter);
+		showRepliesSpinner.setSelection(switch(followList!=null ? followList.repliesPolicy : FollowList.RepliesPolicy.LIST){
+			case FOLLOWED -> 2;
+			case LIST -> 1;
+			case NONE -> 0;
+		});
+		ViewGroup.MarginLayoutParams llp=(ViewGroup.MarginLayoutParams)showRepliesLayout.getLabel().getLayoutParams();
+		llp.setMarginStart(llp.getMarginStart()+V.dp(16));
+
+		MergeRecyclerAdapter adapter=new MergeRecyclerAdapter();
+		adapter.addAdapter(new SingleViewRecyclerAdapter(topView));
+		adapter.addAdapter(super.getAdapter());
+		return adapter;
+	}
+
+	@Override
+	protected int indexOfItemsAdapter(){
+		return 1;
+	}
+
+	protected void doDeleteList(){
+		new DeleteList(followList.id)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						AccountSessionManager.get(accountID).getCacheController().deleteList(followList.id);
+						E.post(new ListDeletedEvent(accountID, followList.id));
+						Nav.finish(BaseEditListFragment.this);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						Activity activity=getActivity();
+						if(activity==null)
+							return;
+						error.showToast(activity);
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+
+	private void onMembersClick(){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("list", Parcels.wrap(followList));
+		Nav.go(getActivity(), ListMembersFragment.class, args);
+	}
+
+	protected void loadMembers(){
+		getMembersRequest=new GetListAccounts(followList.id, null, 3)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(HeaderPaginationList<Account> result){
+						getMembersRequest=null;
+						membersItem.avatars=new ArrayList<>();
+						for(int i=0;i<Math.min(3, result.size());i++){
+							Account acc=result.get(i);
+							membersItem.avatars.add(new UrlImageLoaderRequest(acc.avatarStatic, V.dp(32), V.dp(32)));
+						}
+						rebindItem(membersItem);
+						imgLoader.updateImages();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						getMembersRequest=null;
+					}
+				})
+				.exec(accountID);
+	}
+
+	protected FollowList.RepliesPolicy getSelectedRepliesPolicy(){
+		return switch(showRepliesSpinner.getSelectedItemPosition()){
+			case 0 -> FollowList.RepliesPolicy.NONE;
+			case 1 -> FollowList.RepliesPolicy.LIST;
+			case 2 -> FollowList.RepliesPolicy.FOLLOWED;
+			default -> throw new IllegalStateException("Unexpected value: "+showRepliesSpinner.getSelectedItemPosition());
+		};
+	}
+}

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

@@ -14,18 +14,24 @@ import android.view.WindowInsets;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.E;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.polls.SubmitPollVote;
+import org.joinmastodon.android.api.requests.statuses.TranslateStatus;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.DisplayItemsParent;
 import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.Translation;
 import org.joinmastodon.android.ui.BetterItemAnimator;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.sheets.NonMutualPreReplySheet;
+import org.joinmastodon.android.ui.sheets.OldPostPreReplySheet;
 import org.joinmastodon.android.ui.displayitems.AccountStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HashtagStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.MediaGridStatusDisplayItem;
@@ -33,16 +39,20 @@ import org.joinmastodon.android.ui.displayitems.PollFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.PollOptionStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.SpoilerStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewerHost;
 import org.joinmastodon.android.ui.utils.MediaAttachmentViewController;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.TypedObjectPool;
 
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -101,6 +111,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		for(T s:items){
 			displayItems.addAll(buildDisplayItems(s));
 		}
+		loadRelationships(items.stream().map(DisplayItemsParent::getAccountID).filter(Objects::nonNull).collect(Collectors.toSet()));
 	}
 
 	@Override
@@ -122,6 +133,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		}
 		if(notify)
 			adapter.notifyItemRangeInserted(0, offset);
+		loadRelationships(items.stream().map(DisplayItemsParent::getAccountID).filter(Objects::nonNull).collect(Collectors.toSet()));
 	}
 
 	protected String getMaxID(){
@@ -169,7 +181,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	@Override
 	public void openPhotoViewer(String parentID, Status _status, int attachmentIndex, MediaGridStatusDisplayItem.Holder gridHolder){
 		final Status status=_status.getContentStatus();
-		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, new PhotoViewer.Listener(){
+		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, status, accountID, new PhotoViewer.Listener(){
 			private MediaAttachmentViewController transitioningHolder;
 
 			@Override
@@ -235,6 +247,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			@Override
 			public void photoViewerDismissed(){
 				currentPhotoViewer=null;
+				gridHolder.itemView.setHasTransientState(false);
 			}
 
 			@Override
@@ -246,6 +259,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				return gridHolder.getViewController(index);
 			}
 		});
+		gridHolder.itemView.setHasTransientState(true);
 	}
 
 	@Override
@@ -352,7 +366,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		List<StatusDisplayItem> pollItems=displayItems.subList(firstOptionIndex, footerIndex+1);
 		int prevSize=pollItems.size();
 		pollItems.clear();
-		StatusDisplayItem.buildPollItems(itemID, this, poll, pollItems);
+		StatusDisplayItem.buildPollItems(itemID, this, poll, status, pollItems);
 		if(prevSize!=pollItems.size()){
 			adapter.notifyItemRangeRemoved(firstOptionIndex, prevSize);
 			adapter.notifyItemRangeInserted(firstOptionIndex, pollItems.size());
@@ -450,6 +464,9 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	}
 
 	protected void loadRelationships(Set<String> ids){
+		if(ids.isEmpty())
+			return;
+		ids=ids.stream().filter(id->!relationships.containsKey(id)).collect(Collectors.toSet());
 		if(ids.isEmpty())
 			return;
 		// TODO somehow manage these and cancel outstanding requests on refresh
@@ -560,6 +577,74 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		return attachmentViewsPool;
 	}
 
+	public void togglePostTranslation(Status status, String itemID){
+		switch(status.translationState){
+			case LOADING -> {
+				return;
+			}
+			case SHOWN -> {
+				status.translationState=Status.TranslationState.HIDDEN;
+			}
+			case HIDDEN -> {
+				if(status.translation!=null){
+					status.translationState=Status.TranslationState.SHOWN;
+				}else{
+					status.translationState=Status.TranslationState.LOADING;
+					new TranslateStatus(status.getContentStatus().id, Locale.getDefault().getLanguage())
+							.setCallback(new Callback<>(){
+								@Override
+								public void onSuccess(Translation result){
+									if(getActivity()==null)
+										return;
+									status.translation=result;
+									status.translationState=Status.TranslationState.SHOWN;
+									updateTranslation(itemID);
+								}
+
+								@Override
+								public void onError(ErrorResponse error){
+									if(getActivity()==null)
+										return;
+									status.translationState=Status.TranslationState.HIDDEN;
+									updateTranslation(itemID);
+									new M3AlertDialogBuilder(getActivity())
+											.setTitle(R.string.error)
+											.setMessage(R.string.translation_failed)
+											.setPositiveButton(R.string.ok, null)
+											.show();
+								}
+							})
+							.exec(accountID);
+				}
+			}
+		}
+		updateTranslation(itemID);
+	}
+
+	private void updateTranslation(String itemID) {
+		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
+		if(text!=null){
+			text.updateTranslation(true);
+			imgLoader.bindViewHolder((ImageLoaderRecyclerAdapter) list.getAdapter(), text, text.getAbsoluteAdapterPosition());
+		}
+
+		SpoilerStatusDisplayItem.Holder spoiler=findHolderOfType(itemID, SpoilerStatusDisplayItem.Holder.class);
+		if(spoiler!=null){
+			spoiler.rebind();
+		}
+
+		MediaGridStatusDisplayItem.Holder media=findHolderOfType(itemID, MediaGridStatusDisplayItem.Holder.class);
+		if (media!=null) {
+			media.rebind();
+		}
+
+		for(int i=0;i<list.getChildCount();i++){
+			if(list.getChildViewHolder(list.getChildAt(i)) instanceof PollOptionStatusDisplayItem.Holder item){
+				item.rebind();
+			}
+		}
+	}
+
 	public void rebuildAllDisplayItems(){
 		displayItems.clear();
 		for(T item:data){
@@ -568,6 +653,26 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		adapter.notifyDataSetChanged();
 	}
 
+	public void maybeShowPreReplySheet(Status status, Runnable proceed){
+		Relationship rel=getRelationship(status.account.id);
+		if(!GlobalUserPreferences.isOptedOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.NON_MUTUAL, status.account, accountID) &&
+				!status.account.id.equals(AccountSessionManager.get(accountID).self.id) && rel!=null && !rel.followedBy && status.account.followingCount>=1){
+			new NonMutualPreReplySheet(getActivity(), notAgain->{
+				GlobalUserPreferences.optOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.NON_MUTUAL, notAgain ? null : status.account, accountID);
+				proceed.run();
+			}, status.account, accountID).show();
+		}else if(!GlobalUserPreferences.isOptedOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.OLD_POST, null, null) &&
+				status.createdAt.isBefore(Instant.now().minus(90, ChronoUnit.DAYS))){
+			new OldPostPreReplySheet(getActivity(), notAgain->{
+				if(notAgain)
+					GlobalUserPreferences.optOutOfPreReplySheet(GlobalUserPreferences.PreReplySheetType.OLD_POST, null, null);
+				proceed.run();
+			}, status).show();
+		}else{
+			proceed.run();
+		}
+	}
+
 	protected void onModifyItemViewHolder(BindableViewHolder<StatusDisplayItem> holder){}
 
 	protected class DisplayItemsAdapter extends UsableRecyclerView.Adapter<BindableViewHolder<StatusDisplayItem>> implements ImageLoaderRecyclerAdapter{
@@ -640,7 +745,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()) || sh instanceof ExtendedFooterStatusDisplayItem.Holder) && ih.getItem().getType()!=StatusDisplayItem.Type.GAP;
+				return !ih.getItemID().equals(sh.getItemID()) && ih.getItem().getType()!=StatusDisplayItem.Type.GAP;
 			}
 			return false;
 		}

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

@@ -1,5 +1,8 @@
 package org.joinmastodon.android.fragments;
 
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ClipData;
@@ -19,17 +22,14 @@ import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.style.BackgroundColorSpan;
 import android.text.style.ForegroundColorSpan;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.SoundEffectConstants;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
-import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
@@ -49,7 +49,6 @@ import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonErrorResponse;
-import org.joinmastodon.android.api.requests.accounts.GetPreferences;
 import org.joinmastodon.android.api.requests.statuses.CreateStatus;
 import org.joinmastodon.android.api.requests.statuses.EditStatus;
 import org.joinmastodon.android.api.session.AccountSession;
@@ -57,7 +56,7 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
-import org.joinmastodon.android.fragments.account_list.ComposeAccountSearchFragment;
+import org.joinmastodon.android.fragments.account_list.AccountSearchFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.EmojiCategory;
@@ -94,12 +93,14 @@ 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.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{
+public class ComposeFragment extends MastodonToolbarFragment implements OnBackPressedListener, ComposeEditText.SelectionListener, CustomTransitionsFragment{
 
 	private static final int MEDIA_RESULT=717;
 	public static final int IMAGE_DESCRIPTION_RESULT=363;
@@ -340,7 +341,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			public void onLaunchAccountSearch(){
 				Bundle args=new Bundle();
 				args.putString("account", accountID);
-				Nav.goForResult(getActivity(), ComposeAccountSearchFragment.class, args, AUTOCOMPLETE_ACCOUNT_RESULT, ComposeFragment.this);
+				Nav.goForResult(getActivity(), AccountSearchFragment.class, args, AUTOCOMPLETE_ACCOUNT_RESULT, ComposeFragment.this);
 			}
 		});
 		View autocompleteView=autocompleteViewController.getView();
@@ -691,6 +692,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		req.visibility=statusVisibility;
 		if(!mediaViewController.isEmpty()){
 			req.mediaIds=mediaViewController.getAttachmentIDs();
+			if(editingStatus != null){
+				req.mediaAttributes=mediaViewController.getAttachmentAttributes();
+			}
 		}
 		if(replyTo!=null){
 			req.inReplyToId=replyTo.id;
@@ -836,7 +840,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		boolean usePhotoPicker=UiUtils.isPhotoPickerAvailable();
 		if(usePhotoPicker){
 			intent=new Intent(MediaStore.ACTION_PICK_IMAGES);
-			intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, mediaViewController.getMaxAttachments()-mediaViewController.getMediaAttachmentsCount());
+			if(mediaViewController.getMaxAttachments()-mediaViewController.getMediaAttachmentsCount()>1)
+				intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, mediaViewController.getMaxAttachments()-mediaViewController.getMediaAttachmentsCount());
 		}else{
 			intent=new Intent(Intent.ACTION_GET_CONTENT);
 			intent.addCategory(Intent.CATEGORY_OPENABLE);
@@ -1012,8 +1017,26 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		return new String[]{"image/jpeg", "image/gif", "image/png", "video/mp4"};
 	}
 
+	private String sanitizeMediaDescription(String description){
+		if(description == null){
+			return null;
+		}
+
+		// The Gboard android keyboard attaches this text whenever the user
+		// pastes something from the keyboard's suggestion bar.
+		// Due to different end user locales, the exact text may vary, but at
+		// least in version 13.4.08, all of the translations contained the
+		// string "Gboard".
+		if (description.contains("Gboard")){
+			return null;
+		}
+
+		return description;
+	}
+
 	@Override
 	public boolean onAddMediaAttachmentFromEditText(Uri uri, String description){
+		description = sanitizeMediaDescription(description);
 		return mediaViewController.addMediaAttachment(uri, description);
 	}
 
@@ -1054,6 +1077,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		Editable e=mainEditText.getText();
 		int start=e.getSpanStart(currentAutocompleteSpan);
 		int end=e.getSpanEnd(currentAutocompleteSpan);
+		if(start==-1 || end==-1)
+			return;
 		e.replace(start, end, text+" ");
 		finishAutocomplete();
 		InputConnection conn=mainEditText.getCurrentInputConnection();
@@ -1106,4 +1131,35 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private void setPostLanguage(ComposeLanguageAlertViewController.SelectedOption language){
 		postLang=language;
 	}
+
+	@Override
+	public Animator onCreateEnterTransition(View prev, View container){
+		AnimatorSet anim=new AnimatorSet();
+		if(getArguments().getBoolean("fromThreadFragment")){
+			anim.playTogether(
+					ObjectAnimator.ofFloat(container, View.ALPHA, 0f, 1f),
+					ObjectAnimator.ofFloat(container, View.TRANSLATION_Y, V.dp(200), 0)
+			);
+		}else{
+			anim.playTogether(
+					ObjectAnimator.ofFloat(container, View.ALPHA, 0f, 1f),
+					ObjectAnimator.ofFloat(container, View.TRANSLATION_X, V.dp(100), 0)
+			);
+		}
+		anim.setDuration(300);
+		anim.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		return anim;
+	}
+
+	@Override
+	public Animator onCreateExitTransition(View prev, View container){
+		AnimatorSet anim=new AnimatorSet();
+		anim.playTogether(
+				ObjectAnimator.ofFloat(container, View.TRANSLATION_X, V.dp(100)),
+				ObjectAnimator.ofFloat(container, View.ALPHA, 0)
+		);
+		anim.setDuration(200);
+		anim.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		return anim;
+	}
 }

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

@@ -7,10 +7,7 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
-import android.text.SpannableStringBuilder;
-import android.text.style.BulletSpan;
 import android.util.Log;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -131,20 +128,9 @@ public class ComposeImageDescriptionFragment extends MastodonToolbarFragment imp
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item){
 		if(item.getItemId()==R.id.help){
-			SpannableStringBuilder msg=new SpannableStringBuilder(getText(R.string.alt_text_help));
-			BulletSpan[] spans=msg.getSpans(0, msg.length(), BulletSpan.class);
-			for(BulletSpan span:spans){
-				BulletSpan betterSpan;
-				if(Build.VERSION.SDK_INT<Build.VERSION_CODES.Q)
-					betterSpan=new BulletSpan(V.dp(10), UiUtils.getThemeColor(themeWrapper, R.attr.colorM3OnSurface));
-				else
-					betterSpan=new BulletSpan(V.dp(10), UiUtils.getThemeColor(themeWrapper, R.attr.colorM3OnSurface), V.dp(1.5f));
-				msg.setSpan(betterSpan, msg.getSpanStart(span), msg.getSpanEnd(span), msg.getSpanFlags(span));
-				msg.removeSpan(span);
-			}
 			new M3AlertDialogBuilder(themeWrapper)
 					.setTitle(R.string.what_is_alt_text)
-					.setMessage(msg)
+					.setMessage(UiUtils.fixBulletListInString(themeWrapper, R.string.alt_text_help))
 					.setPositiveButton(R.string.ok, null)
 					.show();
 		}
@@ -181,7 +167,7 @@ public class ComposeImageDescriptionFragment extends MastodonToolbarFragment imp
 		fakeAttachment.meta.width=width;
 		fakeAttachment.meta.height=height;
 
-		photoViewer=new PhotoViewer(getActivity(), Collections.singletonList(fakeAttachment), 0, new PhotoViewer.Listener(){
+		photoViewer=new PhotoViewer(getActivity(), Collections.singletonList(fakeAttachment), 0, null, accountID, new PhotoViewer.Listener(){
 			@Override
 			public void setPhotoViewVisibility(int index, boolean visible){
 				image.setAlpha(visible ? 1f : 0f);

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

@@ -0,0 +1,323 @@
+package org.joinmastodon.android.fragments;
+
+import android.content.res.TypedArray;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewStub;
+import android.view.WindowInsets;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
+import org.joinmastodon.android.api.requests.lists.GetListAccounts;
+import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
+import org.joinmastodon.android.events.FinishListCreationFragmentEvent;
+import org.joinmastodon.android.fragments.account_list.AddNewListMembersFragment;
+import org.joinmastodon.android.fragments.account_list.BaseAccountListFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.viewmodel.AccountViewModel;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+import org.joinmastodon.android.ui.views.CurlyArrowEmptyView;
+import org.parceler.Parcels;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+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.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{
+	private FollowList followList;
+	private Button nextButton;
+	private View buttonBar;
+	private FragmentRootLinearLayout rootView;
+	private FrameLayout searchFragmentContainer;
+	private FrameLayout fragmentContentWrap;
+	private AddNewListMembersFragment searchFragment;
+	private WindowInsets lastInsets;
+	private boolean dismissingSearchFragment;
+	private HashSet<String> accountIDsInList=new HashSet<>();
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.manage_list_members);
+		setSubtitle(getString(R.string.step_x_of_y, 2, 2));
+		setLayout(R.layout.fragment_login);
+		setEmptyText(R.string.list_no_members);
+		setHasOptionsMenu(true);
+
+		followList=Parcels.unwrap(getArguments().getParcelable("list"));
+		if(savedInstanceState!=null || getArguments().getBoolean("needLoadMembers", false)){
+			loadData();
+		}else{
+			onDataLoaded(List.of());
+		}
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetListAccounts(followList.id, null, 0)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(HeaderPaginationList<Account> result){
+						for(Account acc:result)
+							accountIDsInList.add(acc.id);
+						onDataLoaded(result.stream().map(a->new AccountViewModel(a, accountID)).collect(Collectors.toList()));
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
+		View view=super.onCreateView(inflater, container, savedInstanceState);
+		FrameLayout wrapper=new FrameLayout(getActivity());
+		wrapper.addView(view);
+		rootView=(FragmentRootLinearLayout) view;
+		fragmentContentWrap=wrapper;
+		return wrapper;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		nextButton=view.findViewById(R.id.btn_next);
+		nextButton.setOnClickListener(this::onNextClick);
+		nextButton.setText(R.string.done);
+		buttonBar=view.findViewById(R.id.button_bar);
+
+		super.onViewCreated(view, savedInstanceState);
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		lastInsets=insets;
+		if(searchFragment!=null)
+			searchFragment.onApplyWindowInsets(insets);
+		insets=UiUtils.applyBottomInsetToFixedView(buttonBar, insets);
+		rootView.dispatchApplyWindowInsets(insets);
+	}
+
+	@Override
+	protected List<View> getViewsForElevationEffect(){
+		return List.of(getToolbar(), buttonBar);
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		MenuItem item=menu.add(R.string.add_list_member);
+		item.setIcon(R.drawable.ic_add_24px);
+		item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		if(searchFragmentContainer!=null)
+			return true;
+
+		searchFragmentContainer=new FrameLayout(getActivity());
+		searchFragmentContainer.setId(R.id.search_fragment);
+		fragmentContentWrap.addView(searchFragmentContainer);
+
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("list", Parcels.wrap(followList));
+		args.putBoolean("_can_go_back", true);
+		searchFragment=new AddNewListMembersFragment(this);
+		searchFragment.setArguments(args);
+		getChildFragmentManager().beginTransaction().add(R.id.search_fragment, searchFragment).commit();
+		getChildFragmentManager().executePendingTransactions();
+		if(lastInsets!=null)
+			searchFragment.onApplyWindowInsets(lastInsets);
+		searchFragmentContainer.setTranslationX(V.dp(100));
+		searchFragmentContainer.setAlpha(0f);
+		searchFragmentContainer.animate().translationX(0).alpha(1).setDuration(300).withLayer().setInterpolator(CubicBezierInterpolator.DEFAULT).withEndAction(()->{
+			rootView.setVisibility(View.GONE);
+		}).start();
+		return true;
+	}
+
+	@Override
+	protected void initializeEmptyView(View contentView){
+		ViewStub emptyStub=contentView.findViewById(R.id.empty);
+		emptyStub.setLayoutResource(R.layout.empty_with_arrow);
+		super.initializeEmptyView(contentView);
+		TextView emptySecondary=contentView.findViewById(R.id.empty_text_secondary);
+		emptySecondary.setText(R.string.list_find_users);
+		CurlyArrowEmptyView arrowView=(CurlyArrowEmptyView) emptyView;
+		arrowView.setGravityAndOffsets(Gravity.TOP | Gravity.END, 24, 2);
+	}
+
+	@Override
+	protected void setStatusBarColor(int color){
+		rootView.setStatusBarColor(color);
+	}
+
+	@Override
+	protected void setNavigationBarColor(int color){
+		rootView.setNavigationBarColor(color);
+	}
+
+	private void dismissSearchFragment(){
+		if(searchFragment==null || dismissingSearchFragment)
+			return;
+		dismissingSearchFragment=true;
+		rootView.setVisibility(View.VISIBLE);
+		searchFragmentContainer.animate().translationX(V.dp(100)).alpha(0).setDuration(200).withLayer().setInterpolator(CubicBezierInterpolator.DEFAULT).withEndAction(()->{
+			getChildFragmentManager().beginTransaction().remove(searchFragment).commit();
+			getChildFragmentManager().executePendingTransactions();
+			fragmentContentWrap.removeView(searchFragmentContainer);
+			searchFragmentContainer=null;
+			searchFragment=null;
+			dismissingSearchFragment=false;
+		}).start();
+		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
+	}
+
+	private void onNextClick(View v){
+		E.post(new FinishListCreationFragmentEvent(accountID, followList.id));
+		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);
+	}
+
+	@Override
+	public void addAccountToList(AccountViewModel account, Runnable onDone){
+		new AddAccountsToList(followList.id, Set.of(account.account.id))
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						accountIDsInList.add(account.account.id);
+						if(onDone!=null)
+							onDone.run();
+						int i=0;
+						for(AccountViewModel acc:data){
+							if(acc.account.id.equals(account.account.id)){
+								list.getAdapter().notifyItemChanged(i);
+								return;
+							}
+							i++;
+						}
+						int pos=data.size();
+						data.add(account);
+						list.getAdapter().notifyItemInserted(pos);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	public void removeAccountAccountFromList(AccountViewModel account, Runnable onDone){
+		new RemoveAccountsFromList(followList.id, Set.of(account.account.id))
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						accountIDsInList.remove(account.account.id);
+						if(onDone!=null)
+							onDone.run();
+						int i=0;
+						for(AccountViewModel acc:data){
+							if(acc.account.id.equals(account.account.id)){
+								list.getAdapter().notifyItemChanged(i);
+								return;
+							}
+							i++;
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		holder.setStyle(AccountViewHolder.AccessoryType.CUSTOM_BUTTON, false);
+		holder.setOnLongClickListener(vh->false);
+		Button button=holder.getButton();
+		button.setPadding(V.dp(24), 0, V.dp(24), 0);
+		button.setMinimumWidth(0);
+		button.setMinWidth(0);
+		button.setOnClickListener(v->{
+			holder.setActionProgressVisible(true);
+			holder.itemView.setHasTransientState(true);
+			Runnable onDone=()->{
+				holder.setActionProgressVisible(false);
+				holder.itemView.setHasTransientState(false);
+			};
+			AccountViewModel account=holder.getItem();
+			if(isAccountInList(account)){
+				removeAccountAccountFromList(account, onDone);
+			}else{
+				addAccountToList(account, onDone);
+			}
+		});
+	}
+
+	@Override
+	protected void onBindViewHolder(AccountViewHolder holder){
+		Button button=holder.getButton();
+		int textRes, styleRes;
+		if(isAccountInList(holder.getItem())){
+			textRes=R.string.remove;
+			styleRes=R.style.Widget_Mastodon_M3_Button_Tonal_Error;
+		}else{
+			textRes=R.string.add;
+			styleRes=R.style.Widget_Mastodon_M3_Button_Filled;
+		}
+		button.setText(textRes);
+		TypedArray ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
+		button.setBackground(ta.getDrawable(0));
+		ta.recycle();
+		ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.textColor});
+		button.setTextColor(ta.getColorStateList(0));
+		ta.recycle();
+	}
+
+	@Override
+	protected void loadRelationships(List<AccountViewModel> accounts){
+		// no-op
+	}
+}

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

@@ -0,0 +1,149 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.WindowInsets;
+import android.view.inputmethod.InputMethodManager;
+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.lists.CreateList;
+import org.joinmastodon.android.api.requests.lists.UpdateList;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.FinishListCreationFragmentEvent;
+import org.joinmastodon.android.events.ListCreatedEvent;
+import org.joinmastodon.android.events.ListUpdatedEvent;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.List;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+
+public class CreateListFragment extends BaseEditListFragment{
+	private Button nextButton;
+	private View buttonBar;
+	private FollowList followList;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.create_list);
+		setSubtitle(getString(R.string.step_x_of_y, 1, 2));
+		setLayout(R.layout.fragment_login);
+		if(savedInstanceState!=null)
+			followList=Parcels.unwrap(savedInstanceState.getParcelable("list"));
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		E.unregister(this);
+	}
+
+	@Override
+	protected int getNavigationIconDrawableResource(){
+		return R.drawable.ic_baseline_close_24;
+	}
+
+	@Override
+	public boolean wantsCustomNavigationIcon(){
+		return true;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		nextButton=view.findViewById(R.id.btn_next);
+		nextButton.setOnClickListener(this::onNextClick);
+		nextButton.setText(R.string.create);
+		buttonBar=view.findViewById(R.id.button_bar);
+		super.onViewCreated(view, savedInstanceState);
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		super.onApplyWindowInsets(UiUtils.applyBottomInsetToFixedView(buttonBar, insets));
+	}
+
+	@Override
+	protected List<View> getViewsForElevationEffect(){
+		return List.of(getToolbar(), buttonBar);
+	}
+
+	@Override
+	public void onSaveInstanceState(Bundle outState){
+		super.onSaveInstanceState(outState);
+		outState.putParcelable("list", Parcels.wrap(followList));
+	}
+
+	private void onNextClick(View v){
+		String title=titleEdit.getText().toString().trim();
+		if(TextUtils.isEmpty(title)){
+			titleEditLayout.setErrorState(getString(R.string.required_form_field_blank));
+			return;
+		}
+		if(followList==null){
+			new CreateList(title, getSelectedRepliesPolicy(), exclusiveItem.checked)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(FollowList result){
+							followList=result;
+							proceed(false);
+							E.post(new ListCreatedEvent(accountID, result));
+							AccountSessionManager.get(accountID).getCacheController().addList(result);
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							error.showToast(getActivity());
+						}
+					})
+					.wrapProgress(getActivity(), R.string.loading, true)
+					.exec(accountID);
+		}else if(!title.equals(followList.title) || getSelectedRepliesPolicy()!=followList.repliesPolicy || exclusiveItem.checked!=followList.exclusive){
+			new UpdateList(followList.id, title, getSelectedRepliesPolicy(), exclusiveItem.checked)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(FollowList result){
+							followList=result;
+							proceed(true);
+							E.post(new ListUpdatedEvent(accountID, result));
+							AccountSessionManager.get(accountID).getCacheController().updateList(result);
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							error.showToast(getActivity());
+						}
+					})
+					.wrapProgress(getActivity(), R.string.loading, true)
+					.exec(accountID);
+		}else{
+			proceed(true);
+		}
+	}
+
+	private void proceed(boolean needLoadMembers){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("list", Parcels.wrap(followList));
+		args.putBoolean("needLoadMembers", needLoadMembers);
+		Nav.go(getActivity(), CreateListAddMembersFragment.class, args);
+		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
+	}
+
+	@Subscribe
+	public void onFinishListCreationFragment(FinishListCreationFragmentEvent ev){
+		if(ev.accountID.equals(accountID) && followList!=null && ev.listID.equals(followList.id)){
+			Nav.finish(this);
+		}
+	}
+}

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

@@ -0,0 +1,67 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.UpdateList;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.ListUpdatedEvent;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+
+public class EditListFragment extends BaseEditListFragment{
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.edit_list);
+		loadMembers();
+		setHasOptionsMenu(true);
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		menu.add(R.string.delete_list);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.delete_list)
+				.setMessage(getString(R.string.delete_list_confirm, followList.title))
+				.setPositiveButton(R.string.delete, (dlg, which)->doDeleteList())
+				.setNegativeButton(R.string.cancel, null)
+				.show();
+		return true;
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		String newTitle=titleEdit.getText().toString();
+		FollowList.RepliesPolicy newRepliesPolicy=getSelectedRepliesPolicy();
+		boolean newExclusive=exclusiveItem.checked;
+		if(!newTitle.equals(followList.title) || newRepliesPolicy!=followList.repliesPolicy || newExclusive!=followList.exclusive){
+			new UpdateList(followList.id, newTitle, newRepliesPolicy, newExclusive)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(FollowList result){
+							AccountSessionManager.get(accountID).getCacheController().updateList(result);
+							E.post(new ListUpdatedEvent(accountID, result));
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							// TODO handle errors somehow
+						}
+					})
+					.exec(accountID);
+		}
+	}
+}

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

@@ -15,6 +15,7 @@ import org.parceler.Parcels;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import androidx.recyclerview.widget.RecyclerView;
@@ -44,7 +45,7 @@ public class FeaturedHashtagsListFragment extends BaseStatusListFragment<Hashtag
 
 	@Override
 	public void onItemClick(String id){
-		UiUtils.openHashtagTimeline(getActivity(), accountID, id);
+		UiUtils.openHashtagTimeline(getActivity(), accountID, Objects.requireNonNull(findItemOfType(id, HashtagStatusDisplayItem.class)).tag);
 	}
 
 	@Override

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

@@ -1,24 +1,55 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.content.res.TypedArray;
 import android.os.Bundle;
+import android.text.SpannableStringBuilder;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
+import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonErrorResponse;
+import org.joinmastodon.android.api.requests.tags.GetTag;
+import org.joinmastodon.android.api.requests.tags.SetTagFollowed;
 import org.joinmastodon.android.api.requests.timelines.GetHashtagTimeline;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.FilterContext;
+import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.text.SpacerSpan;
+import org.joinmastodon.android.ui.views.ProgressBarButton;
+import org.parceler.Parcels;
 
 import java.util.List;
 
+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.CubicBezierInterpolator;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 
 public class HashtagTimelineFragment extends StatusListFragment{
-	private String hashtag;
+	private Hashtag hashtag;
+	private String hashtagName;
 	private ImageButton fab;
+	private TextView headerTitle, headerSubtitle;
+	private ProgressBarButton followButton;
+	private ProgressBar followProgress;
+	private MenuItem followMenuItem;
+	private boolean followRequestRunning;
+	private boolean toolbarContentVisible;
+	private String maxID;
 
 	public HashtagTimelineFragment(){
 		setListLayoutId(R.layout.recycler_fragment_with_fab);
@@ -27,16 +58,25 @@ public class HashtagTimelineFragment extends StatusListFragment{
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		hashtag=getArguments().getString("hashtag");
-		setTitle('#'+hashtag);
+		if(getArguments().containsKey("hashtag")){
+			hashtag=Parcels.unwrap(getArguments().getParcelable("hashtag"));
+			hashtagName=hashtag.name;
+		}else{
+			hashtagName=getArguments().getString("hashtagName");
+		}
+		setTitle('#'+hashtagName);
+		setHasOptionsMenu(true);
 	}
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetHashtagTimeline(hashtag, offset==0 ? null : getMaxID(), null, count)
+		currentRequest=new GetHashtagTimeline(hashtagName, offset==0 ? null : maxID, null, count)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
+						if(!result.isEmpty())
+							maxID=result.get(result.size()-1).id;
+						AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.PUBLIC);
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -50,17 +90,39 @@ public class HashtagTimelineFragment extends StatusListFragment{
 			loadData();
 	}
 
+	@Override
+	public void loadData(){
+		reloadTag();
+		super.loadData();
+	}
+
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
 		fab=view.findViewById(R.id.fab);
 		fab.setOnClickListener(this::onFabClick);
+
+		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
+			@Override
+			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
+				View topChild=recyclerView.getChildAt(0);
+				int firstChildPos=recyclerView.getChildAdapterPosition(topChild);
+				float newAlpha=firstChildPos>0 ? 1f : Math.min(1f, -topChild.getTop()/(float)headerTitle.getHeight());
+				toolbarTitleView.setAlpha(newAlpha);
+				boolean newToolbarVisibility=newAlpha>0.5f;
+				if(newToolbarVisibility!=toolbarContentVisible){
+					toolbarContentVisible=newToolbarVisibility;
+					if(followMenuItem!=null)
+						followMenuItem.setVisible(toolbarContentVisible);
+				}
+			}
+		});
 	}
 
 	private void onFabClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		args.putString("prefilledText", '#'+hashtag+' ');
+		args.putString("prefilledText", '#'+hashtagName+' ');
 		Nav.go(getActivity(), ComposeFragment.class, args);
 	}
 
@@ -68,4 +130,150 @@ public class HashtagTimelineFragment extends StatusListFragment{
 	protected void onSetFabBottomInset(int inset){
 		((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(16)+inset;
 	}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		View header=getActivity().getLayoutInflater().inflate(R.layout.header_hashtag_timeline, list, false);
+		headerTitle=header.findViewById(R.id.title);
+		headerSubtitle=header.findViewById(R.id.subtitle);
+		followButton=header.findViewById(R.id.profile_action_btn);
+		followProgress=header.findViewById(R.id.action_progress);
+
+		headerTitle.setText("#"+hashtagName);
+		followButton.setVisibility(View.GONE);
+		followButton.setOnClickListener(v->{
+			if(hashtag==null)
+				return;
+			setFollowed(!hashtag.following);
+		});
+		updateHeader();
+
+		MergeRecyclerAdapter mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(header));
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
+	@Override
+	protected int getMainAdapterOffset(){
+		return 1;
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		followMenuItem=menu.add(getString(hashtag!=null && hashtag.following ? R.string.unfollow_user : R.string.follow_user, "#"+hashtagName));
+		followMenuItem.setVisible(toolbarContentVisible);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		if(hashtag!=null){
+			setFollowed(!hashtag.following);
+		}
+		return true;
+	}
+
+	@Override
+	protected void onUpdateToolbar(){
+		super.onUpdateToolbar();
+		toolbarTitleView.setAlpha(toolbarContentVisible ? 1f : 0f);
+		if(followMenuItem!=null)
+			followMenuItem.setVisible(toolbarContentVisible);
+	}
+
+	private void updateHeader(){
+		if(hashtag==null || getActivity()==null)
+			return;
+
+		if(hashtag.history!=null && !hashtag.history.isEmpty()){
+			int weekPosts=hashtag.history.stream().mapToInt(h->h.uses).sum();
+			int todayPosts=hashtag.history.get(0).uses;
+			int numAccounts=hashtag.history.stream().mapToInt(h->h.accounts).sum();
+			int hSpace=V.dp(8);
+			SpannableStringBuilder ssb=new SpannableStringBuilder();
+			ssb.append(getResources().getQuantityString(R.plurals.x_posts, weekPosts, weekPosts));
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append('·');
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append(getResources().getQuantityString(R.plurals.x_participants, numAccounts, numAccounts));
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append('·');
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append(getResources().getQuantityString(R.plurals.x_posts_today, todayPosts, todayPosts));
+			headerSubtitle.setText(ssb);
+		}
+
+		int styleRes;
+		followButton.setVisibility(View.VISIBLE);
+		if(hashtag.following){
+			followButton.setText(R.string.button_following);
+			styleRes=R.style.Widget_Mastodon_M3_Button_Tonal;
+		}else{
+			followButton.setText(R.string.button_follow);
+			styleRes=R.style.Widget_Mastodon_M3_Button_Filled;
+		}
+		TypedArray ta=followButton.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
+		followButton.setBackground(ta.getDrawable(0));
+		ta.recycle();
+		ta=followButton.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.textColor});
+		followButton.setTextColor(ta.getColorStateList(0));
+		followProgress.setIndeterminateTintList(ta.getColorStateList(0));
+		ta.recycle();
+
+		followButton.setTextVisible(true);
+		followProgress.setVisibility(View.GONE);
+		if(followMenuItem!=null){
+			followMenuItem.setTitle(getString(hashtag.following ? R.string.unfollow_user : R.string.follow_user, "#"+hashtagName));
+		}
+	}
+
+	private void reloadTag(){
+		new GetTag(hashtagName)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Hashtag result){
+						hashtag=result;
+						updateHeader();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+
+					}
+				})
+				.exec(accountID);
+	}
+
+	private void setFollowed(boolean followed){
+		if(followRequestRunning)
+			return;
+		followButton.setTextVisible(false);
+		followProgress.setVisibility(View.VISIBLE);
+		followRequestRunning=true;
+		new SetTagFollowed(hashtagName, followed)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Hashtag result){
+						if(getActivity()==null)
+							return;
+						hashtag=result;
+						updateHeader();
+						followRequestRunning=false;
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						if(getActivity()==null)
+							return;
+						if(error instanceof MastodonErrorResponse er && "Duplicate record".equals(er.error)){
+							hashtag.following=true;
+						}else{
+							error.showToast(getActivity());
+						}
+						updateHeader();
+						followRequestRunning=false;
+					}
+				})
+				.exec(accountID);
+	}
 }

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

@@ -30,7 +30,7 @@ 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.AccountSwitcherSheet;
+import org.joinmastodon.android.ui.sheets.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.TabBar;
@@ -150,6 +150,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 				});
 			}
 		}
+		tabBar.selectTab(currentTab);
 
 		return content;
 	}

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

@@ -5,40 +5,50 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
-import android.content.res.ColorStateList;
 import android.content.res.Configuration;
-import android.os.Build;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.animation.AnimationUtils;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import android.widget.Toolbar;
 
 import com.squareup.otto.Subscribe;
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
+import org.joinmastodon.android.api.requests.timelines.GetListTimeline;
+import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
-import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.fragments.settings.SettingsMainFragment;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.FilterContext;
+import org.joinmastodon.android.model.FollowList;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.TimelineMarkers;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
+import org.joinmastodon.android.ui.viewcontrollers.HomeTimelineMenuController;
+import org.joinmastodon.android.ui.viewcontrollers.ToolbarDropdownMenuController;
+import org.joinmastodon.android.ui.views.FixedAspectRatioImageView;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
+import org.parceler.Parcels;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -52,44 +62,143 @@ 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.V;
 
-public class HomeTimelineFragment extends StatusListFragment{
+public class HomeTimelineFragment extends StatusListFragment implements ToolbarDropdownMenuController.HostFragment{
 	private ImageButton fab;
-	private ImageView toolbarLogo;
-	private Button toolbarShowNewPostsBtn;
+	private LinearLayout listsDropdown;
+	private FixedAspectRatioImageView listsDropdownArrow;
+	private TextView listsDropdownText;
+	private Button newPostsBtn;
+	private View newPostsBtnWrap;
 	private boolean newPostsBtnShown;
 	private AnimatorSet currentNewPostsAnim;
+	private ToolbarDropdownMenuController dropdownController;
+	private HomeTimelineMenuController dropdownMainMenuController;
+	private List<FollowList> lists=List.of();
+	private ListMode listMode=ListMode.FOLLOWING;
+	private FollowList currentList;
+	private MergeRecyclerAdapter mergeAdapter;
+	private DiscoverInfoBannerHelper localTimelineBannerHelper;
 
 	private String maxID;
 	private String lastSavedMarkerID;
 
 	public HomeTimelineFragment(){
-		setListLayoutId(R.layout.recycler_fragment_with_fab);
+		setListLayoutId(R.layout.fragment_timeline);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		localTimelineBannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.LOCAL_TIMELINE, accountID);
 	}
 
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
+		dropdownController=new ToolbarDropdownMenuController(this);
+		dropdownMainMenuController=new HomeTimelineMenuController(dropdownController, new HomeTimelineMenuController.Callback(){
+			@Override
+			public void onFollowingSelected(){
+				if(listMode==ListMode.FOLLOWING)
+					return;
+				listMode=ListMode.FOLLOWING;
+				reload();
+			}
+
+			@Override
+			public void onLocalSelected(){
+				if(listMode==ListMode.LOCAL)
+					return;
+				listMode=ListMode.LOCAL;
+				reload();
+			}
+
+			@Override
+			public List<FollowList> getLists(){
+				return lists;
+			}
+
+			@Override
+			public void onListSelected(FollowList list){
+				if(listMode==ListMode.LIST && currentList==list)
+					return;
+				listMode=ListMode.LIST;
+				currentList=list;
+				reload();
+			}
+		});
 		setHasOptionsMenu(true);
 		loadData();
+		AccountSessionManager.get(accountID).getCacheController().getLists(new Callback<>(){
+			@Override
+			public void onSuccess(List<FollowList> result){
+				lists=result;
+			}
+
+			@Override
+			public void onError(ErrorResponse error){}
+		});
 	}
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		AccountSessionManager.getInstance()
-				.getAccount(accountID).getCacheController()
-				.getHomeTimeline(offset>0 ? maxID : null, count, refreshing, new SimpleCallback<>(this){
-					@Override
-					public void onSuccess(CacheablePaginatedResponse<List<Status>> result){
-						if(getActivity()==null)
-							return;
-						onDataLoaded(result.items, !result.items.isEmpty());
-						maxID=result.maxID;
-						if(result.isFromCache())
-							loadNewPosts();
-					}
-				});
+		switch(listMode){
+			case FOLLOWING -> {
+				AccountSessionManager.getInstance()
+						.getAccount(accountID).getCacheController()
+						.getHomeTimeline(offset>0 ? maxID : null, count, refreshing, new SimpleCallback<>(this){
+							@Override
+							public void onSuccess(CacheablePaginatedResponse<List<Status>> result){
+								if(getActivity()==null || listMode!=ListMode.FOLLOWING)
+									return;
+								if(refreshing)
+									list.scrollToPosition(0);
+								onDataLoaded(result.items, !result.items.isEmpty());
+								maxID=result.maxID;
+								if(result.isFromCache())
+									loadNewPosts();
+							}
+
+							@Override
+							public void onError(ErrorResponse error){
+								if(listMode!=ListMode.FOLLOWING)
+									return;
+								super.onError(error);
+							}
+						});
+			}
+			case LOCAL -> {
+				currentRequest=new GetPublicTimeline(true, false, offset>0 ? maxID : null, null, count, null)
+						.setCallback(new SimpleCallback<>(this){
+							@Override
+							public void onSuccess(List<Status> result){
+								if(refreshing)
+									list.scrollToPosition(0);
+								maxID=result.isEmpty() ? null : result.get(result.size()-1).id;
+								AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.PUBLIC);
+								onDataLoaded(result, !result.isEmpty());
+							}
+						})
+						.exec(accountID);
+			}
+			case LIST -> {
+				currentRequest=new GetListTimeline(currentList.id, offset>0 ? maxID : null, null, count, null)
+						.setCallback(new SimpleCallback<>(this){
+							@Override
+							public void onSuccess(List<Status> result){
+								if(refreshing)
+									list.scrollToPosition(0);
+								maxID=result.isEmpty() ? null : result.get(result.size()-1).id;
+								AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.HOME);
+								onDataLoaded(result, !result.isEmpty());
+							}
+						})
+						.exec(accountID);
+			}
+		}
 	}
 
 	@Override
@@ -97,6 +206,19 @@ public class HomeTimelineFragment extends StatusListFragment{
 		super.onViewCreated(view, savedInstanceState);
 		fab=view.findViewById(R.id.fab);
 		fab.setOnClickListener(this::onFabClick);
+		newPostsBtn=view.findViewById(R.id.new_posts_btn);
+		newPostsBtn.setOnClickListener(this::onNewPostsBtnClick);
+		newPostsBtnWrap=view.findViewById(R.id.new_posts_btn_wrap);
+
+		if(newPostsBtnShown){
+			newPostsBtnWrap.setVisibility(View.VISIBLE);
+		}else{
+			newPostsBtnWrap.setVisibility(View.GONE);
+			newPostsBtnWrap.setScaleX(0.9f);
+			newPostsBtnWrap.setScaleY(0.9f);
+			newPostsBtnWrap.setAlpha(0f);
+			newPostsBtnWrap.setTranslationY(V.dp(-56));
+		}
 		updateToolbarLogo();
 		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
 			@Override
@@ -116,13 +238,26 @@ public class HomeTimelineFragment extends StatusListFragment{
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		inflater.inflate(R.menu.home, menu);
+		menu.findItem(R.id.edit_list).setVisible(listMode==ListMode.LIST);
+		GithubSelfUpdater.UpdateState state=GithubSelfUpdater.UpdateState.NO_UPDATE;
+		GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
+		if(updater!=null)
+			state=updater.getState();
+		if(state!=GithubSelfUpdater.UpdateState.NO_UPDATE && state!=GithubSelfUpdater.UpdateState.CHECKING)
+			getToolbar().getMenu().findItem(R.id.settings).setIcon(R.drawable.ic_settings_updateready_24px);
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		Nav.go(getActivity(), SettingsMainFragment.class, args);
+		int id=item.getItemId();
+		if(id==R.id.settings){
+			Nav.go(getActivity(), SettingsMainFragment.class, args);
+		}else if(id==R.id.edit_list){
+			args.putParcelable("list", Parcels.wrap(currentList));
+			Nav.go(getActivity(), EditListFragment.class, args);
+		}
 		return true;
 	}
 
@@ -147,7 +282,7 @@ public class HomeTimelineFragment extends StatusListFragment{
 	@Override
 	protected void onHidden(){
 		super.onHidden();
-		if(!data.isEmpty()){
+		if(!data.isEmpty() && listMode==ListMode.FOLLOWING){
 			String topPostID=displayItems.get(Math.max(0, list.getChildAdapterPosition(list.getChildAt(0))-getMainAdapterOffset())).parentID;
 			if(!topPostID.equals(lastSavedMarkerID)){
 				lastSavedMarkerID=topPostID;
@@ -183,8 +318,8 @@ public class HomeTimelineFragment extends StatusListFragment{
 		// we'll get the currently topmost post as last in the response. This way we know there's no gap
 		// between the existing and newly loaded parts of the timeline.
 		String sinceID=data.size()>1 ? data.get(1).id : "1";
-		currentRequest=new GetHomeTimeline(null, null, 20, sinceID)
-				.setCallback(new Callback<>(){
+		boolean needCache=listMode==ListMode.FOLLOWING;
+		loadAdditionalPosts(null, null, 20, sinceID, new Callback<>(){
 					@Override
 					public void onSuccess(List<Status> result){
 						currentRequest=null;
@@ -199,11 +334,13 @@ public class HomeTimelineFragment extends StatusListFragment{
 							result.get(result.size()-1).hasGapAfter=true;
 							toAdd=result;
 						}
-						AccountSessionManager.get(accountID).filterStatuses(toAdd, FilterContext.HOME);
+						if(needCache)
+							AccountSessionManager.get(accountID).filterStatuses(toAdd, FilterContext.HOME);
 						if(!toAdd.isEmpty()){
 							prependItems(toAdd, true);
 							showNewPostsButton();
-							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(toAdd, false);
+							if(needCache)
+								AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(toAdd, false);
 						}
 					}
 
@@ -212,8 +349,7 @@ public class HomeTimelineFragment extends StatusListFragment{
 						currentRequest=null;
 						dataLoading=false;
 					}
-				})
-				.exec(accountID);
+				});
 	}
 
 	@Override
@@ -225,10 +361,11 @@ public class HomeTimelineFragment extends StatusListFragment{
 		V.setVisibilityAnimated(item.text, View.GONE);
 		GapStatusDisplayItem gap=item.getItem();
 		dataLoading=true;
-		currentRequest=new GetHomeTimeline(item.getItemID(), null, 20, null)
-				.setCallback(new Callback<>(){
+		boolean needCache=listMode==ListMode.FOLLOWING;
+		loadAdditionalPosts(item.getItemID(), null, 20, null, new Callback<>(){
 					@Override
 					public void onSuccess(List<Status> result){
+
 						currentRequest=null;
 						dataLoading=false;
 						if(getActivity()==null)
@@ -242,7 +379,8 @@ public class HomeTimelineFragment extends StatusListFragment{
 							Status gapStatus=getStatusByID(gap.parentID);
 							if(gapStatus!=null){
 								gapStatus.hasGapAfter=false;
-								AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(gapStatus), false);
+								if(needCache)
+									AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(gapStatus), false);
 							}
 						}else{
 							Set<String> idsBelowGap=new HashSet<>();
@@ -254,7 +392,8 @@ public class HomeTimelineFragment extends StatusListFragment{
 								}else if(s.id.equals(gap.parentID)){
 									belowGap=true;
 									s.hasGapAfter=false;
-									AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(s), false);
+									if(needCache)
+										AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(s), false);
 								}else{
 									gapPostIndex++;
 								}
@@ -270,6 +409,8 @@ public class HomeTimelineFragment extends StatusListFragment{
 							}else{
 								result=result.subList(0, endIndex);
 							}
+							if(needCache)
+								AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.HOME);
 							List<StatusDisplayItem> targetList=displayItems.subList(gapPos, gapPos+1);
 							targetList.clear();
 							List<Status> insertedPosts=data.subList(gapPostIndex+1, gapPostIndex+1);
@@ -279,7 +420,6 @@ public class HomeTimelineFragment extends StatusListFragment{
 								targetList.addAll(buildDisplayItems(s));
 								insertedPosts.add(s);
 							}
-							AccountSessionManager.get(accountID).filterStatuses(insertedPosts, FilterContext.HOME);
 							if(targetList.isEmpty()){
 								// oops. We didn't add new posts, but at least we know there are none.
 								adapter.notifyItemRemoved(getMainAdapterOffset()+gapPos);
@@ -287,7 +427,8 @@ public class HomeTimelineFragment extends StatusListFragment{
 								adapter.notifyItemChanged(getMainAdapterOffset()+gapPos);
 								adapter.notifyItemRangeInserted(getMainAdapterOffset()+gapPos+1, targetList.size()-1);
 							}
-							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(insertedPosts, false);
+							if(needCache)
+								AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(insertedPosts, false);
 						}
 					}
 
@@ -304,9 +445,17 @@ public class HomeTimelineFragment extends StatusListFragment{
 								adapter.notifyItemChanged(gapPos);
 						}
 					}
-				})
-				.exec(accountID);
+				});
+	}
 
+	private void loadAdditionalPosts(String maxID, String minID, int limit, String sinceID, Callback<List<Status>> callback){
+		MastodonAPIRequest<List<Status>> req=switch(listMode){
+			case FOLLOWING -> new GetHomeTimeline(maxID, minID, limit, sinceID);
+			case LOCAL -> new GetPublicTimeline(true, false, maxID, minID, limit, sinceID);
+			case LIST -> new GetListTimeline(currentList.id, maxID, minID, limit, sinceID);
+		};
+		currentRequest=req;
+		req.setCallback(callback).exec(accountID);
 	}
 
 	@Override
@@ -320,42 +469,41 @@ public class HomeTimelineFragment extends StatusListFragment{
 	}
 
 	private void updateToolbarLogo(){
-		toolbarLogo=new ImageView(getActivity());
-		toolbarLogo.setScaleType(ImageView.ScaleType.CENTER);
-		toolbarLogo.setImageResource(R.drawable.logo);
-		toolbarLogo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
-
-		toolbarShowNewPostsBtn=new Button(getActivity());
-		toolbarShowNewPostsBtn.setTextAppearance(R.style.m3_title_medium);
-		toolbarShowNewPostsBtn.setTextColor(0xffffffff);
-		toolbarShowNewPostsBtn.setStateListAnimator(null);
-		toolbarShowNewPostsBtn.setBackgroundResource(R.drawable.bg_button_new_posts);
-		toolbarShowNewPostsBtn.setText(R.string.see_new_posts);
-		toolbarShowNewPostsBtn.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_fluent_arrow_up_16_filled, 0, 0, 0);
-		toolbarShowNewPostsBtn.setCompoundDrawableTintList(toolbarShowNewPostsBtn.getTextColors());
-		toolbarShowNewPostsBtn.setCompoundDrawablePadding(V.dp(8));
-		if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N)
-			UiUtils.fixCompoundDrawableTintOnAndroid6(toolbarShowNewPostsBtn);
-		toolbarShowNewPostsBtn.setOnClickListener(this::onNewPostsBtnClick);
-
-		if(newPostsBtnShown){
-			toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
-			toolbarLogo.setVisibility(View.INVISIBLE);
-			toolbarLogo.setAlpha(0f);
-		}else{
-			toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
-			toolbarShowNewPostsBtn.setAlpha(0f);
-			toolbarShowNewPostsBtn.setScaleX(.8f);
-			toolbarShowNewPostsBtn.setScaleY(.8f);
-			toolbarLogo.setVisibility(View.VISIBLE);
-		}
+		listsDropdown=new LinearLayout(getActivity());
+		listsDropdown.setOnClickListener(this::onListsDropdownClick);
+		listsDropdown.setBackgroundResource(R.drawable.bg_button_m3_text);
+		listsDropdown.setAccessibilityDelegate(new View.AccessibilityDelegate(){
+			@Override
+			public void onInitializeAccessibilityNodeInfo(@NonNull View host, @NonNull AccessibilityNodeInfo info){
+				super.onInitializeAccessibilityNodeInfo(host, info);
+				info.setClassName("android.widget.Spinner");
+			}
+		});
+		listsDropdownArrow=new FixedAspectRatioImageView(getActivity());
+		listsDropdownArrow.setUseHeight(true);
+		listsDropdownArrow.setImageResource(R.drawable.ic_arrow_drop_down_24px);
+		listsDropdownArrow.setScaleType(ImageView.ScaleType.CENTER);
+		listsDropdownArrow.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
+		listsDropdown.addView(listsDropdownArrow, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT));
+		listsDropdownText=new TextView(getActivity());
+		listsDropdownText.setTextAppearance(R.style.action_bar_title);
+		listsDropdownText.setSingleLine();
+		listsDropdownText.setEllipsize(TextUtils.TruncateAt.END);
+		listsDropdownText.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
+		listsDropdownText.setPaddingRelative(V.dp(4), 0, V.dp(16), 0);
+		listsDropdownText.setText(getCurrentListTitle());
+		listsDropdownArrow.setImageTintList(listsDropdownText.getTextColors());
+		listsDropdown.setBackgroundTintList(listsDropdownText.getTextColors());
+		listsDropdown.addView(listsDropdownText, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT));
 
 		FrameLayout logoWrap=new FrameLayout(getActivity());
-		logoWrap.addView(toolbarLogo, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER));
-		logoWrap.addView(toolbarShowNewPostsBtn, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, V.dp(32), Gravity.CENTER));
+		FrameLayout.LayoutParams ddlp=new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT, Gravity.START);
+		ddlp.topMargin=ddlp.bottomMargin=V.dp(8);
+		logoWrap.addView(listsDropdown, ddlp);
 
 		Toolbar toolbar=getToolbar();
-		toolbar.addView(logoWrap, new Toolbar.LayoutParams(Gravity.CENTER));
+		toolbar.addView(logoWrap, new Toolbar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+		toolbar.setContentInsetsRelative(V.dp(16), 0);
 	}
 
 	private void showNewPostsButton(){
@@ -365,20 +513,19 @@ public class HomeTimelineFragment extends StatusListFragment{
 		if(currentNewPostsAnim!=null){
 			currentNewPostsAnim.cancel();
 		}
-		toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
+		newPostsBtnWrap.setVisibility(View.VISIBLE);
 		AnimatorSet set=new AnimatorSet();
 		set.playTogether(
-				ObjectAnimator.ofFloat(toolbarLogo, View.ALPHA, 0f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, 1f)
+				ObjectAnimator.ofFloat(newPostsBtnWrap, View.ALPHA, 1f),
+				ObjectAnimator.ofFloat(newPostsBtnWrap, View.SCALE_X, 1f),
+				ObjectAnimator.ofFloat(newPostsBtnWrap, View.SCALE_Y, 1f),
+				ObjectAnimator.ofFloat(newPostsBtnWrap, View.TRANSLATION_Y, 0f)
 		);
-		set.setDuration(300);
-		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		set.setDuration(getResources().getInteger(R.integer.m3_sys_motion_duration_medium3));
+		set.setInterpolator(AnimationUtils.loadInterpolator(getActivity(), R.interpolator.m3_sys_motion_easing_standard_decelerate));
 		set.addListener(new AnimatorListenerAdapter(){
 			@Override
 			public void onAnimationEnd(Animator animation){
-				toolbarLogo.setVisibility(View.INVISIBLE);
 				currentNewPostsAnim=null;
 			}
 		});
@@ -393,20 +540,19 @@ public class HomeTimelineFragment extends StatusListFragment{
 		if(currentNewPostsAnim!=null){
 			currentNewPostsAnim.cancel();
 		}
-		toolbarLogo.setVisibility(View.VISIBLE);
 		AnimatorSet set=new AnimatorSet();
 		set.playTogether(
-				ObjectAnimator.ofFloat(toolbarLogo, View.ALPHA, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 0f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, .8f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, .8f)
+				ObjectAnimator.ofFloat(newPostsBtnWrap, View.ALPHA, 0f),
+				ObjectAnimator.ofFloat(newPostsBtnWrap, View.SCALE_X, .9f),
+				ObjectAnimator.ofFloat(newPostsBtnWrap, View.SCALE_Y, .9f),
+				ObjectAnimator.ofFloat(newPostsBtnWrap, View.TRANSLATION_Y, V.dp(-56))
 		);
-		set.setDuration(300);
-		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		set.setDuration(getResources().getInteger(R.integer.m3_sys_motion_duration_medium3));
+		set.setInterpolator(AnimationUtils.loadInterpolator(getActivity(), R.interpolator.m3_sys_motion_easing_standard_accelerate));
 		set.addListener(new AnimatorListenerAdapter(){
 			@Override
 			public void onAnimationEnd(Animator animation){
-				toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
+				newPostsBtnWrap.setVisibility(View.GONE);
 				currentNewPostsAnim=null;
 			}
 		});
@@ -421,6 +567,20 @@ public class HomeTimelineFragment extends StatusListFragment{
 		}
 	}
 
+	private void onListsDropdownClick(View v){
+		listsDropdownArrow.animate().rotation(-180f).setDuration(150).setInterpolator(CubicBezierInterpolator.DEFAULT).start();
+		dropdownController.show(dropdownMainMenuController);
+		AccountSessionManager.get(accountID).getCacheController().reloadLists(new Callback<>(){
+			@Override
+			public void onSuccess(java.util.List<FollowList> result){
+				lists=result;
+			}
+
+			@Override
+			public void onError(ErrorResponse error){}
+		});
+	}
+
 	@Override
 	public void onDestroyView(){
 		super.onDestroyView();
@@ -443,4 +603,67 @@ public class HomeTimelineFragment extends StatusListFragment{
 	protected boolean shouldRemoveAccountPostsWhenUnfollowing(){
 		return true;
 	}
+
+	@Override
+	public Toolbar getToolbar(){
+		return super.getToolbar();
+	}
+
+	@Override
+	public void onDropdownWillDismiss(){
+		listsDropdownArrow.animate().rotation(0f).setDuration(150).setInterpolator(CubicBezierInterpolator.DEFAULT).start();
+
+	}
+
+	@Override
+	public void onDropdownDismissed(){
+
+	}
+
+	@Override
+	public void reload(){
+		if(currentRequest!=null){
+			currentRequest.cancel();
+			currentRequest=null;
+		}
+		refreshing=true;
+		showProgress();
+		loadData();
+		listsDropdownText.setText(getCurrentListTitle());
+		invalidateOptionsMenu();
+	}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
+	@Override
+	protected void onDataLoaded(List<Status> d, boolean more){
+		if(refreshing){
+			if(listMode==ListMode.LOCAL){
+				localTimelineBannerHelper.maybeAddBanner(list, mergeAdapter);
+				localTimelineBannerHelper.onBannerBecameVisible();
+			}else{
+				localTimelineBannerHelper.removeBanner(mergeAdapter);
+			}
+		}
+		super.onDataLoaded(d, more);
+	}
+
+	private String getCurrentListTitle(){
+		return switch(listMode){
+			case FOLLOWING -> getString(R.string.timeline_following);
+			case LOCAL -> getString(R.string.local_timeline);
+			case LIST -> currentList.title;
+		};
+	}
+
+	private enum ListMode{
+		FOLLOWING,
+		LOCAL,
+		LIST
+	}
 }

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

@@ -0,0 +1,301 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.view.ActionMode;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.WindowInsets;
+import android.widget.ImageButton;
+
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
+import org.joinmastodon.android.api.requests.lists.GetListAccounts;
+import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
+import org.joinmastodon.android.events.AccountAddedToListEvent;
+import org.joinmastodon.android.events.AccountRemovedFromListEvent;
+import org.joinmastodon.android.fragments.account_list.AddListMembersFragment;
+import org.joinmastodon.android.fragments.account_list.PaginatedAccountListFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.viewmodel.AccountViewModel;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.ActionModeHelper;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+import org.parceler.Parcels;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+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.utils.V;
+
+public class ListMembersFragment extends PaginatedAccountListFragment{
+	private static final int ADD_MEMBER_RESULT=600;
+
+	private ImageButton fab;
+	private FollowList followList;
+	private boolean inSelectionMode;
+	private Set<String> selectedAccounts=new HashSet<>();
+	private ActionMode actionMode;
+	private MenuItem deleteItem;
+
+	public ListMembersFragment(){
+		setListLayoutId(R.layout.recycler_fragment_with_fab);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		followList=Parcels.unwrap(getArguments().getParcelable("list"));
+		setTitle(R.string.list_members);
+		setHasOptionsMenu(true);
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		E.unregister(this);
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetListAccounts(followList.id, maxID, count);
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		super.onConfigureViewHolder(holder);
+		holder.setStyle(inSelectionMode ? AccountViewHolder.AccessoryType.CHECKBOX : AccountViewHolder.AccessoryType.MENU, false);
+		holder.setOnClickListener(this::onItemClick);
+		holder.setOnLongClickListener(this::onItemLongClick);
+		holder.getContextMenu().getMenu().add(0, R.id.remove_from_list, 0, R.string.remove_from_list);
+		holder.setOnCustomMenuItemSelectedListener(item->onItemMenuItemSelected(holder, item));
+	}
+
+	@Override
+	protected void onBindViewHolder(AccountViewHolder holder){
+		super.onBindViewHolder(holder);
+		holder.setStyle(inSelectionMode ? AccountViewHolder.AccessoryType.CHECKBOX : AccountViewHolder.AccessoryType.MENU, false);
+		if(inSelectionMode){
+			holder.setChecked(selectedAccounts.contains(holder.getItem().account.id));
+		}
+	}
+
+	@Override
+	public boolean wantsLightStatusBar(){
+		if(actionMode!=null)
+			return UiUtils.isDarkTheme();
+		return super.wantsLightStatusBar();
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.selectable_list, menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		int id=item.getItemId();
+		if(id==R.id.select){
+			enterSelectionMode();
+		}else if(id==R.id.select_all){
+			for(AccountViewModel a:data){
+				selectedAccounts.add(a.account.id);
+			}
+			enterSelectionMode();
+		}
+		return true;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		fab=view.findViewById(R.id.fab);
+		fab.setImageResource(R.drawable.ic_add_24px);
+		fab.setContentDescription(getString(R.string.add_list_member));
+		fab.setOnClickListener(v->onFabClick());
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		super.onApplyWindowInsets(insets);
+		UiUtils.applyBottomInsetToFAB(fab, insets);
+	}
+
+	@Override
+	public void onFragmentResult(int reqCode, boolean success, Bundle result){
+		if(reqCode==ADD_MEMBER_RESULT && success){
+			Account acc=Objects.requireNonNull(Parcels.unwrap(result.getParcelable("selectedAccount")));
+			addAccounts(List.of(acc));
+		}
+	}
+
+	@Subscribe
+	public void onAccountRemovedFromList(AccountRemovedFromListEvent ev){
+		if(ev.accountID.equals(accountID) && ev.listID.equals(followList.id)){
+			removeAccountRows(Set.of(ev.targetAccountID));
+		}
+	}
+
+	@Subscribe
+	public void onAccountAddedToList(AccountAddedToListEvent ev){
+		if(ev.accountID.equals(accountID) && ev.listID.equals(followList.id)){
+			data.add(new AccountViewModel(ev.account, accountID));
+			list.getAdapter().notifyItemInserted(data.size()-1);
+		}
+	}
+
+	private void onFabClick(){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.goForResult(getActivity(), AddListMembersFragment.class, args, ADD_MEMBER_RESULT, this);
+	}
+
+	private void onItemClick(AccountViewHolder holder){
+		if(inSelectionMode){
+			String id=holder.getItem().account.id;
+			if(selectedAccounts.contains(id)){
+				selectedAccounts.remove(id);
+				holder.setChecked(false);
+			}else{
+				selectedAccounts.add(id);
+				holder.setChecked(true);
+			}
+			updateActionModeTitle();
+			deleteItem.setEnabled(!selectedAccounts.isEmpty());
+			return;
+		}
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("profileAccount", Parcels.wrap(holder.getItem().account));
+		Nav.go(getActivity(), ProfileFragment.class, args);
+	}
+
+	private boolean onItemLongClick(AccountViewHolder holder){
+		if(inSelectionMode)
+			return false;
+		selectedAccounts.add(holder.getItem().account.id);
+		enterSelectionMode();
+		return true;
+	}
+
+	private void onItemMenuItemSelected(AccountViewHolder holder, MenuItem item){
+		int id=item.getItemId();
+		if(id==R.id.remove_from_list){
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.confirm_remove_list_member)
+					.setPositiveButton(R.string.remove, (dlg, which)->removeAccounts(Set.of(holder.getItem().account.id)))
+					.setNegativeButton(R.string.cancel, null)
+					.show();
+		}
+	}
+
+	private void updateItemsForSelectionModeTransition(){
+		list.getAdapter().notifyItemRangeChanged(0, data.size());
+	}
+
+	private void enterSelectionMode(){
+		inSelectionMode=true;
+		updateItemsForSelectionModeTransition();
+		V.setVisibilityAnimated(fab, View.INVISIBLE);
+		actionMode=ActionModeHelper.startActionMode(this, ()->elevationOnScrollListener.getCurrentStatusBarColor(), new ActionMode.Callback(){
+			@Override
+			public boolean onCreateActionMode(ActionMode mode, Menu menu){
+				return true;
+			}
+
+			@Override
+			public boolean onPrepareActionMode(ActionMode mode, Menu menu){
+				mode.getMenuInflater().inflate(R.menu.settings_filter_words_action_mode, menu);
+				deleteItem=menu.findItem(R.id.delete);
+				return true;
+			}
+
+			@Override
+			public boolean onActionItemClicked(ActionMode mode, MenuItem item){
+				new M3AlertDialogBuilder(getActivity())
+						.setTitle(R.string.confirm_remove_list_members)
+						.setPositiveButton(R.string.remove, (dlg, which)->removeAccounts(new HashSet<>(selectedAccounts)))
+						.setNegativeButton(R.string.cancel, null)
+						.show();
+				return true;
+			}
+
+			@Override
+			public void onDestroyActionMode(ActionMode mode){
+				actionMode=null;
+				inSelectionMode=false;
+				selectedAccounts.clear();
+				updateItemsForSelectionModeTransition();
+				V.setVisibilityAnimated(fab, View.VISIBLE);
+			}
+		});
+		updateActionModeTitle();
+	}
+
+	private void updateActionModeTitle(){
+		actionMode.setTitle(getResources().getQuantityString(R.plurals.x_items_selected, selectedAccounts.size(), selectedAccounts.size()));
+	}
+
+	private void removeAccounts(Set<String> ids){
+		new RemoveAccountsFromList(followList.id, ids)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						if(inSelectionMode)
+							actionMode.finish();
+						removeAccountRows(ids);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+
+	private void addAccounts(Collection<Account> accounts){
+		new AddAccountsToList(followList.id, accounts.stream().map(a->a.id).collect(Collectors.toSet()))
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						for(Account acc:accounts){
+							data.add(new AccountViewModel(acc, accountID));
+						}
+						list.getAdapter().notifyItemRangeInserted(data.size()-accounts.size(), accounts.size());
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+
+	private void removeAccountRows(Set<String> ids){
+		for(int i=data.size()-1;i>=0;i--){
+			if(ids.contains(data.get(i).account.id)){
+				data.remove(i);
+				list.getAdapter().notifyItemRemoved(i);
+			}
+		}
+	}
+}

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

@@ -0,0 +1,61 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.timelines.GetListTimeline;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.Status;
+import org.parceler.Parcels;
+
+import java.util.List;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.SimpleCallback;
+
+public class ListTimelineFragment extends StatusListFragment{
+	private FollowList followList;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		followList=Parcels.unwrap(getArguments().getParcelable("list"));
+		setTitle(followList.title);
+		setHasOptionsMenu(true);
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetListTimeline(followList.id, offset>0 ? getMaxID() : null, null, count, null)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Status> result){
+						onDataLoaded(result, !result.isEmpty());
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.standalone_list_timeline, menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		int id=item.getItemId();
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("list", Parcels.wrap(followList));
+		if(id==R.id.members){
+			Nav.go(getActivity(), ListMembersFragment.class, args);
+		}else if(id==R.id.edit_list){
+			Nav.go(getActivity(), EditListFragment.class, args);
+		}
+		return true;
+	}
+}

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

@@ -0,0 +1,95 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.tags.GetFollowedTags;
+import org.joinmastodon.android.api.requests.tags.SetTagFollowed;
+import org.joinmastodon.android.fragments.settings.BaseSettingsFragment;
+import org.joinmastodon.android.model.Hashtag;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.viewmodel.ListItemWithOptionsMenu;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
+
+public class ManageFollowedHashtagsFragment extends BaseSettingsFragment<Hashtag> implements ListItemWithOptionsMenu.OptionsMenuListener<Hashtag>{
+	private String maxID;
+
+	public ManageFollowedHashtagsFragment(){
+		super(100);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.manage_hashtags);
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetFollowedTags(offset>0 ? maxID : null, count)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(HeaderPaginationList<Hashtag> result){
+						maxID=null;
+						if(result.nextPageUri!=null)
+							maxID=result.nextPageUri.getQueryParameter("max_id");
+						onDataLoaded(result.stream().map(t->{
+							int posts=t.getWeekPosts();
+							return new ListItemWithOptionsMenu<>(t.name, getResources().getQuantityString(R.plurals.x_posts_recently, posts, posts), ManageFollowedHashtagsFragment.this,
+									R.drawable.ic_tag_24px, ManageFollowedHashtagsFragment.this::onItemClick, t, false);
+						}).collect(Collectors.toList()), maxID!=null);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	public void onConfigureListItemOptionsMenu(ListItemWithOptionsMenu<Hashtag> item, Menu menu){
+		menu.clear();
+		menu.add(getString(R.string.unfollow_user, "#"+item.parentObject.name));
+	}
+
+	@Override
+	public void onListItemOptionSelected(ListItemWithOptionsMenu<Hashtag> item, MenuItem menuItem){
+		new M3AlertDialogBuilder(getActivity())
+				.setTitle(getString(R.string.unfollow_confirmation, "#"+item.parentObject.name))
+				.setPositiveButton(R.string.unfollow, (dlg, which)->doUnfollow(item))
+				.setNegativeButton(R.string.cancel, null)
+				.show();
+	}
+
+	private void onItemClick(ListItemWithOptionsMenu<Hashtag> item){
+		UiUtils.openHashtagTimeline(getActivity(), accountID, item.parentObject);
+	}
+
+	private void doUnfollow(ListItemWithOptionsMenu<Hashtag> item){
+		new SetTagFollowed(item.parentObject.name, false)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Hashtag result){
+						int index=data.indexOf(item);
+						if(index==-1)
+							return;
+						data.remove(index);
+						list.getAdapter().notifyItemRemoved(index);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+}

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

@@ -0,0 +1,199 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.WindowInsets;
+import android.widget.ImageButton;
+
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.DeleteList;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.ListCreatedEvent;
+import org.joinmastodon.android.events.ListDeletedEvent;
+import org.joinmastodon.android.events.ListUpdatedEvent;
+import org.joinmastodon.android.fragments.settings.BaseSettingsFragment;
+import org.joinmastodon.android.model.FollowList;
+import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.model.viewmodel.ListItemWithOptionsMenu;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.Comparator;
+import java.util.List;
+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.api.SimpleCallback;
+
+public class ManageListsFragment extends BaseSettingsFragment<FollowList> implements ListItemWithOptionsMenu.OptionsMenuListener<FollowList>{
+	private ImageButton fab;
+
+	public ManageListsFragment(){
+		setListLayoutId(R.layout.recycler_fragment_with_fab);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.manage_lists);
+		loadData();
+		setRefreshEnabled(true);
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		E.unregister(this);
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		Callback<List<FollowList>> callback=new SimpleCallback<>(this){
+			@Override
+			public void onSuccess(List<FollowList> result){
+				onDataLoaded(result.stream().map(ManageListsFragment.this::makeItem).collect(Collectors.toList()), false);
+			}
+		};
+		if(refreshing){
+			AccountSessionManager.get(accountID)
+					.getCacheController()
+					.reloadLists(callback);
+		}else{
+			AccountSessionManager.get(accountID)
+					.getCacheController()
+					.getLists(callback);
+		}
+	}
+
+	private ListItem<FollowList> makeItem(FollowList l){
+		return new ListItemWithOptionsMenu<>(l.title, null, ManageListsFragment.this, R.drawable.ic_list_alt_24px, ManageListsFragment.this::onListClick, l, false);
+	}
+
+	private void onListClick(ListItemWithOptionsMenu<FollowList> item){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("list", Parcels.wrap(item.parentObject));
+		Nav.go(getActivity(), ListTimelineFragment.class, args);
+	}
+
+	@Override
+	public void onConfigureListItemOptionsMenu(ListItemWithOptionsMenu<FollowList> item, Menu menu){
+		menu.add(0, R.id.edit, 0, R.string.edit_list);
+		menu.add(0, R.id.delete, 1, R.string.delete_list);
+	}
+
+	@Override
+	public void onListItemOptionSelected(ListItemWithOptionsMenu<FollowList> item, MenuItem menuItem){
+		int id=menuItem.getItemId();
+		if(id==R.id.edit){
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("list", Parcels.wrap(item.parentObject));
+			Nav.go(getActivity(), EditListFragment.class, args);
+		}else if(id==R.id.delete){
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.delete_list)
+					.setMessage(getString(R.string.delete_list_confirm, item.parentObject.title))
+					.setPositiveButton(R.string.delete, (dlg, which)->doDeleteList(item.parentObject))
+					.setNegativeButton(R.string.cancel, null)
+					.show();
+		}
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		fab=view.findViewById(R.id.fab);
+		fab.setImageResource(R.drawable.ic_add_24px);
+		fab.setContentDescription(getString(R.string.create_list));
+		fab.setOnClickListener(v->onFabClick());
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		super.onApplyWindowInsets(insets);
+		UiUtils.applyBottomInsetToFAB(fab, insets);
+	}
+
+	private void doDeleteList(FollowList list){
+		new DeleteList(list.id)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Void result){
+						for(int i=0;i<data.size();i++){
+							if(data.get(i).parentObject==list){
+								data.remove(i);
+								itemsAdapter.notifyItemRemoved(i);
+								AccountSessionManager.get(accountID).getCacheController().deleteList(list.id);
+								break;
+							}
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						Activity activity=getActivity();
+						if(activity==null)
+							return;
+						error.showToast(activity);
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, true)
+				.exec(accountID);
+	}
+
+	@Subscribe
+	public void onListUpdated(ListUpdatedEvent ev){
+		if(!ev.accountID.equals(accountID))
+			return;
+		for(ListItem<FollowList> item:data){
+			if(item.parentObject.id.equals(ev.list.id)){
+				item.parentObject=ev.list;
+				item.title=ev.list.title;
+				rebindItem(item);
+				break;
+			}
+		}
+	}
+
+	@Subscribe
+	public void onListDeleted(ListDeletedEvent ev){
+		if(!ev.accountID.equals(accountID))
+			return;
+		int i=0;
+		for(ListItem<FollowList> item:data){
+			if(item.parentObject.id.equals(ev.listID)){
+				data.remove(i);
+				itemsAdapter.notifyItemRemoved(i);
+				break;
+			}
+			i++;
+		}
+	}
+
+	@Subscribe
+	public void onListCreated(ListCreatedEvent ev){
+		if(!ev.accountID.equals(accountID))
+			return;
+		ListItem<FollowList> item=makeItem(ev.list);
+		data.add(item);
+		((List<ListItem<FollowList>>)data).sort(Comparator.comparing(l->l.parentObject.title));
+		itemsAdapter.notifyItemInserted(data.indexOf(item));
+	}
+
+	private void onFabClick(){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.go(getActivity(), CreateListFragment.class, args);
+	}
+}

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

@@ -5,6 +5,7 @@ import android.view.View;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ElevationOnScrollListener;
 
@@ -35,8 +36,15 @@ public abstract class MastodonRecyclerFragment<T> extends BaseRecyclerFragment<T
 	@CallSuper
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		if(wantsElevationOnScrollEffect())
-			list.addOnScrollListener(elevationOnScrollListener=new ElevationOnScrollListener((FragmentRootLinearLayout) view, getViewsForElevationEffect()));
+		if(wantsElevationOnScrollEffect()){
+			FragmentRootLinearLayout rootView;
+			if(view instanceof FragmentRootLinearLayout frl)
+				rootView=frl;
+			else
+				rootView=view.findViewById(R.id.appkit_loader_root);
+			list.addOnScrollListener(elevationOnScrollListener=new ElevationOnScrollListener(rootView, getViewsForElevationEffect()));
+		}
+		list.setItemAnimator(new BetterItemAnimator());
 		if(refreshLayout!=null){
 			int colorBackground=UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background);
 			int colorPrimary=UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary);

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

@@ -44,7 +44,7 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
 
 public class NotificationsListFragment extends BaseStatusListFragment<Notification>{
-	private boolean onlyMentions=true;
+	private boolean onlyMentions;
 	private String maxID;
 	private View tabBar;
 	private View mentionsTab, allTab;
@@ -58,9 +58,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		super.onCreate(savedInstanceState);
 		setLayout(R.layout.fragment_notifications);
 		E.register(this);
-		if(savedInstanceState!=null){
-			onlyMentions=savedInstanceState.getBoolean("onlyMentions", true);
-		}
+		onlyMentions=AccountSessionManager.get(accountID).isNotificationsMentionsOnly();
 		setHasOptionsMenu(true);
 	}
 
@@ -132,13 +130,9 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	protected void onShown(){
 		super.onShown();
 		unreadMarker=realUnreadMarker=AccountSessionManager.get(accountID).getLastKnownNotificationsMarker();
-		if(!dataLoading){
-			if(onlyMentions){
-				refresh();
-			}else{
-				reloadingFromCache=true;
-				refresh();
-			}
+		if(!dataLoading && canRefreshWithoutUpsettingUser()){
+			reloadingFromCache=true;
+			refresh();
 		}
 	}
 
@@ -221,12 +215,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		return views;
 	}
 
-	@Override
-	public void onSaveInstanceState(Bundle outState){
-		super.onSaveInstanceState(outState);
-		outState.putBoolean("onlyMentions", onlyMentions);
-	}
-
 	private Notification getNotificationByID(String id){
 		for(Notification n:data){
 			if(n.id.equals(id))
@@ -291,8 +279,10 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		allTab.setSelected(!onlyMentions);
 		maxID=null;
 		showProgress();
-		loadData(0, 20);
 		refreshing=true;
+		reloadingFromCache=true;
+		loadData(0, 20);
+		AccountSessionManager.get(accountID).setNotificationsMentionsOnly(onlyMentions);
 	}
 
 	@Override
@@ -312,7 +302,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		inflater.inflate(R.menu.notifications, menu);
 		markAllReadItem=menu.findItem(R.id.mark_all_read);
-		updateMarkAllReadButton();
 	}
 
 	@Override
@@ -325,12 +314,13 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	}
 
 	private void markAsRead(){
+		if(data.isEmpty())
+			return;
 		String id=data.get(0).id;
 		if(ObjectIdComparator.INSTANCE.compare(id, realUnreadMarker)>0){
 			new SaveMarkers(null, id).exec(accountID);
 			AccountSessionManager.get(accountID).setNotificationsMarker(id, true);
 			realUnreadMarker=id;
-			updateMarkAllReadButton();
 		}
 	}
 
@@ -348,10 +338,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		});
 	}
 
-	private void updateMarkAllReadButton(){
-		markAllReadItem.setEnabled(!data.isEmpty() && realUnreadMarker!=null && !realUnreadMarker.equals(data.get(0).id));
-	}
-
 	@Override
 	public void onAppendItems(List<Notification> items){
 		super.onAppendItems(items);
@@ -364,4 +350,20 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 			}
 		}
 	}
+
+	private boolean canRefreshWithoutUpsettingUser(){
+		// TODO maybe reload notifications the same way we reload the home timelines, i.e. with gaps and stuff
+		if(data.size()<=itemsPerPage)
+			return true;
+		for(int i=list.getChildCount()-1;i>=0;i--){
+			if(list.getChildViewHolder(list.getChildAt(i)) instanceof StatusDisplayItem.Holder<?> itemHolder){
+				String id=itemHolder.getItemID();
+				for(int j=0;j<data.size();j++){
+					if(data.get(j).id.equals(id))
+						return j<itemsPerPage; // Can refresh the list without losing scroll position if it is within the first page
+				}
+			}
+		}
+		return true;
+	}
 }

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

@@ -93,7 +93,7 @@ public class ProfileFeaturedFragment extends BaseStatusListFragment<SearchResult
 				args.putParcelable("profileAccount", Parcels.wrap(res.account));
 				Nav.go(getActivity(), ProfileFragment.class, args);
 			}
-			case HASHTAG -> UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag.name);
+			case HASHTAG -> UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag);
 			case STATUS -> {
 				Status status=res.status.getContentStatus();
 				Bundle args=new Bundle();

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

@@ -40,7 +40,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import android.widget.Toast;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.GlobalUserPreferences;
@@ -63,10 +62,12 @@ import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.SingleImagePhotoViewerListener;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
+import org.joinmastodon.android.ui.sheets.DecentralizationExplainerSheet;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
 import org.joinmastodon.android.ui.text.CustomEmojiSpan;
 import org.joinmastodon.android.ui.text.HtmlParser;
+import org.joinmastodon.android.ui.text.ImageSpanThatDoesNotBreakShitForNoGoodReason;
 import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.CoverImageView;
@@ -108,7 +109,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private ImageView avatar;
 	private CoverImageView cover;
 	private View avatarBorder;
-	private TextView name, username, bio, followersCount, followersLabel, followingCount, followingLabel;
+	private TextView name, username, usernameDomain, bio, followersCount, followersLabel, followingCount, followingLabel;
 	private ProgressBarButton actionButton;
 	private ViewPager2 pager;
 	private NestedRecyclerScrollView scrollView;
@@ -186,6 +187,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		avatarBorder=content.findViewById(R.id.avatar_border);
 		name=content.findViewById(R.id.name);
 		username=content.findViewById(R.id.username);
+		usernameDomain=content.findViewById(R.id.username_domain);
 		bio=content.findViewById(R.id.bio);
 		followersCount=content.findViewById(R.id.followers_count);
 		followersLabel=content.findViewById(R.id.followers_label);
@@ -245,15 +247,23 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		tabbar.setTabTextColors(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurfaceVariant), UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary));
 		tabbar.setTabTextSize(V.dp(14));
-		tabLayoutMediator=new TabLayoutMediator(tabbar, pager, new TabLayoutMediator.TabConfigurationStrategy(){
+		tabLayoutMediator=new TabLayoutMediator(tabbar, pager, (tab, position)->tab.setText(switch(position){
+			case 0 -> R.string.profile_featured;
+			case 1 -> R.string.profile_timeline;
+			case 2 -> R.string.profile_about;
+			default -> throw new IllegalStateException();
+		}));
+		tabbar.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener(){
 			@Override
-			public void onConfigureTab(@NonNull TabLayout.Tab tab, int position){
-				tab.setText(switch(position){
-					case 0 -> R.string.profile_featured;
-					case 1 -> R.string.profile_timeline;
-					case 2 -> R.string.profile_about;
-					default -> throw new IllegalStateException();
-				});
+			public void onTabSelected(TabLayout.Tab tab){}
+
+			@Override
+			public void onTabUnselected(TabLayout.Tab tab){}
+
+			@Override
+			public void onTabReselected(TabLayout.Tab tab){
+				if(getFragmentForPage(tab.getPosition()) instanceof ScrollableToTop stt)
+					stt.scrollToTop();
 			}
 		});
 
@@ -293,9 +303,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				username+="@"+AccountSessionManager.getInstance().getAccount(accountID).domain;
 			}
 			getActivity().getSystemService(ClipboardManager.class).setPrimaryClip(ClipData.newPlainText(null, "@"+username));
-			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.TIRAMISU || UiUtils.isMIUI()){ // Android 13+ SystemUI shows its own thing when you put things into the clipboard
-				Toast.makeText(getActivity(), R.string.text_copied, Toast.LENGTH_SHORT).show();
-			}
+			UiUtils.maybeShowTextCopiedToast(getActivity());
 			return true;
 		});
 
@@ -315,6 +323,8 @@ 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());
+
 		return sizeWrapper;
 	}
 
@@ -494,23 +504,22 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
 
 		if(account.locked){
-			ssb=new SpannableStringBuilder("@");
-			ssb.append(account.acct);
-			if(isSelf){
-				ssb.append('@');
-				ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain);
-			}
+			ssb=new SpannableStringBuilder(account.username);
 			ssb.append(" ");
 			Drawable lock=username.getResources().getDrawable(R.drawable.ic_lock_fill1_20px, getActivity().getTheme()).mutate();
 			lock.setBounds(0, 0, lock.getIntrinsicWidth(), lock.getIntrinsicHeight());
 			lock.setTint(username.getCurrentTextColor());
-			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BOTTOM), 0);
+			ssb.append(getString(R.string.manually_approves_followers), new ImageSpanThatDoesNotBreakShitForNoGoodReason(lock, ImageSpan.ALIGN_BOTTOM), 0);
 			username.setText(ssb);
 		}else{
-			// noinspection SetTextI18n
-			username.setText('@'+account.acct+(isSelf ? ('@'+AccountSessionManager.getInstance().getAccount(accountID).domain) : ""));
+			username.setText(account.username);
 		}
-		CharSequence parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
+		String domain=account.getDomain();
+		if(TextUtils.isEmpty(domain))
+			domain=AccountSessionManager.get(accountID).domain;
+		usernameDomain.setText(domain);
+
+		CharSequence parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID, account);
 		if(TextUtils.isEmpty(parsedBio)){
 			bio.setVisibility(View.GONE);
 		}else{
@@ -545,7 +554,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		fields.add(joined);
 
 		for(AccountField field:account.fields){
-			field.parsedValue=ssb=HtmlParser.parse(field.value, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
+			field.parsedValue=ssb=HtmlParser.parse(field.value, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID, account);
 			field.valueEmojis=ssb.getSpans(0, ssb.length(), CustomEmojiSpan.class);
 			ssb=new SpannableStringBuilder(field.name);
 			HtmlParser.parseCustomEmoji(ssb, account.emojis);
@@ -601,6 +610,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
 		else
 			menu.findItem(R.id.block_domain).setVisible(false);
+		menu.findItem(R.id.add_to_list).setVisible(relationship.following);
 	}
 
 	@Override
@@ -624,10 +634,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}else if(id==R.id.open_in_browser){
 			UiUtils.launchWebBrowser(getActivity(), account.url);
 		}else if(id==R.id.block_domain){
-			UiUtils.confirmToggleBlockDomain(getActivity(), accountID, account.getDomain(), relationship.domainBlocking, ()->{
+			UiUtils.confirmToggleBlockDomain(getActivity(), accountID, account, relationship.domainBlocking, ()->{
 				relationship.domainBlocking=!relationship.domainBlocking;
 				updateRelationship();
-			});
+			}, this::updateRelationship);
 		}else if(id==R.id.hide_boosts){
 			new SetAccountFollowed(account.id, true, !relationship.showingReblogs)
 					.setCallback(new Callback<>(){
@@ -654,6 +664,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}else if(id==R.id.save){
 			if(isInEditMode)
 				saveAndExitEditMode();
+		}else if(id==R.id.add_to_list){
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("targetAccount", Parcels.wrap(account));
+			Nav.go(getActivity(), AddAccountToListsFragment.class, args);
 		}
 		return true;
 	}
@@ -842,6 +857,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		aboutFragment.enterEditMode(account.source.fields);
 		refreshLayout.setEnabled(false);
 		editDirty=false;
+		V.setVisibilityAnimated(fab, View.GONE);
 	}
 
 	private void exitEditMode(){
@@ -884,6 +900,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		refreshLayout.setEnabled(true);
 
 		bindHeaderView();
+		V.setVisibilityAnimated(fab, View.VISIBLE);
 	}
 
 	private void saveAndExitEditMode(){
@@ -963,7 +980,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				return;
 			int radius=V.dp(25);
 			currentPhotoViewer=new PhotoViewer(getActivity(), createFakeAttachments(account.avatar, ava), 0,
-					new SingleImagePhotoViewerListener(avatar, avatarBorder, new int[]{radius, radius, radius, radius}, this, ()->currentPhotoViewer=null, ()->ava, null, null));
+					null, accountID, new SingleImagePhotoViewerListener(avatar, avatarBorder, new int[]{radius, radius, radius, radius}, this, ()->currentPhotoViewer=null, ()->ava, null, null));
 		}
 	}
 
@@ -975,7 +992,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			if(drawable==null || drawable instanceof ColorDrawable)
 				return;
 			currentPhotoViewer=new PhotoViewer(getActivity(), createFakeAttachments(account.header, drawable), 0,
-					new SingleImagePhotoViewerListener(cover, cover, null, this, ()->currentPhotoViewer=null, ()->drawable, ()->avatarBorder.setTranslationZ(2), ()->avatarBorder.setTranslationZ(0)));
+					null, accountID, new SingleImagePhotoViewerListener(cover, cover, null, this, ()->currentPhotoViewer=null, ()->drawable, ()->avatarBorder.setTranslationZ(2), ()->avatarBorder.setTranslationZ(0)));
 		}
 	}
 
@@ -1036,9 +1053,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		@NonNull
 		@Override
 		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			FrameLayout view=tabViews[viewType];
-			((ViewGroup)view.getParent()).removeView(view);
-			view.setVisibility(View.VISIBLE);
+			FrameLayout view=new FrameLayout(parent.getContext());
 			view.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 			return new SimpleViewHolder(view);
 		}
@@ -1046,8 +1061,13 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		@Override
 		public void onBindViewHolder(@NonNull SimpleViewHolder holder, int position){
 			Fragment fragment=getFragmentForPage(position);
+			FrameLayout fragmentView=tabViews[position];
+			fragmentView.setVisibility(View.VISIBLE);
+			if(fragmentView.getParent() instanceof ViewGroup parent)
+				parent.removeView(fragmentView);
+			((FrameLayout)holder.itemView).addView(fragmentView);
 			if(!fragment.isAdded()){
-				getChildFragmentManager().beginTransaction().add(holder.itemView.getId(), fragment).commit();
+				getChildFragmentManager().beginTransaction().add(fragmentView.getId(), fragment).commit();
 				holder.itemView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
 					@Override
 					public boolean onPreDraw(){

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

@@ -1,7 +1,12 @@
 package org.joinmastodon.android.fragments;
 
+import android.app.ProgressDialog;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,6 +16,8 @@ import android.widget.ProgressBar;
 
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonErrorResponse;
+import org.joinmastodon.android.api.requests.accounts.CheckInviteLink;
 import org.joinmastodon.android.api.requests.catalog.GetCatalogDefaultInstances;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.joinmastodon.android.fragments.onboarding.InstanceCatalogSignupFragment;
@@ -20,6 +27,7 @@ import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.catalog.CatalogDefaultInstance;
 import org.joinmastodon.android.ui.InterpolatingMotionEffect;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ProgressBarButton;
 import org.joinmastodon.android.ui.views.SizeListenerFrameLayout;
@@ -47,13 +55,15 @@ public class SplashFragment extends AppKitFragment{
 	private ProgressBarButton defaultServerButton;
 	private ProgressBar defaultServerProgress;
 	private String chosenDefaultServer=DEFAULT_SERVER;
-	private boolean loadingDefaultServer;
+	private boolean loadingDefaultServer, loadedDefaultServer;
+	private Uri currentInviteLink;
+	private ProgressDialog instanceLoadingProgress;
+	private String inviteCode;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		motionEffect=new InterpolatingMotionEffect(MastodonApp.context);
-		loadAndChooseDefaultServer();
 	}
 
 	@Nullable
@@ -101,6 +111,8 @@ public class SplashFragment extends AppKitFragment{
 				});
 			}
 		});
+		if(!loadedDefaultServer && !loadingDefaultServer)
+			loadAndChooseDefaultServer();
 
 		return contentView;
 	}
@@ -109,19 +121,65 @@ public class SplashFragment extends AppKitFragment{
 		Bundle extras=new Bundle();
 		boolean isSignup=v.getId()==R.id.btn_get_started;
 		extras.putBoolean("signup", isSignup);
+		extras.putString("defaultServer", chosenDefaultServer);
 		Nav.go(getActivity(), isSignup ? InstanceCatalogSignupFragment.class : InstanceChooserLoginFragment.class, extras);
 	}
 
 	private void onJoinDefaultServerClick(View v){
 		if(loadingDefaultServer)
 			return;
+		instanceLoadingProgress=new ProgressDialog(getActivity());
+		instanceLoadingProgress.setCancelable(false);
+		instanceLoadingProgress.setMessage(getString(R.string.loading_instance));
+		instanceLoadingProgress.show();
+		if(currentInviteLink!=null){
+			new CheckInviteLink(currentInviteLink.getPath())
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(CheckInviteLink.Response result){
+							inviteCode=result.inviteCode;
+							proceedWithServerDomain(currentInviteLink.getHost());
+						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							if(getActivity()==null)
+								return;
+							instanceLoadingProgress.dismiss();
+							instanceLoadingProgress=null;
+							if(error instanceof MastodonErrorResponse mer){
+								switch(mer.httpStatus){
+									case 401 -> new M3AlertDialogBuilder(getActivity())
+											.setTitle(R.string.expired_invite_link)
+											.setMessage(getString(R.string.expired_clipboard_invite_link_alert, currentInviteLink.getHost(), chosenDefaultServer))
+											.setPositiveButton(R.string.ok, null)
+											.show();
+									case 404 -> new M3AlertDialogBuilder(getActivity())
+											.setTitle(R.string.invalid_invite_link)
+											.setMessage(getString(R.string.invalid_clipboard_invite_link_alert, currentInviteLink.getHost(), chosenDefaultServer))
+											.setPositiveButton(R.string.ok, null)
+											.show();
+									default -> error.showToast(getActivity());
+								}
+							}
+						}
+					})
+					.execNoAuth(currentInviteLink.getHost());
+			return;
+		}
+		proceedWithServerDomain(chosenDefaultServer);
+	}
+
+	private void proceedWithServerDomain(String domain){
 		new GetInstance()
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Instance result){
 						if(getActivity()==null)
 							return;
-						if(!result.registrations){
+						instanceLoadingProgress.dismiss();
+						instanceLoadingProgress=null;
+						if(!result.registrations && TextUtils.isEmpty(inviteCode)){
 							new M3AlertDialogBuilder(getActivity())
 									.setTitle(R.string.error)
 									.setMessage(R.string.instance_signup_closed)
@@ -131,6 +189,8 @@ public class SplashFragment extends AppKitFragment{
 						}
 						Bundle args=new Bundle();
 						args.putParcelable("instance", Parcels.wrap(result));
+						if(inviteCode!=null)
+							args.putString("inviteCode", inviteCode);
 						Nav.go(getActivity(), InstanceRulesFragment.class, args);
 					}
 
@@ -138,11 +198,12 @@ public class SplashFragment extends AppKitFragment{
 					public void onError(ErrorResponse error){
 						if(getActivity()==null)
 							return;
+						instanceLoadingProgress.dismiss();
+						instanceLoadingProgress=null;
 						error.showToast(getActivity());
 					}
 				})
-				.wrapProgress(getActivity(), R.string.loading_instance, true)
-				.execNoAuth(chosenDefaultServer);
+				.execNoAuth(domain);
 	}
 
 	private void onLearnMoreClick(View v){
@@ -197,7 +258,18 @@ public class SplashFragment extends AppKitFragment{
 	}
 
 	private void loadAndChooseDefaultServer(){
-		loadingDefaultServer=true;
+		ClipData clipData=getActivity().getSystemService(ClipboardManager.class).getPrimaryClip();
+		if(clipData!=null && clipData.getItemCount()>0){
+			CharSequence clipText=clipData.getItemAt(0).coerceToText(getActivity());
+			if(HtmlParser.INVITE_LINK_PATTERN.matcher(clipText).find()){
+				currentInviteLink=Uri.parse(clipText.toString());
+				defaultServerButton.setText(getString(R.string.join_server_x_with_invite, currentInviteLink.getHost()));
+			}
+		}else{
+			loadingDefaultServer=true;
+			defaultServerButton.setTextVisible(false);
+			defaultServerProgress.setVisibility(View.VISIBLE);
+		}
 		new GetCatalogDefaultInstances()
 				.setCallback(new Callback<>(){
 					@Override
@@ -239,7 +311,8 @@ public class SplashFragment extends AppKitFragment{
 	private void setChosenDefaultServer(String domain){
 		chosenDefaultServer=domain;
 		loadingDefaultServer=false;
-		if(defaultServerButton!=null && getActivity()!=null){
+		loadedDefaultServer=true;
+		if(defaultServerButton!=null && getActivity()!=null && currentInviteLink==null){
 			defaultServerButton.setTextVisible(true);
 			defaultServerProgress.setVisibility(View.GONE);
 			defaultServerButton.setText(getString(R.string.join_default_server, chosenDefaultServer));

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

@@ -2,21 +2,27 @@ package org.joinmastodon.android.fragments;
 
 import android.content.res.ColorStateList;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusContext;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.FilterContext;
-import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusContext;
+import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.SpoilerStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.text.HtmlParser;
@@ -25,10 +31,12 @@ import org.parceler.Parcels;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.imageloader.ViewImageLoader;
+import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
@@ -36,10 +44,16 @@ import me.grishka.appkit.utils.V;
 public class ThreadFragment extends StatusListFragment{
 	private Status mainStatus;
 	private ImageView endMark;
+	private FrameLayout replyContainer;
+	private LinearLayout replyButton;
+	private ImageView replyButtonAva;
+	private TextView replyButtonText;
+	private int lastBottomInset;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
+		setLayout(R.layout.fragment_thread);
 		mainStatus=Parcels.unwrap(getArguments().getParcelable("status"));
 		Account inReplyToAccount=Parcels.unwrap(getArguments().getParcelable("inReplyToAccount"));
 		if(inReplyToAccount!=null)
@@ -61,8 +75,14 @@ public class ThreadFragment extends StatusListFragment{
 					text.textSelectable=true;
 				else if(item instanceof FooterStatusDisplayItem footer)
 					footer.hideCounts=true;
+				else if(item instanceof SpoilerStatusDisplayItem spoiler){
+					for(StatusDisplayItem subItem:spoiler.contentItems){
+						if(subItem instanceof TextStatusDisplayItem text)
+							text.textSelectable=true;
+					}
+				}
 			}
-			items.add(new ExtendedFooterStatusDisplayItem(s.id, this, s.getContentStatus()));
+			items.add(items.size()-1, new ExtendedFooterStatusDisplayItem(s.id, this, s.getContentStatus()));
 		}
 		return items;
 	}
@@ -119,6 +139,20 @@ public class ThreadFragment extends StatusListFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
+		replyContainer=view.findViewById(R.id.reply_button_wrapper);
+		replyButton=replyContainer.findViewById(R.id.reply_button);
+		replyButtonText=replyButton.findViewById(R.id.reply_btn_text);
+		replyButtonAva=replyButton.findViewById(R.id.avatar);
+		replyButton.setOutlineProvider(OutlineProviders.roundedRect(20));
+		replyButton.setClipToOutline(true);
+		replyButtonText.setText(getString(R.string.reply_to_user, mainStatus.account.displayName));
+		replyButtonAva.setOutlineProvider(OutlineProviders.OVAL);
+		replyButtonAva.setClipToOutline(true);
+		replyButton.setOnClickListener(v->openReply());
+		Account self=AccountSessionManager.get(accountID).self;
+		if(!TextUtils.isEmpty(self.avatar)){
+			ViewImageLoader.loadWithoutAnimation(replyButtonAva, getResources().getDrawable(R.drawable.image_placeholder), new UrlImageLoaderRequest(self.avatar, V.dp(24), V.dp(24)));
+		}
 		UiUtils.loadCustomEmojiInTextView(toolbarTitleView);
 		showContent();
 		if(!loaded)
@@ -168,4 +202,24 @@ public class ThreadFragment extends StatusListFragment{
 		}
 		super.onErrorRetryClick();
 	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		lastBottomInset=insets.getSystemWindowInsetBottom();
+		super.onApplyWindowInsets(UiUtils.applyBottomInsetToFixedView(replyContainer, insets));
+	}
+
+	private void openReply(){
+		maybeShowPreReplySheet(mainStatus, ()->{
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("replyTo", Parcels.wrap(mainStatus));
+			args.putBoolean("fromThreadFragment", true);
+			Nav.go(getActivity(), ComposeFragment.class, args);
+		});
+	}
+
+	public int getSnackbarOffset(){
+		return replyContainer.getHeight()-lastBottomInset;
+	}
 }

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

@@ -5,7 +5,9 @@ import android.text.TextUtils;
 import android.view.View;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.requests.search.GetSearchResults;
+import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.SearchResults;
 import org.joinmastodon.android.model.viewmodel.AccountViewModel;
 import org.joinmastodon.android.ui.SearchViewHelper;
@@ -13,13 +15,14 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
 import org.parceler.Parcels;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
 
-public class ComposeAccountSearchFragment extends BaseAccountListFragment{
-	private String currentQuery;
+public class AccountSearchFragment extends BaseAccountListFragment{
+	protected String currentQuery;
 	private boolean resultDelivered;
 	private SearchViewHelper searchViewHelper;
 
@@ -28,12 +31,11 @@ public class ComposeAccountSearchFragment extends BaseAccountListFragment{
 		super.onCreate(savedInstanceState);
 		setRefreshEnabled(false);
 		setEmptyText("");
-		dataLoaded();
 	}
 
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
-		searchViewHelper=new SearchViewHelper(getActivity(), getToolbarContext(), getString(R.string.search_hint));
+		searchViewHelper=new SearchViewHelper(getActivity(), getToolbarContext(), getSearchViewPlaceholder());
 		searchViewHelper.setListeners(this::onQueryChanged, null);
 		searchViewHelper.addDivider(contentView);
 		super.onViewCreated(view, savedInstanceState);
@@ -47,17 +49,25 @@ public class ComposeAccountSearchFragment extends BaseAccountListFragment{
 	@Override
 	protected void doLoadData(int offset, int count){
 		refreshing=true;
-		currentRequest=new GetSearchResults(currentQuery, GetSearchResults.Type.ACCOUNTS, false)
+		currentRequest=new GetSearchResults(currentQuery, GetSearchResults.Type.ACCOUNTS, false, null, 0, 0)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(SearchResults result){
-						setEmptyText(R.string.no_search_results);
-						onDataLoaded(result.accounts.stream().map(a->new AccountViewModel(a, accountID)).collect(Collectors.toList()), false);
+						AccountSearchFragment.this.onSuccess(result.accounts);
 					}
 				})
 				.exec(accountID);
 	}
 
+	protected void onSuccess(List<Account> result){
+		setEmptyText(R.string.no_search_results);
+		onDataLoaded(result.stream().map(a->new AccountViewModel(a, accountID)).collect(Collectors.toList()), false);
+	}
+
+	protected String getSearchViewPlaceholder(){
+		return getString(R.string.search_hint);
+	}
+
 	@Override
 	protected void onUpdateToolbar(){
 		super.onUpdateToolbar();

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

@@ -0,0 +1,37 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.SearchAccounts;
+import org.joinmastodon.android.model.Account;
+
+import java.util.List;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class AddListMembersFragment extends AccountSearchFragment{
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		dataLoaded();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		refreshing=true;
+		currentRequest=new SearchAccounts(currentQuery, 0, 0, false, true)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Account> result){
+						AddListMembersFragment.this.onSuccess(result);
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected String getSearchViewPlaceholder(){
+		return getString(R.string.search_among_people_you_follow);
+	}
+}

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

@@ -0,0 +1,125 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.annotation.SuppressLint;
+import android.content.res.TypedArray;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.widget.Button;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetAccountFollowing;
+import org.joinmastodon.android.api.requests.accounts.SearchAccounts;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.viewmodel.AccountViewModel;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.utils.V;
+
+@SuppressLint("ValidFragment") // This shouldn't be part of any saved states anyway
+public class AddNewListMembersFragment extends AccountSearchFragment{
+	private Listener listener;
+	private String maxID;
+
+	public AddNewListMembersFragment(Listener listener){
+		this.listener=listener;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		if(TextUtils.isEmpty(currentQuery)){
+			currentRequest=new GetAccountFollowing(AccountSessionManager.get(accountID).self.id, offset>0 ? maxID : null, count)
+					.setCallback(new SimpleCallback<>(this){
+						@Override
+						public void onSuccess(HeaderPaginationList<Account> result){
+							setEmptyText("");
+							onDataLoaded(result.stream().map(a->new AccountViewModel(a, accountID)).collect(Collectors.toList()), result.nextPageUri!=null);
+							maxID=result.getNextPageMaxID();
+						}
+					})
+					.exec(accountID);
+		}else{
+			refreshing=true;
+			currentRequest=new SearchAccounts(currentQuery, 0, 0, false, true)
+					.setCallback(new SimpleCallback<>(this){
+						@Override
+						public void onSuccess(List<Account> result){
+							AddNewListMembersFragment.this.onSuccess(result);
+						}
+					})
+					.exec(accountID);
+		}
+	}
+
+	@Override
+	protected String getSearchViewPlaceholder(){
+		return getString(R.string.search_among_people_you_follow);
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		holder.setStyle(AccountViewHolder.AccessoryType.CUSTOM_BUTTON, false);
+		holder.setOnLongClickListener(vh->false);
+		Button button=holder.getButton();
+		button.setPadding(V.dp(24), 0, V.dp(24), 0);
+		button.setMinimumWidth(0);
+		button.setMinWidth(0);
+		button.setOnClickListener(v->{
+			holder.setActionProgressVisible(true);
+			holder.itemView.setHasTransientState(true);
+			Runnable onDone=()->{
+				holder.setActionProgressVisible(false);
+				holder.itemView.setHasTransientState(false);
+				onBindViewHolder(holder);
+			};
+			AccountViewModel account=holder.getItem();
+			if(listener.isAccountInList(account)){
+				listener.removeAccountAccountFromList(account, onDone);
+			}else{
+				listener.addAccountToList(account, onDone);
+			}
+		});
+	}
+
+	@Override
+	protected void onBindViewHolder(AccountViewHolder holder){
+		Button button=holder.getButton();
+		int textRes, styleRes;
+		if(listener.isAccountInList(holder.getItem())){
+			textRes=R.string.remove;
+			styleRes=R.style.Widget_Mastodon_M3_Button_Tonal_Error;
+		}else{
+			textRes=R.string.add;
+			styleRes=R.style.Widget_Mastodon_M3_Button_Filled;
+		}
+		button.setText(textRes);
+		TypedArray ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
+		button.setBackground(ta.getDrawable(0));
+		ta.recycle();
+		ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.textColor});
+		button.setTextColor(ta.getColorStateList(0));
+		ta.recycle();
+	}
+
+	@Override
+	protected void loadRelationships(List<AccountViewModel> accounts){
+		// no-op
+	}
+
+	public interface Listener{
+		boolean isAccountInList(AccountViewModel account);
+		void addAccountToList(AccountViewModel account, Runnable onDone);
+		void removeAccountAccountFromList(AccountViewModel account, Runnable onDone);
+	}
+}

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

@@ -38,6 +38,7 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 	protected HashMap<String, Relationship> relationships=new HashMap<>();
 	protected String accountID;
 	protected ArrayList<APIRequest<?>> relationshipsRequests=new ArrayList<>();
+	protected int itemLayoutRes=R.layout.item_account_list;
 
 	public BaseAccountListFragment(){
 		super(40);
@@ -73,6 +74,8 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 
 	protected void loadRelationships(List<AccountViewModel> accounts){
 		Set<String> ids=accounts.stream().map(ai->ai.account.id).collect(Collectors.toSet());
+		if(ids.isEmpty())
+			return;
 		GetAccountRelationships req=new GetAccountRelationships(ids);
 		relationshipsRequests.add(req);
 		req.setCallback(new Callback<>(){
@@ -122,20 +125,9 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 		Toolbar toolbar=getToolbar();
 		if(toolbar!=null && toolbar.getNavigationIcon()!=null){
 			toolbar.setNavigationContentDescription(R.string.back);
-			if(hasSubtitle()){
-				toolbar.setTitleTextAppearance(getActivity(), R.style.m3_title_medium);
-				toolbar.setSubtitleTextAppearance(getActivity(), R.style.m3_body_medium);
-				int color=UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary);
-				toolbar.setTitleTextColor(color);
-				toolbar.setSubtitleTextColor(color);
-			}
 		}
 	}
 
-	protected boolean hasSubtitle(){
-		return true;
-	}
-
 	@Override
 	public void onApplyWindowInsets(WindowInsets insets){
 		if(Build.VERSION.SDK_INT>=29 && insets.getTappableElementInsets().bottom==0){
@@ -150,6 +142,7 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 	}
 
 	protected void onConfigureViewHolder(AccountViewHolder holder){}
+	protected void onBindViewHolder(AccountViewHolder holder){}
 
 	protected class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
 		public AccountsAdapter(){
@@ -159,7 +152,7 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 		@NonNull
 		@Override
 		public AccountViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			AccountViewHolder holder=new AccountViewHolder(BaseAccountListFragment.this, parent, relationships);
+			AccountViewHolder holder=new AccountViewHolder(BaseAccountListFragment.this, parent, relationships, itemLayoutRes);
 			onConfigureViewHolder(holder);
 			return holder;
 		}
@@ -167,6 +160,7 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 		@Override
 		public void onBindViewHolder(AccountViewHolder holder, int position){
 			holder.bind(data.get(position));
+			BaseAccountListFragment.this.onBindViewHolder(holder);
 			super.onBindViewHolder(holder, position);
 		}
 

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

@@ -14,8 +14,4 @@ public abstract class StatusRelatedAccountListFragment extends PaginatedAccountL
 		status=Parcels.unwrap(getArguments().getParcelable("status"));
 	}
 
-	@Override
-	protected boolean hasSubtitle(){
-		return false;
-	}
 }

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

@@ -49,7 +49,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	private DiscoverNewsFragment newsFragment;
 	private DiscoverAccountsFragment accountsFragment;
 	private SearchFragment searchFragment;
-	private LocalTimelineFragment localTimelineFragment;
 
 	private String accountID;
 	private String currentQuery;
@@ -71,15 +70,14 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
 
-		tabViews=new FrameLayout[5];
+		tabViews=new FrameLayout[4];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			tabView.setId(switch(i){
 				case 0 -> R.id.discover_posts;
 				case 1 -> R.id.discover_hashtags;
 				case 2 -> R.id.discover_news;
-				case 3 -> R.id.discover_local_timeline;
-				case 4 -> R.id.discover_users;
+				case 3 -> R.id.discover_users;
 				default -> throw new IllegalStateException("Unexpected value: "+i);
 			});
 			tabView.setVisibility(View.GONE);
@@ -122,12 +120,8 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			accountsFragment=new DiscoverAccountsFragment();
 			accountsFragment.setArguments(args);
 
-			localTimelineFragment=new LocalTimelineFragment();
-			localTimelineFragment.setArguments(args);
-
 			getChildFragmentManager().beginTransaction()
 					.add(R.id.discover_posts, postsFragment)
-					.add(R.id.discover_local_timeline, localTimelineFragment)
 					.add(R.id.discover_hashtags, hashtagsFragment)
 					.add(R.id.discover_news, newsFragment)
 					.add(R.id.discover_users, accountsFragment)
@@ -141,8 +135,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 					case 0 -> R.string.posts;
 					case 1 -> R.string.hashtags;
 					case 2 -> R.string.news;
-					case 3 -> R.string.local_timeline;
-					case 4 -> R.string.for_you;
+					case 3 -> R.string.for_you;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 			}
@@ -245,8 +238,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			case 0 -> postsFragment;
 			case 1 -> hashtagsFragment;
 			case 2 -> newsFragment;
-			case 3 -> localTimelineFragment;
-			case 4 -> accountsFragment;
+			case 3 -> accountsFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}
@@ -280,15 +272,19 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		@NonNull
 		@Override
 		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			FrameLayout view=tabViews[viewType];
-			((ViewGroup)view.getParent()).removeView(view);
-			view.setVisibility(View.VISIBLE);
+			FrameLayout view=new FrameLayout(parent.getContext());
 			view.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 			return new SimpleViewHolder(view);
 		}
 
 		@Override
-		public void onBindViewHolder(@NonNull SimpleViewHolder holder, int position){}
+		public void onBindViewHolder(@NonNull SimpleViewHolder holder, int position){
+			FrameLayout view=tabViews[position];
+			if(view.getParent() instanceof ViewGroup parent)
+				parent.removeView(view);
+			view.setVisibility(View.VISIBLE);
+			((FrameLayout)holder.itemView).addView(view, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+		}
 
 		@Override
 		public int getItemCount(){

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

@@ -3,7 +3,9 @@ package org.joinmastodon.android.fragments.discover;
 import android.os.Bundle;
 
 import org.joinmastodon.android.api.requests.trends.GetTrendingStatuses;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.StatusListFragment;
+import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
 
@@ -15,6 +17,7 @@ import me.grishka.appkit.utils.MergeRecyclerAdapter;
 
 public class DiscoverPostsFragment extends StatusListFragment{
 	private DiscoverInfoBannerHelper bannerHelper;
+	private int realOffset=0;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -24,10 +27,12 @@ public class DiscoverPostsFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetTrendingStatuses(offset, count)
+		currentRequest=new GetTrendingStatuses(offset==0 ? 0 : realOffset, count)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
+						realOffset+=result.size();
+						AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.PUBLIC);
 						onDataLoaded(result, !result.isEmpty());
 						bannerHelper.onBannerBecameVisible();
 					}

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

@@ -1,54 +0,0 @@
-package org.joinmastodon.android.fragments.discover;
-
-import android.os.Bundle;
-import android.view.View;
-
-import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.StatusListFragment;
-import org.joinmastodon.android.model.FilterContext;
-import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
-
-import java.util.List;
-
-import androidx.recyclerview.widget.RecyclerView;
-import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.utils.MergeRecyclerAdapter;
-
-public class LocalTimelineFragment extends StatusListFragment{
-	private DiscoverInfoBannerHelper bannerHelper;
-
-	private String maxID;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState){
-		super.onCreate(savedInstanceState);
-		bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.LOCAL_TIMELINE, accountID);
-	}
-
-	@Override
-	protected void doLoadData(int offset, int count){
-		currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, count)
-				.setCallback(new SimpleCallback<>(this){
-					@Override
-					public void onSuccess(List<Status> result){
-						if(!result.isEmpty())
-							maxID=result.get(result.size()-1).id;
-						boolean empty=result.isEmpty();
-						AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.PUBLIC);
-						onDataLoaded(result, !empty);
-						bannerHelper.onBannerBecameVisible();
-					}
-				})
-				.exec(accountID);
-	}
-
-	@Override
-	protected RecyclerView.Adapter getAdapter(){
-		MergeRecyclerAdapter adapter=new MergeRecyclerAdapter();
-		bannerHelper.maybeAddBanner(list, adapter);
-		adapter.addAdapter(super.getAdapter());
-		return adapter;
-	}
-}

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

@@ -3,7 +3,6 @@ package org.joinmastodon.android.fragments.discover;
 import android.app.Activity;
 import android.os.Build;
 import android.os.Bundle;
-import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
 import org.joinmastodon.android.R;
@@ -20,7 +19,6 @@ import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.AccountStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HashtagStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
@@ -28,13 +26,13 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
-import java.util.Objects;
+import java.util.Set;
 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.utils.V;
+import me.grishka.appkit.api.SimpleCallback;
 
 public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 	private String currentQuery;
@@ -94,7 +92,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 				args.putParcelable("profileAccount", Parcels.wrap(res.account));
 				Nav.go(getActivity(), ProfileFragment.class, args);
 			}
-			case HASHTAG -> UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag.name);
+			case HASHTAG -> UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag);
 			case STATUS -> {
 				Status status=res.status.getContentStatus();
 				Bundle args=new Bundle();
@@ -110,7 +108,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 	}
 
 	@Override
-	protected void doLoadData(int offset, int count){
+	protected void doLoadData(int _offset, int count){
 		GetSearchResults.Type type;
 		if(currentFilter.size()==1){
 			type=switch(currentFilter.iterator().next()){
@@ -125,8 +123,22 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 			dataLoaded();
 			return;
 		}
-		currentRequest=new GetSearchResults(currentQuery, type, true)
-				.setCallback(new Callback<>(){
+		String maxID=null;
+		// TODO server-side bug
+		/*int offset=0;
+		if(_offset>0){
+			if(type==GetSearchResults.Type.STATUSES){
+				if(!preloadedData.isEmpty())
+					maxID=preloadedData.get(preloadedData.size()-1).status.id;
+				else if(!data.isEmpty())
+					maxID=data.get(data.size()-1).status.id;
+			}else{
+				offset=_offset;
+			}
+		}*/
+		int offset=_offset;
+		currentRequest=new GetSearchResults(currentQuery, type, type==null, maxID, offset, type==null ? 0 : count)
+				.setCallback(new SimpleCallback<SearchResults>(this){
 					@Override
 					public void onSuccess(SearchResults result){
 						ArrayList<SearchResult> results=new ArrayList<>();
@@ -139,21 +151,18 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 								results.add(new SearchResult(tag));
 						}
 						if(result.statuses!=null){
-							for(Status status:result.statuses)
-								results.add(new SearchResult(status));
+							Set<String> alreadyLoadedStatuses=data.stream().filter(r->r.type==SearchResult.Type.STATUS).map(r->r.status.id).collect(Collectors.toSet());
+							for(Status status:result.statuses){
+								if(!alreadyLoadedStatuses.contains(status.id))
+									results.add(new SearchResult(status));
+							}
 						}
 						prevDisplayItems=new ArrayList<>(displayItems);
 						unfilteredResults=results;
-						onDataLoaded(filterSearchResults(results), false);
-					}
-
-					@Override
-					public void onError(ErrorResponse error){
-						currentRequest=null;
-						Activity a=getActivity();
-						if(a==null)
-							return;
-						error.showToast(a);
+						boolean wasRefreshing=refreshing;
+						onDataLoaded(filterSearchResults(results), type!=null && !results.isEmpty());
+						if(wasRefreshing)
+							list.scrollToPosition(0);
 					}
 				})
 				.exec(accountID);

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

@@ -43,9 +43,7 @@ import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
 import org.joinmastodon.android.ui.viewholders.SimpleListItemViewHolder;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -114,14 +112,14 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 				onDataLoaded(results.stream().map(sr->{
 					SearchResultViewModel vm=new SearchResultViewModel(sr, accountID, true);
 					if(sr.type==SearchResult.Type.HASHTAG){
-						vm.hashtagItem.onClick=()->openHashtag(sr);
+						vm.hashtagItem.setOnClick(i->openHashtag(sr));
 					}
 					return vm;
 				}).collect(Collectors.toList()), false);
 				recentsHeader.setVisible(!data.isEmpty());
 			});
 		}else{
-			currentRequest=new GetSearchResults(currentQuery, null, false)
+			currentRequest=new GetSearchResults(currentQuery, null, false, null, 0, 0)
 					.limit(2)
 					.setCallback(new SimpleCallback<>(this){
 						@Override
@@ -131,7 +129,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 									.map(sr->{
 										SearchResultViewModel vm=new SearchResultViewModel(sr, accountID, false);
 										if(sr.type==SearchResult.Type.HASHTAG){
-											vm.hashtagItem.onClick=()->openHashtag(sr);
+											vm.hashtagItem.setOnClick(i->openHashtag(sr));
 										}
 										return vm;
 									})
@@ -377,7 +375,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 	}
 
 	private void openHashtag(SearchResult res){
-		UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag.name);
+		UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag);
 		AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putRecentSearch(res);
 	}
 
@@ -386,21 +384,23 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 	}
 
 	private void onSearchViewEnter(){
+		if(TextUtils.isEmpty(currentQuery) || currentQuery.trim().isEmpty())
+			return;
 		deliverResult(currentQuery, null);
 	}
 
-	private void onOpenURLClick(){
+	private void onOpenURLClick(ListItem<?> item_){
 		((MainActivity)getActivity()).handleURL(Uri.parse(searchViewHelper.getQuery()), accountID);
 	}
 
-	private void onGoToHashtagClick(){
+	private void onGoToHashtagClick(ListItem<?> item_){
 		String q=searchViewHelper.getQuery();
 		if(q.startsWith("#"))
 			q=q.substring(1);
 		UiUtils.openHashtagTimeline(getActivity(), accountID, q);
 	}
 
-	private void onGoToAccountClick(){
+	private void onGoToAccountClick(ListItem<?> item_){
 		String q=searchViewHelper.getQuery();
 		if(!q.startsWith("@")){
 			q="@"+q;
@@ -408,14 +408,14 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 		if(q.lastIndexOf('@')==0){
 			q+="@"+AccountSessionManager.get(accountID).domain;
 		}
-		((MainActivity)getActivity()).openSearchQuery(q, accountID, R.string.loading, true);
+		((MainActivity)getActivity()).openSearchQuery(q, accountID, R.string.loading, true, GetSearchResults.Type.ACCOUNTS);
 	}
 
-	private void onGoToStatusSearchClick(){
+	private void onGoToStatusSearchClick(ListItem<?> item_){
 		deliverResult(searchViewHelper.getQuery(), SearchResult.Type.STATUS);
 	}
 
-	private void onGoToAccountSearchClick(){
+	private void onGoToAccountSearchClick(ListItem<?> item_){
 		deliverResult(searchViewHelper.getQuery(), SearchResult.Type.ACCOUNT);
 	}
 

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

@@ -105,7 +105,7 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
 
 		@Override
 		public void onClick(){
-			UiUtils.openHashtagTimeline(getActivity(), accountID, item.name);
+			UiUtils.openHashtagTimeline(getActivity(), accountID, item);
 		}
 	}
 }

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

@@ -24,7 +24,7 @@ import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.settings.SettingsMainFragment;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.ui.AccountSwitcherSheet;
+import org.joinmastodon.android.ui.sheets.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.io.File;
@@ -165,9 +165,7 @@ public class AccountActivationFragment extends ToolbarFragment{
 	private void tryGetAccount(){
 		if(AccountSessionManager.getInstance().tryGetAccount(accountID)==null){
 			uiHandler.removeCallbacks(pollRunnable);
-			getActivity().finish();
-			Intent intent=new Intent(getActivity(), MainActivity.class);
-			startActivity(intent);
+			((MainActivity)getActivity()).restartHomeFragment();
 			return;
 		}
 		currentRequest=new GetOwnAccount()

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

@@ -137,6 +137,9 @@ public class GoogleMadeMeAddThisFragment extends ToolbarFragment{
 	protected void onButtonClick(){
 		Bundle args=new Bundle();
 		args.putParcelable("instance", Parcels.wrap(instance));
+		if(getArguments().containsKey("inviteCode")){
+			args.putString("inviteCode", getArguments().getString("inviteCode"));
+		}
 		Nav.goForResult(getActivity(), SignupFragment.class, args, SIGNUP_REQUEST, this);
 	}