Skip to content

Commit

Permalink
New dry-yeasts, fix some ingredient activities.
Browse files Browse the repository at this point in the history
  • Loading branch information
@caseydavenport
caseydavenport committed Mar 29, 2016
1 parent 123b332 commit c8599cf
Show file tree
Hide file tree
Showing 18 changed files with 541 additions and 151 deletions.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<manifest
package="com.biermacht.brews"
xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="25"
android:versionName="1.3">
android:versionCode="26"
android:versionName="1.3.1">

<uses-sdk
android:minSdkVersion="15"
Expand Down
248 changes: 248 additions & 0 deletions assets/Yeasts/dry-yeasts-01.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,248 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<YEASTS>
<YEAST>
<NAME>Safale US-05</NAME>
<VERSION>1</VERSION>
<TYPE>Ale</TYPE>
<FORM>Dry</FORM>
<AMOUNT>0.0502753</AMOUNT>
<AMOUNT_IS_WEIGHT>FALSE</AMOUNT_IS_WEIGHT>
<LABORATORY>Fermentis</LABORATORY>
<PRODUCT_ID>US-05</PRODUCT_ID>
<MIN_TEMPERATURE>15.0000000</MIN_TEMPERATURE>
<MAX_TEMPERATURE>22.2222222</MAX_TEMPERATURE>
<FLOCCULATION>Medium</FLOCCULATION>
<ATTENUATION>80.00000000</ATTENUATION>
<NOTES>Produces well-balanced beers with low diacetyl.</NOTES>
<BEST_FOR>Ales</BEST_FOR>
<MAX_REUSE>5</MAX_REUSE>
<TIMES_CULTURED>0</TIMES_CULTURED>
<ADD_TO_SECONDARY>FALSE</ADD_TO_SECONDARY>
<DISPLAY_AMOUNT>50.28 ml</DISPLAY_AMOUNT>
<DISP_MIN_TEMP>59.0 F</DISP_MIN_TEMP>
<DISP_MAX_TEMP>72.0 F</DISP_MAX_TEMP>
<INVENTORY>0.0 pkg</INVENTORY>
<CULTURE_DATE>3/6/2011</CULTURE_DATE>
</YEAST>

<YEAST>
<NAME>Safbrew T-58</NAME>
<VERSION>1</VERSION>
<TYPE>Ale</TYPE>
<FORM>Dry</FORM>
<AMOUNT>0.0502753</AMOUNT>
<AMOUNT_IS_WEIGHT>FALSE</AMOUNT_IS_WEIGHT>
<LABORATORY>Fermentis</LABORATORY>
<PRODUCT_ID>T-58</PRODUCT_ID>
<MIN_TEMPERATURE>15.0000000</MIN_TEMPERATURE>
<MAX_TEMPERATURE>23.8888889</MAX_TEMPERATURE>
<FLOCCULATION>Low</FLOCCULATION>
<ATTENUATION>75.00000000</ATTENUATION>
<NOTES>Estery and somewhat peppery.</NOTES>
<BEST_FOR>Belgian ales</BEST_FOR>
<ADD_TO_SECONDARY>FALSE</ADD_TO_SECONDARY>
<DISP_MIN_TEMP>59.0 F</DISP_MIN_TEMP>
<DISP_MAX_TEMP>75.0 F</DISP_MAX_TEMP>
</YEAST>

<YEAST>
<NAME>Saflager W-34/70</NAME>
<VERSION>1</VERSION>
<TYPE>Lager</TYPE>
<FORM>Dry</FORM>
<AMOUNT>0.0502753</AMOUNT>
<AMOUNT_IS_WEIGHT>FALSE</AMOUNT_IS_WEIGHT>
<LABORATORY>Fermentis</LABORATORY>
<PRODUCT_ID>W-34/70</PRODUCT_ID>
<MIN_TEMPERATURE>11.6666667</MIN_TEMPERATURE>
<MAX_TEMPERATURE>15.0000000</MAX_TEMPERATURE>
<FLOCCULATION>High</FLOCCULATION>
<ATTENUATION>83.0000000</ATTENUATION>
<NOTES>Good balance of floral and fruity aromas with clean flavor.</NOTES>
<BEST_FOR>German lagers</BEST_FOR>
<ADD_TO_SECONDARY>FALSE</ADD_TO_SECONDARY>
<DISP_MIN_TEMP>54.0 F</DISP_MIN_TEMP>
<DISP_MAX_TEMP>59.0 F</DISP_MAX_TEMP>
</YEAST>

<YEAST>
<NAME>Saflager S-23</NAME>
<VERSION>1</VERSION>
<TYPE>Lager</TYPE>
<FORM>Dry</FORM>
<AMOUNT>0.0502753</AMOUNT>
<AMOUNT_IS_WEIGHT>FALSE</AMOUNT_IS_WEIGHT>
<LABORATORY>Fermentis</LABORATORY>
<PRODUCT_ID>S-23</PRODUCT_ID>
<MIN_TEMPERATURE>12.0000000</MIN_TEMPERATURE>
<MAX_TEMPERATURE>15.0000000</MAX_TEMPERATURE>
<FLOCCULATION>High</FLOCCULATION>
<ATTENUATION>82.0000000</ATTENUATION>
<NOTES>Produces fruity, estery notes.</NOTES>
<BEST_FOR>Continental lagers</BEST_FOR>
<ADD_TO_SECONDARY>FALSE</ADD_TO_SECONDARY>
<DISP_MIN_TEMP>54.0 F</DISP_MIN_TEMP>
<DISP_MAX_TEMP>59.0 F</DISP_MAX_TEMP>
</YEAST>

<YEAST>
<NAME>Safale S-04</NAME>
<VERSION>1</VERSION>
<TYPE>Ale</TYPE>
<FORM>Dry</FORM>
<AMOUNT>0.0502753</AMOUNT>
<AMOUNT_IS_WEIGHT>FALSE</AMOUNT_IS_WEIGHT>
<LABORATORY>Fermentis</LABORATORY>
<PRODUCT_ID>S-04</PRODUCT_ID>
<MIN_TEMPERATURE>15.0000000</MIN_TEMPERATURE>
<MAX_TEMPERATURE>20.0000000</MAX_TEMPERATURE>
<FLOCCULATION>High</FLOCCULATION>
<ATTENUATION>75.0000000</ATTENUATION>
<NOTES>English ale yeast selected for fast fermentation.</NOTES>
<BEST_FOR>English ales, cask ales.</BEST_FOR>
<ADD_TO_SECONDARY>FALSE</ADD_TO_SECONDARY>
<DISP_MIN_TEMP>59.0 F</DISP_MIN_TEMP>
<DISP_MAX_TEMP>68.0 F</DISP_MAX_TEMP>
</YEAST>

<YEAST>
<NAME>Safbrew S-33</NAME>
<VERSION>1</VERSION>
<TYPE>Ale</TYPE>
<FORM>Dry</FORM>
<AMOUNT>0.0502753</AMOUNT>
<AMOUNT_IS_WEIGHT>FALSE</AMOUNT_IS_WEIGHT>
<LABORATORY>Fermentis</LABORATORY>
<PRODUCT_ID>S-33</PRODUCT_ID>
<MIN_TEMPERATURE>15.0000000</MIN_TEMPERATURE>
<MAX_TEMPERATURE>20.0000000</MAX_TEMPERATURE>
<FLOCCULATION>Powdery</FLOCCULATION>
<ATTENUATION>70.0000000</ATTENUATION>
<NOTES>General purpose ale yeast with neutral flavor profiles.</NOTES>
<BEST_FOR>Specialty ales and trappist styles.</BEST_FOR>
<ADD_TO_SECONDARY>FALSE</ADD_TO_SECONDARY>
<DISP_MIN_TEMP>59.0 F</DISP_MIN_TEMP>
<DISP_MAX_TEMP>68.0 F</DISP_MAX_TEMP>
</YEAST>

<YEAST>
<NAME>Safbrew WB-06</NAME>
<VERSION>1</VERSION>
<TYPE>Ale</TYPE>
<FORM>Dry</FORM>
<AMOUNT>0.0502753</AMOUNT>
<AMOUNT_IS_WEIGHT>FALSE</AMOUNT_IS_WEIGHT>
<LABORATORY>Fermentis</LABORATORY>
<PRODUCT_ID>WB-06</PRODUCT_ID>
<MIN_TEMPERATURE>18.0000000</MIN_TEMPERATURE>
<MAX_TEMPERATURE>24.0000000</MAX_TEMPERATURE>
<FLOCCULATION>Low</FLOCCULATION>
<ATTENUATION>86.0000000</ATTENUATION>
<NOTES>Subtle estery and phenol flavors - banana and clover.</NOTES>
<BEST_FOR>Wheat beers.</BEST_FOR>
<ADD_TO_SECONDARY>FALSE</ADD_TO_SECONDARY>
<DISP_MIN_TEMP>64.0 F</DISP_MIN_TEMP>
<DISP_MAX_TEMP>75.0 F</DISP_MAX_TEMP>
</YEAST>

<YEAST>
<NAME>Safbrew BE-256</NAME>
<VERSION>1</VERSION>
<TYPE>Ale</TYPE>
<FORM>Dry</FORM>
<AMOUNT>0.0502753</AMOUNT>
<AMOUNT_IS_WEIGHT>FALSE</AMOUNT_IS_WEIGHT>
<LABORATORY>Fermentis</LABORATORY>
<PRODUCT_ID>BE-256</PRODUCT_ID>
<MIN_TEMPERATURE>15.0000000</MIN_TEMPERATURE>
<MAX_TEMPERATURE>20.0000000</MAX_TEMPERATURE>
<FLOCCULATION>High</FLOCCULATION>
<ATTENUATION>82.0000000</ATTENUATION>
<NOTES>Subtle, well-balanced aromas. Ferments fast.</NOTES>
<BEST_FOR>High alcohol beers, abbey style beers.</BEST_FOR>
<ADD_TO_SECONDARY>FALSE</ADD_TO_SECONDARY>
<DISP_MIN_TEMP>59.0 F</DISP_MIN_TEMP>
<DISP_MAX_TEMP>68.0 F</DISP_MAX_TEMP>
</YEAST>

<YEAST>
<NAME>Safale K-97</NAME>
<VERSION>1</VERSION>
<TYPE>Ale</TYPE>
<FORM>Dry</FORM>
<AMOUNT>0.0502753</AMOUNT>
<AMOUNT_IS_WEIGHT>FALSE</AMOUNT_IS_WEIGHT>
<LABORATORY>Fermentis</LABORATORY>
<PRODUCT_ID>K-97</PRODUCT_ID>
<MIN_TEMPERATURE>15.0000000</MIN_TEMPERATURE>
<MAX_TEMPERATURE>20.0000000</MAX_TEMPERATURE>
<FLOCCULATION>High</FLOCCULATION>
<ATTENUATION>81.0000000</ATTENUATION>
<NOTES>Suitable for ales with low esters.</NOTES>
<BEST_FOR>Belgian wheat beers, ales.</BEST_FOR>
<ADD_TO_SECONDARY>FALSE</ADD_TO_SECONDARY>
<DISP_MIN_TEMP>59.0 F</DISP_MIN_TEMP>
<DISP_MAX_TEMP>68.0 F</DISP_MAX_TEMP>
</YEAST>

<YEAST>
<NAME>Saflager S-198</NAME>
<VERSION>1</VERSION>
<TYPE>Lager</TYPE>
<FORM>Dry</FORM>
<AMOUNT>0.0502753</AMOUNT>
<AMOUNT_IS_WEIGHT>FALSE</AMOUNT_IS_WEIGHT>
<LABORATORY>Fermentis</LABORATORY>
<PRODUCT_ID>S-198</PRODUCT_ID>
<MIN_TEMPERATURE>10.000000</MIN_TEMPERATURE>
<MAX_TEMPERATURE>14.0000000</MAX_TEMPERATURE>
<FLOCCULATION>High</FLOCCULATION>
<ATTENUATION>84.0000000</ATTENUATION>
<NOTES>Popular with commercial breweries - neutral flavor.</NOTES>
<BEST_FOR>Wide rage of lagers, Pilsners.</BEST_FOR>
<ADD_TO_SECONDARY>FALSE</ADD_TO_SECONDARY>
<DISP_MIN_TEMP>50.0 F</DISP_MIN_TEMP>
<DISP_MAX_TEMP>57.2 F</DISP_MAX_TEMP>
</YEAST>

<YEAST>
<NAME>Belle Saison</NAME>
<VERSION>1</VERSION>
<TYPE>Ale</TYPE>
<FORM>Dry</FORM>
<AMOUNT>0.0502753</AMOUNT>
<AMOUNT_IS_WEIGHT>FALSE</AMOUNT_IS_WEIGHT>
<LABORATORY>Danstar</LABORATORY>
<PRODUCT_ID>Belle Saison</PRODUCT_ID>
<MIN_TEMPERATURE>17.2222222</MIN_TEMPERATURE>
<MAX_TEMPERATURE>26.6666667</MAX_TEMPERATURE>
<FLOCCULATION>Low</FLOCCULATION>
<ATTENUATION>92.0000000</ATTENUATION>
<NOTES>Belgian strain chosen for Saison beers.</NOTES>
<BEST_FOR>Saison.</BEST_FOR>
<ADD_TO_SECONDARY>FALSE</ADD_TO_SECONDARY>
<DISP_MIN_TEMP>63.0 F</DISP_MIN_TEMP>
<DISP_MAX_TEMP>80.0 F</DISP_MAX_TEMP>
</YEAST>

<YEAST>
<NAME>Nottingham</NAME>
<VERSION>1</VERSION>
<TYPE>Ale</TYPE>
<FORM>Dry</FORM>
<AMOUNT>0.0502753</AMOUNT>
<AMOUNT_IS_WEIGHT>FALSE</AMOUNT_IS_WEIGHT>
<LABORATORY>Danstar</LABORATORY>
<PRODUCT_ID>Nottingham</PRODUCT_ID>
<MIN_TEMPERATURE>17.0000000</MIN_TEMPERATURE>
<MAX_TEMPERATURE>20.0000000</MAX_TEMPERATURE>
<FLOCCULATION>High</FLOCCULATION>
<ATTENUATION>80.0000000</ATTENUATION>
<NOTES>Slightly estery, almost neutral.</NOTES>
<BEST_FOR>British Ales.</BEST_FOR>
<ADD_TO_SECONDARY>FALSE</ADD_TO_SECONDARY>
<DISP_MIN_TEMP>62.6 F</DISP_MIN_TEMP>
<DISP_MAX_TEMP>68.0 F</DISP_MAX_TEMP>
</YEAST>

</YEASTS>
2 changes: 1 addition & 1 deletion res/layout/row_layout_edit_text.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
android:layout_marginRight="20dp"
android:layout_marginLeft="20dp"
android:layout_marginBottom="5dp"
android:text="Beer Style"
android:text=""
android:background="@color/transparent"/>
</LinearLayout>

Expand Down
2 changes: 1 addition & 1 deletion src/com/biermacht/brews/frontend/IngredientActivities/AddCustomFermentableActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void onCreate(Bundle savedInstanceState) {
descriptionViewTitle.setText("Description");

// Set views
Log.d("AddCustomFermentableActivity::onCreate", "Initializing views");
Log.d("AddCustomFerm", "Initializing views");
this.registerViews(Arrays.asList(descriptionView));
this.setViews(Arrays.asList(nameView, fermentableTypeSpinner, timeView, amountView, colorView, gravityView, descriptionView));
if (! haveRecipe()) {
Expand Down
5 changes: 5 additions & 0 deletions src/com/biermacht/brews/frontend/IngredientActivities/AddCustomMiscActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ public void onCreate(Bundle savedInstanceState) {
// Set initial values
misc = new Misc("Custom misc");
setValues(misc);


// Units are configurable via the spinner - don't include the units
// in the amount title.
amountViewTitle.setText("Amount");
}

@Override
Expand Down
8 changes: 7 additions & 1 deletion src/com/biermacht/brews/frontend/IngredientActivities/AddEditIngredientActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.support.v7.app.AlertDialog;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.Log;
import android.view.View;
import android.widget.AdapterView;
import android.widget.TextView;
Expand Down Expand Up @@ -109,7 +110,12 @@ else if (i.getShortDescription().toLowerCase().contains(s.toString().toLowerCase
}

public void setInitialSearchableListSelection() {
// Set to second item (first is the "create new" placeholder)
if (filteredList.size() <= 1) {
// If there are no items in the list, we can't set an initial selection.
// If there is only a single item in the list, no need to set an initial selection.
Log.d("AddEditIngredientActivi", "filteredList size <= 1, do not set list selection");
return;
}
searchableListListener.onItemClick(null, null, 1, 1);
}

Expand Down
22 changes: 14 additions & 8 deletions src/com/biermacht/brews/frontend/IngredientActivities/AddMiscActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public void onCreate(Bundle savedInstanceState) {

public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
units = unitsArray.get(position);
Log.d("AddMiscActivity::onItemSelected", "Misc units selected: " + units);
Log.d("AddMiscActivity", "Misc units selected: " + units);
}

public void onNothingSelected(AdapterView<?> parentView) {
Expand All @@ -129,7 +129,7 @@ public void onNothingSelected(AdapterView<?> parentView) {

public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
type = typeArray.get(position);
Log.d("AddMiscActivity::onItemSelected", "Misc type selected: " + type);
Log.d("AddMiscActivity", "Misc type selected: " + type);
}

public void onNothingSelected(AdapterView<?> parentView) {
Expand All @@ -141,17 +141,22 @@ public void onNothingSelected(AdapterView<?> parentView) {
useSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {

public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
// Can't do anything if the misc is null.
if (misc == null) {
Log.d("AddMiscActivity", "No misc available");
return;
}

use = useArray.get(position);
misc.setUse(use);
Log.d("AddMiscActivity::onItemSelected", "Misc use selected: " + use);
Log.d("AddMiscActivity", "Misc use selected: " + use);

if (use.equals(Misc.USE_BOTTLING)) {
timeView.setVisibility(View.GONE);
}
else {
timeView.setVisibility(View.VISIBLE);
String units = misc.getTimeUnits();
timeViewTitle.setText(use + " Time" + " (" + units + ")");
timeViewTitle.setText(use + " Time" + " (" + misc.getTimeUnits() + ")");
}
}

Expand Down Expand Up @@ -180,13 +185,13 @@ public void onMissedClick(View v) {
@Override
public void getList() {
// Get the list of ingredients to show
Log.d("AddMiscActivity::getList", "Getting miscs list");
Log.d("AddMiscActivity", "Getting miscs list");
ingredientList = new ArrayList<Ingredient>();
ingredientList.addAll(ingredientHandler.getMiscsList());

// Add a placeholder ingredient. When selected, allows user to create
// a new custom ingredient.
Log.d("AddMiscActivity::getList", "Adding placeholder ingredient");
Log.d("AddMiscActivity", "Adding placeholder ingredient");
PlaceholderIngredient i = new PlaceholderIngredient("Create new");
i.setShortDescription("Create a custom misc");
ingredientList.add(0, i);
Expand All @@ -195,7 +200,7 @@ public void getList() {
@Override
public void createSpinner() {
// Set up spinner
Log.d("AddMiscActivity::createSpinner", "Creating misc spinner");
Log.d("AddMiscActivity", "Creating misc spinner");
adapter = new IngredientSpinnerAdapter(this, ingredientList, "Misc Selector", true);
adapter.setDropDownViewResource(android.R.layout.simple_dropdown_item_1line);
spinnerView.setAdapter(adapter);
Expand Down Expand Up @@ -237,6 +242,7 @@ public void onItemClick(AdapterView<?> parentView, View selectedItemView, int po
}

public void setValues(Misc m) {
Log.d("AddMiscActivity", "Setting text view values from misc: " + misc.getName());
nameViewText.setText(m.getName());
searchableListViewText.setText(m.getName());
timeViewText.setText(String.format("%d", mRecipe.getBoilTime()));
Expand Down
Loading

0 comments on commit c8599cf

Please sign in to comment.