Fix progress bar colors, recipe deletion, maybe crash due to footerview

Author: caseydavenport

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <manifest
     package="com.biermacht.brews"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="29"
-    android:versionName="1.4.2">
+    android:versionCode="30"
+    android:versionName="1.4.3">
 
     <uses-sdk
         android:minSdkVersion="15"

src/com/biermacht/brews/database/DatabaseAPI.java

@@ -7,6 +7,7 @@
 import com.biermacht.brews.frontend.MainActivity;
 import com.biermacht.brews.ingredient.Ingredient;
 import com.biermacht.brews.recipe.MashProfile;
+import com.biermacht.brews.recipe.MashStep;
 import com.biermacht.brews.recipe.Recipe;
 import com.biermacht.brews.utils.Constants;
 import com.biermacht.brews.utils.comparators.RecipeComparator;
@@ -68,6 +69,14 @@ public boolean updateIngredient(Ingredient i, long dbid) {
 
   // Deletes the given recipe if it exists in the database.
   public boolean deleteRecipe(Recipe r) {
+    // Delete all ingredients for this recipe.
+    for (Ingredient i : r.getIngredientList()) {
+      this.deleteIngredientWithId(i.getId(), i.getDatabaseId());
+    }
+
+    // Delete the MashProfile.
+    this.deleteMashProfileFromDatabase(r.getMashProfile(), Constants.DATABASE_DEFAULT);
+
     return this.databaseInterface.deleteRecipeIfExists(r.getId());
   }
 
@@ -155,7 +164,10 @@ public ArrayList<MashProfile> getMashProfiles(long dbid) {
   }
 
   // Deletes the given mash profile
-  public boolean deleteMashProfileFromDatabase(long id, long dbid) {
-    return this.databaseInterface.deleteMashProfile(id, dbid);
+  public boolean deleteMashProfileFromDatabase(MashProfile p, long dbid) {
+    for (MashStep s : p.getMashStepList()) {
+      this.databaseInterface.deleteMashStep(s.getId());
+    }
+    return this.databaseInterface.deleteMashProfile(p.getId(), dbid);
   }
 }

src/com/biermacht/brews/frontend/adapters/DetailArrayAdapter.java

@@ -140,7 +140,7 @@ else if (this.isOk) {
       }
       else {
         this.vs.progressBar.getProgressDrawable().setColorFilter(
-                Color.RED, android.graphics.PorterDuff.Mode.SRC_IN);
+                color, android.graphics.PorterDuff.Mode.SRC_IN);
       }
     }
 

src/com/biermacht/brews/frontend/fragments/DetailsViewFragment.java

@@ -208,12 +208,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
       this.detailList.add(this.eff);
     }
 
-    // Create a new DetailArrayAdapter and set it on the listView.
-    this.mAdapter = new DetailArrayAdapter(getActivity(), this.detailList);
-    this.listView.setAdapter(this.mAdapter);
-
     // Set up the notes footer.
-    notesFooter = inflater.inflate(R.layout.notes_list_footer, container, false);
+    notesFooter = inflater.inflate(R.layout.notes_list_footer, null);
     TextView notesText = (TextView) notesFooter.findViewById(R.id.notes);
     TextView tasteNotesText = (TextView) notesFooter.findViewById(R.id.taste_notes);
 
@@ -247,6 +243,10 @@ public void onClick(View view) {
         startActivity(i);      }
     });
 
+    // Create a new DetailArrayAdapter and set it on the listView.
+    this.mAdapter = new DetailArrayAdapter(getActivity(), this.detailList);
+    this.listView.setAdapter(this.mAdapter);
+
     return this.pageView;
     }
 

src/com/biermacht/brews/recipe/MashProfile.java

@@ -428,6 +428,6 @@ public void save(Context c, long database) {
   }
 
   public void delete(Context c, long database) {
-    new DatabaseAPI(c).deleteMashProfileFromDatabase(this.getId(), database);
+    new DatabaseAPI(c).deleteMashProfileFromDatabase(this, database);
   }
 }