Skip to content

Commit

Permalink
Bump version, run code formatting tool.
Browse files Browse the repository at this point in the history
  • Loading branch information
caseydavenport committed Sep 18, 2016
1 parent 222d7ec commit 87efac4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 12 deletions.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
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="31"
android:versionName="1.4.4"
android:versionCode="32"
android:versionName="1.4.5"
android:installLocation="auto">

<uses-sdk
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.biermacht.brews.frontend.fragments;

import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
Expand Down Expand Up @@ -57,16 +56,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
measTempTitle.setText("Temperature of Wort (" + Units.getTemperatureUnits() + ")");
calibTempTitle.setText("Calibration Temperature (" + Units.getTemperatureUnits() + ")");
if (Units.getTemperatureUnits().equals(Units.FAHRENHEIT)) {
String calibTemp=this.getActivity().getSharedPreferences(Constants.PREFERENCES, Context.MODE_PRIVATE).getString(Constants.PREF_HYDROMETER_CALIBRATION_TEMP,"68");
String calibTemp = this.getActivity().getSharedPreferences(Constants.PREFERENCES, Context.MODE_PRIVATE).getString(Constants.PREF_HYDROMETER_CALIBRATION_TEMP, "68");
calibTempEditText.setText(calibTemp);
measTempEditText.setHint("80");
calcGravityTitle.setText("Gravity at "+calibTemp + Units.getTemperatureUnits());
calcGravityTitle.setText("Gravity at " + calibTemp + Units.getTemperatureUnits());
}
else {
String calibTemp=this.getActivity().getSharedPreferences(Constants.PREFERENCES, Context.MODE_PRIVATE).getString(Constants.PREF_HYDROMETER_CALIBRATION_TEMP,"20");
String calibTemp = this.getActivity().getSharedPreferences(Constants.PREFERENCES, Context.MODE_PRIVATE).getString(Constants.PREF_HYDROMETER_CALIBRATION_TEMP, "20");
calibTempEditText.setText(calibTemp);
measTempEditText.setHint("27");
calcGravityTitle.setText("Gravity at "+calibTemp + Units.getTemperatureUnits());
calcGravityTitle.setText("Gravity at " + calibTemp + Units.getTemperatureUnits());
}

return pageView;
Expand All @@ -86,7 +85,7 @@ public void calculate() {
return;
}
// save calibration temp if the field contains a valid value
this.getActivity().getSharedPreferences(Constants.PREFERENCES, Context.MODE_PRIVATE).edit().putString(Constants.PREF_HYDROMETER_CALIBRATION_TEMP,calibTempEditText.getText().toString()).commit();
this.getActivity().getSharedPreferences(Constants.PREFERENCES, Context.MODE_PRIVATE).edit().putString(Constants.PREF_HYDROMETER_CALIBRATION_TEMP, calibTempEditText.getText().toString()).commit();

if ((measGrav != 0)) {
// Update the calculated gravity title
Expand Down Expand Up @@ -126,7 +125,6 @@ public String name() {
public void handleClick(View v) {
if (v.getId() == R.id.calculate_button) {


this.calculate();

// The page is a bit long - scroll to the bottom so the user can see the
Expand Down
1 change: 0 additions & 1 deletion src/com/biermacht/brews/utils/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public class Constants {
public static final String KEY_TIMER_STATE = "biermacht.brews.timer.state";
public static final String KEY_STYLE = "biermacht.brews.style";


public static final int INVALID_ID = - 1;

public static final String BREW_DATE_FMT = "dd MMM yyyy";
Expand Down
3 changes: 1 addition & 2 deletions src/com/biermacht/brews/utils/IngredientHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,7 @@ public ArrayList<Recipe> getRecipesFromXml(InputStream is, String path) throws E
inSrc.setEncoding("ISO-8859-2");
sp.parse(inSrc, beerXmlReader);
list = beerXmlReader.getRecipes();
}
catch (Exception e) {
} catch (Exception e) {
try {
Log.d("IngredientHandler", "Failed to parse as .xml, attempting to parse as a .bsmx file");
// Failed to parse as a .xml file. Attempt to parse as .bsmx format instead.
Expand Down

0 comments on commit 87efac4

Please sign in to comment.