From 15c1676d0bdf404e934cf1451dcb77b370329555 Mon Sep 17 00:00:00 2001 From: Kuro Date: Thu, 3 Aug 2023 15:28:27 +0200 Subject: [PATCH 1/8] Removed mentionings of reddit in english and german and a few mentionings in other languages. --- app/src/main/res/values-cs/strings.xml | 4 +- app/src/main/res/values-de/strings.xml | 84 +++++++++++----------- app/src/main/res/values-es/strings.xml | 4 +- app/src/main/res/values-fr/strings.xml | 8 +-- app/src/main/res/values-hi/strings.xml | 2 +- app/src/main/res/values-hr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 8 +-- app/src/main/res/values-ja/strings.xml | 4 +- app/src/main/res/values-nl/strings.xml | 8 +-- app/src/main/res/values-pl/strings.xml | 4 +- app/src/main/res/values-pt-rBR/strings.xml | 8 +-- app/src/main/res/values-pt/strings.xml | 4 +- app/src/main/res/values-ro/strings.xml | 4 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-tr-rTR/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values/strings.xml | 66 ++++++++--------- 20 files changed, 111 insertions(+), 111 deletions(-) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d6d2e77b..fd5bce4a 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -380,8 +380,8 @@ "docilealligator.app@gmail.com" "Reddit účet" "u/Hostilenemy" - "Subreddit" - "r/Infinity_For_Reddit" + Community + !infinityforlemmy@lemdro.id "Sdílet" "Pokud máte rádi tuto aplikaci, sdílejte ji s ostatními lidmi" "Infinity pro Reddit" diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3ed48e2e..50eec8f2 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -17,14 +17,14 @@ "Posteingang" "Einstellungen" "Gespeichert" - "Multireddit erstellen" - "Multireddits auswählen" + Multicommunity erstellen + Multicommunity auswählen "Benutzerdefinierte Themen" "Thema anpassen" "Thema erstellen" "Thema-Vorschau" - "Multireddit bearbeiten" - "Ausgewählte Subreddits" + Multicommunity bearbeiten + Ausgewählte Communities "Melden" "Bild %1$d/%2$d" "Video %1$d/%2$d" @@ -55,8 +55,8 @@ "Flair bearbeiten" "Beitragslayout ändern" "Speichern" - "Multireddit bearbeiten" - "Multireddit löschen" + Multicommunity bearbeiten + Multicommunity löschen "Teilen" "Vorschau" "Melden" @@ -83,7 +83,7 @@ Tippen für Neuversuch." "Keine Kommentare gefunden" "Keine Subreddits gefunden" "Keine Benutzer gefunden" - "Keine Multireddits gefunden" + Keine Multicommunities gefunden "Keine Speicherberechtigung, um diese Datei zu speichern" "Fehler beim Laden der Kommentare. Tippen für Neuversuch." @@ -104,7 +104,7 @@ Tippen für Neuversuch." "Seit:" "Profil" "Abonnements" - "Multireddit" + Multicommunity "Posteingang" "Upgevotet" "Downgevotet" @@ -117,7 +117,7 @@ Tippen für Neuversuch." "Kann Subredddit-Info nicht abrufen" "Kann Benutzer-Info nicht abrufen" "Kann Seitenleiste nicht abrufen" - "Kann Multireddit-Info nicht abrufen" + Kann Multicommunity-Info nicht abrufen "Abonnieren" "Deabonnieren" "Abonniert" @@ -171,9 +171,9 @@ Tippen für Neuversuch." "Wähle ein Subreddit" "Regeln" "URL" - "Subreddits" + Communities "Benutzer" - "Multireddits" + MultiCommunity "Text" "Link" "Bild" @@ -408,10 +408,10 @@ Tippen für Neuversuch." "Gib mir eine 5-Stern-Bewertung und mach mich richtig glücklich" "E-Mail" "docilealligator.app@gmail.com" - "Reddit-Konto" - "u/Hostilenemy" - "Subreddit" - "r/Infinity_For_Reddit" + Lemmy-Konto + \@bazsalanszky@lemmy.toldi.eu + Community + !infinityforlemmy@lemdro.id "Teilen" "Teile diese App mit anderen Leuten, wenn sie dir gefällt" "Infinity For Reddit" @@ -434,10 +434,10 @@ Tippen für Neuversuch." "Reiter 3" "Titel" "Typ" - "Subreddit-Name (ohne r/ Präfix)" + Community-Name (ohne r/ Präfix) - "Multireddit-Name (/user/DeinBenutzername/m/DeinMultiredditName)" + Multicommunity-Name (/user/DeinBenutzername/m/DeinMulticommunityName) "Benutzername (ohne u/ Präfix)" "Es gibt hier keine Entwickleroptionen" "Konnte den Link nicht abrufen" @@ -475,8 +475,8 @@ Tippen für Neuversuch." "%1$d Monate" "1 Jahr" "%1$d Jahre" - "Fehler beim Abrufen der Multireddit-Daten" - "Kann Multireddits nicht synchronisieren" + Fehler beim Abrufen der Multicommunity-Daten + Kann Multicommunities nicht synchronisieren "Kann Abonnements nicht synchronisieren" "Schau dir Infinity for Reddit an, ein super Reddit-Client! https://play.google.com/store/apps/details?id=eu.toldi.infinityforlemmy" @@ -506,9 +506,9 @@ https://play.google.com/store/apps/details?id=eu.toldi.infinityforlemmy""Beschreibung" "Privat" "Wo ist der Name?" - "Kann dieses Multireddit nicht erstellen" - "Dieses Multireddit existiert bereits" - "Kann dieses Multireddit nicht bearbeiten" + Kann dieses Multicommunity nicht erstellen + Dieses Multicommunity existiert bereits + Kann diese Multicommunity nicht bearbeiten "Löschen erfolgreich" "Löschen fehlgeschlagen" "Bist du sicher?" @@ -745,7 +745,7 @@ Basiere auf Indigo-AMOLED-Thema" "Alle Einstellungen erfolgreich gelöscht" "u/Hostilenemy" - "r/Infinity_For_Reddit" + !infinityforlemmy@lemdro.id "Primärer Text" "Sekundärer Text" "Dies ist ein Beitrag" @@ -756,8 +756,8 @@ Basiere auf Indigo-AMOLED-Thema" "Autor-Flair" "Ich habe für meine Freundin eine “Gute Besserung“-Karte besorgt. Sie ist nicht krank oder so, aber sie könnte sich definitiv bessern." - "Multireddit bearbeiten" - "Multireddit löschen" + Multicommunity bearbeiten + Multicommunity löschen "%1$d Auszeichnungen" "1 Auszeichnung" "Melden" @@ -822,7 +822,7 @@ Beispiel: DeinPasswort:123456" "Mehr Reiter" "Die folgenden Optionen zu aktivieren, kann zu ungewollten Verhalten führen: Reiter könnten den Inhalt verlieren, wenn zu anderen gewechselt wird. Selbes Verhalten wie beim Neuladen der Seite." - "Favoriten der abonnierten Subreddits anzeigen" + Favoriten der abonnierten Communities anzeigen "Abonnierte Subreddits anzeigen" "Downloadpfad" "Downloadpfad für Bilder" @@ -855,7 +855,7 @@ Reiter könnten den Inhalt verlieren, wenn zu anderen gewechselt wird. Selbes Ve "Im Datensparmodus: Vorschaubilder haben eine geringere Auflösung. -Reddit-Videos haben eine geringere Auflösung. +Lemmy-Videos haben eine geringere Auflösung. Automatisches Abspielen von Videos ist deaktiviert." "Übersetzung" "Übersetze diese App auf POEditor. Danke an alle Beitragenden." @@ -933,10 +933,10 @@ Nachricht: %2$s" "Gefilterte Beiträge" "Beitragsfilter" "Benutzer" - "Wähle ein Multireddit" + Wähle eine Multicommunity "In der Datenbank speichern" "Alle Nachrichten lesen" - "Zum Multireddit hinzufügen" + Zum Multicommunity hinzufügen "Subreddits durchsuchen" "Benutzer durchsuchen" "GIF" @@ -995,19 +995,19 @@ Nachricht: %2$s" "Benutzer" - "Multireddit: %1$s" + Multicommunity: %1$s - "Multireddit" + Multicommunity "Suche" "Subreddit" "Benutzer" - "Leer lassen, um diesen Beitragsfilter auf alle Subreddits / Benutzer / Multireddits anzuwenden" + Leer lassen, um diesen Beitragsfilter auf alle Subreddits / Benutzer / Multicommunities anzuwenden "Du machst das zu oft hintereinander. Versuche es später noch einmal. Dies ist eine Beschränkung der Reddit-API." "Alle Nachrichten erfolgreich als gelesen markiert" "Kann nicht alle Nachrichten als gelesen markieren" - "%1$s wurde zu Multireddit %2$s hinzugefügt" - "Konnte %1$s nicht zu Multireddit %2$s hinzufügen" + %1$s wurde zu Multicommunity %2$s hinzugefügt + Konnte %1$s nicht zu Multicommunity %2$s hinzufügen "Wähle einen Benutzer" "Antippen, um die Medien in der Galerie-Ansicht anzuzeigen" "Beitragsart verstecken" @@ -1097,8 +1097,8 @@ Nachricht: %2$s" "Nur einen Indikator für die Kommentarebene anzeigen" "Speichern" "Nicht mehr speichern" - "Pfad des Multireddit kopieren" - "Pfad des Multireddit kann nicht kopiert werden" + Pfad der Multicommunity kopieren + Pfad der Multicommunity kann nicht kopiert werden "Absturzmeldungen werden gelöscht" "Wenn du diese Option aktivierst, wird NSFW dauerhaft deaktiviert, egal ob die NSFW-Option ein- oder ausgeschaltet ist. Diese Option ist irreversibel, wenn du NSFW wieder einschalten willst, müssen die Daten der App gelöscht werden. @@ -1125,9 +1125,9 @@ Benenne diese Themen sonst neu." "Infinity Theme ihrem Hintergrund anpassen" "Material You anwenden" "Sollte Infinity den Theme nicht gewechselt haben" - "Multireddits Favoriten anzeigen" - "Multireddits anzeigen" - "Sektion für Reddit zusammenklappen" + Multicommunities Favoriten anzeigen + Multicommunities anzeigen + Sektion für Lemmy zusammenklappen "Automatisch zum Querformat im Videospieler wechseln" "Stummschalt-Option im Beitragsfeed merken" "Automatisch" @@ -1190,7 +1190,7 @@ Antippen zum Wiederholen." "Titel: enthält Schlüsselwörter (key1,key2)" "Titel: enthält Regex" "Domains cont" - "Dieses Multireddit hat kein Subreddit!" + Dieses Multicommunity hat kein Subreddit! "Fehler beim Abrufen von v.redd.it video: Kann Video URL nicht finden" "Diese Domain containen" "Ruhig Brauner!!!" @@ -1256,13 +1256,13 @@ Antippen zum Wiederholen." "Weniger Werkzeugleistenoptionen anzeigen" "Wert %1$d" "Autoravatar zeigen" - "Reddit Nutzungsbestimmungen " + "Lemmy Nutzungsbestimmungen " "Immer die Anzahl von untergeordneten Kommentaren anzeigen" "Upvoteverhaltnis verstecken" "Gefährlich" "Wert erhöhen um Vorschau in höherer Qualität zu zeigen, aber die App kann unerwartet abstürzen." "Beitragsvorschau maximale Auflösung (Höhe * Breite)" - "Reddit Video Standardauflösung" + Lemmy Video Standardauflösung "ttf Schriftart Datei auswählen" "Schriftart konnte nicht geladen werden" "Benutzerdefinierte Schriftart konnte nicht geladen werden" diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 038c0f2b..2b3ccd68 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -175,7 +175,7 @@ Toca para reintentar." "Elige un subreddit" "Reglas" "URL" - "Subreddits" + Communities "Usuarios" "Multireddits" "Texto" @@ -401,7 +401,7 @@ Premio means prize, so it's better suited the first word instead of the second o "Cuenta de Reddit" "u/Hostilenemy" "Subreddit" - "r/Infinity_For_Reddit" + !infinityforlemmy@lemdro.id "Compartir" "Si te gusta esta aplicación ¡Compártela!" "Infinity for Reddit" diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 7ff05fe9..86d45577 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -177,9 +177,9 @@ "Choisir une subreddit" "Règles" "URL" - "Subreddits" + Communities "Utilisateurs" - "Multireddits" + MultiCommunity "Texte" "Lien" "Image" @@ -439,8 +439,8 @@ peut ne pas fonctionner sur Android 11" "docilealligator.app@gmail.com" "Compte Reddit" "u/Hostilenemy" - "Subreddit" - "r/Infinity_For_Reddit" + Community + !infinityforlemmy@lemdro.id "Partager" "Partagez cette application avec d'autres si vous l'appréciez" "Infinity Pour Reddit" diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index f6690772..f9189359 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -430,7 +430,7 @@ Behavior --> "रैडिट खाता " "u/Hostilenemy" "सबरैडिट " - "r/Infinity_For_Reddit" + !infinityforlemmy@lemdro.id "साझा करें " "यदि आप इसका आनंद लेते हैं तो एप्प को अन्य लोगों के साथ साझा करें " "Infinity For Reddit" diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 73f0b40e..2ee85daa 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -400,7 +400,7 @@ "Reddit račun" "u/Hostilenemy" "Podreddit" - "r/Infinity_For_Reddit" + !infinityforlemmy@lemdro.id "Dijeljenje" "Ako Vam se aplikacija sviđa, podijelite ju s drugima" "Infinity For Reddit" diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 9571273e..50438a58 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -385,7 +385,7 @@ "Reddit fiók" "u/Hostilenemy" "Közösség" - "r/Infinity_For_Reddit" + !infinityforlemmy@lemdro.id "Megosztás" "Ha tetszik az app oszd meg másokkal is" "Infiniti Reddithez" diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 81721ddf..535e3455 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -164,9 +164,9 @@ Tocca per riprovare." "Scegli un subreddit" "Regole" "URL" - "Subreddit" + Communities "Utenti" - "MultiReddit" + MultiCommunity "Testo" "Link" "Immagine" @@ -373,8 +373,8 @@ Tocca per riprovare." "docilealligator.app@gmail.com" "Account Reddit" "u/Hostilenemy" - "Subreddit" - "r/Infinity_For_Reddit" + Community + !infinityforlemmy@lemdro.id "Condividi" "Condividi questa app con altre persone se la apprezzi" "Infinity For Reddit" diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 258b296e..3852ba84 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -432,8 +432,8 @@ "docilealligator.app@gmail.com" "Redditアカウント" "u/Hostilenemy" - "Subreddit" - "r/Infinity_For_Reddit" + Community + !infinityforlemmy@lemdro.id "共有" "このアプリが気に入ったようでしたら、ぜひ他の方々にもご紹介ください" "Infinity For Reddit" diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 743e3414..173cb286 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -166,9 +166,9 @@ Druk om opnieuw te proberen." "Kies een subreddit" "Regels" "URL" - "Subreddits" + Communities "Gebruikers" - "MultiReddits" + MultiCommunity "Tekst" "Link" "Afbeelding" @@ -383,8 +383,8 @@ Druk om opnieuw te proberen." "docilealligator.app@gmail.com" "Reddit-account" "u/Hostilenemy" - "Subreddit" - "r/Infinity_For_Reddit" + Community + !infinityforlemmy@lemdro.id "Delen" "Deel deze app met anderen als je hem graag gebruikt" "Infinity For Reddit" diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a36349b2..e8d50360 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -378,8 +378,8 @@ "docilealligator.app@gmail.com" "Konto Reddit" "u/Hostilenemy" - "Subreddit" - "r/Infinity_For_Reddit" + Community + !infinityforlemmy@lemdro.id "Udostępnij" "Udostępnij tą aplikację, jeśli ci się ona podoba" "Infinity For Reddit" diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 4c273b5a..b70cfc22 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -173,9 +173,9 @@ Toque para tentar novamente." "Escolha um subreddit" "Regras" "URL" - "Subreddits" + Communities "Usuários" - "Multireddits" + MultiCommunity "Texto" "Link" "Imagem" @@ -382,8 +382,8 @@ Toque para tentar novamente." "docilealligator.app@gmail.com" "Conta Reddit" "u/Hostilenemy" - "Subreddit" - "r/Infinity_For_Reddit" + Community + !infinityforlemmy@lemdro.id "Compartilhar" "Compartilhe esse App com outros se você está gostando dele" "Infinity For Reddit" diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 7dd79258..08fb7b62 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -171,7 +171,7 @@ Toque para tentar novamente." "URL" "Comunidades" "Utilizadores" - "MultiReddits" + MultiCommunity "Texto" "Ligação" "Imagem" @@ -388,7 +388,7 @@ Toque para tentar novamente." "Conta do Reddit" "u/Hostilenemy" "Comunidade" - "r/Infinity_For_Reddit" + !infinityforlemmy@lemdro.id "Partilhar" "Se aprecia esta aplicação, partilhe-a com outros" "Infinity For Reddit" diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 09dea63d..71bd0a6c 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -402,8 +402,8 @@ Atinge pentru a reîncerca." "docilealligator.app@gmail.com" "Cont Reddit" "u/Hostilenemy" - "Subreddit" - "r/Infinity_For_Reddit" + Community + !infinityforlemmy@lemdro.id "Distribuie" "Distribuie această aplicație altor persoane dacă îți place" "Infinit Pentru Reddit" diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 02902830..a525e206 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -389,7 +389,7 @@ "Аккаунт Reddit" "u/Hostilenemy" "Сабреддит" - "r/Infinity_For_Reddit" + !infinityforlemmy@lemdro.id "Поделиться" "Поделитесь этим приложением с другими людьми, если оно вам нравится" "Infinity для Reddit" diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 36beaeef..9a85ba07 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -396,7 +396,7 @@ Tekrar denemek için tıklayın." "Reddit Hesabı" "u/Hostilenemy" "Subreddit" - "r/Infinity_For_Reddit" + !infinityforlemmy@lemdro.id "Paylaş" "Bu uygulamayı beğendiyseniz başkalarıyla paylaşın" "Infinity For Reddit" diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 60c4ae1a..a0f05a42 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -377,7 +377,7 @@ "Обліківка Reddit" "u/Hostilenemy" "Сабредит" - "r/Infinity_For_Reddit" + !infinityforlemmy@lemdro.id "Поширте" "Поділіться цим застосунком з іншими людьми, якщо він Вам подобається" "Infinity For Reddit" diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 66aa451c..ea5dcb7e 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -390,7 +390,7 @@ Nhấn để thử lại." "Tài khoản Reddit" "u/Hostilenemy" "Subreddit" - "r/Infinity_For_Reddit" + !infinityforlemmy@lemdro.id "Chia sẻ" "Hãy chia sẻ ứng dụng này với người khác nếu bạn thích nó" "Infinity cho Reddit" diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 9874a670..dc15ec46 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -395,7 +395,7 @@ "版块" - "r/Infinity_For_Reddit" + !infinityforlemmy@lemdro.id "分享" "如果您喜欢此应用，可以分享给其他人" "Infinity For Reddit" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4b815c19..c88800c8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,13 +16,13 @@ Inbox Settings Saved - Create Multireddit + Create Multicommunity Select Communities Custom Themes Customize Theme Create Theme Theme Preview - Edit Multireddit + Edit Multicommunity Selected Communities Report Image %1$d/%2$d @@ -38,7 +38,7 @@ Filtered Posts Post Filter Users - Select a Multireddit + Select a Multicommunity Gallery Post Trending Wiki @@ -70,8 +70,8 @@ Edit Flair Change Post Layout Save - Edit MultiReddit - Delete Multireddit + Edit Multicommunity + Delete Multicommunity Share Preview Report @@ -84,7 +84,7 @@ Give Award Save to Database Read All Messages - Add to Multireddit + Add to Multicommuity Share Link Copy Link Open in browser @@ -114,7 +114,7 @@ No comments found No communities found No users found - No Multireddits found + No Multicommunities found No storage permission to save this file Anonymous homepage is not implemented yet @@ -135,7 +135,7 @@ Profile Subscriptions - Multireddit + Multicommuity History Inbox Inbox (%1$,d) @@ -153,7 +153,7 @@ Invalid response from the server Invalid username or password Cannot fetch sidebar - Cannot fetch multireddit info + Cannot fetch multicommunity info Subscribe Unsubscribe @@ -226,7 +226,7 @@ Communities Users - MultiReddits + MultiCommunity Posts Comments About @@ -511,14 +511,14 @@ Tab 3 More Tabs Enabling the following options will cause an unintended behaviour:\nTabs may lose all the content after switching to others. This is the same as refreshing the page. - Show Favorite Multireddits - Show Multireddits + Show Favorite Multicommunities + Show Multicommunities Show Favorite Subscribed Communities Show Subscribed Communities Title Type Community Name (Without @ instance tag) - MultiReddit Path (/user/yourusername/m/yourmultiredditname) (only lowercase characters) + Multicommunity Path (/user/yourusername/m/yourmulticommunityname) (only lowercase characters) Username (Without u/ prefix) There\'s no developer options here Download Location @@ -548,7 +548,7 @@ Option 4 Floating Action Button Data Saving Mode - In data saving mode:\nPreview images are in lower resolution.\nReddit videos are in lower resolution.\nVideo autoplay is disabled. + In data saving mode: Preview images are in lower resolution. Lemmy videos are in lower resolution. Video autoplay is disabled. Translation Translate this app on POEditor. Thanks to all contributors. National Flags @@ -594,7 +594,7 @@ Swipe Between Posts Navigation Drawer Collapse Account Section - Collapse Reddit Section + Collapse Lemmy Section Collapse Post Section Collapse Preferences Section Collapse Favorite Communities Section @@ -639,13 +639,13 @@ Show Fewer Toolbar Options Starting From Level %1$d Show Author Avatar - Reddit User Agreement + Lemmy User Agreement Always Show the Number of Child Comments Hide Upvote Ratio Dangerous Increase the value to show previews in higher resolution, but the app may crash unexpectedly. Post Feed Preview Max Resolution (Width * Height) - Reddit Video Default Resolution + Lemmy Video Default Resolution Easier to Watch in Full Screen Hide FAB in Post Feed Comment Divider Type @@ -700,8 +700,8 @@ 1 Year %1$d Years - Error getting multireddit data - Cannot sync multireddits + Error getting multicommunity data + Cannot sync multicommunities Cannot sync subscriptions Check out Infinity for Lemmy, an awesome Lemmy client!\nhttps://play.google.com/store/apps/details?id=eu.toldi.infinityforlemmy @@ -742,9 +742,9 @@ Private Select Communities and Users Where is the name? - Cannot create this multireddit - This multireddit already exists - Cannot edit this multireddit + Cannot create this multicommunity + This multicommunity already exists + Cannot edit this multicommunity Deleted successfully Delete failed Are you sure? @@ -981,7 +981,7 @@ Reset all settings successfully \@bazsalanszky@lemmy.toldi.eu - r/Infinity_For_Reddit + !infinityforlemmy@lemdro.id Primary Text Secondary Text This is a post @@ -992,10 +992,10 @@ Author Flair I got my girlfriend a “Get better soon” card.\nShe\'s not ill or anything, but she could definitely get better. - Copy Multireddit\'s Path - Unable to copy multireddit\'s path - Edit Multireddit - Delete Multireddit + Copy Multicommunity\'s Path + Unable to copy multicommunity\'s path + Edit Multicommunity + Delete Multicommunity %1$,d Awards 1 Award @@ -1140,19 +1140,19 @@ Community User: %1$s User - MultiReddit: %1$s - MultiReddit + Multicommunity: %1$s + Multicommunity Search Community User - Leave it blank to apply this post filter to all the communities / users / multireddits + Leave it blank to apply this post filter to all the communities / users / multicommunities You are doing this too frequently. Try again later. This is Reddit API\'s rate limit. Read all messages successfully Unable to read all messages - %1$s is added to multireddit %2$s - Unable to add %1$s to multireddit %2$s + %1$s is added to multicommunity %2$s + Unable to add %1$s to multicommunity %2$s Choose a user @@ -1162,7 +1162,7 @@ Vote Start by joining a community! - This multireddit does not have a community! + This multicommunity does not have a community! Successfully exported settings to the destination directory. The password of the generated zip file is 123321. Please don\'t modify the zip file. Could not create backup zip in the destination directory From 4bfe1b0c02e900365f06a9e631bdd40587380f14 Mon Sep 17 00:00:00 2001 From: Bazsalanszky Date: Fri, 4 Aug 2023 10:08:08 +0200 Subject: [PATCH 2/8] Remove unused elements from navigation drawer This makes it more accurate for Lemmy. --- .../AccountSectionRecyclerViewAdapter.java | 24 +++++++------------ ...gationDrawerRecyclerViewMergedAdapter.java | 12 ---------- 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/adapters/navigationdrawer/AccountSectionRecyclerViewAdapter.java b/app/src/main/java/eu/toldi/infinityforlemmy/adapters/navigationdrawer/AccountSectionRecyclerViewAdapter.java index 31ba0da9..e0b44dba 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/adapters/navigationdrawer/AccountSectionRecyclerViewAdapter.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/adapters/navigationdrawer/AccountSectionRecyclerViewAdapter.java @@ -24,8 +24,8 @@ public class AccountSectionRecyclerViewAdapter extends RecyclerView.Adapter 0) { ((MenuItemViewHolder) holder).menuTextView.setText(baseActivity.getString(R.string.inbox_with_count, inboxCount)); @@ -118,23 +114,21 @@ public class AccountSectionRecyclerViewAdapter extends RecyclerView.Adapter Date: Fri, 4 Aug 2023 10:54:21 +0200 Subject: [PATCH 3/8] Remove some reddit specific options from a few places Removed multireddits. Also remove the "random" option from the "more options" menu --- .../activities/MainActivity.java | 4 --- .../activities/SearchResultActivity.java | 4 --- .../SubscribedThingListingActivity.java | 27 +++++-------------- .../ViewMultiRedditDetailActivity.java | 4 --- .../ViewSubredditDetailActivity.java | 4 --- .../activities/ViewUserDetailActivity.java | 5 +--- .../FABMoreOptionsBottomSheetFragment.java | 5 ---- ...fragment_fab_more_options_bottom_sheet.xml | 19 ------------- 8 files changed, 7 insertions(+), 65 deletions(-) diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java index e2900a45..a8370e17 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java @@ -1400,10 +1400,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb goToUser(); break; } - case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: { - randomThing(); - break; - } case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: { if (sectionsPagerAdapter != null) { sectionsPagerAdapter.hideReadPosts(); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/SearchResultActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/SearchResultActivity.java index 2ddc39ac..6e5636a3 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/SearchResultActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/SearchResultActivity.java @@ -558,10 +558,6 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect goToUser(); break; } - case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: { - random(); - break; - } case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: { if (sectionsPagerAdapter != null) { sectionsPagerAdapter.hideReadPosts(); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/SubscribedThingListingActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/SubscribedThingListingActivity.java index 1b47dd83..cd3fea7a 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/SubscribedThingListingActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/SubscribedThingListingActivity.java @@ -233,7 +233,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti }); sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager()); viewPager.setAdapter(sectionsPagerAdapter); - viewPager.setOffscreenPageLimit(3); + viewPager.setOffscreenPageLimit(1); if (viewPager.getCurrentItem() != 2) { fab.hide(); } @@ -358,7 +358,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti } if (!(!forceLoad && mInsertMultiredditSuccess)) { - loadMultiReddits(); + //loadMultiReddits(); } } @@ -412,7 +412,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti public void success() { Toast.makeText(SubscribedThingListingActivity.this, R.string.delete_multi_reddit_success, Toast.LENGTH_SHORT).show(); - loadMultiReddits(); + //loadMultiReddits(); } @Override @@ -439,7 +439,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti @Subscribe public void onRefreshMultiRedditsEvent(RefreshMultiRedditsEvent event) { - loadMultiReddits(); + //loadMultiReddits(); } @Override @@ -477,6 +477,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti @Override public Fragment getItem(int position) { switch (position) { + default: case 0: { SubscribedSubredditsListingFragment fragment = new SubscribedSubredditsListingFragment(); Bundle bundle = new Bundle(); @@ -487,28 +488,12 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti fragment.setArguments(bundle); return fragment; } - case 1: { - FollowedUsersListingFragment fragment = new FollowedUsersListingFragment(); - Bundle bundle = new Bundle(); - bundle.putString(FollowedUsersListingFragment.EXTRA_ACCOUNT_NAME, mAccountName == null ? "-" : mAccountName); - bundle.putString(FollowedUsersListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken); - fragment.setArguments(bundle); - return fragment; - } - default: { - MultiRedditListingFragment fragment = new MultiRedditListingFragment(); - Bundle bundle = new Bundle(); - bundle.putString(MultiRedditListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken); - bundle.putString(MultiRedditListingFragment.EXTRA_ACCOUNT_NAME, mAccountName == null ? "-" : mAccountName); - fragment.setArguments(bundle); - return fragment; - } } } @Override public int getCount() { - return 3; + return 1; } @Override diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewMultiRedditDetailActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewMultiRedditDetailActivity.java index 225f65a0..dd2965c5 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewMultiRedditDetailActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewMultiRedditDetailActivity.java @@ -946,10 +946,6 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT goToUser(); break; } - case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: { - random(); - break; - } case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: { if (mFragment instanceof PostFragment) { ((PostFragment) mFragment).hideReadPosts(); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewSubredditDetailActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewSubredditDetailActivity.java index 745ef679..6e010df0 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewSubredditDetailActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewSubredditDetailActivity.java @@ -1402,10 +1402,6 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp goToUser(); break; } - case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: { - random(); - break; - } case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: { if (sectionsPagerAdapter != null) { sectionsPagerAdapter.hideReadPosts(); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewUserDetailActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewUserDetailActivity.java index b90713f4..f1a71c49 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewUserDetailActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewUserDetailActivity.java @@ -1341,10 +1341,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele goToUser(); break; } - case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: { - random(); - break; - } + case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: { if (sectionsPagerAdapter != null) { sectionsPagerAdapter.hideReadPosts(); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/FABMoreOptionsBottomSheetFragment.java b/app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/FABMoreOptionsBottomSheetFragment.java index 263b895e..c29eff6e 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/FABMoreOptionsBottomSheetFragment.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/FABMoreOptionsBottomSheetFragment.java @@ -24,7 +24,6 @@ public class FABMoreOptionsBottomSheetFragment extends LandscapeExpandedRoundedB public static final int FAB_OPTION_SEARCH = 4; public static final int FAB_OPTION_GO_TO_SUBREDDIT = 5; public static final int FAB_OPTION_GO_TO_USER = 6; - public static final int FAB_RANDOM = 7; public static final int FAB_HIDE_READ_POSTS = 8; public static final int FAB_FILTER_POSTS = 9; public static final int FAB_GO_TO_TOP = 10; @@ -86,10 +85,6 @@ public class FABMoreOptionsBottomSheetFragment extends LandscapeExpandedRoundedB dismiss(); }); - binding.randomTextViewFabMoreOptionsBottomSheetFragment.setOnClickListener(view -> { - activity.fabOptionSelected(FAB_RANDOM); - dismiss(); - }); binding.filterPostsTextViewFabMoreOptionsBottomSheetFragment.setOnClickListener(view -> { activity.fabOptionSelected(FAB_FILTER_POSTS); diff --git a/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml index 6dbb217e..5d9ed9a4 100644 --- a/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml @@ -144,25 +144,6 @@ android:focusable="true" android:background="?attr/selectableItemBackground" /> - - Date: Fri, 4 Aug 2023 13:19:03 +0200 Subject: [PATCH 4/8] View user bug fix Resolved the issue where clicking on a user from the inbox was not functioning properly. --- .../infinityforlemmy/adapters/MessageRecyclerViewAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/adapters/MessageRecyclerViewAdapter.java b/app/src/main/java/eu/toldi/infinityforlemmy/adapters/MessageRecyclerViewAdapter.java index 3210ab7b..0cccaa27 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/adapters/MessageRecyclerViewAdapter.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/adapters/MessageRecyclerViewAdapter.java @@ -215,7 +215,7 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter Date: Fri, 4 Aug 2023 14:05:40 +0200 Subject: [PATCH 5/8] Fix sort types on search page Closes #19 --- ...SearchPostSortTypeBottomSheetFragment.java | 29 ++++--------- .../fragments/PostFragment.java | 6 ++- ...ent_search_post_sort_type_bottom_sheet.xml | 41 +------------------ 3 files changed, 13 insertions(+), 63 deletions(-) diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/SearchPostSortTypeBottomSheetFragment.java b/app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/SearchPostSortTypeBottomSheetFragment.java index f64c5833..ee140a12 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/SearchPostSortTypeBottomSheetFragment.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/SearchPostSortTypeBottomSheetFragment.java @@ -31,16 +31,12 @@ public class SearchPostSortTypeBottomSheetFragment extends LandscapeExpandedRoun public static final String EXTRA_CURRENT_SORT_TYPE = "ECST"; - @BindView(R.id.relevance_type_text_view_search_sort_type_bottom_sheet_fragment) - TextView relevanceTypeTextView; - @BindView(R.id.hot_type_text_view_search_sort_type_bottom_sheet_fragment) - TextView hotTypeTextView; @BindView(R.id.top_type_text_view_search_sort_type_bottom_sheet_fragment) TextView topTypeTextView; @BindView(R.id.new_type_text_view_search_sort_type_bottom_sheet_fragment) TextView newTypeTextView; - @BindView(R.id.comments_type_text_view_search_sort_type_bottom_sheet_fragment) - TextView commentsTypeTextView; + @BindView(R.id.old_type_text_view_search_sort_type_bottom_sheet_fragment) + TextView oldTypeTextView; private BaseActivity activity; public SearchPostSortTypeBottomSheetFragment() { // Required empty public constructor @@ -61,14 +57,12 @@ public class SearchPostSortTypeBottomSheetFragment extends LandscapeExpandedRoun ButterKnife.bind(this, rootView); String currentSortType = getArguments().getString(EXTRA_CURRENT_SORT_TYPE); - if (currentSortType.equals(SortType.Type.HOT.fullName)) { - hotTypeTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(hotTypeTextView.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); - } else if (currentSortType.equals(SortType.Type.TOP.fullName)) { + if (currentSortType.equals(SortType.Type.TOP.fullName)) { topTypeTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(topTypeTextView.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.NEW.fullName)) { newTypeTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(newTypeTextView.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); } else if (currentSortType.equals(SortType.Type.OLD.fullName)) { - commentsTypeTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(commentsTypeTextView.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); + oldTypeTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(oldTypeTextView.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O @@ -76,15 +70,6 @@ public class SearchPostSortTypeBottomSheetFragment extends LandscapeExpandedRoun rootView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR); } - /*relevanceTypeTextView.setOnClickListener(view -> { - ((SortTypeSelectionCallback) activity).sortTypeSelected(SortType.Type.RELEVANCE.name()); - dismiss(); - });*/ - - hotTypeTextView.setOnClickListener(view -> { - ((SortTypeSelectionCallback) activity).sortTypeSelected(SortType.Type.HOT.name()); - dismiss(); - }); topTypeTextView.setOnClickListener(view -> { ((SortTypeSelectionCallback) activity).sortTypeSelected(SortType.Type.TOP.name()); @@ -92,12 +77,12 @@ public class SearchPostSortTypeBottomSheetFragment extends LandscapeExpandedRoun }); newTypeTextView.setOnClickListener(view -> { - ((SortTypeSelectionCallback) activity).sortTypeSelected(new SortType(SortType.Type.NEW)); + ((SortTypeSelectionCallback) activity).sortTypeSelected(new SortType(SortType.Type.NEW,null)); dismiss(); }); - commentsTypeTextView.setOnClickListener(view -> { - ((SortTypeSelectionCallback) activity).sortTypeSelected(SortType.Type.MOST_COMMENTS.name()); + oldTypeTextView.setOnClickListener(view -> { + ((SortTypeSelectionCallback) activity).sortTypeSelected(new SortType(SortType.Type.OLD,null)); dismiss(); }); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/fragments/PostFragment.java b/app/src/main/java/eu/toldi/infinityforlemmy/fragments/PostFragment.java index 9ad61c9a..8d2e6d6d 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/fragments/PostFragment.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/fragments/PostFragment.java @@ -460,9 +460,9 @@ public class PostFragment extends Fragment implements FragmentCommunicator { nameOfUsage = PostFilterUsage.NO_USAGE; String sort = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_SEARCH_POST, SortType.Type.TOP_ALL.value); - String sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_SEARCH_POST, SortType.Time.ALL.name()); + String sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_SEARCH_POST, sort.equalsIgnoreCase(SortType.Type.TOP.value) ? SortType.Time.ALL.name() : null); SortType.Type st = SortType.Type.fromValue(sort); - sortType = new SortType(st == null ? SortType.Type.TOP_ALL : st, SortType.Time.valueOf(sortTime)); + sortType = new SortType(st == null ? SortType.Type.TOP_ALL : st,sortTime != null ? SortType.Time.valueOf(sortTime) : null); postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_SEARCH_POST, defaultPostLayout); mAdapter = new PostRecyclerViewAdapter(activity, this, mExecutor, mRetrofit.getRetrofit(), mGfycatRetrofit, @@ -1385,6 +1385,8 @@ public class PostFragment extends Fragment implements FragmentCommunicator { mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_SEARCH_POST, sortType.getType().name()).apply(); if (sortType.getTime() != null) { mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TIME_SEARCH_POST, sortType.getTime().name()).apply(); + }else { + mSortTypeSharedPreferences.edit().remove(SharedPreferencesUtils.SORT_TIME_SEARCH_POST).apply(); } break; case PostPagingSource.TYPE_MULTI_REDDIT: diff --git a/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml index 8b1c86b6..e7c06c29 100644 --- a/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml @@ -11,43 +11,6 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - From 9149ee224ce71ab06a1f1f147c35639039dd0c3d Mon Sep 17 00:00:00 2001 From: Bazsalanszky Date: Fri, 4 Aug 2023 14:34:30 +0200 Subject: [PATCH 6/8] Better since time on Community Pages --- .../subreddit/ParseSubredditData.java | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/subreddit/ParseSubredditData.java b/app/src/main/java/eu/toldi/infinityforlemmy/subreddit/ParseSubredditData.java index 77aa746c..7e421027 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/subreddit/ParseSubredditData.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/subreddit/ParseSubredditData.java @@ -8,7 +8,12 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; +import java.util.Locale; +import java.util.TimeZone; import eu.toldi.infinityforlemmy.utils.JSONUtils; @@ -47,7 +52,11 @@ public class ParseSubredditData { } boolean removed = community.getBoolean("removed"); - String published = community.getString("published"); + String published_raw = community.getString("published"); + String published = formatISOTime(published_raw); + if(published == null){ + published = published_raw; + } String updated = ""; if (!community.isNull("updated")) { updated = community.getString("updated"); @@ -170,4 +179,25 @@ public class ParseSubredditData { } } } + + public static String formatISOTime(String isoTime) { + // Truncate the time to millisecond precision + String truncatedTime = isoTime.substring(0, 23); + + SimpleDateFormat isoFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.US); + isoFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + + try { + Date date = isoFormat.parse(truncatedTime); + + // Set your desired output format here + SimpleDateFormat outputFormat = new SimpleDateFormat("MMM dd, yyyy HH:mm:ss", Locale.US); + outputFormat.setTimeZone(TimeZone.getDefault()); // Set to device's default timezone + + return outputFormat.format(date); + } catch (ParseException e) { + e.printStackTrace(); + return null; + } + } } From 484f9607b1f1a0387afd2fbfd97ae54ccbfa8531 Mon Sep 17 00:00:00 2001 From: Bazsalanszky Date: Fri, 4 Aug 2023 14:38:34 +0200 Subject: [PATCH 7/8] Removed description from the community view page The community's description was shown both on the community page (bellow the subscription button) and on the about page. Now it's only on the about page, to make the UI less cluttered. Closes #42 --- .../activities/ViewSubredditDetailActivity.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewSubredditDetailActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewSubredditDetailActivity.java index 6e010df0..8173d83b 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewSubredditDetailActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewSubredditDetailActivity.java @@ -554,12 +554,9 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp creationTimeTextView.setText(subredditData.getCreatedUTC()); description = subredditData.getDescription(); - if (hideSubredditDescription || description.equals("")) { - descriptionTextView.setVisibility(View.GONE); - } else { - descriptionTextView.setVisibility(View.VISIBLE); - markwon.setMarkdown(descriptionTextView, description); - } + + descriptionTextView.setVisibility(View.GONE); + if (subredditData.isNSFW()) { if (nsfwWarningBuilder == null From 562c91acb2ea47ff45fec0ffe6777385a1738192 Mon Sep 17 00:00:00 2001 From: Bazsalanszky Date: Fri, 4 Aug 2023 15:00:42 +0200 Subject: [PATCH 8/8] Fix sort types in settings Closes #25 --- app/src/main/res/values/arrays.xml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index eaee0915..5257528a 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -501,47 +501,57 @@ Hot New - Rising + Active Top - Controversial + Most Comments + New Comments HOT NEW - RISING + ACTIVE TOP - CONTROVERSIAL + MOSTCOMMENTS + NEWCOMMENTS New - Hot + Old Top - Controversial NEW - HOT + OLD TOP - CONTROVERSIAL Hour + 6 Hours + 12 Hours Day Week Month + 3 Months + 6 Months + 9 Months Year All Time HOUR + 6HOURS + 12HOURS DAY WEEK MONTH + 3MONTHS + 6MONTHS + 9MONTHS YEAR ALL