Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

move favourites in communication group menu

This commit is contained in:
tom79 2020-03-28 11:38:16 +01:00
parent c97ecda3e1
commit 2a10541e4c
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
View File

@ -1809,7 +1809,7 @@ public abstract class BaseMainActivity extends BaseActivity
fragmentManager.beginTransaction() fragmentManager.beginTransaction()
.replace(R.id.main_app_container, displayPeertubeNotificationsFragment, fragmentTag).commit(); .replace(R.id.main_app_container, displayPeertubeNotificationsFragment, fragmentTag).commit();
} else if (id == R.id.nav_favorites) { } else if (id == R.id.nav_favorites || id == R.id.nav_favorites_px) {
toot.hide(); toot.hide();
statusFragment = new DisplayStatusFragment(); statusFragment = new DisplayStatusFragment();
bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.FAVOURITES); bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.FAVOURITES);
@ -2209,7 +2209,12 @@ public abstract class BaseMainActivity extends BaseActivity
if (faveFrag != null && faveFrag.isVisible()) { if (faveFrag != null && faveFrag.isVisible()) {
faveFrag.scrollToTop(); faveFrag.scrollToTop();
} }
} else if (navigationView.getMenu().findItem(R.id.nav_blocked) != null && navigationView.getMenu().findItem(R.id.nav_blocked).isChecked()) { } else if (navigationView.getMenu().findItem(R.id.nav_favorites_px) != null && navigationView.getMenu().findItem(R.id.nav_favorites_px).isChecked()) {
DisplayStatusFragment faveFrag = (DisplayStatusFragment) fragmentManager.findFragmentByTag("FAVOURITES");
if (faveFrag != null && faveFrag.isVisible()) {
faveFrag.scrollToTop();
}
} else if (navigationView.getMenu().findItem(R.id.nav_blocked) != null && navigationView.getMenu().findItem(R.id.nav_blocked).isChecked()) {
DisplayAccountsFragment blockFrag = (DisplayAccountsFragment) fragmentManager.findFragmentByTag("BLOCKS"); DisplayAccountsFragment blockFrag = (DisplayAccountsFragment) fragmentManager.findFragmentByTag("BLOCKS");
if (blockFrag != null && blockFrag.isVisible()) { if (blockFrag != null && blockFrag.isVisible()) {

12
app/src/main/res/menu/activity_main_drawer.xml
View File

@ -30,6 +30,10 @@
android:id="@+id/nav_list" android:id="@+id/nav_list"
android:icon="@drawable/ic_list" android:icon="@drawable/ic_list"
android:title="@string/action_lists" /> android:title="@string/action_lists" />
<item
android:id="@+id/nav_favorites"
android:icon="@drawable/ic_star_menu"
android:title="@string/favorites_menu" />
<item <item
android:id="@+id/nav_group" android:id="@+id/nav_group"
android:icon="@drawable/ic_group_work" android:icon="@drawable/ic_group_work"
@ -123,6 +127,10 @@
android:title="@string/communication_menu_title"> android:title="@string/communication_menu_title">
<menu> <menu>
<group android:checkableBehavior="single"> <group android:checkableBehavior="single">
<item
android:id="@+id/nav_favorites_px"
android:icon="@drawable/ic_star_menu"
android:title="@string/favorites_menu" />
<item <item
android:id="@+id/nav_pixelfed_scheduled" android:id="@+id/nav_pixelfed_scheduled"
android:icon="@drawable/ic_schedule" android:icon="@drawable/ic_schedule"
@ -151,10 +159,6 @@
android:id="@+id/nav_settings" android:id="@+id/nav_settings"
android:icon="@drawable/ic_settings" android:icon="@drawable/ic_settings"
android:title="@string/settings" /> android:title="@string/settings" />
<item
android:id="@+id/nav_favorites"
android:icon="@drawable/ic_star_menu"
android:title="@string/favorites_menu" />
<item <item
android:id="@+id/nav_blocked" android:id="@+id/nav_blocked"
android:icon="@drawable/ic_block" android:icon="@drawable/ic_block"