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

Fix some issues related to showing sort type on toolbars.

Browse Source
This commit is contained in:
Alex Ning 2020-06-05 23:28:04 +08:00
parent e9ffe5a13c
commit ff5691aecb
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MainActivity.java
View File

@ -1375,16 +1375,30 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
void displaySortTypeInToolbar() { void displaySortTypeInToolbar() {
switch (viewPager.getCurrentItem()) { switch (viewPager.getCurrentItem()) {
case 0: case 0:
if (mAccessToken != null) {
if (tab1 != null) { if (tab1 != null) {
SortType sortType = tab1.getSortType(); SortType sortType = tab1.getSortType();
Utils.displaySortTypeInToolbar(sortType, toolbar); Utils.displaySortTypeInToolbar(sortType, toolbar);
} }
break; } else {
case 1:
if (tab2 != null) { if (tab2 != null) {
SortType sortType = tab2.getSortType(); SortType sortType = tab2.getSortType();
Utils.displaySortTypeInToolbar(sortType, toolbar); Utils.displaySortTypeInToolbar(sortType, toolbar);
} }
}
break;
case 1:
if (mAccessToken != null) {
if (tab2 != null) {
SortType sortType = tab2.getSortType();
Utils.displaySortTypeInToolbar(sortType, toolbar);
}
} else {
if (tab3 != null) {
SortType sortType = tab3.getSortType();
Utils.displaySortTypeInToolbar(sortType, toolbar);
}
}
break; break;
case 2: case 2:
if (tab3 != null) { if (tab3 != null) {

2
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java
View File

@ -345,7 +345,7 @@ public class ViewPostDetailActivity extends BaseActivity implements FlairBottomS
}; };
mSingleCommentId = getIntent().getStringExtra(EXTRA_SINGLE_COMMENT_ID); mSingleCommentId = getIntent().getStringExtra(EXTRA_SINGLE_COMMENT_ID);
sortType = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_POST_COMMENT, SortType.Type.BEST.value); sortType = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_POST_COMMENT, SortType.Type.BEST.value.toUpperCase());
mToolbar.setTitle(new SortType(SortType.Type.valueOf(sortType)).getType().fullName); mToolbar.setTitle(new SortType(SortType.Type.valueOf(sortType)).getType().fullName);
sortType = sortType.toLowerCase(); sortType = sortType.toLowerCase();
if (savedInstanceState == null) { if (savedInstanceState == null) {