Merge pull request #18 from Maangchi/Knappe-WorkBranch

Added More amount types
Maangchi · Dec 11, 2021 · d99a1d7 · d99a1d7
2 parents 1e9f264 + 5410a93
commit d99a1d7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/app/src/main/java/com/example/cmsc355cookbookapp/Ingredients_class.java b/app/src/main/java/com/example/cmsc355cookbookapp/Ingredients_class.java
@@ -16,10 +16,8 @@ public Ingredients_class (int ing_id, String name, int amount, String amount_typ
         Amount_type = amount_type;
         this.need = need;
     }
-
     public Ingredients_class() {
     }
-
     //toString
     @Override
     public String toString() {
@@ -31,7 +29,6 @@ public String toString() {
                 ", need=" + need +
                 '}';
     }
-
     //getters and setters
     public void setIng_id(int ing_id) {
         this.ing_id = ing_id;

diff --git a/app/src/main/java/com/example/cmsc355cookbookapp/MainActivity.java b/app/src/main/java/com/example/cmsc355cookbookapp/MainActivity.java
@@ -43,6 +43,13 @@ public void onClick(View v) {
                 openPantry();
             }
         });
+
+        recipe_btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                openRecipes();
+            }
+        });
     }
 
     public void openPantry() {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -15,13 +15,15 @@
     <string-array name="amount_types">
         <item>Pounds</item>
         <item>Ounces</item>
+        <item>Gallons</item>
+        <item>Quarts</item>
+        <item>Pints</item>
         <item>Cups</item>
-        <item>tablespoon</item>
-        <item>teaspoon</item>
+        <item>Tablespoon</item>
+        <item>Teaspoon</item>
         <item>Grams</item>
         <item>Kilograms</item>
         <item>Liter</item>
         <item>MilliLiters</item>
-        <item>pint</item>
     </string-array>
 </resources>