From de64fab73344e7ba391efc7c4fc271dd1a41123c Mon Sep 17 00:00:00 2001 From: John Ruzick Date: Mon, 18 May 2020 11:08:20 -0400 Subject: [PATCH 1/6] Add ABV/IBU text to Tap Details --- .../java/org/kegbot/app/TapStatusFragment.java | 17 +++++++++++++++++ .../org/kegbot/app/config/AppConfiguration.java | 11 +++++++++++ .../java/org/kegbot/app/config/ConfigKey.java | 3 +++ kegtab/src/main/res/layout/tap_detail.xml | 12 ++++++++++++ kegtab/src/main/res/values/styles.xml | 9 +++++++++ kegtab/src/main/res/xml/settings_general.xml | 14 ++++++++++++++ 6 files changed, 66 insertions(+) diff --git a/kegtab/src/main/java/org/kegbot/app/TapStatusFragment.java b/kegtab/src/main/java/org/kegbot/app/TapStatusFragment.java index 7f68861d..e8a15116 100644 --- a/kegtab/src/main/java/org/kegbot/app/TapStatusFragment.java +++ b/kegtab/src/main/java/org/kegbot/app/TapStatusFragment.java @@ -202,6 +202,8 @@ private void updateTapDetails() { final TextView title = ButterKnife.findById(mView, R.id.tapTitle); final TextView subtitle = ButterKnife.findById(mView, R.id.tapSubtitle); + final TextView abvText = ButterKnife.findById(mView, R.id.tapAbv); + final TextView ibuText = ButterKnife.findById(mView, R.id.tapIbu); final TextView tapNotes = ButterKnife.findById(mView, R.id.tapNotes); final ViewFlipper flipper = ButterKnife.findById(mView, R.id.tapStatusFlipper); @@ -256,6 +258,21 @@ public void onClick(View v) { description = tap.getDescription(); } + // Find ABV and IBU values + final String abv = String.valueOf(keg.getBeverage().getAbvPercent()); + if(mCore.getConfiguration().getAbvVisibleWhenZero()) { + abvText.setText("ABV: " + abv + "%"); + } else{ + abvText.setText(keg.getBeverage().getAbvPercent() == 0 ? "" : "ABV: " + abv + "%"); + } + + final String ibu = String.valueOf(Math.round(keg.getBeverage().getIbu())); + if(mCore.getConfiguration().getIbuVisibleWhenZero()){ + ibuText.setText("IBU: " + ibu); + } else{ + ibuText.setText(keg.getBeverage().getIbu() == 0 ? "" : "IBU: " + ibu); + } + final ImageView tapImage = (ImageView) mView.findViewById(R.id.tapImage); final ImageView tapIllustration = (ImageView) mView.findViewById(R.id.tapIllustration); diff --git a/kegtab/src/main/java/org/kegbot/app/config/AppConfiguration.java b/kegtab/src/main/java/org/kegbot/app/config/AppConfiguration.java index c317a6a8..9534ea30 100644 --- a/kegtab/src/main/java/org/kegbot/app/config/AppConfiguration.java +++ b/kegtab/src/main/java/org/kegbot/app/config/AppConfiguration.java @@ -294,6 +294,17 @@ public boolean getTemperaturesCelsius() { return getBoolean(ConfigKey.TEMPERATURE_UNITS_CELSIUS); } + public void setAbvVisibleWhenZero(boolean value) { setBoolean(ConfigKey.ABV_DISPLAY_WHEN_ZERO, value); + } + public boolean getAbvVisibleWhenZero() { + return getBoolean(ConfigKey.ABV_DISPLAY_WHEN_ZERO); + } + public void setIbuVisibleWhenZero(boolean value) { setBoolean(ConfigKey.IBU_DISPLAY_WHEN_ZERO, value); + } + public boolean getIbuVisibleWhenZero() { + return getBoolean(ConfigKey.IBU_DISPLAY_WHEN_ZERO); + } + public boolean stayAwake() { return getBoolean(ConfigKey.STAY_AWAKE); } diff --git a/kegtab/src/main/java/org/kegbot/app/config/ConfigKey.java b/kegtab/src/main/java/org/kegbot/app/config/ConfigKey.java index b0dc588a..7959bd9f 100644 --- a/kegtab/src/main/java/org/kegbot/app/config/ConfigKey.java +++ b/kegtab/src/main/java/org/kegbot/app/config/ConfigKey.java @@ -64,6 +64,9 @@ enum ConfigKey { VOLUME_UNITS_METRIC(FALSE), TEMPERATURE_UNITS_CELSIUS(FALSE), + ABV_DISPLAY_WHEN_ZERO(FALSE), + IBU_DISPLAY_WHEN_ZERO(FALSE), + STAY_AWAKE(TRUE), KEEP_SCREEN_ON(TRUE), WAKE_DURING_POUR(FALSE), diff --git a/kegtab/src/main/res/layout/tap_detail.xml b/kegtab/src/main/res/layout/tap_detail.xml index 3ea8e4e6..1e1754a3 100644 --- a/kegtab/src/main/res/layout/tap_detail.xml +++ b/kegtab/src/main/res/layout/tap_detail.xml @@ -38,6 +38,18 @@ android:layout_toRightOf="@+id/tapTitle" android:layout_alignBaseline="@+id/tapTitle"/> + + + + @color/muted + + diff --git a/kegtab/src/main/res/xml/settings_general.xml b/kegtab/src/main/res/xml/settings_general.xml index 4c636f13..93676dff 100644 --- a/kegtab/src/main/res/xml/settings_general.xml +++ b/kegtab/src/main/res/xml/settings_general.xml @@ -41,27 +41,6 @@ android:summaryOn="Temperatures will be shown in Celsius" android:title="Show Temperatures in Celsius"> - - - - - - \ No newline at end of file diff --git a/kegtab/src/main/res/xml/settings_kegerator.xml b/kegtab/src/main/res/xml/settings_kegerator.xml index d0f475af..08e4320e 100644 --- a/kegtab/src/main/res/xml/settings_kegerator.xml +++ b/kegtab/src/main/res/xml/settings_kegerator.xml @@ -74,6 +74,27 @@ android:summaryOn="Kegbot will cycle taps on the main screen when idle" android:title="Rotate Taps"> + + + + + + Date: Fri, 22 May 2020 09:40:47 -0400 Subject: [PATCH 6/6] Reverse layout changes to pour in progress screen, did not look good on smaller tablet screens --- kegtab/src/main/res/layout/pour_in_progress_activity.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kegtab/src/main/res/layout/pour_in_progress_activity.xml b/kegtab/src/main/res/layout/pour_in_progress_activity.xml index 5d6453bc..7b0312d5 100644 --- a/kegtab/src/main/res/layout/pour_in_progress_activity.xml +++ b/kegtab/src/main/res/layout/pour_in_progress_activity.xml @@ -94,7 +94,7 @@