Merge branch 'fix/garden-select' into develop

* fix/garden-select: Prevent double item selection when adding new garden
7LPdWcaW · Jan 23, 2019 · 26e4d69 · 26e4d69
2 parents dc0c875 + fb266c6
commit 26e4d69
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/app/src/main/java/me/anon/grow/MainActivity.java b/app/src/main/java/me/anon/grow/MainActivity.java
@@ -213,6 +213,13 @@ else if (item.getItemId() == R.id.add)
 						GardenManager.getInstance().getGardens().set(index, garden);
 					}
 
+					MenuItem item = navigation.getMenu().findItem(selectedItem);
+
+					if (item != null)
+					{
+						item.setChecked(false);
+					}
+
 					selectedItem = 100 + index;
 
 					setNavigationView();
@@ -250,7 +257,14 @@ else if (item.getItemId() >= 100 && item.getItemId() < Integer.MAX_VALUE)
 		{
 			navigation.getMenu().findItem(R.id.garden_menu).getSubMenu().findItem(R.id.all).setChecked(false);
 
+			MenuItem selected = navigation.getMenu().findItem(selectedItem);
+			if (selected != null)
+			{
+				selected.setChecked(false);
+			}
+
 			selectedItem = item.getItemId();
+			item.setChecked(true);
 			int gardenIndex = item.getItemId() - 100;
 			getFragmentManager().beginTransaction().replace(R.id.fragment_holder, PlantListFragment.newInstance(GardenManager.getInstance().getGardens().get(gardenIndex)), TAG_FRAGMENT).commit();
 		}