From f5edf67c1511fc20a62e99f6453b1ef27b7b88fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= Date: Tue, 30 Oct 2018 19:03:20 +0100 Subject: [PATCH] Working activity without bottom navigation --- .../java/com/uam/wmi/findmytutor/activity/BaseActivity.java | 4 ++-- .../com/uam/wmi/findmytutor/activity/UsersListActivity.java | 6 +++--- app/src/main/res/layout/users_list.xml | 3 +++ app/src/main/res/layout/users_list_main.xml | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java index 6fe2d49..7c43a75 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java @@ -173,10 +173,10 @@ public abstract class BaseActivity setFragment(sharingFragment); } else if (itemId == R.id.nav_user_list) { - //removeFragment(sharingFragment); + removeFragment(sharingFragment); startActivity(new Intent(this, UsersListActivity.class)); } - finish(); + //finish(); }, 300); return true; diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListActivity.java index 525ee06..71415ee 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListActivity.java @@ -219,17 +219,17 @@ public class UsersListActivity extends BaseActivity { disposable.dispose(); } - @Override + protected int getContentViewId() { return R.layout.users_list; } - @Override + protected int getNavigationMenuItemId() { return R.id.nav_user_list; } - @Override + public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); } diff --git a/app/src/main/res/layout/users_list.xml b/app/src/main/res/layout/users_list.xml index 2feba05..074de2b 100644 --- a/app/src/main/res/layout/users_list.xml +++ b/app/src/main/res/layout/users_list.xml @@ -5,12 +5,15 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".activity.UsersListActivity"> + + diff --git a/app/src/main/res/layout/users_list_main.xml b/app/src/main/res/layout/users_list_main.xml index 47b4d8e..4266a83 100644 --- a/app/src/main/res/layout/users_list_main.xml +++ b/app/src/main/res/layout/users_list_main.xml @@ -9,6 +9,7 @@ tools:context=".activity.UsersListActivity" tools:showIn="@layout/users_list_main"> +