Fixed bug where fragments were shown over one another

6 files changed, 11 insertions, 11 deletions

diff --git a/app/src/main/java/org/rssin/android/HomeScreenActivity.java b/app/src/main/java/org/rssin/android/HomeScreenActivity.java
index 24fa6c3..337cb80 100755
--- a/app/src/main/java/org/rssin/android/HomeScreenActivity.java
+++ b/app/src/main/java/org/rssin/android/HomeScreenActivity.java
@@ -82,17 +82,7 @@ public class HomeScreenActivity extends ActionBarActivity implements NavigationD
 

     @Override

     public boolean onOptionsItemSelected(MenuItem item) {

-        // Handle action bar item clicks here. The action bar will

-        // automatically handle clicks on the Home/Up button, so long

-        // as you specify a parent activity in AndroidManifest.xml.

-        int id = item.getItemId();

-

-        if(currentFragment.onOptionsItemSelected(item))

-        {

-            return true;

-        }

-

-        return super.onOptionsItemSelected(item);

+        return currentFragment.onOptionsItemSelected(item) || super.onOptionsItemSelected(item);

     }

 

 }

diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerAllFeedsFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerAllFeedsFragment.java
index e32b7e6..db6a464 100755
--- a/app/src/main/java/org/rssin/android/NavigationDrawerAllFeedsFragment.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerAllFeedsFragment.java
@@ -35,6 +35,8 @@ public class NavigationDrawerAllFeedsFragment extends Fragment {
     @Override

     public View onCreateView(LayoutInflater inflater, ViewGroup container,

                              Bundle savedInstanceState) {

+        container.removeAllViews();

+

         final View rootView = inflater.inflate(R.layout.fragment_home_screen, container, false);

         final RecyclerView mRecyclerView = (RecyclerView) rootView.findViewById(R.id.unified_inbox_feeditems);

         final Context context = mRecyclerView.getContext();

diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerFeedFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerFeedFragment.java
index 66b808b..cafbb84 100755
--- a/app/src/main/java/org/rssin/android/NavigationDrawerFeedFragment.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerFeedFragment.java
@@ -56,6 +56,8 @@ public class NavigationDrawerFeedFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,

                              Bundle savedInstanceState)

     {

+        container.removeAllViews();

+

         final Bundle args = getArguments();

         final View rootView = inflater.inflate(R.layout.fragment_home_screen, container, false);

         final RecyclerView mRecyclerView = (RecyclerView) rootView.findViewById(R.id.unified_inbox_feeditems);

diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerFilterFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerFilterFragment.java
index ececd81..287ca3b 100755
--- a/app/src/main/java/org/rssin/android/NavigationDrawerFilterFragment.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerFilterFragment.java
@@ -52,6 +52,8 @@ public class NavigationDrawerFilterFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,

                              Bundle savedInstanceState)

     {

+        container.removeAllViews();

+

         final Bundle args = getArguments();

         final View rootView = inflater.inflate(R.layout.fragment_home_screen, container, false);

         final RecyclerView mRecyclerView = (RecyclerView) rootView.findViewById(R.id.unified_inbox_feeditems);

diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
index dc2cfd6..d115a1e 100755
--- a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
@@ -59,6 +59,8 @@ public class NavigationDrawerManageFeedsFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,

                              Bundle savedInstanceState)

     {

+        container.removeAllViews();

+

         final Bundle args = getArguments();

         rootView = inflater.inflate(R.layout.fragment_feeds, container, false);

         final Context context = rootView.getContext();

diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java
index 42be75f..1c8200c 100755
--- a/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java
@@ -46,6 +46,8 @@ public class NavigationDrawerManageFiltersFragment extends Fragment {
     @Override

     public View onCreateView(LayoutInflater inflater, ViewGroup container,

                              Bundle savedInstanceState) {

+        container.removeAllViews();

+

         rootView = inflater.inflate(R.layout.fragment_filters, container, false);

         final Context context = rootView.getContext();