From b8c3dae807730b90e32c935820db79353c80e187 Mon Sep 17 00:00:00 2001 From: Balazs Toldi Date: Fri, 11 Aug 2023 08:42:16 +0200 Subject: [PATCH] Rename Home feed to "Subscribed" feed --- .../activities/FilteredPostsActivity.java | 2 +- .../activities/MainActivity.java | 2 +- .../fragments/PostFragment.java | 9 +++--- .../CustomizeMainPageTabsFragment.java | 2 +- ...ent_new_post_filter_usage_bottom_sheet.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- 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 | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- 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/arrays.xml | 30 +++++++++---------- app/src/main/res/values/strings.xml | 2 +- 26 files changed, 43 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/FilteredPostsActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/FilteredPostsActivity.java index 29def7d5..468d17bf 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/FilteredPostsActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/FilteredPostsActivity.java @@ -272,7 +272,7 @@ public class FilteredPostsActivity extends BaseActivity implements SortTypeSelec switch (postType) { case PostPagingSource.TYPE_FRONT_PAGE: case PostPagingSource.TYPE_ANONYMOUS_FRONT_PAGE: - getSupportActionBar().setTitle(R.string.home); + getSupportActionBar().setTitle(R.string.subscribed_feed); break; case PostPagingSource.TYPE_SEARCH: getSupportActionBar().setTitle(R.string.search); 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 578072ad..438f5f9d 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java @@ -930,7 +930,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb new TabLayoutMediator(tabLayout, viewPager2, (tab, position) -> { switch (position) { case 0: - Utils.setTitleWithCustomFontToTab(typeface, tab, mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_TITLE, getString(R.string.home))); + Utils.setTitleWithCustomFontToTab(typeface, tab, mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_TITLE, getString(R.string.subscribed_feed))); break; case 1: Utils.setTitleWithCustomFontToTab(typeface, tab, mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_TITLE, getString(R.string.local))); 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 d62e8c51..8d3a2ee5 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/fragments/PostFragment.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/fragments/PostFragment.java @@ -137,7 +137,6 @@ import eu.toldi.infinityforlemmy.post.PostPagingSource; import eu.toldi.infinityforlemmy.post.PostViewModel; import eu.toldi.infinityforlemmy.postfilter.PostFilter; import eu.toldi.infinityforlemmy.postfilter.PostFilterUsage; -import eu.toldi.infinityforlemmy.utils.LemmyUtils; import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils; import eu.toldi.infinityforlemmy.utils.Utils; import eu.toldi.infinityforlemmy.videoautoplay.ExoCreator; @@ -530,7 +529,7 @@ public class PostFragment extends Fragment implements FragmentCommunicator { sort = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_SUBREDDIT_POST_BASE + subredditName, mSharedPreferences.getString(SharedPreferencesUtils.SUBREDDIT_DEFAULT_SORT_TYPE, SortType.Type.HOT.name())); - if (sort.equals(sort.equals(SortType.Type.TOP.name()))) { + if (sort.equalsIgnoreCase(SortType.Type.TOP.value)) { sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_SUBREDDIT_POST_BASE + subredditName, mSharedPreferences.getString(SharedPreferencesUtils.SUBREDDIT_DEFAULT_SORT_TIME, SortType.Time.ALL.name())); } @@ -538,7 +537,7 @@ public class PostFragment extends Fragment implements FragmentCommunicator { postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_SUBREDDIT_POST_BASE + subredditName, defaultPostLayout); if (sortTime != null) { - sortType = new SortType(SortType.Type.valueOf(sort), SortType.Time.valueOf(sortTime)); + sortType = new SortType(SortType.Type.fromValue(sortTime)); } else { sortType = new SortType(SortType.Type.valueOf(sort)); } @@ -670,10 +669,10 @@ public class PostFragment extends Fragment implements FragmentCommunicator { String sort = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_USER_POST_BASE + username, mSharedPreferences.getString(SharedPreferencesUtils.USER_DEFAULT_SORT_TYPE, SortType.Type.NEW.name())); - if (sort.equals(SortType.Type.TOP.name())) { + if (sort.equalsIgnoreCase(SortType.Type.TOP.value)) { String sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_USER_POST_BASE + username, mSharedPreferences.getString(SharedPreferencesUtils.USER_DEFAULT_SORT_TIME, SortType.Time.ALL.name())); - sortType = new SortType(SortType.Type.valueOf(sort), SortType.Time.valueOf(sortTime)); + sortType = new SortType(SortType.Type.fromValue(sortTime)); } else { sortType = new SortType(SortType.Type.valueOf(sort)); } diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/settings/CustomizeMainPageTabsFragment.java b/app/src/main/java/eu/toldi/infinityforlemmy/settings/CustomizeMainPageTabsFragment.java index 8effbd76..6e6aab6a 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/settings/CustomizeMainPageTabsFragment.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/settings/CustomizeMainPageTabsFragment.java @@ -224,7 +224,7 @@ public class CustomizeMainPageTabsFragment extends Fragment { showTabNamesSwitch.setOnCheckedChangeListener((compoundButton, b) -> mainActivityTabsSharedPreferences.edit().putBoolean((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_SHOW_TAB_NAMES, b).apply()); showTabNamesLinearLayout.setOnClickListener(view -> showTabNamesSwitch.performClick()); - tab1CurrentTitle = mainActivityTabsSharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_TITLE, getString(R.string.home)); + tab1CurrentTitle = mainActivityTabsSharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_TITLE, getString(R.string.subscribed_feed)); tab1CurrentPostType = mainActivityTabsSharedPreferences.getInt((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_POST_TYPE, SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_HOME); tab1CurrentName = mainActivityTabsSharedPreferences.getString((accountName == null ? "" : accountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_NAME, ""); tab1TypeSummaryTextView.setText(typeValues[tab1CurrentPostType]); diff --git a/app/src/main/res/layout/fragment_new_post_filter_usage_bottom_sheet.xml b/app/src/main/res/layout/fragment_new_post_filter_usage_bottom_sheet.xml index 76b8d73d..1fd3145d 100644 --- a/app/src/main/res/layout/fragment_new_post_filter_usage_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_new_post_filter_usage_bottom_sheet.xml @@ -15,7 +15,7 @@ android:id="@+id/home_text_view_new_post_filter_usage_bottom_sheet_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/home" + android:text="@string/subscribed_feed" android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index c7f7d83c..7649c66e 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -712,7 +712,7 @@ Obsahuje problém s autorskými právy Obsahuje dětskou pornografii Obsahuje zneužívající obsah - Domů + Domů Populární Oznámení Zprávy diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 4e1a7719..7f80a58b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -739,7 +739,7 @@ Es enthält urheberrechtlich geschütztes Material Es enthält Kinderpornografie Es enthält gewalttätiges Material - Home + Home Beliebt Benachrichtigungen Nachrichten diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 4826294e..e284d25f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -734,7 +734,7 @@ Premio means prize, so it's better suited the first word instead of the second o Contiene Copyright Contiene pornografía infantil Contiene contenido abusivo - Inicio + Inicio Popular Notificaciones Mensajes diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 512988a0..6a88f495 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -754,7 +754,7 @@ https://s3.eu-west-1.amazonaws.com/po-pub/i/dFZKKms9HbrDGOlcgW9QTcwF.jpg --> Ça contient des problèmes de droits d\'auteur Ça contient de la pédopornographie Ça contient du contenu abusif - Suivi + Suivi Local Notifications Messages diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index e11a2c6a..4a868089 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -750,7 +750,7 @@ Behavior --> "इसमें कापीराइट के मुद्दे हैं " "इसमें चाइल्ड पाॅर्नोग्राफी है " "इसकी अंतःवस्तु अनुचित है " - "होम " + "होम " "लोकप्रिय " "अधिसूचनाएं " "संदेश " diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 75160051..0cf3242f 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -724,7 +724,7 @@ Sadrži povredu autorskih prava Sadrži dječju pornografiju Sadrži uvredljiv sadržaj - Naslovnica + Naslovnica Popularno Obavijesti Poruke diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4ef150c6..6454a89b 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -712,7 +712,7 @@ Ez szerzői jogi problémát tartalmaz Ez gyermek gyermek pornográfiát tartalmaz Ez bántalmazó tartalmat tartalmaz - Home + Home Helyi Értesítések Üzenetek diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index abf2078e..2a107e6a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -702,7 +702,7 @@ Contiene problemi di Copyright Contiene pedopornografia Contiene contenuto offensivo - Home + Home Popolari Notifiche Messaggi diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ceca4805..29637fa8 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -752,7 +752,7 @@ 著作権侵害が含まれている 児童ポルノが含まれている 虐待的内容が含まれている - ホーム + ホーム 人気 通知 メッセージ diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e12e7ee9..7c340446 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -717,7 +717,7 @@ not: "5 uren" --> Het bevat een auteursrechtkwestie Het bevat kinderpornografie Het bevat beledigende inhoud - Thuis + Thuis Populair Notificaties Berichten diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f63c7716..3f5ef4c3 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -707,7 +707,7 @@ Zawiera kwestię dotyczącą praw autorskich Zawiera pornografię dziecięcą Zawiera obraźliwe treści - Strona główna + Strona główna Popularne Powiadomienia Wiadomości diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 05600f8b..05415898 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -712,7 +712,7 @@ Contém problemas com direitos autorais Contém pornografia infantil Contém conteúdo abusivo - Tela inicial + Tela inicial Popular Notificações Mensagens diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d0d67940..1470366a 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -704,7 +704,7 @@ Contém Problemas de Direitos de Autor Contém Pornografia Infantil Contém Conteúdo Abusivo - Início + Início Local Notificações Mensagens diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 95f52bcc..d21023f9 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -730,7 +730,7 @@ Conține Probleme Legate cu Drepturile de Autor Conține Pornografie Infantilă Conține Conținut Abuziv - Acasă + Acasă Popular Notificări Mesaje diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e5e28ed3..49c7310f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -716,7 +716,7 @@ Содержит нарушение авторских прав Содержит детскую порнографию Содержит оскорбительный контент - Главная + Главная Популярное Уведомления Сообщения diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index b1aeef75..442b686a 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -722,7 +722,7 @@ This translation does it work well in this kinda format. People use "since" in s Telif Hakkı Meselesi İçeriyor Çocuk Pornografisi İçeriyor Kötüye Kullanım Amaçlı İçerik İçeriyor - Ana Sayfa + Ana Sayfa Popüler Bildirimler Mesajlar diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index d009b3ff..59760c24 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -709,7 +709,7 @@ Містить проблему авторських прав Містить дитячу порнографію Містить образливий вміст - Домівка + Домівка Популярне Сповіщення Повідомлення diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 44bb99f8..eb4afd8c 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -713,7 +713,7 @@ Nó chứa vấn đề bản quyền Nó chứa porn trẻ em Nó chứa nội dung lạm dụng - Trang chủ + Trang chủ Phổ biến Thông báo Tin nhắn diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index b0d00571..39ee0c94 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -734,7 +734,7 @@ 帖子有版权问题 它包含儿童色情内容 它包含侮辱性内容 - 主页 + 主页 热门 通知 消息 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 5257528a..2957fdeb 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -194,7 +194,7 @@ - @string/home + @string/subscribed_feed @string/local @string/all @string/community @@ -208,7 +208,7 @@ - @string/home + @string/subscribed_feed @string/local @string/all @string/community @@ -336,7 +336,7 @@ - @string/home + @string/subscribed_feed @string/subscriptions @string/inbox @string/profile @@ -360,7 +360,7 @@ - @string/home + @string/subscribed_feed @string/subscriptions @string/multi_reddits @string/refresh @@ -543,17 +543,17 @@ - HOUR - 6HOURS - 12HOURS - DAY - WEEK - MONTH - 3MONTHS - 6MONTHS - 9MONTHS - YEAR - ALL + TopHour + TopSixHour + TopTwelveHour + TopDay + TopWeek + TopMonth + TopThreeMonths + TopSixMonths + TopNineMonths + TopYear + TopAll diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c0c2291c..f0248691 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1011,7 +1011,7 @@ It Contains Child Pornography It Contains Abusive Content - Home + Subscribed Local Notifications Messages