Fixes #84

Merge branch 'feature/seedling-stage' into develop * feature/seedling-stage: Adds seedling stage
7LPdWcaW · Jun 15, 2019 · 2eaf556 · 2eaf556
2 parents ae07a1f + e6f18e1
commit 2eaf556
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/app/src/main/java/me/anon/grow/fragment/PlantListFragment.java b/app/src/main/java/me/anon/grow/fragment/PlantListFragment.java
@@ -457,7 +457,7 @@ else if (item.getItemId() == R.id.delete_garden)
 				saveCurrentState();
 			}
 
-			int[] ids = {R.id.filter_planted, R.id.filter_germination, R.id.filter_cutting, R.id.filter_vegetation, R.id.filter_flowering, R.id.filter_drying, R.id.filter_curing, R.id.filter_harvested};
+			int[] ids = {R.id.filter_planted, R.id.filter_germination, R.id.filter_seedling, R.id.filter_cutting, R.id.filter_vegetation, R.id.filter_flowering, R.id.filter_drying, R.id.filter_curing, R.id.filter_harvested};
 			PlantStage[] stages = PlantStage.values();
 
 			for (int index = 0; index < ids.length; index++)

diff --git a/app/src/main/java/me/anon/model/PlantStage.java b/app/src/main/java/me/anon/model/PlantStage.java
@@ -13,6 +13,7 @@ public enum PlantStage
 {
 	PLANTED("Planted"),
 	GERMINATION("Germination"),
+	SEEDLING("Seedling"),
 	CUTTING("Cutting"),
 	VEGETATION("Vegetation"),
 	FLOWER("Flower"),

diff --git a/app/src/main/res/menu/plant_list_menu.xml b/app/src/main/res/menu/plant_list_menu.xml
@@ -24,6 +24,12 @@
 					android:checked="true"
 				/>
 
+				<item
+					android:id="@+id/filter_seedling"
+					android:title="Seedling"
+					android:checked="true"
+				/>
+
 				<item
 					android:id="@+id/filter_cutting"
 					android:title="Cutting"