mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-12-29 04:17:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename Home feed to "Subscribed" feed

Browse Source
This commit is contained in:
Balazs Toldi 2023-08-11 08:42:16 +02:00
parent 82414bba55
commit b8c3dae807
No known key found for this signature in database
GPG Key ID: 6C7D440036F99D58
26 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/toldi/infinityforlemmy/activities/FilteredPostsActivity.java
View File

@ -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);

2
app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java
View File

@ -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)));

9
app/src/main/java/eu/toldi/infinityforlemmy/fragments/PostFragment.java
View File

@ -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));
}

2
app/src/main/java/eu/toldi/infinityforlemmy/settings/CustomizeMainPageTabsFragment.java
View File

@ -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]);

2
app/src/main/res/layout/fragment_new_post_filter_usage_bottom_sheet.xml
View File

@ -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"

2
app/src/main/res/values-cs/strings.xml
View File

@ -712,7 +712,7 @@
<string name="report_reason_general_copyright_issue">Obsahuje problém s autorskými právy</string>
<string name="report_reason_general_child_pornography">Obsahuje dětskou pornografii</string>
<string name="report_reason_general_abusive_content">Obsahuje zneužívající obsah</string>
<string name="home">Domů</string>
<string name="subscribed_feed">Domů</string>
<string name="local">Populární</string>
<string name="notifications">Oznámení</string>
<string name="messages">Zprávy</string>

2
app/src/main/res/values-de/strings.xml
View File

@ -739,7 +739,7 @@
<string name="report_reason_general_copyright_issue">Es enthält urheberrechtlich geschütztes Material</string>
<string name="report_reason_general_child_pornography">Es enthält Kinderpornografie</string>
<string name="report_reason_general_abusive_content">Es enthält gewalttätiges Material</string>
<string name="home">Home</string>
<string name="subscribed_feed">Home</string>
<string name="local">Beliebt</string>
<string name="notifications">Benachrichtigungen</string>
<string name="messages">Nachrichten</string>

2
app/src/main/res/values-es/strings.xml
View File

@ -734,7 +734,7 @@ Premio means prize, so it's better suited the first word instead of the second o
<string name="report_reason_general_copyright_issue">Contiene Copyright</string>
<string name="report_reason_general_child_pornography">Contiene pornografía infantil</string>
<string name="report_reason_general_abusive_content">Contiene contenido abusivo</string>
<string name="home">Inicio</string>
<string name="subscribed_feed">Inicio</string>
<string name="local">Popular</string>
<string name="notifications">Notificaciones</string>
<string name="messages">Mensajes</string>

2
app/src/main/res/values-fr/strings.xml
View File

@ -754,7 +754,7 @@ https://s3.eu-west-1.amazonaws.com/po-pub/i/dFZKKms9HbrDGOlcgW9QTcwF.jpg -->
<string name="report_reason_general_copyright_issue">Ça contient des problèmes de droits d\'auteur</string>
<string name="report_reason_general_child_pornography">Ça contient de la pédopornographie</string>
<string name="report_reason_general_abusive_content">Ça contient du contenu abusif</string>
<string name="home">Suivi</string>
<string name="subscribed_feed">Suivi</string>
<string name="local">Local</string>
<string name="notifications">Notifications</string>
<string name="messages">Messages</string>

2
app/src/main/res/values-hi/strings.xml
View File

@ -750,7 +750,7 @@ Behavior -->
<string name="report_reason_general_copyright_issue">"इसमें कापीराइट के मुद्दे हैं "</string>
<string name="report_reason_general_child_pornography">"इसमें चाइल्ड पाॅर्नोग्राफी है "</string>
<string name="report_reason_general_abusive_content">"इसकी अंतःवस्तु अनुचित है "</string>
<string name="home">"होम "</string>
<string name="subscribed_feed">"होम "</string>
<string name="local">"लोकप्रिय "</string>
<string name="notifications">"अधिसूचनाएं "</string>
<string name="messages">"संदेश "</string>

2
app/src/main/res/values-hr/strings.xml
View File

@ -724,7 +724,7 @@
<string name="report_reason_general_copyright_issue">Sadrži povredu autorskih prava</string>
<string name="report_reason_general_child_pornography">Sadrži dječju pornografiju</string>
<string name="report_reason_general_abusive_content">Sadrži uvredljiv sadržaj</string>
<string name="home">Naslovnica</string>
<string name="subscribed_feed">Naslovnica</string>
<string name="local">Popularno</string>
<string name="notifications">Obavijesti</string>
<string name="messages">Poruke</string>

2
app/src/main/res/values-hu/strings.xml
View File

@ -712,7 +712,7 @@
<string name="report_reason_general_copyright_issue">Ez szerzői jogi problémát tartalmaz</string>
<string name="report_reason_general_child_pornography">Ez gyermek gyermek pornográfiát tartalmaz</string>
<string name="report_reason_general_abusive_content">Ez bántalmazó tartalmat tartalmaz</string>
<string name="home">Home</string>
<string name="subscribed_feed">Home</string>
<string name="local">Helyi</string>
<string name="notifications">Értesítések</string>
<string name="messages">Üzenetek</string>

2
app/src/main/res/values-it/strings.xml
View File

@ -702,7 +702,7 @@
<string name="report_reason_general_copyright_issue">Contiene problemi di Copyright</string>
<string name="report_reason_general_child_pornography">Contiene pedopornografia</string>
<string name="report_reason_general_abusive_content">Contiene contenuto offensivo</string>
<string name="home">Home</string>
<string name="subscribed_feed">Home</string>
<string name="local">Popolari</string>
<string name="notifications">Notifiche</string>
<string name="messages">Messaggi</string>

2
app/src/main/res/values-ja/strings.xml
View File

@ -752,7 +752,7 @@
<string name="report_reason_general_copyright_issue">著作権侵害が含まれている</string>
<string name="report_reason_general_child_pornography">児童ポルノが含まれている</string>
<string name="report_reason_general_abusive_content">虐待的内容が含まれている</string>
<string name="home">ホーム</string>
<string name="subscribed_feed">ホーム</string>
<string name="local">人気</string>
<string name="notifications">通知</string>
<string name="messages">メッセージ</string>

2
app/src/main/res/values-nl/strings.xml
View File

@ -717,7 +717,7 @@ not: "5 uren" -->
<string name="report_reason_general_copyright_issue">Het bevat een auteursrechtkwestie</string>
<string name="report_reason_general_child_pornography">Het bevat kinderpornografie</string>
<string name="report_reason_general_abusive_content">Het bevat beledigende inhoud</string>
<string name="home">Thuis</string>
<string name="subscribed_feed">Thuis</string>
<string name="local">Populair</string>
<string name="notifications">Notificaties</string>
<string name="messages">Berichten</string>

2
app/src/main/res/values-pl/strings.xml
View File

@ -707,7 +707,7 @@
<string name="report_reason_general_copyright_issue">Zawiera kwestię dotyczącą praw autorskich</string>
<string name="report_reason_general_child_pornography">Zawiera pornografię dziecięcą</string>
<string name="report_reason_general_abusive_content">Zawiera obraźliwe treści</string>
<string name="home">Strona główna</string>
<string name="subscribed_feed">Strona główna</string>
<string name="local">Popularne</string>
<string name="notifications">Powiadomienia</string>
<string name="messages">Wiadomości</string>

2
app/src/main/res/values-pt-rBR/strings.xml
View File

@ -712,7 +712,7 @@
<string name="report_reason_general_copyright_issue">Contém problemas com direitos autorais</string>
<string name="report_reason_general_child_pornography">Contém pornografia infantil</string>
<string name="report_reason_general_abusive_content">Contém conteúdo abusivo</string>
<string name="home">Tela inicial</string>
<string name="subscribed_feed">Tela inicial</string>
<string name="local">Popular</string>
<string name="notifications">Notificações</string>
<string name="messages">Mensagens</string>

2
app/src/main/res/values-pt/strings.xml
View File

@ -704,7 +704,7 @@
<string name="report_reason_general_copyright_issue">Contém Problemas de Direitos de Autor</string>
<string name="report_reason_general_child_pornography">Contém Pornografia Infantil</string>
<string name="report_reason_general_abusive_content">Contém Conteúdo Abusivo</string>
<string name="home">Início</string>
<string name="subscribed_feed">Início</string>
<string name="local">Local</string>
<string name="notifications">Notificações</string>
<string name="messages">Mensagens</string>

2
app/src/main/res/values-ro/strings.xml
View File

@ -730,7 +730,7 @@
<string name="report_reason_general_copyright_issue">Conține Probleme Legate cu Drepturile de Autor</string>
<string name="report_reason_general_child_pornography">Conține Pornografie Infantilă</string>
<string name="report_reason_general_abusive_content">Conține Conținut Abuziv</string>
<string name="home">Acasă</string>
<string name="subscribed_feed">Acasă</string>
<string name="local">Popular</string>
<string name="notifications">Notificări</string>
<string name="messages">Mesaje</string>

2
app/src/main/res/values-ru/strings.xml
View File

@ -716,7 +716,7 @@
<string name="report_reason_general_copyright_issue">Содержит нарушение авторских прав</string>
<string name="report_reason_general_child_pornography">Содержит детскую порнографию</string>
<string name="report_reason_general_abusive_content">Содержит оскорбительный контент</string>
<string name="home">Главная</string>
<string name="subscribed_feed">Главная</string>
<string name="local">Популярное</string>
<string name="notifications">Уведомления</string>
<string name="messages">Сообщения</string>

2
app/src/main/res/values-tr-rTR/strings.xml
View File

@ -722,7 +722,7 @@ This translation does it work well in this kinda format. People use "since" in s
<string name="report_reason_general_copyright_issue">Telif Hakkı Meselesi İçeriyor</string>
<string name="report_reason_general_child_pornography">Çocuk Pornografisi İçeriyor</string>
<string name="report_reason_general_abusive_content">Kötüye Kullanım Amaçlı İçerik İçeriyor</string>
<string name="home">Ana Sayfa</string>
<string name="subscribed_feed">Ana Sayfa</string>
<string name="local">Popüler</string>
<string name="notifications">Bildirimler</string>
<string name="messages">Mesajlar</string>

2
app/src/main/res/values-uk/strings.xml
View File

@ -709,7 +709,7 @@
<string name="report_reason_general_copyright_issue">Містить проблему авторських прав</string>
<string name="report_reason_general_child_pornography">Містить дитячу порнографію</string>
<string name="report_reason_general_abusive_content">Містить образливий вміст</string>
<string name="home">Домівка</string>
<string name="subscribed_feed">Домівка</string>
<string name="local">Популярне</string>
<string name="notifications">Сповіщення</string>
<string name="messages">Повідомлення</string>

2
app/src/main/res/values-vi/strings.xml
View File

@ -713,7 +713,7 @@
<string name="report_reason_general_copyright_issue">Nó chứa vấn đề bản quyền</string>
<string name="report_reason_general_child_pornography">Nó chứa porn trẻ em</string>
<string name="report_reason_general_abusive_content">Nó chứa nội dung lạm dụng</string>
<string name="home">Trang chủ</string>
<string name="subscribed_feed">Trang chủ</string>
<string name="local">Phổ biến</string>
<string name="notifications">Thông báo</string>
<string name="messages">Tin nhắn</string>

2
app/src/main/res/values-zh-rCN/strings.xml
View File

@ -734,7 +734,7 @@
<string name="report_reason_general_copyright_issue">帖子有版权问题</string>
<string name="report_reason_general_child_pornography">它包含儿童色情内容</string>
<string name="report_reason_general_abusive_content">它包含侮辱性内容</string>
<string name="home">主页</string>
<string name="subscribed_feed">主页</string>
<string name="local">热门</string>
<string name="notifications">通知</string>
<string name="messages">消息</string>

30
app/src/main/res/values/arrays.xml
View File

@ -194,7 +194,7 @@
</string-array>
<string-array name="settings_tab_post_type">
<item>@string/home</item>
<item>@string/subscribed_feed</item>
<item>@string/local</item>
<item>@string/all</item>
<item>@string/community</item>
@ -208,7 +208,7 @@
</string-array>
<string-array name="settings_tab_post_type_anonymous">
<item>@string/home</item>
<item>@string/subscribed_feed</item>
<item>@string/local</item>
<item>@string/all</item>
<item>@string/community</item>
@ -336,7 +336,7 @@
</string-array>
<string-array name="settings_other_activities_bottom_app_bar_options">
<item>@string/home</item>
<item>@string/subscribed_feed</item>
<item>@string/subscriptions</item>
<item>@string/inbox</item>
<item>@string/profile</item>
@ -360,7 +360,7 @@
</string-array>
<string-array name="settings_other_activities_bottom_app_bar_options_anonymous">
<item>@string/home</item>
<item>@string/subscribed_feed</item>
<item>@string/subscriptions</item>
<item>@string/multi_reddits</item>
<item>@string/refresh</item>
@ -543,17 +543,17 @@
</string-array>
<string-array name="settings_default_sort_time_values">
<item>HOUR</item>
<item>6HOURS</item>
<item>12HOURS</item>
<item>DAY</item>
<item>WEEK</item>
<item>MONTH</item>
<item>3MONTHS</item>
<item>6MONTHS</item>
<item>9MONTHS</item>
<item>YEAR</item>
<item>ALL</item>
<item>TopHour</item>
<item>TopSixHour</item>
<item>TopTwelveHour</item>
<item>TopDay</item>
<item>TopWeek</item>
<item>TopMonth</item>
<item>TopThreeMonths</item>
<item>TopSixMonths</item>
<item>TopNineMonths</item>
<item>TopYear</item>
<item>TopAll</item>
</string-array>
<string-array name="settings_default_search_result_tab">

2
app/src/main/res/values/strings.xml
View File

@ -1011,7 +1011,7 @@
<string name="report_reason_general_child_pornography">It Contains Child Pornography</string>
<string name="report_reason_general_abusive_content">It Contains Abusive Content</string>
<string name="home">Home</string>
<string name="subscribed_feed">Subscribed</string>
<string name="local">Local</string>
<string name="notifications">Notifications</string>
<string name="messages">Messages</string>