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

Add drafts, settings, and more menu entries

This commit is contained in:
tom79 2019-09-29 18:33:58 +02:00
parent 94ef02f69b
commit 02f8d2f45f
3 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1879,7 +1879,7 @@ public abstract class BaseMainActivity extends BaseActivity
toolbarTitle.setVisibility(View.VISIBLE); toolbarTitle.setVisibility(View.VISIBLE);
delete_instance.setVisibility(View.GONE); delete_instance.setVisibility(View.GONE);
appBar.setExpanded(true); appBar.setExpanded(true);
if (id != R.id.nav_drafts && id != R.id.nav_bookmarks && id != R.id.nav_peertube) { if (id != R.id.nav_drafts && id != R.id.nav_pixelfed_drafts && id != R.id.nav_bookmarks && id != R.id.nav_peertube) {
delete_all.hide(); delete_all.hide();
} else { } else {
delete_all.show(); delete_all.show();
@ -1903,7 +1903,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 || id == R.id.nav_pixelfed_favorites) { } else if (id == R.id.nav_favorites) {
toot.hide(); toot.hide();
statusFragment = new DisplayStatusFragment(); statusFragment = new DisplayStatusFragment();
bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.FAVOURITES); bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.FAVOURITES);
@ -1964,7 +1964,7 @@ public abstract class BaseMainActivity extends BaseActivity
fragmentTag = "HOW_TO_VIDEOS"; fragmentTag = "HOW_TO_VIDEOS";
fragmentManager.beginTransaction() fragmentManager.beginTransaction()
.replace(R.id.main_app_container, displayHowToFragment, fragmentTag).commit(); .replace(R.id.main_app_container, displayHowToFragment, fragmentTag).commit();
} else if (id == R.id.nav_muted || id == R.id.nav_pixelfed_muted) { } else if (id == R.id.nav_muted ) {
toot.hide(); toot.hide();
accountsFragment = new DisplayAccountsFragment(); accountsFragment = new DisplayAccountsFragment();
bundle.putSerializable("type", RetrieveAccountsAsyncTask.Type.MUTED); bundle.putSerializable("type", RetrieveAccountsAsyncTask.Type.MUTED);
@ -1972,13 +1972,13 @@ public abstract class BaseMainActivity extends BaseActivity
fragmentTag = "MUTED"; fragmentTag = "MUTED";
fragmentManager.beginTransaction() fragmentManager.beginTransaction()
.replace(R.id.main_app_container, accountsFragment, fragmentTag).commit(); .replace(R.id.main_app_container, accountsFragment, fragmentTag).commit();
} else if (id == R.id.nav_scheduled) { } else if (id == R.id.nav_scheduled || id == R.id.nav_pixelfed_scheduled) {
tootShow(); tootShow();
TabLayoutScheduleFragment tabLayoutScheduleFragment = new TabLayoutScheduleFragment(); TabLayoutScheduleFragment tabLayoutScheduleFragment = new TabLayoutScheduleFragment();
fragmentTag = "SCHEDULED"; fragmentTag = "SCHEDULED";
fragmentManager.beginTransaction() fragmentManager.beginTransaction()
.replace(R.id.main_app_container, tabLayoutScheduleFragment, fragmentTag).commit(); .replace(R.id.main_app_container, tabLayoutScheduleFragment, fragmentTag).commit();
} else if (id == R.id.nav_drafts) { } else if (id == R.id.nav_drafts || id == R.id.nav_pixelfed_drafts) {
DisplayDraftsFragment displayDraftsFragment = new DisplayDraftsFragment(); DisplayDraftsFragment displayDraftsFragment = new DisplayDraftsFragment();
fragmentTag = "DRAFTS"; fragmentTag = "DRAFTS";
fragmentManager.beginTransaction() fragmentManager.beginTransaction()

4
app/src/main/java/app/fedilab/android/helper/Helper.java
View File

@ -1600,9 +1600,9 @@ public class Helper {
MenuItem itemCom = menu.findItem(R.id.nav_main_com); MenuItem itemCom = menu.findItem(R.id.nav_main_com);
if (itemCom != null) if (itemCom != null)
itemCom.setVisible(false); itemCom.setVisible(false);
MenuItem itemOpt = menu.findItem(R.id.nav_main_opt); /*MenuItem itemOpt = menu.findItem(R.id.nav_main_opt);
if (itemOpt != null) if (itemOpt != null)
itemOpt.setVisible(false); itemOpt.setVisible(false);*/
MenuItem itemPCom = menu.findItem(R.id.nav_peertube_comm); MenuItem itemPCom = menu.findItem(R.id.nav_peertube_comm);
if (itemPCom != null) if (itemPCom != null)
itemPCom.setVisible(false); itemPCom.setVisible(false);

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

@ -114,36 +114,18 @@
android:id="@+id/nav_pixelfed_comm"> android:id="@+id/nav_pixelfed_comm">
<menu> <menu>
<group android:checkableBehavior="single"> <group android:checkableBehavior="single">
<!--
<item <item
android:id="@+id/nav_peertube_fav" android:id="@+id/nav_pixelfed_scheduled"
android:icon="@drawable/ic_favorite_peertube_full" android:icon="@drawable/ic_schedule"
android:title="@string/peertube_favorites" /> android:title="@string/scheduled_toots" />
-->
<!--
<item <item
android:id="@+id/nav_my_photo" android:id="@+id/nav_pixelfed_drafts"
android:icon="@drawable/ic_pixelfed_media" android:icon="@drawable/ic_save_white"
android:title="@string/my_pictures" /> android:title="@string/drafts" />
-->
<item
android:id="@+id/nav_pixelfed_favorites"
android:icon="@drawable/ic_pixelfed_favorite"
android:title="@string/favorites_menu" />
<item <item
android:id="@+id/nav_pixelfed_blocked" android:id="@+id/nav_pixelfed_blocked"
android:icon="@drawable/ic_block" android:icon="@drawable/ic_block"
android:title="@string/blocked_menu" /> android:title="@string/blocked_menu" />
<item
android:id="@+id/nav_pixelfed_muted"
android:icon="@drawable/ic_volume_mute"
android:title="@string/muted_menu" />
<!--
<item
android:id="@+id/nav_pixelfed_settings"
android:icon="@drawable/ic_settings"
android:title="@string/settings" />
-->
</group> </group>
</menu> </menu>
</item> </item>