Fix Issue #859:Enabled menu item on selection

openMF · Aug 15, 2018 · a994468 · a994468
1 parent 78fb231
commit a994468
Showing 1 changed file with 20 additions and 9 deletions.
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/DashboardActivity.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/DashboardActivity.java
@@ -63,6 +63,7 @@ public class DashboardActivity extends MifosBaseActivity
     SwitchCompat userStatusToggle;
     private Menu menu;
     private boolean doubleBackToExitPressedOnce = false;
+    private boolean itemClient = true, itemCenter = true, itemGroup = true;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -93,19 +94,26 @@ public void onBackStackChanged() {
                         Fragment fragment = fragmentManager.findFragmentById(R.id.container);
                         if (fragment instanceof CreateNewClientFragment) {
                             setActionBarTitle(R.string.create_client);
-                            setMenuCreateClient(false);
-                            setMenuCreateCentre(true);
-                            setMenuCreateGroup(true);
+                            itemClient = false;
+                            itemGroup = true;
+                            itemCenter = true;
+                            invalidateOptionsMenu();
                         } else if (fragment instanceof CreateNewGroupFragment) {
                             setActionBarTitle(R.string.create_group);
-                            setMenuCreateClient(true);
-                            setMenuCreateCentre(true);
-                            setMenuCreateGroup(false);
+                            itemClient = true;
+                            itemGroup = false;
+                            itemCenter = true;
+                            invalidateOptionsMenu();
                         } else if (fragment instanceof CreateNewCenterFragment) {
                             setActionBarTitle(R.string.create_center);
-                            setMenuCreateClient(true);
-                            setMenuCreateCentre(false);
-                            setMenuCreateGroup(true);
+                            itemClient = true;
+                            itemGroup = true;
+                            itemCenter = false;
+                            invalidateOptionsMenu();
+                        } else {
+                            itemClient = true;
+                            itemGroup = true;
+                            itemCenter = true;
                         }
                     }
                 });
@@ -319,6 +327,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         hideKeyboard(mDrawerLayout);
+        menu.getItem(0).setEnabled(itemClient);
+        menu.getItem(1).setEnabled(itemCenter);
+        menu.getItem(2).setEnabled(itemGroup);
         return super.onPrepareOptionsMenu(menu);
     }